merge of 1c33e529dab473350372fd8e8e18d1322fe7aa8a

     and 63568fa256744014488cd1f4983565c78db1f166

9 files changed, 12 insertions, 11 deletions

diff --git a/packages/bl/bl_cvs.bb b/packages/bl/bl_cvs.bb
index c11a00bcfa..c0f206225a 100644
--- a/packages/bl/bl_cvs.bb
+++ b/packages/bl/bl_cvs.bb
@@ -2,9 +2,9 @@ SECTION = "base"
 LICENSE= "GPL"
 PV = "0.0cvs${CVSDATE}"
 DESCRIPTION = "Command line tool for iPaq backlight control"
-MAINTAINER = "Florian Boor <florian@kernelconcets.de>"
+MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=apps/h3600_test \
+SRC_URI = "${HANDHELDS_CVS};module=apps/h3600_test \
            file://nokernelheader.patch;patch=1;pnum=0"
 
 S = "${WORKDIR}/h3600_test"
diff --git a/packages/gpe-buttonbox/gpe-buttonbox_cvs.bb b/packages/gpe-buttonbox/gpe-buttonbox_cvs.bb
index e25f1985ac..361aae7038 100644
--- a/packages/gpe-buttonbox/gpe-buttonbox_cvs.bb
+++ b/packages/gpe-buttonbox/gpe-buttonbox_cvs.bb
@@ -2,7 +2,7 @@ DEFAULT_PREFERENCE = "-1"
 LICENSE =	"GPL"
 DESCIPTION =	"Buttonbox for gpe"
 
-SRC_URI =	"cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=gpe/base/gpe-buttonbox"
+SRC_URI =	"${HANDHELDS_CVS};module=gpe/base/gpe-buttonbox"
 
 DEPENDS =	"libgpewidget libgpelaunch"
 
diff --git a/packages/gpe-conf/gpe-conf_cvs.bb b/packages/gpe-conf/gpe-conf_cvs.bb
index 6ab2d16863..8af52e3ac1 100644
--- a/packages/gpe-conf/gpe-conf_cvs.bb
+++ b/packages/gpe-conf/gpe-conf_cvs.bb
@@ -6,7 +6,7 @@ PR = "r0"
 
 inherit gpe
 
-SRC_URI =	"cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=gpe/base/${PN} \
+SRC_URI =	"${HANDHELDS_CVS};module=gpe/base/${PN} \
 		 file://Makefile.dpkg_ipkg \
     		 file://Makefile.translation"
 
diff --git a/packages/gpe-today/gpe-today_cvs.bb b/packages/gpe-today/gpe-today_cvs.bb
index 817bbf3d33..a1ed5c6707 100644
--- a/packages/gpe-today/gpe-today_cvs.bb
+++ b/packages/gpe-today/gpe-today_cvs.bb
@@ -12,7 +12,7 @@ PR = 			"r0"
 
 inherit gpe
 
-SRC_URI =		"cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=gpe/base/${PN} \
+SRC_URI =		"${HANDHELDS_CVS};module=gpe/base/${PN} \
 		 		 file://Makefile.dpkg_ipkg \
     		 	 file://Makefile.translation"
 
diff --git a/packages/gpesyncd/gpesyncd_cvs.bb b/packages/gpesyncd/gpesyncd_cvs.bb
index c6c8230a89..fbc5953b57 100644
--- a/packages/gpesyncd/gpesyncd_cvs.bb
+++ b/packages/gpesyncd/gpesyncd_cvs.bb
@@ -3,7 +3,7 @@ DESCRIPTION =	"Sync daemon for GPE and OpenSync"
 MAINTAINER =	"Koen Kooi <koen@handhelds.org>"
 
 
-SRC_URI =	"cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=gpe/base/gpesyncd"
+SRC_URI =	"${HANDHELDS_CVS};module=gpe/base/gpesyncd"
 
 DEPENDS =	"libgpevtype sqlite libmimedir glib-2.0"
 
diff --git a/packages/libgpevtype/libgpevtype_cvs.bb b/packages/libgpevtype/libgpevtype_cvs.bb
index 946bcd2d74..a1bcc5c01f 100644
--- a/packages/libgpevtype/libgpevtype_cvs.bb
+++ b/packages/libgpevtype/libgpevtype_cvs.bb
@@ -13,7 +13,7 @@ PR = 		"r0"
 
 inherit pkgconfig gpe autotools
 
-SRC_URI =   	"cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=gpe/base/${PN}"
+SRC_URI =   	"${HANDHELDS_CVS};module=gpe/base/${PN}"
 
 
 headers = "tag-db.h vcard.h vevent.h vtodo.h"
diff --git a/packages/libgpewidget/libgpewidget_cvs.bb b/packages/libgpewidget/libgpewidget_cvs.bb
index 42230bab5e..f3d377a46c 100644
--- a/packages/libgpewidget/libgpewidget_cvs.bb
+++ b/packages/libgpewidget/libgpewidget_cvs.bb
@@ -14,10 +14,10 @@ PR = "r0"
 
 inherit autotools pkgconfig
 
-SRC_URI =   "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=gpe/base/${PN}"
+SRC_URI =   "${HANDHELDS_CVS};module=gpe/base/${PN}"
 
 EXTRA_OECONF = "--enable-cairo"
 
 do_stage () {
 	autotools_stage_all
-
+}
diff --git a/packages/nonworking/opie-mediaplayer1-libmpeg3plugin/opie-mediaplayer1-libmpeg3plugin_cvs.bb b/packages/nonworking/opie-mediaplayer1-libmpeg3plugin/opie-mediaplayer1-libmpeg3plugin_cvs.bb
index f37b407fce..002edfd5db 100644
--- a/packages/nonworking/opie-mediaplayer1-libmpeg3plugin/opie-mediaplayer1-libmpeg3plugin_cvs.bb
+++ b/packages/nonworking/opie-mediaplayer1-libmpeg3plugin/opie-mediaplayer1-libmpeg3plugin_cvs.bb
@@ -4,10 +4,10 @@ PRIORITY = "optional"
 LICENSE = "GPL"
 DEPENDS = "opie-mediaplayer1"
 RDEPENDS = "opie-mediaplayer1"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.2.1+cvs-${CVSDATE}"
 APPNAME = "mpeg3plugin"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/multimedia/opieplayer;date=${CVSDATE} "
+SRC_URI = "${HANDHELDS_CVS};module=opie/core/multimedia/opieplayer"
 
 S = "${WORKDIR}/opieplayer/libmpeg3"
 
diff --git a/packages/opie-launcher-settings/opie-launcher-settings_1.2.1.bb b/packages/opie-launcher-settings/opie-launcher-settings_1.2.1.bb
index 4590f81108..4663d0350e 100644
--- a/packages/opie-launcher-settings/opie-launcher-settings_1.2.1.bb
+++ b/packages/opie-launcher-settings/opie-launcher-settings_1.2.1.bb
@@ -3,3 +3,4 @@ include ${PN}.inc
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/settings/launcher \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
+	   ${HANDHELDS_CVS};tag=${TAG};module=opie/pics"