merge of 'e6967a90020b84553487e008644039b8e0fad143'

     and 'f98e1fc33b6d30e6e946f29f43f26ffaa1b5fcad'

24 files changed, 51 insertions, 148 deletions

diff --git a/packages/e17/entice_20060128.bb b/packages/e17/entice_20060128.bb
index 776f652b96..5b433de015 100644
--- a/packages/e17/entice_20060128.bb
+++ b/packages/e17/entice_20060128.bb
@@ -1,8 +1,8 @@
 DESCRIPTION = "Entice is the E17 picture viewer"
 # can also depend on GIMP for editing
-DEPENDS = "edb evas-x11 ecore-x11 edje epsilon esmart-x11"
 LICENSE = "MIT"
-PR = "r3"
+DEPENDS = "edb evas-x11 ecore-x11 edje epsilon esmart-x11"
+PR = "r4"
 
 inherit e
 
diff --git a/packages/e17/entice_20060416.bb b/packages/e17/entice_20060416.bb
index 87434e3d3b..663ee97cd8 100644
--- a/packages/e17/entice_20060416.bb
+++ b/packages/e17/entice_20060416.bb
@@ -1,8 +1,8 @@
 DESCRIPTION = "Entice is the E17 picture viewer"
 # can also depend on GIMP for editing
-DEPENDS = "edb evas-x11 ecore-x11 edje epsilon esmart-x11"
 LICENSE = "MIT"
-PR = "r0"
+DEPENDS = "edb evas-x11 ecore-x11 edje epsilon esmart-x11"
+PR = "r1"
 
 inherit e
 
diff --git a/packages/fltk/fltk_1.1.4.bb b/packages/fltk/fltk_1.1.4.bb
index 39e3279a4f..66c4b214ec 100644
--- a/packages/fltk/fltk_1.1.4.bb
+++ b/packages/fltk/fltk_1.1.4.bb
@@ -4,8 +4,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "LGPL"
 DEPENDS = "jpeg libpng mesa zlib"
-
-PR = "FLDevice-r0"
+PR = "r1"
 
 SRC_URI = "ftp://ftp-fourier.ujf-grenoble.fr/xcas/devel/sources/fltk-${PV}-device.tar.gz"
 
diff --git a/packages/fltk/fltk_1.1.7.bb b/packages/fltk/fltk_1.1.7.bb
index dca48837a8..3e095b45a3 100644
--- a/packages/fltk/fltk_1.1.7.bb
+++ b/packages/fltk/fltk_1.1.7.bb
@@ -3,9 +3,8 @@ HOMEPAGE = "http://www.fltk.org"
 SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "LGPL"
-PR= "r1"
-
 DEPENDS = "zlib jpeg libpng libxext libxft"
+PR = "r2"
 
 SRC_URI = "ftp://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/fltk/${PV}/fltk-${PV}-source.tar.bz2"
 
diff --git a/packages/gpe-ownerinfo/gpe-ownerinfo.inc b/packages/gpe-ownerinfo/gpe-ownerinfo.inc
new file mode 100644
index 0000000000..704044f09b
--- /dev/null
+++ b/packages/gpe-ownerinfo/gpe-ownerinfo.inc
@@ -0,0 +1,13 @@
+inherit gpe
+
+DESCRIPTION = "GPE owner information dialog"
+SECTION = "gpe"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "gtk+ libgpewidget"
+
+do_stage () {
+	oe_libinstall -a libgpe-ownerinfo ${STAGING_LIBDIR}
+	install -m 0644 gpe-ownerinfo.h ${STAGING_INCDIR}/
+}
+
diff --git a/packages/gpe-ownerinfo/gpe-ownerinfo_0.23.bb b/packages/gpe-ownerinfo/gpe-ownerinfo_0.23.bb
index 2eb1b947a8..c5d8184cbf 100644
--- a/packages/gpe-ownerinfo/gpe-ownerinfo_0.23.bb
+++ b/packages/gpe-ownerinfo/gpe-ownerinfo_0.23.bb
@@ -1,13 +1,3 @@
-inherit gpe
+require gpe-ownerinfo.inc
 
-DESCRIPTION = "GPE owner information dialog"
-SECTION = "gpe"
-PRIORITY = "optional"
-DEPENDS = "gtk+ libgpewidget"
-LICENSE = "GPL"
 PR = "r1"
-
-do_stage () {
-	oe_libinstall -a libgpe-ownerinfo ${STAGING_LIBDIR}
-	install -m 0644 gpe-ownerinfo.h ${STAGING_INCDIR}/
-}
diff --git a/packages/gpe-ownerinfo/gpe-ownerinfo_0.24.bb b/packages/gpe-ownerinfo/gpe-ownerinfo_0.24.bb
index e0709fe1ed..e63a6172a2 100644
--- a/packages/gpe-ownerinfo/gpe-ownerinfo_0.24.bb
+++ b/packages/gpe-ownerinfo/gpe-ownerinfo_0.24.bb
@@ -1,15 +1,5 @@
-inherit gpe
+require gpe-ownerinfo.inc
 
-DESCRIPTION = "GPE owner information dialog"
-SECTION = "gpe"
-PRIORITY = "optional"
-DEPENDS = "gtk+ libgpewidget"
 PR = "r2"
-LICENSE = "GPL"
 
 SRC_URI += "file://fixloop.patch;patch=1;pnum=0"
-
-do_stage () {
-	oe_libinstall -a libgpe-ownerinfo ${STAGING_LIBDIR}
-	install -m 0644 gpe-ownerinfo.h ${STAGING_INCDIR}/
-}
diff --git a/packages/gpe-ownerinfo/gpe-ownerinfo_0.25.bb b/packages/gpe-ownerinfo/gpe-ownerinfo_0.25.bb
index f04b9c19be..e7ef651bc4 100644
--- a/packages/gpe-ownerinfo/gpe-ownerinfo_0.25.bb
+++ b/packages/gpe-ownerinfo/gpe-ownerinfo_0.25.bb
@@ -1,13 +1,3 @@
-inherit gpe
+require gpe-ownerinfo.inc
 
-DESCRIPTION = "GPE owner information dialog"
-SECTION = "gpe"
-PRIORITY = "optional"
-DEPENDS = "gtk+ libgpewidget"
-LICENSE = "GPL"
 PR = "r0"
-
-do_stage () {
-	oe_libinstall -a libgpe-ownerinfo ${STAGING_LIBDIR}
-	install -m 0644 gpe-ownerinfo.h ${STAGING_INCDIR}/
-}
diff --git a/packages/gpe-ownerinfo/gpe-ownerinfo_0.26.bb b/packages/gpe-ownerinfo/gpe-ownerinfo_0.26.bb
index f04b9c19be..e7ef651bc4 100644
--- a/packages/gpe-ownerinfo/gpe-ownerinfo_0.26.bb
+++ b/packages/gpe-ownerinfo/gpe-ownerinfo_0.26.bb
@@ -1,13 +1,3 @@
-inherit gpe
+require gpe-ownerinfo.inc
 
-DESCRIPTION = "GPE owner information dialog"
-SECTION = "gpe"
-PRIORITY = "optional"
-DEPENDS = "gtk+ libgpewidget"
-LICENSE = "GPL"
 PR = "r0"
-
-do_stage () {
-	oe_libinstall -a libgpe-ownerinfo ${STAGING_LIBDIR}
-	install -m 0644 gpe-ownerinfo.h ${STAGING_INCDIR}/
-}
diff --git a/packages/gpe-ownerinfo/gpe-ownerinfo_0.27.bb b/packages/gpe-ownerinfo/gpe-ownerinfo_0.27.bb
index f04b9c19be..e7ef651bc4 100644
--- a/packages/gpe-ownerinfo/gpe-ownerinfo_0.27.bb
+++ b/packages/gpe-ownerinfo/gpe-ownerinfo_0.27.bb
@@ -1,13 +1,3 @@
-inherit gpe
+require gpe-ownerinfo.inc
 
-DESCRIPTION = "GPE owner information dialog"
-SECTION = "gpe"
-PRIORITY = "optional"
-DEPENDS = "gtk+ libgpewidget"
-LICENSE = "GPL"
 PR = "r0"
-
-do_stage () {
-	oe_libinstall -a libgpe-ownerinfo ${STAGING_LIBDIR}
-	install -m 0644 gpe-ownerinfo.h ${STAGING_INCDIR}/
-}
diff --git a/packages/gpe-ownerinfo/gpe-ownerinfo_0.28.bb b/packages/gpe-ownerinfo/gpe-ownerinfo_0.28.bb
index e17c6a6798..b00cc7cc66 100644
--- a/packages/gpe-ownerinfo/gpe-ownerinfo_0.28.bb
+++ b/packages/gpe-ownerinfo/gpe-ownerinfo_0.28.bb
@@ -1,15 +1,5 @@
-inherit gpe
+require gpe-ownerinfo.inc
 
-DESCRIPTION = "GPE owner information dialog"
-SECTION = "gpe"
-PRIORITY = "optional"
-DEPENDS = "gtk+ libgpewidget"
-LICENSE = "GPL"
 PR = "r1"
 
 SRC_URI += "file://compile.patch;patch=1"
-
-do_stage () {
-	oe_libinstall -a libgpe-ownerinfo ${STAGING_LIBDIR}
-	install -m 0644 gpe-ownerinfo.h ${STAGING_INCDIR}/
-}
diff --git a/packages/gpe-ownerinfo/gpe-ownerinfo_svn.bb b/packages/gpe-ownerinfo/gpe-ownerinfo_svn.bb
index 90fb6faf14..036f70eaf1 100644
--- a/packages/gpe-ownerinfo/gpe-ownerinfo_svn.bb
+++ b/packages/gpe-ownerinfo/gpe-ownerinfo_svn.bb
@@ -1,8 +1,5 @@
-DESCRIPTION = "GPE owner information dialog"
-SECTION = "gpe"
-PRIORITY = "optional"
-LICENSE = "GPL"
-DEPENDS = "gtk+ libgpewidget"
+require gpe-ownerinfo.inc
+
 PR = "r1"
 PV = "0.28+svn-${SRCDATE}"
 
@@ -12,8 +9,3 @@ SRC_URI += "${GPE_SVN} \
 	    file://svn-build.patch;patch=1" 
 
 S = "${WORKDIR}/${PN}"
-
-do_stage () {
-        oe_libinstall -a libgpe-ownerinfo ${STAGING_LIBDIR}
-        install -m 0644 gpe-ownerinfo.h ${STAGING_INCDIR}/
-}
diff --git a/packages/gpe-timesheet/gpe-timesheet_0.18.bb b/packages/gpe-timesheet/gpe-timesheet_0.18.bb
deleted file mode 100644
index 0cd8b539f0..0000000000
--- a/packages/gpe-timesheet/gpe-timesheet_0.18.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-LICENSE = "GPL"
-inherit gpe
-
-DESCRIPTION = "GPE time tracker"
-DEPENDS = "libgpewidget gtk+ sqlite"
-SECTION = "gpe"
-RDEPENDS = "gpe-icons"
-
-SRC_URI = "${GPE_MIRROR}/gpe-timesheet-${PV}.tar.gz"
diff --git a/packages/gpe-timesheet/gpe-timesheet_0.19.bb b/packages/gpe-timesheet/gpe-timesheet_0.19.bb
deleted file mode 100644
index 0cd8b539f0..0000000000
--- a/packages/gpe-timesheet/gpe-timesheet_0.19.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-LICENSE = "GPL"
-inherit gpe
-
-DESCRIPTION = "GPE time tracker"
-DEPENDS = "libgpewidget gtk+ sqlite"
-SECTION = "gpe"
-RDEPENDS = "gpe-icons"
-
-SRC_URI = "${GPE_MIRROR}/gpe-timesheet-${PV}.tar.gz"
diff --git a/packages/gpe-timesheet/gpe-timesheet_0.20.bb b/packages/gpe-timesheet/gpe-timesheet_0.20.bb
deleted file mode 100644
index 0cd8b539f0..0000000000
--- a/packages/gpe-timesheet/gpe-timesheet_0.20.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-LICENSE = "GPL"
-inherit gpe
-
-DESCRIPTION = "GPE time tracker"
-DEPENDS = "libgpewidget gtk+ sqlite"
-SECTION = "gpe"
-RDEPENDS = "gpe-icons"
-
-SRC_URI = "${GPE_MIRROR}/gpe-timesheet-${PV}.tar.gz"
diff --git a/packages/gpe-timesheet/gpe-timesheet_0.21.bb b/packages/gpe-timesheet/gpe-timesheet_0.21.bb
deleted file mode 100644
index 0cd8b539f0..0000000000
--- a/packages/gpe-timesheet/gpe-timesheet_0.21.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-LICENSE = "GPL"
-inherit gpe
-
-DESCRIPTION = "GPE time tracker"
-DEPENDS = "libgpewidget gtk+ sqlite"
-SECTION = "gpe"
-RDEPENDS = "gpe-icons"
-
-SRC_URI = "${GPE_MIRROR}/gpe-timesheet-${PV}.tar.gz"
diff --git a/packages/gphoto2/gphoto2_2.1.4.bb b/packages/gphoto2/gphoto2_2.1.4.bb
index 5ebed8f8bf..80d0ee0f27 100644
--- a/packages/gphoto2/gphoto2_2.1.4.bb
+++ b/packages/gphoto2/gphoto2_2.1.4.bb
@@ -1,7 +1,8 @@
-LICENSE = "GPL"
+DESCRIPTION = "gphoto2 is a command-line utility to fetch pictures from digital cameras"
 SECTION = "console/utils"
+LICENSE = "GPL"
 DEPENDS = "libgphoto2 popt"
-DESCRIPTION = "gphoto2 is a command-line utility to fetch pictures from digital cameras"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/gphoto2-${PV}.tar.bz2"
 
diff --git a/packages/gphoto2/gphoto2_2.1.5.bb b/packages/gphoto2/gphoto2_2.1.5.bb
index dc49ce74b0..0913b9743c 100644
--- a/packages/gphoto2/gphoto2_2.1.5.bb
+++ b/packages/gphoto2/gphoto2_2.1.5.bb
@@ -1,7 +1,8 @@
-LICENSE = "GPL"
+DESCRIPTION = "gphoto2 is a command-line utility to fetch pictures from digital cameras"
 SECTION = "console/utils"
+LICENSE = "GPL"
 DEPENDS = "libgphoto2 popt"
-DESCRIPTION = "gphoto2 is a command-line utility to fetch pictures from digital cameras"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/gphoto2-${PV}.tar.gz"
 
diff --git a/packages/gphoto2/gphoto2_2.1.6.bb b/packages/gphoto2/gphoto2_2.1.6.bb
index ff6531a572..63dad91f14 100644
--- a/packages/gphoto2/gphoto2_2.1.6.bb
+++ b/packages/gphoto2/gphoto2_2.1.6.bb
@@ -1,8 +1,8 @@
-LICENSE = "GPL"
+DESCRIPTION = "gphoto2 is a command-line utility to fetch pictures from digital cameras"
 SECTION = "console/utils"
+LICENSE = "GPL"
 DEPENDS = "libgphoto2 popt"
-DESCRIPTION = "gphoto2 is a command-line utility to fetch pictures from digital cameras"
-PR="r1"
+PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/gphoto2-${PV}.tar.gz"
 
diff --git a/packages/links/links-x11_2.0+2.1pre26.bb b/packages/links/links-x11_2.0+2.1pre26.bb
index c026ca7e02..9ee70d9ad4 100644
--- a/packages/links/links-x11_2.0+2.1pre26.bb
+++ b/packages/links/links-x11_2.0+2.1pre26.bb
@@ -2,7 +2,8 @@ require links.inc
 
 DEPENDS += "virtual/libx11"
 RCONFLICTS = "links"
-PR = "r0"
+PR = "r1"
+
 SRC_URI += " file://links2.desktop \
              http://www.xora.org.uk/oe/links2.png"
 
diff --git a/packages/links/links_2.0+2.1pre26.bb b/packages/links/links_2.0+2.1pre26.bb
index 6fcf8cef84..c46a64f380 100644
--- a/packages/links/links_2.0+2.1pre26.bb
+++ b/packages/links/links_2.0+2.1pre26.bb
@@ -1,8 +1,8 @@
 require links.inc
 
 DEPENDS += "gpm"
-RCONFLICTS="links-x11"
-PR = "r0"
+RCONFLICTS = "links-x11"
+PR = "r1"
 
 EXTRA_OECONF = "--enable-javascript --with-libfl --enable-graphics \
 	        --with-ssl=${STAGING_LIBDIR}/.. --with-libjpeg \
diff --git a/packages/mb-desktop-xine/mb-desktop-xine_0.4.bb b/packages/mb-desktop-xine/mb-desktop-xine_0.4.bb
index 885177de01..e7a933ee0c 100644
--- a/packages/mb-desktop-xine/mb-desktop-xine_0.4.bb
+++ b/packages/mb-desktop-xine/mb-desktop-xine_0.4.bb
@@ -1,8 +1,6 @@
 DESCRIPTION = "foo"
-LICENSE = "GPL"
 HOMEPAGE = "http://projects.o-hand.com/matchbox/"
-
-SRC_URI="http://projects.o-hand.com/matchbox/sources/mb-desktop-xine/0.4/mb-desktop-xine-${PV}.tar.bz2"
+LICENSE = "GPL"
 DEPENDS = "matchbox-desktop libxine-x11"
 RDEPENDS = "libxine-plugin-vo-out-xshm \
             libxine-plugin-vo-out-none \
@@ -27,10 +25,11 @@ RDEPENDS = "libxine-plugin-vo-out-xshm \
             libxine-plugin-dmx-avi \
 	    libxine-plugin-ao-out-oss \
 	    matchbox-desktop	"
+PR = "r1"
 
+SRC_URI="http://projects.o-hand.com/matchbox/sources/mb-desktop-xine/0.4/mb-desktop-xine-${PV}.tar.bz2"
 
 FILES_${PN} += " /usr/share/themes/mbmediabox/matchbox/ \
 		/usr/share/matchbox/desktop/modules/*.so"
 
-
 inherit autotools pkgconfig
diff --git a/packages/netpbm/netpbm_10.28.bb b/packages/netpbm/netpbm_10.28.bb
index dde0d17d57..cfe2a5cc88 100644
--- a/packages/netpbm/netpbm_10.28.bb
+++ b/packages/netpbm/netpbm_10.28.bb
@@ -1,14 +1,14 @@
-# bitbake configuration file for NetPBM, a command line image (sampled
-# data) processing package derived from PBMPlus
-#
-# For documentation see: http://netpbm.sourceforge.net/doc/
+DESCRIPTION = "Netpbm is a toolkit for manipulation of graphic images, including\
+conversion of images between a variety of different formats.  There\
+are over 220 separate tools in the package including converters for\
+about 100 graphics formats."
+HOMEPAGE = "http://netpbm.sourceforge.net"
+SECTION = "console/utils"
 LICENSE = "GPL MIT Artistic"
 # NOTE: individual command line utilities are covered by different
 # licenses.  The compiled and linked command line utilties are
 # subject to the licenses of the libraries they use too - including
 # libpng libz, IJG, and libtiff licenses
-
-SECTION = "console/utils"
 DEPENDS = "jpeg zlib libpng tiff install-native flex-native"
 RDEPENDS = "perl\
 	perl-module-cwd\
@@ -25,12 +25,7 @@ RDEPENDS = "perl\
 RDEPENDS += "perl-module-exporter-heavy"
 RDEPENDS += "perl-module-file-spec-unix"
 
-HOMEPAGE = "http://netpbm.sourceforge.net"
-DESCRIPTION = "Netpbm is a toolkit for manipulation of graphic images, including\
-conversion of images between a variety of different formats.  There\
-are over 220 separate tools in the package including converters for\
-about 100 graphics formats."
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/netpbm/netpbm-${PV}.tgz \
 	   file://ppmtojpeg.patch;patch=42 \
diff --git a/packages/povray/povray_3.6.1.bb b/packages/povray/povray_3.6.1.bb
index e1c60570be..107c86cfb8 100644
--- a/packages/povray/povray_3.6.1.bb
+++ b/packages/povray/povray_3.6.1.bb
@@ -3,11 +3,10 @@ HOMEPAGE = "http://www.povray.org"
 SECTION = "console/graphics"
 #Make this a weak assigment to allow branding of the povray binary
 LICENSE = "povray"
-
 DEPENDS = "virtual/libx11 zlib jpeg libpng tiff"
 RDEPENDS = ""
 
-PR = "r1"
+PR = "r2"
 
 #We apply a patch that subverts the checks for jpeg, zlib, png and tiff because we know OE has the required versions, but it is still a hack.
 SRC_URI = "http://www.povray.org/redirect/www.povray.org/ftp/pub/povray/Official/Unix/${P}.tar.bz2 \