Merge bk://oe-devel@oe-devel.bkbits.net/packages

into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2004/11/27 12:48:07+01:00 uni-frankfurt.de!mickeyl use ${HANDHELDS_CVS} (see default in oe.conf) instead of hardcoding cvs://cvs.handhelds.org/... 2004/11/27 12:46:42+01:00 uni-frankfurt.de!mickeyl download zbedic from cvs BKrev: 41a86995A2uN5wW4nZHxDvYiHvh3-A
author: Michael Lauer <mickey@vanille-media.de> 2004-11-27 11:48:37 +0000
committer: Michael Lauer <mickey@vanille-media.de> 2004-11-27 11:48:37 +0000
commit: 9d8e32e606c021113800d864e90484fd0595832e (patch)
tree: 0f504f80d326750d49163bf1cc7e4e64135da91a
parent: 80e85c0a8664aa9e5008268ed03c6c1cd30366bb (diff)
388 files changed, 4895 insertions, 490 deletions
diff --git a/atd/atd_0.70.oe b/atd/atd_0.70.oe
index 64a8f80187..58825960b0 100644
--- a/atd/atd_0.70.oe
+++ b/atd/atd_0.70.oe
@@ -1,4 +1,4 @@
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=apps/atd;tag=ATD-0_70"
+SRC_URI = "${HANDHELDS_CVS};module=apps/atd;tag=ATD-0_70"
 S = "${WORKDIR}/atd"
 SECTION = "base"
 LICENSE = "GPLV2"
diff --git a/chkhinge/chkhinge_20040706.oe b/chkhinge/chkhinge_20040706.oe
index e310a06d96..d436090715 100644
--- a/chkhinge/chkhinge_20040706.oe
+++ b/chkhinge/chkhinge_20040706.oe
@@ -1,5 +1,5 @@
 SECTION = "base"
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=apps/chkhinge;date=${PV}"
+SRC_URI = "${HANDHELDS_CVS};module=apps/chkhinge;date=${PV}"
 LICENSE = "MIT"
 S = "${WORKDIR}/chkhinge"
 PR = "r1"
diff --git a/conf/oe.conf b/conf/oe.conf
index 1b1562b946..2ecbaf7ada 100644
--- a/conf/oe.conf
+++ b/conf/oe.conf
@@ -274,6 +274,7 @@ SOURCEFORGE_MIRROR = "http://aleron.dl.sourceforge.net/sourceforge"
 GPE_MIRROR = "http://gpe.handhelds.org/pub/projects/gpe/source"
 XLIBS_MIRROR = "http://freedesktop.org/~xlibs/release"
 GNOME_MIRROR = "http://ftp.gnome.org/pub/GNOME/sources"
+HANDHELDS_CVS = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs"
 
 # You can use the mirror of your country to get faster downloads by putting
 #  export DEBIAN_MIRROR = "ftp://ftp.de.debian.org/debian/pool"
diff --git a/esound/esound-gpe_20020817.oe b/esound/esound-gpe_20020817.oe
index 62a51cefb3..3f1bed8f9a 100644
--- a/esound/esound-gpe_20020817.oe
+++ b/esound/esound-gpe_20020817.oe
@@ -1,7 +1,7 @@
 SECTION = "x11/base"
 CVSDATE = "${PV}"
 LICENSE = "GPL"
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=gpe/base/esound \
+SRC_URI = "${HANDHELDS_CVS};module=gpe/base/esound \
 	   file://audiofile-please.patch;patch=1 \
 	   file://configure.patch;patch=1"
 S = "${WORKDIR}/esound"
diff --git a/ipkg-utils/ipkg-link_1.6cvs.oe b/ipkg-utils/ipkg-link_1.6cvs.oe
index 32671dde37..e6edd626ce 100644
--- a/ipkg-utils/ipkg-link_1.6cvs.oe
+++ b/ipkg-utils/ipkg-link_1.6cvs.oe
@@ -4,7 +4,7 @@ LICENSE = "GPL"
 CONFLICTS = "ipkg-utils"
 PV_append = "${CVSDATE}"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=ipkg-utils \
+SRC_URI = "${HANDHELDS_CVS};module=ipkg-utils \
 	   file://fix-ipkg-link.patch;patch=1 "
 	   
 SRC_URI_append_beagle = "file://fix-ipkg-link-beagle.patch;patch=1"	   
diff --git a/ipkg-utils/ipkg-utils_1.6cvs.oe b/ipkg-utils/ipkg-utils_1.6cvs.oe
index 06c565ad34..54656c772a 100644
--- a/ipkg-utils/ipkg-utils_1.6cvs.oe
+++ b/ipkg-utils/ipkg-utils_1.6cvs.oe
@@ -9,7 +9,7 @@ RDEPENDS = "python"
 PV_append = "${CVSDATE}"
 PR = "r5"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=ipkg-utils \
+SRC_URI = "${HANDHELDS_CVS};module=ipkg-utils \
 	   file://fix-ipkg-link.patch;patch=1 \
 	   file://fix-ipkg-tar.patch;patch=1 "
 SRC_URI_append_beagle = " file://fix-ipkg-link-beagle.patch;patch=1 "	   
diff --git a/ipkg/ipkg_0.99.127.oe b/ipkg/ipkg_0.99.127.oe
index 0db4463544..c97cefbbdb 100644
--- a/ipkg/ipkg_0.99.127.oe
+++ b/ipkg/ipkg_0.99.127.oe
@@ -10,7 +10,7 @@ FILES_libipkg-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so"
 FILES_libipkg = "${libdir}"
 AUTO_LIBNAME_PKGS = "libipkg"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=familiar/dist/ipkg;tag=${@'V' + oe.data.getVar('PV',d,1).replace('.', '-')} \
+SRC_URI = "${HANDHELDS_CVS};module=familiar/dist/ipkg;tag=${@'V' + oe.data.getVar('PV',d,1).replace('.', '-')} \
 	file://uninclude-replace.patch;patch=1 \
 	file://depends.patch;patch=1"
 S = "${WORKDIR}/ipkg/C"
diff --git a/ipkg/ipkg_0.99.129.oe b/ipkg/ipkg_0.99.129.oe
index 6acaa36100..cee468ffe7 100644
--- a/ipkg/ipkg_0.99.129.oe
+++ b/ipkg/ipkg_0.99.129.oe
@@ -10,7 +10,7 @@ FILES_libipkg-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so"
 FILES_libipkg = "${libdir}"
 AUTO_LIBNAME_PKGS = "libipkg"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=familiar/dist/ipkg;tag=${@'V' + oe.data.getVar('PV',d,1).replace('.', '-')} \
+SRC_URI = "${HANDHELDS_CVS};module=familiar/dist/ipkg;tag=${@'V' + oe.data.getVar('PV',d,1).replace('.', '-')} \
 	file://buffer-overflow.patch;patch=1 \
 	file://uninclude-replace.patch;patch=1"
 S = "${WORKDIR}/ipkg/C"
diff --git a/ipkg/ipkg_0.99.130.oe b/ipkg/ipkg_0.99.130.oe
index 101328c8a4..2dcc26e5db 100644
--- a/ipkg/ipkg_0.99.130.oe
+++ b/ipkg/ipkg_0.99.130.oe
@@ -10,7 +10,7 @@ FILES_libipkg-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so"
 FILES_libipkg = "${libdir}"
 AUTO_LIBNAME_PKGS = "libipkg"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=familiar/dist/ipkg;tag=${@'V' + oe.data.getVar('PV',d,1).replace('.', '-')} \
+SRC_URI = "${HANDHELDS_CVS};module=familiar/dist/ipkg;tag=${@'V' + oe.data.getVar('PV',d,1).replace('.', '-')} \
 	file://uninclude-replace.patch;patch=1 \
 	file://terse.patch;patch=1"
 S = "${WORKDIR}/ipkg/C"
diff --git a/kbdd/kbdd_20040904.oe b/kbdd/kbdd_20040904.oe
index 181d04b3bd..97bd89e797 100644
--- a/kbdd/kbdd_20040904.oe
+++ b/kbdd/kbdd_20040904.oe
@@ -1,5 +1,5 @@
 SECTION = "unknown"
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=apps/kbdd;date=${PV}"
+SRC_URI = "${HANDHELDS_CVS};module=apps/kbdd;date=${PV}"
 
 S = "${WORKDIR}/kbdd"
 
diff --git a/libmailwrapper/libmailwrapper_1.1.7.oe b/libmailwrapper/libmailwrapper_1.1.7.oe
index e69de29bb2..addf2c9405 100644
--- a/libmailwrapper/libmailwrapper_1.1.7.oe
+++ b/libmailwrapper/libmailwrapper_1.1.7.oe
@@ -0,0 +1,26 @@
+DESCRIPTION = "Qt-based class wrapper of libetpan."
+SECTION = "opie/libs"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "LGPL"
+DEPENDS = "libetpan"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/mail/libmailwrapper "
+S = "${WORKDIR}/libmailwrapper"
+
+inherit opie
+
+do_stage () {
+	install -d ${STAGING_INCDIR}/libmailwrapper/
+	install -m 0664 ${S}/maildefines.h ${STAGING_INCDIR}/libmailwrapper/
+	install -m 0664 ${S}/settings.h ${STAGING_INCDIR}/libmailwrapper/
+	install -m 0664 ${S}/statusmail.h ${STAGING_INCDIR}/libmailwrapper/
+	install -m 0664 ${S}/abstractmail.h ${STAGING_INCDIR}/libmailwrapper/
+	install -m 0664 ${S}/mailtypes.h ${STAGING_INCDIR}/libmailwrapper/
+	oe_libinstall -so libmailwrapper ${STAGING_LIBDIR}
+}
+
+do_install() {
+	oe_libinstall -so libmailwrapper ${D}/${palmtopdir}/lib
+}
diff --git a/libmailwrapper/libmailwrapper_cvs.oe b/libmailwrapper/libmailwrapper_cvs.oe
index 86e608c850..0ef5cf8952 100644
--- a/libmailwrapper/libmailwrapper_cvs.oe
+++ b/libmailwrapper/libmailwrapper_cvs.oe
@@ -6,7 +6,7 @@ LICENSE = "LGPL"
 DEPENDS = "libetpan"
 PV = "1.1.7+cvs-${CVSDATE}"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/net/mail/libmailwrapper "
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/mail/libmailwrapper "
 S = "${WORKDIR}/libmailwrapper"
 
 inherit opie
diff --git a/libopie/libopie2_1.1.7.oe b/libopie/libopie2_1.1.7.oe
index e69de29bb2..3f6dbfdb1c 100644
--- a/libopie/libopie2_1.1.7.oe
+++ b/libopie/libopie2_1.1.7.oe
@@ -0,0 +1,76 @@
+DESCRIPTION = "Base libraries for the Open Palmtop Integrated Environment"
+HOMEPAGE = "http://opie.handhelds.org"
+SECTION = "opie/libs"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "LGPL"
+I18N_FILES = "libopiecore2.ts libopiesecurity2.ts"
+DEPENDS = "libqpe-opie sqlite3 libpcap-0.7.2 virtual/kernel"
+PROVIDES = "libopiecore2 libopiedb2 libopiemm2 libopiesecurity2 libopienet2 libopiepim2 libopieui2 "
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/libopie2 \
+           file://include.pro"
+S = "${WORKDIR}/libopie2"
+
+inherit opie
+
+#FIXME: Add machine specific bits here. Best use oe_machinstall and read from a given file
+
+EXTRA_QMAKEVARS_POST = 'DEFINES+=OPIE_NEW_MALLOC \
+                        DEFINES+="OPIE_SOUND_FRAGMENT_SHIFT=16" \
+			DEFINES+=OPIE_NO_ERASE_RECT_HACKFIX \
+			LIBS+=-L${S} LIBS+="-Wl,-rpath-link,${S}"'
+
+EXTRA_QMAKEVARS_PRE = 'ENABLE_SQL_PIM_BACKEND=y'
+
+# uclibc doesn't have backtrace()
+python __anonymous () {
+    import oe, re
+    if (re.match('.*uclibc$', oe.data.getVar('TARGET_OS', d, 1)) != None):
+        oe.data.setVar("EXTRA_QMAKEVARS_POST_append", " DEFINES+=OPIE_NO_BACKTRACE ", d)
+}
+
+do_compile() {
+	install -d ${STAGING_INCDIR}/opie2
+	install -d ${STAGING_INCDIR}/opie2/private
+	for i in `find . -name "*.h"`
+	do
+		install -m 0644 $i ${STAGING_INCDIR}/opie2/`basename $i`
+	done
+	install -m 0644 opiepim/private/vobject_p.h ${STAGING_INCDIR}/opie2/private/	
+	oe_runmake MOC=${STAGING_BINDIR}/moc UIC=${STAGING_BINDIR}/uic DESTDIR=${S}
+}
+
+LIBS = "core2 ui2 db2 mm2 net2 pim2 security2"
+
+# need some special case for uic-created header files here
+do_stage() {
+        for f in ${LIBS}
+	do
+		oe_libinstall -so libopie$f ${STAGING_LIBDIR}/
+	done
+
+	install -m 0644 ${WORKDIR}/include.pro ${OPIEDIR}/
+	install -m 0644 opiepim/ui/opimrecurrencebase.h ${STAGING_INCDIR}/opie2/
+	install -m 0644 opieui/otimepickerbase.h ${STAGING_INCDIR}/opie2/
+	install -m 0644 opiepim/core/opimtemplatebase.h ${STAGING_INCDIR}/opie2/
+}
+
+do_install() {
+	install -d ${D}/${palmtopdir}/lib
+	for f in ${LIBS}
+	do
+		oe_libinstall -so libopie$f ${D}/${palmtopdir}/lib
+	done
+}
+
+PACKAGES = "libopiecore2 libopiedb2 libopiesecurity2 libopiemm2 libopienet2 libopiepim2 libopieui2"
+FILES_libopiecore2 = "${palmtopdir}/lib/libopiecore2.so*"
+FILES_libopiedb2 = "${palmtopdir}/lib/libopiedb2.so*"
+FILES_libopiemm2 = "${palmtopdir}/lib/libopiemm2.so*"
+FILES_libopienet2 = "${palmtopdir}/lib/libopienet2.so*"
+FILES_libopiepim2 = "${palmtopdir}/lib/libopiepim2.so*"
+FILES_libopieui2 = "${palmtopdir}/lib/libopieui2.so*"
+FILES_libopiesecurity2 = "${palmtopdir}/lib/libopiesecurity2.so*"
+
+#FIXME: Add individual package descriptions and dependencies
diff --git a/libopie/libopie2_cvs.oe b/libopie/libopie2_cvs.oe
index 4188539dc7..368e03800f 100644
--- a/libopie/libopie2_cvs.oe
+++ b/libopie/libopie2_cvs.oe
@@ -9,7 +9,7 @@ PR = "r4"
 PROVIDES = "libopiecore2 libopiedb2 libopiemm2 libopiesecurity2 libopienet2 libopiepim2 libopieui2"
 PV = "1.1.7+cvs-${CVSDATE}"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/libopie2 \
+SRC_URI = "${HANDHELDS_CVS};module=opie/libopie2 \
            file://include.pro"
 S = "${WORKDIR}/libopie2"
 
diff --git a/libopieobex/libopieobex0_1.1.7.oe b/libopieobex/libopieobex0_1.1.7.oe
index e69de29bb2..8842403edd 100644
--- a/libopieobex/libopieobex0_1.1.7.oe
+++ b/libopieobex/libopieobex0_1.1.7.oe
@@ -0,0 +1,23 @@
+DESCRIPTION = "IrDA obex support library"
+SECTION = "opie/libs"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "LGPL"
+DEPENDS = "opie-taskbar"
+RDEPENDS = "openobex-apps"
+APPNAME = "obex"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/obex \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
+S = "${WORKDIR}/obex"
+
+inherit opie
+
+do_install() {
+        install -d ${D}${palmtopdir}/pics/${APPNAME}/ ${D}${palmtopdir}/plugins/obex/
+        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+	oe_libinstall -so libopieobex ${D}${palmtopdir}/plugins/obex/
+}
+
+FILES_${PN} = "${palmtopdir}/plugins/obex/ ${palmtopdir}/pics/obex/"
diff --git a/libopieobex/libopieobex0_cvs.oe b/libopieobex/libopieobex0_cvs.oe
index 35c66bffbd..55d5b58050 100644
--- a/libopieobex/libopieobex0_cvs.oe
+++ b/libopieobex/libopieobex0_cvs.oe
@@ -8,8 +8,8 @@ RDEPENDS = "openobex-apps"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "obex"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/obex \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics"
+SRC_URI = "${HANDHELDS_CVS};module=opie/core/obex \
+           ${HANDHELDS_CVS};module=opie/pics"
 S = "${WORKDIR}/obex"
 
 inherit opie
diff --git a/libopietooth/libopietooth1_1.1.7.oe b/libopietooth/libopietooth1_1.1.7.oe
index e69de29bb2..a7f909c2f5 100644
--- a/libopietooth/libopietooth1_1.1.7.oe
+++ b/libopietooth/libopietooth1_1.1.7.oe
@@ -0,0 +1,24 @@
+DESCRIPTION = "Opie Bluetooth library"
+SECTION = "opie/libs"
+PRIORITY = "optional"
+DEPENDS = "libopie2"
+MAINTAINER = "Team Opie <opie@handhelds.org>
+LICENSE = "LGPL"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/opietooth/lib"
+
+inherit opie
+
+
+S = "${WORKDIR}/lib"
+
+do_stage() {
+        install -m 0644 *.h ${STAGING_INCDIR}/
+	oe_libinstall -so libopietooth1 ${STAGING_LIBDIR}/
+}
+ 
+do_install() {
+	oe_libinstall -so libopietooth1 ${D}/${palmtopdir}/lib
+}
+
diff --git a/libopietooth/libopietooth1_cvs.oe b/libopietooth/libopietooth1_cvs.oe
index db2b6d44e4..690b8d6a72 100644
--- a/libopietooth/libopietooth1_cvs.oe
+++ b/libopietooth/libopietooth1_cvs.oe
@@ -6,7 +6,7 @@ MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "LGPL"
 PR = "r1"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/net/opietooth/lib"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/opietooth/lib"
 PV = "1.1.7+cvs-${CVSDATE}"
 
 inherit opie
diff --git a/libqpe/libqpe-opie_1.1.7.oe b/libqpe/libqpe-opie_1.1.7.oe
index 7524888a4a..c183ab9964 100644
--- a/libqpe/libqpe-opie_1.1.7.oe
+++ b/libqpe/libqpe-opie_1.1.7.oe
@@ -8,7 +8,7 @@ PROVIDES = "virtual/libqpe"
 PR = "r2"
 
 TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/library \
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/library \
 	file://nomax.patch;patch=1;pnum=2"
 S = "${WORKDIR}/library"
 
diff --git a/libqpe/libqpe-opie_cvs.oe b/libqpe/libqpe-opie_cvs.oe
index 5cfa0e9fd0..2660f79cf0 100644
--- a/libqpe/libqpe-opie_cvs.oe
+++ b/libqpe/libqpe-opie_cvs.oe
@@ -7,7 +7,7 @@ DEPENDS = "uicmoc-native qte-for-opie"
 PROVIDES = "virtual/libqpe"
 PV = "1.1.7+cvs-${CVSDATE}"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/library \
+SRC_URI = "${HANDHELDS_CVS};module=opie/library \
 	file://nomax.patch;patch=1;pnum=2"
 S = "${WORKDIR}/library"
 
diff --git a/libqtaux/libqtaux2_1.1.7.oe b/libqtaux/libqtaux2_1.1.7.oe
index e69de29bb2..466ec36441 100644
--- a/libqtaux/libqtaux2_1.1.7.oe
+++ b/libqtaux/libqtaux2_1.1.7.oe
@@ -0,0 +1,34 @@
+DESCRIPTION = "Qt/Embedded 2 Auxilliary libraries"
+HOMEPAGE = "http://opie.handhelds.org"
+SECTION = "opie/libs"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/libqtaux"
+S = "${WORKDIR}/libqtaux"
+
+inherit qmake
+
+EXTRA_QMAKEVARS_POST = 'DEFINES+=QWS'
+
+do_compile() {
+	install -d ${STAGING_INCDIR}/opie2
+	for i in `find . -name "*.h"`
+	do
+		install -m 0644 $i ${STAGING_INCDIR}/opie2/`basename $i`
+	done
+	oe_runmake MOC=${STAGING_BINDIR}/moc UIC=${STAGING_BINDIR}/uic DESTDIR=${S}
+}
+
+# no staging neessary, becaue
+# include files already done during do_compile
+# lib files already done during do_compile
+
+do_install() {
+	oe_libinstall -so -C ${STAGING_LIBDIR} libqtaux2 ${D}/${palmtopdir}/lib
+}
+
+FILES_${PN}=${palmtopdir}/lib
+
diff --git a/libqtaux/libqtaux2_cvs.oe b/libqtaux/libqtaux2_cvs.oe
index 2d679c6653..8a640f1022 100644
--- a/libqtaux/libqtaux2_cvs.oe
+++ b/libqtaux/libqtaux2_cvs.oe
@@ -6,7 +6,7 @@ MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/libqtaux"
+SRC_URI = "${HANDHELDS_CVS};module=opie/libqtaux"
 S = "${WORKDIR}/libqtaux"
 
 inherit qmake
diff --git a/linux/handhelds-pxa-2.6_cvs.oe b/linux/handhelds-pxa-2.6_cvs.oe
index 4e9a0f5abf..9713256abf 100644
--- a/linux/handhelds-pxa-2.6_cvs.oe
+++ b/linux/handhelds-pxa-2.6_cvs.oe
@@ -10,7 +10,7 @@ COMPATIBLE_HOST = "arm.*-linux"
 
 FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/handhelds-pxa-${PV}"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=linux/kernel26  \
+SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26  \
            file://defconfig"
 
 S = "${WORKDIR}/kernel26"
diff --git a/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh36.12.oe b/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh36.12.oe
index 905ba4a49e..785be3b0b8 100644
--- a/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh36.12.oe
+++ b/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh36.12.oe
@@ -8,7 +8,7 @@ PACKAGE_ARCH = "ipaqpxa"
 KERNEL_CCSUFFIX = "-3.3.3"
 COMPATIBLE_HOST = "arm.*-linux"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=linux/kernel;tag=${@'K' + oe.data.getVar('PV',d,1).replace('.', '-')} \
+SRC_URI = "${HANDHELDS_CVS};module=linux/kernel;tag=${@'K' + oe.data.getVar('PV',d,1).replace('.', '-')} \
 	   file://defconfig-ipaqpxa \
 	   file://ipaq-hal.init \
 	   file://linux-2.4-no-short-loads.patch;patch=1 \
diff --git a/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh36.13.oe b/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh36.13.oe
index 50c4d88cb0..6321499630 100644
--- a/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh36.13.oe
+++ b/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh36.13.oe
@@ -8,7 +8,7 @@ PACKAGE_ARCH = "ipaqpxa"
 KERNEL_CCSUFFIX = "-3.3.3"
 COMPATIBLE_HOST = "arm.*-linux"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=linux/kernel;tag=${@'K' + oe.data.getVar('PV',d,1).replace('.', '-')} \
+SRC_URI = "${HANDHELDS_CVS};module=linux/kernel;tag=${@'K' + oe.data.getVar('PV',d,1).replace('.', '-')} \
 	   file://defconfig-ipaqpxa \
 	   file://ipaq-hal.init \
 	   file://linux-2.4-no-short-loads.patch;patch=1 \
diff --git a/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh36.14.oe b/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh36.14.oe
index 58755e4452..f67ab8ddf8 100644
--- a/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh36.14.oe
+++ b/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh36.14.oe
@@ -8,7 +8,7 @@ PACKAGE_ARCH = "ipaqpxa"
 KERNEL_CCSUFFIX = "-3.3.3"
 COMPATIBLE_HOST = "arm.*-linux"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=linux/kernel;tag=${@'K' + oe.data.getVar('PV',d,1).replace('.', '-')} \
+SRC_URI = "${HANDHELDS_CVS};module=linux/kernel;tag=${@'K' + oe.data.getVar('PV',d,1).replace('.', '-')} \
 	   file://defconfig-ipaqpxa \
 	   file://ipaq-hal.init \
 	   file://linux-2.4-no-short-loads.patch;patch=1 \
diff --git a/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.1.oe b/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.1.oe
index 6f2ab3f42b..427dd142f0 100644
--- a/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.1.oe
+++ b/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.1.oe
@@ -8,7 +8,7 @@ PACKAGE_ARCH = "ipaqpxa"
 KERNEL_CCSUFFIX = "-3.3.3"
 COMPATIBLE_HOST = "arm.*-linux"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=linux/kernel;tag=${@'K' + oe.data.getVar('PV',d,1).replace('.', '-')} \
+SRC_URI = "${HANDHELDS_CVS};module=linux/kernel;tag=${@'K' + oe.data.getVar('PV',d,1).replace('.', '-')} \
 	   file://defconfig-ipaqpxa \
 	   file://ipaq-hal.init \
 	   file://linux-2.4-no-short-loads.patch;patch=1 \
diff --git a/linux/handhelds-sa-2.6_cvs.oe b/linux/handhelds-sa-2.6_cvs.oe
index f0f13a8a96..6b2b5adbff 100644
--- a/linux/handhelds-sa-2.6_cvs.oe
+++ b/linux/handhelds-sa-2.6_cvs.oe
@@ -10,7 +10,7 @@ COMPATIBLE_HOST = "arm.*-linux"
 
 FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/handhelds-sa-${PV}"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=linux/kernel26  \
+SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26  \
            file://defconfig-${MACHINE}"
 
 S = "${WORKDIR}/kernel26"
diff --git a/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh36.12.oe b/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh36.12.oe
index 429211f75d..2c457ae07e 100644
--- a/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh36.12.oe
+++ b/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh36.12.oe
@@ -9,7 +9,7 @@ KERNEL_CCSUFFIX = "-3.3.3"
 COMPATIBLE_HOST = "arm.*-linux"
 
 FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/handhelds-sa-${PV}"
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=linux/kernel;tag=${@'K' + oe.data.getVar('PV',d,1).replace('.', '-')} \
+SRC_URI = "${HANDHELDS_CVS};module=linux/kernel;tag=${@'K' + oe.data.getVar('PV',d,1).replace('.', '-')} \
            file://defconfig-ipaqsa \
 	   file://ipaq-hal.init \
 	   file://ipsec.patch;patch=1"
diff --git a/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.1.oe b/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.1.oe
index e69de29bb2..b5bf57692d 100644
--- a/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.1.oe
+++ b/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.1.oe
@@ -0,0 +1,57 @@
+SECTION = "kernel"
+DESCRIPTION = "handhelds.org Linux kernel for StrongArm processor based devices."
+MAINTAINER = "Rene Wagner <reenoo@gmx.de>"
+LICENSE = "GPL"
+PR = "r0"
+
+PACKAGE_ARCH = "ipaqsa"
+KERNEL_CCSUFFIX = "-3.3.3"
+COMPATIBLE_HOST = "arm.*-linux"
+
+FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/handhelds-sa-${PV}"
+SRC_URI = "${HANDHELDS_CVS};module=linux/kernel;tag=${@'K' + oe.data.getVar('PV',d,1).replace('.', '-')} \
+           file://defconfig-ipaqsa \
+	   file://ipaq-hal.init"
+
+S = "${WORKDIR}/kernel"
+
+inherit kernel update-rc.d
+
+K_MAJOR = "${@oe.data.getVar('PV',d,1).split('-')[0].split('.')[0]}"
+K_MINOR = "${@oe.data.getVar('PV',d,1).split('-')[0].split('.')[1]}"
+K_MICRO = "${@oe.data.getVar('PV',d,1).split('-')[0].split('.')[2]}"
+RMKV    = "${@oe.data.getVar('PV',d,1).split('-')[1].split('rmk')[-1]}"
+PXAV    = "${@oe.data.getVar('PV',d,1).split('-')[2].split('pxa')[-1]}"
+HHV     = "${@oe.data.getVar('PV',d,1).split('-')[3].split('hh')[-1]}"
+
+KERNEL_PRIORITY = "${@'%d' % (int(oe.data.getVar('K_MAJOR',d,1)) * 100000000 + int(oe.data.getVar('K_MINOR',d,1)) * 1000000 + int(oe.data.getVar('K_MICRO',d,1)) * 10000 + int(oe.data.getVar('RMKV',d,1)) * 1000 + int(oe.data.getVar('PXAV',d,1)) * 100 + float(oe.data.getVar('HHV',d,1)))}"
+
+module_conf_h3600_micro = "alias ipaq_hal_3600 h3600_micro"
+module_conf_h3600_asic = "alias ipaq_hal_3800 h3600_asic"
+module_conf_sa1100_ir = "alias irda0 sa1100_ir"
+module_conf_pcmcia_core = "options pcmcia_core ignore_cis_vcc=1"
+module_conf_ppp_async = "alias ppp0 ppp_async"
+module_conf_orinoco_cs = "options orinoco_cs ignore_cis_vcc=1"
+module_conf_hostap_cs = "options hostap_cs ignore_cis_vcc=1"
+module_conf_spectrum_cs = "options spectrum_cs ignore_cis_vcc=1"
+
+module_autoload_h3600_generic_sleeve = "h3600_generic_sleeve"
+module_autoload_h3600_ts = "h3600_ts"
+module_autoload_apm = "apm"
+module_autoload_h3600-uda1341 = "h3600-uda1341"
+module_autoload_af_packet = "af_packet"
+module_autoload_ppp_async = "ppp_async"
+module_autoload_usb-eth = "usb-eth"
+
+FILES_kernel += "/etc/init.d/ipaq-hal"
+INITSCRIPT_NAME = "ipaq-hal"
+INITSCRIPT_PARAMS = "start 21 S ."
+
+do_configure_prepend() {
+	install -m 0644 ${WORKDIR}/defconfig-${PACKAGE_ARCH} ${S}/.config
+}
+
+do_install_append() {
+        install -d ${D}/etc/init.d
+        install ${WORKDIR}/ipaq-hal.init ${D}/etc/init.d/ipaq-hal
+}
diff --git a/manufacturers/manufacturers_20031209.oe b/manufacturers/manufacturers_20031209.oe
index e69de29bb2..800447456d 100644
--- a/manufacturers/manufacturers_20031209.oe
+++ b/manufacturers/manufacturers_20031209.oe
@@ -0,0 +1,12 @@
+SECTION = "base"
+DESCRIPTION = "Ethernet manufacturer database"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@vanille.de>"
+CVSDATE = "${PV}"
+
+SRC_URI = "${HANDHELDS_CVS};module=opie/etc"
+S = "${WORKDIR}/etc"
+
+do_install() {
+	install -d ${D}/${sysconfdir}
+	install -m 0644 manufacturers ${D}/${sysconfdir}/
+}
diff --git a/opie-aboutapplet/opie-aboutapplet_1.1.7.oe b/opie-aboutapplet/opie-aboutapplet_1.1.7.oe
index e69de29bb2..36c857df76 100644
--- a/opie-aboutapplet/opie-aboutapplet_1.1.7.oe
+++ b/opie-aboutapplet/opie-aboutapplet_1.1.7.oe
@@ -0,0 +1,13 @@
+DESCRIPTION = "About Opie"
+SECTION = "opie/applets"
+PRIORITY = "optional"
+MAINTAINER = "Rajko Albrecht <alwin@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "aboutapplet"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/aboutapplet"
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
diff --git a/opie-aboutapplet/opie-aboutapplet_cvs.oe b/opie-aboutapplet/opie-aboutapplet_cvs.oe
index 5bb1ad4574..44cb02a23a 100644
--- a/opie-aboutapplet/opie-aboutapplet_cvs.oe
+++ b/opie-aboutapplet/opie-aboutapplet_cvs.oe
@@ -6,7 +6,7 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "aboutapplet"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/applets/aboutapplet"
+SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/aboutapplet"
 S = "${WORKDIR}/${APPNAME}"
 
 inherit opie
diff --git a/opie-addressbook/opie-addressbook_1.1.7.oe b/opie-addressbook/opie-addressbook_1.1.7.oe
index e69de29bb2..025a27048a 100644
--- a/opie-addressbook/opie-addressbook_1.1.7.oe
+++ b/opie-addressbook/opie-addressbook_1.1.7.oe
@@ -0,0 +1,18 @@
+DESCRIPTION = "Contacts"
+SECTION = "opie/pim"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+RDEPENDS = "opie-pics"
+
+APPNAME = "addressbook"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/addressbook \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/addressbook"
+
+inherit opie
+
+# FILES plugins/application/libaddressbook.so* bin/addressbook apps/1Pim/addressbook.desktop
diff --git a/opie-addressbook/opie-addressbook_cvs.oe b/opie-addressbook/opie-addressbook_cvs.oe
index 2bdbd6adbf..e2977c47eb 100644
--- a/opie-addressbook/opie-addressbook_cvs.oe
+++ b/opie-addressbook/opie-addressbook_cvs.oe
@@ -7,8 +7,8 @@ RDEPENDS = "opie-pics"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "addressbook"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/pim/addressbook \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/addressbook \
+           ${HANDHELDS_CVS};module=opie/apps"
 
 S = "${WORKDIR}/addressbook"
 
diff --git a/opie-advancedfm/opie-advancedfm_1.1.7.oe b/opie-advancedfm/opie-advancedfm_1.1.7.oe
index e69de29bb2..bdc2554f2f 100644
--- a/opie-advancedfm/opie-advancedfm_1.1.7.oe
+++ b/opie-advancedfm/opie-advancedfm_1.1.7.oe
@@ -0,0 +1,24 @@
+DESCRIPTION = "Opie Advanced Filemanager"
+SECTION = "opie/applications"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+APPNAME = "advancedfm"
+RDEPENDS = "opie-advancedfm-pics"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/${APPNAME} \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+do_install() {
+    install -d ${D}/${palmtopdir}/pics/${APPNAME}/
+    install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}/${palmtopdir}/pics/${APPNAME}/
+}
+
+PACKAGES_prepend = "opie-advancedfm-pics "
+FILES_opie-advancedfm-pics = "${palmtopdir}/pics/${APPNAME}/*.png"
+
diff --git a/opie-advancedfm/opie-advancedfm_cvs.oe b/opie-advancedfm/opie-advancedfm_cvs.oe
index 4dfce967a1..f572785426 100644
--- a/opie-advancedfm/opie-advancedfm_cvs.oe
+++ b/opie-advancedfm/opie-advancedfm_cvs.oe
@@ -7,9 +7,9 @@ PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "advancedfm"
 RDEPENDS = "opie-advancedfm-pics"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/apps/${APPNAME} \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/${APPNAME} \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/apps"
 S = "${WORKDIR}/${APPNAME}"
 
 inherit opie
diff --git a/opie-alarm/opie-alarm_1.1.7.oe b/opie-alarm/opie-alarm_1.1.7.oe
index e69de29bb2..028be0d068 100644
--- a/opie-alarm/opie-alarm_1.1.7.oe
+++ b/opie-alarm/opie-alarm_1.1.7.oe
@@ -0,0 +1,22 @@
+DESCRIPTION = "Opie Alarm"
+SECTION = "opie/base"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+RDEPENDS = "apmd"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/opiealarm \
+           file://01opiealarm "
+S = "${WORKDIR}/opiealarm"
+
+inherit opie
+
+do_install() {
+	install -d ${D}/${palmtopdir}/bin/ ${D}/${sysconfdir}/apm/event.d/
+	install -m 0755 ${S}/opiealarm ${D}/${palmtopdir}/bin/
+	install -m 0755 ${WORKDIR}/01opiealarm ${D}/${sysconfdir}/apm/event.d/
+}
+
+FILES_${PN} = "${palmtopdir}/bin/opiealarm ${sysconfdir}/apm/event.d/01opiealarm"
diff --git a/opie-alarm/opie-alarm_cvs.oe b/opie-alarm/opie-alarm_cvs.oe
index 768711321d..11d648945e 100644
--- a/opie-alarm/opie-alarm_cvs.oe
+++ b/opie-alarm/opie-alarm_cvs.oe
@@ -6,7 +6,7 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 RDEPENDS = "apmd"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/opiealarm \
+SRC_URI = "${HANDHELDS_CVS};module=opie/core/opiealarm \
            file://01opiealarm "
 S = "${WORKDIR}/opiealarm"
 
diff --git a/opie-appearance/opie-appearance_1.1.7.oe b/opie-appearance/opie-appearance_1.1.7.oe
index e69de29bb2..4d4f42bbf5 100644
--- a/opie-appearance/opie-appearance_1.1.7.oe
+++ b/opie-appearance/opie-appearance_1.1.7.oe
@@ -0,0 +1,24 @@
+DESCRIPTION = "Appearance settings dialog for the Opie environment."
+SECTION = "opie/settings"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+DEPENDS = "libqtaux2  "
+
+APPNAME = "appearance"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/appearance2 \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/appearance2"
+
+inherit opie
+
+# FILES plugins/application/libappearance.so* bin/appearance apps/Settings/Appearance.desktop pics/appearance
+do_install() {
+        install -d ${D}${palmtopdir}/pics/${APPNAME}/
+        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+}
+
diff --git a/opie-appearance/opie-appearance_cvs.oe b/opie-appearance/opie-appearance_cvs.oe
index 2ad997d187..13c8e09d7f 100644
--- a/opie-appearance/opie-appearance_cvs.oe
+++ b/opie-appearance/opie-appearance_cvs.oe
@@ -7,9 +7,9 @@ DEPENDS = "libqtaux2"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "appearance"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/settings/appearance2 \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/appearance2 \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/apps"
 
 S = "${WORKDIR}/appearance2"
 
diff --git a/opie-aqpkg/opie-aqpkg_1.1.7.oe b/opie-aqpkg/opie-aqpkg_1.1.7.oe
index e69de29bb2..c6a4e7b9ad 100644
--- a/opie-aqpkg/opie-aqpkg_1.1.7.oe
+++ b/opie-aqpkg/opie-aqpkg_1.1.7.oe
@@ -0,0 +1,23 @@
+DESCRIPTION = "A Package Manager"
+SECTION = "opie/settings"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "aqpkg"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/aqpkg \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+# FILES plugins/application/libaqpkg.so* bin/aqpkg pics/aqpkg apps/Settings/aqpkg.desktop
+do_install() {
+        install -d ${D}${palmtopdir}/pics/${APPNAME}/
+        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+}
+
diff --git a/opie-aqpkg/opie-aqpkg_cvs.oe b/opie-aqpkg/opie-aqpkg_cvs.oe
index cf0314cb79..d7276a315d 100644
--- a/opie-aqpkg/opie-aqpkg_cvs.oe
+++ b/opie-aqpkg/opie-aqpkg_cvs.oe
@@ -6,9 +6,9 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "aqpkg"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/settings/aqpkg \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/aqpkg \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/apps"
 
 S = "${WORKDIR}/${APPNAME}"
 
diff --git a/opie-autorotateapplet/opie-autorotateapplet_1.1.7.oe b/opie-autorotateapplet/opie-autorotateapplet_1.1.7.oe
index e69de29bb2..c4439c031e 100644
--- a/opie-autorotateapplet/opie-autorotateapplet_1.1.7.oe
+++ b/opie-autorotateapplet/opie-autorotateapplet_1.1.7.oe
@@ -0,0 +1,37 @@
+DESCRIPTION = "Applet to disable the automatic screen rotation on Zaurus C-models"
+SECTION = "opie/applets"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "autorotateapplet"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/autorotateapplet \
+	   ${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
+
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+pkg_postinst() {
+#!/bin/sh
+if [ -n "$D" ]; then exit 1; fi
+if pidof -s qpe >/dev/null; then
+  /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+else
+  exit 0
+fi
+}
+
+pkg_postrm() {
+#!/bin/sh
+if [ -n "$D" ]; then exit 1; fi
+/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+}
+
+# FILES plugins/applets/libautorotateapplet.so* pics/autorotate/*.png
+do_install() {
+	install -d ${D}${palmtopdir}/pics/autorotate/
+	install -m 0655 ${WORKDIR}/pics/autorotate/*.png ${D}${palmtopdir}/pics/autorotate/
+}
diff --git a/opie-autorotateapplet/opie-autorotateapplet_cvs.oe b/opie-autorotateapplet/opie-autorotateapplet_cvs.oe
index 241f67e829..32a901917e 100644
--- a/opie-autorotateapplet/opie-autorotateapplet_cvs.oe
+++ b/opie-autorotateapplet/opie-autorotateapplet_cvs.oe
@@ -6,8 +6,8 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "autorotateapplet"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/applets/autorotateapplet \
-	   cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/autorotateapplet \
+	   ${HANDHELDS_CVS};module=opie/pics"
 
 S = "${WORKDIR}/${APPNAME}"
 
diff --git a/opie-backgammon/opie-backgammon_1.1.7.oe b/opie-backgammon/opie-backgammon_1.1.7.oe
index e69de29bb2..f1716e08a0 100644
--- a/opie-backgammon/opie-backgammon_1.1.7.oe
+++ b/opie-backgammon/opie-backgammon_1.1.7.oe
@@ -0,0 +1,23 @@
+DESCRIPTION = "Backgammon Game"
+SECTION = "opie/games"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "backgammon"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/backgammon \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+# FILES plugins/application/libbackgammon.so* bin/backgammon apps/Games/backgammon.desktop pics/backgammon help/en/html/backgammon.html
+do_install() {
+        install -d ${D}${palmtopdir}/pics/${APPNAME}/
+        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+}
+
diff --git a/opie-backgammon/opie-backgammon_cvs.oe b/opie-backgammon/opie-backgammon_cvs.oe
index 18cb141cde..8020096618 100644
--- a/opie-backgammon/opie-backgammon_cvs.oe
+++ b/opie-backgammon/opie-backgammon_cvs.oe
@@ -6,9 +6,9 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "backgammon"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/games/backgammon \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/backgammon \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/apps"
 
 S = "${WORKDIR}/${APPNAME}"
 
diff --git a/opie-backup/opie-backup_1.1.7.oe b/opie-backup/opie-backup_1.1.7.oe
index e69de29bb2..d413a9ede7 100644
--- a/opie-backup/opie-backup_1.1.7.oe
+++ b/opie-backup/opie-backup_1.1.7.oe
@@ -0,0 +1,23 @@
+DESCRIPTION = "Backup and Restore utility."
+SECTION = "opie/settings"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "backup"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/backup \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+# FILES plugins/application/libbackup.so* bin/backup pics/backup apps/Settings/backup.desktop
+do_install() {
+        install -d ${D}${palmtopdir}/pics/${APPNAME}/
+        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+}
+
diff --git a/opie-backup/opie-backup_cvs.oe b/opie-backup/opie-backup_cvs.oe
index 7512fe79e2..3ea8bf161a 100644
--- a/opie-backup/opie-backup_cvs.oe
+++ b/opie-backup/opie-backup_cvs.oe
@@ -6,9 +6,9 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "backup"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/settings/backup \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/backup \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/apps"
 
 S = "${WORKDIR}/${APPNAME}"
 
diff --git a/opie-bartender/opie-bartender_1.1.7.oe b/opie-bartender/opie-bartender_1.1.7.oe
index e69de29bb2..3a14d16b87 100644
--- a/opie-bartender/opie-bartender_1.1.7.oe
+++ b/opie-bartender/opie-bartender_1.1.7.oe
@@ -0,0 +1,24 @@
+DESCRIPTION = "Bartender drink receipe database"
+SECTION = "opie/applications"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "bartender"
+APPTYPE = "binary"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/opie-bartender \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/opie-bartender"
+
+inherit opie
+
+do_install() {
+        install -d ${D}${palmtopdir}/pics/${APPNAME}/
+        install -d ${D}${palmtopdir}/etc/${APPNAME}/
+	install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+	install -m 0644 db/drinkdb.txt  ${D}${palmtopdir}/etc/${APPNAME}/
+}
diff --git a/opie-bartender/opie-bartender_cvs.oe b/opie-bartender/opie-bartender_cvs.oe
index 4e188b4434..0a0bab0838 100644
--- a/opie-bartender/opie-bartender_cvs.oe
+++ b/opie-bartender/opie-bartender_cvs.oe
@@ -6,9 +6,9 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "bartender"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/apps/opie-bartender \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/opie-bartender \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/apps"
 
 S = "${WORKDIR}/opie-bartender"
 
diff --git a/opie-batteryapplet/opie-batteryapplet_1.1.7.oe b/opie-batteryapplet/opie-batteryapplet_1.1.7.oe
index e69de29bb2..9c5bd06254 100644
--- a/opie-batteryapplet/opie-batteryapplet_1.1.7.oe
+++ b/opie-batteryapplet/opie-batteryapplet_1.1.7.oe
@@ -0,0 +1,37 @@
+DESCRIPTION = "Battery Monitor applet"
+SECTION = "opie/applets"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "batteryapplet"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/batteryapplet \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+pkg_postinst() {
+#!/bin/sh
+if pidof -s qpe >/dev/null; then
+  /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+else
+  exit 0
+fi
+ if [ -n "$D" ]; then false; fi
+}
+
+pkg_postrm() {
+#!/bin/sh
+/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+ if [ -n "$D" ]; then false; fi
+}
+
+# FILES plugins/applets/libbatteryapplet.so*
+do_install() {
+}
+
diff --git a/opie-batteryapplet/opie-batteryapplet_cvs.oe b/opie-batteryapplet/opie-batteryapplet_cvs.oe
index 09d7750114..5ea2c14ab4 100644
--- a/opie-batteryapplet/opie-batteryapplet_cvs.oe
+++ b/opie-batteryapplet/opie-batteryapplet_cvs.oe
@@ -6,9 +6,9 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "batteryapplet"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/applets/batteryapplet \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/batteryapplet \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/apps"
 
 S = "${WORKDIR}/${APPNAME}"
 
diff --git a/opie-bluepin/opie-bluepin_1.1.7.oe b/opie-bluepin/opie-bluepin_1.1.7.oe
index e69de29bb2..1d374006e0 100644
--- a/opie-bluepin/opie-bluepin_1.1.7.oe
+++ b/opie-bluepin/opie-bluepin_1.1.7.oe
@@ -0,0 +1,14 @@
+DESCRIPTION = "Opie BluePin"
+SECTION = "opie/applications"
+PRIORITY = "optional"
+DEPENDS = "libopietooth1"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "bluepin"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/opietooth/blue-pin"
+S = "${WORKDIR}/blue-pin"
+
+inherit opie
diff --git a/opie-bluepin/opie-bluepin_cvs.oe b/opie-bluepin/opie-bluepin_cvs.oe
index 24a3d01cac..c1b08ddfd8 100644
--- a/opie-bluepin/opie-bluepin_cvs.oe
+++ b/opie-bluepin/opie-bluepin_cvs.oe
@@ -7,7 +7,7 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "bluepin"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/net/opietooth/blue-pin"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/opietooth/blue-pin"
 S = "${WORKDIR}/blue-pin"
 
 inherit opie
diff --git a/opie-bluetoothapplet/opie-bluetoothapplet_1.1.7.oe b/opie-bluetoothapplet/opie-bluetoothapplet_1.1.7.oe
index e69de29bb2..92ce696f62 100644
--- a/opie-bluetoothapplet/opie-bluetoothapplet_1.1.7.oe
+++ b/opie-bluetoothapplet/opie-bluetoothapplet_1.1.7.oe
@@ -0,0 +1,21 @@
+DESCRIPTION = "Opie Bluetooth Applet"
+SECTION = "opie/applets"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+DEPENDS = "libopietooth1"
+
+APPNAME = "bluetoothapplet"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/opietooth/applet \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics/bluetoothapplet"
+S = "${WORKDIR}/applet"
+
+inherit opie
+
+do_install() {
+	install -d ${D}${palmtopdir}/pics/bluetoothapplet
+	install -m 0644 ${WORKDIR}/bluetoothapplet/*.png ${D}${palmtopdir}/pics/bluetoothapplet
+}
+
diff --git a/opie-bluetoothapplet/opie-bluetoothapplet_cvs.oe b/opie-bluetoothapplet/opie-bluetoothapplet_cvs.oe
index 8f6396ce13..5773601350 100644
--- a/opie-bluetoothapplet/opie-bluetoothapplet_cvs.oe
+++ b/opie-bluetoothapplet/opie-bluetoothapplet_cvs.oe
@@ -7,8 +7,8 @@ DEPENDS = "libopietooth1"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "bluetoothapplet"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/net/opietooth/applet \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics/bluetoothapplet"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/opietooth/applet \
+           ${HANDHELDS_CVS};module=opie/pics/bluetoothapplet"
 S = "${WORKDIR}/applet"
 
 inherit opie
diff --git a/opie-bluetoothmanager/opie-bluetoothmanager_1.1.7.oe b/opie-bluetoothmanager/opie-bluetoothmanager_1.1.7.oe
index e69de29bb2..db8c42b7e1 100644
--- a/opie-bluetoothmanager/opie-bluetoothmanager_1.1.7.oe
+++ b/opie-bluetoothmanager/opie-bluetoothmanager_1.1.7.oe
@@ -0,0 +1,23 @@
+DESCRIPTION = "Bluetooth manager for Opie"
+SECTION = "opie/settings"
+PRIORITY = "optional"
+DEPENDS = "libopietooth1"
+RDEPENDS = "opie-bluepin"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "bluetooth-manager"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/opietooth/manager \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
+S = "${WORKDIR}/manager"
+
+inherit opie
+
+# Files: plugins/application/libbluetooth-manager.so* bin/bluetooth-manager apps/Settings/bluetooth-manager.desktop pics/opietooth/*
+do_install() {
+        install -d ${D}${palmtopdir}/pics/opietooth/
+        install -m 0644 ${WORKDIR}/pics/opietooth/*.png ${D}${palmtopdir}/pics/opietooth/
+}
diff --git a/opie-bluetoothmanager/opie-bluetoothmanager_cvs.oe b/opie-bluetoothmanager/opie-bluetoothmanager_cvs.oe
index 30eb5c4261..02185cfecf 100644
--- a/opie-bluetoothmanager/opie-bluetoothmanager_cvs.oe
+++ b/opie-bluetoothmanager/opie-bluetoothmanager_cvs.oe
@@ -8,9 +8,9 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "bluetooth-manager"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/net/opietooth/manager \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/opietooth/manager \
+           ${HANDHELDS_CVS};module=opie/apps \
+           ${HANDHELDS_CVS};module=opie/pics"
 S = "${WORKDIR}/manager"
 
 inherit opie
diff --git a/opie-bounce/opie-bounce_1.1.7.oe b/opie-bounce/opie-bounce_1.1.7.oe
index e69de29bb2..6362ec19e6 100644
--- a/opie-bounce/opie-bounce_1.1.7.oe
+++ b/opie-bounce/opie-bounce_1.1.7.oe
@@ -0,0 +1,23 @@
+DESCRIPTION = "bounce"
+SECTION = "opie/games"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "bounce"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/bounce \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+# FILES plugins/application/libbounce.so* bin/bounce apps/Games/bounce.desktop pics/bounce/*.png
+do_install() {
+        install -d ${D}${palmtopdir}/pics/${APPNAME}/
+        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+}
+
diff --git a/opie-bounce/opie-bounce_cvs.oe b/opie-bounce/opie-bounce_cvs.oe
index 91788df1d4..886a4dfe22 100644
--- a/opie-bounce/opie-bounce_cvs.oe
+++ b/opie-bounce/opie-bounce_cvs.oe
@@ -6,9 +6,9 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "bounce"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/games/bounce \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/bounce \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/apps"
 
 S = "${WORKDIR}/${APPNAME}"
 
diff --git a/opie-brightnessapplet/opie-brightnessapplet_1.1.7.oe b/opie-brightnessapplet/opie-brightnessapplet_1.1.7.oe
index 432d1bd9dd..fdb4cf2886 100644
--- a/opie-brightnessapplet/opie-brightnessapplet_1.1.7.oe
+++ b/opie-brightnessapplet/opie-brightnessapplet_1.1.7.oe
@@ -8,8 +8,8 @@ APPNAME = "brightnessapplet"
 
 
 TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/noncore/applets/brightnessapplet \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/pics"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/brightnessapplet \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
 S = "${WORKDIR}/${APPNAME}"
 
 inherit opie
diff --git a/opie-brightnessapplet/opie-brightnessapplet_cvs.oe b/opie-brightnessapplet/opie-brightnessapplet_cvs.oe
index a5c7d5b0ab..399b97d794 100644
--- a/opie-brightnessapplet/opie-brightnessapplet_cvs.oe
+++ b/opie-brightnessapplet/opie-brightnessapplet_cvs.oe
@@ -9,8 +9,8 @@ CVSDATE = "20041001"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "brightnessapplet"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/applets/brightnessapplet \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/brightnessapplet \
+           ${HANDHELDS_CVS};module=opie/pics"
 S = "${WORKDIR}/${APPNAME}"
 
 inherit opie
diff --git a/opie-button-settings/opie-button-settings_1.1.7.oe b/opie-button-settings/opie-button-settings_1.1.7.oe
index e69de29bb2..f2313f7f39 100644
--- a/opie-button-settings/opie-button-settings_1.1.7.oe
+++ b/opie-button-settings/opie-button-settings_1.1.7.oe
@@ -0,0 +1,32 @@
+DESCRIPTION = "Device-buttons settings dialog"
+SECTION = "opie/settings"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+RDEPENDS = "opie-button-settings-pics"
+
+APPNAME = "buttonsettings"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/settings/button \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/button"
+
+inherit opie
+
+# FILES plugins/application/libbuttonsettings.so* bin/buttonsettings apps/Settings/Button.desktop pics/buttonsettings/*.png
+do_install() {
+        install -d ${D}${palmtopdir}/pics/${APPNAME}/
+	install -d ${D}${palmtopdir}/pics/devicebuttons/
+        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+	install -m 0644 ${WORKDIR}/pics/devicebuttons/*.png ${D}${palmtopdir}/pics/devicebuttons/
+}
+
+PACKAGES_prepend = "opie-button-settings-pics "
+FILES_opie-button-settings-pics = "${palmtopdir}/pics/devicebuttons/z*" 
+FILES_opie-button-settings-pics_h3600 = "${palmtopdir}/pics/devicebuttons/ipaq*"
+FILES_opie-button-settings-pics_h3900 = "${palmtopdir}/pics/devicebuttons/ipaq*"
+FILES_opie-button-settings-pics_simpad = "${palmtopdir}/pics/devicebuttons/simpad*"
+PACKAGE_ARCH_opie-button-settings-pics = "${MACHINE_ARCH}"
diff --git a/opie-button-settings/opie-button-settings_cvs.oe b/opie-button-settings/opie-button-settings_cvs.oe
index fbdc0ce24f..8e1ef8b79d 100644
--- a/opie-button-settings/opie-button-settings_cvs.oe
+++ b/opie-button-settings/opie-button-settings_cvs.oe
@@ -7,9 +7,9 @@ RDEPENDS = "opie-button-settings-pics"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "buttonsettings"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/settings/button \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/core/settings/button \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/apps"
 
 S = "${WORKDIR}/button"
 
diff --git a/opie-buzzword/opie-buzzword_1.1.7.oe b/opie-buzzword/opie-buzzword_1.1.7.oe
index e69de29bb2..20bfc20c0a 100644
--- a/opie-buzzword/opie-buzzword_1.1.7.oe
+++ b/opie-buzzword/opie-buzzword_1.1.7.oe
@@ -0,0 +1,26 @@
+DESCRIPTION = "BuzzWord Bingo"
+SECTION = "opie/games"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "buzzword"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/buzzword \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/share \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+# FILES plugins/application/libbuzzword.so* bin/buzzword apps/Games/buzzword.desktop pics/buzzword/buzzword.png share/buzzword/buzzwords
+do_install() {
+        install -d ${D}${palmtopdir}/pics/${APPNAME}/
+        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+        install -d ${D}${palmtopdir}/share/${APPNAME}/
+        install -m 0644 ${WORKDIR}/share/${APPNAME}/buzzwords ${D}${palmtopdir}/share/${APPNAME}/
+}
+
diff --git a/opie-buzzword/opie-buzzword_cvs.oe b/opie-buzzword/opie-buzzword_cvs.oe
index d36aa7d529..59ac85567f 100644
--- a/opie-buzzword/opie-buzzword_cvs.oe
+++ b/opie-buzzword/opie-buzzword_cvs.oe
@@ -6,10 +6,10 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "buzzword"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/games/buzzword \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/share \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/buzzword \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/share \
+           ${HANDHELDS_CVS};module=opie/apps"
 
 S = "${WORKDIR}/${APPNAME}"
 
diff --git a/opie-calculator/opie-calculator_1.1.7.oe b/opie-calculator/opie-calculator_1.1.7.oe
index e69de29bb2..ca1e3adf5f 100644
--- a/opie-calculator/opie-calculator_1.1.7.oe
+++ b/opie-calculator/opie-calculator_1.1.7.oe
@@ -0,0 +1,23 @@
+DESCRIPTION = "Calculator"
+SECTION = "opie/applications"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "calculator"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/tools/calculator \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+# FILES plugins/application/libcalculator.so* bin/calculator apps/Applications/calculator.desktop etc/unit_conversion.dat pics/calc
+do_install() {
+        install -d ${D}${palmtopdir}/pics/calc/
+        install -m 0644 ${WORKDIR}/pics/calc/*.png ${D}${palmtopdir}/pics/calc/
+}
+
diff --git a/opie-calculator/opie-calculator_cvs.oe b/opie-calculator/opie-calculator_cvs.oe
index 4526e841ca..03f89774b0 100644
--- a/opie-calculator/opie-calculator_cvs.oe
+++ b/opie-calculator/opie-calculator_cvs.oe
@@ -6,9 +6,9 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "calculator"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/tools/calculator \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/tools/calculator \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/apps"
 
 S = "${WORKDIR}/${APPNAME}"
 
diff --git a/opie-calibrate/opie-calibrate_1.1.7.oe b/opie-calibrate/opie-calibrate_1.1.7.oe
index e69de29bb2..5bc9e975de 100644
--- a/opie-calibrate/opie-calibrate_1.1.7.oe
+++ b/opie-calibrate/opie-calibrate_1.1.7.oe
@@ -0,0 +1,17 @@
+DESCRIPTION = "Opie Standalone Touchscreen Calibration Utility"
+SECTION = "opie/base"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate"
+S = "${WORKDIR}/calibrate"
+
+inherit opie
+
+do_install() {
+	install -d ${D}/${palmtopdir}/bin/
+	install -m 0755 calibrate ${D}/${palmtopdir}/bin/
+}
diff --git a/opie-calibrate/opie-calibrate_cvs.oe b/opie-calibrate/opie-calibrate_cvs.oe
index 741f2b3e44..f4184e6de7 100644
--- a/opie-calibrate/opie-calibrate_cvs.oe
+++ b/opie-calibrate/opie-calibrate_cvs.oe
@@ -5,7 +5,7 @@ MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/apps/calibrate"
+SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate"
 S = "${WORKDIR}/calibrate"
 
 inherit opie
diff --git a/opie-camera/opie-camera_1.0.3.oe b/opie-camera/opie-camera_1.0.3.oe
index e69de29bb2..e000c9ba64 100644
--- a/opie-camera/opie-camera_1.0.3.oe
+++ b/opie-camera/opie-camera_1.0.3.oe
@@ -0,0 +1,27 @@
+DESCRIPTION = "Opie Camera, Photo and Video Capturing Application for the Sharp CF-AG06 camera"
+SECTION = "opie/applications"
+PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@vanille.de>"
+LICENSE = "GPL"
+RDEPENDS = "sharp-camera-support"
+APPNAME = "camera"
+APPTYPE = "binary"
+PR = "r0"
+
+TAG = "v1_1_7"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/multimedia/${APPNAME} \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+S = "${WORKDIR}/camera"
+
+EXTRA_QMAKEVARS_POST=" LIBS+=-L.. "
+
+inherit opie
+
+do_install() {
+    install -d ${D}/${palmtopdir}/pics/${APPNAME}
+    install -d ${D}/${palmtopdir}/lib/
+    oe_libinstall -so libcamera ${D}/${palmtopdir}/lib
+    install -m 0755 capture ${D}/${palmtopdir}/bin/
+    install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}/${palmtopdir}/pics/${APPNAME}/
+}
diff --git a/opie-camera/opie-camera_cvs.oe b/opie-camera/opie-camera_cvs.oe
index 6718260a28..3568ce36f3 100644
--- a/opie-camera/opie-camera_cvs.oe
+++ b/opie-camera/opie-camera_cvs.oe
@@ -8,9 +8,9 @@ APPNAME = "camera"
 APPTYPE = "binary"
 PV = "1.0.3+cvs-${CVSDATE}"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/multimedia/${APPNAME} \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/multimedia/${APPNAME} \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/apps"
 S = "${WORKDIR}/camera"
 
 EXTRA_QMAKEVARS_POST=" LIBS+=-L.. "
diff --git a/opie-cardmon/opie-cardmon_1.1.7.oe b/opie-cardmon/opie-cardmon_1.1.7.oe
index e69de29bb2..25f72b80c2 100644
--- a/opie-cardmon/opie-cardmon_1.1.7.oe
+++ b/opie-cardmon/opie-cardmon_1.1.7.oe
@@ -0,0 +1,41 @@
+DESCRIPTION = "CF/PCMCIA Card Monitor applet"
+SECTION = "opie/applets"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+I18N_FILES = "libcardmonapplet.ts"
+APPNAME = "cardmonapplet"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/cardmon \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/sounds \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/cardmon"
+
+inherit opie
+
+pkg_postinst() {
+#!/bin/sh
+if pidof -s qpe >/dev/null; then
+  /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+fi
+ if [ -n "$D" ]; then false; fi
+}
+
+pkg_postrm() {
+#!/bin/sh
+/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+ if [ -n "$D" ]; then false; fi
+}
+
+# FILES plugins/applets/libcardmonapplet.so* pics/cardmon/*.png sounds/cardmon/*.wav
+do_install() {
+        install -d ${D}${palmtopdir}/pics/cardmon/
+        install -d ${D}${palmtopdir}/sounds/cardmon/
+        install -m 0644 ${WORKDIR}/pics/cardmon/*.png ${D}${palmtopdir}/pics/cardmon/
+        install -m 0644 ${WORKDIR}/sounds/cardmon/*.wav ${D}${palmtopdir}/sounds/cardmon/
+}
+
diff --git a/opie-cardmon/opie-cardmon_cvs.oe b/opie-cardmon/opie-cardmon_cvs.oe
index 042847cea7..a2153eb12d 100644
--- a/opie-cardmon/opie-cardmon_cvs.oe
+++ b/opie-cardmon/opie-cardmon_cvs.oe
@@ -7,10 +7,10 @@ PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "cardmonapplet"
 I18N_FILES = "libcardmonapplet.ts"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/applets/cardmon \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/sounds \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/cardmon \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/sounds \
+           ${HANDHELDS_CVS};module=opie/apps"
 
 S = "${WORKDIR}/cardmon"
 
diff --git a/opie-checkbook/opie-checkbook_0.8.0.oe b/opie-checkbook/opie-checkbook_0.8.0.oe
index e75b068afd..64c54a30f3 100644
--- a/opie-checkbook/opie-checkbook_0.8.0.oe
+++ b/opie-checkbook/opie-checkbook_0.8.0.oe
@@ -6,9 +6,9 @@ LICENSE = "GPL"
 APPNAME = "checkbook"
 
 TAG = "v1_1_6"
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/noncore/apps/${APPNAME} \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/${APPNAME} \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
 S = "${WORKDIR}/${APPNAME}"
 
 inherit opie
diff --git a/opie-checkbook/opie-checkbook_cvs.oe b/opie-checkbook/opie-checkbook_cvs.oe
index 025a804022..8323707ac4 100644
--- a/opie-checkbook/opie-checkbook_cvs.oe
+++ b/opie-checkbook/opie-checkbook_cvs.oe
@@ -6,9 +6,9 @@ LICENSE = "GPL"
 PV = "0.8.0-cvs-${CVSDATE}"
 APPNAME = "checkbook"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/apps/${APPNAME} \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/${APPNAME} \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/apps"
 S = "${WORKDIR}/${APPNAME}"
 
 inherit opie
diff --git a/opie-citytime/opie-citytime_1.1.7.oe b/opie-citytime/opie-citytime_1.1.7.oe
index e69de29bb2..54062e3f92 100644
--- a/opie-citytime/opie-citytime_1.1.7.oe
+++ b/opie-citytime/opie-citytime_1.1.7.oe
@@ -0,0 +1,23 @@
+DESCRIPTION = "Time-zone / world clock settings"
+SECTION = "opie/settings"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+RRECOMMENDS = "timezones"
+
+
+APPNAME = "citytime"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/settings/citytime \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+do_install() {
+        install -d ${D}${palmtopdir}/pics/${APPNAME}/
+        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+}
+
diff --git a/opie-citytime/opie-citytime_cvs.oe b/opie-citytime/opie-citytime_cvs.oe
index ffa59c883e..fb6edb09e0 100644
--- a/opie-citytime/opie-citytime_cvs.oe
+++ b/opie-citytime/opie-citytime_cvs.oe
@@ -8,9 +8,9 @@ PV = "1.1.7+cvs-${CVSDATE}"
 
 APPNAME = "citytime"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/settings/citytime \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/core/settings/citytime \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/apps"
 S = "${WORKDIR}/${APPNAME}"
 
 inherit opie
diff --git a/opie-clipboardapplet/opie-clipboardapplet_1.1.7.oe b/opie-clipboardapplet/opie-clipboardapplet_1.1.7.oe
index e69de29bb2..8d662400ba 100644
--- a/opie-clipboardapplet/opie-clipboardapplet_1.1.7.oe
+++ b/opie-clipboardapplet/opie-clipboardapplet_1.1.7.oe
@@ -0,0 +1,35 @@
+DESCRIPTION = "Clipboard applet"
+SECTION = "opie/applets"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "clipboardapplet"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/clipboardapplet \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+pkg_postinst() {
+#!/bin/sh
+if pidof -s qpe >/dev/null; then
+  /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+fi
+ if [ -n "$D" ]; then false; fi
+}
+
+pkg_postrm() {
+#!/bin/sh
+/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+ if [ -n "$D" ]; then false; fi
+}
+
+# FILES plugins/applets/libclipboardapplet.so*
+do_install() {
+}
+
diff --git a/opie-clipboardapplet/opie-clipboardapplet_cvs.oe b/opie-clipboardapplet/opie-clipboardapplet_cvs.oe
index 0a475d5507..a56c6bafc3 100644
--- a/opie-clipboardapplet/opie-clipboardapplet_cvs.oe
+++ b/opie-clipboardapplet/opie-clipboardapplet_cvs.oe
@@ -6,9 +6,9 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "clipboardapplet"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/applets/clipboardapplet \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/clipboardapplet \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/apps"
 
 S = "${WORKDIR}/${APPNAME}"
 
diff --git a/opie-clock/opie-clock_1.1.7.oe b/opie-clock/opie-clock_1.1.7.oe
index e69de29bb2..7d45673865 100644
--- a/opie-clock/opie-clock_1.1.7.oe
+++ b/opie-clock/opie-clock_1.1.7.oe
@@ -0,0 +1,24 @@
+DESCRIPTION = "Clock and stop-watch"
+SECTION = "opie/applications"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "clock"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/tools/clock \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+# FILES plugins/application/libclock.so* bin/clock apps/Applications/clock.desktop
+do_install() {
+        install -d ${D}${palmtopdir}/pics/${APPNAME}/
+        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+}
+
+
diff --git a/opie-clock/opie-clock_cvs.oe b/opie-clock/opie-clock_cvs.oe
index d353a96147..ad92b266b7 100644
--- a/opie-clock/opie-clock_cvs.oe
+++ b/opie-clock/opie-clock_cvs.oe
@@ -6,9 +6,9 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "clock"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/tools/clock \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/tools/clock \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/apps"
 
 S = "${WORKDIR}/${APPNAME}"
 
diff --git a/opie-clockapplet/opie-clockapplet_1.1.7.oe b/opie-clockapplet/opie-clockapplet_1.1.7.oe
index e69de29bb2..4fe94f2111 100644
--- a/opie-clockapplet/opie-clockapplet_1.1.7.oe
+++ b/opie-clockapplet/opie-clockapplet_1.1.7.oe
@@ -0,0 +1,35 @@
+DESCRIPTION = "Clock applet"
+SECTION = "opie/applets"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "clockapplet"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/clockapplet \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+pkg_postinst() {
+#!/bin/sh
+if pidof -s qpe >/dev/null; then
+  /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+fi
+ if [ -n "$D" ]; then false; fi
+}
+
+pkg_postrm() {
+#!/bin/sh
+/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+ if [ -n "$D" ]; then false; fi
+}
+
+# FILES plugins/applets/libclockapplet.so*
+do_install() {
+}
+
diff --git a/opie-clockapplet/opie-clockapplet_cvs.oe b/opie-clockapplet/opie-clockapplet_cvs.oe
index 8cc4648119..ee89392fce 100644
--- a/opie-clockapplet/opie-clockapplet_cvs.oe
+++ b/opie-clockapplet/opie-clockapplet_cvs.oe
@@ -6,9 +6,9 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "clockapplet"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/applets/clockapplet \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/clockapplet \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/apps"
 
 S = "${WORKDIR}/${APPNAME}"
 
diff --git a/opie-confeditor/opie-confeditor_1.1.7.oe b/opie-confeditor/opie-confeditor_1.1.7.oe
index e69de29bb2..f5a03e7693 100644
--- a/opie-confeditor/opie-confeditor_1.1.7.oe
+++ b/opie-confeditor/opie-confeditor_1.1.7.oe
@@ -0,0 +1,23 @@
+DESCRIPTION = "An enditor for the ~/Settings/*.conf files"
+SECTION = "opie/settings"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "confedit"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/confedit \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+# FILES bin/confedit apps/Settings/confedit.desktop pics/confedit/confedit.png plugins/application/libconfedit.so*
+do_install() {
+        install -d ${D}${palmtopdir}/pics/${APPNAME}/
+        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+}
+
diff --git a/opie-confeditor/opie-confeditor_cvs.oe b/opie-confeditor/opie-confeditor_cvs.oe
index fc55b6d5a1..d63b5bb570 100644
--- a/opie-confeditor/opie-confeditor_cvs.oe
+++ b/opie-confeditor/opie-confeditor_cvs.oe
@@ -6,9 +6,9 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "confedit"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/apps/confedit \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/confedit \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/apps"
 
 S = "${WORKDIR}/${APPNAME}"
 
diff --git a/opie-console/opie-console_1.1.7.oe b/opie-console/opie-console_1.1.7.oe
index e69de29bb2..e59366a585 100644
--- a/opie-console/opie-console_1.1.7.oe
+++ b/opie-console/opie-console_1.1.7.oe
@@ -0,0 +1,23 @@
+DESCRIPTION = "Opie Console"
+SECTION = "opie/applications"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+RDEPENDS = "opie-keytabs qte-font-fixed"
+
+APPNAME = "opie-console"
+APPTYPE = binary
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/${APPNAME} \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+do_install() {
+    install -d ${D}/${palmtopdir}/pics/console/keys/
+    install -m 0644 ${WORKDIR}/pics/console/*.png ${D}/${palmtopdir}/pics/console/
+    install -m 0644 ${WORKDIR}/pics/console/keys/*.png ${D}/${palmtopdir}/pics/console/keys/
+}
diff --git a/opie-console/opie-console_cvs.oe b/opie-console/opie-console_cvs.oe
index b6b47efc2c..2be8c2687f 100644
--- a/opie-console/opie-console_cvs.oe
+++ b/opie-console/opie-console_cvs.oe
@@ -8,9 +8,9 @@ RDEPENDS = "opie-keytabs qte-font-fixed"
 APPNAME = "opie-console"
 APPTYPE = binary
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/apps/${APPNAME} \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/${APPNAME} \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/apps"
 S = "${WORKDIR}/${APPNAME}"
 
 inherit opie
diff --git a/opie-dagger/opie-dagger_1.1.7.oe b/opie-dagger/opie-dagger_1.1.7.oe
index e69de29bb2..77b4d176c3 100644
--- a/opie-dagger/opie-dagger_1.1.7.oe
+++ b/opie-dagger/opie-dagger_1.1.7.oe
@@ -0,0 +1,23 @@
+DESCRIPTION = "A Bible study program utilizing the Sword library."
+SECTION = "opie/applications"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+DEPENDS = "libopiecore2 libopieui2 sword"
+APPNAME = "dagger"
+
+EXTRA_QMAKEVARS_PRE = "LIBSWORD_INC_DIR=${STAGING_INCDIR}/sword"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/dagger \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+do_install() {
+        install -d ${D}${palmtopdir}/pics/${APPNAME}/
+        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+}
+
diff --git a/opie-dagger/opie-dagger_cvs.oe b/opie-dagger/opie-dagger_cvs.oe
index 204db26d9c..4329b9f4b1 100644
--- a/opie-dagger/opie-dagger_cvs.oe
+++ b/opie-dagger/opie-dagger_cvs.oe
@@ -9,9 +9,9 @@ APPNAME = "dagger"
 
 EXTRA_QMAKEVARS_PRE = "LIBSWORD_INC_DIR=${STAGING_INCDIR}/sword"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/apps/dagger \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/dagger \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/apps"
 S = "${WORKDIR}/${APPNAME}"
 
 inherit opie
diff --git a/opie-dasher/opie-dasher_1.1.7.oe b/opie-dasher/opie-dasher_1.1.7.oe
index e69de29bb2..9a753965e7 100644
--- a/opie-dasher/opie-dasher_1.1.7.oe
+++ b/opie-dasher/opie-dasher_1.1.7.oe
@@ -0,0 +1,50 @@
+DESCRIPTION = "Dasher text input method"
+SECTION = "opie/inputmethods"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "qdasher"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/dasher \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/share "
+
+S = "${WORKDIR}/dasher"
+
+inherit opie
+
+pkg_postinst() {
+#!/bin/sh
+if [ -n "$D" ]; then exit 1; fi
+if pidof -s qpe >/dev/null; then
+  /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadInputMethods()"
+else
+  exit 0
+fi
+
+}
+
+pkg_postrm() {
+#!/bin/sh
+if [ -n "$D" ]; then exit 1; fi
+/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadInputMethods()"
+}
+
+# FILES plugins/inputmethods/libqdasher.so* share/dasher/alphabet.xml
+# FILES share/dasher/training_*.txt
+do_install() {
+	install -d ${D}/${palmtopdir}/share/dasher/
+	install -m 0644 ${WORKDIR}/share/dasher/alphabet.xml ${D}/${palmtopdir}/share/dasher/
+	for f in ${WORKDIR}/share/dasher/training_*.txt
+	do
+#		echo Installing Dasher Language $f
+		[ -f $f ] && install -m 0644 $f ${D}${palmtopdir}/share/dasher/
+	done
+}
+
+PACKAGES = " opie-dasher-english opie-dasher "
+
+FILES_opie-dasher = "${palmtopdir}/plugins/inputmethods/libqdasher.so*"
+FILES_opie-dasher-english = "${palmtopdir}/share/dasher/training_english_GB.txt"
+
diff --git a/opie-dasher/opie-dasher_cvs.oe b/opie-dasher/opie-dasher_cvs.oe
index 95b8ac76e1..e4af407a86 100644
--- a/opie-dasher/opie-dasher_cvs.oe
+++ b/opie-dasher/opie-dasher_cvs.oe
@@ -6,8 +6,8 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "qdasher"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/inputmethods/dasher \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/share "
+SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/dasher \
+           ${HANDHELDS_CVS};module=opie/share "
 
 S = "${WORKDIR}/dasher"
 
diff --git a/opie-datebook/opie-datebook_1.1.7.oe b/opie-datebook/opie-datebook_1.1.7.oe
index e69de29bb2..cd662f0a62 100644
--- a/opie-datebook/opie-datebook_1.1.7.oe
+++ b/opie-datebook/opie-datebook_1.1.7.oe
@@ -0,0 +1,18 @@
+DESCRIPTION = "A datebook/appointment manager"
+SECTION = "opie/pim"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+RDEPENDS = "opie-pics"
+
+APPNAME = "datebook"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/datebook \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+# FILES plugins/application/libdatebook.so* bin/datebook apps/1Pim/datebook.desktop
diff --git a/opie-datebook/opie-datebook_cvs.oe b/opie-datebook/opie-datebook_cvs.oe
index 88523fa084..0d1e3c86bd 100644
--- a/opie-datebook/opie-datebook_cvs.oe
+++ b/opie-datebook/opie-datebook_cvs.oe
@@ -7,8 +7,8 @@ RDEPENDS = "opie-pics"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "datebook"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/pim/datebook \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/datebook \
+           ${HANDHELDS_CVS};module=opie/apps"
 
 S = "${WORKDIR}/${APPNAME}"
 
diff --git a/opie-deco-flat/opie-deco-flat_1.1.7.oe b/opie-deco-flat/opie-deco-flat_1.1.7.oe
index e69de29bb2..d380ba3849 100644
--- a/opie-deco-flat/opie-deco-flat_1.1.7.oe
+++ b/opie-deco-flat/opie-deco-flat_1.1.7.oe
@@ -0,0 +1,14 @@
+DESCRIPTION = "Simple, flat window decoration style for Opie"
+SECTION = "opie/decorations"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "flat"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/decorations/flat "
+
+S = "${WORKDIR}/flat"
+
+inherit opie
diff --git a/opie-deco-flat/opie-deco-flat_cvs.oe b/opie-deco-flat/opie-deco-flat_cvs.oe
index 9a574bbc8c..ea2c1cd8e7 100644
--- a/opie-deco-flat/opie-deco-flat_cvs.oe
+++ b/opie-deco-flat/opie-deco-flat_cvs.oe
@@ -6,7 +6,7 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "flat"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/decorations/flat "
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/decorations/flat "
 
 S = "${WORKDIR}/flat"
 
diff --git a/opie-deco-liquid/opie-deco-liquid_1.1.7.oe b/opie-deco-liquid/opie-deco-liquid_1.1.7.oe
index e69de29bb2..7ada754c7c 100644
--- a/opie-deco-liquid/opie-deco-liquid_1.1.7.oe
+++ b/opie-deco-liquid/opie-deco-liquid_1.1.7.oe
@@ -0,0 +1,15 @@
+DESCRIPTION = "Liquid window decoration style for Opie"
+SECTION = "opie/decorations"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+DEPENDS = "libqtaux2"
+
+APPNAME = "liquid"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/decorations/liquid "
+
+S = "${WORKDIR}/liquid"
+
+inherit opie
diff --git a/opie-deco-liquid/opie-deco-liquid_cvs.oe b/opie-deco-liquid/opie-deco-liquid_cvs.oe
index 6acfa78571..3ec310061e 100644
--- a/opie-deco-liquid/opie-deco-liquid_cvs.oe
+++ b/opie-deco-liquid/opie-deco-liquid_cvs.oe
@@ -7,7 +7,7 @@ DEPENDS = "libqtaux2"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "liquid"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/decorations/liquid "
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/decorations/liquid "
 
 S = "${WORKDIR}/liquid"
 
diff --git a/opie-deco-polished/opie-deco-polished_1.1.7.oe b/opie-deco-polished/opie-deco-polished_1.1.7.oe
index e69de29bb2..8346357c21 100644
--- a/opie-deco-polished/opie-deco-polished_1.1.7.oe
+++ b/opie-deco-polished/opie-deco-polished_1.1.7.oe
@@ -0,0 +1,14 @@
+DESCRIPTION = "Polished window decoration style for Opie"
+SECTION = "opie/decorations"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "polished"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/decorations/polished "
+
+S = "${WORKDIR}/polished"
+
+inherit opie
diff --git a/opie-deco-polished/opie-deco-polished_cvs.oe b/opie-deco-polished/opie-deco-polished_cvs.oe
index caec98a5f5..9472dbc3fe 100644
--- a/opie-deco-polished/opie-deco-polished_cvs.oe
+++ b/opie-deco-polished/opie-deco-polished_cvs.oe
@@ -6,7 +6,7 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "polished"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/decorations/polished "
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/decorations/polished "
 
 S = "${WORKDIR}/polished"
 
diff --git a/opie-doctab/opie-doctab_1.1.7.oe b/opie-doctab/opie-doctab_1.1.7.oe
index e69de29bb2..c508990167 100644
--- a/opie-doctab/opie-doctab_1.1.7.oe
+++ b/opie-doctab/opie-doctab_1.1.7.oe
@@ -0,0 +1,23 @@
+DESCRIPTION = "DocTab settings dialog for the Opie environment."
+SECTION = "opie/settings"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "doctab"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/doctab \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
+
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+# FILES plugins/application/libdoctab.so* bin/doctab apps/Settings/DocTab.desktop
+do_install() {
+        install -d ${D}${palmtopdir}/pics/${APPNAME}/
+        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+}
+
diff --git a/opie-doctab/opie-doctab_cvs.oe b/opie-doctab/opie-doctab_cvs.oe
index 0a7019e83a..7b0e19aa7f 100644
--- a/opie-doctab/opie-doctab_cvs.oe
+++ b/opie-doctab/opie-doctab_cvs.oe
@@ -6,9 +6,9 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "doctab"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/settings/doctab \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/doctab \
+           ${HANDHELDS_CVS};module=opie/apps \
+           ${HANDHELDS_CVS};module=opie/pics"
 
 S = "${WORKDIR}/${APPNAME}"
 
diff --git a/opie-drawpad/opie-drawpad_1.1.7.oe b/opie-drawpad/opie-drawpad_1.1.7.oe
index e69de29bb2..a6e09a1c2b 100644
--- a/opie-drawpad/opie-drawpad_1.1.7.oe
+++ b/opie-drawpad/opie-drawpad_1.1.7.oe
@@ -0,0 +1,24 @@
+DESCRIPTION = "A note taking program with basic draw tools"
+SECTION = "opie/pim"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+DEPENDS = "libopiecore2 libopieui2 libqtaux2"
+
+APPNAME = "drawpad"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/graphics/drawpad \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+# FILES plugins/application/libdrawpad.so* bin/drawpad apps/1Pim/drawpad.desktop pics/drawpad
+do_install() {
+        install -d ${D}${palmtopdir}/pics/${APPNAME}/
+        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+}
+
diff --git a/opie-drawpad/opie-drawpad_cvs.oe b/opie-drawpad/opie-drawpad_cvs.oe
index 65dbf2283e..864a6c5b49 100644
--- a/opie-drawpad/opie-drawpad_cvs.oe
+++ b/opie-drawpad/opie-drawpad_cvs.oe
@@ -7,9 +7,9 @@ DEPENDS = "libopiecore2 libopieui2 libqtaux2"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "drawpad"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/graphics/drawpad \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/graphics/drawpad \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/apps"
 
 S = "${WORKDIR}/${APPNAME}"
 
diff --git a/opie-dvorak/opie-dvorak_1.1.7.oe b/opie-dvorak/opie-dvorak_1.1.7.oe
index e69de29bb2..ee807faf40 100644
--- a/opie-dvorak/opie-dvorak_1.1.7.oe
+++ b/opie-dvorak/opie-dvorak_1.1.7.oe
@@ -0,0 +1,38 @@
+DESCRIPTION = "Dvorak keyboard input method"
+SECTION = "opie/inputmethods"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+DEPENDS = "opie-pickboard"
+RDEPENDS = "opie-pickboard"
+
+APPNAME = "qdvorak"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/dvorak \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/pickboard"
+S = "${WORKDIR}/dvorak"
+
+inherit opie
+
+pkg_postinst() {
+#!/bin/sh
+if [ -n "$D" ]; then exit 1; fi
+if pidof -s qpe >/dev/null; then
+  /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadInputMethods()"
+else
+  exit 0
+fi
+
+}
+
+pkg_postrm() {
+#!/bin/sh
+if [ -n "$D" ]; then exit 1; fi
+/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadInputMethods()"
+}
+
+# FILES plugins/inputmethods/libqdvorak.so*
+do_install() {
+}
+
diff --git a/opie-dvorak/opie-dvorak_cvs.oe b/opie-dvorak/opie-dvorak_cvs.oe
index d22a246c0c..8903843ab8 100644
--- a/opie-dvorak/opie-dvorak_cvs.oe
+++ b/opie-dvorak/opie-dvorak_cvs.oe
@@ -8,8 +8,8 @@ RDEPENDS = "opie-pickboard"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "qdvorak"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/inputmethods/dvorak \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/inputmethods/pickboard"
+SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/dvorak \
+           ${HANDHELDS_CVS};module=opie/inputmethods/pickboard"
 S = "${WORKDIR}/dvorak"
 
 inherit opie
diff --git a/opie-embeddedkonsole/opie-embeddedkonsole_1.1.7.oe b/opie-embeddedkonsole/opie-embeddedkonsole_1.1.7.oe
index e69de29bb2..8b0343e6d2 100644
--- a/opie-embeddedkonsole/opie-embeddedkonsole_1.1.7.oe
+++ b/opie-embeddedkonsole/opie-embeddedkonsole_1.1.7.oe
@@ -0,0 +1,22 @@
+DESCRIPTION = "Opie embedded konsole"
+SECTION = "opie/applications"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+DEPENDS = " libqtaux2"
+RDEPENDS = "qte-font-fixed"
+
+APPNAME = "embeddedkonsole"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/${APPNAME} \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+do_install() {
+    install -d ${D}/${palmtopdir}/pics/konsole/
+    install -m 0644 ${WORKDIR}/pics/konsole/*.png ${D}/${palmtopdir}/pics/konsole/
+}
diff --git a/opie-embeddedkonsole/opie-embeddedkonsole_cvs.oe b/opie-embeddedkonsole/opie-embeddedkonsole_cvs.oe
index fad2cf6b1f..4f5758986c 100644
--- a/opie-embeddedkonsole/opie-embeddedkonsole_cvs.oe
+++ b/opie-embeddedkonsole/opie-embeddedkonsole_cvs.oe
@@ -8,9 +8,9 @@ PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "embeddedkonsole"
 RDEPENDS = "qte-font-fixed"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/apps/${APPNAME} \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/${APPNAME} \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/apps"
 S = "${WORKDIR}/${APPNAME}"
 
 inherit opie
diff --git a/opie-euroconv/opie-euroconv_1.1.7.oe b/opie-euroconv/opie-euroconv_1.1.7.oe
index e69de29bb2..b1ae9b6076 100644
--- a/opie-euroconv/opie-euroconv_1.1.7.oe
+++ b/opie-euroconv/opie-euroconv_1.1.7.oe
@@ -0,0 +1,23 @@
+DESCRIPTION = "Euroconv"
+SECTION = "opie/applications"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "euroconv"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/tools/euroconv \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+# FILES plugins/application/libeuroconv.so* bin/euroconv pics/euroconv/* apps/Applications/euroconv.desktop
+do_install() {
+        install -d ${D}${palmtopdir}/pics/${APPNAME}/
+        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+}
+
diff --git a/opie-euroconv/opie-euroconv_cvs.oe b/opie-euroconv/opie-euroconv_cvs.oe
index b9f6b46efa..9165871bf9 100644
--- a/opie-euroconv/opie-euroconv_cvs.oe
+++ b/opie-euroconv/opie-euroconv_cvs.oe
@@ -6,9 +6,9 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "euroconv"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/tools/euroconv \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/tools/euroconv \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/apps"
 
 S = "${WORKDIR}/${APPNAME}"
 
diff --git a/opie-examples-python/opie-examples-python_1.1.7.oe b/opie-examples-python/opie-examples-python_1.1.7.oe
index e69de29bb2..c2c789306c 100644
--- a/opie-examples-python/opie-examples-python_1.1.7.oe
+++ b/opie-examples-python/opie-examples-python_1.1.7.oe
@@ -0,0 +1,32 @@
+DESCRIPTION = "Python examples for Opie"
+SECTION = "opie/base"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+RDEPENDS = "python-pyqt opie-pyquicklauncher"
+
+APPNAME = "python"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/examples/python \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+do_configure() {
+	:
+}
+
+do_compile() {
+	:
+}
+
+do_install() {
+        install -d ${D}${palmtopdir}/bin/python/ ${D}${palmtopdir}/apps/Python
+	install -m 0755 *.py ${D}${palmtopdir}/bin/python/
+	install -m 0644 ${WORKDIR}/apps/Python/.directory ${D}${palmtopdir}/apps/Python/
+	install -m 0644 ${WORKDIR}/apps/Python/*.desktop ${D}${palmtopdir}/apps/Python/
+}
+
diff --git a/opie-examples-python/opie-examples-python_cvs.oe b/opie-examples-python/opie-examples-python_cvs.oe
index d574d6955d..122c49399b 100644
--- a/opie-examples-python/opie-examples-python_cvs.oe
+++ b/opie-examples-python/opie-examples-python_cvs.oe
@@ -7,9 +7,9 @@ RDEPENDS = "python-pyqt opie-pyquicklauncher"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "python"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/examples/python \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/examples/python \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/apps"
 S = "${WORKDIR}/${APPNAME}"
 
 inherit opie
diff --git a/opie-eye/opie-eye_1.1.7.oe b/opie-eye/opie-eye_1.1.7.oe
index e69de29bb2..71cc48ffcb 100644
--- a/opie-eye/opie-eye_1.1.7.oe
+++ b/opie-eye/opie-eye_1.1.7.oe
@@ -0,0 +1,31 @@
+DESCRIPTION = "A image viewer"
+SECTION = "opie/applications"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+DEPENDS = "libopiecore2 libopieui2 libopiemm2"
+RDEPENDS = "opie-advancedfm-pics"
+APPNAME = "opie-eye"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/graphics/opie-eye \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+do_configure_append() {
+        cd slave && qmake -makefile -spec ${QMAKESPEC} slave.pro -after ${EXTRA_QMAKEVARS_POST}
+}
+
+do_compile_append() {
+        cd slave && oe_runmake
+}
+
+do_install() {
+	install -m 0755 opie-eye_slave ${D}/${palmtopdir}/bin/
+        install -d ${D}${palmtopdir}/pics/${APPNAME}/
+        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+}
+
diff --git a/opie-eye/opie-eye_cvs.oe b/opie-eye/opie-eye_cvs.oe
index d9d484d270..168d1d67b8 100644
--- a/opie-eye/opie-eye_cvs.oe
+++ b/opie-eye/opie-eye_cvs.oe
@@ -8,9 +8,9 @@ RDEPENDS = "opie-advancedfm-pics"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "opie-eye"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/graphics/opie-eye \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/graphics/opie-eye \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/apps"
 S = "${WORKDIR}/${APPNAME}"
 
 inherit opie
diff --git a/opie-fifteen/opie-fifteen_1.1.7.oe b/opie-fifteen/opie-fifteen_1.1.7.oe
index e69de29bb2..30750be016 100644
--- a/opie-fifteen/opie-fifteen_1.1.7.oe
+++ b/opie-fifteen/opie-fifteen_1.1.7.oe
@@ -0,0 +1,23 @@
+DESCRIPTION = "Fifteen pieces game"
+SECTION = "opie/games"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "fifteen"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/fifteen \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+# FILES plugins/application/libfifteen.so* bin/fifteen apps/Games/fifteen.desktop pics/fifteen
+do_install() {
+        install -d ${D}${palmtopdir}/pics/${APPNAME}/
+        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+}
+
diff --git a/opie-fifteen/opie-fifteen_cvs.oe b/opie-fifteen/opie-fifteen_cvs.oe
index a687a8b75d..6ae2f653f9 100644
--- a/opie-fifteen/opie-fifteen_cvs.oe
+++ b/opie-fifteen/opie-fifteen_cvs.oe
@@ -6,9 +6,9 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "fifteen"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/games/fifteen \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/fifteen \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/apps"
 
 S = "${WORKDIR}/${APPNAME}"
 
diff --git a/opie-formatter/opie-formatter_1.1.7.oe b/opie-formatter/opie-formatter_1.1.7.oe
index e69de29bb2..b1240122ef 100644
--- a/opie-formatter/opie-formatter_1.1.7.oe
+++ b/opie-formatter/opie-formatter_1.1.7.oe
@@ -0,0 +1,23 @@
+DESCRIPTION = "The filesystem formatting and mountpoint app for the Opie environment."
+SECTION = "opie/settings"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "formatter"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/tools/formatter \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+# FILES plugins/application/libformatter.so* bin/formatter pics/formatter/devices.png apps/Settings/formatter.desktop
+do_install() {
+        install -d ${D}${palmtopdir}/pics/${APPNAME}/
+        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+}
+
diff --git a/opie-formatter/opie-formatter_cvs.oe b/opie-formatter/opie-formatter_cvs.oe
index 826e932b47..05792b89d1 100644
--- a/opie-formatter/opie-formatter_cvs.oe
+++ b/opie-formatter/opie-formatter_cvs.oe
@@ -6,9 +6,9 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "formatter"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/tools/formatter \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/tools/formatter \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/apps"
 
 S = "${WORKDIR}/${APPNAME}"
 
diff --git a/opie-freetype/opie-freetype_1.1.7.oe b/opie-freetype/opie-freetype_1.1.7.oe
index e69de29bb2..43c2f5f300 100644
--- a/opie-freetype/opie-freetype_1.1.7.oe
+++ b/opie-freetype/opie-freetype_1.1.7.oe
@@ -0,0 +1,17 @@
+DESCRIPTION = "Freetype fontfactory plugin"
+SECTION = "opie/fontfactories"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+DEPENDS = "freetype"
+
+APPNAME = "freetypefactory"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/freetype \
+	   file://modern-freetype-includes.patch;patch=1"
+S = "${WORKDIR}/freetype"
+
+inherit opie
+
+EXTRA_QMAKEVARS_POST = "INCLUDEPATH+=${STAGING_INCDIR}/freetype2"
diff --git a/opie-freetype/opie-freetype_cvs.oe b/opie-freetype/opie-freetype_cvs.oe
index e6cd80062b..0fbe9fe0cb 100644
--- a/opie-freetype/opie-freetype_cvs.oe
+++ b/opie-freetype/opie-freetype_cvs.oe
@@ -7,7 +7,7 @@ DEPENDS = "freetype"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "freetypefactory"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/freetype \
+SRC_URI = "${HANDHELDS_CVS};module=opie/freetype \
 	   file://modern-freetype-includes.patch;patch=1"
 S = "${WORKDIR}/freetype"
 
diff --git a/opie-ftp/opie-ftp_1.1.7.oe b/opie-ftp/opie-ftp_1.1.7.oe
index e69de29bb2..ed00673e26 100644
--- a/opie-ftp/opie-ftp_1.1.7.oe
+++ b/opie-ftp/opie-ftp_1.1.7.oe
@@ -0,0 +1,26 @@
+DESCRIPTION = "Opie-Ftp"
+SECTION = "opie/applications"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+DEPENDS = "libopiecore2 opie-ftplib"
+I18N_FILES = "opieftp.ts"
+
+APPNAME = "opieftp"
+APPTYPE = "binary"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/opieftp \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+# FILES plugins/application/libopieftp.so* bin/opieftp pics/opieftp apps/Applications/opieftp.desktop
+do_install() {
+        install -d ${D}${palmtopdir}/pics/${APPNAME}/
+        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+}
+
diff --git a/opie-ftp/opie-ftp_cvs.oe b/opie-ftp/opie-ftp_cvs.oe
index 79befbaad4..d09ce448de 100644
--- a/opie-ftp/opie-ftp_cvs.oe
+++ b/opie-ftp/opie-ftp_cvs.oe
@@ -8,9 +8,9 @@ PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "opieftp"
 I18N_FILES = "opieftp.ts"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/net/opieftp \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/opieftp \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/apps"
 
 S = "${WORKDIR}/${APPNAME}"
 
diff --git a/opie-ftplib/opie-ftplib_1.1.7.oe b/opie-ftplib/opie-ftplib_1.1.7.oe
index e69de29bb2..1882c1d0a9 100644
--- a/opie-ftplib/opie-ftplib_1.1.7.oe
+++ b/opie-ftplib/opie-ftplib_1.1.7.oe
@@ -0,0 +1,25 @@
+DESCRIPTION = "Opie FTP Library"
+SECTION = "opie/libs"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+PRIORITY = "optional"
+LICENSE = "GPL"
+PROVIDES = "libftplib1"
+I18N_FILES = "libftplib.ts"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/ftplib"
+S = "${WORKDIR}/ftplib"
+
+inherit palmtop
+inherit opie_i18n
+
+EXTRA_QMAKEVARS_POST = "DESTDIR=${S}"
+
+do_stage () {
+	install -m 0664 ${S}/ftplib.h ${STAGING_INCDIR}/
+	oe_libinstall -so libftplib ${STAGING_LIBDIR}
+}
+
+do_install() {
+	oe_libinstall -so libftplib ${D}/${palmtopdir}/lib
+}
diff --git a/opie-ftplib/opie-ftplib_cvs.oe b/opie-ftplib/opie-ftplib_cvs.oe
index 9cce1e5183..41778d1c75 100644
--- a/opie-ftplib/opie-ftplib_cvs.oe
+++ b/opie-ftplib/opie-ftplib_cvs.oe
@@ -8,7 +8,7 @@ I18N_FILES = "libftplib.ts"
 
 PV = "1.1.7+cvs-${CVSDATE}"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/net/ftplib"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/ftplib"
 S = "${WORKDIR}/ftplib"
 
 inherit palmtop
diff --git a/opie-go/opie-go_1.1.7.oe b/opie-go/opie-go_1.1.7.oe
index e69de29bb2..04bda2ef76 100644
--- a/opie-go/opie-go_1.1.7.oe
+++ b/opie-go/opie-go_1.1.7.oe
@@ -0,0 +1,23 @@
+DESCRIPTION = "The game of Go"
+SECTION = "opie/games"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "go"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/go \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+# FILES plugins/application/libgo.so* bin/go apps/Games/go.desktop pics/go
+do_install() {
+        install -d ${D}${palmtopdir}/pics/${APPNAME}/
+        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+}
+
diff --git a/opie-go/opie-go_cvs.oe b/opie-go/opie-go_cvs.oe
index 62cec60241..d6299954ed 100644
--- a/opie-go/opie-go_cvs.oe
+++ b/opie-go/opie-go_cvs.oe
@@ -6,9 +6,9 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "go"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/games/go \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/go \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/apps"
 
 S = "${WORKDIR}/${APPNAME}"
 
diff --git a/opie-gutenbrowser/opie-gutenbrowser_1.1.7.oe b/opie-gutenbrowser/opie-gutenbrowser_1.1.7.oe
index e69de29bb2..31f838e9e8 100644
--- a/opie-gutenbrowser/opie-gutenbrowser_1.1.7.oe
+++ b/opie-gutenbrowser/opie-gutenbrowser_1.1.7.oe
@@ -0,0 +1,25 @@
+DESCRIPTION = "Etext reader for the Project Gutenberg."
+SECTION = "opie/applications"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+DEPENDS = "  opie-ftplib"
+
+APPNAME = "gutenbrowser"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/opie-gutenbrowser \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
+	   ${HANDHELDS_CVS};tag=${TAG};module=opie/etc"
+
+S = "${WORKDIR}/opie-gutenbrowser"
+
+inherit opie
+
+do_install() {
+        install -d ${D}${palmtopdir}/pics/${APPNAME}/
+        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+	install -d ${D}${palmtopdir}/etc/gutenbrowser/
+	install -m 0644 ${WORKDIR}/etc/gutenbrowser/ftpList ${WORKDIR}/etc/gutenbrowser/GUTINDEX.ALL ${D}${palmtopdir}/etc/gutenbrowser/
+}
diff --git a/opie-gutenbrowser/opie-gutenbrowser_cvs.oe b/opie-gutenbrowser/opie-gutenbrowser_cvs.oe
index 4ba0b924ef..f61bcb8c7f 100644
--- a/opie-gutenbrowser/opie-gutenbrowser_cvs.oe
+++ b/opie-gutenbrowser/opie-gutenbrowser_cvs.oe
@@ -7,10 +7,10 @@ DEPENDS = "  opie-ftplib"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "gutenbrowser"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/apps/opie-gutenbrowser \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps \
-	   cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/etc"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/opie-gutenbrowser \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/apps \
+	   ${HANDHELDS_CVS};module=opie/etc"
 
 S = "${WORKDIR}/opie-gutenbrowser"
 
diff --git a/opie-handwriting/opie-handwriting_1.1.7.oe b/opie-handwriting/opie-handwriting_1.1.7.oe
index e69de29bb2..309613c9ea 100644
--- a/opie-handwriting/opie-handwriting_1.1.7.oe
+++ b/opie-handwriting/opie-handwriting_1.1.7.oe
@@ -0,0 +1,52 @@
+DESCRIPTION = "Handwriting input method"
+SECTION = "opie/inputmethods"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "qhandwriting"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/handwriting \
+	${HANDHELDS_CVS};tag=${TAG};module=opie/etc/qimpen"
+
+S = "${WORKDIR}/handwriting"
+
+inherit opie
+
+pkg_postinst() {
+#!/bin/sh
+if [ -n "$D" ]; then exit 1; fi
+if pidof -s qpe >/dev/null; then
+  /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadInputMethods()"
+else
+  exit 0
+fi
+
+}
+
+pkg_postrm() {
+#!/bin/sh
+if [ -n "$D" ]; then exit 1; fi
+/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadInputMethods()"
+}
+
+# FILES plugins/inputmethods/libqhandwriting.so*
+do_install() {
+	install -d ${D}${palmtopdir}/etc/qimpen/
+	for f in ../qimpen/*
+	do
+		[ -f $f ] && install -m 0644 $f ${D}${palmtopdir}/etc/qimpen/
+	done
+}
+
+PACKAGES = " opie-handwriting-classicset opie-handwriting-graffitiset opie-handwriting "
+
+FILES_opie-handwriting = "${palmtopdir}/plugins/inputmethods/libqhandwriting.so*"
+FILES_opie-handwriting-classicset = "${palmtopdir}/etc/qimpen/default.conf \
+	${palmtopdir}/etc/qimpen/combining.qpt \
+	${palmtopdir}/etc/qimpen/asciilower.qpt \
+	${palmtopdir}/etc/qimpen/asciiupper.qpt \
+	${palmtopdir}/etc/qimpen/numeric.qpt"
+FILES_opie-handwriting-graffitiset = "${palmtopdir}/etc/qimpen/graffiti*"
+
diff --git a/opie-handwriting/opie-handwriting_cvs.oe b/opie-handwriting/opie-handwriting_cvs.oe
index 1afa8dd3a6..4fbac3dec1 100644
--- a/opie-handwriting/opie-handwriting_cvs.oe
+++ b/opie-handwriting/opie-handwriting_cvs.oe
@@ -6,8 +6,8 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "qhandwriting"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/inputmethods/handwriting \
-	cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/etc/qimpen"
+SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/handwriting \
+	${HANDHELDS_CVS};module=opie/etc/qimpen"
 
 S = "${WORKDIR}/handwriting"
 
diff --git a/opie-help-en/opie-help-en_1.1.7.oe b/opie-help-en/opie-help-en_1.1.7.oe
index e69de29bb2..984d41c08a 100644
--- a/opie-help-en/opie-help-en_1.1.7.oe
+++ b/opie-help-en/opie-help-en_1.1.7.oe
@@ -0,0 +1,25 @@
+DESCRIPTION = "Opie Help Packages - English"
+SECTION = "opie/help"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/help/en/html "
+S = "${WORKDIR}/html"
+
+do_install() {
+        install -d ${D}${palmtopdir}/help/en/html/
+        install -m 0644 ${WORKDIR}/html/*.html ${D}${palmtopdir}/help/en/html/
+	for d in $(find . -type d | grep -v CVS)
+	do
+		install -d ${D}${palmtopdir}/help/en/html/$d
+        	install -m 0644 ${WORKDIR}/html/$d/*.html ${D}${palmtopdir}/help/en/html/$d/
+	done
+}
+
+python populate_packages_prepend () {
+	help_dir = oe.data.expand('${palmtopdir}/help/en/html/', d)
+	
+	do_split_packages(d, help_dir, file_regex='^(.*)\.html$', output_pattern='opie-%s-help-en', description='Opie Help for %s - English', aux_files_pattern=help_dir + '%s/*')
+}
diff --git a/opie-help-en/opie-help-en_cvs.oe b/opie-help-en/opie-help-en_cvs.oe
index ed33028a8c..720bf2cfb7 100644
--- a/opie-help-en/opie-help-en_cvs.oe
+++ b/opie-help-en/opie-help-en_cvs.oe
@@ -5,7 +5,7 @@ MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/help/en/html "
+SRC_URI = "${HANDHELDS_CVS};module=opie/help/en/html "
 S = "${WORKDIR}/html"
 
 do_install() {
diff --git a/opie-helpbrowser/opie-helpbrowser_1.1.7.oe b/opie-helpbrowser/opie-helpbrowser_1.1.7.oe
index e69de29bb2..95e5ffd8e5 100644
--- a/opie-helpbrowser/opie-helpbrowser_1.1.7.oe
+++ b/opie-helpbrowser/opie-helpbrowser_1.1.7.oe
@@ -0,0 +1,21 @@
+DESCRIPTION = "Opie Help Browser"
+SECTION = "opie/applications"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "helpbrowser"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/${APPNAME} \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+do_install() {
+    install -d ${D}/${palmtopdir}/pics/${APPNAME}/
+    install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}/${palmtopdir}/pics/${APPNAME}/
+}
diff --git a/opie-helpbrowser/opie-helpbrowser_cvs.oe b/opie-helpbrowser/opie-helpbrowser_cvs.oe
index e6fbc2739d..619c1c93a8 100644
--- a/opie-helpbrowser/opie-helpbrowser_cvs.oe
+++ b/opie-helpbrowser/opie-helpbrowser_cvs.oe
@@ -6,9 +6,9 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "helpbrowser"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/apps/${APPNAME} \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/${APPNAME} \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/apps"
 
 S = "${WORKDIR}/${APPNAME}"
 
diff --git a/opie-homeapplet/opie-homeapplet_1.1.7.oe b/opie-homeapplet/opie-homeapplet_1.1.7.oe
index e69de29bb2..672b694751 100644
--- a/opie-homeapplet/opie-homeapplet_1.1.7.oe
+++ b/opie-homeapplet/opie-homeapplet_1.1.7.oe
@@ -0,0 +1,21 @@
+DESCRIPTION = "Home Applet"
+SECTION = "opie/applets"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "homeapplet"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/homeapplet \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+# FILES
+do_install() {
+}
+
diff --git a/opie-homeapplet/opie-homeapplet_cvs.oe b/opie-homeapplet/opie-homeapplet_cvs.oe
index b42738d1d1..e359a0dcb0 100644
--- a/opie-homeapplet/opie-homeapplet_cvs.oe
+++ b/opie-homeapplet/opie-homeapplet_cvs.oe
@@ -6,9 +6,9 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "homeapplet"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/applets/homeapplet \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/homeapplet \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/apps"
 
 S = "${WORKDIR}/${APPNAME}"
 
diff --git a/opie-i18n/opie-i18n_1.1.7.oe b/opie-i18n/opie-i18n_1.1.7.oe
index e69de29bb2..622a6df9ec 100644
--- a/opie-i18n/opie-i18n_1.1.7.oe
+++ b/opie-i18n/opie-i18n_1.1.7.oe
@@ -0,0 +1,66 @@
+DESCRIPTION = "Opie i18n files"
+SECTION = "opie/base"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>
+LICENSE = "GPL"
+DEPENDS = "opie-lrelease-native"
+
+SRC_URI = "${HANDHELDS_CVS};module=opie/i18n \
+	   ${HANDHELDS_CVS};module=opie/etc/dict"
+S = "${WORKDIR}/i18n"
+
+do_compile() {
+	for f in ?? ??_??
+	do
+		cd ${S}/$f
+		for g in *.ts
+		do
+			opie-lrelease $g
+		done
+	done
+}
+
+do_install() {
+	install -d ${D}${palmtopdir}/i18n/
+	install -d ${D}${palmtopdir}/etc/dict/
+	for f in ?? ??_??
+	do
+		echo Installing language $f
+		install -d ${D}${palmtopdir}/i18n/$f/
+		install -m 0644 $f/.directory ${D}${palmtopdir}/i18n/$f/
+		install -m 0644 $f/*.qm ${D}${palmtopdir}/i18n/$f/
+		if [ -e ${WORKDIR}/dict/dawg.$f ]
+		then
+			install -m 0644 ${WORKDIR}/dict/dawg.$f ${D}${palmtopdir}/etc/dict/
+		fi
+	done
+}
+
+PACKAGES = "	opie-i18n-cz  opie-i18n-da  opie-i18n-de  opie-i18n-dk  opie-i18n-en  opie-i18n-es  opie-i18n-fr  opie-i18n-hu \
+		opie-i18n-it  opie-i18n-ja  opie-i18n-ko  opie-i18n-lv  opie-i18n-mk  opie-i18n-nl  opie-i18n-no  opie-i18n-pl \
+		opie-i18n-pt  opie-i18n-pt-br  opie-i18n-ru  opie-i18n-sl  opie-i18n-xx  opie-i18n-zh-cn  opie-i18n-zh-tw "
+
+FILES_opie-i18n-cz = "${palmtopdir}/i18n/cz ${palmtopdir}/etc/dict/dawg.cz"
+FILES_opie-i18n-da = "${palmtopdir}/i18n/da ${palmtopdir}/etc/dict/dawg.da"
+FILES_opie-i18n-de = "${palmtopdir}/i18n/de ${palmtopdir}/etc/dict/dawg.de"
+FILES_opie-i18n-dk = "${palmtopdir}/i18n/dk ${palmtopdir}/etc/dict/dawg.dk"
+FILES_opie-i18n-en = "${palmtopdir}/i18n/en ${palmtopdir}/etc/dict/dawg.en"
+FILES_opie-i18n-es = "${palmtopdir}/i18n/es ${palmtopdir}/etc/dict/dawg.es"
+FILES_opie-i18n-fr = "${palmtopdir}/i18n/fr ${palmtopdir}/etc/dict/dawg.fr"
+FILES_opie-i18n-hu = "${palmtopdir}/i18n/hu ${palmtopdir}/etc/dict/dawg.hu"
+FILES_opie-i18n-it = "${palmtopdir}/i18n/it ${palmtopdir}/etc/dict/dawg.it"
+FILES_opie-i18n-ja = "${palmtopdir}/i18n/ja ${palmtopdir}/etc/dict/dawg.ja"
+FILES_opie-i18n-ko = "${palmtopdir}/i18n/ko ${palmtopdir}/etc/dict/dawg.ko"
+FILES_opie-i18n-lv = "${palmtopdir}/i18n/lv ${palmtopdir}/etc/dict/dawg.lv"
+FILES_opie-i18n-mk = "${palmtopdir}/i18n/mk ${palmtopdir}/etc/dict/dawg.mk"
+FILES_opie-i18n-nl = "${palmtopdir}/i18n/nl ${palmtopdir}/etc/dict/dawg.nl"
+FILES_opie-i18n-no = "${palmtopdir}/i18n/no ${palmtopdir}/etc/dict/dawg.no"
+FILES_opie-i18n-pl = "${palmtopdir}/i18n/pl ${palmtopdir}/etc/dict/dawg.pl"
+FILES_opie-i18n-pt = "${palmtopdir}/i18n/pt ${palmtopdir}/etc/dict/dawg.pt"
+FILES_opie-i18n-pt-br = "${palmtopdir}/i18n/pt_BR ${palmtopdir}/etc/dict/dawg.pt_BR"
+FILES_opie-i18n-ru = "${palmtopdir}/i18n/ru ${palmtopdir}/etc/dict/dawg.ru"
+FILES_opie-i18n-sl = "${palmtopdir}/i18n/sl ${palmtopdir}/etc/dict/dawg.sl"
+FILES_opie-i18n-xx = "${palmtopdir}/i18n/xx ${palmtopdir}/etc/dict/dawg.xx"
+FILES_opie-i18n-zh-cn = "${palmtopdir}/i18n/zh_CN ${palmtopdir}/etc/dict/dawg.zh_CN"
+FILES_opie-i18n-zh-tw = "${palmtopdir}/i18n/zh_TW ${palmtopdir}/etc/dict/dawg.zh_TW"
+
diff --git a/opie-i18n/opie-i18n_cvs.oe b/opie-i18n/opie-i18n_cvs.oe
index 001c762f03..2804b95112 100644
--- a/opie-i18n/opie-i18n_cvs.oe
+++ b/opie-i18n/opie-i18n_cvs.oe
@@ -6,8 +6,8 @@ LICENSE = "GPL"
 DEPENDS = "opie-lrelease-native"
 PV = "1.1.7+cvs-${CVSDATE}"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/i18n \
-	   cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/etc/dict"
+SRC_URI = "${HANDHELDS_CVS};module=opie/i18n \
+	   ${HANDHELDS_CVS};module=opie/etc/dict"
 S = "${WORKDIR}/i18n"
 
 do_compile() {
diff --git a/opie-i18n/opie-lrelease-native_1.1.7.oe b/opie-i18n/opie-lrelease-native_1.1.7.oe
index e69de29bb2..0a8f46d398 100644
--- a/opie-i18n/opie-lrelease-native_1.1.7.oe
+++ b/opie-i18n/opie-lrelease-native_1.1.7.oe
@@ -0,0 +1,22 @@
+DESCRIPTION = "Opie native i18n tool lrelease"
+SECTION = "opie/base"
+PRIORITY = "optional"
+MAINTAINER = "Holger Freyther <zecke@handhelds.org>"
+LICENSE = "GPL"
+DEPENDS = "uicmoc3-native"
+
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/development/translation/opie-lrelease \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/development/translation/shared"
+
+S = "${WORKDIR}/opie-lrelease"
+
+inherit native qmake
+
+export OE_QMAKE_LINK="${CXX}"
+EXTRA_QMAKEVARS_POST_append = "LIBS+=-ldl"
+
+do_stage() {
+	install -m 0755 opie-lrelease ${STAGING_BINDIR}/
+}
diff --git a/opie-i18n/opie-lrelease-native_cvs.oe b/opie-i18n/opie-lrelease-native_cvs.oe
index e8dd09ba00..23063796fa 100644
--- a/opie-i18n/opie-lrelease-native_cvs.oe
+++ b/opie-i18n/opie-lrelease-native_cvs.oe
@@ -6,8 +6,8 @@ LICENSE = "GPL"
 DEPENDS = "uicmoc3-native"
 PV = "1.1.7+cvs-${CVSDATE}"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/development/translation/opie-lrelease \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/development/translation/shared"
+SRC_URI = "${HANDHELDS_CVS};module=opie/development/translation/opie-lrelease \
+           ${HANDHELDS_CVS};module=opie/development/translation/shared"
 
 S = "${WORKDIR}/opie-lrelease"
 
diff --git a/opie-i18n/opie-lupdate-native_1.1.7.oe b/opie-i18n/opie-lupdate-native_1.1.7.oe
index e69de29bb2..fc99630acf 100644
--- a/opie-i18n/opie-lupdate-native_1.1.7.oe
+++ b/opie-i18n/opie-lupdate-native_1.1.7.oe
@@ -0,0 +1,22 @@
+DESCRIPTION = "Opie native i18n tool lupdate"
+SECTION = "opie/base"
+PRIORITY = "optional"
+MAINTAINER = "Holger Freyther <zecke@handhelds.org>"
+LICENSE = "GPL"
+DEPENDS = "uicmoc3-native"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/development/translation/opie-lupdate \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/development/translation/shared"
+
+S = "${WORKDIR}/opie-lupdate"
+
+inherit native qmake
+
+export OE_QMAKE_LINK="${CXX}"
+EXTRA_QMAKEVARS_POST_append = "LIBS+=-ldl "
+EXTRA_QMAKEVARS_POST_append = "CONFIG-=thread "
+
+do_stage() {
+	install -m 0755 opie-lupdate ${STAGING_BINDIR}/
+}
diff --git a/opie-i18n/opie-lupdate-native_cvs.oe b/opie-i18n/opie-lupdate-native_cvs.oe
index c976275d1b..ae8d9a2642 100644
--- a/opie-i18n/opie-lupdate-native_cvs.oe
+++ b/opie-i18n/opie-lupdate-native_cvs.oe
@@ -6,8 +6,8 @@ LICENSE = "GPL"
 DEPENDS = "uicmoc3-native"
 PV = "1.1.7+cvs-${CVSDATE}"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/development/translation/opie-lupdate \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/development/translation/shared"
+SRC_URI = "${HANDHELDS_CVS};module=opie/development/translation/opie-lupdate \
+           ${HANDHELDS_CVS};module=opie/development/translation/shared"
 
 S = "${WORKDIR}/opie-lupdate"
 
diff --git a/opie-irc/opie-irc_1.1.7.oe b/opie-irc/opie-irc_1.1.7.oe
index e69de29bb2..bb45904868 100644
--- a/opie-irc/opie-irc_1.1.7.oe
+++ b/opie-irc/opie-irc_1.1.7.oe
@@ -0,0 +1,29 @@
+DESCRIPTION = "The Opie IRC client lets you chat on your favorite IRC server using your handheld computer"
+SECTION = "opie/applications"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+I18N_FILES = "opieirc.ts"
+DEPENDS = "libqtaux2"
+
+APPNAME = "opieirc"
+#APPTYPE = "binary"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/opieirc \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/help \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
+	   ${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
+
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+# FILES plugins/application/libopieirc.so* bin/opieirc pics/opieirc apps/Applications/opieirc.desktop help/en/html/opieirc.html help/en/html/opieirc
+do_install() {
+	install -d ${D}${palmtopdir}/pics/${APPNAME}/
+	install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+        install -d ${D}${palmtopdir}/help/en/html/
+        install -m 0644 ${WORKDIR}/help/en/html/opieirc.html ${D}${palmtopdir}/help/en/html/
+}
+
diff --git a/opie-irc/opie-irc_cvs.oe b/opie-irc/opie-irc_cvs.oe
index b8b972c2fc..c35e187993 100644
--- a/opie-irc/opie-irc_cvs.oe
+++ b/opie-irc/opie-irc_cvs.oe
@@ -9,10 +9,10 @@ PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "opieirc"
 #APPTYPE = "binary"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/net/opieirc \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/help \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps \
-	   cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/opieirc \
+           ${HANDHELDS_CVS};module=opie/help \
+           ${HANDHELDS_CVS};module=opie/apps \
+	   ${HANDHELDS_CVS};module=opie/pics"
 
 S = "${WORKDIR}/${APPNAME}"
 
diff --git a/opie-irdaapplet/opie-irdaapplet_1.1.7.oe b/opie-irdaapplet/opie-irdaapplet_1.1.7.oe
index e69de29bb2..4b3bffaa04 100644
--- a/opie-irdaapplet/opie-irdaapplet_1.1.7.oe
+++ b/opie-irdaapplet/opie-irdaapplet_1.1.7.oe
@@ -0,0 +1,40 @@
+DESCRIPTION = "IrDA Applet"
+SECTION = "opie/applets"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "irdaapplet"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/irdaapplet \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/sounds \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+pkg_postinst() {
+#!/bin/sh
+if pidof -s qpe >/dev/null; then
+  /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+fi
+ if [ -n "$D" ]; then false; fi
+}
+
+pkg_postrm() {
+#!/bin/sh
+/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+ if [ -n "$D" ]; then false; fi
+}
+
+# FILES plugins/applets/libirdaapplet.so* pics/irdaapplet/* sounds/irdaapplet/*.wav
+do_install() {
+        install -d ${D}${palmtopdir}/pics/${APPNAME}/
+        install -d ${D}${palmtopdir}/sounds/${APPNAME}/
+        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+        install -m 0644 ${WORKDIR}/sounds/${APPNAME}/*.wav ${D}${palmtopdir}/sounds/${APPNAME}/
+}
+
diff --git a/opie-irdaapplet/opie-irdaapplet_cvs.oe b/opie-irdaapplet/opie-irdaapplet_cvs.oe
index b0ff4e9ac8..08cf6cbd9d 100644
--- a/opie-irdaapplet/opie-irdaapplet_cvs.oe
+++ b/opie-irdaapplet/opie-irdaapplet_cvs.oe
@@ -6,10 +6,10 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "irdaapplet"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/applets/irdaapplet \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/sounds \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/irdaapplet \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/sounds \
+           ${HANDHELDS_CVS};module=opie/apps"
 
 S = "${WORKDIR}/${APPNAME}"
 
diff --git a/opie-jumpx/opie-jumpx_1.1.7.oe b/opie-jumpx/opie-jumpx_1.1.7.oe
index e69de29bb2..9608c94f52 100644
--- a/opie-jumpx/opie-jumpx_1.1.7.oe
+++ b/opie-jumpx/opie-jumpx_1.1.7.oe
@@ -0,0 +1,39 @@
+DESCRIPTION = "JumpX input method"
+SECTION = "opie/inputmethods"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "qjumpx"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/jumpx \
+	   ${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
+
+S = "${WORKDIR}/jumpx"
+
+inherit opie
+
+pkg_postinst() {
+#!/bin/sh
+if [ -n "$D" ]; then exit 1; fi
+if pidof -s qpe >/dev/null; then
+  /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadInputMethods()"
+else
+  exit 0
+fi
+
+}
+
+pkg_postrm() {
+#!/bin/sh
+if [ -n "$D" ]; then exit 1; fi
+/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadInputMethods()"
+}
+
+# FILES plugins/inputmethods/libqjumpx.so* pics/jumpx
+do_install() {
+	install -d ${D}/${palmtopdir}/pics/jumpx/
+	install -m 0644 ${WORKDIR}/pics/jumpx/*.png ${D}/${palmtopdir}/pics/jumpx/
+}
+
diff --git a/opie-jumpx/opie-jumpx_cvs.oe b/opie-jumpx/opie-jumpx_cvs.oe
index c8b897ca64..574d5dda44 100644
--- a/opie-jumpx/opie-jumpx_cvs.oe
+++ b/opie-jumpx/opie-jumpx_cvs.oe
@@ -6,8 +6,8 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "qjumpx"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/inputmethods/jumpx \
-	   cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics"
+SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/jumpx \
+	   ${HANDHELDS_CVS};module=opie/pics"
 
 S = "${WORKDIR}/jumpx"
 
diff --git a/opie-kbill/opie-kbill_1.1.7.oe b/opie-kbill/opie-kbill_1.1.7.oe
index e69de29bb2..dc71f94d30 100644
--- a/opie-kbill/opie-kbill_1.1.7.oe
+++ b/opie-kbill/opie-kbill_1.1.7.oe
@@ -0,0 +1,27 @@
+DESCRIPTION = "The famous hit Bill game"
+SECTION = "opie/games"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "kbill"
+APPTYPE = "binary"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/kbill \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+# FILES bin/kbill apps/Games/kbill.desktop pics/kbill/*
+do_install() {
+        install -d ${D}${palmtopdir}/pics/${APPNAME}/pixmaps
+        install -d ${D}${palmtopdir}/pics/${APPNAME}/bitmaps
+        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+        install -m 0644 ${WORKDIR}/pics/${APPNAME}/bitmaps/*.xbm ${D}${palmtopdir}/pics/${APPNAME}/bitmaps
+        install -m 0644 ${WORKDIR}/pics/${APPNAME}/pixmaps/*.xpm ${D}${palmtopdir}/pics/${APPNAME}/pixmaps
+}
+
diff --git a/opie-kbill/opie-kbill_cvs.oe b/opie-kbill/opie-kbill_cvs.oe
index 7144e65d0e..edb9bf42e4 100644
--- a/opie-kbill/opie-kbill_cvs.oe
+++ b/opie-kbill/opie-kbill_cvs.oe
@@ -7,9 +7,9 @@ PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "kbill"
 APPTYPE = "binary"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/games/kbill \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/kbill \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/apps"
 
 S = "${WORKDIR}/${APPNAME}"
 
diff --git a/opie-kcheckers/opie-kcheckers_1.1.7.oe b/opie-kcheckers/opie-kcheckers_1.1.7.oe
index e69de29bb2..728b08d897 100644
--- a/opie-kcheckers/opie-kcheckers_1.1.7.oe
+++ b/opie-kcheckers/opie-kcheckers_1.1.7.oe
@@ -0,0 +1,23 @@
+DESCRIPTION = "The game of Checkers"
+SECTION = "opie/games"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "kcheckers"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/kcheckers \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+# FILES plugins/application/libkcheckers.so* bin/kcheckers apps/Games/kcheckers.desktop pics/kcheckers
+do_install() {
+        install -d ${D}${palmtopdir}/pics/${APPNAME}/
+        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.xpm ${D}${palmtopdir}/pics/${APPNAME}/
+}
+
diff --git a/opie-kcheckers/opie-kcheckers_cvs.oe b/opie-kcheckers/opie-kcheckers_cvs.oe
index aa0987966a..4f369d651b 100644
--- a/opie-kcheckers/opie-kcheckers_cvs.oe
+++ b/opie-kcheckers/opie-kcheckers_cvs.oe
@@ -6,9 +6,9 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "kcheckers"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/games/kcheckers \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/kcheckers \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/apps"
 
 S = "${WORKDIR}/${APPNAME}"
 
diff --git a/opie-keyboard/opie-keyboard_1.1.7.oe b/opie-keyboard/opie-keyboard_1.1.7.oe
index e69de29bb2..1ade5e45e8 100644
--- a/opie-keyboard/opie-keyboard_1.1.7.oe
+++ b/opie-keyboard/opie-keyboard_1.1.7.oe
@@ -0,0 +1,37 @@
+DESCRIPTION = "Opie Keyboard input method"
+SECTION = "opie/inputmethods"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+DEPENDS = "opie-pickboard"
+RDEPENDS = "opie-pickboard"
+
+APPNAME = "qkeyboard"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/keyboard "
+S = "${WORKDIR}/keyboard"
+
+inherit opie
+
+pkg_postinst() {
+#!/bin/sh
+if [ -n "$D" ]; then exit 1; fi
+if pidof -s qpe >/dev/null; then
+  /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadInputMethods()"
+else
+  exit 0
+fi
+
+}
+
+pkg_postrm() {
+#!/bin/sh
+if [ -n "$D" ]; then exit 1; fi
+/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadInputMethods()"
+}
+
+# FILES plugins/inputmethods/libqkeyboard.so*
+do_install() {
+}
+
diff --git a/opie-keyboard/opie-keyboard_cvs.oe b/opie-keyboard/opie-keyboard_cvs.oe
index babe0fcb7f..4db7676899 100644
--- a/opie-keyboard/opie-keyboard_cvs.oe
+++ b/opie-keyboard/opie-keyboard_cvs.oe
@@ -8,7 +8,7 @@ RDEPENDS = "opie-pickboard"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "qkeyboard"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/inputmethods/keyboard "
+SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/keyboard "
 S = "${WORKDIR}/keyboard"
 
 inherit opie
diff --git a/opie-keypebble/opie-keypebble_1.1.7.oe b/opie-keypebble/opie-keypebble_1.1.7.oe
index e69de29bb2..e692d55983 100644
--- a/opie-keypebble/opie-keypebble_1.1.7.oe
+++ b/opie-keypebble/opie-keypebble_1.1.7.oe
@@ -0,0 +1,21 @@
+DESCRIPTION = "A VNC Viewer"
+SECTION = "opie/applications"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "keypebble"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/comm/${APPNAME} \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics                    \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+do_install() {
+	install -d ${D}${palmtopdir}/pics/vnc
+	install -m 0644 ${WORKDIR}/pics/vnc/*.* ${D}${palmtopdir}/pics/vnc/
+}
+
diff --git a/opie-keypebble/opie-keypebble_cvs.oe b/opie-keypebble/opie-keypebble_cvs.oe
index e773f87064..71ed883d96 100644
--- a/opie-keypebble/opie-keypebble_cvs.oe
+++ b/opie-keypebble/opie-keypebble_cvs.oe
@@ -6,9 +6,9 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "keypebble"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/comm/${APPNAME} \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics                    \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/comm/${APPNAME} \
+           ${HANDHELDS_CVS};module=opie/pics                    \
+           ${HANDHELDS_CVS};module=opie/apps"
 S = "${WORKDIR}/${APPNAME}"
 
 inherit opie
diff --git a/opie-keytabs/opie-keytabs_1.1.7.oe b/opie-keytabs/opie-keytabs_1.1.7.oe
index e69de29bb2..81199d6275 100644
--- a/opie-keytabs/opie-keytabs_1.1.7.oe
+++ b/opie-keytabs/opie-keytabs_1.1.7.oe
@@ -0,0 +1,19 @@
+DESCRIPTION = "Opie keytabs for terminal applications"
+SECTION = "opie/base"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "virtual/libqpe"
+
+APPTYPE = "binary"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/etc "
+
+$palmtopdir = "/opt/QtPalmtop/"
+
+do_install() {
+        install -d ${D}${palmtopdir}/etc/keytabs/
+        install -m 0644 ${WORKDIR}/etc/keytabs/*.* ${D}${palmtopdir}/etc/keytabs/
+}
+
+FILES_${PN} = "${palmtopdir}/etc/keytabs/*"
diff --git a/opie-keytabs/opie-keytabs_cvs.oe b/opie-keytabs/opie-keytabs_cvs.oe
index 06ee3f66f7..4c8081c238 100644
--- a/opie-keytabs/opie-keytabs_cvs.oe
+++ b/opie-keytabs/opie-keytabs_cvs.oe
@@ -6,7 +6,7 @@ DEPENDS = "virtual/libqpe"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPTYPE = "binary"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/etc "
+SRC_URI = "${HANDHELDS_CVS};module=opie/etc "
 
 $palmtopdir = "/opt/QtPalmtop/"
 
diff --git a/opie-keyview/opie-keyview_1.1.7.oe b/opie-keyview/opie-keyview_1.1.7.oe
index e69de29bb2..1d231f922b 100644
--- a/opie-keyview/opie-keyview_1.1.7.oe
+++ b/opie-keyview/opie-keyview_1.1.7.oe
@@ -0,0 +1,31 @@
+DESCRIPTION = "Keyview Development Inputmethod"
+SECTION = "opie/inputmethods"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "virtual/libqpe"
+
+APPNAME = "keyview"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/development/keyview "
+
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+pkg_postinst() {
+#!/bin/sh
+if [ -n "$D" ]; then exit 1; fi
+if pidof -s qpe >/dev/null; then
+  /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadInputMethods()"
+else
+  exit 0
+fi
+}
+
+pkg_postrm() {
+#!/bin/sh
+/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadInputMethods()"
+}
+
+# FILES plugins/inputmethods/libkeyview.so*
diff --git a/opie-keyview/opie-keyview_cvs.oe b/opie-keyview/opie-keyview_cvs.oe
index 95d2e89b9d..fcbc469de7 100644
--- a/opie-keyview/opie-keyview_cvs.oe
+++ b/opie-keyview/opie-keyview_cvs.oe
@@ -6,7 +6,7 @@ DEPENDS = "virtual/libqpe"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "keyview"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/development/keyview "
+SRC_URI = "${HANDHELDS_CVS};module=opie/development/keyview "
 
 S = "${WORKDIR}/${APPNAME}"
 
diff --git a/opie-kjumpx/opie-kjumpx_1.1.7.oe b/opie-kjumpx/opie-kjumpx_1.1.7.oe
index e69de29bb2..b4da30e472 100644
--- a/opie-kjumpx/opie-kjumpx_1.1.7.oe
+++ b/opie-kjumpx/opie-kjumpx_1.1.7.oe
@@ -0,0 +1,40 @@
+DESCRIPTION = "Koreanized JumpX input method"
+SECTION = "opie/inputmethods"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+RDEPENDS = "opie-pics"
+
+APPNAME = "qkjumpx"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/kjumpx \
+	   ${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
+
+S = "${WORKDIR}/kjumpx"
+
+inherit opie
+
+pkg_postinst() {
+#!/bin/sh
+if [ -n "$D" ]; then exit 1; fi
+if pidof -s qpe >/dev/null; then
+  /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadInputMethods()"
+else
+  exit 0
+fi
+
+}
+
+pkg_postrm() {
+#!/bin/sh
+if [ -n "$D" ]; then exit 1; fi
+/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadInputMethods()"
+}
+
+# FILES plugins/inputmethods/libqkjumpx.so* pics/kjumpx/*
+do_install() {
+	install -d ${D}/${palmtopdir}/pics/kjumpx/
+	install -m 0644 ${WORKDIR}/pics/kjumpx/*.png ${D}/${palmtopdir}/pics/kjumpx/
+}
+
diff --git a/opie-kjumpx/opie-kjumpx_cvs.oe b/opie-kjumpx/opie-kjumpx_cvs.oe
index 74e4ba0924..29a5c4c8d2 100644
--- a/opie-kjumpx/opie-kjumpx_cvs.oe
+++ b/opie-kjumpx/opie-kjumpx_cvs.oe
@@ -7,8 +7,8 @@ RDEPENDS = "opie-pics"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "qkjumpx"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/inputmethods/kjumpx \
-	   cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics"
+SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/kjumpx \
+	   ${HANDHELDS_CVS};module=opie/pics"
 
 S = "${WORKDIR}/kjumpx"
 
diff --git a/opie-kpacman/opie-kpacman_1.1.7.oe b/opie-kpacman/opie-kpacman_1.1.7.oe
index e69de29bb2..db92f83523 100644
--- a/opie-kpacman/opie-kpacman_1.1.7.oe
+++ b/opie-kpacman/opie-kpacman_1.1.7.oe
@@ -0,0 +1,41 @@
+DESCRIPTION = "Kpacman, the classical arcade game of Pacman"
+SECTION = "opie/games"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "kpacman"
+APPTYPE = "binary"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/kpacman \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/share \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+pkg_postinst() {
+#!/bin/sh
+if [ -n "$D" ]; then exit 1; fi
+
+if [ ! -f $HOME/Settings/kpacman.conf ]
+    exit 0
+then
+    cp /opt/QtPalmtop/share/kpacman/kpacman.conf $HOME/Settings/
+fi
+}
+
+# FILES bin/kpacman apps/Games/kpacman.desktop pics/kpacman/kpacman.png share/kpacman
+do_install() {
+        install -d ${D}${palmtopdir}/pics/${APPNAME}/
+        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+        install -d ${D}${palmtopdir}/share/${APPNAME}/fonts
+        install -d ${D}${palmtopdir}/share/${APPNAME}/pics
+        install -m 0644 ${WORKDIR}/share/${APPNAME}/*.conf ${D}${palmtopdir}/share/${APPNAME}/
+        install -m 0644 ${WORKDIR}/share/${APPNAME}/fonts/*.xbm ${D}${palmtopdir}/share/${APPNAME}/fonts/
+        install -m 0644 ${WORKDIR}/share/${APPNAME}/pics/*.xpm ${D}${palmtopdir}/share/${APPNAME}/pics/
+}
+
diff --git a/opie-kpacman/opie-kpacman_cvs.oe b/opie-kpacman/opie-kpacman_cvs.oe
index a8eef7a628..5d78a204dd 100644
--- a/opie-kpacman/opie-kpacman_cvs.oe
+++ b/opie-kpacman/opie-kpacman_cvs.oe
@@ -6,10 +6,10 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "kpacman"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/games/kpacman \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/share \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/kpacman \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/share \
+           ${HANDHELDS_CVS};module=opie/apps"
 
 S = "${WORKDIR}/${APPNAME}"
 
diff --git a/opie-language/opie-language_1.1.7.oe b/opie-language/opie-language_1.1.7.oe
index e69de29bb2..4893db8c5e 100644
--- a/opie-language/opie-language_1.1.7.oe
+++ b/opie-language/opie-language_1.1.7.oe
@@ -0,0 +1,18 @@
+DESCRIPTION = "Language settings dialog"
+SECTION = "opie/settings"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "language"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/language \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+# FILES plugins/application/liblanguage.so* bin/language apps/Settings/Language.desktop
+
diff --git a/opie-language/opie-language_cvs.oe b/opie-language/opie-language_cvs.oe
index 984854c92e..f51341a7dd 100644
--- a/opie-language/opie-language_cvs.oe
+++ b/opie-language/opie-language_cvs.oe
@@ -6,8 +6,8 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "language"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/settings/language \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/language \
+           ${HANDHELDS_CVS};module=opie/apps"
 
 S = "${WORKDIR}/${APPNAME}"
 
diff --git a/opie-launcher-settings/opie-launcher-settings_1.1.7.oe b/opie-launcher-settings/opie-launcher-settings_1.1.7.oe
index e69de29bb2..e5edd0e172 100644
--- a/opie-launcher-settings/opie-launcher-settings_1.1.7.oe
+++ b/opie-launcher-settings/opie-launcher-settings_1.1.7.oe
@@ -0,0 +1,23 @@
+DESCRIPTION = "Launcher settings dialog"
+SECTION = "opie/settings"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+DEPENDS = "libqtaux2"
+
+APPNAME = "launchersettings"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/settings/launcher \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
+	   cvs://anoncvs:anoncvs@cvs.handhelds.org/Cvs;tag=${TAG};module=opie/pics"
+
+S = "${WORKDIR}/launcher"
+
+inherit opie
+
+# FILES plugins/application/liblaunchersettings.so* bin/launchersettings apps/Settings/launchersettings.desktop pics/launchersettings
+do_install() {
+        install -d ${D}${palmtopdir}/pics/${APPNAME}/
+        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+} 
diff --git a/opie-launcher-settings/opie-launcher-settings_cvs.oe b/opie-launcher-settings/opie-launcher-settings_cvs.oe
index 831f7dce1a..a28619e5b7 100644
--- a/opie-launcher-settings/opie-launcher-settings_cvs.oe
+++ b/opie-launcher-settings/opie-launcher-settings_cvs.oe
@@ -7,8 +7,8 @@ DEPENDS = "libqtaux2"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "launchersettings"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/settings/launcher \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps \
+SRC_URI = "${HANDHELDS_CVS};module=opie/core/settings/launcher \
+           ${HANDHELDS_CVS};module=opie/apps \
 	   cvs://anoncvs:anoncvs@cvs.handhelds.org/Cvs;module=opie/pics"
 
 S = "${WORKDIR}/launcher"
diff --git a/opie-libqrsync/opie-libqrsync_1.1.7.oe b/opie-libqrsync/opie-libqrsync_1.1.7.oe
index e69de29bb2..22b59e5b63 100644
--- a/opie-libqrsync/opie-libqrsync_1.1.7.oe
+++ b/opie-libqrsync/opie-libqrsync_1.1.7.oe
@@ -0,0 +1,16 @@
+DESCRIPTION = "Qt wrapper for librsync"
+SECTION = "opie/base"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/rsync"
+S = "${WORKDIR}/rsync"
+
+inherit opie
+
+do_stage() {
+	oe_libinstall -a libqrsync ${STAGING_LIBDIR}/
+	install -m 0644 qrsync.h ${STAGING_INCDIR}/
+}
diff --git a/opie-libqrsync/opie-libqrsync_cvs.oe b/opie-libqrsync/opie-libqrsync_cvs.oe
index 8daa4aef24..921d9404ca 100644
--- a/opie-libqrsync/opie-libqrsync_cvs.oe
+++ b/opie-libqrsync/opie-libqrsync_cvs.oe
@@ -5,7 +5,7 @@ MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/rsync"
+SRC_URI = "${HANDHELDS_CVS};module=opie/rsync"
 S = "${WORKDIR}/rsync"
 
 inherit opie
diff --git a/opie-light-and-power/opie-light-and-power_1.1.7.oe b/opie-light-and-power/opie-light-and-power_1.1.7.oe
index e69de29bb2..2affc546fe 100644
--- a/opie-light-and-power/opie-light-and-power_1.1.7.oe
+++ b/opie-light-and-power/opie-light-and-power_1.1.7.oe
@@ -0,0 +1,23 @@
+DESCRIPTION = "Light and Power settings dialog"
+SECTION = "opie/settings"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "light-and-power"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/settings/light-and-power \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+# FILES plugins/application/liblight-and-power.so* bin/light-and-power apps/Settings/light.desktop pics/lightandpower
+do_install() {
+        install -d ${D}${palmtopdir}/pics/lightandpower/
+        install -m 0644 ${WORKDIR}/pics/lightandpower/*.png ${D}${palmtopdir}/pics/lightandpower/
+}
+
diff --git a/opie-light-and-power/opie-light-and-power_cvs.oe b/opie-light-and-power/opie-light-and-power_cvs.oe
index a9561647f5..e95d9a3b4f 100644
--- a/opie-light-and-power/opie-light-and-power_cvs.oe
+++ b/opie-light-and-power/opie-light-and-power_cvs.oe
@@ -6,9 +6,9 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "light-and-power"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/settings/light-and-power \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/core/settings/light-and-power \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/apps"
 
 S = "${WORKDIR}/${APPNAME}"
 
diff --git a/opie-lockapplet/opie-lockapplet_cvs.oe b/opie-lockapplet/opie-lockapplet_cvs.oe
index 9129963902..5b48bd1016 100644
--- a/opie-lockapplet/opie-lockapplet_cvs.oe
+++ b/opie-lockapplet/opie-lockapplet_cvs.oe
@@ -8,8 +8,8 @@ APPNAME = "lockapplet"
 DEPENDS = "opie-security"
 RDEPENDS = "opie-security"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/applets/lockapplet \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics "
+SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/lockapplet \
+           ${HANDHELDS_CVS};module=opie/pics "
 
 S = "${WORKDIR}/lockapplet"
 
diff --git a/opie-login/opie-login_1.1.7.oe b/opie-login/opie-login_1.1.7.oe
index e69de29bb2..54f8533c8f 100644
--- a/opie-login/opie-login_1.1.7.oe
+++ b/opie-login/opie-login_1.1.7.oe
@@ -0,0 +1,25 @@
+DESCRIPTION = "Opie Login Manager (similar to gdm, xdm or kdm)"
+SECTION = "opie/base"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "opie-login"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/${APPNAME} \
+	   ${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate \
+	   ${HANDHELDS_CVS};tag=${TAG};module=opie/core/launcher"
+
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+EXTRA_QMAKEVARS_POST_append = " LIBS-=-lpam"
+EXTRA_QMAKEVARS_POST_append = " DEFINES-=USEPAM"
+
+do_configure() {
+	install -d "${WORKDIR}/apps"
+	ln -s "${WORKDIR}/calibrate" "${WORKDIR}/apps/calibrate"
+	palmtop_do_configure
+}
diff --git a/opie-login/opie-login_cvs.oe b/opie-login/opie-login_cvs.oe
index 218690c05a..503ece7a8b 100644
--- a/opie-login/opie-login_cvs.oe
+++ b/opie-login/opie-login_cvs.oe
@@ -6,9 +6,9 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "opie-login"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/${APPNAME} \
-	   cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/apps/calibrate \
-	   cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/launcher"
+SRC_URI = "${HANDHELDS_CVS};module=opie/core/${APPNAME} \
+	   ${HANDHELDS_CVS};module=opie/core/apps/calibrate \
+	   ${HANDHELDS_CVS};module=opie/core/launcher"
 
 S = "${WORKDIR}/${APPNAME}"
 
diff --git a/opie-logoutapplet/opie-logoutapplet_1.1.7.oe b/opie-logoutapplet/opie-logoutapplet_1.1.7.oe
index e69de29bb2..34c5114b55 100644
--- a/opie-logoutapplet/opie-logoutapplet_1.1.7.oe
+++ b/opie-logoutapplet/opie-logoutapplet_1.1.7.oe
@@ -0,0 +1,20 @@
+DESCRIPTION = "Logout Applet"
+SECTION = "opie/applets"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "logoutapplet"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/logoutapplet \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+# FILES
+do_install() {
+}
+
diff --git a/opie-logoutapplet/opie-logoutapplet_cvs.oe b/opie-logoutapplet/opie-logoutapplet_cvs.oe
index c8937070dd..2f739abc01 100644
--- a/opie-logoutapplet/opie-logoutapplet_cvs.oe
+++ b/opie-logoutapplet/opie-logoutapplet_cvs.oe
@@ -6,8 +6,8 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "logoutapplet"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/applets/logoutapplet \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/logoutapplet \
+           ${HANDHELDS_CVS};module=opie/apps"
 
 S = "${WORKDIR}/${APPNAME}"
 
diff --git a/opie-mail/opie-mail_1.1.7.oe b/opie-mail/opie-mail_1.1.7.oe
index e69de29bb2..9bfd380497 100644
--- a/opie-mail/opie-mail_1.1.7.oe
+++ b/opie-mail/opie-mail_1.1.7.oe
@@ -0,0 +1,26 @@
+DESCRIPTION = "Opie's mail and news client featuring POP3, IMAP and NNTP - with and without SSL."
+SECTION = "opie/pim"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+DEPENDS = "libmailwrapper libetpan"
+RDEPENDS = "opie-pics"
+
+APPNAME = "opiemail"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/mail \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
+	   ${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
+
+S = "${WORKDIR}/mail"
+
+inherit opie
+
+# FILES plugins/application/libopiemail.so* bin/opiemail apps/1Pim/mail.desktop pics/mail/*.png
+
+do_install() {
+	install -d ${D}/${palmtopdir}/pics/mail/
+	install -m 0644 ${WORKDIR}/pics/mail/*.png ${D}/${palmtopdir}/pics/mail/
+}
+
diff --git a/opie-mail/opie-mail_cvs.oe b/opie-mail/opie-mail_cvs.oe
index 2114a17054..de33550820 100644
--- a/opie-mail/opie-mail_cvs.oe
+++ b/opie-mail/opie-mail_cvs.oe
@@ -8,9 +8,9 @@ RDEPENDS = "opie-pics"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "opiemail"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/net/mail \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps \
-	   cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/mail \
+           ${HANDHELDS_CVS};module=opie/apps \
+	   ${HANDHELDS_CVS};module=opie/pics"
 
 S = "${WORKDIR}/mail"
 
diff --git a/opie-mailapplet/opie-mailapplet_1.1.7.oe b/opie-mailapplet/opie-mailapplet_1.1.7.oe
index e69de29bb2..8fa3693407 100644
--- a/opie-mailapplet/opie-mailapplet_1.1.7.oe
+++ b/opie-mailapplet/opie-mailapplet_1.1.7.oe
@@ -0,0 +1,18 @@
+DESCRIPTION = "A Biff-like mailchecker"
+SECTION = "opie/applets"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+DEPENDS = "libmailwrapper"
+
+APPNAME = "mailapplet"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/mail/taskbarapplet \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/taskbarapplet"
+
+inherit opie
+
diff --git a/opie-mailapplet/opie-mailapplet_cvs.oe b/opie-mailapplet/opie-mailapplet_cvs.oe
index 7805c680ce..f5189d2cbe 100644
--- a/opie-mailapplet/opie-mailapplet_cvs.oe
+++ b/opie-mailapplet/opie-mailapplet_cvs.oe
@@ -7,9 +7,9 @@ DEPENDS = "libmailwrapper"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "mailapplet"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/net/mail/taskbarapplet \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/mail/taskbarapplet \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/apps"
 
 S = "${WORKDIR}/taskbarapplet"
 
diff --git a/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_1.1.7.oe b/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_1.1.7.oe
index e69de29bb2..614b2138c8 100644
--- a/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_1.1.7.oe
+++ b/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_1.1.7.oe
@@ -0,0 +1,24 @@
+DESCRIPTION = "MP3 file plugin for opie-mediaplayer11 using libmad"
+SECTION = "opie/codecs"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+DEPENDS = "opie-mediaplayer1 libmad"
+RDEPENDS = "opie-mediaplayer1"
+
+APPNAME = "madplugin"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer \
+	   file://libmadplugin.pro"
+
+S = "${WORKDIR}/opieplayer/libmad"
+QMAKE_PROFILES = "libmadplugin.pro"
+
+inherit opie
+
+do_configure_prepend() {
+	install -m 0644 ${WORKDIR}/libmadplugin.pro ${S}/
+}
+
+# FILES plugins/codecs/libmadplugin.so
diff --git a/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_cvs.oe b/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_cvs.oe
index 527de6aa6f..8051b6d7bb 100644
--- a/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_cvs.oe
+++ b/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_cvs.oe
@@ -8,7 +8,7 @@ RDEPENDS = "opie-mediaplayer1"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "madplugin"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/multimedia/opieplayer \
+SRC_URI = "${HANDHELDS_CVS};module=opie/core/multimedia/opieplayer \
 	   file://libmadplugin.pro"
 
 S = "${WORKDIR}/opieplayer/libmad"
diff --git a/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_1.1.7.oe b/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_1.1.7.oe
index e69de29bb2..49aaf16f88 100644
--- a/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_1.1.7.oe
+++ b/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_1.1.7.oe
@@ -0,0 +1,18 @@
+DESCRIPTION = "MOD/XM/S3M/IT plugin using libmodplug"
+SECTION = "opie/codecs"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "opie-mediaplayer1"
+RDEPENDS = "opie-mediaplayer1"
+
+APPNAME = "modplugin"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer "
+
+S = "${WORKDIR}/opieplayer/modplug"
+
+inherit opie
+
+# FILES plugins/codecs/libmodplugin.so*
+
diff --git a/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_cvs.oe b/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_cvs.oe
index 2da4dc6a43..fbd8dde877 100644
--- a/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_cvs.oe
+++ b/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_cvs.oe
@@ -7,7 +7,7 @@ RDEPENDS = "opie-mediaplayer1"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "modplugin"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/multimedia/opieplayer "
+SRC_URI = "${HANDHELDS_CVS};module=opie/core/multimedia/opieplayer "
 
 S = "${WORKDIR}/opieplayer/modplug"
 
diff --git a/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_1.1.7.oe b/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_1.1.7.oe
index e69de29bb2..8bdd82ab8a 100644
--- a/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_1.1.7.oe
+++ b/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_1.1.7.oe
@@ -0,0 +1,25 @@
+DESCRIPTION = "Ogg file plugin using tremor"
+SECTION = "opie/codecs"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+DEPENDS = "opie-mediaplayer1 tremor"
+RDEPENDS = "opie-mediaplayer1"
+
+APPNAME = "tremorplugin"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer \
+	   file://vorbis.pro "
+
+S = "${WORKDIR}/opieplayer/vorbis"
+
+QMAKE_PROFILES = "vorbis.pro"
+
+inherit opie
+
+do_configure_prepend() {
+	install -m 0644 ${WORKDIR}/vorbis.pro ${S}/
+}
+
+# FILES plugins/codecs/libtremorplugin.so
diff --git a/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_cvs.oe b/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_cvs.oe
index f6a9cf7a66..e7acc8c25d 100644
--- a/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_cvs.oe
+++ b/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_cvs.oe
@@ -8,7 +8,7 @@ RDEPENDS = "opie-mediaplayer1"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "tremorplugin"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/multimedia/opieplayer \
+SRC_URI = "${HANDHELDS_CVS};module=opie/core/multimedia/opieplayer \
 	   file://vorbis.pro "
 
 S = "${WORKDIR}/opieplayer/vorbis"
diff --git a/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_1.1.7.oe b/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_1.1.7.oe
index e69de29bb2..fd10e2efcb 100644
--- a/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_1.1.7.oe
+++ b/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_1.1.7.oe
@@ -0,0 +1,17 @@
+DESCRIPTION = "WAV file plugin"
+SECTION = "opie/codecs"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "opie-mediaplayer1"
+RDEPENDS = "opie-mediaplayer1"
+
+APPNAME = "wavplugin"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer "
+
+S = "${WORKDIR}/opieplayer/${APPNAME}"
+
+inherit opie
+
+# FILES plugins/codecs/libwavplugin*
diff --git a/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_cvs.oe b/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_cvs.oe
index 01868d6679..0d7fe70ad5 100644
--- a/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_cvs.oe
+++ b/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_cvs.oe
@@ -7,7 +7,7 @@ RDEPENDS = "opie-mediaplayer1"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "wavplugin"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/multimedia/opieplayer "
+SRC_URI = "${HANDHELDS_CVS};module=opie/core/multimedia/opieplayer "
 
 S = "${WORKDIR}/opieplayer/${APPNAME}"
 
diff --git a/opie-mediaplayer1/opie-mediaplayer1_1.1.7.oe b/opie-mediaplayer1/opie-mediaplayer1_1.1.7.oe
index d279dc8c1b..ddd1252971 100644
--- a/opie-mediaplayer1/opie-mediaplayer1_1.1.7.oe
+++ b/opie-mediaplayer1/opie-mediaplayer1_1.1.7.oe
@@ -10,9 +10,9 @@ APPNAME = "opieplayer"
 APPTYPE = "binary"
 
 TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/core/multimedia/opieplayer \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
 
 S = "${WORKDIR}/${APPNAME}"
 
diff --git a/opie-mediaplayer1/opie-mediaplayer1_cvs.oe b/opie-mediaplayer1/opie-mediaplayer1_cvs.oe
index e22fed10d9..d393f4c5de 100644
--- a/opie-mediaplayer1/opie-mediaplayer1_cvs.oe
+++ b/opie-mediaplayer1/opie-mediaplayer1_cvs.oe
@@ -9,9 +9,9 @@ PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "opieplayer"
 APPTYPE = "binary"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/multimedia/opieplayer \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/core/multimedia/opieplayer \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/apps"
 
 S = "${WORKDIR}/${APPNAME}"
 
diff --git a/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_1.1.7.oe b/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_1.1.7.oe
index e69de29bb2..20b0bca774 100644
--- a/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_1.1.7.oe
+++ b/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_1.1.7.oe
@@ -0,0 +1,18 @@
+DESCRIPTION = "Skin for opie-mediaplayer2"
+SECTION = "opie/multimedia"
+PRIORITY = "optional"
+LICENSE = "GPL"
+
+APPNAME="opieplayer2"
+
+RPROVIDES="opie-mediaplayer2-skin"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
+
+FILES_${PN} = "${palmtopdir}/pics/${APPNAME}/skins/default_landscape/*.png"
+
+do_install() {
+	install -d ${D}${palmtopdir}/pics/${APPNAME}/skins/default_landscape/
+        install -m 0644 ${WORKDIR}/pics/${APPNAME}/skins/default_landscape/*.png ${D}${palmtopdir}/pics/${APPNAME}/skins/default_landscape/
+}
diff --git a/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_cvs.oe b/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_cvs.oe
index 4062b53bb7..803cb63b2d 100644
--- a/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_cvs.oe
+++ b/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_cvs.oe
@@ -7,7 +7,7 @@ APPNAME = "opieplayer2"
 
 RPROVIDES = "opie-mediaplayer2-skin"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics"
+SRC_URI = "${HANDHELDS_CVS};module=opie/pics"
 
 FILES_${PN} = "${palmtopdir}/pics/${APPNAME}/skins/default_landscape/*.png"
 
diff --git a/opie-mediaplayer2/opie-mediaplayer2-skin-default_1.1.7.oe b/opie-mediaplayer2/opie-mediaplayer2-skin-default_1.1.7.oe
index e69de29bb2..d4b2a5a3ee 100644
--- a/opie-mediaplayer2/opie-mediaplayer2-skin-default_1.1.7.oe
+++ b/opie-mediaplayer2/opie-mediaplayer2-skin-default_1.1.7.oe
@@ -0,0 +1,18 @@
+DESCRIPTION = "Skin for opie-mediaplayer2"
+SECTION = "opie/multimedia"
+PRIORITY = "optional"
+LICENSE = "GPL"
+
+APPNAME="opieplayer2"
+
+RPROVIDES="opie-mediaplayer2-skin"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
+
+FILES_${PN} = "${palmtopdir}/pics/${APPNAME}/skins/default/*.png"
+
+do_install() {
+	install -d ${D}${palmtopdir}/pics/${APPNAME}/skins/default/
+        install -m 0644 ${WORKDIR}/pics/${APPNAME}/skins/default/*.png ${D}${palmtopdir}/pics/${APPNAME}/skins/default/
+}
diff --git a/opie-mediaplayer2/opie-mediaplayer2-skin-default_cvs.oe b/opie-mediaplayer2/opie-mediaplayer2-skin-default_cvs.oe
index 2fd6ec29c9..c882d2d505 100644
--- a/opie-mediaplayer2/opie-mediaplayer2-skin-default_cvs.oe
+++ b/opie-mediaplayer2/opie-mediaplayer2-skin-default_cvs.oe
@@ -7,7 +7,7 @@ APPNAME = "opieplayer2"
 
 RPROVIDES = "opie-mediaplayer2-skin"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics"
+SRC_URI = "${HANDHELDS_CVS};module=opie/pics"
 
 FILES_${PN} = "${palmtopdir}/pics/${APPNAME}/skins/default/*.png"
 
diff --git a/opie-mediaplayer2/opie-mediaplayer2-skin-pod_1.1.7.oe b/opie-mediaplayer2/opie-mediaplayer2-skin-pod_1.1.7.oe
index e69de29bb2..ce18229c78 100644
--- a/opie-mediaplayer2/opie-mediaplayer2-skin-pod_1.1.7.oe
+++ b/opie-mediaplayer2/opie-mediaplayer2-skin-pod_1.1.7.oe
@@ -0,0 +1,18 @@
+DESCRIPTION = "Skin for opie-mediaplayer2"
+SECTION = "opie/multimedia"
+PRIORITY = "optional"
+LICENSE = "GPL"
+
+APPNAME="opieplayer2"
+
+RPROVIDES="opie-mediaplayer2-skin"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
+
+FILES_${PN} = "${palmtopdir}/pics/${APPNAME}/skins/Pod/*.png"
+
+do_install() {
+	install -d ${D}${palmtopdir}/pics/${APPNAME}/skins/Pod/
+        install -m 0644 ${WORKDIR}/pics/${APPNAME}/skins/Pod/*.png ${D}${palmtopdir}/pics/${APPNAME}/skins/Pod/
+}
diff --git a/opie-mediaplayer2/opie-mediaplayer2-skin-pod_cvs.oe b/opie-mediaplayer2/opie-mediaplayer2-skin-pod_cvs.oe
index 183ab5586c..7bd80615ad 100644
--- a/opie-mediaplayer2/opie-mediaplayer2-skin-pod_cvs.oe
+++ b/opie-mediaplayer2/opie-mediaplayer2-skin-pod_cvs.oe
@@ -7,7 +7,7 @@ APPNAME = "opieplayer2"
 
 RPROVIDES = "opie-mediaplayer2-skin"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics"
+SRC_URI = "${HANDHELDS_CVS};module=opie/pics"
 
 FILES_${PN} = "${palmtopdir}/pics/${APPNAME}/skins/Pod/*.png"
 
diff --git a/opie-mediaplayer2/opie-mediaplayer2-skin-techno_1.1.7.oe b/opie-mediaplayer2/opie-mediaplayer2-skin-techno_1.1.7.oe
index e69de29bb2..9a075ae9d1 100644
--- a/opie-mediaplayer2/opie-mediaplayer2-skin-techno_1.1.7.oe
+++ b/opie-mediaplayer2/opie-mediaplayer2-skin-techno_1.1.7.oe
@@ -0,0 +1,18 @@
+DESCRIPTION = "Skin for opie-mediaplayer2"
+SECTION = "opie/multimedia"
+PRIORITY = "optional"
+LICENSE = "GPL"
+
+APPNAME="opieplayer2"
+
+RPROVIDES="opie-mediaplayer2-skin"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
+
+FILES_${PN} = "${palmtopdir}/pics/${APPNAME}/skins/techno/*.png"
+
+do_install() {
+	install -d ${D}${palmtopdir}/pics/${APPNAME}/skins/techno/
+        install -m 0644 ${WORKDIR}/pics/${APPNAME}/skins/techno/*.png ${D}${palmtopdir}/pics/${APPNAME}/skins/techno/
+}
diff --git a/opie-mediaplayer2/opie-mediaplayer2-skin-techno_cvs.oe b/opie-mediaplayer2/opie-mediaplayer2-skin-techno_cvs.oe
index 9a1c782bbc..ab19aa31c5 100644
--- a/opie-mediaplayer2/opie-mediaplayer2-skin-techno_cvs.oe
+++ b/opie-mediaplayer2/opie-mediaplayer2-skin-techno_cvs.oe
@@ -7,7 +7,7 @@ APPNAME = "opieplayer2"
 
 RPROVIDES = "opie-mediaplayer2-skin"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics"
+SRC_URI = "${HANDHELDS_CVS};module=opie/pics"
 
 FILES_${PN} = "${palmtopdir}/pics/${APPNAME}/skins/techno/*.png"
 
diff --git a/opie-mediaplayer2/opie-mediaplayer2_1.1.7.oe b/opie-mediaplayer2/opie-mediaplayer2_1.1.7.oe
index 521b4fafd0..98f8df2e27 100644
--- a/opie-mediaplayer2/opie-mediaplayer2_1.1.7.oe
+++ b/opie-mediaplayer2/opie-mediaplayer2_1.1.7.oe
@@ -12,9 +12,9 @@ APPNAME = "opieplayer2"
 PR = "r2"
 
 TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/noncore/multimedia/opieplayer2 \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/apps \
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/multimedia/opieplayer2 \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
 	   file://fix-switch-yuv2rgb_arm2.patch;patch=1"
 S = "${WORKDIR}/${APPNAME}"
 
diff --git a/opie-mediaplayer2/opie-mediaplayer2_cvs.oe b/opie-mediaplayer2/opie-mediaplayer2_cvs.oe
index c373723d2d..5c5e75c4c8 100644
--- a/opie-mediaplayer2/opie-mediaplayer2_cvs.oe
+++ b/opie-mediaplayer2/opie-mediaplayer2_cvs.oe
@@ -12,9 +12,9 @@ libxine-plugin-dmx-audio libxine-plugin-dmx-mpeg libxine-plugin-inp-file "
 APPNAME = "opieplayer2"
 PR = "r3"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/multimedia/opieplayer2 \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps \
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/multimedia/opieplayer2 \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/apps \
 	   file://fix-switch-yuv2rgb_arm2.patch;patch=1"
 S = "${WORKDIR}/${APPNAME}"
 
diff --git a/opie-mediummount/opie-mediummount_1.1.7.oe b/opie-mediummount/opie-mediummount_1.1.7.oe
index e69de29bb2..3fe8efc6eb 100644
--- a/opie-mediummount/opie-mediummount_1.1.7.oe
+++ b/opie-mediummount/opie-mediummount_1.1.7.oe
@@ -0,0 +1,23 @@
+DESCRIPTION = "Medium mount configuration"
+SECTION = "opie/settings"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "mediummount"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/mediummount \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+# FILES plugins/application/libmediummount.so* bin/mediummount apps/Settings/medium.desktop pics/mediummount/*
+do_install() {
+        install -d ${D}${palmtopdir}/pics/${APPNAME}/
+        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+}
+
diff --git a/opie-mediummount/opie-mediummount_cvs.oe b/opie-mediummount/opie-mediummount_cvs.oe
index 3e204497a0..8a00572626 100644
--- a/opie-mediummount/opie-mediummount_cvs.oe
+++ b/opie-mediummount/opie-mediummount_cvs.oe
@@ -6,9 +6,9 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "mediummount"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/settings/mediummount \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/mediummount \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/apps"
 
 S = "${WORKDIR}/${APPNAME}"
 
diff --git a/opie-memoryapplet/opie-memoryapplet_1.1.7.oe b/opie-memoryapplet/opie-memoryapplet_1.1.7.oe
index e69de29bb2..4d323bee28 100644
--- a/opie-memoryapplet/opie-memoryapplet_1.1.7.oe
+++ b/opie-memoryapplet/opie-memoryapplet_1.1.7.oe
@@ -0,0 +1,38 @@
+DESCRIPTION = "Memory Applet. \
+This applet displays the amount of free memory and manages the swap partition"
+SECTION = "opie/applets"
+PRIORITY = "optional"
+LICENSE = "GPL"
+
+APPNAME = "memoryapplet"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/memoryapplet \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/sysinfo \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           file://memoryapplet.pro.patch;patch=1"
+
+S = "${WORKDIR}/memoryapplet"
+
+inherit opie
+
+pkg_postinst() {
+#!/bin/sh
+if pidof -s qpe >/dev/null; then
+  /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+fi
+ if [ -n "$D" ]; then false; fi
+}
+
+pkg_postrm() {
+#!/bin/sh
+/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+ if [ -n "$D" ]; then false; fi
+}
+
+do_install() {
+    install -d ${D}/${palmtopdir}/plugins/applets ${D}/${palmtopdir}/pics/memory/
+    install -m 0644 ${WORKDIR}/pics/memory/*.png ${D}/${palmtopdir}/pics/memory/
+    oe_libinstall -so libmemoryapplet ${D}/${palmtopdir}/plugins/applets/
+}
+
diff --git a/opie-memoryapplet/opie-memoryapplet_cvs.oe b/opie-memoryapplet/opie-memoryapplet_cvs.oe
index 5adb7dc6fd..c61d93fc0f 100644
--- a/opie-memoryapplet/opie-memoryapplet_cvs.oe
+++ b/opie-memoryapplet/opie-memoryapplet_cvs.oe
@@ -6,9 +6,9 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "memoryapplet"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/applets/memoryapplet \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/settings/sysinfo \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/memoryapplet \
+           ${HANDHELDS_CVS};module=opie/noncore/settings/sysinfo \
+           ${HANDHELDS_CVS};module=opie/pics \
            file://memoryapplet.pro.patch;patch=1"
 
 S = "${WORKDIR}/memoryapplet"
diff --git a/opie-mindbreaker/opie-mindbreaker_1.1.7.oe b/opie-mindbreaker/opie-mindbreaker_1.1.7.oe
index e69de29bb2..bb93dbe8f5 100644
--- a/opie-mindbreaker/opie-mindbreaker_1.1.7.oe
+++ b/opie-mindbreaker/opie-mindbreaker_1.1.7.oe
@@ -0,0 +1,23 @@
+DESCRIPTION = "Game: crack the coloured code"
+SECTION = "opie/games"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "mindbreaker"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/mindbreaker \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+# FILES plugins/application/libmindbreaker.so* bin/mindbreaker apps/Games/mindbreaker.desktop pics/mindbreaker
+do_install() {
+        install -d ${D}${palmtopdir}/pics/${APPNAME}/
+        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+}
+
diff --git a/opie-mindbreaker/opie-mindbreaker_cvs.oe b/opie-mindbreaker/opie-mindbreaker_cvs.oe
index 5cea0e0fe3..4b2d302d0f 100644
--- a/opie-mindbreaker/opie-mindbreaker_cvs.oe
+++ b/opie-mindbreaker/opie-mindbreaker_cvs.oe
@@ -6,9 +6,9 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "mindbreaker"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/games/mindbreaker \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/mindbreaker \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/apps"
 
 S = "${WORKDIR}/${APPNAME}"
 
diff --git a/opie-minesweep/opie-minesweep_1.1.7.oe b/opie-minesweep/opie-minesweep_1.1.7.oe
index e69de29bb2..1325c12610 100644
--- a/opie-minesweep/opie-minesweep_1.1.7.oe
+++ b/opie-minesweep/opie-minesweep_1.1.7.oe
@@ -0,0 +1,23 @@
+DESCRIPTION = "Game: find the mines"
+SECTION = "opie/games"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "minesweep"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/minesweep \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+# FILES plugins/application/libminesweep.so* bin/minesweep apps/Games/minesweep.desktop pics/minesweep
+do_install() {
+        install -d ${D}${palmtopdir}/pics/${APPNAME}/
+        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+}
+
diff --git a/opie-minesweep/opie-minesweep_cvs.oe b/opie-minesweep/opie-minesweep_cvs.oe
index e5dc40f04d..b2a64b8083 100644
--- a/opie-minesweep/opie-minesweep_cvs.oe
+++ b/opie-minesweep/opie-minesweep_cvs.oe
@@ -6,9 +6,9 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "minesweep"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/games/minesweep \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/minesweep \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/apps"
 
 S = "${WORKDIR}/${APPNAME}"
 
diff --git a/opie-mobilemsg/opie-mobilemsg_1.1.7.oe b/opie-mobilemsg/opie-mobilemsg_1.1.7.oe
index e69de29bb2..c91f80e399 100644
--- a/opie-mobilemsg/opie-mobilemsg_1.1.7.oe
+++ b/opie-mobilemsg/opie-mobilemsg_1.1.7.oe
@@ -0,0 +1,27 @@
+DESCRIPTION = "Mobile Messaging"
+SECTION = "opie/applications"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "mobilemsg"
+APPTYPE = "binary"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/comm/mobilemsg \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+# FILES plugins/application/libmobilemsg.so* bin/mobilemsg apps/Applications/mobilemsg.desktop pics/mobilemsg
+
+do_install() {
+}
+
+do_install_prepend() {
+	install -d ${D}${palmtopdir}/pics/mobilemsg/
+	install -m 0644 ${WORKDIR}/pics/mobilemsg/*.png ${D}${palmtopdir}/pics/mobilemsg/
+}
diff --git a/opie-mobilemsg/opie-mobilemsg_cvs.oe b/opie-mobilemsg/opie-mobilemsg_cvs.oe
index de1a0262be..9612200d2a 100644
--- a/opie-mobilemsg/opie-mobilemsg_cvs.oe
+++ b/opie-mobilemsg/opie-mobilemsg_cvs.oe
@@ -7,9 +7,9 @@ PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "mobilemsg"
 APPTYPE = "binary"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/comm/mobilemsg \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/comm/mobilemsg \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/apps"
 
 S = "${WORKDIR}/${APPNAME}"
 
diff --git a/opie-multikey/opie-multikey_1.1.7.oe b/opie-multikey/opie-multikey_1.1.7.oe
index e69de29bb2..1d34a6218f 100644
--- a/opie-multikey/opie-multikey_1.1.7.oe
+++ b/opie-multikey/opie-multikey_1.1.7.oe
@@ -0,0 +1,40 @@
+DESCRIPTION = "Multiple language keyboard"
+SECTION = "opie/inputmethods"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+DEPENDS = "libqtaux2 opie-pickboard"
+RDEPENDS = "opie-pics opie-pickboard"
+
+APPNAME = "qmultikey"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/multikey \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/share"
+S = "${WORKDIR}/multikey"
+
+inherit opie
+
+pkg_postinst() {
+#!/bin/sh
+if [ -n "$D" ]; then exit 1; fi
+if pidof -s qpe >/dev/null; then
+  /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadInputMethods()"
+else
+  exit 0
+fi
+}
+
+pkg_postrm() {
+#!/bin/sh
+if [ -n "$D" ]; then exit 1; fi
+/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadInputMethods()"
+}
+
+# FILES plugins/inputmethods/libqmultikey.so* share/multikey/*
+do_install() {
+	install -d ${D}${palmtopdir}/share/multikey/
+	install -m 0644 ${WORKDIR}/share/multikey/*.keymap ${D}${palmtopdir}/share/multikey/
+	install -m 0644 ${WORKDIR}/share/multikey/README ${D}${palmtopdir}/share/multikey/
+}
+
diff --git a/opie-multikey/opie-multikey_cvs.oe b/opie-multikey/opie-multikey_cvs.oe
index 886a8449bf..f2211773d5 100644
--- a/opie-multikey/opie-multikey_cvs.oe
+++ b/opie-multikey/opie-multikey_cvs.oe
@@ -8,8 +8,8 @@ RDEPENDS = "opie-pics opie-pickboard"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "qmultikey"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/inputmethods/multikey \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/share"
+SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/multikey \
+           ${HANDHELDS_CVS};module=opie/share"
 S = "${WORKDIR}/multikey"
 
 inherit opie
diff --git a/opie-multikeyapplet/opie-multikeyapplet_1.1.7.oe b/opie-multikeyapplet/opie-multikeyapplet_1.1.7.oe
index e69de29bb2..c3d787cf1f 100644
--- a/opie-multikeyapplet/opie-multikeyapplet_1.1.7.oe
+++ b/opie-multikeyapplet/opie-multikeyapplet_1.1.7.oe
@@ -0,0 +1,34 @@
+DESCRIPTION = "Multikey Keyboard Layout Switcher Applet"
+SECTION = "opie/applets"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "multikeyapplet"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/multikeyapplet \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+pkg_postinst() {
+#!/bin/sh
+if pidof -s qpe >/dev/null; then
+  /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+fi
+ if [ -n "$D" ]; then false; fi
+}
+
+pkg_postrm() {
+#!/bin/sh
+/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+ if [ -n "$D" ]; then false; fi
+}
+
+# FILES plugins/applets/libmultikeyapplet.so*
+do_install() {
+}
+
diff --git a/opie-multikeyapplet/opie-multikeyapplet_cvs.oe b/opie-multikeyapplet/opie-multikeyapplet_cvs.oe
index ae692cf11c..f8640458ed 100644
--- a/opie-multikeyapplet/opie-multikeyapplet_cvs.oe
+++ b/opie-multikeyapplet/opie-multikeyapplet_cvs.oe
@@ -6,8 +6,8 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "multikeyapplet"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/applets/multikeyapplet \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/multikeyapplet \
+           ${HANDHELDS_CVS};module=opie/apps"
 
 S = "${WORKDIR}/${APPNAME}"
 
diff --git a/opie-networkapplet/opie-networkapplet_1.1.7.oe b/opie-networkapplet/opie-networkapplet_1.1.7.oe
index e69de29bb2..634f1db3f4 100644
--- a/opie-networkapplet/opie-networkapplet_1.1.7.oe
+++ b/opie-networkapplet/opie-networkapplet_1.1.7.oe
@@ -0,0 +1,38 @@
+DESCRIPTION = "Network Applet"
+SECTION = "opie/applets"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+RDEPENDS = "opie-networksettings"
+
+APPNAME = "networkapplet"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/networkapplet \
+	   ${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
+
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+pkg_postinst() {
+#!/bin/sh
+if [ -n "$D" ]; then exit 1; fi
+if pidof -s qpe >/dev/null; then
+  /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+else
+  exit 0
+fi
+}
+
+pkg_postrm() {
+#!/bin/sh
+if [ -n "$D" ]; then exit 1; fi
+/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+}
+
+# FILES plugins/applets/libnetworkapplet.so* pics/networkapplet
+do_install() {
+        install -d ${D}${palmtopdir}/pics/${APPNAME}/
+        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/ 
+}
diff --git a/opie-networkapplet/opie-networkapplet_cvs.oe b/opie-networkapplet/opie-networkapplet_cvs.oe
index a4a28989bf..ed909783a1 100644
--- a/opie-networkapplet/opie-networkapplet_cvs.oe
+++ b/opie-networkapplet/opie-networkapplet_cvs.oe
@@ -7,8 +7,8 @@ RDEPENDS = "opie-networksettings"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "networkapplet"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/applets/networkapplet \
-	   cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/networkapplet \
+	   ${HANDHELDS_CVS};module=opie/pics"
 
 S = "${WORKDIR}/${APPNAME}"
 
diff --git a/opie-networksettings/opie-networksettings_1.1.7.oe b/opie-networksettings/opie-networksettings_1.1.7.oe
index e69de29bb2..bd491aa98c 100644
--- a/opie-networksettings/opie-networksettings_1.1.7.oe
+++ b/opie-networksettings/opie-networksettings_1.1.7.oe
@@ -0,0 +1,49 @@
+DESCRIPTION = "Opie Network Settings"
+SECTION = "opie/settings"
+PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "GPL"
+PROVIDES = "opie-networksettings-pppplugin opie-networksettings-wlanplugin"
+APPNAME = "networksettings"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/networksettings \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
+	   ${HANDHELDS_CVS};tag=${TAG};module=opie/root"
+
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+EXTRA_QMAKEVARS_POST += "LIBS+=-L${S}"
+
+do_install() {
+	# Create dir for changedns and the opie-kppp peer
+	install -d ${D}/${bindir}/
+	install -d ${D}/${sysconfdir}/
+	install -d ${D}/${sysconfdir}/ppp/
+	install -d ${D}/${sysconfdir}/ppp/peers/
+	
+	install -d ${D}/${palmtopdir}/pics/${APPNAME}/
+	install -d ${D}/${palmtopdir}/pics/Network/
+	install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.* ${D}${palmtopdir}/pics/${APPNAME}/
+	install -m 0644 ${WORKDIR}/pics/Network/*.* ${D}${palmtopdir}/pics/Network/
+	install -d ${D}/${palmtopdir}/lib/
+	oe_libinstall -so libinterfaces ${D}${palmtopdir}/lib
+	install -d ${D}/${palmtopdir}/plugins/networksettings/
+	for plugin in kppp wlan
+	do
+		install lib$plugin.so ${D}/${palmtopdir}/plugins/networksettings/
+	done
+
+	# install changedns script
+	install -m 0755 ${WORKDIR}/root/usr/bin/changedns ${D}${bindir}/
+	install -m 0644 ${WORKDIR}/root/etc/ppp/peers/opie-kppp ${D}${sysconfdir}/ppp/peers
+}
+
+PACKAGES =+ "opie-networksettings-pppplugin opie-networksettings-wlanplugin"
+FILES_${PN} += " ${bindir}/changedns "
+FILES_opie-networksettings-pppplugin = "${palmtopdir}/plugins/networksettings/libkppp.so ${sysconfdir}/ppp/peers/opie-kppp"
+FILES_opie-networksettings-wlanplugin = "${palmtopdir}/plugins/networksettings/libwlan.so"
+
diff --git a/opie-networksettings/opie-networksettings_cvs.oe b/opie-networksettings/opie-networksettings_cvs.oe
index b73b7b64ab..0a0ac15f9c 100644
--- a/opie-networksettings/opie-networksettings_cvs.oe
+++ b/opie-networksettings/opie-networksettings_cvs.oe
@@ -8,10 +8,10 @@ PV = "1.1.7+cvs-${CVSDATE}"
 
 APPNAME = "networksettings"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/settings/networksettings \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps \
-	   cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/root"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/networksettings \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/apps \
+	   ${HANDHELDS_CVS};module=opie/root"
 
 S = "${WORKDIR}/${APPNAME}"
 
diff --git a/opie-notesapplet/opie-notesapplet_1.1.7.oe b/opie-notesapplet/opie-notesapplet_1.1.7.oe
index e69de29bb2..719420c93d 100644
--- a/opie-notesapplet/opie-notesapplet_1.1.7.oe
+++ b/opie-notesapplet/opie-notesapplet_1.1.7.oe
@@ -0,0 +1,35 @@
+DESCRIPTION = "Notes Applet"
+SECTION = "opie/applets"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "notesapplet"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/notesapplet"
+
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+pkg_postinst() {
+#!/bin/sh
+if [ -n "$D" ]; then exit 1; fi
+if pidof -s qpe >/dev/null; then
+  /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+else
+  exit 0
+fi
+}
+
+pkg_postrm() {
+#!/bin/sh
+if [ -n "$D" ]; then exit 1; fi
+/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+}
+
+# FILES plugins/applets/libnotesapplet.so*
+do_install() {
+}
+
diff --git a/opie-notesapplet/opie-notesapplet_cvs.oe b/opie-notesapplet/opie-notesapplet_cvs.oe
index cd760761f0..668425cc49 100644
--- a/opie-notesapplet/opie-notesapplet_cvs.oe
+++ b/opie-notesapplet/opie-notesapplet_cvs.oe
@@ -6,7 +6,7 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "notesapplet"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/applets/notesapplet"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/notesapplet"
 
 S = "${WORKDIR}/${APPNAME}"
 
diff --git a/opie-odict/opie-odict_1.1.7.oe b/opie-odict/opie-odict_1.1.7.oe
index e69de29bb2..a60fd5cb80 100644
--- a/opie-odict/opie-odict_1.1.7.oe
+++ b/opie-odict/opie-odict_1.1.7.oe
@@ -0,0 +1,23 @@
+DESCRIPTION = "Dictionary look-up program"
+SECTION = "opie/applications"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "odict"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/odict \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+# FILES plugins/application/libodict.so* bin/odict apps/Applications/odict.desktop pics/odict/odict.png
+do_install() {
+        install -d ${D}${palmtopdir}/pics/${APPNAME}/
+        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+}
+
diff --git a/opie-odict/opie-odict_cvs.oe b/opie-odict/opie-odict_cvs.oe
index a36bbe1110..e1982d9107 100644
--- a/opie-odict/opie-odict_cvs.oe
+++ b/opie-odict/opie-odict_cvs.oe
@@ -6,9 +6,9 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "odict"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/apps/odict \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/odict \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/apps"
 
 S = "${WORKDIR}/${APPNAME}"
 
diff --git a/opie-oxygen/opie-oxygen_1.0.0.oe b/opie-oxygen/opie-oxygen_1.0.0.oe
index 646caf6a3b..79aa8c942a 100644
--- a/opie-oxygen/opie-oxygen_1.0.0.oe
+++ b/opie-oxygen/opie-oxygen_1.0.0.oe
@@ -6,10 +6,10 @@ LICENSE = "GPL"
 APPNAME = "oxygen"
 
 TAG = "v1_1_6"
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/noncore/apps/${APPNAME} \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/share \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/${APPNAME} \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/share \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
 S = "${WORKDIR}/${APPNAME}"
 
 inherit opie
diff --git a/opie-oxygen/opie-oxygen_cvs.oe b/opie-oxygen/opie-oxygen_cvs.oe
index 001978bc42..1452e818c6 100644
--- a/opie-oxygen/opie-oxygen_cvs.oe
+++ b/opie-oxygen/opie-oxygen_cvs.oe
@@ -6,10 +6,10 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "oxygen"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/apps/${APPNAME} \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/share \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/${APPNAME} \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/share \
+           ${HANDHELDS_CVS};module=opie/apps"
 S = "${WORKDIR}/${APPNAME}"
 
 inherit opie
diff --git a/opie-oyatzee/opie-oyatzee_1.1.7.oe b/opie-oyatzee/opie-oyatzee_1.1.7.oe
index e69de29bb2..38adaf1143 100644
--- a/opie-oyatzee/opie-oyatzee_1.1.7.oe
+++ b/opie-oyatzee/opie-oyatzee_1.1.7.oe
@@ -0,0 +1,24 @@
+DESCRIPTION = "Yatzee-like game"
+SECTION = "opie/games"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "oyatzee"
+APPTYPE = "binary"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/oyatzee \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+# FILES bin/oyatzee apps/Games/oyatzee.desktop pics/oyatzee
+do_install() {
+	install -d ${D}${palmtopdir}/pics/${APPNAME}/
+	install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+}
+
diff --git a/opie-oyatzee/opie-oyatzee_cvs.oe b/opie-oyatzee/opie-oyatzee_cvs.oe
index 4b45acbb4b..9facbb916c 100644
--- a/opie-oyatzee/opie-oyatzee_cvs.oe
+++ b/opie-oyatzee/opie-oyatzee_cvs.oe
@@ -6,9 +6,9 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "oyatzee"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/games/oyatzee \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/oyatzee \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/apps"
 
 S = "${WORKDIR}/${APPNAME}"
 
diff --git a/opie-packagemanager/opie-packagemanager_1.1.7.oe b/opie-packagemanager/opie-packagemanager_1.1.7.oe
index e69de29bb2..c8067215d0 100644
--- a/opie-packagemanager/opie-packagemanager_1.1.7.oe
+++ b/opie-packagemanager/opie-packagemanager_1.1.7.oe
@@ -0,0 +1,23 @@
+DESCRIPTION = "Opie Package Manager"
+SECTION = "opie/settings"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+DEPENDS = "libipkg "
+
+APPNAME = "packagemanager"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/${APPNAME} \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+EXTRA_QMAKEVARS_PRE = 'LIBIPK_INC_DIR=${STAGING_INCDIR}/libipkg'
+
+do_install() {
+    install -d ${D}/${palmtopdir}/pics/${APPNAME}
+    install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}/${palmtopdir}/pics/${APPNAME}/
+}
diff --git a/opie-packagemanager/opie-packagemanager_cvs.oe b/opie-packagemanager/opie-packagemanager_cvs.oe
index 72e2ff5d07..f5aa9fab48 100644
--- a/opie-packagemanager/opie-packagemanager_cvs.oe
+++ b/opie-packagemanager/opie-packagemanager_cvs.oe
@@ -7,9 +7,9 @@ DEPENDS = "libipkg "
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "packagemanager"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/settings/${APPNAME};cvsdate=${CVSDATE} \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics;cvsdate=${CVSDATE} \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/${APPNAME};cvsdate=${CVSDATE} \
+           ${HANDHELDS_CVS};module=opie/pics;cvsdate=${CVSDATE} \
+           ${HANDHELDS_CVS};module=opie/apps"
 S = "${WORKDIR}/${APPNAME}"
 
 inherit opie
diff --git a/opie-parashoot/opie-parashoot_1.1.7.oe b/opie-parashoot/opie-parashoot_1.1.7.oe
index e69de29bb2..d31de50392 100644
--- a/opie-parashoot/opie-parashoot_1.1.7.oe
+++ b/opie-parashoot/opie-parashoot_1.1.7.oe
@@ -0,0 +1,23 @@
+DESCRIPTION = "Game: shoot the parachutists"
+SECTION = "opie/games"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "parashoot"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/parashoot \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+# FILES plugins/application/libparashoot.so* bin/parashoot apps/Games/parashoot.desktop pics/parashoot
+do_install() {
+        install -d ${D}${palmtopdir}/pics/${APPNAME}/
+        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+}
+
diff --git a/opie-parashoot/opie-parashoot_cvs.oe b/opie-parashoot/opie-parashoot_cvs.oe
index f421d4945f..2c1983b6f8 100644
--- a/opie-parashoot/opie-parashoot_cvs.oe
+++ b/opie-parashoot/opie-parashoot_cvs.oe
@@ -6,9 +6,9 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "parashoot"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/games/parashoot \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/parashoot \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/apps"
 
 S = "${WORKDIR}/${APPNAME}"
 
diff --git a/opie-performance/opie-performance_1.1.7.oe b/opie-performance/opie-performance_1.1.7.oe
index e69de29bb2..3e1f64d36c 100644
--- a/opie-performance/opie-performance_1.1.7.oe
+++ b/opie-performance/opie-performance_1.1.7.oe
@@ -0,0 +1,24 @@
+DESCRIPTION = "Graphics performance tester"
+SECTION = "opie/applications"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "performance"
+APPTYPE = "binary"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/development/performance \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+# FILES bin/performance apps/Applications/performance.desktop
+#do_install() {
+#        install -d ${D}${palmtopdir}/pics/${APPNAME}/
+#        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+#}
+
diff --git a/opie-performance/opie-performance_cvs.oe b/opie-performance/opie-performance_cvs.oe
index 7f46271e68..07d92f461e 100644
--- a/opie-performance/opie-performance_cvs.oe
+++ b/opie-performance/opie-performance_cvs.oe
@@ -6,9 +6,9 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "performance"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/development/performance \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/development/performance \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/apps"
 
 S = "${WORKDIR}/${APPNAME}"
 
diff --git a/opie-pickboard/opie-pickboard_1.1.7.oe b/opie-pickboard/opie-pickboard_1.1.7.oe
index e69de29bb2..3ff984f415 100644
--- a/opie-pickboard/opie-pickboard_1.1.7.oe
+++ b/opie-pickboard/opie-pickboard_1.1.7.oe
@@ -0,0 +1,38 @@
+DESCRIPTION = "Pickboard input method"
+SECTION = "opie/inputmethods"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "qpickboard"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/pickboard"
+S = "${WORKDIR}/pickboard"
+
+inherit opie
+
+pkg_postinst() {
+#!/bin/sh
+if [ -n "$D" ]; then exit 1; fi
+if pidof -s qpe >/dev/null; then
+  /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+else
+  exit 0
+fi
+}
+
+pkg_postrm() {
+#!/bin/sh
+if [ -n "$D" ]; then exit 1; fi
+/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadInputMethods()"
+}
+
+
+do_stage() {
+	install -m 0755 libqpickboard.so ${STAGING_LIBDIR}/
+	install pickboardcfg.h ${STAGING_INCDIR}/
+	install pickboardpicks.h ${STAGING_INCDIR}/
+}
+
+# FILES plugins/inputmethods/libqpickboard.so*
diff --git a/opie-pickboard/opie-pickboard_cvs.oe b/opie-pickboard/opie-pickboard_cvs.oe
index 0aab5634d4..5a65fbb2f0 100644
--- a/opie-pickboard/opie-pickboard_cvs.oe
+++ b/opie-pickboard/opie-pickboard_cvs.oe
@@ -6,7 +6,7 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "qpickboard"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/inputmethods/pickboard"
+SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/pickboard"
 S = "${WORKDIR}/pickboard"
 
 inherit opie
diff --git a/opie-pics/opie-pics_1.1.7.oe b/opie-pics/opie-pics_1.1.7.oe
index e69de29bb2..68467886b3 100644
--- a/opie-pics/opie-pics_1.1.7.oe
+++ b/opie-pics/opie-pics_1.1.7.oe
@@ -0,0 +1,22 @@
+DESCRIPTION = "Common Opie pictures usable from all applications"
+SECTION = "opie/base"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>
+LICENSE = "GPL"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};module=opie/pics;tag=${TAG}"
+S = "${WORKDIR}/pics"
+
+do_install() {
+	install -d ${D}${palmtopdir}/pics/addressbook/
+	install -d ${D}${palmtopdir}/pics/datebook/
+	install -d ${D}${palmtopdir}/pics/todo/
+	install *.png ${D}${palmtopdir}/pics/
+	install addressbook/*.png ${D}${palmtopdir}/pics/addressbook/
+	install datebook/*.png ${D}${palmtopdir}/pics/datebook/
+	install todo/*.png ${D}${palmtopdir}/pics/todo/	
+	
+}
+
+FILES_${PN} = "${palmtopdir}"
diff --git a/opie-pics/opie-pics_cvs.oe b/opie-pics/opie-pics_cvs.oe
index cde951fddd..fd62da081b 100644
--- a/opie-pics/opie-pics_cvs.oe
+++ b/opie-pics/opie-pics_cvs.oe
@@ -5,7 +5,7 @@ MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics"
+SRC_URI = "${HANDHELDS_CVS};module=opie/pics"
 S = "${WORKDIR}/pics"
 
 do_install() {
diff --git a/opie-pimconverter/opie-pimconverter_1.1.7.oe b/opie-pimconverter/opie-pimconverter_1.1.7.oe
index e69de29bb2..c20eb47de8 100644
--- a/opie-pimconverter/opie-pimconverter_1.1.7.oe
+++ b/opie-pimconverter/opie-pimconverter_1.1.7.oe
@@ -0,0 +1,25 @@
+DESCRIPTION = "Opie PIM database converter"
+SECTION = "opie/pim"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+RDEPENDS = "sqlite3 sqlite"
+
+APPNAME = "opimconverter"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/tools/pimconverter \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/pimconverter"
+EXTRA_QMAKEVARS_POST += "TARGET=${APPNAME}"
+
+inherit opie
+
+# FILES bin/opimconverter pics/opimconverter/* apps/1Pim/opimconverter.desktop
+do_install() {
+        install -d ${D}${palmtopdir}/pics/${APPNAME}/
+        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+}
+
diff --git a/opie-pimconverter/opie-pimconverter_cvs.oe b/opie-pimconverter/opie-pimconverter_cvs.oe
index 2b24292930..704d342f29 100644
--- a/opie-pimconverter/opie-pimconverter_cvs.oe
+++ b/opie-pimconverter/opie-pimconverter_cvs.oe
@@ -10,9 +10,9 @@ PV = "1.1.7+cvs-${CVSDATE}"
 PR = "r3"
 APPNAME = "opimconverter"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/tools/pimconverter \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/tools/pimconverter \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/apps"
 
 S = "${WORKDIR}/pimconverter"
 EXTRA_QMAKEVARS_POST += "TARGET=${APPNAME}"
diff --git a/opie-powerchord/opie-powerchord_1.1.7.oe b/opie-powerchord/opie-powerchord_1.1.7.oe
index e69de29bb2..769baaa4eb 100644
--- a/opie-powerchord/opie-powerchord_1.1.7.oe
+++ b/opie-powerchord/opie-powerchord_1.1.7.oe
@@ -0,0 +1,27 @@
+DESCRIPTION = "Guitar Chord generator application"
+SECTION = "opie/multimedia"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "powerchord"
+APPTYPE = "binary"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/multimedia/powerchord \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/share \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+# FILES bin/powerchord apps/Applications/powerchord.desktop pics/powerchord share/powerchord
+do_install() {
+        install -d ${D}${palmtopdir}/pics/${APPNAME}/
+        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+        install -d ${D}${palmtopdir}/share/${APPNAME}/
+        install -m 0644 ${WORKDIR}/share/${APPNAME}/*.raw ${D}${palmtopdir}/share/${APPNAME}/
+}
+
diff --git a/opie-powerchord/opie-powerchord_cvs.oe b/opie-powerchord/opie-powerchord_cvs.oe
index 610b3662d2..4cb9fff3a9 100644
--- a/opie-powerchord/opie-powerchord_cvs.oe
+++ b/opie-powerchord/opie-powerchord_cvs.oe
@@ -6,10 +6,10 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "powerchord"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/multimedia/powerchord \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/share \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/multimedia/powerchord \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/share \
+           ${HANDHELDS_CVS};module=opie/apps"
 
 S = "${WORKDIR}/${APPNAME}"
 
diff --git a/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_1.1.7.oe b/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_1.1.7.oe
index e69de29bb2..1cf97e569b 100644
--- a/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_1.1.7.oe
+++ b/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_1.1.7.oe
@@ -0,0 +1,28 @@
+DESCRIPTION = "Python Quicklaunch Applet"
+SECTION = "opie/applets"
+LICENSE = "GPL"
+
+APPNAME = "pyquicklaunch"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/pyquicklaunch \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+pkg_postinst() {
+#!/bin/sh
+if pidof -s qpe >/dev/null; then
+  /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+fi
+ if [ -n "$D" ]; then false; fi
+}
+
+pkg_postrm() {
+#!/bin/sh
+/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+ if [ -n "$D" ]; then false; fi
+}
+
diff --git a/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_cvs.oe b/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_cvs.oe
index a5ee02438b..c390acd8dc 100644
--- a/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_cvs.oe
+++ b/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_cvs.oe
@@ -4,9 +4,9 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "pyquicklaunch"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/applets/pyquicklaunch \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/pyquicklaunch \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/apps"
 S = "${WORKDIR}/${APPNAME}"
 
 inherit opie
diff --git a/opie-qasteroids/opie-qasteroids_1.1.7.oe b/opie-qasteroids/opie-qasteroids_1.1.7.oe
index e69de29bb2..75889bd3c9 100644
--- a/opie-qasteroids/opie-qasteroids_1.1.7.oe
+++ b/opie-qasteroids/opie-qasteroids_1.1.7.oe
@@ -0,0 +1,23 @@
+DESCRIPTION = "Game: shoot the asteroids"
+SECTION = "opie/games"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "qasteroids"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/qasteroids \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+# FILES plugins/application/libqasteroids.so* bin/qasteroids apps/Games/qasteroids.desktop pics/qasteroids/*
+do_install() {
+        install -d ${D}${palmtopdir}/pics/${APPNAME}/
+        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+}
+
diff --git a/opie-qasteroids/opie-qasteroids_cvs.oe b/opie-qasteroids/opie-qasteroids_cvs.oe
index 880cf17c3a..fe833be668 100644
--- a/opie-qasteroids/opie-qasteroids_cvs.oe
+++ b/opie-qasteroids/opie-qasteroids_cvs.oe
@@ -6,9 +6,9 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "qasteroids"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/games/qasteroids \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/qasteroids \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/apps"
 
 S = "${WORKDIR}/${APPNAME}"
 
diff --git a/opie-qcop/opie-qcop_1.0.0.oe b/opie-qcop/opie-qcop_1.0.0.oe
index 252f437672..cfe4588c35 100644
--- a/opie-qcop/opie-qcop_1.0.0.oe
+++ b/opie-qcop/opie-qcop_1.0.0.oe
@@ -5,7 +5,7 @@ MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 
 TAG = "v1_1_6"
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/core/apps/qcop"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/qcop"
 S = "${WORKDIR}/qcop"
 
 inherit opie
diff --git a/opie-qcop/opie-qcop_cvs.oe b/opie-qcop/opie-qcop_cvs.oe
index 89835c6a93..c2fffa9184 100644
--- a/opie-qcop/opie-qcop_cvs.oe
+++ b/opie-qcop/opie-qcop_cvs.oe
@@ -5,7 +5,7 @@ MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 PV = "1.0.0+cvs-${CVSDATE}"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/apps/qcop"
+SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/qcop"
 S = "${WORKDIR}/qcop"
 
 inherit opie
diff --git a/opie-quicklauncher/opie-quicklauncher_1.1.7.oe b/opie-quicklauncher/opie-quicklauncher_1.1.7.oe
index e69de29bb2..37489317ae 100644
--- a/opie-quicklauncher/opie-quicklauncher_1.1.7.oe
+++ b/opie-quicklauncher/opie-quicklauncher_1.1.7.oe
@@ -0,0 +1,18 @@
+DESCRIPTION = "The Opie Quick Launcher Loader"
+SECTION = "opie/base"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/tools/quicklauncher"
+S = "${WORKDIR}/quicklauncher"
+
+inherit opie
+
+do_install() {
+	install -d ${D}/${palmtopdir}/bin/
+	install -m 755 quicklauncher ${D}/${palmtopdir}/bin/
+
+}
diff --git a/opie-quicklauncher/opie-quicklauncher_cvs.oe b/opie-quicklauncher/opie-quicklauncher_cvs.oe
index 96cf3df121..364e036001 100644
--- a/opie-quicklauncher/opie-quicklauncher_cvs.oe
+++ b/opie-quicklauncher/opie-quicklauncher_cvs.oe
@@ -5,7 +5,7 @@ MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/tools/quicklauncher"
+SRC_URI = "${HANDHELDS_CVS};module=opie/core/tools/quicklauncher"
 S = "${WORKDIR}/quicklauncher"
 
 inherit opie
diff --git a/opie-rdesktop/opie-rdesktop_1.1.7.oe b/opie-rdesktop/opie-rdesktop_1.1.7.oe
index e69de29bb2..91ec9e0c52 100644
--- a/opie-rdesktop/opie-rdesktop_1.1.7.oe
+++ b/opie-rdesktop/opie-rdesktop_1.1.7.oe
@@ -0,0 +1,25 @@
+DESCRIPTION = "Remote Desktop Protocol (RDP) Client"
+SECTION = "opie/applications"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+I18N_FILES = "ordesktop.ts"
+DEPENDS = "openssl"
+
+APPNAME = "ordesktop"
+APPTYPE = "binary"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/opierdesktop \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
+	   ${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
+
+S = "${WORKDIR}/opierdesktop"
+
+inherit opie
+
+# FILES bin/ordesktop pics/opierdesktop apps/Applications/opierdesktop.desktop
+do_install() {
+        install -d ${D}${palmtopdir}/pics/opierdesktop/
+        install -m 0644 ${WORKDIR}/pics/opierdesktop/*.png ${D}${palmtopdir}/pics/opierdesktop/ 
+}
diff --git a/opie-rdesktop/opie-rdesktop_cvs.oe b/opie-rdesktop/opie-rdesktop_cvs.oe
index f5fe47c59e..6130263b2d 100644
--- a/opie-rdesktop/opie-rdesktop_cvs.oe
+++ b/opie-rdesktop/opie-rdesktop_cvs.oe
@@ -9,9 +9,9 @@ PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "ordesktop"
 APPTYPE = "binary"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/net/opierdesktop \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps \
-	   cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/opierdesktop \
+           ${HANDHELDS_CVS};module=opie/apps \
+	   ${HANDHELDS_CVS};module=opie/pics"
 
 S = "${WORKDIR}/opierdesktop"
 
diff --git a/opie-reader/opie-reader_1.1.7.oe b/opie-reader/opie-reader_1.1.7.oe
index e69de29bb2..0ca1ef7b7b 100644
--- a/opie-reader/opie-reader_1.1.7.oe
+++ b/opie-reader/opie-reader_1.1.7.oe
@@ -0,0 +1,43 @@
+DESCRIPTION = "E-Book reader"
+SECTION = "opie/applications"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "opie-reader"
+APPTYPE = "binary"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/opie-reader \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/opie-reader"
+
+EXTRA_QMAKEVARS_POST += "LIBS+=-L${S}"
+
+inherit opie
+
+# FILES bin/opie-reader apps/Applications/opie-reader.desktop pics/opie-reader/*
+do_install() {
+        install -d ${D}${palmtopdir}/pics/${APPNAME}/ \ 
+                   ${D}${palmtopdir}/lib/ \
+                   ${D}${palmtopdir}/plugins/reader/data/ \
+				   ${D}${palmtopdir}/plugins/reader/filters/ \
+                   ${D}${palmtopdir}/plugins/reader/codecs/ 
+        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+
+		for f in libAportis libPlucker libppms libCHM libWeasel libiSilo   
+		do
+			oe_libinstall -so -C ${S}/ $f ${D}/${palmtopdir}/plugins/reader/codecs/
+		done
+
+		for f in libreader_codec libreader_pdb libreader_pluckerbase
+		do
+			oe_libinstall -so -C ${S}/ $f ${D}/${palmtopdir}/lib/
+		done
+		oe_libinstall -so -C ${S}/ libHTMLfilter ${D}/${palmtopdir}/plugins/reader/filters/
+		install -m 0644 ${S}/HTMLentities ${D}/${palmtopdir}/plugins/reader/data/
+		
+}
+
diff --git a/opie-reader/opie-reader_cvs.oe b/opie-reader/opie-reader_cvs.oe
index 838ebda508..87fa254555 100644
--- a/opie-reader/opie-reader_cvs.oe
+++ b/opie-reader/opie-reader_cvs.oe
@@ -7,9 +7,9 @@ PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "opie-reader"
 APPTYPE = "binary"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/apps/opie-reader \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/opie-reader \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/apps"
 
 S = "${WORKDIR}/opie-reader"
 
diff --git a/opie-recorder/opie-recorder_1.1.7.oe b/opie-recorder/opie-recorder_1.1.7.oe
index e69de29bb2..c700772c7c 100644
--- a/opie-recorder/opie-recorder_1.1.7.oe
+++ b/opie-recorder/opie-recorder_1.1.7.oe
@@ -0,0 +1,24 @@
+DESCRIPTION = "Audio sampling recorder"
+SECTION = "opie/multimedia"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "opierec"
+APPTYPE = "binary"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/multimedia/opierec \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/opierec"
+
+inherit opie
+
+# FILES bin/opierec pics/opierec apps/Applications/opierec.desktop
+do_install() {
+        install -d ${D}${palmtopdir}/pics/${APPNAME}/
+        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+}
+
diff --git a/opie-recorder/opie-recorder_cvs.oe b/opie-recorder/opie-recorder_cvs.oe
index 9e4312a021..8ef5aed85b 100644
--- a/opie-recorder/opie-recorder_cvs.oe
+++ b/opie-recorder/opie-recorder_cvs.oe
@@ -6,9 +6,9 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "opierec"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/multimedia/opierec \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/multimedia/opierec \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/apps"
 
 S = "${WORKDIR}/opierec"
 
diff --git a/opie-remote/opie-remote_1.1.7.oe b/opie-remote/opie-remote_1.1.7.oe
index e69de29bb2..25feefbd42 100644
--- a/opie-remote/opie-remote_1.1.7.oe
+++ b/opie-remote/opie-remote_1.1.7.oe
@@ -0,0 +1,25 @@
+DESCRIPTION = "A remote control"
+SECTION = "opie/applications"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+RDEPENDS = "lirc"
+
+APPNAME = "remote"
+APPTYPE = "binary"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/tools/remote \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+# FILES bin/remote apps/Applications/remote.desktop pics/remote/*.png
+do_install() {
+        install -d ${D}${palmtopdir}/pics/${APPNAME}/
+        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+}
+
diff --git a/opie-remote/opie-remote_cvs.oe b/opie-remote/opie-remote_cvs.oe
index 346ac3ad32..a39da09eb9 100644
--- a/opie-remote/opie-remote_cvs.oe
+++ b/opie-remote/opie-remote_cvs.oe
@@ -8,9 +8,9 @@ PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "remote"
 APPTYPE = "binary"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/tools/remote \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/tools/remote \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/apps"
 
 S = "${WORKDIR}/${APPNAME}"
 
diff --git a/opie-restartapplet/opie-restartapplet2_1.1.7.oe b/opie-restartapplet/opie-restartapplet2_1.1.7.oe
index e69de29bb2..3f2c4d77e2 100644
--- a/opie-restartapplet/opie-restartapplet2_1.1.7.oe
+++ b/opie-restartapplet/opie-restartapplet2_1.1.7.oe
@@ -0,0 +1,20 @@
+DESCRIPTION = "Restart Applet"
+SECTION = "opie/applets"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "restartapplet"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/restartapplet2 \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/restartapplet2"
+
+inherit opie
+
+# FILES plugins/applets/librestartapplet.so*
+do_install() {
+}
+
diff --git a/opie-restartapplet/opie-restartapplet2_cvs.oe b/opie-restartapplet/opie-restartapplet2_cvs.oe
index d97b9fcc19..768401a689 100644
--- a/opie-restartapplet/opie-restartapplet2_cvs.oe
+++ b/opie-restartapplet/opie-restartapplet2_cvs.oe
@@ -6,8 +6,8 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "restartapplet"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/applets/restartapplet2 \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/restartapplet2 \
+           ${HANDHELDS_CVS};module=opie/apps"
 
 S = "${WORKDIR}/restartapplet2"
 
diff --git a/opie-restartapplet/opie-restartapplet_1.1.7.oe b/opie-restartapplet/opie-restartapplet_1.1.7.oe
index e69de29bb2..e5b4c46ea2 100644
--- a/opie-restartapplet/opie-restartapplet_1.1.7.oe
+++ b/opie-restartapplet/opie-restartapplet_1.1.7.oe
@@ -0,0 +1,20 @@
+DESCRIPTION = "Restart Applet"
+SECTION = "opie/applets"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "restartapplet"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/restartapplet \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+# FILES plugins/applets/librestartapplet.so*
+do_install() {
+}
+
diff --git a/opie-restartapplet/opie-restartapplet_cvs.oe b/opie-restartapplet/opie-restartapplet_cvs.oe
index e0a6f77953..fc9c20077e 100644
--- a/opie-restartapplet/opie-restartapplet_cvs.oe
+++ b/opie-restartapplet/opie-restartapplet_cvs.oe
@@ -6,8 +6,8 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "restartapplet"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/applets/restartapplet \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/restartapplet \
+           ${HANDHELDS_CVS};module=opie/apps"
 
 S = "${WORKDIR}/${APPNAME}"
 
diff --git a/opie-restartapplet2/opie-restartapplet2_1.1.7.oe b/opie-restartapplet2/opie-restartapplet2_1.1.7.oe
index e69de29bb2..7f2c25d7b5 100644
--- a/opie-restartapplet2/opie-restartapplet2_1.1.7.oe
+++ b/opie-restartapplet2/opie-restartapplet2_1.1.7.oe
@@ -0,0 +1,21 @@
+DESCRIPTION = "Restart Applet"
+SECTION = "opie/applets"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "restartapplet"
+I18N_FILES = "librestartapplet.ts"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/restartapplet2 \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/restartapplet2"
+
+inherit opie
+
+# FILES plugins/applets/librestartapplet.so*
+do_install() {
+}
+
diff --git a/opie-restartapplet2/opie-restartapplet2_cvs.oe b/opie-restartapplet2/opie-restartapplet2_cvs.oe
index 63236cdd88..0a05079dc0 100644
--- a/opie-restartapplet2/opie-restartapplet2_cvs.oe
+++ b/opie-restartapplet2/opie-restartapplet2_cvs.oe
@@ -7,8 +7,8 @@ PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "restartapplet"
 I18N_FILES = "librestartapplet.ts"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/applets/restartapplet2 \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/restartapplet2 \
+           ${HANDHELDS_CVS};module=opie/apps"
 
 S = "${WORKDIR}/restartapplet2"
 
diff --git a/opie-rotateapplet/opie-rotateapplet_1.1.7.oe b/opie-rotateapplet/opie-rotateapplet_1.1.7.oe
index e69de29bb2..664edd3ad1 100644
--- a/opie-rotateapplet/opie-rotateapplet_1.1.7.oe
+++ b/opie-rotateapplet/opie-rotateapplet_1.1.7.oe
@@ -0,0 +1,19 @@
+DESCRIPTION = "Rotate Applet"
+SECTION = "opie/applets"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "rotateapplet"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/rotateapplet \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+# FILES
+do_install() {
+}
diff --git a/opie-rotateapplet/opie-rotateapplet_cvs.oe b/opie-rotateapplet/opie-rotateapplet_cvs.oe
index 7387af108b..6ce5a0a04a 100644
--- a/opie-rotateapplet/opie-rotateapplet_cvs.oe
+++ b/opie-rotateapplet/opie-rotateapplet_cvs.oe
@@ -6,8 +6,8 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "rotateapplet"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/applets/rotateapplet \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/rotateapplet \
+           ${HANDHELDS_CVS};module=opie/apps"
 
 S = "${WORKDIR}/${APPNAME}"
 
diff --git a/opie-screenshotapplet/opie-screenshotapplet_1.1.7.oe b/opie-screenshotapplet/opie-screenshotapplet_1.1.7.oe
index e69de29bb2..f390d00678 100644
--- a/opie-screenshotapplet/opie-screenshotapplet_1.1.7.oe
+++ b/opie-screenshotapplet/opie-screenshotapplet_1.1.7.oe
@@ -0,0 +1,34 @@
+DESCRIPTION = "Screenshot Applet"
+SECTION = "opie/applets"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "screenshotapplet"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/screenshotapplet \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+pkg_postinst() {
+#!/bin/sh
+if pidof -s qpe >/dev/null; then
+  /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+fi
+ if [ -n "$D" ]; then false; fi
+}
+
+pkg_postrm() {
+#!/bin/sh
+/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+ if [ -n "$D" ]; then false; fi
+}
+
+# FILES plugins/applets/libscreenshotapplet.so*
+do_install() {
+}
+
diff --git a/opie-screenshotapplet/opie-screenshotapplet_cvs.oe b/opie-screenshotapplet/opie-screenshotapplet_cvs.oe
index 1f6bb81896..5578f6aaf9 100644
--- a/opie-screenshotapplet/opie-screenshotapplet_cvs.oe
+++ b/opie-screenshotapplet/opie-screenshotapplet_cvs.oe
@@ -6,8 +6,8 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "screenshotapplet"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/applets/screenshotapplet \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/screenshotapplet \
+           ${HANDHELDS_CVS};module=opie/apps"
 
 S = "${WORKDIR}/${APPNAME}"
 
diff --git a/opie-search/opie-search_1.1.7.oe b/opie-search/opie-search_1.1.7.oe
index e69de29bb2..2a04f682ef 100644
--- a/opie-search/opie-search_1.1.7.oe
+++ b/opie-search/opie-search_1.1.7.oe
@@ -0,0 +1,23 @@
+DESCRIPTION = "Search through all PIM data"
+SECTION = "opie/pim"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "osearch"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/osearch \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+# FILES plugins/application/libosearch.so* bin/osearch apps/1Pim/osearch.desktop pics/osearch/*.png
+do_install() {
+        install -d ${D}${palmtopdir}/pics/${APPNAME}/
+        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+}
+
diff --git a/opie-search/opie-search_cvs.oe b/opie-search/opie-search_cvs.oe
index c4410c6928..353676e354 100644
--- a/opie-search/opie-search_cvs.oe
+++ b/opie-search/opie-search_cvs.oe
@@ -6,9 +6,9 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "osearch"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/pim/osearch \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/osearch \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/apps"
 
 S = "${WORKDIR}/${APPNAME}"
 
diff --git a/opie-security/opie-security_1.1.7.oe b/opie-security/opie-security_1.1.7.oe
index edf9a67313..c164880e93 100644
--- a/opie-security/opie-security_1.1.7.oe
+++ b/opie-security/opie-security_1.1.7.oe
@@ -9,9 +9,9 @@ PR = "r1"
 APPNAME = "security"
 
 TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/core/settings/security \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/settings/security \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
 
 S = "${WORKDIR}/${APPNAME}"
 
diff --git a/opie-security/opie-security_cvs.oe b/opie-security/opie-security_cvs.oe
index 5d7b2c3c21..3030313d73 100644
--- a/opie-security/opie-security_cvs.oe
+++ b/opie-security/opie-security_cvs.oe
@@ -8,9 +8,9 @@ PR = "r1"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "security"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/settings/security \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/core/settings/security \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/apps"
 
 S = "${WORKDIR}/${APPNAME}"
 
diff --git a/opie-securityplugins/opie-securityplugin-blueping_1.1.7.oe b/opie-securityplugins/opie-securityplugin-blueping_1.1.7.oe
index e69de29bb2..cb8b2b7102 100644
--- a/opie-securityplugins/opie-securityplugin-blueping_1.1.7.oe
+++ b/opie-securityplugins/opie-securityplugin-blueping_1.1.7.oe
@@ -0,0 +1,26 @@
+DESCRIPTION = "Blueping plugin for opie-security authentication. \
+This is a bluetooth-based authentication plugin (you need \
+to have another Bluetooth device around to use it)."
+SECTION = "opie/settings"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+I18N_FILES = "libmultiauthbluepingplugin.ts"
+RDEPENDS = "opie-security bluez-utils"
+
+APPNAME = "multiauthbluepingplugin"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/securityplugins/blueping \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics "
+
+S = "${WORKDIR}/blueping"
+
+inherit opie
+
+# FILES plugins/security/libmultiauthbluepingplugin.so* pics/security/bluepingplugin.png root/etc/suspend-scripts/S50bluetooth
+do_install() {
+        install -d ${D}${palmtopdir}/pics/security/
+        install -m 0644 ${WORKDIR}/pics/security/bluepingplugin.png ${D}${palmtopdir}/pics/security/
+}
+
diff --git a/opie-securityplugins/opie-securityplugin-blueping_cvs.oe b/opie-securityplugins/opie-securityplugin-blueping_cvs.oe
index 03f1e3753f..f5a75f64c9 100644
--- a/opie-securityplugins/opie-securityplugin-blueping_cvs.oe
+++ b/opie-securityplugins/opie-securityplugin-blueping_cvs.oe
@@ -11,8 +11,8 @@ PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "multiauthbluepingplugin"
 PR = "r1"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/securityplugins/blueping \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics "
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/securityplugins/blueping \
+           ${HANDHELDS_CVS};module=opie/pics "
 
 S = "${WORKDIR}/blueping"
 
diff --git a/opie-securityplugins/opie-securityplugin-dummy_1.1.7.oe b/opie-securityplugins/opie-securityplugin-dummy_1.1.7.oe
index e69de29bb2..b2c50f5b79 100644
--- a/opie-securityplugins/opie-securityplugin-dummy_1.1.7.oe
+++ b/opie-securityplugins/opie-securityplugin-dummy_1.1.7.oe
@@ -0,0 +1,26 @@
+DESCRIPTION = "Dummy plugin for opie-security authentication. \
+This is a very simple authentication plugin (you just have \
+to press a button basically), for demonstration purpose."
+SECTION = "opie/settings"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+I18N_FILES = "libmultiauthdummyplugin.ts"
+RDEPENDS = "opie-security"
+
+APPNAME = "multiauthdummyplugin"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/securityplugins/dummy \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics "
+
+S = "${WORKDIR}/dummy"
+
+inherit opie
+
+# FILES plugins/security/libmultiauthdummyplugin.so* pics/security/dummyplugin.png
+do_install() {
+        install -d ${D}${palmtopdir}/pics/security
+        install -m 0644 ${WORKDIR}/pics/security/dummyplugin.png ${D}${palmtopdir}/pics/security/
+}
+
diff --git a/opie-securityplugins/opie-securityplugin-dummy_cvs.oe b/opie-securityplugins/opie-securityplugin-dummy_cvs.oe
index e69c5aabb3..6c2fd468ae 100644
--- a/opie-securityplugins/opie-securityplugin-dummy_cvs.oe
+++ b/opie-securityplugins/opie-securityplugin-dummy_cvs.oe
@@ -11,8 +11,8 @@ PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "multiauthdummyplugin"
 PR = "r1"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/securityplugins/dummy \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics "
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/securityplugins/dummy \
+           ${HANDHELDS_CVS};module=opie/pics "
 
 S = "${WORKDIR}/dummy"
 
diff --git a/opie-securityplugins/opie-securityplugin-notice_1.1.7.oe b/opie-securityplugins/opie-securityplugin-notice_1.1.7.oe
index e69de29bb2..a988d102f3 100644
--- a/opie-securityplugins/opie-securityplugin-notice_1.1.7.oe
+++ b/opie-securityplugins/opie-securityplugin-notice_1.1.7.oe
@@ -0,0 +1,25 @@
+DESCRIPTION = "Notice plugin for opie-security authentication. \
+It allows you to display, for example, a notice from your legal departement."
+SECTION = "opie/settings"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+I18N_FILES = "libmultiauthnoticeplugin.ts"
+RDEPENDS = "opie-security"
+
+APPNAME = "multiauthnoticeplugin"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/securityplugins/notice \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics "
+
+S = "${WORKDIR}/notice"
+
+inherit opie
+
+# FILES plugins/security/libmultiauthnoticeplugin.so* pics/security/noticeplugin.png pics/security/noticeplugin_small.png
+do_install() {
+        install -d ${D}${palmtopdir}/pics/security/
+        install -m 0644 ${WORKDIR}/pics/security/noticeplugin*.png ${D}${palmtopdir}/pics/security/
+}
+
diff --git a/opie-securityplugins/opie-securityplugin-notice_cvs.oe b/opie-securityplugins/opie-securityplugin-notice_cvs.oe
index cc7e0c6a17..7fe7762681 100644
--- a/opie-securityplugins/opie-securityplugin-notice_cvs.oe
+++ b/opie-securityplugins/opie-securityplugin-notice_cvs.oe
@@ -10,8 +10,8 @@ PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "multiauthnoticeplugin"
 PR = "r1"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/securityplugins/notice \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics "
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/securityplugins/notice \
+           ${HANDHELDS_CVS};module=opie/pics "
 
 S = "${WORKDIR}/notice"
 
diff --git a/opie-securityplugins/opie-securityplugin-pin_1.1.7.oe b/opie-securityplugins/opie-securityplugin-pin_1.1.7.oe
index e69de29bb2..b79b0f6951 100644
--- a/opie-securityplugins/opie-securityplugin-pin_1.1.7.oe
+++ b/opie-securityplugins/opie-securityplugin-pin_1.1.7.oe
@@ -0,0 +1,27 @@
+DESCRIPTION = "PIN plugin for opie-security authentication. \
+It implements the same kind of widgets as opie-security package, \
+but this implementation can be used along with other authentication \
+methods in the Opie Multi-Authentication Framework."
+SECTION = "opie/settings"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+I18N_FILES = "libmultiauthpinplugin.ts"
+RDEPENDS = "opie-security"
+
+APPNAME = "multiauthpinplugin"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/securityplugins/pin \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics "
+
+S = "${WORKDIR}/pin"
+
+inherit opie
+
+# FILES plugins/security/libmultiauthpinplugin.so* pics/security/pinplugin.png
+do_install() {
+        install -d ${D}${palmtopdir}/pics/security/
+        install -m 0644 ${WORKDIR}/pics/security/pinplugin.png ${D}${palmtopdir}/pics/security/
+}
+
diff --git a/opie-securityplugins/opie-securityplugin-pin_cvs.oe b/opie-securityplugins/opie-securityplugin-pin_cvs.oe
index c16b94d5ba..fd176d1375 100644
--- a/opie-securityplugins/opie-securityplugin-pin_cvs.oe
+++ b/opie-securityplugins/opie-securityplugin-pin_cvs.oe
@@ -12,8 +12,8 @@ PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "multiauthpinplugin"
 PR = "r1"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/securityplugins/pin \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics "
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/securityplugins/pin \
+           ${HANDHELDS_CVS};module=opie/pics "
 
 S = "${WORKDIR}/pin"
 
diff --git a/opie-sfcave/opie-sfcave_1.1.7.oe b/opie-sfcave/opie-sfcave_1.1.7.oe
index e69de29bb2..851f346dbe 100644
--- a/opie-sfcave/opie-sfcave_1.1.7.oe
+++ b/opie-sfcave/opie-sfcave_1.1.7.oe
@@ -0,0 +1,24 @@
+DESCRIPTION = "SFCave for the Zaurus. Fly the dot though the cave avoiding the walls."
+SECTION = "opie/games"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "sfcave"
+APPTYPE = "binary"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/sfcave \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+# FILES bin/sfcave apps/Games/sfcave.desktop pics/sfcave
+do_install() {
+        install -d ${D}${palmtopdir}/pics/${APPNAME}/
+        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+}
+
diff --git a/opie-sfcave/opie-sfcave_cvs.oe b/opie-sfcave/opie-sfcave_cvs.oe
index 992c40fb63..4b64bd67c6 100644
--- a/opie-sfcave/opie-sfcave_cvs.oe
+++ b/opie-sfcave/opie-sfcave_cvs.oe
@@ -6,9 +6,9 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "sfcave"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/games/sfcave \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/sfcave \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/apps"
 
 S = "${WORKDIR}/${APPNAME}"
 
diff --git a/opie-sh/opie-sh_1.1.7.oe b/opie-sh/opie-sh_1.1.7.oe
index a2be0d643f..45982f3b0e 100644
--- a/opie-sh/opie-sh_1.1.7.oe
+++ b/opie-sh/opie-sh_1.1.7.oe
@@ -9,12 +9,12 @@ APPNAME = "opie-sh"
 APPTYPE = "binary"
 
 TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/noncore/tools/opie-sh \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/help \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/share \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/apps \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/bin"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/tools/opie-sh \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/help \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/share \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/bin"
 S = "${WORKDIR}/${APPNAME}"
 
 inherit opie
diff --git a/opie-sh/opie-sh_cvs.oe b/opie-sh/opie-sh_cvs.oe
index 917d583035..36b6c8af1c 100644
--- a/opie-sh/opie-sh_cvs.oe
+++ b/opie-sh/opie-sh_cvs.oe
@@ -8,12 +8,12 @@ APPNAME = "opie-sh"
 APPTYPE = "binary"
 PR = "r1"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/tools/opie-sh \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/help \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/share \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/bin"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/tools/opie-sh \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/help \
+           ${HANDHELDS_CVS};module=opie/share \
+           ${HANDHELDS_CVS};module=opie/apps \
+           ${HANDHELDS_CVS};module=opie/bin"
 S = "${WORKDIR}/${APPNAME}"
 
 inherit opie
diff --git a/opie-sheet/opie-sheet_1.1.7.oe b/opie-sheet/opie-sheet_1.1.7.oe
index e69de29bb2..4a7621ac56 100644
--- a/opie-sheet/opie-sheet_1.1.7.oe
+++ b/opie-sheet/opie-sheet_1.1.7.oe
@@ -0,0 +1,23 @@
+DESCRIPTION = "Opie Sheet"
+SECTION = "opie/applications"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "opie-sheet"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/opie-sheet \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/opie-sheet"
+
+inherit opie
+
+# FILES plugins/application/libsheetqt.so* bin/sheetqt apps/Applications/opie-sheet.desktop help/en/html/sheetqt.html pics/opie-sheet/*.png
+do_install() {
+        install -d ${D}${palmtopdir}/pics/${APPNAME}/
+        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+}
+
diff --git a/opie-sheet/opie-sheet_cvs.oe b/opie-sheet/opie-sheet_cvs.oe
index 75703016cc..a2e1ce0258 100644
--- a/opie-sheet/opie-sheet_cvs.oe
+++ b/opie-sheet/opie-sheet_cvs.oe
@@ -6,9 +6,9 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "opie-sheet"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/apps/opie-sheet \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/opie-sheet \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/apps"
 
 S = "${WORKDIR}/opie-sheet"
 
diff --git a/opie-showimg/opie-showimg_1.1.7.oe b/opie-showimg/opie-showimg_1.1.7.oe
index e69de29bb2..fca58cfeee 100644
--- a/opie-showimg/opie-showimg_1.1.7.oe
+++ b/opie-showimg/opie-showimg_1.1.7.oe
@@ -0,0 +1,23 @@
+DESCRIPTION = "Simple Image Viewer"
+SECTION = "opie/applications"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "showimg"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/multimedia/showimg \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+# FILES plugins/application/libshowimg.so* bin/showimg apps/Applications/showimg.desktop pics/imageviewer
+do_install() {
+        install -d ${D}${palmtopdir}/pics/imageviewer/
+        install -m 0644 ${WORKDIR}/pics/imageviewer/*.png ${D}${palmtopdir}/pics/imageviewer/
+}
+
diff --git a/opie-showimg/opie-showimg_cvs.oe b/opie-showimg/opie-showimg_cvs.oe
index 69242d18f9..bfd942aa0d 100644
--- a/opie-showimg/opie-showimg_cvs.oe
+++ b/opie-showimg/opie-showimg_cvs.oe
@@ -6,9 +6,9 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "showimg"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/multimedia/showimg \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/multimedia/showimg \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/apps"
 
 S = "${WORKDIR}/${APPNAME}"
 
diff --git a/opie-snake/opie-snake_1.1.7.oe b/opie-snake/opie-snake_1.1.7.oe
index e69de29bb2..bfa4287823 100644
--- a/opie-snake/opie-snake_1.1.7.oe
+++ b/opie-snake/opie-snake_1.1.7.oe
@@ -0,0 +1,23 @@
+DESCRIPTION = "Game: control the snake"
+SECTION = "opie/games"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "snake"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/snake \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+# FILES plugins/application/libsnake.so* bin/snake apps/Games/snake.desktop pics/snake
+do_install() {
+        install -d ${D}${palmtopdir}/pics/${APPNAME}/
+        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+}
+
diff --git a/opie-snake/opie-snake_cvs.oe b/opie-snake/opie-snake_cvs.oe
index 73bfad974a..8d1de6629d 100644
--- a/opie-snake/opie-snake_cvs.oe
+++ b/opie-snake/opie-snake_cvs.oe
@@ -6,9 +6,9 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "snake"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/games/snake \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/snake \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/apps"
 
 S = "${WORKDIR}/${APPNAME}"
 
diff --git a/opie-solitaire/opie-solitaire_1.1.7.oe b/opie-solitaire/opie-solitaire_1.1.7.oe
index e69de29bb2..706ba8b628 100644
--- a/opie-solitaire/opie-solitaire_1.1.7.oe
+++ b/opie-solitaire/opie-solitaire_1.1.7.oe
@@ -0,0 +1,24 @@
+DESCRIPTION = "Game: solitaire card games"
+SECTION = "opie/games"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "patience"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/solitaire \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/solitaire"
+
+inherit opie
+
+# FILES plugins/application/libpatience.so* bin/patience apps/Games/patience.desktop pics/cards
+do_install() {
+        install -d ${D}${palmtopdir}/pics/cards/
+        install -m 0644 ${WORKDIR}/pics/cards/*.png ${D}${palmtopdir}/pics/cards/
+}
+
+
diff --git a/opie-solitaire/opie-solitaire_cvs.oe b/opie-solitaire/opie-solitaire_cvs.oe
index 8b5351f3bf..533b168d02 100644
--- a/opie-solitaire/opie-solitaire_cvs.oe
+++ b/opie-solitaire/opie-solitaire_cvs.oe
@@ -6,9 +6,9 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "patience"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/games/solitaire \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/solitaire \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/apps"
 
 S = "${WORKDIR}/solitaire"
 
diff --git a/opie-sounds/opie-sounds_1.1.7.oe b/opie-sounds/opie-sounds_1.1.7.oe
index 75e7d0ff8e..0bbe38485a 100644
--- a/opie-sounds/opie-sounds_1.1.7.oe
+++ b/opie-sounds/opie-sounds_1.1.7.oe
@@ -5,7 +5,7 @@ MAINTAINER = "Team Opie <opie@handhelds.org>
 LICENSE = "GPL"
 
 TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/sounds;tag=${TAG}"
+SRC_URI = "${HANDHELDS_CVS};module=opie/sounds;tag=${TAG}"
 S = "${WORKDIR}/sounds"
 
 SOUNDS = "alarm touchsound keysound"
diff --git a/opie-sounds/opie-sounds_cvs.oe b/opie-sounds/opie-sounds_cvs.oe
index 0995596732..b7b7f3b68e 100644
--- a/opie-sounds/opie-sounds_cvs.oe
+++ b/opie-sounds/opie-sounds_cvs.oe
@@ -5,7 +5,7 @@ MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/sounds"
+SRC_URI = "${HANDHELDS_CVS};module=opie/sounds"
 S = "${WORKDIR}/sounds"
 
 SOUNDS = "alarm touchsound keysound"
diff --git a/opie-sshkeys/opie-sshkeys_1.1.7.oe b/opie-sshkeys/opie-sshkeys_1.1.7.oe
index e69de29bb2..f5794d8cf9 100644
--- a/opie-sshkeys/opie-sshkeys_1.1.7.oe
+++ b/opie-sshkeys/opie-sshkeys_1.1.7.oe
@@ -0,0 +1,25 @@
+DESCRIPTION = "Utility for managing ssh-agent keys"
+SECTION = "opie/settings"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+RDEPENDS = "ssh opie-sh-ssh-askpass"
+
+APPNAME = "sshkeys"
+APPTYPE = "binary"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/sshkeys \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+# FILES bin/sshkeys apps/Settings/sshkeys.desktop pics/sshkeys/sshkeys.png
+do_install() {
+        install -d ${D}${palmtopdir}/pics/${APPNAME}/
+        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+}
+
diff --git a/opie-sshkeys/opie-sshkeys_cvs.oe b/opie-sshkeys/opie-sshkeys_cvs.oe
index 1caac6ea2d..4a247777b5 100644
--- a/opie-sshkeys/opie-sshkeys_cvs.oe
+++ b/opie-sshkeys/opie-sshkeys_cvs.oe
@@ -7,9 +7,9 @@ RDEPENDS = "ssh opie-sh-ssh-askpass"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "sshkeys"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/settings/sshkeys \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/sshkeys \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/apps"
 
 S = "${WORKDIR}/${APPNAME}"
 
diff --git a/opie-style-flat/opie-style-flat_1.1.7.oe b/opie-style-flat/opie-style-flat_1.1.7.oe
index e69de29bb2..6c6213e2e5 100644
--- a/opie-style-flat/opie-style-flat_1.1.7.oe
+++ b/opie-style-flat/opie-style-flat_1.1.7.oe
@@ -0,0 +1,14 @@
+DESCRIPTION = "Simple, flat widget style for Opie"
+SECTION = "opie/styles"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "flatstyle"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/styles/flat "
+
+S = "${WORKDIR}/flat"
+
+inherit opie
diff --git a/opie-style-flat/opie-style-flat_cvs.oe b/opie-style-flat/opie-style-flat_cvs.oe
index 7e5a1eab1c..b9653a3f57 100644
--- a/opie-style-flat/opie-style-flat_cvs.oe
+++ b/opie-style-flat/opie-style-flat_cvs.oe
@@ -6,7 +6,7 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "flatstyle"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/styles/flat "
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/styles/flat "
 
 S = "${WORKDIR}/flat"
 
diff --git a/opie-style-fresh/opie-style-fresh_1.1.7.oe b/opie-style-fresh/opie-style-fresh_1.1.7.oe
index e69de29bb2..639bb1174b 100644
--- a/opie-style-fresh/opie-style-fresh_1.1.7.oe
+++ b/opie-style-fresh/opie-style-fresh_1.1.7.oe
@@ -0,0 +1,19 @@
+DESCRIPTION = "Opie widget style"
+SECTION = "opie/styles"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "freshstyle"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/styles/fresh "
+
+S = "${WORKDIR}/fresh"
+
+inherit opie
+
+# FILES plugins/styles/libfreshstyle.so*
+do_install() {
+}
+
diff --git a/opie-style-fresh/opie-style-fresh_cvs.oe b/opie-style-fresh/opie-style-fresh_cvs.oe
index 3e92e62393..54138a45b9 100644
--- a/opie-style-fresh/opie-style-fresh_cvs.oe
+++ b/opie-style-fresh/opie-style-fresh_cvs.oe
@@ -6,7 +6,7 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "freshstyle"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/styles/fresh "
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/styles/fresh "
 
 S = "${WORKDIR}/fresh"
 
diff --git a/opie-style-liquid/opie-style-liquid_1.1.7.oe b/opie-style-liquid/opie-style-liquid_1.1.7.oe
index e69de29bb2..53b7a7d905 100644
--- a/opie-style-liquid/opie-style-liquid_1.1.7.oe
+++ b/opie-style-liquid/opie-style-liquid_1.1.7.oe
@@ -0,0 +1,20 @@
+DESCRIPTION = "Liquid style by Mosfet"
+SECTION = "opie/styles"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+DEPENDS = " libqtaux2"
+
+APPNAME = "liquid"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/styles/liquid "
+
+S = "${WORKDIR}/liquid"
+
+inherit opie
+
+# FILES
+do_install() {
+}
+
diff --git a/opie-style-liquid/opie-style-liquid_cvs.oe b/opie-style-liquid/opie-style-liquid_cvs.oe
index 0eaff10f03..07a9b9b431 100644
--- a/opie-style-liquid/opie-style-liquid_cvs.oe
+++ b/opie-style-liquid/opie-style-liquid_cvs.oe
@@ -7,7 +7,7 @@ DEPENDS = " libqtaux2"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "liquid"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/styles/liquid "
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/styles/liquid "
 
 S = "${WORKDIR}/liquid"
 
diff --git a/opie-style-metal/opie-style-metal_1.1.7.oe b/opie-style-metal/opie-style-metal_1.1.7.oe
index e69de29bb2..8cfabf49c5 100644
--- a/opie-style-metal/opie-style-metal_1.1.7.oe
+++ b/opie-style-metal/opie-style-metal_1.1.7.oe
@@ -0,0 +1,19 @@
+DESCRIPTION = "Metal Style by Trolltech"
+SECTION = "opie/styles"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "metal"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/styles/metal "
+
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+# FILES
+do_install() {
+}
+
diff --git a/opie-style-metal/opie-style-metal_cvs.oe b/opie-style-metal/opie-style-metal_cvs.oe
index 8a17526edd..e033a024b9 100644
--- a/opie-style-metal/opie-style-metal_cvs.oe
+++ b/opie-style-metal/opie-style-metal_cvs.oe
@@ -6,7 +6,7 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "metal"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/styles/metal "
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/styles/metal "
 
 S = "${WORKDIR}/${APPNAME}"
 
diff --git a/opie-style-phase/opie-style-phase_1.1.7.oe b/opie-style-phase/opie-style-phase_1.1.7.oe
index e69de29bb2..efabb7e54c 100644
--- a/opie-style-phase/opie-style-phase_1.1.7.oe
+++ b/opie-style-phase/opie-style-phase_1.1.7.oe
@@ -0,0 +1,13 @@
+DESCRIPTION = "Opie Phase disguishes oneself through its' simple, clean and slick look. \
+It is based on http://www.usermode.org/code.html Phase 0.4."
+SECTION = "opie/styles"
+PRIORITY = "optional"
+LICENSE = "GPL"
+
+APPNAME = "phasestyle"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/styles/phase"
+S = "${WORKDIR}/phase"
+
+inherit opie
diff --git a/opie-style-phase/opie-style-phase_cvs.oe b/opie-style-phase/opie-style-phase_cvs.oe
index adf3685a8a..42931baff4 100644
--- a/opie-style-phase/opie-style-phase_cvs.oe
+++ b/opie-style-phase/opie-style-phase_cvs.oe
@@ -6,7 +6,7 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "phasestyle"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/styles/phase"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/styles/phase"
 S = "${WORKDIR}/phase"
 
 inherit opie
diff --git a/opie-style-web/opie-style-web_1.1.7.oe b/opie-style-web/opie-style-web_1.1.7.oe
index e69de29bb2..ceb9ad91b4 100644
--- a/opie-style-web/opie-style-web_1.1.7.oe
+++ b/opie-style-web/opie-style-web_1.1.7.oe
@@ -0,0 +1,12 @@
+DESCRIPTION = "A flatter widget style than flat :)"
+SECTION = "opie/styles"
+PRIORITY = "optional"
+LICENSE = "GPL"
+
+APPNAME = "webstyle"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/styles/web"
+S = "${WORKDIR}/web"
+
+inherit opie
diff --git a/opie-style-web/opie-style-web_cvs.oe b/opie-style-web/opie-style-web_cvs.oe
index ed18fd149a..e3860469ba 100644
--- a/opie-style-web/opie-style-web_cvs.oe
+++ b/opie-style-web/opie-style-web_cvs.oe
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "webstyle"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/styles/web"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/styles/web"
 S = "${WORKDIR}/web"
 
 inherit opie
diff --git a/opie-suspendapplet/opie-suspendapplet_1.1.7.oe b/opie-suspendapplet/opie-suspendapplet_1.1.7.oe
index e69de29bb2..5b9aa73456 100644
--- a/opie-suspendapplet/opie-suspendapplet_1.1.7.oe
+++ b/opie-suspendapplet/opie-suspendapplet_1.1.7.oe
@@ -0,0 +1,20 @@
+DESCRIPTION = "Suspend Applet"
+SECTION = "opie/applets"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "suspendapplet"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/suspendapplet \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+# FILES
+do_install() {
+}
+
diff --git a/opie-suspendapplet/opie-suspendapplet_cvs.oe b/opie-suspendapplet/opie-suspendapplet_cvs.oe
index 7f6bc80020..0f7a10a4c5 100644
--- a/opie-suspendapplet/opie-suspendapplet_cvs.oe
+++ b/opie-suspendapplet/opie-suspendapplet_cvs.oe
@@ -6,8 +6,8 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "suspendapplet"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/applets/suspendapplet \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/suspendapplet \
+           ${HANDHELDS_CVS};module=opie/apps"
 
 S = "${WORKDIR}/${APPNAME}"
 
diff --git a/opie-symlinker/opie-symlinker_1.1.7.oe b/opie-symlinker/opie-symlinker_1.1.7.oe
index e69de29bb2..df61f519b4 100644
--- a/opie-symlinker/opie-symlinker_1.1.7.oe
+++ b/opie-symlinker/opie-symlinker_1.1.7.oe
@@ -0,0 +1,21 @@
+DESCRIPTION = "Enables apps on external media"
+SECTION = "opie/base"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "opie-update-symlinks"
+APPTYPE = "binary"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/symlinker "
+
+S = "${WORKDIR}/symlinker"
+
+inherit opie
+
+do_install() {
+	install -d ${D}${palmtopdir}/bin/
+	install -m 0755 ${S}/opie-update-symlinks ${D}${palmtopdir}/bin/
+}
+
diff --git a/opie-symlinker/opie-symlinker_cvs.oe b/opie-symlinker/opie-symlinker_cvs.oe
index 688b7fc82f..d2e25e51c6 100644
--- a/opie-symlinker/opie-symlinker_cvs.oe
+++ b/opie-symlinker/opie-symlinker_cvs.oe
@@ -7,7 +7,7 @@ PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "opie-update-symlinks"
 APPTYPE = "binary"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/symlinker "
+SRC_URI = "${HANDHELDS_CVS};module=opie/core/symlinker "
 
 S = "${WORKDIR}/symlinker"
 
diff --git a/opie-sysinfo/opie-sysinfo_1.1.7.oe b/opie-sysinfo/opie-sysinfo_1.1.7.oe
index e69de29bb2..3cd0522125 100644
--- a/opie-sysinfo/opie-sysinfo_1.1.7.oe
+++ b/opie-sysinfo/opie-sysinfo_1.1.7.oe
@@ -0,0 +1,24 @@
+DESCRIPTION = "System Information dialog for the Opie environment"
+SECTION = "opie/settings"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "sysinfo"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/sysinfo \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/share"
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+do_install() {
+        install -d ${D}${palmtopdir}/pics/${APPNAME}/
+        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+        install -d ${D}${palmtopdir}/share/sysinfo/
+        install -m 0644 ${WORKDIR}/share/sysinfo/results ${D}${palmtopdir}/share/sysinfo/results
+}
+
diff --git a/opie-sysinfo/opie-sysinfo_cvs.oe b/opie-sysinfo/opie-sysinfo_cvs.oe
index 24144d40e9..63b83ca299 100644
--- a/opie-sysinfo/opie-sysinfo_cvs.oe
+++ b/opie-sysinfo/opie-sysinfo_cvs.oe
@@ -6,10 +6,10 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "sysinfo"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/settings/sysinfo \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/share"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/sysinfo \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/apps \
+           ${HANDHELDS_CVS};module=opie/share"
 S = "${WORKDIR}/${APPNAME}"
 
 inherit opie
diff --git a/opie-systemtime/opie-systemtime_1.1.7.oe b/opie-systemtime/opie-systemtime_1.1.7.oe
index e69de29bb2..19f47a01c0 100644
--- a/opie-systemtime/opie-systemtime_1.1.7.oe
+++ b/opie-systemtime/opie-systemtime_1.1.7.oe
@@ -0,0 +1,29 @@
+DESCRIPTION = "Set the system time - utilizing ntpdate, if available."
+SECTION = "opie/settings"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+RRECOMMENDS = "ntpdate"
+
+
+APPNAME = "systemtime"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/netsystemtime \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/etc \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/netsystemtime"
+
+inherit opie
+
+# FILES plugins/application/libsystemtime.so* bin/systemtime apps/Settings/systemtime.desktop etc/ntpservers pics/netsystemtime
+do_install() {
+        install -d ${D}${palmtopdir}/pics/netsystemtime/
+        install -d ${D}${palmtopdir}/etc
+        install -m 0644 ${WORKDIR}/pics/netsystemtime/*.png ${D}${palmtopdir}/pics/netsystemtime/
+        install -m 0644 ${WORKDIR}/etc/ntpservers ${D}${palmtopdir}/etc
+}
+
+FILES_opie-systemtime_append = " /etc/ntpservers"
diff --git a/opie-systemtime/opie-systemtime_cvs.oe b/opie-systemtime/opie-systemtime_cvs.oe
index 5c2b9fc90d..03b9a82ff2 100644
--- a/opie-systemtime/opie-systemtime_cvs.oe
+++ b/opie-systemtime/opie-systemtime_cvs.oe
@@ -8,10 +8,10 @@ PV = "1.1.7+cvs-${CVSDATE}"
 
 APPNAME = "systemtime"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/settings/netsystemtime \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/etc \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/netsystemtime \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/etc \
+           ${HANDHELDS_CVS};module=opie/apps"
 
 S = "${WORKDIR}/netsystemtime"
 
diff --git a/opie-tableviewer/opie-tableviewer_1.1.7.oe b/opie-tableviewer/opie-tableviewer_1.1.7.oe
index e69de29bb2..75caf7c067 100644
--- a/opie-tableviewer/opie-tableviewer_1.1.7.oe
+++ b/opie-tableviewer/opie-tableviewer_1.1.7.oe
@@ -0,0 +1,23 @@
+DESCRIPTION = "XML database browsers"
+SECTION = "opie/applications"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "tableviewer"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/tableviewer \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+# FILES plugins/application/libtableviewer.so* bin/tableviewer apps/Applications/tableviewer.desktop
+do_install() {
+        install -d ${D}${palmtopdir}/pics/${APPNAME}/
+        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+}
+
diff --git a/opie-tableviewer/opie-tableviewer_cvs.oe b/opie-tableviewer/opie-tableviewer_cvs.oe
index 3085aa0b3b..9d3975b026 100644
--- a/opie-tableviewer/opie-tableviewer_cvs.oe
+++ b/opie-tableviewer/opie-tableviewer_cvs.oe
@@ -6,9 +6,9 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "tableviewer"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/apps/tableviewer \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/tableviewer \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/apps"
 
 S = "${WORKDIR}/${APPNAME}"
 
diff --git a/opie-tabmanager/opie-tabmanager_1.1.7.oe b/opie-tabmanager/opie-tabmanager_1.1.7.oe
index e69de29bb2..a3962333ab 100644
--- a/opie-tabmanager/opie-tabmanager_1.1.7.oe
+++ b/opie-tabmanager/opie-tabmanager_1.1.7.oe
@@ -0,0 +1,24 @@
+DESCRIPTION = "Tab Manager"
+SECTION = "opie/settings"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "tabmanager"
+APPTYPE = "binary"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/tabmanager \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+# FILES plugins/application/libtabmanager.so* bin/tabmanager apps/Settings/tabmanager.desktop pics/tabmanager/tabmanager.png
+do_install() {
+        install -d ${D}${palmtopdir}/pics/${APPNAME}/
+        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+}
+
diff --git a/opie-tabmanager/opie-tabmanager_cvs.oe b/opie-tabmanager/opie-tabmanager_cvs.oe
index 596d5ef967..e2e314b02a 100644
--- a/opie-tabmanager/opie-tabmanager_cvs.oe
+++ b/opie-tabmanager/opie-tabmanager_cvs.oe
@@ -6,9 +6,9 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "tabmanager"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/settings/tabmanager \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/tabmanager \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/apps"
 
 S = "${WORKDIR}/${APPNAME}"
 
diff --git a/opie-taskbar/opie-taskbar_1.1.7.oe b/opie-taskbar/opie-taskbar_1.1.7.oe
index 64972f72f9..e3e4cc1a82 100644
--- a/opie-taskbar/opie-taskbar_1.1.7.oe
+++ b/opie-taskbar/opie-taskbar_1.1.7.oe
@@ -9,13 +9,13 @@ PR = "r2"
 APPNAME = "qpe"
 
 TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/core/apps/calibrate \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/noncore/settings/mediummount \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/core/launcher \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/apps \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/root \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/etc \
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/mediummount \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/core/launcher \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/root \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/etc \
 	   file://nomax.patch;patch=1;pnum=3 \
            file://server.pro-1.1.7 \
            file://opie-reorgfiles \
diff --git a/opie-taskbar/opie-taskbar_cvs.oe b/opie-taskbar/opie-taskbar_cvs.oe
index 81e8077935..a766e11b3e 100644
--- a/opie-taskbar/opie-taskbar_cvs.oe
+++ b/opie-taskbar/opie-taskbar_cvs.oe
@@ -8,13 +8,13 @@ PV = "1.1.7+cvs-${CVSDATE}"
 PR = "r2"
 APPNAME = "qpe"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/apps/calibrate \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/settings/mediummount \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/launcher \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/root \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/etc \
+SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \
+           ${HANDHELDS_CVS};module=opie/noncore/settings/mediummount \
+           ${HANDHELDS_CVS};module=opie/core/launcher \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/apps \
+           ${HANDHELDS_CVS};module=opie/root \
+           ${HANDHELDS_CVS};module=opie/etc \
 	   file://nomax.patch;patch=1;pnum=3 \
            file://server.pro \
            file://opie-reorgfiles \
diff --git a/opie-tetrix/opie-tetrix_1.1.7.oe b/opie-tetrix/opie-tetrix_1.1.7.oe
index e69de29bb2..2e63a9c783 100644
--- a/opie-tetrix/opie-tetrix_1.1.7.oe
+++ b/opie-tetrix/opie-tetrix_1.1.7.oe
@@ -0,0 +1,23 @@
+DESCRIPTION = "Game: control falling blocks"
+SECTION = "opie/games"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "tetrix"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/tetrix \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+# FILES plugins/application/libtetrix.so* bin/tetrix apps/Games/tetrix.desktop pics/tetrix/*
+do_install() {
+        install -d ${D}${palmtopdir}/pics/${APPNAME}/
+        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+}
+
diff --git a/opie-tetrix/opie-tetrix_cvs.oe b/opie-tetrix/opie-tetrix_cvs.oe
index 666491c45b..7a52e7f319 100644
--- a/opie-tetrix/opie-tetrix_cvs.oe
+++ b/opie-tetrix/opie-tetrix_cvs.oe
@@ -6,9 +6,9 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "tetrix"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/games/tetrix \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/tetrix \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/apps"
 
 S = "${WORKDIR}/${APPNAME}"
 
diff --git a/opie-textedit/opie-textedit_1.1.7.oe b/opie-textedit/opie-textedit_1.1.7.oe
index e69de29bb2..5e0e6ed6ff 100644
--- a/opie-textedit/opie-textedit_1.1.7.oe
+++ b/opie-textedit/opie-textedit_1.1.7.oe
@@ -0,0 +1,20 @@
+DESCRIPTION = "Opie Text Editor"
+SECTION = "opie/pim"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "textedit"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/${APPNAME} \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+do_install() {
+    install -d ${D}/${palmtopdir}/pics/${APPNAME}
+    install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}/${palmtopdir}/pics/${APPNAME}/
+}
diff --git a/opie-textedit/opie-textedit_cvs.oe b/opie-textedit/opie-textedit_cvs.oe
index c947d8103f..171a38a2bc 100644
--- a/opie-textedit/opie-textedit_cvs.oe
+++ b/opie-textedit/opie-textedit_cvs.oe
@@ -6,9 +6,9 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "textedit"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/apps/${APPNAME} \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/${APPNAME} \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/apps"
 S = "${WORKDIR}/${APPNAME}"
 
 inherit opie
diff --git a/opie-theme/opie-theme_1.1.7.oe b/opie-theme/opie-theme_1.1.7.oe
index e69de29bb2..682c5af08a 100644
--- a/opie-theme/opie-theme_1.1.7.oe
+++ b/opie-theme/opie-theme_1.1.7.oe
@@ -0,0 +1,49 @@
+DESCRIPTION = "Themed style"
+SECTION = "opie/styles"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "theme"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/styles/theme \
+	${HANDHELDS_CVS};tag=${TAG};module=opie/plugins/styles "
+
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+# FILES plugins/styles/libtheme.so*
+do_install() {
+	install -d ${D}${palmtopdir}/plugins/styles/pixmaps/
+	install -d ${D}${palmtopdir}/plugins/styles/themes/
+	for t in cleannsimple GradE8 ixpe luna
+	do
+		install -d ${D}${palmtopdir}/plugins/styles/pixmaps/$t/
+		for f in ../styles/pixmaps/$t/*
+		do
+		   [ -f $f ] && install -m 0644 $f ${D}${palmtopdir}/plugins/styles/pixmaps/$t/
+		done
+		install -m 0644 ../styles/themes/$t.themerc ${D}${palmtopdir}/plugins/styles/themes/
+	done
+	for t in lumonmarble lumonwave
+	do
+		install -d ${D}${palmtopdir}/plugins/styles/pixmaps/lumon/
+		for f in ../styles/pixmaps/lumon/*
+		do
+		   [ -f $f ] && install -m 0644 $f ${D}${palmtopdir}/plugins/styles/pixmaps/lumon/
+		done
+		install -m 0644 ../styles/themes/$t.themerc ${D}${palmtopdir}/plugins/styles/themes/
+	done
+}
+
+PACKAGES = " opie-theme-cleannsimple opie-theme-grade8 opie-theme-ixpe opie-theme-lumonmarble opie-theme-lumonwave opie-theme-luna opie-theme "
+
+FILES_opie-theme = " ${palmtopdir}/plugins/styles/libtheme.so*"
+FILES_opie-theme-cleannsimple = " ${palmtopdir}/plugins/styles/themes/cleannsimple.themerc ${palmtopdir}/plugins/styles/pixmaps/cleannsimple/*.png"
+FILES_opie-theme-grade8 = " ${palmtopdir}/plugins/styles/themes/GradE8.themerc ${palmtopdir}/plugins/styles/pixmaps/GradE8/*.png"
+FILES_opie-theme-ixpe = " ${palmtopdir}/plugins/styles/themes/ixpe.themerc ${palmtopdir}/plugins/styles/pixmaps/ixpe/*.png"
+FILES_opie-theme-lumonmarble = " ${palmtopdir}/plugins/styles/themes/lumonmarble.themerc ${palmtopdir}/plugins/styles/pixmaps/lumon/arrowdown.png ${palmtopdir}/plugins/styles/pixmaps/lumon/arrowleft.png ${palmtopdir}/plugins/styles/pixmaps/lumon/arrowright.png ${palmtopdir}/plugins/styles/pixmaps/lumon/arrowup.png ${palmtopdir}/plugins/styles/pixmaps/lumon/backgroundwhitemarble.png ${palmtopdir}/plugins/styles/pixmaps/lumon/backgroundbluemarble.png ${palmtopdir}/plugins/styles/pixmaps/lumon/button.png ${palmtopdir}/plugins/styles/pixmaps/lumon/buttonborder.png ${palmtopdir}/plugins/styles/pixmaps/lumon/buttonborderdown.png ${palmtopdir}/plugins/styles/pixmaps/lumon/buttondown.png ${palmtopdir}/plugins/styles/pixmaps/lumon/checkbox.png ${palmtopdir}/plugins/styles/pixmaps/lumon/checkboxdown.png ${palmtopdir}/plugins/styles/pixmaps/lumon/hscrollgroove.png ${palmtopdir}/plugins/styles/pixmaps/lumon/menubar.png ${palmtopdir}/plugins/styles/pixmaps/lumon/menuitemdown.png ${palmtopdir}/plugins/styles/pixmaps/lumon/radio.png ${palmtopdir}/plugins/styles/pixmaps/lumon/radiodown.png ${palmtopdir}/plugins/styles/pixmaps/lumon/scrollbutton.png ${palmtopdir}/plugins/styles/pixmaps/lumon/sunkenarrowdown.png ${palmtopdir}/plugins/styles/pixmaps/lumon/sunkenarrowleft.png ${palmtopdir}/plugins/styles/pixmaps/lumon/sunkenarrowright.png ${palmtopdir}/plugins/styles/pixmaps/lumon/sunkenarrowup.png ${palmtopdir}/plugins/styles/pixmaps/lumon/tab.png ${palmtopdir}/plugins/styles/pixmaps/lumon/tabdown.png ${palmtopdir}/plugins/styles/pixmaps/lumon/vscrollgroove.png"
+FILES_opie-theme-lumonwave = " ${palmtopdir}/plugins/styles/themes/lumonwave.themerc ${palmtopdir}/plugins/styles/pixmaps/lumon/arrowdown.png ${palmtopdir}/plugins/styles/pixmaps/lumon/arrowleft.png ${palmtopdir}/plugins/styles/pixmaps/lumon/arrowright.png ${palmtopdir}/plugins/styles/pixmaps/lumon/arrowup.png ${palmtopdir}/plugins/styles/pixmaps/lumon/backgroundwave.png ${palmtopdir}/plugins/styles/pixmaps/lumon/backgroundwaveblue.png ${palmtopdir}/plugins/styles/pixmaps/lumon/button.png ${palmtopdir}/plugins/styles/pixmaps/lumon/buttonborder.png ${palmtopdir}/plugins/styles/pixmaps/lumon/buttonborderdown.png ${palmtopdir}/plugins/styles/pixmaps/lumon/buttondown.png ${palmtopdir}/plugins/styles/pixmaps/lumon/checkbox.png ${palmtopdir}/plugins/styles/pixmaps/lumon/checkboxdown.png ${palmtopdir}/plugins/styles/pixmaps/lumon/hscrollgroove.png ${palmtopdir}/plugins/styles/pixmaps/lumon/menubar.png ${palmtopdir}/plugins/styles/pixmaps/lumon/menuitemdown.png ${palmtopdir}/plugins/styles/pixmaps/lumon/radio.png ${palmtopdir}/plugins/styles/pixmaps/lumon/radiodown.png ${palmtopdir}/plugins/styles/pixmaps/lumon/scrollbutton.png ${palmtopdir}/plugins/styles/pixmaps/lumon/splitter.png ${palmtopdir}/plugins/styles/pixmaps/lumon/sunkenarrowdown.png ${palmtopdir}/plugins/styles/pixmaps/lumon/sunkenarrowleft.png ${palmtopdir}/plugins/styles/pixmaps/lumon/sunkenarrowright.png ${palmtopdir}/plugins/styles/pixmaps/lumon/sunkenarrowup.png ${palmtopdir}/plugins/styles/pixmaps/lumon/tab.png ${palmtopdir}/plugins/styles/pixmaps/lumon/tabdown.png ${palmtopdir}/plugins/styles/pixmaps/lumon/vscrollgroove.png"
+FILES_opie-theme-luna = " ${palmtopdir}/plugins/styles/themes/luna.themerc ${palmtopdir}/plugins/styles/pixmaps/luna/*.png"
diff --git a/opie-theme/opie-theme_cvs.oe b/opie-theme/opie-theme_cvs.oe
index 2d4e896fde..ee7f700b46 100644
--- a/opie-theme/opie-theme_cvs.oe
+++ b/opie-theme/opie-theme_cvs.oe
@@ -6,8 +6,8 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "theme"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/styles/theme \
-	cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/plugins/styles "
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/styles/theme \
+	${HANDHELDS_CVS};module=opie/plugins/styles "
 
 S = "${WORKDIR}/${APPNAME}"
 
diff --git a/opie-tictac/opie-tictac_1.1.7.oe b/opie-tictac/opie-tictac_1.1.7.oe
index e69de29bb2..23c9ce308a 100644
--- a/opie-tictac/opie-tictac_1.1.7.oe
+++ b/opie-tictac/opie-tictac_1.1.7.oe
@@ -0,0 +1,23 @@
+DESCRIPTION = "Tic Tac Toe game."
+SECTION = "opie/games"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "tictac"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/tictac \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+# FILES plugins/application/libtictac.so* bin/tictac apps/Games/tictac.desktop pics/tictac
+do_install() {
+        install -d ${D}${palmtopdir}/pics/${APPNAME}/
+        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+}
+
diff --git a/opie-tictac/opie-tictac_cvs.oe b/opie-tictac/opie-tictac_cvs.oe
index 7449ad4f81..87e12ec678 100644
--- a/opie-tictac/opie-tictac_cvs.oe
+++ b/opie-tictac/opie-tictac_cvs.oe
@@ -6,9 +6,9 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "tictac"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/games/tictac \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/tictac \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/apps"
 
 S = "${WORKDIR}/${APPNAME}"
 
diff --git a/opie-tinykate/opie-tinykate_1.1.7.oe b/opie-tinykate/opie-tinykate_1.1.7.oe
index e69de29bb2..69fcf2b531 100644
--- a/opie-tinykate/opie-tinykate_1.1.7.oe
+++ b/opie-tinykate/opie-tinykate_1.1.7.oe
@@ -0,0 +1,47 @@
+DESCRIPTION = "The Kate Text Editor for Opie"
+SECTION = "opie/applications"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+DEPENDS = "libqtaux2"
+
+APPNAME = "tinykate"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/tinykate \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/share \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/tinykate"
+
+inherit opie
+
+EXTRA_QMAKEVARS_POST += " LIBS+=-L.."
+
+# FILES plugins/application/libkate.so* bin/kate apps/Applications/tinykate.desktop pics/tinykate lib/libtinykate.so*
+do_install() {
+	install -d ${D}${palmtopdir}/lib/
+	oe_soinstall libkate.so.1.0.0 ${D}${palmtopdir}/lib/
+        install -d ${D}${palmtopdir}/pics/${APPNAME}/
+        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+	install -d ${D}${palmtopdir}/share/${APPNAME}/syntax/
+	install -m 0644 ${WORKDIR}/share/${APPNAME}/syntax/*.* ${D}${palmtopdir}/share/${APPNAME}/syntax/
+}
+
+PACKAGES = " \
+	opie-tinykate-syntax-commondev \
+	opie-tinykate-syntax-documentation \
+	opie-tinykate-syntax-misc \
+	opie-tinykate-syntax-miscdev \
+	opie-tinykate-syntax-unix \
+	opie-tinykate-syntax-web \
+	opie-tinykate "
+
+
+FILES_opie-tinykate-syntax-commondev = " ${palmtopdir}/share/tinykate/syntax/c.xml ${palmtopdir}/share/tinykate/syntax/cpp.xml ${palmtopdir}/share/tinykate/syntax/gnuassembler.xml ${palmtopdir}/share/tinykate/syntax/kbasic.xml ${palmtopdir}/share/tinykate/syntax/pascal.xml ${palmtopdir}/share/tinykate/syntax/perl.xml ${palmtopdir}/share/tinykate/syntax/php.xml ${palmtopdir}/share/tinykate/syntax/python.xml ${palmtopdir}/share/tinykate/syntax/ruby.xml ${palmtopdir}/share/tinykate/syntax/sql.xml ${palmtopdir}/share/tinykate/syntax/tcl.xml ${palmtopdir}/share/tinykate/syntax/xml.xml ${palmtopdir}/share/tinykate/syntax/xmldebug.xml ${palmtopdir}/share/tinykate/syntax/java.xml"
+FILES_opie-tinykate-syntax-documentation = " ${palmtopdir}/share/tinykate/syntax/latex.xml ${palmtopdir}/share/tinykate/syntax/postscript.xml ${palmtopdir}/share/tinykate/syntax/sgml.xml"
+FILES_opie-tinykate-syntax-misc = " ${palmtopdir}/share/tinykate/syntax/idconsole.xml ${palmtopdir}/share/tinykate/syntax/matlab.xml ${palmtopdir}/share/tinykate/syntax/verilog.xml ${palmtopdir}/share/tinykate/syntax/vhdl.xml"
+FILES_opie-tinykate-syntax-miscdev = " ${palmtopdir}/share/tinykate/syntax/ada.xml ${palmtopdir}/share/tinykate/syntax/eiffel.xml ${palmtopdir}/share/tinykate/syntax/ferite.xml ${palmtopdir}/share/tinykate/syntax/fortran.xml ${palmtopdir}/share/tinykate/syntax/haskell.xml ${palmtopdir}/share/tinykate/syntax/literate-haskell.xml ${palmtopdir}/share/tinykate/syntax/objectivec.xml ${palmtopdir}/share/tinykate/syntax/sather.xml ${palmtopdir}/share/tinykate/syntax/scheme.xml"
+FILES_opie-tinykate-syntax-unix = " ${palmtopdir}/share/tinykate/syntax/cs.xml ${palmtopdir}/share/tinykate/syntax/bash.xml ${palmtopdir}/share/tinykate/syntax/changelog.xml ${palmtopdir}/share/tinykate/syntax/desktop.xml ${palmtopdir}/share/tinykate/syntax/diff.xml ${palmtopdir}/share/tinykate/syntax/mab.xml ${palmtopdir}/share/tinykate/syntax/makefile.xml ${palmtopdir}/share/tinykate/syntax/rpmspec.xml ${palmtopdir}/share/tinykate/syntax/sml.xml ${palmtopdir}/share/tinykate/syntax/winehq.xml"
+FILES_opie-tinykate-syntax-web = " ${palmtopdir}/share/tinykate/syntax/css.xml ${palmtopdir}/share/tinykate/syntax/html.xml ${palmtopdir}/share/tinykate/syntax/javascript.xml"
diff --git a/opie-tinykate/opie-tinykate_cvs.oe b/opie-tinykate/opie-tinykate_cvs.oe
index 5eb15166d0..35600aac12 100644
--- a/opie-tinykate/opie-tinykate_cvs.oe
+++ b/opie-tinykate/opie-tinykate_cvs.oe
@@ -7,10 +7,10 @@ DEPENDS = "libqtaux2"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "tinykate"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/apps/tinykate \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/share \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/tinykate \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/share \
+           ${HANDHELDS_CVS};module=opie/apps"
 
 S = "${WORKDIR}/tinykate"
 
diff --git a/opie-today-addressbookplugin/opie-today-addressbookplugin_1.1.7.oe b/opie-today-addressbookplugin/opie-today-addressbookplugin_1.1.7.oe
index e69de29bb2..ceddaccb0b 100644
--- a/opie-today-addressbookplugin/opie-today-addressbookplugin_1.1.7.oe
+++ b/opie-today-addressbookplugin/opie-today-addressbookplugin_1.1.7.oe
@@ -0,0 +1,15 @@
+DESCRIPTION = "Addressbook plugin for Today"
+SECTION = "opie/today"
+PRIORITY = "optional"
+LICENSE = "GPL"
+RDEPENDS = "opie-today"
+
+APPNAME="todayaddressbookplugin"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/today/plugins/addressbook "
+
+S = "${WORKDIR}/addressbook"
+
+inherit opie
+
diff --git a/opie-today-addressbookplugin/opie-today-addressbookplugin_cvs.oe b/opie-today-addressbookplugin/opie-today-addressbookplugin_cvs.oe
index d9fe92f30a..843c22dd06 100644
--- a/opie-today-addressbookplugin/opie-today-addressbookplugin_cvs.oe
+++ b/opie-today-addressbookplugin/opie-today-addressbookplugin_cvs.oe
@@ -6,7 +6,7 @@ RDEPENDS = "opie-today"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "todayaddressbookplugin"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/pim/today/plugins/addressbook "
+SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/today/plugins/addressbook "
 
 S = "${WORKDIR}/addressbook"
 
diff --git a/opie-today-datebookplugin/opie-today-datebookplugin_1.1.7.oe b/opie-today-datebookplugin/opie-today-datebookplugin_1.1.7.oe
index e69de29bb2..9adfbcdb05 100644
--- a/opie-today-datebookplugin/opie-today-datebookplugin_1.1.7.oe
+++ b/opie-today-datebookplugin/opie-today-datebookplugin_1.1.7.oe
@@ -0,0 +1,15 @@
+DESCRIPTION = "Datebook plugin for Today"
+SECTION = "opie/today"
+PRIORITY = "optional"
+LICENSE = "GPL"
+RDEPENDS = "opie-today"
+
+APPNAME = "todaydatebookplugin"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/today/plugins/datebook "
+
+S = "${WORKDIR}/datebook"
+
+inherit opie
+
diff --git a/opie-today-datebookplugin/opie-today-datebookplugin_cvs.oe b/opie-today-datebookplugin/opie-today-datebookplugin_cvs.oe
index 27bada5172..82de0c7d91 100644
--- a/opie-today-datebookplugin/opie-today-datebookplugin_cvs.oe
+++ b/opie-today-datebookplugin/opie-today-datebookplugin_cvs.oe
@@ -6,7 +6,7 @@ RDEPENDS = "opie-today"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "todaydatebookplugin"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/pim/today/plugins/datebook "
+SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/today/plugins/datebook "
 
 S = "${WORKDIR}/datebook"
 
diff --git a/opie-today-fortuneplugin/opie-today-fortuneplugin_1.1.7.oe b/opie-today-fortuneplugin/opie-today-fortuneplugin_1.1.7.oe
index e69de29bb2..724e12a66d 100644
--- a/opie-today-fortuneplugin/opie-today-fortuneplugin_1.1.7.oe
+++ b/opie-today-fortuneplugin/opie-today-fortuneplugin_1.1.7.oe
@@ -0,0 +1,15 @@
+DESCRIPTION = "'fortune' plugin for Today"
+SECTION = "opie/today"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+DEPENDS = "opie-today libqtaux2"
+RDEPENDS = "fortune-mod opie-today"
+
+APPNAME = "todayfortuneplugin"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/todayplugins/fortune "
+S = "${WORKDIR}/fortune"
+
+inherit opie
diff --git a/opie-today-fortuneplugin/opie-today-fortuneplugin_cvs.oe b/opie-today-fortuneplugin/opie-today-fortuneplugin_cvs.oe
index f38bb26b96..4d2b569c48 100644
--- a/opie-today-fortuneplugin/opie-today-fortuneplugin_cvs.oe
+++ b/opie-today-fortuneplugin/opie-today-fortuneplugin_cvs.oe
@@ -8,7 +8,7 @@ RDEPENDS = "fortune-mod opie-today"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "todayfortuneplugin"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/todayplugins/fortune "
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/todayplugins/fortune "
 S = "${WORKDIR}/fortune"
 
 inherit opie
diff --git a/opie-today-mailplugin/opie-today-mailplugin_1.1.7.oe b/opie-today-mailplugin/opie-today-mailplugin_1.1.7.oe
index e69de29bb2..2355e71c99 100644
--- a/opie-today-mailplugin/opie-today-mailplugin_1.1.7.oe
+++ b/opie-today-mailplugin/opie-today-mailplugin_1.1.7.oe
@@ -0,0 +1,16 @@
+DESCRIPTION = "Mail plugin for Today"
+SECTION = "opie/today"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+DEPENDS = "opie-today opie-mailapplet"
+RDEPENDS = "opie-today opie-mailapplet"
+
+APPNAME = "todaymailplugin"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/today/plugins/mail "
+
+S = "${WORKDIR}/mail"
+
+inherit opie
diff --git a/opie-today-mailplugin/opie-today-mailplugin_cvs.oe b/opie-today-mailplugin/opie-today-mailplugin_cvs.oe
index 642059e2c4..f8498bcabb 100644
--- a/opie-today-mailplugin/opie-today-mailplugin_cvs.oe
+++ b/opie-today-mailplugin/opie-today-mailplugin_cvs.oe
@@ -8,7 +8,7 @@ RDEPENDS = "opie-today opie-mailapplet"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "todaymailplugin"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/pim/today/plugins/mail "
+SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/today/plugins/mail "
 
 S = "${WORKDIR}/mail"
 
diff --git a/opie-today-stocktickerplugin/opie-today-stocktickerplugin_1.1.7.oe b/opie-today-stocktickerplugin/opie-today-stocktickerplugin_1.1.7.oe
index e69de29bb2..a972f2c970 100644
--- a/opie-today-stocktickerplugin/opie-today-stocktickerplugin_1.1.7.oe
+++ b/opie-today-stocktickerplugin/opie-today-stocktickerplugin_1.1.7.oe
@@ -0,0 +1,24 @@
+DESCRIPTION = "Stock ticker plugin for Today"
+SECTION = "opie/today"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+DEPENDS = "opie-today libqtaux2"
+
+APPNAME = "todaystocktickerplugin"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/todayplugins/stockticker \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/stockticker"
+
+inherit opie
+
+# FILES plugins/today/libtodaystocktickerplugin.so* bin/stockticker pics/stockticker/stockticker.png
+do_install() {
+        install -d ${D}${palmtopdir}/pics/stockticker/
+        install -m 0644 ${WORKDIR}/pics/stockticker/*.png ${D}${palmtopdir}/pics/stockticker/
+}
+
diff --git a/opie-today-stocktickerplugin/opie-today-stocktickerplugin_cvs.oe b/opie-today-stocktickerplugin/opie-today-stocktickerplugin_cvs.oe
index e8f197207f..aebf23826f 100644
--- a/opie-today-stocktickerplugin/opie-today-stocktickerplugin_cvs.oe
+++ b/opie-today-stocktickerplugin/opie-today-stocktickerplugin_cvs.oe
@@ -7,9 +7,9 @@ DEPENDS = "opie-today libqtaux2"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "todaystocktickerplugin"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/todayplugins/stockticker \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/todayplugins/stockticker \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/apps"
 
 S = "${WORKDIR}/stockticker"
 
diff --git a/opie-today-todolistplugin/opie-today-todolistplugin_1.1.7.oe b/opie-today-todolistplugin/opie-today-todolistplugin_1.1.7.oe
index e69de29bb2..6fb4fb6d9f 100644
--- a/opie-today-todolistplugin/opie-today-todolistplugin_1.1.7.oe
+++ b/opie-today-todolistplugin/opie-today-todolistplugin_1.1.7.oe
@@ -0,0 +1,16 @@
+DESCRIPTION = "Todo list plugin for Today"
+SECTION = "opie/today"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+RDEPENDS = "opie-today"
+
+APPNAME = "todaytodolistplugin"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/today/plugins/todolist "
+
+S = "${WORKDIR}/todolist"
+
+inherit opie
+
diff --git a/opie-today-todolistplugin/opie-today-todolistplugin_cvs.oe b/opie-today-todolistplugin/opie-today-todolistplugin_cvs.oe
index b1e3d7d230..0180f0bfcd 100644
--- a/opie-today-todolistplugin/opie-today-todolistplugin_cvs.oe
+++ b/opie-today-todolistplugin/opie-today-todolistplugin_cvs.oe
@@ -7,7 +7,7 @@ RDEPENDS = "opie-today"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "todaytodolistplugin"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/pim/today/plugins/todolist "
+SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/today/plugins/todolist "
 
 S = "${WORKDIR}/todolist"
 
diff --git a/opie-today-weatherplugin/opie-today-weatherplugin_1.1.7.oe b/opie-today-weatherplugin/opie-today-weatherplugin_1.1.7.oe
index e69de29bb2..0af39a7f25 100644
--- a/opie-today-weatherplugin/opie-today-weatherplugin_1.1.7.oe
+++ b/opie-today-weatherplugin/opie-today-weatherplugin_1.1.7.oe
@@ -0,0 +1,24 @@
+DESCRIPTION = "Weather plugin for Today"
+SECTION = "opie/today"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+DEPENDS = "libopiecore2 libopiepim2"
+RDEPENDS = "opie-today"
+
+APPNAME = "todayweatherplugin"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/todayplugins/weather \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
+
+S = "${WORKDIR}/weather"
+
+inherit opie
+
+# FILES plugins/today/libtodayweatherplugin.so* pics/todayweatherplugin
+do_install() {
+        install -d ${D}${palmtopdir}/pics/${APPNAME}/
+        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+}
+
diff --git a/opie-today-weatherplugin/opie-today-weatherplugin_cvs.oe b/opie-today-weatherplugin/opie-today-weatherplugin_cvs.oe
index 1cce379fd1..78d49b2398 100644
--- a/opie-today-weatherplugin/opie-today-weatherplugin_cvs.oe
+++ b/opie-today-weatherplugin/opie-today-weatherplugin_cvs.oe
@@ -8,8 +8,8 @@ RDEPENDS = "opie-today"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "todayweatherplugin"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/todayplugins/weather \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/todayplugins/weather \
+           ${HANDHELDS_CVS};module=opie/pics"
 
 S = "${WORKDIR}/weather"
 
diff --git a/opie-today/opie-today_1.1.7.oe b/opie-today/opie-today_1.1.7.oe
index e69de29bb2..99f3f11bf6 100644
--- a/opie-today/opie-today_1.1.7.oe
+++ b/opie-today/opie-today_1.1.7.oe
@@ -0,0 +1,23 @@
+DESCRIPTION = "Today screen application"
+SECTION = "opie/pim"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "today"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/today \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+# FILES plugins/application/libtoday.so* bin/today apps/1Pim/today.desktop pics/today/* 
+do_install() {
+        install -d ${D}${palmtopdir}/pics/${APPNAME}/
+        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+}
+
diff --git a/opie-today/opie-today_cvs.oe b/opie-today/opie-today_cvs.oe
index fb00363d8a..cf4349f9de 100644
--- a/opie-today/opie-today_cvs.oe
+++ b/opie-today/opie-today_cvs.oe
@@ -6,9 +6,9 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "today"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/pim/today \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/today \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/apps"
 
 S = "${WORKDIR}/${APPNAME}"
 
diff --git a/opie-todo/opie-todo_1.1.7.oe b/opie-todo/opie-todo_1.1.7.oe
index e69de29bb2..84be4d9269 100644
--- a/opie-todo/opie-todo_1.1.7.oe
+++ b/opie-todo/opie-todo_1.1.7.oe
@@ -0,0 +1,18 @@
+DESCRIPTION = "Todo list manager"
+SECTION = "opie/pim"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+RDEPENDS = "opie-pics"
+
+APPNAME = "todolist"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/todo \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/todo"
+
+inherit opie
+
+# FILES plugins/application/libtodolist.so* bin/todolist apps/1Pim/todo.desktop
diff --git a/opie-todo/opie-todo_cvs.oe b/opie-todo/opie-todo_cvs.oe
index 40c52207c6..51a6c16cb7 100644
--- a/opie-todo/opie-todo_cvs.oe
+++ b/opie-todo/opie-todo_cvs.oe
@@ -7,8 +7,8 @@ RDEPENDS = "opie-pics"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "todolist"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/pim/todo \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/todo \
+           ${HANDHELDS_CVS};module=opie/apps"
 
 S = "${WORKDIR}/todo"
 
diff --git a/opie-tonleiter/opie-tonleiter_1.1.7.oe b/opie-tonleiter/opie-tonleiter_1.1.7.oe
index e69de29bb2..4746591f89 100644
--- a/opie-tonleiter/opie-tonleiter_1.1.7.oe
+++ b/opie-tonleiter/opie-tonleiter_1.1.7.oe
@@ -0,0 +1,24 @@
+DESCRIPTION = "Music scales for string instruments"
+SECTION = "opie/multimedia"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "tonleiter"
+APPTYPE = "binary"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/multimedia/tonleiter \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+# FILES bin/tonleiter pics/tonleiter apps/Applications/tonleiter.desktop
+do_install() {
+        install -d ${D}${palmtopdir}/pics/${APPNAME}/
+        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+}
+
diff --git a/opie-tonleiter/opie-tonleiter_cvs.oe b/opie-tonleiter/opie-tonleiter_cvs.oe
index e2e787daf8..fb6a111833 100644
--- a/opie-tonleiter/opie-tonleiter_cvs.oe
+++ b/opie-tonleiter/opie-tonleiter_cvs.oe
@@ -7,9 +7,9 @@ PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "tonleiter"
 APPTYPE = "binary"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/multimedia/tonleiter \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/multimedia/tonleiter \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/apps"
 
 S = "${WORKDIR}/${APPNAME}"
 
diff --git a/opie-unikeyboard/opie-unikeyboard_1.1.7.oe b/opie-unikeyboard/opie-unikeyboard_1.1.7.oe
index e69de29bb2..4c5f4542f6 100644
--- a/opie-unikeyboard/opie-unikeyboard_1.1.7.oe
+++ b/opie-unikeyboard/opie-unikeyboard_1.1.7.oe
@@ -0,0 +1,35 @@
+DESCRIPTION = "Unicode input method"
+SECTION = "opie/inputmethods"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "qunikeyboard"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/unikeyboard "
+
+S = "${WORKDIR}/unikeyboard"
+
+inherit opie
+
+pkg_postinst() {
+#!/bin/sh
+if [ -n "$D" ]; then exit 1; fi
+if pidof -s qpe >/dev/null; then
+  /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+else
+  exit 0
+fi
+}
+
+pkg_postrm() {
+#!/bin/sh
+if [ -n "$D" ]; then exit 1; fi
+/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadInputMethods()"
+}
+
+# FILES plugins/inputmethods/libqunikeyboard.so*
+do_install() {
+}
+
diff --git a/opie-unikeyboard/opie-unikeyboard_cvs.oe b/opie-unikeyboard/opie-unikeyboard_cvs.oe
index ae23beeb58..0e06d17c72 100644
--- a/opie-unikeyboard/opie-unikeyboard_cvs.oe
+++ b/opie-unikeyboard/opie-unikeyboard_cvs.oe
@@ -6,7 +6,7 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "qunikeyboard"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/inputmethods/unikeyboard "
+SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/unikeyboard "
 
 S = "${WORKDIR}/unikeyboard"
 
diff --git a/opie-usermanager/opie-usermanager_1.1.7.oe b/opie-usermanager/opie-usermanager_1.1.7.oe
index e69de29bb2..501e66bd14 100644
--- a/opie-usermanager/opie-usermanager_1.1.7.oe
+++ b/opie-usermanager/opie-usermanager_1.1.7.oe
@@ -0,0 +1,23 @@
+DESCRIPTION = "User/Group manager for Opie"
+SECTION = "opie/settings"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "usermanager"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/usermanager \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+# FILES plugins/application/libusermanager.so* bin/usermanager apps/Settings/usermanager.desktop pics/usermanager/*
+do_install() {
+        install -d ${D}${palmtopdir}/pics/${APPNAME}/
+        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+}
+
diff --git a/opie-usermanager/opie-usermanager_cvs.oe b/opie-usermanager/opie-usermanager_cvs.oe
index b1b019419d..a29c43235e 100644
--- a/opie-usermanager/opie-usermanager_cvs.oe
+++ b/opie-usermanager/opie-usermanager_cvs.oe
@@ -6,9 +6,9 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "usermanager"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/settings/usermanager \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/usermanager \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/apps"
 
 S = "${WORKDIR}/${APPNAME}"
 
diff --git a/opie-vmemo-settings/opie-vmemo-settings_1.1.7.oe b/opie-vmemo-settings/opie-vmemo-settings_1.1.7.oe
index e69de29bb2..cc9116591c 100644
--- a/opie-vmemo-settings/opie-vmemo-settings_1.1.7.oe
+++ b/opie-vmemo-settings/opie-vmemo-settings_1.1.7.oe
@@ -0,0 +1,17 @@
+DESCRIPTION = "Sound settings dialog"
+SECTION = "opie/settings"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "sound"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/sound \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+# FILES plugins/application/libsound.so* bin/sound apps/Settings/Sound.desktop
diff --git a/opie-vmemo-settings/opie-vmemo-settings_cvs.oe b/opie-vmemo-settings/opie-vmemo-settings_cvs.oe
index d6c40adfae..bcfae4d938 100644
--- a/opie-vmemo-settings/opie-vmemo-settings_cvs.oe
+++ b/opie-vmemo-settings/opie-vmemo-settings_cvs.oe
@@ -6,8 +6,8 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "sound"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/settings/sound \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/sound \
+           ${HANDHELDS_CVS};module=opie/apps"
 
 S = "${WORKDIR}/${APPNAME}"
 
diff --git a/opie-vmemo/opie-vmemo_1.1.7.oe b/opie-vmemo/opie-vmemo_1.1.7.oe
index e69de29bb2..16f7b67dca 100644
--- a/opie-vmemo/opie-vmemo_1.1.7.oe
+++ b/opie-vmemo/opie-vmemo_1.1.7.oe
@@ -0,0 +1,36 @@
+DESCRIPTION = "Voice Memo Recorder Applet"
+SECTION = "opie/applets"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+RDEPENDS = "opie-vmemo-settings"
+I18N_FILES = "libvmemoapplet.ts"
+
+APPNAME = "vmemoapplet"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/vmemo \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/vmemo"
+
+inherit opie
+
+pkg_postinst() {
+#!/bin/sh
+if pidof -s qpe >/dev/null; then
+  /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+fi
+ if [ -n "$D" ]; then exit 1; fi
+}
+
+pkg_postrm() {
+#!/bin/sh
+/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+ if [ -n "$D" ]; then exit 1; fi
+}
+
+# FILES plugins/applets/libvmemoapplet.so*
+do_install() {
+}
+
diff --git a/opie-vmemo/opie-vmemo_cvs.oe b/opie-vmemo/opie-vmemo_cvs.oe
index 3472f75eac..bc254de257 100644
--- a/opie-vmemo/opie-vmemo_cvs.oe
+++ b/opie-vmemo/opie-vmemo_cvs.oe
@@ -8,8 +8,8 @@ PV = "1.1.7+cvs-${CVSDATE}"
 I18N_FILES = "libvmemoapplet.ts"
 APPNAME = "vmemoapplet"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/applets/vmemo \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/vmemo \
+           ${HANDHELDS_CVS};module=opie/apps"
 
 S = "${WORKDIR}/vmemo"
 
diff --git a/opie-volumeapplet/opie-volumeapplet_1.1.7.oe b/opie-volumeapplet/opie-volumeapplet_1.1.7.oe
index e69de29bb2..433ffadb78 100644
--- a/opie-volumeapplet/opie-volumeapplet_1.1.7.oe
+++ b/opie-volumeapplet/opie-volumeapplet_1.1.7.oe
@@ -0,0 +1,34 @@
+DESCRIPTION = "Volume applet"
+SECTION = "opie/applets"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "volumeapplet"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/volumeapplet \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+pkg_postinst() {
+#!/bin/sh
+if pidof -s qpe >/dev/null; then
+  /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+fi
+ if [ -n "$D" ]; then false; fi
+}
+
+pkg_postrm() {
+#!/bin/sh
+/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+ if [ -n "$D" ]; then false; fi
+}
+
+# FILES plugins/applets/libvolumeapplet.so*
+do_install() {
+}
+
diff --git a/opie-volumeapplet/opie-volumeapplet_cvs.oe b/opie-volumeapplet/opie-volumeapplet_cvs.oe
index f9a9f750a5..9dc12ad5a4 100644
--- a/opie-volumeapplet/opie-volumeapplet_cvs.oe
+++ b/opie-volumeapplet/opie-volumeapplet_cvs.oe
@@ -6,8 +6,8 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "volumeapplet"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/applets/volumeapplet \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/volumeapplet \
+           ${HANDHELDS_CVS};module=opie/apps"
 
 S = "${WORKDIR}/${APPNAME}"
 
diff --git a/opie-vtapplet/opie-vtapplet_1.1.7.oe b/opie-vtapplet/opie-vtapplet_1.1.7.oe
index e69de29bb2..44095dd408 100644
--- a/opie-vtapplet/opie-vtapplet_1.1.7.oe
+++ b/opie-vtapplet/opie-vtapplet_1.1.7.oe
@@ -0,0 +1,20 @@
+DESCRIPTION = "VT Applet"
+SECTION = "opie/applets"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "vtapplet"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/vtapplet \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+# FILES
+do_install() {
+}
+
diff --git a/opie-vtapplet/opie-vtapplet_cvs.oe b/opie-vtapplet/opie-vtapplet_cvs.oe
index 6f7ef70249..bc521d3643 100644
--- a/opie-vtapplet/opie-vtapplet_cvs.oe
+++ b/opie-vtapplet/opie-vtapplet_cvs.oe
@@ -6,8 +6,8 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "vtapplet"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/applets/vtapplet \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/vtapplet \
+           ${HANDHELDS_CVS};module=opie/apps"
 
 S = "${WORKDIR}/${APPNAME}"
 
diff --git a/opie-wellenreiter/opie-wellenreiter_1.0.3.oe b/opie-wellenreiter/opie-wellenreiter_1.0.3.oe
index 9d226fd9be..0136aeb428 100644
--- a/opie-wellenreiter/opie-wellenreiter_1.0.3.oe
+++ b/opie-wellenreiter/opie-wellenreiter_1.0.3.oe
@@ -11,9 +11,9 @@ APPTYPE = "binary"
 
 CVSDATE = "20041015"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/net/wellenreiter;date=20040504 \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics;date=20040504                     \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps;date=20040504"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/wellenreiter;date=20040504 \
+           ${HANDHELDS_CVS};module=opie/pics;date=20040504                     \
+           ${HANDHELDS_CVS};module=opie/apps;date=20040504"
 S = "${WORKDIR}/wellenreiter"
 
 inherit opie
diff --git a/opie-wellenreiter/opie-wellenreiter_cvs.oe b/opie-wellenreiter/opie-wellenreiter_cvs.oe
index 7781030ac7..7b5996e6fe 100644
--- a/opie-wellenreiter/opie-wellenreiter_cvs.oe
+++ b/opie-wellenreiter/opie-wellenreiter_cvs.oe
@@ -9,9 +9,9 @@ PV = "1.0.3+cvs-${CVSDATE}"
 APPNAME = "wellenreiter"
 APPTYPE = "binary"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/net/wellenreiter \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/wellenreiter \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/apps"
 S = "${WORKDIR}/wellenreiter"
 
 inherit opie
diff --git a/opie-wirelessapplet/opie-wirelessapplet_1.1.7.oe b/opie-wirelessapplet/opie-wirelessapplet_1.1.7.oe
index e69de29bb2..582086387b 100644
--- a/opie-wirelessapplet/opie-wirelessapplet_1.1.7.oe
+++ b/opie-wirelessapplet/opie-wirelessapplet_1.1.7.oe
@@ -0,0 +1,35 @@
+DESCRIPTION = "Wireless Applet"
+SECTION = "opie/applets"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "wirelessapplet"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/wirelessapplet"
+
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+pkg_postinst() {
+#!/bin/sh
+if [ -n "$D" ]; then exit 1; fi
+if pidof -s qpe >/dev/null; then
+  /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+else
+  exit 0
+fi
+}
+
+pkg_postrm() {
+#!/bin/sh
+if [ -n "$D" ]; then exit 1; fi
+/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+}
+
+# FILES plugins/applets/libwirelessapplet.so*
+do_install() {
+}
+
diff --git a/opie-wirelessapplet/opie-wirelessapplet_cvs.oe b/opie-wirelessapplet/opie-wirelessapplet_cvs.oe
index 96f6b6904a..4bb241f8cd 100644
--- a/opie-wirelessapplet/opie-wirelessapplet_cvs.oe
+++ b/opie-wirelessapplet/opie-wirelessapplet_cvs.oe
@@ -6,7 +6,7 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "wirelessapplet"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/applets/wirelessapplet"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/wirelessapplet"
 
 S = "${WORKDIR}/${APPNAME}"
 
diff --git a/opie-wordgame/opie-wordgame_1.1.7.oe b/opie-wordgame/opie-wordgame_1.1.7.oe
index e69de29bb2..372a10dc0a 100644
--- a/opie-wordgame/opie-wordgame_1.1.7.oe
+++ b/opie-wordgame/opie-wordgame_1.1.7.oe
@@ -0,0 +1,24 @@
+DESCRIPTION = "Crossword game"
+SECTION = "opie/games"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "wordgame"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/wordgame \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+# FILES plugins/application/libwordgame.so* bin/wordgame apps/Games/wordgame.desktop pics/wordgame
+do_install() {
+        install -d ${D}${palmtopdir}/pics/${APPNAME}/
+        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.xpm ${D}${palmtopdir}/pics/${APPNAME}/
+}
+
diff --git a/opie-wordgame/opie-wordgame_cvs.oe b/opie-wordgame/opie-wordgame_cvs.oe
index 6b8e2c9a8c..6fb2dac4cd 100644
--- a/opie-wordgame/opie-wordgame_cvs.oe
+++ b/opie-wordgame/opie-wordgame_cvs.oe
@@ -6,9 +6,9 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "wordgame"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/games/wordgame \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/wordgame \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/apps"
 
 S = "${WORKDIR}/${APPNAME}"
 
diff --git a/opie-write/opie-write_1.1.7.oe b/opie-write/opie-write_1.1.7.oe
index e69de29bb2..c0b59eef32 100644
--- a/opie-write/opie-write_1.1.7.oe
+++ b/opie-write/opie-write_1.1.7.oe
@@ -0,0 +1,20 @@
+DESCRIPTION = "Opie Write"
+SECTION = "opie/applications"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "opie-write"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/${APPNAME} \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+do_install() {
+    install -d ${D}/${palmtopdir}/pics/${APPNAME}/
+    install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}/${palmtopdir}/pics/${APPNAME}/
+}
diff --git a/opie-write/opie-write_cvs.oe b/opie-write/opie-write_cvs.oe
index 3d83ce3997..7a9fe64136 100644
--- a/opie-write/opie-write_cvs.oe
+++ b/opie-write/opie-write_cvs.oe
@@ -6,9 +6,9 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "opie-write"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/apps/${APPNAME} \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/${APPNAME} \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/apps"
 S = "${WORKDIR}/${APPNAME}"
 
 inherit opie
diff --git a/opie-zkbapplet/opie-zkbapplet_1.1.7.oe b/opie-zkbapplet/opie-zkbapplet_1.1.7.oe
index e69de29bb2..5a662f920f 100644
--- a/opie-zkbapplet/opie-zkbapplet_1.1.7.oe
+++ b/opie-zkbapplet/opie-zkbapplet_1.1.7.oe
@@ -0,0 +1,31 @@
+DESCRIPTION = "KeyZ Applet"
+SECTION = "opie/applets"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+I18N_FILES = "keyz-cfg.ts"
+APPNAME = "zkbapplet"
+RDEPENDS = "opie-pics"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/zkbapplet \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/share \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+do_install() {
+        install -d ${D}${palmtopdir}/pics/
+        install -d ${D}${palmtopdir}/share/zkb/
+        install -m 0644 ${WORKDIR}/share/zkb/*xml* ${D}${palmtopdir}/share/zkb/
+	install -m 0644 ${WORKDIR}/share/zkb/zkb.xml.sample ${D}${palmtopdir}/share/zkb/zkb.xml
+        install -d ${D}${palmtopdir}/bin
+        install -m 0755 ${S}/keyz-cfg ${D}${palmtopdir}/bin/
+        install -d ${D}${palmtopdir}/apps/Settings
+        install -m 0644 ${WORKDIR}/apps/Settings/keyz-cfg.desktop ${D}${palmtopdir}/apps/Settings/
+}
+
diff --git a/opie-zkbapplet/opie-zkbapplet_cvs.oe b/opie-zkbapplet/opie-zkbapplet_cvs.oe
index d54bbc7159..587d92fc6d 100644
--- a/opie-zkbapplet/opie-zkbapplet_cvs.oe
+++ b/opie-zkbapplet/opie-zkbapplet_cvs.oe
@@ -9,10 +9,10 @@ RDEPENDS = "opie-pics"
 I18N_FILES = "keyz-cfg.ts"
 
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/applets/zkbapplet \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/share \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/zkbapplet \
+           ${HANDHELDS_CVS};module=opie/share \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/apps"
 
 S = "${WORKDIR}/${APPNAME}"
 
diff --git a/opie-zlines/opie-zlines_1.1.7.oe b/opie-zlines/opie-zlines_1.1.7.oe
index e69de29bb2..f40d71d0f8 100644
--- a/opie-zlines/opie-zlines_1.1.7.oe
+++ b/opie-zlines/opie-zlines_1.1.7.oe
@@ -0,0 +1,23 @@
+DESCRIPTION = "ZLines"
+SECTION = "opie/games"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "zlines"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/zlines \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+# FILES plugins/application/libzlines.so* bin/zlines apps/Games/zlines.desktop pics/zlines
+do_install() {
+        install -d ${D}${palmtopdir}/pics/${APPNAME}/
+        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+}
+
diff --git a/opie-zlines/opie-zlines_cvs.oe b/opie-zlines/opie-zlines_cvs.oe
index b0f2400d49..811f944ae0 100644
--- a/opie-zlines/opie-zlines_cvs.oe
+++ b/opie-zlines/opie-zlines_cvs.oe
@@ -6,9 +6,9 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "zlines"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/games/zlines \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/zlines \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/apps"
 
 S = "${WORKDIR}/${APPNAME}"
 
diff --git a/opie-zsafe/opie-zsafe_1.1.7.oe b/opie-zsafe/opie-zsafe_1.1.7.oe
index e69de29bb2..5817b134bc 100644
--- a/opie-zsafe/opie-zsafe_1.1.7.oe
+++ b/opie-zsafe/opie-zsafe_1.1.7.oe
@@ -0,0 +1,26 @@
+DESCRIPTION = "Password manager program for Opie."
+SECTION = "opie/applications"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "zsafe"
+APPTYPE = "binary"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/zsafe \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+QMAKE_PROFILES = "zsafe.pro"
+
+# FILES bin/zsafe apps/Applications/zsafe.desktop pics/zsafe/zsafe.png
+do_install() {
+        install -d ${D}${palmtopdir}/pics/${APPNAME}/
+        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+}
+
diff --git a/opie-zsafe/opie-zsafe_cvs.oe b/opie-zsafe/opie-zsafe_cvs.oe
index 7a29ed36f7..e696ae1dfb 100644
--- a/opie-zsafe/opie-zsafe_cvs.oe
+++ b/opie-zsafe/opie-zsafe_cvs.oe
@@ -6,9 +6,9 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "zsafe"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/apps/zsafe \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/zsafe \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/apps"
 
 S = "${WORKDIR}/${APPNAME}"
 
diff --git a/opie-zsame/opie-zsame_1.1.7.oe b/opie-zsame/opie-zsame_1.1.7.oe
index e69de29bb2..c7e4085899 100644
--- a/opie-zsame/opie-zsame_1.1.7.oe
+++ b/opie-zsame/opie-zsame_1.1.7.oe
@@ -0,0 +1,23 @@
+DESCRIPTION = "ZSame"
+SECTION = "opie/games"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "zsame"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/zsame \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+# FILES plugins/application/libzsame.so* bin/zsame apps/Games/zsame.desktop pics/zsame
+do_install() {
+        install -d ${D}${palmtopdir}/pics/${APPNAME}/
+        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+}
+
diff --git a/opie-zsame/opie-zsame_cvs.oe b/opie-zsame/opie-zsame_cvs.oe
index a4655cfd3f..9781b0b420 100644
--- a/opie-zsame/opie-zsame_cvs.oe
+++ b/opie-zsame/opie-zsame_cvs.oe
@@ -6,9 +6,9 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "zsame"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/games/zsame \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/zsame \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/apps"
 
 S = "${WORKDIR}/${APPNAME}"
 
diff --git a/python/python-quicklauncher_0.0.1.oe b/python/python-quicklauncher_0.0.1.oe
index 658ff4f866..818f6a8bfc 100644
--- a/python/python-quicklauncher_0.0.1.oe
+++ b/python/python-quicklauncher_0.0.1.oe
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 RDEPENDS = "python-pyqt"
 PR = "ml1"
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/tools/pyquicklauncher"
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/tools/pyquicklauncher"
 S = "${WORKDIR}/pyquicklauncher"
 
 inherit distutils
diff --git a/rosetta/rosetta_cvs.oe b/rosetta/rosetta_cvs.oe
index 5c3737fad9..12be1138d7 100644
--- a/rosetta/rosetta_cvs.oe
+++ b/rosetta/rosetta_cvs.oe
@@ -4,7 +4,7 @@ DEPENDS = "gtk+ libgpewidget x11 libxrandr libxft xtst xext xau"
 DESCRIPTION = "Multistroke / full word handwriting recognition for X"
 LICENSE = "GPL"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=rosetta \
+SRC_URI = "${HANDHELDS_CVS};module=rosetta \
 	file://rosetta-makefile.patch;patch=1"
 S = "${WORKDIR}/rosetta"
 PR = "r2"
diff --git a/snes232/snes232_cvs.oe b/snes232/snes232_cvs.oe
index bc06cac357..4e2ce7cdb8 100644
--- a/snes232/snes232_cvs.oe
+++ b/snes232/snes232_cvs.oe
@@ -5,7 +5,7 @@ INHIBIT_PACKAGE_STRIP = "1"
 
 RDEPENDS = "kernel-module-serport"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=gpe/games/snes232 \
+SRC_URI = "${HANDHELDS_CVS};module=gpe/games/snes232 \
 	file://snes232-2.6.patch;patch=1;pnum=0 \
 	file://Makefile-2.6"
 
diff --git a/timezones/timezones_cvs.oe b/timezones/timezones_cvs.oe
index 39c0d8a677..15231f6326 100644
--- a/timezones/timezones_cvs.oe
+++ b/timezones/timezones_cvs.oe
@@ -5,7 +5,7 @@ MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/root"
+SRC_URI = "${HANDHELDS_CVS};module=opie/root"
 S = "${WORKDIR}/root"
 
 do_install() {
diff --git a/update-rc.d/update-rc.d_0.3.oe b/update-rc.d/update-rc.d_0.3.oe
index 0df1c78ed1..9034a07cb9 100644
--- a/update-rc.d/update-rc.d_0.3.oe
+++ b/update-rc.d/update-rc.d_0.3.oe
@@ -4,7 +4,7 @@ DESCRIPTION = "Manage symlinks in /etc/rcN.d"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 S = ${WORKDIR}/update-rc.d
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=apps/update-rc.d;tag=r0_3"
+SRC_URI = "${HANDHELDS_CVS};module=apps/update-rc.d;tag=r0_3"
 
 do_compile() {
 }
diff --git a/update-rc.d/update-rc.d_0.4.oe b/update-rc.d/update-rc.d_0.4.oe
index e57d7a762a..51c388eee1 100644
--- a/update-rc.d/update-rc.d_0.4.oe
+++ b/update-rc.d/update-rc.d_0.4.oe
@@ -4,7 +4,7 @@ DESCRIPTION = "Manage symlinks in /etc/rcN.d"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 S = ${WORKDIR}/update-rc.d
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=apps/update-rc.d;tag=r0_4"
+SRC_URI = "${HANDHELDS_CVS};module=apps/update-rc.d;tag=r0_4"
 
 do_compile() {
 }
diff --git a/update-rc.d/update-rc.d_0.5.oe b/update-rc.d/update-rc.d_0.5.oe
index e69de29bb2..8ae9255d6e 100644
--- a/update-rc.d/update-rc.d_0.5.oe
+++ b/update-rc.d/update-rc.d_0.5.oe
@@ -0,0 +1,19 @@
+SECTION = "base"
+PRIORITY = "standard"
+DESCRIPTION = "Manage symlinks in /etc/rcN.d"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+S = ${WORKDIR}/update-rc.d
+
+SRC_URI = "${HANDHELDS_CVS};module=apps/update-rc.d;tag=r0_5"
+
+do_compile() {
+}
+
+do_stage() {
+	install -m 0755 ${S}/update-rc.d ${STAGING_BINDIR}/
+}
+
+do_install() {
+	install -d ${D}/${sbindir}
+	install -m 0755 ${S}/update-rc.d ${D}/${sbindir}/update-rc.d
+}
diff --git a/zbedic/zbedic_0.9.1.oe b/zbedic/zbedic_cvs.oe
index e69de29bb2..e69de29bb2 100644
--- a/zbedic/zbedic_0.9.1.oe
+++ b/zbedic/zbedic_cvs.oe
author	Michael Lauer <mickey@vanille-media.de>	2004-11-27 11:48:37 +0000
committer	Michael Lauer <mickey@vanille-media.de>	2004-11-27 11:48:37 +0000
commit	9d8e32e606c021113800d864e90484fd0595832e (patch)
tree	0f504f80d326750d49163bf1cc7e4e64135da91a
parent	80e85c0a8664aa9e5008268ed03c6c1cd30366bb (diff)