apply SRC_URI cleanup patch from Andrew Zabolotny

BKrev: 41a46442gQQyjH2tdMY3_XyigOZcNw

33 files changed, 92 insertions, 50 deletions

diff --git a/gpe-aerial/gpe-aerial_0.2.11.oe b/gpe-aerial/gpe-aerial_0.2.11.oe
index ea25c106d0..a901e117ca 100644
--- a/gpe-aerial/gpe-aerial_0.2.11.oe
+++ b/gpe-aerial/gpe-aerial_0.2.11.oe
@@ -6,5 +6,4 @@ SECTION = "gpe"
 PRIORITY = "optional"
 LICENSE = "GPL"
 
-SRC_URI = "http://gpe.handhelds.org/pub/projects/gpe/source/${PN}-${PV}.tar.gz \
-	   file://fix_makefile.patch;patch=1"
+SRC_URI += "file://fix_makefile.patch;patch=1"
diff --git a/gpe-autostarter/gpe-autostarter_0.6.oe b/gpe-autostarter/gpe-autostarter_0.6.oe
index aae9ec6e5e..0b3edf936f 100644
--- a/gpe-autostarter/gpe-autostarter_0.6.oe
+++ b/gpe-autostarter/gpe-autostarter_0.6.oe
@@ -3,6 +3,4 @@ SECTION = "gpe"
 DEPENDS = "glib-2.0 dbus hotplug-dbus"
 RDEPENDS = "hotplug-dbus"
 
-SRC_URI = "ftp://gpe.handhelds.org/gpe/source/gpe-autostarter-${PV}.tar.gz"
-
 inherit gpe
diff --git a/gpe-package/gpe-package_0.0.10.oe b/gpe-package/gpe-package_0.0.10.oe
index 86aedc66bf..612f4d9258 100644
--- a/gpe-package/gpe-package_0.0.10.oe
+++ b/gpe-package/gpe-package_0.0.10.oe
@@ -8,9 +8,8 @@ PRIORITY = "optional"
 #BROKEN = "1"
 PR = "r1"
 
-SRC_URI = "http://gpe.handhelds.org/pub/projects/gpe/source/${PN}-${PV}.tar.gz \
-           file://fix_makefile.patch;patch=1 \
-	   file://fix_interface_c.patch;patch=1"
+SRC_URI += "file://fix_makefile.patch;patch=1 \
+	    file://fix_interface_c.patch;patch=1"
 
 do_compile() {
         oe_runmake STAGING_INCDIR="${STAGING_INCDIR}"
diff --git a/gpe-package/gpe-package_0.0.12.oe b/gpe-package/gpe-package_0.0.12.oe
index ef0d4d19a9..44fab5c499 100644
--- a/gpe-package/gpe-package_0.0.12.oe
+++ b/gpe-package/gpe-package_0.0.12.oe
@@ -9,7 +9,6 @@ RDEPENDS = "gpe-icons"
 SECTION = "gpe"
 PRIORITY = "optional"
 
-SRC_URI = "http://gpe.handhelds.org/pub/projects/gpe/source/${PN}-${PV}.tar.gz \
-	   file://use-filesel.patch;patch=1"
+SRC_URI += "file://use-filesel.patch;patch=1"
 
 FILES_{PN} += "${datadir}"
diff --git a/gpe-package/gpe-package_0.0.9-1.oe b/gpe-package/gpe-package_0.0.9-1.oe
index 01dbabc500..a64734cbc2 100644
--- a/gpe-package/gpe-package_0.0.9-1.oe
+++ b/gpe-package/gpe-package_0.0.9-1.oe
@@ -6,9 +6,8 @@ RDEPENDS = "gpe-icons"
 SECTION = "gpe"
 PRIORITY = "optional"
 
-SRC_URI = "http://gpe.handhelds.org/pub/projects/gpe/source/${PN}-${PV}.tar.gz \
-           file://fix_makefiles.patch;patch=1 \
-	   file://fix_interface_c.patch;patch=1"
+SRC_URI += "file://fix_makefiles.patch;patch=1 \
+	    file://fix_interface_c.patch;patch=1"
 
 do_compile() {
 	oe_runmake STAGING_INCDIR="${STAGING_INCDIR}"
diff --git a/gpe-plucker/gpe-plucker_0.1.oe b/gpe-plucker/gpe-plucker_0.1.oe
index e69de29bb2..80582cd7ef 100644
--- a/gpe-plucker/gpe-plucker_0.1.oe
+++ b/gpe-plucker/gpe-plucker_0.1.oe
@@ -0,0 +1,8 @@
+inherit gpe pkgconfig
+
+DESCRIPTION = "Plucker ebook reader"
+DEPENDS = "gtk+ libgpewidget"
+SECTION = "gpe"
+PRIORITY = "optional"
+
+SRC_URI += "file://fix_makefiles.patch;patch=1"
diff --git a/gpe-question/gpe-question_0.03.oe b/gpe-question/gpe-question_0.03.oe
index e69de29bb2..b1f9e4b901 100644
--- a/gpe-question/gpe-question_0.03.oe
+++ b/gpe-question/gpe-question_0.03.oe
@@ -0,0 +1,6 @@
+inherit gpe
+
+DEPENDS = "libgpewidget"
+RDEPENDS = "gpe-icons"
+SECTION = "gpe"
+DESCRIPTION = "GPE interface for asking questions from shell scripts"
diff --git a/gpe-question/gpe-question_0.04.oe b/gpe-question/gpe-question_0.04.oe
index e69de29bb2..b1f9e4b901 100644
--- a/gpe-question/gpe-question_0.04.oe
+++ b/gpe-question/gpe-question_0.04.oe
@@ -0,0 +1,6 @@
+inherit gpe
+
+DEPENDS = "libgpewidget"
+RDEPENDS = "gpe-icons"
+SECTION = "gpe"
+DESCRIPTION = "GPE interface for asking questions from shell scripts"
diff --git a/gpe-session-scripts/gpe-session-scripts_0.61.oe b/gpe-session-scripts/gpe-session-scripts_0.61.oe
index b03c63117a..fb7d05ac9f 100644
--- a/gpe-session-scripts/gpe-session-scripts_0.61.oe
+++ b/gpe-session-scripts/gpe-session-scripts_0.61.oe
@@ -11,8 +11,7 @@ RDEPENDS = "matchbox gpe-session-starter gpe-bluetooth xstroke xtscal gpe-questi
 # more rdepends: keylaunch ipaq-sleep apmd blueprobe
 DEPENDS = "matchbox-wm matchbox-panel gpe-bluetooth xstroke xtscal gpe-question matchbox-applet-inputmanager gpe-clock xrandr"
 
-SRC_URI = "http://gpe.handhelds.org/pub/projects/gpe/source/gpe-session-scripts-${PV}.tar.gz \
-	file://change-default-applets.patch;patch=1"
+SRC_URI += "file://change-default-applets.patch;patch=1"
 
 do_install_append() {
 	install -d ${D}/etc/gpe/xsettings-default.d
diff --git a/gpe-session-scripts/gpe-session-scripts_0.62.oe b/gpe-session-scripts/gpe-session-scripts_0.62.oe
index e69de29bb2..81bb954de1 100644
--- a/gpe-session-scripts/gpe-session-scripts_0.62.oe
+++ b/gpe-session-scripts/gpe-session-scripts_0.62.oe
@@ -0,0 +1,24 @@
+LICENSE = "GPL"
+PR = "r0"
+
+inherit gpe
+
+DESCRIPTION = "GPE session startup scripts"
+SECTION = "gpe"
+PRIORITY = "optional"
+MAINTAINER = "Philip Blundell <pb@handhelds.org>"
+RDEPENDS = "matchbox gpe-session-starter gpe-bluetooth xstroke xtscal gpe-question gpe-clock matchbox-applet-inputmanager xrandr"
+# more rdepends: keylaunch ipaq-sleep apmd blueprobe
+DEPENDS = "matchbox-wm matchbox-panel gpe-bluetooth xstroke xtscal gpe-question matchbox-applet-inputmanager gpe-clock xrandr"
+
+SRC_URI += "file://zaurus.sh \
+	file://change-default-applets.patch;patch=1"
+
+do_install_append() {
+	install ${WORKDIR}/zaurus.sh ${D}/etc/X11/Xinit.d/11zaurus
+	install -d ${D}/etc/gpe/xsettings-default.d
+	if [ "${GPE_MACHINE_CLASS}" != "bigscreen" ]; then
+		echo "Gtk/ToolbarStyle:S:icons" > ${D}/etc/gpe/xsettings-default.d/toolbar
+	fi
+}
+
diff --git a/gpe-soundbite/gpe-soundbite_1.0.5.oe b/gpe-soundbite/gpe-soundbite_1.0.5.oe
index e69de29bb2..5d9930317b 100644
--- a/gpe-soundbite/gpe-soundbite_1.0.5.oe
+++ b/gpe-soundbite/gpe-soundbite_1.0.5.oe
@@ -0,0 +1,7 @@
+inherit gpe pkgconfig
+
+DESCRIPTION = "GPE audio Recorder"
+DEPENDS = "gtk+ libgpewidget libglade libgsm gpe-soundserver"
+SECTION = "gpe"
+PRIORITY = "optional"
+LDFLAGS_append = "-Wl,--export-dynamic"
diff --git a/gpe-timesheet/gpe-timesheet_0.13.oe b/gpe-timesheet/gpe-timesheet_0.13.oe
index 6218113735..b97ed97ffc 100644
--- a/gpe-timesheet/gpe-timesheet_0.13.oe
+++ b/gpe-timesheet/gpe-timesheet_0.13.oe
@@ -4,5 +4,4 @@ inherit gpe
 DEPENDS = "libgpewidget glib-2.0 gtk+"
 SECTION = "gpe"
 
-SRC_URI = "http://gpe.handhelds.org/pub/projects/gpe/source/gpe-timesheet-${PV}.tar.gz \
-	file://gpe-timesheet-makefile.patch;patch=0"
+SRC_URI += "file://gpe-timesheet-makefile.patch;patch=0"
diff --git a/gpe-timesheet/gpe-timesheet_0.14.oe b/gpe-timesheet/gpe-timesheet_0.14.oe
index e7b256099d..b4f580736c 100644
--- a/gpe-timesheet/gpe-timesheet_0.14.oe
+++ b/gpe-timesheet/gpe-timesheet_0.14.oe
@@ -5,5 +5,3 @@ DESCRIPTION = "GPE time tracker"
 DEPENDS = "libgpewidget gtk+ sqlite"
 SECTION = "gpe"
 RDEPENDS = "gpe-icons"
-
-SRC_URI = "http://gpe.handhelds.org/pub/projects/gpe/source/gpe-timesheet-${PV}.tar.gz"
diff --git a/gpe-today/gpe-today_0.08.oe b/gpe-today/gpe-today_0.08.oe
index 64fd7090b7..492128a3a5 100644
--- a/gpe-today/gpe-today_0.08.oe
+++ b/gpe-today/gpe-today_0.08.oe
@@ -6,5 +6,4 @@ DEPENDS = "gtk+ libxrandr libxsettings libxsettings-client libgpewidget libdispl
 SECTION = "gpe"
 PRIORITY = "optional"
 
-SRC_URI = "http://gpe.handhelds.org/pub/projects/gpe/source/gpe-today-${PV}.tar.gz \
-	file://gpe-today_makefiles.patch;patch=1"
+SRC_URI += "file://gpe-today_makefiles.patch;patch=1"
diff --git a/gpe-todo/gpe-todo_0.46.oe b/gpe-todo/gpe-todo_0.46.oe
index a5b78aaa16..04eed9a60a 100644
--- a/gpe-todo/gpe-todo_0.46.oe
+++ b/gpe-todo/gpe-todo_0.46.oe
@@ -6,5 +6,3 @@ DEPENDS = "gtk+ libdisplaymigration libgpewidget libgpepimc libtododb"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 SECTION = "gpe"
 PRIORITY = "optional"
-
-SRC_URI = "http://gpe.handhelds.org/pub/projects/gpe/source/gpe-todo-${PV}.tar.gz"
diff --git a/gpe-watch/gpe-watch_0.10.oe b/gpe-watch/gpe-watch_0.10.oe
index e69de29bb2..c41295211c 100644
--- a/gpe-watch/gpe-watch_0.10.oe
+++ b/gpe-watch/gpe-watch_0.10.oe
@@ -0,0 +1,8 @@
+inherit gpe pkgconfig
+
+DESCRIPTION = "GPE analog clock-watch"
+DEPENDS = "gtk+ libgpewidget"
+SECTION = "gpe"
+PRIORITY = "optional"
+
+SRC_URI += "file://fix_makefile.patch;patch=1"
diff --git a/libdisplaymigration/libdisplaymigration_0.28.oe b/libdisplaymigration/libdisplaymigration_0.28.oe
index 3080fef100..7d85914d77 100644
--- a/libdisplaymigration/libdisplaymigration_0.28.oe
+++ b/libdisplaymigration/libdisplaymigration_0.28.oe
@@ -7,8 +7,6 @@ PRIORITY = "optional"
 
 inherit pkgconfig gpe
 
-SRC_URI = "http://gpe.handhelds.org/pub/projects/gpe/source/libdisplaymigration-${PV}.tar.gz"
-
 headers = "displaymigration.h auth.h crypt.h"
 
 do_stage () {
diff --git a/libdotdesktop/libdotdesktop_0.11.oe b/libdotdesktop/libdotdesktop_0.11.oe
index 17444c85a9..463b143f1c 100644
--- a/libdotdesktop/libdotdesktop_0.11.oe
+++ b/libdotdesktop/libdotdesktop_0.11.oe
@@ -4,7 +4,7 @@ DEPENDS = "glib-2.0"
 
 inherit pkgconfig
 
-SRC_URI = "ftp://gpe.handhelds.org/gpe/source/libdotdesktop-${PV}.tar.gz \
+SRC_URI = "${GPE_MIRROR}/libdotdesktop-${PV}.tar.gz \
 	file://make_build_var.patch;patch=1"
 
 headers = "dotdesktop.h"
diff --git a/libeventdb/libeventdb_0.15.oe b/libeventdb/libeventdb_0.15.oe
index 33bec04ac0..9d3dcbe622 100644
--- a/libeventdb/libeventdb_0.15.oe
+++ b/libeventdb/libeventdb_0.15.oe
@@ -7,8 +7,6 @@ DEPENDS = "libgpewidget libgpepimc sqlite"
 
 inherit pkgconfig gpe
 
-SRC_URI = "http://gpe.handhelds.org/pub/projects/gpe/source/libeventdb-${PV}.tar.gz"
-
 headers = "event-db.h"
 
 do_stage () {
diff --git a/libgpepimc/libgpepimc_0.2.oe b/libgpepimc/libgpepimc_0.2.oe
index b6da42e0e5..c189aeaa18 100644
--- a/libgpepimc/libgpepimc_0.2.oe
+++ b/libgpepimc/libgpepimc_0.2.oe
@@ -7,8 +7,7 @@ DEPENDS = "libgpewidget libdisplaymigration gtk+ sqlite"
 
 inherit pkgconfig gpe
 
-SRC_URI = "http://gpe.handhelds.org/pub/projects/gpe/source/libgpepimc-${PV}.tar.gz \
-	file://libgpepimc_pc.patch;patch=1"
+SRC_URI += "file://libgpepimc_pc.patch;patch=1"
 
 headers = "pim-categories.h pim-categories-ui.h"
 
diff --git a/libgpepimc/libgpepimc_0.3.oe b/libgpepimc/libgpepimc_0.3.oe
index 0b9164f38b..3e178cc91b 100644
--- a/libgpepimc/libgpepimc_0.3.oe
+++ b/libgpepimc/libgpepimc_0.3.oe
@@ -7,8 +7,6 @@ DEPENDS = "libgpewidget libdisplaymigration gtk+ sqlite"
 
 inherit pkgconfig gpe
 
-SRC_URI = "http://gpe.handhelds.org/pub/projects/gpe/source/libgpepimc-${PV}.tar.gz"
-
 headers = "pim-categories.h pim-categories-ui.h"
 
 do_stage () {
diff --git a/libgpevtype/libgpevtype_0.3.oe b/libgpevtype/libgpevtype_0.3.oe
index b232a5d09c..5af5870219 100644
--- a/libgpevtype/libgpevtype_0.3.oe
+++ b/libgpevtype/libgpevtype_0.3.oe
@@ -7,8 +7,6 @@ DEPENDS = "libmimedir"
 
 inherit pkgconfig gpe
 
-SRC_URI = "http://gpe.handhelds.org/pub/projects/gpe/source/libgpevtype-${PV}.tar.gz"
-
 headers = "tag-db.h vcard.h vevent.h vtodo.h"
 
 do_stage () {
diff --git a/libmimedir/libmimedir_0.0-20040307.oe b/libmimedir/libmimedir_0.0-20040307.oe
index 90386b5ee4..98c410a736 100644
--- a/libmimedir/libmimedir_0.0-20040307.oe
+++ b/libmimedir/libmimedir_0.0-20040307.oe
@@ -5,7 +5,7 @@ LICENSE = "LGPL"
 DEPENDS = "intltool-native"
 PR = "r1"
 
-SRC_URI = "http://gpe.handhelds.org/pub/projects/gpe/source/libmimedir-snapshot-20040307.tar.gz"
+SRC_URI = "${GPE_MIRROR}/libmimedir-snapshot-20040307.tar.gz"
 S = "${WORKDIR}/libmimedir"
 
 inherit autotools pkgconfig
diff --git a/libschedule/libschedule_0.13.oe b/libschedule/libschedule_0.13.oe
index f756224282..feba11c9df 100644
--- a/libschedule/libschedule_0.13.oe
+++ b/libschedule/libschedule_0.13.oe
@@ -8,8 +8,6 @@ DEPENDS = "glib-2.0"
 
 inherit pkgconfig gpe
 
-SRC_URI = "http://gpe.handhelds.org/pub/projects/gpe/source/libschedule-${PV}.tar.gz"
-
 headers = "schedule.h"
 
 do_stage () {
diff --git a/libtododb/libtododb_0.07.oe b/libtododb/libtododb_0.07.oe
index ecfa13b3fd..180481fd61 100644
--- a/libtododb/libtododb_0.07.oe
+++ b/libtododb/libtododb_0.07.oe
@@ -7,8 +7,6 @@ DEPENDS = "libgpewidget libgpepimc sqlite"
 
 inherit pkgconfig gpe
 
-SRC_URI = "http://gpe.handhelds.org/pub/projects/gpe/source/libtododb-${PV}.tar.gz"
-
 headers = "todo-db.h"
 
 do_stage () {
diff --git a/libtododb/libtododb_0.08.oe b/libtododb/libtododb_0.08.oe
index ecfa13b3fd..180481fd61 100644
--- a/libtododb/libtododb_0.08.oe
+++ b/libtododb/libtododb_0.08.oe
@@ -7,8 +7,6 @@ DEPENDS = "libgpewidget libgpepimc sqlite"
 
 inherit pkgconfig gpe
 
-SRC_URI = "http://gpe.handhelds.org/pub/projects/gpe/source/libtododb-${PV}.tar.gz"
-
 headers = "todo-db.h"
 
 do_stage () {
diff --git a/libxsettings-client/libxsettings-client_0.12.oe b/libxsettings-client/libxsettings-client_0.12.oe
index 8e40c7abff..51e1c21bf7 100644
--- a/libxsettings-client/libxsettings-client_0.12.oe
+++ b/libxsettings-client/libxsettings-client_0.12.oe
@@ -4,8 +4,7 @@ DEPENDS = "libgpewidget libxsettings x11"
 
 inherit pkgconfig gpe
 
-SRC_URI = "ftp://gpe.handhelds.org/gpe/source/libxsettings-client0-${PV}.tar.gz \
-	file://make_pkgconfig_x11.patch;patch=1"
+SRC_URI += "file://make_pkgconfig_x11.patch;patch=1"
 
 S = "${WORKDIR}/libxsettings-client0-0.12"
 
diff --git a/libxsettings/libxsettings_0.11.oe b/libxsettings/libxsettings_0.11.oe
index 9b9d0b435a..0f2fe547b9 100644
--- a/libxsettings/libxsettings_0.11.oe
+++ b/libxsettings/libxsettings_0.11.oe
@@ -6,8 +6,6 @@ DEPENDS = "x11"
 
 inherit gpe
 
-SRC_URI = "http://gpe.handhelds.org/pub/projects/gpe/source/libxsettings-${PV}.tar.gz"
-
 headers = "xsettings-common.h"
 
 do_stage () {
diff --git a/nsqld/nsqld_0.5.3.oe b/nsqld/nsqld_0.5.3.oe
index e69de29bb2..f438daf0dc 100644
--- a/nsqld/nsqld_0.5.3.oe
+++ b/nsqld/nsqld_0.5.3.oe
@@ -0,0 +1,16 @@
+DESCRIPTION = "Server process for syncing"
+SECTION = "gpe"
+PRIORITY = "optional"
+MAINTAINER = "Tim Teulings <tim@teulings.org>"
+LICENSE = "GPL"
+
+SRC_URI = "${GPE_MIRROR}/nsqld-${PV}.tar.gz"
+
+S = "${WORKDIR}/nsqld-${PV}"
+
+inherit autotools pkgconfig
+
+do_install () {
+        install -d ${D}/${bindir}
+        install -m 0755 ${WORKDIR}/nsqld-${PV}/nsqld ${D}${bindir}
+}
diff --git a/xtscal/xtscal_0.4.oe b/xtscal/xtscal_0.4.oe
index f0548878e7..310f525685 100644
--- a/xtscal/xtscal_0.4.oe
+++ b/xtscal/xtscal_0.4.oe
@@ -4,8 +4,6 @@ SECTION = "x11/base"
 
 DEPENDS = "x11 libxft libxrandr"
 
-
-
-SRC_URI = "http://gpe.handhelds.org/pub/projects/gpe/source/xtscal-${PV}.tar.bz2"
+SRC_URI = "${GPE_MIRROR}/xtscal-${PV}.tar.bz2"
 
 inherit autotools
diff --git a/xtscal/xtscal_0.5.1.oe b/xtscal/xtscal_0.5.1.oe
index 73c1a815f0..46eddc2c01 100644
--- a/xtscal/xtscal_0.5.1.oe
+++ b/xtscal/xtscal_0.5.1.oe
@@ -6,7 +6,7 @@ DEPENDS = "x11 libxft libxrandr xcalibrate"
 
 PR = "r1"
 
-SRC_URI = "http://gpe.handhelds.org/pub/projects/gpe/source/xtscal-${PV}.tar.bz2 \
+SRC_URI = "${GPE_MIRROR}/xtscal-${PV}.tar.bz2 \
 	   file://xtscal-poodle.patch;patch=1"
 
 inherit autotools
diff --git a/xtscal/xtscal_0.5.oe b/xtscal/xtscal_0.5.oe
index 2e71affe84..8b811947ff 100644
--- a/xtscal/xtscal_0.5.oe
+++ b/xtscal/xtscal_0.5.oe
@@ -4,6 +4,6 @@ SECTION = "x11/base"
 
 DEPENDS = "x11 libxft libxrandr xcalibrate"
 
-SRC_URI = "http://gpe.handhelds.org/pub/projects/gpe/source/xtscal-${PV}.tar.bz2"
+SRC_URI = "${GPE_MIRROR}/xtscal-${PV}.tar.bz2"
 
 inherit autotools
diff --git a/xtscal/xtscal_0.6.3.oe b/xtscal/xtscal_0.6.3.oe
index 7176ea022d..022833f46f 100644
--- a/xtscal/xtscal_0.6.3.oe
+++ b/xtscal/xtscal_0.6.3.oe
@@ -6,6 +6,6 @@ DEPENDS = "x11 libxft libxrandr xcalibrate"
 
 PR = "r0"
 
-SRC_URI = "http://gpe.handhelds.org/pub/projects/gpe/source/xtscal-${PV}.tar.bz2"
+SRC_URI = "${GPE_MIRROR}/xtscal-${PV}.tar.bz2"
 
 inherit autotools