summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--classes/native.bbclass7
-rw-r--r--packages/cumulus/cumulus_cvs.bb2
-rw-r--r--packages/ffmpeg/ffmpeg_cvs.bb3
-rw-r--r--packages/gaim/gaim_2.0.0-cvs-mco1.bb3
-rw-r--r--packages/gaim/gaim_cvs.bb3
-rw-r--r--packages/gchub/gchub-module_svn.bb2
-rw-r--r--packages/gomunicator/gomunicator_cvs.bb3
-rw-r--r--packages/gpe-buttonbox/gpe-buttonbox_cvs.bb3
-rw-r--r--packages/gpe-mini-browser/gpe-mini-browser_cvs.bb2
-rw-r--r--packages/gpe-today/gpe-today_cvs.bb3
-rw-r--r--packages/gpesyncd/gpesyncd_cvs.bb3
-rw-r--r--packages/gpsdrive/gpsdrive_cvs.bb3
-rw-r--r--packages/inputpipe/inputpipe_svn.bb3
-rw-r--r--packages/kbdd/kbdd_cvs.bb3
-rw-r--r--packages/libgpevtype/libgpevtype_cvs.bb2
-rw-r--r--packages/libgpewidget/libgpewidget_cvs.bb2
-rw-r--r--packages/libmailwrapper/libmailwrapper_cvs.bb2
-rw-r--r--packages/libmatchbox/libmatchbox_svn.bb3
-rw-r--r--packages/libmimedir/libmimedir_cvs.bb3
-rw-r--r--packages/libqtaux/libqtaux2_cvs.bb2
-rw-r--r--packages/libsm/libsm_cvs.bb2
-rw-r--r--packages/madwifi/madwifi-modules_cvs-bsd.bb2
-rw-r--r--packages/madwifi/madwifi-modules_cvs.bb2
-rw-r--r--packages/mileage/mileage_cvs.bb3
-rw-r--r--packages/mystun-server/mystun-server_cvs.bb2
-rw-r--r--packages/nonworking/opie-mediaplayer1-libmpeg3plugin/opie-mediaplayer1-libmpeg3plugin_cvs.bb2
-rw-r--r--packages/nylon/nylon-scripts_cvs.bb2
-rw-r--r--packages/nylon/nylon-statistics.bb2
-rw-r--r--packages/nylon/yamonenv.bb2
-rw-r--r--packages/olsrd/olsrd_cvs.bb2
-rw-r--r--packages/opie-i18n/opie-i18n_cvs.bb3
-rw-r--r--packages/opie-i18n/opie-lrelease-native_cvs.bb3
-rw-r--r--packages/opie-i18n/opie-lupdate-native_cvs.bb3
-rw-r--r--packages/portaudio/portaudio_0.0.19.bb2
-rw-r--r--packages/prism54/prism54-module_cvs.bb2
-rw-r--r--packages/putty/putty_svn.bb3
-rw-r--r--packages/qplot/qplot_2.0.1+cvs20020420.bb3
-rw-r--r--packages/tremor/tremor_svn.bb2
-rw-r--r--packages/usbutils/usbutils_cvs.bb2
39 files changed, 63 insertions, 38 deletions
diff --git a/classes/native.bbclass b/classes/native.bbclass
index feada55b3d..f4e1f7c7d5 100644
--- a/classes/native.bbclass
+++ b/classes/native.bbclass
@@ -7,6 +7,13 @@ EXCLUDE_FROM_WORLD = "1"
PACKAGES = ""
PACKAGE_ARCH = "${BUILD_ARCH}"
+# When this class has packaging enabled, setting
+# RPROVIDES becomes unnecessary.
+RPROVIDES = "${PN}"
+
+# Need to resolve package RDEPENDS as well as DEPENDS
+BUILD_ALL_DEPS = "1"
+
TARGET_ARCH = "${BUILD_ARCH}"
TARGET_OS = "${BUILD_OS}"
TARGET_VENDOR = "${BUILD_VENDOR}"
diff --git a/packages/cumulus/cumulus_cvs.bb b/packages/cumulus/cumulus_cvs.bb
index ff58977b11..9fdad829b9 100644
--- a/packages/cumulus/cumulus_cvs.bb
+++ b/packages/cumulus/cumulus_cvs.bb
@@ -6,7 +6,7 @@ LICENSE = "GPL"
APPTYPE = "binary"
APPNAME = "cumulus"
APPDESKTOP = "${S}"
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
PR = "r0"
SRC_URI = "http://www.kflog.org/fileadmin/user_upload/cumulus_snapshots/cumulus-snapshot.tbz"
diff --git a/packages/ffmpeg/ffmpeg_cvs.bb b/packages/ffmpeg/ffmpeg_cvs.bb
index 3973ce0f48..bfd68eb3e2 100644
--- a/packages/ffmpeg/ffmpeg_cvs.bb
+++ b/packages/ffmpeg/ffmpeg_cvs.bb
@@ -1,4 +1,5 @@
-PV = "0.4.9-pre1+cvs${SRCDATE}"
+#Remove the dash after cvs below when 0.4.9 changes in PV
+PV = "0.4.9-pre1+cvs-${SRCDATE}"
DESCRIPTION = "ffmpeg"
SECTION = "libs"
PRIORITY = "optional"
diff --git a/packages/gaim/gaim_2.0.0-cvs-mco1.bb b/packages/gaim/gaim_2.0.0-cvs-mco1.bb
index 7160d8120f..8ff63ee8b9 100644
--- a/packages/gaim/gaim_2.0.0-cvs-mco1.bb
+++ b/packages/gaim/gaim_2.0.0-cvs-mco1.bb
@@ -1,6 +1,7 @@
PR = "r3"
SRCDATE_${PN} = "20050904"
-PV = "2.0.0+cvs${SRCDATE}-mco1"
+#Change to x.y.z+cvs${SRCDATE}-mco1 when 2.0.0 changes
+PV = "2.0.0-cvs-mco1-${SRCDATE}"
WEBCVSURL = "http://handhelds.org/cgi-bin/cvsweb.cgi/~checkout~/gaim"
diff --git a/packages/gaim/gaim_cvs.bb b/packages/gaim/gaim_cvs.bb
index 3daaf44c19..801ec7dd25 100644
--- a/packages/gaim/gaim_cvs.bb
+++ b/packages/gaim/gaim_cvs.bb
@@ -1,5 +1,6 @@
PR = "r0"
-PV = "2.0+cvs${SRCDATE}"
+#Remove the dash below when 2.0 changes in PV
+PV = "2.0+cvs-${SRCDATE}"
SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/gaim;module=gaim \
file://no-superimposed-version-on-logo.patch;patch=1 \
diff --git a/packages/gchub/gchub-module_svn.bb b/packages/gchub/gchub-module_svn.bb
index fe951aaa4e..676e0b0804 100644
--- a/packages/gchub/gchub-module_svn.bb
+++ b/packages/gchub/gchub-module_svn.bb
@@ -4,7 +4,7 @@ DESCRIPTION = "Kernel module for the GameCube Hub input device"
DEPENDS = "virtual/kernel"
MAINTAINER = "Micah Dowty <micah@navi.cx>"
LICENSE = "GPL"
-PV = "0.0+svn${SRCDATE}"
+PV = "1:0.0+svn${SRCDATE}"
SRC_URI = "svn://svn.navi.cx/misc/trunk/wasabi/devices;module=gchub;proto=http"
diff --git a/packages/gomunicator/gomunicator_cvs.bb b/packages/gomunicator/gomunicator_cvs.bb
index 3c3f9352c7..d45d467d45 100644
--- a/packages/gomunicator/gomunicator_cvs.bb
+++ b/packages/gomunicator/gomunicator_cvs.bb
@@ -4,7 +4,8 @@ LICENSE = "GPLv2"
AUTHOR = "Robert Woerle"
MAINTAINER = "Koen Kooi <koen@handhelds.org>"
DEPENDS = "libgpewidget gtk+ glib-2.0"
-PV = "0.1.3+cvs${SRCDATE}"
+#Remove the dash below when 0.1.3 changes in PV
+PV = "0.1.3+cvs-${SRCDATE}"
inherit autotools pkgconfig
diff --git a/packages/gpe-buttonbox/gpe-buttonbox_cvs.bb b/packages/gpe-buttonbox/gpe-buttonbox_cvs.bb
index 302d78d109..86e5cabcf0 100644
--- a/packages/gpe-buttonbox/gpe-buttonbox_cvs.bb
+++ b/packages/gpe-buttonbox/gpe-buttonbox_cvs.bb
@@ -7,7 +7,8 @@ SRC_URI = "${HANDHELDS_CVS};module=gpe/base/gpe-buttonbox"
DEPENDS = "libgpewidget libgpelaunch"
S = "${WORKDIR}/${PN}"
-PV = "0.5+cvs${SRCDATE}"
+#Remove the dash below when 0.5 changes in PV
+PV = "0.5+cvs-${SRCDATE}"
PR = "r0"
inherit autotools
diff --git a/packages/gpe-mini-browser/gpe-mini-browser_cvs.bb b/packages/gpe-mini-browser/gpe-mini-browser_cvs.bb
index 2f5574d91b..d2e9ed6edb 100644
--- a/packages/gpe-mini-browser/gpe-mini-browser_cvs.bb
+++ b/packages/gpe-mini-browser/gpe-mini-browser_cvs.bb
@@ -1,5 +1,5 @@
PR = "r2"
-PV = "0.17+cvs${SRCDATE}"
+PV = "0.18+cvs${SRCDATE}"
SRC_URI = "${HANDHELDS_CVS};module=gpe/base/gpe-mini-browser"
DESCRIPTION = "A lightweight webbrowser for the GPE platform"
diff --git a/packages/gpe-today/gpe-today_cvs.bb b/packages/gpe-today/gpe-today_cvs.bb
index 1ce5babfbb..33af763f07 100644
--- a/packages/gpe-today/gpe-today_cvs.bb
+++ b/packages/gpe-today/gpe-today_cvs.bb
@@ -7,7 +7,8 @@ PRIORITY = "optional"
S = "${WORKDIR}/${PN}"
-PV = "0.10+cvs${SRCDATE}"
+#Remove the dash below when 0.10 changes in PV
+PV = "0.10+cvs-${SRCDATE}"
PR = "r0"
inherit gpe
diff --git a/packages/gpesyncd/gpesyncd_cvs.bb b/packages/gpesyncd/gpesyncd_cvs.bb
index 457b75c343..94ce44f30e 100644
--- a/packages/gpesyncd/gpesyncd_cvs.bb
+++ b/packages/gpesyncd/gpesyncd_cvs.bb
@@ -8,7 +8,8 @@ SRC_URI = "${HANDHELDS_CVS};module=gpe/base/gpesyncd"
DEPENDS = "libgpevtype sqlite libmimedir glib-2.0"
S = "${WORKDIR}/${PN}"
-PV = "0.0+cvs${SRCDATE}"
+#Remove the dash below when 0.0 changes in PV
+PV = "0.0+cvs-${SRCDATE}"
PR = "r0"
inherit autotools
diff --git a/packages/gpsdrive/gpsdrive_cvs.bb b/packages/gpsdrive/gpsdrive_cvs.bb
index c4bc1382c8..a01f12d094 100644
--- a/packages/gpsdrive/gpsdrive_cvs.bb
+++ b/packages/gpsdrive/gpsdrive_cvs.bb
@@ -1,7 +1,8 @@
inherit autotools pkgconfig
PR = "r1"
-PV = "2.10pre3+cvs${SRCDATE}"
+#Remove the dash below when 2.10pre3 changes in PV
+PV = "2.10pre3+cvs-${SRCDATE}"
DEFAULT_PREFERENCE="-1"
PACKAGES += "gpsdrive-add"
diff --git a/packages/inputpipe/inputpipe_svn.bb b/packages/inputpipe/inputpipe_svn.bb
index 87ececd731..ffa59a762a 100644
--- a/packages/inputpipe/inputpipe_svn.bb
+++ b/packages/inputpipe/inputpipe_svn.bb
@@ -3,7 +3,8 @@ PRIORITY = "optional"
DESCRIPTION = "Inputpipe is a network transparency layer for linux input devices"
MAINTAINER = "Micah Dowty <micah@navi.cx>"
LICENSE = "GPL"
-PV = "0.5+svn${SRCDATE}"
+#Remove the dash below when 0.5 changes in PV
+PV = "0.5+svn-${SRCDATE}"
SRC_URI = "svn://svn.navi.cx/misc/trunk;module=inputpipe;proto=http"
S = "${WORKDIR}/inputpipe"
diff --git a/packages/kbdd/kbdd_cvs.bb b/packages/kbdd/kbdd_cvs.bb
index a4ecc512a3..12516114f6 100644
--- a/packages/kbdd/kbdd_cvs.bb
+++ b/packages/kbdd/kbdd_cvs.bb
@@ -10,7 +10,8 @@ SRC_URI = "${HANDHELDS_CVS};module=apps/kbdd;date=${SRCDATE} \
file://kbdd.conf \
file://kbdd-modules"
-PV="0.8+cvs${SRCDATE}"
+#Remove the dash below when 0.8 changes in PV
+PV="0.8+cvs-${SRCDATE}"
PR="r5"
inherit update-rc.d linux_modules
diff --git a/packages/libgpevtype/libgpevtype_cvs.bb b/packages/libgpevtype/libgpevtype_cvs.bb
index aaaec8cb77..7ba1398329 100644
--- a/packages/libgpevtype/libgpevtype_cvs.bb
+++ b/packages/libgpevtype/libgpevtype_cvs.bb
@@ -8,7 +8,7 @@ DEPENDS = "libmimedir"
DEFAULT_PREFERENCE = "-1"
S = "${WORKDIR}/${PN}"
-PV = "0.12+cvs${SRCDATE}"
+PV = "0.14+cvs${SRCDATE}"
PR = "r0"
inherit pkgconfig gpe autotools
diff --git a/packages/libgpewidget/libgpewidget_cvs.bb b/packages/libgpewidget/libgpewidget_cvs.bb
index b5b9a9b6aa..6e60b95133 100644
--- a/packages/libgpewidget/libgpewidget_cvs.bb
+++ b/packages/libgpewidget/libgpewidget_cvs.bb
@@ -9,7 +9,7 @@ LICENSE = "LGPL"
DEFAULT_PREFERENCE = "-1"
S = "${WORKDIR}/${PN}"
-PV = "0.105+cvs${SRCDATE}"
+PV = "0.107+cvs${SRCDATE}"
PR = "r0"
inherit autotools pkgconfig
diff --git a/packages/libmailwrapper/libmailwrapper_cvs.bb b/packages/libmailwrapper/libmailwrapper_cvs.bb
index 408193f776..8a5722ee18 100644
--- a/packages/libmailwrapper/libmailwrapper_cvs.bb
+++ b/packages/libmailwrapper/libmailwrapper_cvs.bb
@@ -1,5 +1,5 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/mail/libmailwrapper "
diff --git a/packages/libmatchbox/libmatchbox_svn.bb b/packages/libmatchbox/libmatchbox_svn.bb
index 370bed7f51..9a49853fe1 100644
--- a/packages/libmatchbox/libmatchbox_svn.bb
+++ b/packages/libmatchbox/libmatchbox_svn.bb
@@ -1,6 +1,7 @@
include libmatchbox.inc
-PV = "1.7+cvs${SRCDATE}"
+#Remove the dash below when 1.7 changes in PV
+PV = "1.7+cvs-${SRCDATE}"
DEFAULT_PREFERENCE = "-1"
SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http\
diff --git a/packages/libmimedir/libmimedir_cvs.bb b/packages/libmimedir/libmimedir_cvs.bb
index 9e8d904ba7..33e918b278 100644
--- a/packages/libmimedir/libmimedir_cvs.bb
+++ b/packages/libmimedir/libmimedir_cvs.bb
@@ -4,7 +4,8 @@ PRIORITY = "optional"
LICENSE = "LGPL"
DEPENDS = "intltool-native"
PR = "r1"
-PV = "0.3.1+cvs${SRCDATE}"
+#Remove the dash below when 0.3.1 changes in PV
+PV = "0.3.1+cvs-${SRCDATE}"
DEFAULT_PREFERENCE = -1
diff --git a/packages/libqtaux/libqtaux2_cvs.bb b/packages/libqtaux/libqtaux2_cvs.bb
index db821756b9..85cd5bdbb3 100644
--- a/packages/libqtaux/libqtaux2_cvs.bb
+++ b/packages/libqtaux/libqtaux2_cvs.bb
@@ -1,5 +1,5 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/libqtaux"
diff --git a/packages/libsm/libsm_cvs.bb b/packages/libsm/libsm_cvs.bb
index 6c64da33d4..c94637c344 100644
--- a/packages/libsm/libsm_cvs.bb
+++ b/packages/libsm/libsm_cvs.bb
@@ -1,4 +1,4 @@
-PV = "0.0+cvs${SRCDATE}"
+PV = "6.0.3+cvs${SRCDATE}"
LICENSE = "MIT-X"
SECTION = "libs"
PRIORITY = "optional"
diff --git a/packages/madwifi/madwifi-modules_cvs-bsd.bb b/packages/madwifi/madwifi-modules_cvs-bsd.bb
index 1092180037..6da2c34baf 100644
--- a/packages/madwifi/madwifi-modules_cvs-bsd.bb
+++ b/packages/madwifi/madwifi-modules_cvs-bsd.bb
@@ -5,7 +5,7 @@ MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
LICENSE = "GPL"
RDEPENDS = "kernel (${KERNEL_VERSION})"
DEPENDS = "virtual/kernel"
-PV = "cvs-bsd+${SRCDATE}"
+PV = "1:0.0+cvs${SRCDATE}-bsd"
SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/madwifi;module=madwifi;tag=BSD;date=${SRCDATE}"
diff --git a/packages/madwifi/madwifi-modules_cvs.bb b/packages/madwifi/madwifi-modules_cvs.bb
index 4e00bf609c..0bef3d506e 100644
--- a/packages/madwifi/madwifi-modules_cvs.bb
+++ b/packages/madwifi/madwifi-modules_cvs.bb
@@ -5,7 +5,7 @@ MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
LICENSE = "GPL"
RDEPENDS = "kernel (${KERNEL_VERSION})"
DEPENDS = "virtual/kernel"
-PV = "0.0+cvs${SRCDATE}"
+PV = "1:0.0+cvs${SRCDATE}"
SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/madwifi;module=madwifi"
diff --git a/packages/mileage/mileage_cvs.bb b/packages/mileage/mileage_cvs.bb
index 88658eb0d1..355db4d3ea 100644
--- a/packages/mileage/mileage_cvs.bb
+++ b/packages/mileage/mileage_cvs.bb
@@ -3,7 +3,8 @@ HOMEPAGE = "http://mileage.sourceforge.net"
SECTION = "opie/applications"
PRIORITY = "optional"
LICENSE = "GPL"
-PV = "4.2.0+cvs${SRCDATE}"
+#Change to form x.y.z+cvs${SRCDATE} when 4.2.0 changes in PV
+PV = "4.2.0-cvs-${SRCDATE}"
PR = "r1"
SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/mileage;module=mileage"
diff --git a/packages/mystun-server/mystun-server_cvs.bb b/packages/mystun-server/mystun-server_cvs.bb
index 7a4d8b015a..cfdf72f475 100644
--- a/packages/mystun-server/mystun-server_cvs.bb
+++ b/packages/mystun-server/mystun-server_cvs.bb
@@ -4,7 +4,7 @@ MAINTAINER = "Sven-Ola Tuecke <sven-ola@gmx.de>"
SECTION = "console/telephony"
PRIORITY = "optional"
LICENSE = "GPL"
-PV = "0.0+cvs${SRCDATE}"
+PV = "1:0.0+cvs${SRCDATE}"
SRC_URI="cvs://anonymous@cvs.mystun.berlios.de/cvsroot/mystun;module=mystun \
file://init \
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 7290f4d56c..95a41a5317 100644
--- a/packages/nonworking/opie-mediaplayer1-libmpeg3plugin/opie-mediaplayer1-libmpeg3plugin_cvs.bb
+++ b/packages/nonworking/opie-mediaplayer1-libmpeg3plugin/opie-mediaplayer1-libmpeg3plugin_cvs.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
LICENSE = "GPL"
DEPENDS = "opie-mediaplayer1"
RDEPENDS = "opie-mediaplayer1"
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
APPNAME = "mpeg3plugin"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/multimedia/opieplayer"
diff --git a/packages/nylon/nylon-scripts_cvs.bb b/packages/nylon/nylon-scripts_cvs.bb
index 4098f17d2e..0f98108623 100644
--- a/packages/nylon/nylon-scripts_cvs.bb
+++ b/packages/nylon/nylon-scripts_cvs.bb
@@ -5,7 +5,7 @@ SECTION = "base"
PRIORITY = "optional"
MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
LICENSE = "GPLv2"
-PV = "0.0+cvs${SRCDATE}"
+PV = "1:0.0+cvs${SRCDATE}"
PR = "r2"
SRC_URI = "http://meshcube.org/download/${PN}_${SRCDATE}.tgz"
diff --git a/packages/nylon/nylon-statistics.bb b/packages/nylon/nylon-statistics.bb
index 0212df309d..9216568b0d 100644
--- a/packages/nylon/nylon-statistics.bb
+++ b/packages/nylon/nylon-statistics.bb
@@ -4,7 +4,7 @@ SECTION = "base"
PRIORITY = "optional"
MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
LICENSE = "GPLv2"
-PV = "0.0+cvs${SRCDATE}"
+PV = "1:0.0+cvs${SRCDATE}"
PR = "r1"
SRC_URI = "http://meshcube.org/download/${PN}_${SRCDATE}.tgz"
diff --git a/packages/nylon/yamonenv.bb b/packages/nylon/yamonenv.bb
index a11b1cd65e..bf4c94200e 100644
--- a/packages/nylon/yamonenv.bb
+++ b/packages/nylon/yamonenv.bb
@@ -3,7 +3,7 @@ SECTION = "base"
PRIORITY = "optional"
MAINTAINER = "Michael Stickel <michael.stickel@4g-systems.biz>"
LICENSE = "GPL"
-PV = "0.0+cvs${SRCDATE}"
+PV = "1:0.0+cvs${SRCDATE}"
SRC_URI = "http://meshcube.org/download/${PN}_${SRCDATE}.tgz"
S = "${WORKDIR}/${PN}"
diff --git a/packages/olsrd/olsrd_cvs.bb b/packages/olsrd/olsrd_cvs.bb
index 27c433d4e9..6aca392434 100644
--- a/packages/olsrd/olsrd_cvs.bb
+++ b/packages/olsrd/olsrd_cvs.bb
@@ -5,7 +5,7 @@ MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
SECTION = "console/network"
PRIORITY = "optional"
LICENSE = "BSD"
-PV = "0.0+cvs${SRCDATE}"
+PV = "1:0.0+cvs${SRCDATE}"
SRC_URI="cvs://anonymous@cvs.sourceforge.net/cvsroot/olsrd;module=olsrd-current \
file://init \
diff --git a/packages/opie-i18n/opie-i18n_cvs.bb b/packages/opie-i18n/opie-i18n_cvs.bb
index 15bddc3651..1a1ef7c35b 100644
--- a/packages/opie-i18n/opie-i18n_cvs.bb
+++ b/packages/opie-i18n/opie-i18n_cvs.bb
@@ -1,6 +1,7 @@
include ${PN}.inc
-PV = "${OPIE_CVS_PV}"
+# Remove the dash below when 1.2.1 changes in PV
+PV = "1.2.1+cvs-${SRCDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/i18n \
${HANDHELDS_CVS};module=opie/etc/dict"
diff --git a/packages/opie-i18n/opie-lrelease-native_cvs.bb b/packages/opie-i18n/opie-lrelease-native_cvs.bb
index 03a08cd570..6f52c45d74 100644
--- a/packages/opie-i18n/opie-lrelease-native_cvs.bb
+++ b/packages/opie-i18n/opie-lrelease-native_cvs.bb
@@ -1,5 +1,6 @@
include ${PN}.inc
-PV = "${OPIE_CVS_PV}"
+# Remove the dash below when 1.2.1 changes in PV
+PV = "1.2.1+cvs-${SRCDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/development/translation/opie-lrelease \
${HANDHELDS_CVS};module=opie/development/translation/shared"
diff --git a/packages/opie-i18n/opie-lupdate-native_cvs.bb b/packages/opie-i18n/opie-lupdate-native_cvs.bb
index 46b3ceb5e4..f7f9a79c25 100644
--- a/packages/opie-i18n/opie-lupdate-native_cvs.bb
+++ b/packages/opie-i18n/opie-lupdate-native_cvs.bb
@@ -1,5 +1,6 @@
include ${PN}.inc
-PV = "${OPIE_CVS_PV}"
+# Remove the dash below when 1.2.1 changes in PV
+PV = "1.2.1+cvs-${SRCDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/development/translation/opie-lupdate \
${HANDHELDS_CVS};module=opie/development/translation/shared"
diff --git a/packages/portaudio/portaudio_0.0.19.bb b/packages/portaudio/portaudio_0.0.19.bb
index 68809e7c41..efb3cc31db 100644
--- a/packages/portaudio/portaudio_0.0.19.bb
+++ b/packages/portaudio/portaudio_0.0.19.bb
@@ -3,7 +3,7 @@ SECTION = "libs"
PRIORITY = "optional"
MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
LICENSE = "GPL"
-PV = "0.0.19+cvs${SRCDATE}"
+PV = "1:0.0.19+cvs${SRCDATE}"
PR = "r1"
SRC_URI = "http://www.portaudio.com/archives/pa_snapshot_v19.tar.gz"
diff --git a/packages/prism54/prism54-module_cvs.bb b/packages/prism54/prism54-module_cvs.bb
index e0d5b76a8b..7953eb46b3 100644
--- a/packages/prism54/prism54-module_cvs.bb
+++ b/packages/prism54/prism54-module_cvs.bb
@@ -1,5 +1,5 @@
SECTION = "base"
-PV = "0.0+cvs${SRCDATE}"
+PV = "1.2+cvs${SRCDATE}"
include prism54-module_1.2.bb
diff --git a/packages/putty/putty_svn.bb b/packages/putty/putty_svn.bb
index b14d957a4d..55f827b467 100644
--- a/packages/putty/putty_svn.bb
+++ b/packages/putty/putty_svn.bb
@@ -1,7 +1,8 @@
DESCRIPTION = "PuTTY is a free implementation of Telnet and SSH for Win32 and Unix platforms"
SECTION = "console/network"
LICENSE = "MIT"
-PV = "0.58+cvs${SRCDATE}"
+#Remove the dash below when 0.58 changes in PV
+PV = "0.58+cvs-${SRCDATE}"
SRC_URI = "svn://ixion.tartarus.org/main;module=putty \
file://lib.pro \
diff --git a/packages/qplot/qplot_2.0.1+cvs20020420.bb b/packages/qplot/qplot_2.0.1+cvs20020420.bb
index af257baa79..b78afd9a76 100644
--- a/packages/qplot/qplot_2.0.1+cvs20020420.bb
+++ b/packages/qplot/qplot_2.0.1+cvs20020420.bb
@@ -5,7 +5,8 @@ MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
LICENSE = "GPL"
HOMEPAGE = "http://qplot.sourceforge.net/"
SRCDATE = 20020420
-PV = "2.0.1+cvs${SRCDATE}"
+#Change to form x.y.z+cvs${SRCDATE} when 2.0.1 changes in PV
+PV = "2.0.1-cvs-${SRCDATE}"
PR = "r1"
SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/qplot;module=qplot \
diff --git a/packages/tremor/tremor_svn.bb b/packages/tremor/tremor_svn.bb
index 8b9d538f92..fd3dead30a 100644
--- a/packages/tremor/tremor_svn.bb
+++ b/packages/tremor/tremor_svn.bb
@@ -3,7 +3,7 @@ PRIORITY = "optional"
MAINTAINER = "Greg Gilbert <greg@treke.net>"
DEPENDS = "libogg"
DESCRIPTION = "tremor is a fixed point implementation of the vorbis codec."
-PV = "0.0+svn${SRCDATE}"
+PV = "1:0.0+svn${SRCDATE}"
LICENSE = "BSD"
DEFAULT_PREFERENCE = "-1"
diff --git a/packages/usbutils/usbutils_cvs.bb b/packages/usbutils/usbutils_cvs.bb
index 0c9d303256..85c4b51b21 100644
--- a/packages/usbutils/usbutils_cvs.bb
+++ b/packages/usbutils/usbutils_cvs.bb
@@ -3,7 +3,7 @@ SECTION = "base"
DEPENDS += "libusb"
LICENSE = "GPL"
PRIORITY = "optional"
-PV = "0.70+cvs${SRCDATE}"
+PV = "0.71+cvs${SRCDATE}"
PR = "r3"
SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/linux-usb;module=usbutils"