12 files changed, 4 insertions, 192 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index ced2f1f7eb..218087fa22 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -118,13 +118,16 @@ FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*.so.* \
 SECTION_${PN}-doc = "doc"
 FILES_${PN}-doc = "${docdir} ${mandir} ${infodir} ${datadir}/gtk-doc \
             ${datadir}/gnome/help"
+RDEPENDS_${PN}-dev = "${@['', '${PN} (>= ${PV})'][packaged(bb.data.getVar('PN', d, 1), d) == True]}"
 SECTION_${PN}-dev = "devel"
 FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la \
                 ${libdir}/*.a ${libdir}/*.o ${libdir}/pkgconfig \
                 /lib/*.a /lib/*.o ${datadir}/aclocal"
-FILES_${PN}-locale = "${datadir}/locale"
+# RRECOMMENDS_${PN}-dbg = "${PN} (>= ${PV})"
+RRECOMMENDS_${PN}-dbg = "${@['', '${PN} (>= ${PV})'][packaged(bb.data.getVar('PN', d, 1), d) == True]}"
 FILES_${PN}-dbg = "${bindir}/.debug ${sbindir}/.debug ${libexecdir}/.debug ${libdir}/.debug \
             /bin/.debug /sbin/.debug /lib/.debug ${libdir}/${PN}/.debug"
+FILES_${PN}-locale = "${datadir}/locale"
 
 # File manifest
 
diff --git a/meta/packages/compositeext/compositeext_cvs.bb b/meta/packages/compositeext/compositeext_cvs.bb
deleted file mode 100644
index 8f0f4f9f46..0000000000
--- a/meta/packages/compositeext/compositeext_cvs.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-PV = "0.0+cvs${SRCDATE}"
-LICENSE= "BSD-X"
-SECTION = "libs"
-DEPENDS = "xextensions fixesext"
-DESCRIPTION = "X Composite extension headers and specification"
-DEFAULT_PREFERENCE = "1"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=CompositeExt"
-S = "${WORKDIR}/CompositeExt"
-
-inherit autotools pkgconfig
-
-do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR}
-}
diff --git a/meta/packages/damageext/damageext-1.0/autofoo.patch b/meta/packages/damageext/damageext-1.0/autofoo.patch
deleted file mode 100644
index e36fb1d74b..0000000000
--- a/meta/packages/damageext/damageext-1.0/autofoo.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- damageext-1.0/configure.ac~autofoo	2003-11-25 22:47:58.000000000 -0500
-+++ damageext-1.0/configure.ac	2005-01-16 11:47:08.123775952 -0500
-@@ -25,9 +25,9 @@
- 
- AC_PREREQ([2.57])
- AC_INIT([damageext], [1.0], [keithp@keithp.com], damageext)
-+AC_CONFIG_AUX_DIR(.)
- AM_INIT_AUTOMAKE([dist-bzip2])
- AM_MAINTAINER_MODE
--AC_CONFIG_AUX_DIR(.)
- 
- PKG_CHECK_MODULES(FIXESEXT, fixesext)
- 
diff --git a/meta/packages/damageext/damageext_cvs.bb b/meta/packages/damageext/damageext_cvs.bb
deleted file mode 100644
index e9ffa7d2b1..0000000000
--- a/meta/packages/damageext/damageext_cvs.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-PV = "0.0+cvs${SRCDATE}"
-LICENSE = "MIT-X"
-SECTION = "libs"
-DEPENDS = "xextensions fixesext"
-DESCRIPTION = "X Damage extension headers and specification"
-PR = "r1"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=DamageExt"
-S = "${WORKDIR}/DamageExt"
-
-inherit autotools pkgconfig
-
-do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR}
-}
diff --git a/meta/packages/fixesext/fixesext_cvs.bb b/meta/packages/fixesext/fixesext_cvs.bb
deleted file mode 100644
index 4ddbc96c64..0000000000
--- a/meta/packages/fixesext/fixesext_cvs.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-PV = "0.0+cvs${SRCDATE}"
-LICENSE= "BSD-X"
-SECTION = "libs"
-DEPENDS = "xextensions"
-DESCRIPTION = "X Fixes extension headers and specification."
-DEFAULT_PREFERENCE = "1"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=FixesExt"
-S = "${WORKDIR}/FixesExt"
-
-inherit autotools pkgconfig
-
-do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR}
-}
diff --git a/meta/packages/randrext/randrext_1.0.bb b/meta/packages/randrext/randrext_1.0.bb
deleted file mode 100644
index 3fe6a442ac..0000000000
--- a/meta/packages/randrext/randrext_1.0.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-SECTION = "libs"
-LICENSE= "BSD-X"
-DESCRIPTION = "X Resize and Rotate extension headers"
-
-SRC_URI = "${XLIBS_MIRROR}/randrext-${PV}.tar.bz2"
-
-inherit autotools pkgconfig
-
-do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR}
-}
diff --git a/meta/packages/randrext/randrext_cvs.bb b/meta/packages/randrext/randrext_cvs.bb
deleted file mode 100644
index 29cff38373..0000000000
--- a/meta/packages/randrext/randrext_cvs.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-PV = "0.0+cvs${SRCDATE}"
-LICENSE= "BSD-X"
-SECTION = "libs"
-DESCRIPTION = "X Resize and Rotate extension headers"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Randr"
-S = "${WORKDIR}/Randr"
-
-inherit autotools pkgconfig
-
-do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR}
-}
diff --git a/meta/packages/recordext/recordext_cvs.bb b/meta/packages/recordext/recordext_cvs.bb
deleted file mode 100644
index eeaae24762..0000000000
--- a/meta/packages/recordext/recordext_cvs.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-PV = "0.0+cvs${SRCDATE}"
-LICENSE = "BSD-X"
-SECTION = "libs"
-DESCRIPTION = "XRecord extension protocol bits"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=RecordExt"
-S = "${WORKDIR}/RecordExt"
-
-inherit autotools pkgconfig
-
-do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR}
-}
diff --git a/meta/packages/renderext/renderext_0.8.bb b/meta/packages/renderext/renderext_0.8.bb
deleted file mode 100644
index a12f7c0da5..0000000000
--- a/meta/packages/renderext/renderext_0.8.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-SECTION = "libs"
-LICENSE = "MIT-X"
-DESCRIPTION = "X Render extension headers"
-
-SRC_URI = "${XLIBS_MIRROR}/renderext-${PV}.tar.bz2"
-
-inherit autotools pkgconfig
-
-do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR}
-}
diff --git a/meta/packages/renderext/renderext_cvs.bb b/meta/packages/renderext/renderext_cvs.bb
deleted file mode 100644
index 08053d95b9..0000000000
--- a/meta/packages/renderext/renderext_cvs.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-PV = "0.0+cvs${SRCDATE}"
-LICENSE = "MIT-X"
-SECTION = "libs"
-DESCRIPTION = "X Render extension headers"
-DEFAULT_PREFERENCE = "1"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Render"
-S = "${WORKDIR}/Render"
-
-inherit autotools pkgconfig
-
-do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR}
-}
diff --git a/meta/packages/resourceext/resourceext_1.0.bb b/meta/packages/resourceext/resourceext_1.0.bb
deleted file mode 100644
index 55780b1d22..0000000000
--- a/meta/packages/resourceext/resourceext_1.0.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-SECTION = "libs"
-LICENSE = "Xorg"
-DEPENDS = "xextensions"
-DESCRIPTION = "X Resource usage extension headers"
-
-SRC_URI = "${XLIBS_MIRROR}/resourceext-${PV}.tar.bz2"
-
-inherit autotools pkgconfig
-
-do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR}
-}
diff --git a/meta/packages/resourceext/resourceext_cvs.bb b/meta/packages/resourceext/resourceext_cvs.bb
deleted file mode 100644
index b0fe23392e..0000000000
--- a/meta/packages/resourceext/resourceext_cvs.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-PV = "0.0+cvs${SRCDATE}"
-SECTION = "libs"
-LICENSE = "Xorg"
-DEPENDS = "xextensions"
-DESCRIPTION = "X Resource usage extension headers"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=ResourceExt"
-S = "${WORKDIR}/ResourceExt"
-
-inherit autotools pkgconfig
-
-do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR}
-}