merge of '1eda19994e5c81f91c763811b4933f6a997fc501'

     and '22493c02a81dce48bd16714e4afc99389ea3fd30'

11 files changed, 22 insertions, 8 deletions

diff --git a/packages/libccaudio2/libccaudio2_0.9.0.bb b/packages/libccaudio2/libccaudio2_0.9.0.bb
index 1cfb715764..854792be4b 100644
--- a/packages/libccaudio2/libccaudio2_0.9.0.bb
+++ b/packages/libccaudio2/libccaudio2_0.9.0.bb
@@ -1,7 +1,9 @@
 DESCRIPTION = "a C++ class library for generating and recognising sounds."
 HOMEPAGE = "http://www.gnu.org/software/ccaudio/"
 LICENSE = "GPL"
+SECTION = "libs"
 MAINTAINER = "Martin Dietze <dietze@4g-systems.com>, Thomas Geffert <geffert@4g-systems.com>"
+PR = "r1"
 
 SRC_URI = "http://ftp.gnu.org/pub/gnu/ccaudio/ccaudio2-${PV}.tar.gz \
 	file://01-ccaudio-fixed-point.diff;patch=1 \
diff --git a/packages/libcdaudio/libcdaudio_0.99.12p2.bb b/packages/libcdaudio/libcdaudio_0.99.12p2.bb
index 3e15ee8dcc..e661202423 100644
--- a/packages/libcdaudio/libcdaudio_0.99.12p2.bb
+++ b/packages/libcdaudio/libcdaudio_0.99.12p2.bb
@@ -4,8 +4,10 @@
 
 HOMEPAGE = "http://libcdaudio.sourceforge.net/"
 DESCRIPTION = "Portable library for controlling audio CDs"
+SECTION = "libs"
 MAINTAINER = "Raymond Danks <info-linux@geode.amd.com>"
 LICENSE = "GPL"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.gz"
 
diff --git a/packages/libdvdnav/libdvdnav_0.1.10.bb b/packages/libdvdnav/libdvdnav_0.1.10.bb
index 6d7a32e7d8..cef4183571 100644
--- a/packages/libdvdnav/libdvdnav_0.1.10.bb
+++ b/packages/libdvdnav/libdvdnav_0.1.10.bb
@@ -4,8 +4,10 @@
 
 HOMEPAGE="http://dvd.sourceforge.net/"
 DESCRIPTION="DVD navigation multimeda library"
+SECTION = "libs"
 MAINTAINER = "Raymond Danks <info-linux@geode.amd.com>"
 LICENSE = "GPL"
+PR = "r1"
 
 SRC_URI="${SOURCEFORGE_MIRROR}/dvd/${PN}-${PV}.tar.gz"
 
diff --git a/packages/libedit/libedit_20050118.bb b/packages/libedit/libedit_20050118.bb
index fb714e3562..472397c881 100644
--- a/packages/libedit/libedit_20050118.bb
+++ b/packages/libedit/libedit_20050118.bb
@@ -1,8 +1,10 @@
 DESCRIPTION = "BSD replacement for libreadline"
 HOMEPAGE = "http://cvsweb.netbsd.org/bsdweb.cgi/src/lib/libedit/"
+SECTION = "libs"
 MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
 LICENSE="BSD"
 DEPENDS = "ncurses"
+PR = "r1"
 
 SRC_URI = "ftp://ftp.linux.ee/pub/gentoo/distfiles/distfiles/libedit-${PV}.tar.bz2 \
 	file://20031222-debian-to-gentoo.patch;patch=1;pnum=1 \
diff --git a/packages/libsexy/libsexy_0.1.8.bb b/packages/libsexy/libsexy_0.1.8.bb
index 0c714ec633..123b6dd445 100644
--- a/packages/libsexy/libsexy_0.1.8.bb
+++ b/packages/libsexy/libsexy_0.1.8.bb
@@ -1,8 +1,9 @@
 DESCRIPTION = "Libsexy is a collection of GTK+ widgets that extend the functionality of such standard widgets as GtkEntry and GtkLabel"
 HOMEPAGE = "http://wiki.chipx86.com/wiki/Libsexy"
 AUTHOR = "Christian Hammond <chipx86@chipx86.com>"
+SECTION = "x11/libs"
 MAINTAINER = "Koen Kooi <koen@linuxtogo.org>""
-PR = "r0"
+PR = "r1"
 
 DEPENDS = "gtk+ enchant libxml2"
 
diff --git a/packages/pme/pme_1.0.3.bb b/packages/pme/pme_1.0.3.bb
index 9cfad5dfdd..2e1cab6117 100644
--- a/packages/pme/pme_1.0.3.bb
+++ b/packages/pme/pme_1.0.3.bb
@@ -1,8 +1,9 @@
-SECTION = "unknown"
+SECTION = "libs"
 DEPENDS = "libpcre"
 LICENSE = "BSD"
 DESCRIPTION = "PME is a C++ wrapper around the PCRE library."
 SRC_URI = "http://xaxxon.slackworks.com/pme/pme-${PV}.tar.gz"
+PR = "r1"
 
 inherit autotools 
 
diff --git a/packages/povray/povray_3.6.1.bb b/packages/povray/povray_3.6.1.bb
index 58ff33cbc4..a93ae3ddc4 100644
--- a/packages/povray/povray_3.6.1.bb
+++ b/packages/povray/povray_3.6.1.bb
@@ -1,5 +1,6 @@
 DESCRIPTION = "The Persistence of Vision Raytracer is a high-quality, totally free tool for creating stunning three-dimensional graphics. "
 HOMEPAGE = "http://www.povray.org"
+SECTION = "console/graphics"
 #Make this a weak assigment to allow branding of the povray binary 
 MAINTAINER ?= "Koen Kooi <koen@openembedded.org>"
 LICENSE = "povray"
@@ -7,7 +8,7 @@ LICENSE = "povray"
 DEPENDS = "virtual/libx11 libz jpeg libpng tiff"
 RDEPENDS = ""
 
-PR = "r0" 
+PR = "r1"
 
 #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 \
diff --git a/packages/roadster/roadster_cvs.bb b/packages/roadster/roadster_cvs.bb
index 0b7b845380..d339503b8d 100644
--- a/packages/roadster/roadster_cvs.bb
+++ b/packages/roadster/roadster_cvs.bb
@@ -1,8 +1,10 @@
 DESCRIPTION = "Roadster aims to be easy-to-use and open-source mapping software."
 LICENSE = "GPL"
 HOMEPAGE = "http://linuxadvocate.org/projects/roadster/"
+SECTION = "x11/navigation"
 MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 PV = "0.0+cvs${SRCDATE}"
+PR = "r1"
 
 DEPENDS = "tcp-wrappers mysql gpsd gtk+ cairo libxml2 libgnomeui libglade"
 RDEPENDS = "gpsd gtk+ cairo libxml2"
diff --git a/packages/scew/scew_0.3.1.bb b/packages/scew/scew_0.3.1.bb
index a25335860b..6abde6b012 100644
--- a/packages/scew/scew_0.3.1.bb
+++ b/packages/scew/scew_0.3.1.bb
@@ -1,8 +1,9 @@
-SECTION = "unknown"
+SECTION = "libs"
 DESCRIPTION = "Simple C Expat Wrapper."
 DEPENDS = "expat"
 LICENSE = "LGPL"
 SRC_URI = "http://savannah.nongnu.org/download/scew/scew-${PV}.tar.gz \
 	   file://m4.patch;patch=1"
+PR = "r1"
 
 inherit autotools pkgconfig
diff --git a/packages/starling/starling_0.1.bb b/packages/starling/starling_0.1.bb
index 5f4311dfe5..4e19678506 100644
--- a/packages/starling/starling_0.1.bb
+++ b/packages/starling/starling_0.1.bb
@@ -1,7 +1,7 @@
 LICENSE = "GPL"
-SECTION = "gpe"
+SECTION = "gpe/multimedia"
 PRIORITY = "optional"
-PR = "r0"
+PR = "r1"
 MAINTAINER = "Florian Boor <fb@kernelconcepts.de>
 
 inherit gpe autotools
diff --git a/packages/synergy/synergy_1.2.7.bb b/packages/synergy/synergy_1.2.7.bb
index 50cf20ee47..3303cc7000 100644
--- a/packages/synergy/synergy_1.2.7.bb
+++ b/packages/synergy/synergy_1.2.7.bb
@@ -2,10 +2,10 @@ DESCRIPTION = "Synergy - control multiple computers with one keyboard and mouse"
 HOMEPAGE = "http://synergy2.sourceforge.net/"
 LICENSE = "GPLv2"
 MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
-SECTION = "x11"
+SECTION = "x11/utils"
 # NOTE: This depends on full x11, not diet-x11
 DEPENDS = "libx11 libxtst"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/synergy2/synergy-${PV}.tar.gz"