gnome: convert a lot of recipes to new style staging

52 files changed, 51 insertions, 284 deletions

diff --git a/recipes/gnome/at-spi_1.26.0.bb b/recipes/gnome/at-spi_1.26.0.bb
index e5c8236e6b..78aa77aec5 100644
--- a/recipes/gnome/at-spi_1.26.0.bb
+++ b/recipes/gnome/at-spi_1.26.0.bb
@@ -8,10 +8,6 @@ RDEPENDS_${PN} = "libgail-gnome gtk-module-gail"
 
 inherit gnome
 
-do_stage () {
-	autotools_stage_all
-}
-
 FILES_${PN} += " \
                 ${libdir}/bonobo \
                 ${libdir}/gtk-2.0 \
diff --git a/recipes/gnome/at-spi_1.28.0.bb b/recipes/gnome/at-spi_1.28.0.bb
index e0fb58aed3..4b82e7b404 100644
--- a/recipes/gnome/at-spi_1.28.0.bb
+++ b/recipes/gnome/at-spi_1.28.0.bb
@@ -6,7 +6,7 @@ LICENSE = "LGPL"
 DEPENDS = "gtk+ atk libbonobo orbit2 orbit2-native"
 RDEPENDS_${PN} = "libgail-gnome gtk-module-gail"
 
-PR = "r1"
+PR = "r2"
 
 inherit gnome
 
@@ -16,10 +16,6 @@ do_configure_prepend () {
 	sed -i "s|LIBBONOBO_IDL_DIR=.*|LIBBONOBO_IDL_DIR=${STAGING_DATADIR}/idl//bonobo-2.0|" ${S}/configure.in
 }
 
-do_stage () {
-	autotools_stage_all
-}
-
 FILES_${PN} += " \
                 ${libdir}/bonobo \
                 ${libdir}/gtk-2.0 \
diff --git a/recipes/gnome/epiphany_2.28.0.bb b/recipes/gnome/epiphany_2.28.0.bb
index bb4bcf4292..5497bea0ae 100644
--- a/recipes/gnome/epiphany_2.28.0.bb
+++ b/recipes/gnome/epiphany_2.28.0.bb
@@ -11,13 +11,7 @@ do_configure_prepend() {
         sed -i -e s:help::g Makefile.am
 }
 
-do_stage () {
-	autotools_stage_all
-}
-
 FILES_${PN} += "${datadir}/icons ${datadir}/dbus-1"
 
-
-
 SRC_URI[archive.md5sum] = "b88ac1168fc271892cabf73b749cac16"
 SRC_URI[archive.sha256sum] = "23e0379c41c378221338fb327d747f3e42b2b98cdf1512c9df7cbeab45f311ea"
diff --git a/recipes/gnome/gconf-dbus_svn.bb b/recipes/gnome/gconf-dbus_svn.bb
index 4deae5747b..bc27d87bea 100644
--- a/recipes/gnome/gconf-dbus_svn.bb
+++ b/recipes/gnome/gconf-dbus_svn.bb
@@ -8,7 +8,7 @@ RPROVIDES_${PN}-dev = "gconf-dev"
 
 SRCREV = "641"
 PV = "2.16.0+svnr${SRCPV}"
-PR = "r0"
+PR = "r1"
 
 inherit autotools pkgconfig
 
@@ -24,14 +24,11 @@ do_configure_prepend() {
 	touch gtk-doc.make
 }
 
-do_stage() {
-	autotools_stage_all
-	install -m 0644 gconf-2.m4 ${STAGING_DATADIR}/aclocal/gconf-2.m4
-}
-
 do_install_append() {
+	install -d ${D}${datadir}/aclocal/
 	install -d ${D}/${sysconfdir}/X11/Xsession.d
 	install -m 755 ${WORKDIR}/69gconfd-dbus ${D}/${sysconfdir}/X11/Xsession.d/
+	install -m 0644 gconf-2.m4 ${D}${datadir}/aclocal/gconf-2.m4
 }
 
 FILES_${PN} = "${libdir}/GConf-dbus/2/*.so ${libdir}/dbus-1.0 ${sysconfdir} ${datadir}/dbus* ${libdir}/*.so.* ${bindir}/* ${libexecdir}/*"
diff --git a/recipes/gnome/gconf_2.6.1.bb b/recipes/gnome/gconf_2.6.1.bb
index 7707090319..7c4adde966 100644
--- a/recipes/gnome/gconf_2.6.1.bb
+++ b/recipes/gnome/gconf_2.6.1.bb
@@ -11,7 +11,6 @@ SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/GConf/2.6/GConf-${PV}.tar.bz2
 	   file://backends.patch;patch=1"
 
 EXTRA_OECONF = "--disable-gtk-doc"
-HEADERS = "gconf.h gconf-changeset.h gconf-listeners.h gconf-schema.h gconf-value.h gconf-error.h gconf-engine.h gconf-client.h gconf-enum-types.h"
 
 inherit autotools pkgconfig gettext
 
@@ -20,10 +19,8 @@ do_compile() {
 }
 
 do_stage() {
-	oe_libinstall -so -C gconf libgconf-2 ${STAGING_LIBDIR}
-	install -d ${STAGING_INCDIR}/gconf/2/gconf/
-	( cd gconf; for i in ${HEADERS}; do install -m 0644 $i ${STAGING_INCDIR}/gconf/2/gconf/$i; done )
-	install -m 0644 gconf.m4 ${STAGING_DATADIR}/aclocal/gconf-2.m4
+	install -d ${D}${datadir}/aclocal
+	install -m 0644 gconf.m4 ${D}${datadir}/aclocal/gconf-2.m4
 }
 
 do_install() {
diff --git a/recipes/gnome/gedit_2.26.2.bb b/recipes/gnome/gedit_2.26.2.bb
index 09e95f4d14..358653c8fe 100644
--- a/recipes/gnome/gedit_2.26.2.bb
+++ b/recipes/gnome/gedit_2.26.2.bb
@@ -13,10 +13,6 @@ do_configure_prepend () {
 	cp ${STAGING_DATADIR}/gnome-common/data/omf.make ${S}
 }
 
-do_stage () {
-	autotools_stage_all
-}
-
 FILES_${PN} += "${libdir} ${datadir}/gedit-2"
 FILES_${PN}-dbg += "${libdir}/gedit-2/plugin-loaders/.debug ${libdir}/gedit-2/plugins/.debug"
 
diff --git a/recipes/gnome/gedit_2.28.0.bb b/recipes/gnome/gedit_2.28.0.bb
index c63f12764d..af54ac29fa 100644
--- a/recipes/gnome/gedit_2.28.0.bb
+++ b/recipes/gnome/gedit_2.28.0.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 DEPENDS = "iso-codes gnome-common glib-2.0 gtk+ gconf gtksourceview2"
 RDEPENDS += " gtksourceview2"
 
-PR = "r1"
+PR = "r2"
 
 inherit gnome pkgconfig
 
@@ -15,10 +15,6 @@ do_configure_prepend () {
 	cp ${STAGING_DATADIR}/gnome-common/data/omf.make ${S}
 }
 
-do_stage () {
-	autotools_stage_all
-}
-
 FILES_${PN} += "${libdir}/gedit-2/plugin* ${datadir}/gedit-2"
 FILES_${PN}-dbg += "${libdir}/gedit-2/plugin-loaders/.debug ${libdir}/gedit-2/plugins/.debug"
 
diff --git a/recipes/gnome/gio-standalone_0.1.2.bb b/recipes/gnome/gio-standalone_0.1.2.bb
index 6e98cf8bd5..0429c61c88 100644
--- a/recipes/gnome/gio-standalone_0.1.2.bb
+++ b/recipes/gnome/gio-standalone_0.1.2.bb
@@ -1,17 +1,12 @@
 DESCRIPTION = "gio is a platform independent file and I/O abstraction library"
 LICENSE = "LGPL"
 DEPENDS = "glib-2.0"
-PR = "r0"
+PR = "r1"
 
 inherit gnome
 
 PACKAGES =+ "libgio"
 FILES_libgio = "${libdir}/libgio.so.*"
 
-do_stage() {
-	autotools_stage_all
-}
-
-
 SRC_URI[archive.md5sum] = "6c3ae062f5b32f20eeaf91603f92652e"
 SRC_URI[archive.sha256sum] = "a142efdd4508c7af90db878ded6f4713eb9bca47b508f60b294e62d7905ecff2"
diff --git a/recipes/gnome/gnome-applets_2.28.0.bb b/recipes/gnome/gnome-applets_2.28.0.bb
index d425dac6a9..41efe5e424 100644
--- a/recipes/gnome/gnome-applets_2.28.0.bb
+++ b/recipes/gnome/gnome-applets_2.28.0.bb
@@ -14,10 +14,6 @@ do_configure_prepend () {
 	done
 }
 
-do_stage() {
-        autotools_stage_all
-}
-
 FILES_${PN} += " \
                 ${datadir}/dbus-1/ \
                 ${datadir}/PolicyKit/ \
diff --git a/recipes/gnome/gnome-cups-manager_0.31.bb b/recipes/gnome/gnome-cups-manager_0.31.bb
index 2bb3f588e9..c633720bf2 100644
--- a/recipes/gnome/gnome-cups-manager_0.31.bb
+++ b/recipes/gnome/gnome-cups-manager_0.31.bb
@@ -1,7 +1,7 @@
 DESCRIPTION="Gnome Cups Manager"
 LICENSE="GPLv2"
 
-PR ="r0"
+PR = "r1"
 
 DEPENDS="glib-2.0 gtk+ pango libgnomecups"
 
@@ -12,10 +12,5 @@ FILES += "${datadir}/icons/hicolor/48x48/stock/data/emblem-*.png \
 
 SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gnome-cups-manager/${PV}/gnome-cups-manager-${PV}.tar.bz2"
 
-do_stage() {
-	autotools_stage_all
-}
-
-
 SRC_URI[md5sum] = "4144b2cf05e381e89fed066793e3b249"
 SRC_URI[sha256sum] = "8ccfd3816757fa8127cf96a530e374c81a449fbcd9391d2d3e1bac29f54ab3e6"
diff --git a/recipes/gnome/gnome-cups-manager_0.33.bb b/recipes/gnome/gnome-cups-manager_0.33.bb
index b5b2307852..5ba81dd097 100644
--- a/recipes/gnome/gnome-cups-manager_0.33.bb
+++ b/recipes/gnome/gnome-cups-manager_0.33.bb
@@ -1,7 +1,7 @@
 DESCRIPTION="Gnome Cups Manager"
 LICENSE="GPLv2"
 
-PR ="r0"
+PR = "r1"
 
 DEPENDS="glib-2.0 gtk+ pango libgnomecups"
 
@@ -11,10 +11,5 @@ FILES_${PN} += "${datadir}/icons/"
 
 SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gnome-cups-manager/${PV}/gnome-cups-manager-${PV}.tar.bz2"
 
-do_stage() {
-	autotools_stage_all
-}
-
-
 SRC_URI[md5sum] = "a48eb85cd239760913c936d824062473"
 SRC_URI[sha256sum] = "9d4fdefc8f69c0e1b330bb399b162f1f1005afdadf346e4f5d739de75c660dca"
diff --git a/recipes/gnome/gnome-desktop_2.7.90.bb b/recipes/gnome/gnome-desktop_2.7.90.bb
index 5db81af267..ed6acad38e 100644
--- a/recipes/gnome/gnome-desktop_2.7.90.bb
+++ b/recipes/gnome/gnome-desktop_2.7.90.bb
@@ -1,22 +1,11 @@
 require gnome-desktop.inc
 
-PR = "r0"
+PR = "r1"
 
 inherit gnome
 
 EXTRA_OECONF = ""
 EXTRA_AUTORECONF = "-I ${STAGING_DATADIR}/aclocal/gnome2-macros"
 
-do_stage () {
-	install -d ${STAGING_INCDIR}/gnome-desktop-2.0/libgnome/
-#	install -d ${STAGING_INCDIR}/gnome-desktop-2.0/libgnomeui/
-	install -m 0644 libgnome-desktop/libgnome/gnome-desktop-item.h ${STAGING_INCDIR}/gnome-desktop-2.0/libgnome/
-#	install -m 0644 libgnome-desktop/libgnomeui/gnome-ditem-edit.h ${STAGING_INCDIR}/gnome-desktop-2.0/libgnomeui/
-#	install -m 0644 libgnome-desktop/libgnomeui/gnome-hint.h ${STAGING_INCDIR}/gnome-desktop-2.0/libgnomeui/
-	oe_libinstall -C libgnome-desktop/.libs -so libgnome-desktop-2 ${STAGING_LIBDIR}
-
-
-}
-
 SRC_URI[archive.md5sum] = "16691f6bdc7c09445c457387adaba1f1"
 SRC_URI[archive.sha256sum] = "6a1499a1e50ac89210a9a1fdb36bc070ef6d1a02764a0f8d90de314dba01972e"
diff --git a/recipes/gnome/gnome-keyring_0.2.1.bb b/recipes/gnome/gnome-keyring_0.2.1.bb
index 8ee35635d1..d654b7a1fd 100644
--- a/recipes/gnome/gnome-keyring_0.2.1.bb
+++ b/recipes/gnome/gnome-keyring_0.2.1.bb
@@ -8,17 +8,5 @@ DEPENDS = ""
 
 EXTRA_OECONF = "--disable-gtk-doc"
 
-HEADERS = " \
-gnome-keyring.h \
-"
-
-do_stage() {
-	install -d ${STAGING_INCDIR}/gnome-keyring-1
-	for i in ${HEADERS}; do
-		install -m 0644 $i ${STAGING_INCDIR}/gnome-keyring-1/$i
-	done
-	oe_libinstall -so libgnome-keyring ${STAGING_LIBDIR}
-}
-
 SRC_URI[md5sum] = "2fe5fb39cc18d1a6792fd3281223dfff"
 SRC_URI[sha256sum] = "1c6d5a1732742469ec32ab7297f3b8eacfc0f4bfae5fdb096b603877dde12612"
diff --git a/recipes/gnome/gnome-keyring_0.4.4.bb b/recipes/gnome/gnome-keyring_0.4.4.bb
index 85b94a60c1..1b7c74a0cc 100644
--- a/recipes/gnome/gnome-keyring_0.4.4.bb
+++ b/recipes/gnome/gnome-keyring_0.4.4.bb
@@ -8,17 +8,5 @@ DEPENDS = "gtk+"
 
 EXTRA_OECONF = "--disable-gtk-doc"
 
-HEADERS = " \
-gnome-keyring.h \
-"
-
-do_stage() {
-	install -d ${STAGING_INCDIR}/gnome-keyring-1
-	for i in ${HEADERS}; do
-		install -m 0644 $i ${STAGING_INCDIR}/gnome-keyring-1/$i
-	done
-	oe_libinstall -so libgnome-keyring ${STAGING_LIBDIR}
-}
-
 SRC_URI[md5sum] = "dc17fa8b04172d3b1993caa6959a7648"
 SRC_URI[sha256sum] = "f6799acf59bc91054c4832e7956cb3126effdf911f746139478dcfa8ec727653"
diff --git a/recipes/gnome/gnome-keyring_0.6.0.bb b/recipes/gnome/gnome-keyring_0.6.0.bb
index b89990a92e..9c40803c65 100644
--- a/recipes/gnome/gnome-keyring_0.6.0.bb
+++ b/recipes/gnome/gnome-keyring_0.6.0.bb
@@ -7,10 +7,5 @@ DEPENDS = "gtk+"
 
 EXTRA_OECONF = "--disable-gtk-doc"
 
-
-do_stage() {
-        autotools_stage_all
-}
-
 SRC_URI[archive.md5sum] = "1e3a3a12b19fc5ebe95363658c2256d8"
 SRC_URI[archive.sha256sum] = "649f2a0d5298b896781d0ac563b8ea1be7f3fe07fd17ea43b0ec0562be47769f"
diff --git a/recipes/gnome/gnome-keyring_0.8.1.bb b/recipes/gnome/gnome-keyring_0.8.1.bb
index 798a066552..fd32af3951 100644
--- a/recipes/gnome/gnome-keyring_0.8.1.bb
+++ b/recipes/gnome/gnome-keyring_0.8.1.bb
@@ -7,9 +7,5 @@ DEPENDS = "gtk+"
 
 EXTRA_OECONF = "--disable-gtk-doc"
 
-do_stage() {
-        autotools_stage_all
-}
-
 SRC_URI[archive.md5sum] = "24b15dedcf40c1c60d0fb989370d80ff"
 SRC_URI[archive.sha256sum] = "ad28558e2c0e5496cdfec3f8badf84d64af3aebc3fc9f5632066591e20ce3943"
diff --git a/recipes/gnome/gnome-keyring_2.20.0.bb b/recipes/gnome/gnome-keyring_2.20.0.bb
index 34cdf1749a..5e3af8d3ad 100644
--- a/recipes/gnome/gnome-keyring_2.20.0.bb
+++ b/recipes/gnome/gnome-keyring_2.20.0.bb
@@ -1,7 +1,7 @@
 LICENSE = "GPL"
 SECTION = "x11/gnome"
 
-PR = "r2"
+PR = "r3"
 
 inherit autotools gnome pkgconfig
 
@@ -18,9 +18,5 @@ do_install_append () {
 
 FILES_${PN} += "${datadir}/dbus-1/services"
 
-do_stage() {
-        autotools_stage_all
-}
-
 SRC_URI[archive.md5sum] = "effc946bf3fa05d70b1251801383efd2"
 SRC_URI[archive.sha256sum] = "6fadcd85a16672381857de0e1cf2b6fe16ec3393931f92427deb13153eeabe1c"
diff --git a/recipes/gnome/gnome-keyring_2.24.1.bb b/recipes/gnome/gnome-keyring_2.24.1.bb
index bb0eb28c82..bab91780cc 100644
--- a/recipes/gnome/gnome-keyring_2.24.1.bb
+++ b/recipes/gnome/gnome-keyring_2.24.1.bb
@@ -3,7 +3,7 @@ SECTION = "x11/gnome"
 
 inherit autotools gnome pkgconfig
 
-PR = "r1"
+PR = "r2"
 
 DEPENDS = "gtk+ libtasn1 libgcrypt gconf"
 
@@ -22,9 +22,5 @@ do_install_append () {
 
 FILES_${PN} += "${datadir}/dbus-1/services"
 
-do_stage() {
-        autotools_stage_all
-}
-
 SRC_URI[archive.md5sum] = "aa5552dc129f3509ee39145b7f0bf977"
 SRC_URI[archive.sha256sum] = "3c9eb7f45dd0026340635b9e1ee18c36a47541610aa5a7ef604ca645aa4763f9"
diff --git a/recipes/gnome/gnome-keyring_2.26.0.bb b/recipes/gnome/gnome-keyring_2.26.0.bb
index 20bd78dcbe..d1ca1e7384 100644
--- a/recipes/gnome/gnome-keyring_2.26.0.bb
+++ b/recipes/gnome/gnome-keyring_2.26.0.bb
@@ -23,9 +23,5 @@ PACKAGES =+ "gnome-keyring-pam-plugin"
 FILES_gnome-keyring-pam-plugin = "${libdir}/security/*.so"
 FILES_${PN}-dbg += "${libdir}/gnome-keyring/*/.debug ${libdir}/security/.debug"
 
-do_stage() {
-        autotools_stage_all
-}
-
 SRC_URI[archive.md5sum] = "0395fcf79b990465030a2795dcddacb9"
 SRC_URI[archive.sha256sum] = "7acda11db2eb07b2f68a1a506203fe95141954acb10c394850418fd04ed80a07"
diff --git a/recipes/gnome/gnome-media_2.26.0.bb b/recipes/gnome/gnome-media_2.26.0.bb
index c134d6da1f..bbc1e96b0d 100644
--- a/recipes/gnome/gnome-media_2.26.0.bb
+++ b/recipes/gnome/gnome-media_2.26.0.bb
@@ -8,7 +8,7 @@ DEPENDS += "pulseaudio"
 #DEPENDS += "nautilus-cd-burner"
 inherit gnome
 
-PR = "r1"
+PR = "r2"
 
 EXTRA_OECONF = "--disable-static --disable-gtk-doc --disable-scrollkeeper"
 
@@ -17,10 +17,6 @@ do_configure_prepend() {
 	sed -i 's/^\(SUBDIRS = .*\)\(doc\|help\)/\1/' */Makefile.am
 }
 
-do_stage() {
-	autotools_stage_all
-}
-
 do_install_append() {
 	rm ${D}${libdir}/libglade/2.0/libgnome-media-profiles.la
 }
diff --git a/recipes/gnome/gnome-media_2.28.0.bb b/recipes/gnome/gnome-media_2.28.0.bb
index 7740c6bf22..3d16f3510b 100644
--- a/recipes/gnome/gnome-media_2.28.0.bb
+++ b/recipes/gnome/gnome-media_2.28.0.bb
@@ -15,10 +15,6 @@ do_configure_prepend() {
 	sed -i 's/^\(SUBDIRS = .*\)\(doc\|help\)/\1/' */Makefile.am
 }
 
-do_stage() {
-	autotools_stage_all
-}
-
 do_install_append() {
 	rm ${D}${libdir}/libglade/2.0/libgnome-media-profiles.la
 }
diff --git a/recipes/gnome/gnome-menus_2.10.2.bb b/recipes/gnome/gnome-menus_2.10.2.bb
index 61bb67a2a0..d029ac6230 100644
--- a/recipes/gnome/gnome-menus_2.10.2.bb
+++ b/recipes/gnome/gnome-menus_2.10.2.bb
@@ -1,13 +1,8 @@
 DEPENDS = "gnome-vfs libxml2 gconf popt gtk+"
 LICENSE = "GPL"
 
-
 inherit gnome pkgconfig
 
-do_stage() {
-autotools_stage_all
-}
-
 FILES_${PN} += "${datadir}"
 
 SRC_URI[archive.md5sum] = "97b0ad03ea219cc8f5c02585db1d237e"
diff --git a/recipes/gnome/gnome-menus_2.12.0.bb b/recipes/gnome/gnome-menus_2.12.0.bb
index ed6f72c35d..2e544db93a 100644
--- a/recipes/gnome/gnome-menus_2.12.0.bb
+++ b/recipes/gnome/gnome-menus_2.12.0.bb
@@ -1,17 +1,11 @@
 DEPENDS = "python gnome-vfs libxml2 gconf popt gtk+"
 LICENSE = "GPL"
 
-
 inherit gnome pkgconfig
 
-do_stage() {
-autotools_stage_all
-}
-
 PACKAGES += "${PN}-python"
 FILES_${PN} += "${datadir}/desktop-directories/"
 FILES_${PN}-python = "${libdir}/python*"
 
-
 SRC_URI[archive.md5sum] = "615392c4f729f70c03aa3aa7dbe40a95"
 SRC_URI[archive.sha256sum] = "f77192ca0b909000f675ad3cd520c313431ee117d554102c7ea486f76f396f6b"
diff --git a/recipes/gnome/gnome-menus_2.16.1.bb b/recipes/gnome/gnome-menus_2.16.1.bb
index 2d08f48f33..4eb9b84588 100644
--- a/recipes/gnome/gnome-menus_2.16.1.bb
+++ b/recipes/gnome/gnome-menus_2.16.1.bb
@@ -1,20 +1,15 @@
 DEPENDS = "python gnome-vfs libxml2 gconf popt gtk+"
 LICENSE = "GPL"
 
-PR = "r1"
+PR = "r2"
 
 inherit gnome pkgconfig python-dir
 
-do_stage() {
-autotools_stage_all
-}
-
 PACKAGES += "${PN}-python"
 FILES_${PN} += "${datadir}/desktop-directories/"
 FILES_${PN}-python = "${libdir}/python*"
 FILES_${PN}-dbg += "${PYTHON_SITEPACKAGES_DIR}/*/.debug \
                     ${PYTHON_SITEPACKAGES_DIR}/.debug"
 
-
 SRC_URI[archive.md5sum] = "a5c467abe68003d23ec09a795ebfd29f"
 SRC_URI[archive.sha256sum] = "72238f33406ada505fde8555ff93c00e7fec055a41500339b434c5445b09c87b"
diff --git a/recipes/gnome/gnome-menus_2.22.2.bb b/recipes/gnome/gnome-menus_2.22.2.bb
index ce1b87ebfa..4057cf818d 100644
--- a/recipes/gnome/gnome-menus_2.22.2.bb
+++ b/recipes/gnome/gnome-menus_2.22.2.bb
@@ -3,16 +3,11 @@ LICENSE = "GPL"
 
 inherit gnome pkgconfig python-dir
 
-do_stage() {
-autotools_stage_all
-}
-
 PACKAGES += "${PN}-python"
 FILES_${PN} += "${datadir}/desktop-directories/"
 FILES_${PN}-python = "${libdir}/python*"
 FILES_${PN}-dbg += "${PYTHON_SITEPACKAGES_DIR}/*/.debug \
                     ${PYTHON_SITEPACKAGES_DIR}/.debug"
 
-
 SRC_URI[archive.md5sum] = "2bb185643632b28f4dba4b8201b8e230"
 SRC_URI[archive.sha256sum] = "b3ef17eb05308e35e1627e5ca56b6951e9aea69cf112164ef698cdad6f44ed23"
diff --git a/recipes/gnome/gnome-menus_2.24.0.bb b/recipes/gnome/gnome-menus_2.24.0.bb
index b47eec7615..c3f08978bf 100644
--- a/recipes/gnome/gnome-menus_2.24.0.bb
+++ b/recipes/gnome/gnome-menus_2.24.0.bb
@@ -3,16 +3,11 @@ LICENSE = "GPL"
 
 inherit gnome pkgconfig python-dir
 
-do_stage() {
-autotools_stage_all
-}
-
 PACKAGES += "${PN}-python"
 FILES_${PN} += "${datadir}/desktop-directories/"
 FILES_${PN}-python = "${libdir}/python*"
 FILES_${PN}-dbg += "${PYTHON_SITEPACKAGES_DIR}/*/.debug \
                     ${PYTHON_SITEPACKAGES_DIR}/.debug"
 
-
 SRC_URI[archive.md5sum] = "1816a0d21ef99d5b3a8bcd033c88f732"
 SRC_URI[archive.sha256sum] = "f19ac5af961be1d6244f9526311af8a67518c7403ef71209dcee94b68f77d58e"
diff --git a/recipes/gnome/gnome-menus_2.26.0.bb b/recipes/gnome/gnome-menus_2.26.0.bb
index b5b8a286b0..f9622655a3 100644
--- a/recipes/gnome/gnome-menus_2.26.0.bb
+++ b/recipes/gnome/gnome-menus_2.26.0.bb
@@ -3,16 +3,11 @@ LICENSE = "GPL"
 
 inherit gnome pkgconfig python-dir
 
-do_stage() {
-autotools_stage_all
-}
-
 PACKAGES += "${PN}-python"
 FILES_${PN} += "${datadir}/desktop-directories/"
 FILES_${PN}-python = "${libdir}/python*"
 FILES_${PN}-dbg += "${PYTHON_SITEPACKAGES_DIR}/*/.debug \
                     ${PYTHON_SITEPACKAGES_DIR}/.debug"
 
-
 SRC_URI[archive.md5sum] = "55fd07e67d8334de2e03e4e23c011452"
 SRC_URI[archive.sha256sum] = "84a97b6d74b14e27888a0f54759e570cb701400c5b176471871bc08a6acafb15"
diff --git a/recipes/gnome/gnome-menus_2.28.0.1.bb b/recipes/gnome/gnome-menus_2.28.0.1.bb
index d3abb7bb88..3f1fcf5c2f 100644
--- a/recipes/gnome/gnome-menus_2.28.0.1.bb
+++ b/recipes/gnome/gnome-menus_2.28.0.1.bb
@@ -6,16 +6,11 @@ DEPENDS = "python gnome-vfs libxml2 gconf popt gtk+"
 
 inherit gnome pkgconfig python-dir
 
-do_stage() {
-	autotools_stage_all
-}
-
 PACKAGES += "${PN}-python"
 FILES_${PN} += "${datadir}/desktop-directories/"
 FILES_${PN}-python = "${libdir}/python*"
 FILES_${PN}-dbg += "${PYTHON_SITEPACKAGES_DIR}/*/.debug \
                     ${PYTHON_SITEPACKAGES_DIR}/.debug"
 
-
 SRC_URI[archive.md5sum] = "279316228fd84917acb9405476f74b53"
 SRC_URI[archive.sha256sum] = "75e73554cd0b0a8356956e76ccb517def5382eafa7bdb14336499cd271570dbc"
diff --git a/recipes/gnome/gnome-panel_2.10.1.bb b/recipes/gnome/gnome-panel_2.10.1.bb
index ecb4926168..56483cc0d3 100644
--- a/recipes/gnome/gnome-panel_2.10.1.bb
+++ b/recipes/gnome/gnome-panel_2.10.1.bb
@@ -3,9 +3,5 @@ DEPENDS = "libwnck orbit2 gtk+ libgnome libgnomeui gnome-desktop libglade gnome-
 
 inherit gnome pkgconfig
 
-do_stage() {
-autotools_stage_all
-}
-
 SRC_URI[archive.md5sum] = "a2719f5c79a9e48bca086f08a77a6889"
 SRC_URI[archive.sha256sum] = "dc60f7f6e9b9ce52ad4e2ce1f7d6dca643590e86e49c749d513d9f8a25068a7a"
diff --git a/recipes/gnome/gnome-panel_2.12.1.bb b/recipes/gnome/gnome-panel_2.12.1.bb
index afe4b6939d..58b6d26eb6 100644
--- a/recipes/gnome/gnome-panel_2.12.1.bb
+++ b/recipes/gnome/gnome-panel_2.12.1.bb
@@ -3,9 +3,5 @@ DEPENDS = "libwnck orbit2 gtk+ libgnome libgnomeui gnome-desktop libglade gnome-
 
 inherit gnome pkgconfig
 
-do_stage() {
-autotools_stage_all
-}
-
 SRC_URI[archive.md5sum] = "a532717e8ac7f67b7198c256909cd7dd"
 SRC_URI[archive.sha256sum] = "61a01f535b50ca0a4c35b4b59513287f17e0665c0b678952cae663b883b13827"
diff --git a/recipes/gnome/gnome-panel_2.18.1.bb b/recipes/gnome/gnome-panel_2.18.1.bb
index 50dc8338b9..8029cd46c0 100644
--- a/recipes/gnome/gnome-panel_2.18.1.bb
+++ b/recipes/gnome/gnome-panel_2.18.1.bb
@@ -1,7 +1,7 @@
 LICENSE = "GPL"
 DEPENDS = "startup-notification libwnck orbit2 gtk+ libgnome libgnomeui gnome-desktop libglade gnome-menus orbit2-native"
 
-PR = "r1"
+PR = "r2"
 
 inherit gnome pkgconfig
 
@@ -18,9 +18,5 @@ FILES_${PN} =+ "${datadir}/gnome* \
 
 EXTRA_OEMAKE = "ORBIT_IDL=${STAGING_BINDIR_NATIVE}/orbit-idl-2"
 
-do_stage() {
-        autotools_stage_all
-}
-
 SRC_URI[archive.md5sum] = "6c325f5b5f9f424faa494665720bcfb9"
 SRC_URI[archive.sha256sum] = "c04b53bcc0057ed042169baa725ed3769194864e5824643cc0af8c58cf773d2c"
diff --git a/recipes/gnome/gnome-panel_2.22.2.bb b/recipes/gnome/gnome-panel_2.22.2.bb
index 7d7c95ff5c..fb2fb902bd 100644
--- a/recipes/gnome/gnome-panel_2.22.2.bb
+++ b/recipes/gnome/gnome-panel_2.22.2.bb
@@ -16,9 +16,5 @@ FILES_${PN} =+ "${datadir}/gnome* \
 
 EXTRA_OEMAKE = "ORBIT_IDL=${STAGING_BINDIR_NATIVE}/orbit-idl-2"
 
-do_stage() {
-        autotools_stage_all
-}
-
 SRC_URI[archive.md5sum] = "3d8aab9d476a593e731afcd60272454a"
 SRC_URI[archive.sha256sum] = "e1ecc0ddc5a09481deb2daa1f30fa14472bfed541db46bb4f49f3d0d728b0a45"
diff --git a/recipes/gnome/gnome-panel_2.24.0.bb b/recipes/gnome/gnome-panel_2.24.0.bb
index 6ee82f3ffe..60713f39c0 100644
--- a/recipes/gnome/gnome-panel_2.24.0.bb
+++ b/recipes/gnome/gnome-panel_2.24.0.bb
@@ -22,9 +22,5 @@ export SYSROOT = "${STAGING_DIR_HOST}"
 EXTRA_OEMAKE = "ORBIT_IDL=${STAGING_BINDIR_NATIVE}/orbit-idl-2 SYSROOT=${SYSROOT}"
 EXTRA_OECONF = "--disable-scrollkeeper"
 
-do_stage() {
-        autotools_stage_all
-}
-
 SRC_URI[archive.md5sum] = "0d246880611a4c58fe2ff99614b96918"
 SRC_URI[archive.sha256sum] = "6d6d0f013594f1d5f685bc9d35ad2c64d7817339a932d8e17eede5b8a3c8196a"
diff --git a/recipes/gnome/gnome-panel_2.26.0.bb b/recipes/gnome/gnome-panel_2.26.0.bb
index 27bd444951..24c22ae230 100644
--- a/recipes/gnome/gnome-panel_2.26.0.bb
+++ b/recipes/gnome/gnome-panel_2.26.0.bb
@@ -22,9 +22,5 @@ EXTRA_OECONF = "--disable-scrollkeeper \
                 --disable-eds \
                "
 
-do_stage() {
-        autotools_stage_all
-}
-
 SRC_URI[archive.md5sum] = "27965de9b12952b22b7e232af6acb0de"
 SRC_URI[archive.sha256sum] = "e8e21b008d4afcebfc3241d0f91dd2dcc0b171b16f5675fc1b7ed699e79b56f3"
diff --git a/recipes/gnome/gnome-panel_2.28.0.bb b/recipes/gnome/gnome-panel_2.28.0.bb
index d925394dc1..49e9575a2f 100644
--- a/recipes/gnome/gnome-panel_2.28.0.bb
+++ b/recipes/gnome/gnome-panel_2.28.0.bb
@@ -3,7 +3,7 @@ LICENSE = "GPL"
 SECTION = "x11/gnome"
 DEPENDS = "gconf librsvg libgweather startup-notification libwnck orbit2 gtk+ libbonoboui libglade libgnome libgnomeui gnome-desktop libglade gnome-menus orbit2-native"
 
-PR = "r1"
+PR = "r2"
 
 inherit gnome pkgconfig
 
@@ -19,10 +19,6 @@ do_configure_prepend() {
         sed -i -e s:help:: ${S}/Makefile.am
 }
 
-do_stage() {
-        autotools_stage_all
-}
-
 pkg_postinst_append () {
 	gconftool-2 --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults \
 		--direct --load /etc/gconf/schemas/panel-default-setup.entries
diff --git a/recipes/gnome/gnome-python-desktop_2.23.0.bb b/recipes/gnome/gnome-python-desktop_2.23.0.bb
index 5b2a9d9fc2..164b3d8ebc 100644
--- a/recipes/gnome/gnome-python-desktop_2.23.0.bb
+++ b/recipes/gnome/gnome-python-desktop_2.23.0.bb
@@ -1,7 +1,7 @@
 LICENSE = "GPL/LGPL"
 DEPENDS = "librsvg libwnck totem-pl-parser libgtop gnome-panel gnome-desktop eds-dbus python-pygtk gnome-python libgnomeprint libgnomeprintui"
 
-PR = "r4"
+PR = "r5"
 
 inherit gnome distutils-base
 
@@ -20,11 +20,6 @@ do_configure_prepend() {
 	${S}/configure.ac
 }	
 
-AUTOTOOLS_STAGE_PKGCONFIG = "1"
-do_stage() {
-	autotools_stage_all
-}	
-
 FILES_${PN}-dev += "${datadir}/pygtk"
 
 SRC_URI[archive.md5sum] = "d8f8e61d99402e8b0a82d3c8d6e873be"
diff --git a/recipes/gnome/gnome-python-desktop_2.26.0.bb b/recipes/gnome/gnome-python-desktop_2.26.0.bb
index c4c3a98750..4b963ae2c9 100644
--- a/recipes/gnome/gnome-python-desktop_2.26.0.bb
+++ b/recipes/gnome/gnome-python-desktop_2.26.0.bb
@@ -1,7 +1,7 @@
 LICENSE = "GPL/LGPL"
 DEPENDS = "librsvg libwnck totem-pl-parser libgtop gnome-panel gnome-desktop eds-dbus python-pygtk gnome-python libgnomeprint libgnomeprintui"
 
-PR = "r4"
+PR = "r5"
 
 inherit gnome distutils-base
 
@@ -20,11 +20,6 @@ do_configure_prepend() {
 	${S}/configure.ac
 }	
 
-AUTOTOOLS_STAGE_PKGCONFIG = "1"
-do_stage() {
-	autotools_stage_all
-}	
-
 FILES_${PN}-dev += "${datadir}/pygtk"
 
 SRC_URI[archive.md5sum] = "fbcf4ef5ec4a8c4eec4d390c5889c80f"
diff --git a/recipes/gnome/gnome-python-extras_2.19.1.bb b/recipes/gnome/gnome-python-extras_2.19.1.bb
index 4efa7c2fab..d7f42678bd 100644
--- a/recipes/gnome/gnome-python-extras_2.19.1.bb
+++ b/recipes/gnome/gnome-python-extras_2.19.1.bb
@@ -1,7 +1,7 @@
 LICENSE = "GPL/LGPL"
 DEPENDS = "python-pygtk libwnck"
 
-PR = "r1"
+PR = "r2"
 
 inherit gnome distutils-base
 
@@ -15,11 +15,6 @@ do_configure_prepend() {
 	sed -i -e s:'`$PKG_CONFIG --variable=defsdir pygtk-2.0`':\"${STAGING_DATADIR}/pygtk/2.0/defs\":g ${S}/configure.ac
 }	
 
-AUTOTOOLS_STAGE_PKGCONFIG = "1"
-do_stage() {
-	autotools_stage_all
-}	
-
 FILES_${PN}-dev += "${datadir}/pygtk"
 
 SRC_URI[archive.md5sum] = "08896c63d71ce44d20fafbaf9c0edc78"
diff --git a/recipes/gnome/goffice_0.6.2.bb b/recipes/gnome/goffice_0.6.2.bb
index 747190fbba..8714bbeb48 100644
--- a/recipes/gnome/goffice_0.6.2.bb
+++ b/recipes/gnome/goffice_0.6.2.bb
@@ -1,6 +1,7 @@
 DESCRIPTION="Gnome Office Library"
 LICENSE="GPLv2"
-PR ="r1"
+
+PR ="r2"
 
 DEFAULT_PREFERENCE = "-1"
 
@@ -10,11 +11,6 @@ FILES_${PN}-dbg += "${libdir}/goffice/${PV}/plugins/*/.debug"
 
 inherit gnome pkgconfig
 
-do_stage() {
-        gnome_stage_includes
-	oe_libinstall -so -C goffice libgoffice-0.6 ${STAGING_LIBDIR}
-}
-
 PACKAGES_DYNAMIC = "goffice-plugin-*"
 
 python populate_packages_prepend () {
@@ -23,6 +19,5 @@ python populate_packages_prepend () {
         do_split_packages(d, goffice_libdir, '(.*)', 'goffice-plugin-%s', 'Goffice plugin for %s', allow_dirs=True)
 }
 
-
 SRC_URI[archive.md5sum] = "f52d78cffbcfc3c13336fd308ea3926e"
 SRC_URI[archive.sha256sum] = "b126902259875a24ece29bdf1f93cc7fd4fd7b83508cae1c15dabd10b4d537cd"
diff --git a/recipes/gnome/libgnome_2.10.1.bb b/recipes/gnome/libgnome_2.10.1.bb
index 95a0b39fec..e38c82c9c4 100644
--- a/recipes/gnome/libgnome_2.10.1.bb
+++ b/recipes/gnome/libgnome_2.10.1.bb
@@ -1,7 +1,8 @@
 DESCRIPTION = "Gnome application programming libraries"
 LICENSE = "GPL"
 SECTION = "x11/gnome/libs"
-PR = "r1"
+
+PR = "r2"
 
 inherit gnome
 
@@ -9,10 +10,5 @@ DEPENDS = "gconf-native gnome-vfs libbonobo"
 
 EXTRA_OECONF = "--disable-gtk-doc"
 
-do_stage() {
-	oe_libinstall -C libgnome -a -so libgnome-2 ${STAGING_LIBDIR}
-	gnome_stage_includes
-}
-
 SRC_URI[archive.md5sum] = "dfb1a9b5fd25da8680a166c83ce0b6a8"
 SRC_URI[archive.sha256sum] = "9cf2d20f528470b2fc7995aea314c5898fad654fde265880002de0669b869c27"
diff --git a/recipes/gnome/libgnome_2.6.1.1.bb b/recipes/gnome/libgnome_2.6.1.1.bb
index 5f800f1b8a..ca23ba1164 100644
--- a/recipes/gnome/libgnome_2.6.1.1.bb
+++ b/recipes/gnome/libgnome_2.6.1.1.bb
@@ -1,6 +1,7 @@
 LICENSE = "GPL"
 SECTION = "x11/gnome/libs"
-PR = "r1"
+
+PR = "r2"
 
 inherit gnome
 
@@ -10,10 +11,5 @@ DEPENDS = "gnome-vfs libbonobo"
 
 EXTRA_OECONF = "--disable-gtk-doc"
 
-do_stage() {
-	oe_libinstall -C libgnome -a -so libgnome-2 ${STAGING_LIBDIR}
-	gnome_stage_includes
-}
-
 SRC_URI[archive.md5sum] = "8fb8d073987cb4c5d9bfe577550d11c2"
 SRC_URI[archive.sha256sum] = "eda475bdbc875fcb2c0b53acdb6de0f403bafc7941dd42f076353366d4f348b2"
diff --git a/recipes/gnome/libgnomecanvas_2.10.2.bb b/recipes/gnome/libgnomecanvas_2.10.2.bb
index 47fc46ef44..8a7e56ca73 100644
--- a/recipes/gnome/libgnomecanvas_2.10.2.bb
+++ b/recipes/gnome/libgnomecanvas_2.10.2.bb
@@ -1,6 +1,8 @@
 LICENSE = "GPL"
 SECTION = "x11/gnome/libs"
-PR = "r2"
+
+PR = "r3"
+
 DESCRIPTION = "A powerful object-oriented display"
 inherit gnome
 
@@ -11,10 +13,5 @@ EXTRA_OECONF = "--disable-gtk-doc"
 FILES_${PN} += "${libdir}/libglade/*/libcanvas.so"
 FILES_${PN}-dbg += "${libdir}/libglade/*/.debug/libcanvas.so"
 
-do_stage() {
-	gnome_stage_includes
-	oe_libinstall -C libgnomecanvas -a -so libgnomecanvas-2 ${STAGING_LIBDIR}
-}
-
 SRC_URI[archive.md5sum] = "976eada7b499ae6e74966f8888c015d1"
 SRC_URI[archive.sha256sum] = "82e7700a83aa203afc0c8903642546945b66472c66950cfc443f807b629ecc5a"
diff --git a/recipes/gnome/libgnomecanvas_2.12.0.bb b/recipes/gnome/libgnomecanvas_2.12.0.bb
index 20d46c39fe..81a7ddb52f 100644
--- a/recipes/gnome/libgnomecanvas_2.12.0.bb
+++ b/recipes/gnome/libgnomecanvas_2.12.0.bb
@@ -1,6 +1,8 @@
 LICENSE = "GPL"
 SECTION = "x11/gnome/libs"
-PR = "r2"
+
+PR = "r3"
+
 DESCRIPTION = "A powerful object-oriented display"
 inherit gnome
 
@@ -11,10 +13,5 @@ EXTRA_OECONF = "--disable-gtk-doc"
 FILES_${PN} += "${libdir}/libglade/*/libcanvas.so"
 FILES_${PN}-dbg += "${libdir}/libglade/*/.debug/libcanvas.so"
 
-do_stage() {
-	gnome_stage_includes
-	oe_libinstall -C libgnomecanvas -a -so libgnomecanvas-2 ${STAGING_LIBDIR}
-}
-
 SRC_URI[archive.md5sum] = "62c0edd3d27803d341662fd9088b2d9b"
 SRC_URI[archive.sha256sum] = "77c57dab746a312cd188ce9fcf91bb99b9a7e06d164f438530d65d018afd35da"
diff --git a/recipes/gnome/libgnomecanvas_2.6.1.1.bb b/recipes/gnome/libgnomecanvas_2.6.1.1.bb
index 315fc3219e..6fe45164dd 100644
--- a/recipes/gnome/libgnomecanvas_2.6.1.1.bb
+++ b/recipes/gnome/libgnomecanvas_2.6.1.1.bb
@@ -1,6 +1,8 @@
 LICENSE = "GPL"
 SECTION = "x11/gnome/libs"
-PR = "r1"
+
+PR = "r2"
+
 DESCRIPTION = "A powerful object-oriented display"
 inherit gnome
 
@@ -10,10 +12,5 @@ EXTRA_OECONF = "--disable-gtk-doc"
 
 FILES_${PN} += "${libdir}/libglade/*/libcanvas.so"
 
-do_stage() {
-	gnome_stage_includes
-	oe_libinstall -C libgnomecanvas -a -so libgnomecanvas-2 ${STAGING_LIBDIR}
-}
-
 SRC_URI[archive.md5sum] = "040257b0231fd5fc507f731d73d9738b"
 SRC_URI[archive.sha256sum] = "fd117570a94e527f76241bc54d2dd53cbea5e17455f5795b5e52afee25eccaca"
diff --git a/recipes/gnome/libgnomeprint_2.6.2.bb b/recipes/gnome/libgnomeprint_2.6.2.bb
index fa6f30f70b..0aee074d2d 100644
--- a/recipes/gnome/libgnomeprint_2.6.2.bb
+++ b/recipes/gnome/libgnomeprint_2.6.2.bb
@@ -1,16 +1,11 @@
 LICENSE = "GPL"
 SECTION = "x11/gnome/libs"
-PR = "r1"
+
+PR = "r2"
 
 DEPENDS = "libxml2 glib-2.0 pango libart-lgpl fontconfig popt gnome-common"
 
 inherit flow-lossage pkgconfig gnome
 
-do_stage() {
-	install -d ${STAGING_LIBDIR}
-	oe_libinstall -so -a -C libgnomeprint libgnomeprint-2-2 ${STAGING_LIBDIR}
-	gnome_stage_includes
-}
-
 SRC_URI[archive.md5sum] = "f742bb321fab833b67270f7b86af0fdb"
 SRC_URI[archive.sha256sum] = "4c8c61d56cded77108d74467a4312e7b9d3bb5236fd1e09f6c3b1205ef5d3d32"
diff --git a/recipes/gnome/libgnomeprint_2.8.2.bb b/recipes/gnome/libgnomeprint_2.8.2.bb
index 7bfae9c58d..2a3d2843c2 100644
--- a/recipes/gnome/libgnomeprint_2.8.2.bb
+++ b/recipes/gnome/libgnomeprint_2.8.2.bb
@@ -1,6 +1,7 @@
 LICENSE = "GPL"
 SECTION = "x11/gnome/libs"
-PR = "r2"
+
+PR = "r3"
 
 DEPENDS = "libxml2 libgnomecups glib-2.0 pango libart-lgpl fontconfig popt gnome-common"
 
@@ -9,11 +10,5 @@ inherit flow-lossage pkgconfig gnome
 FILES_${PN}-dbg += "${libdir}/libgnomeprint/2.8.2/modules/transports/.debug \
 		    ${libdir}/libgnomeprint/2.8.2/modules/.debug"
 
-do_stage() {
-	install -d ${STAGING_LIBDIR}
-	oe_libinstall -so -a -C libgnomeprint libgnomeprint-2-2 ${STAGING_LIBDIR}
-	gnome_stage_includes
-}
-
 SRC_URI[archive.md5sum] = "8361c4e1bc3d87b91435807d0c06a3e4"
 SRC_URI[archive.sha256sum] = "155ea46d59a2f366f8c72f97ed3e2f64f6afd259f1049f1d6da93f64ed503389"
diff --git a/recipes/gnome/libgnomeprintui_2.6.2.bb b/recipes/gnome/libgnomeprintui_2.6.2.bb
index 7e448c7555..a1a1566813 100644
--- a/recipes/gnome/libgnomeprintui_2.6.2.bb
+++ b/recipes/gnome/libgnomeprintui_2.6.2.bb
@@ -1,17 +1,13 @@
 LICENSE = "GPL"
 SECTION = "x11/gnome/libs"
-PR = "r1"
+
+PR = "r2"
+
 DEPENDS = "libgnomeprint gtk+ libgnomecanvas gnome-icon-theme gnome-common"
 
 inherit gnome pkgconfig
 
 SRC_URI += "file://configure.patch;patch=1"
 
-do_stage() {
-	install -d ${STAGING_LIBDIR}
-	oe_libinstall -so -a -C libgnomeprintui libgnomeprintui-2-2 ${STAGING_LIBDIR}
-	gnome_stage_includes
-}
-
 SRC_URI[archive.md5sum] = "b26f7f70eb67fe29f20f6312d4f3085e"
 SRC_URI[archive.sha256sum] = "7869603bbda88f35652d9b70af178836ca7612119ab36084ccc35f2d51c83f13"
diff --git a/recipes/gnome/libgnomeprintui_2.8.2.bb b/recipes/gnome/libgnomeprintui_2.8.2.bb
index fa9f0db66b..2540ceaef7 100644
--- a/recipes/gnome/libgnomeprintui_2.8.2.bb
+++ b/recipes/gnome/libgnomeprintui_2.8.2.bb
@@ -1,17 +1,13 @@
 LICENSE = "GPL"
 SECTION = "x11/gnome/libs"
-PR = "r1"
+
+PR = "r2"
+
 DEPENDS = "libgnomeprint gtk+ libgnomecanvas gnome-icon-theme gnome-common"
 
 inherit gnome pkgconfig
 
 SRC_URI += "file://configure.patch;patch=1"
 
-do_stage() {
-	install -d ${STAGING_LIBDIR}
-	oe_libinstall -so -a -C libgnomeprintui libgnomeprintui-2-2 ${STAGING_LIBDIR}
-	gnome_stage_includes
-}
-
 SRC_URI[archive.md5sum] = "b38d1f6813dd52879ba4174ddc3f1b1c"
 SRC_URI[archive.sha256sum] = "5c4ba52ca52cdb2d89e2fb7a638891ded38e844c08dd992e482f0793cfbc71c7"
diff --git a/recipes/gnome/libgnomeui_2.6.1.1.bb b/recipes/gnome/libgnomeui_2.6.1.1.bb
index 73d1a41f6e..921554b8fb 100644
--- a/recipes/gnome/libgnomeui_2.6.1.1.bb
+++ b/recipes/gnome/libgnomeui_2.6.1.1.bb
@@ -1,6 +1,8 @@
 LICENSE = "GPL"
 SECTION = "x11/gnome/libs"
-PR = "r1"
+
+PR = "r2"
+
 DEPENDS = "libgnome libgnomecanvas libbonoboui gnome-keyring"
 DESCRIPTION = "GNOME User Interface Library"
 
@@ -17,10 +19,5 @@ do_configure_prepend() {
 	install -m 0644 ${WORKDIR}/gnome-stock-pixbufs.h ${S}/libgnomeui/pixmaps/gnome-stock-pixbufs.h
 }
 
-do_stage() {
-	gnome_stage_includes
-	oe_libinstall -C libgnomeui -a -so libgnomeui-2 ${STAGING_LIBDIR}
-}
-
 SRC_URI[archive.md5sum] = "16e6717b5d7da982db00fea6167188ef"
 SRC_URI[archive.sha256sum] = "0c6c91a59e411d196fe56c814bd368224b04e11a341a8ad552398035e8f19d93"
diff --git a/recipes/gnome/libunique_1.0.8.bb b/recipes/gnome/libunique_1.0.8.bb
index a7bc838230..9181238938 100644
--- a/recipes/gnome/libunique_1.0.8.bb
+++ b/recipes/gnome/libunique_1.0.8.bb
@@ -1,7 +1,7 @@
 LICENSE = "LGPL"
 SECTION = "x11/gnome"
 
-inherit autotools_stage gnome lib_package
+inherit gnome lib_package
 
 DEPENDS = "gtk+ dbus"
 
diff --git a/recipes/gnome/libunique_1.1.2.bb b/recipes/gnome/libunique_1.1.2.bb
index ec76b2735d..8ffd695210 100644
--- a/recipes/gnome/libunique_1.1.2.bb
+++ b/recipes/gnome/libunique_1.1.2.bb
@@ -1,7 +1,7 @@
 LICENSE = "LGPL"
 SECTION = "x11/gnome"
 
-inherit autotools_stage gnome lib_package
+inherit gnome lib_package
 
 DEPENDS = "gtk+ dbus"
 
diff --git a/recipes/gnome/libunique_1.1.6.bb b/recipes/gnome/libunique_1.1.6.bb
index 9f5b19fa6f..6077a6601a 100644
--- a/recipes/gnome/libunique_1.1.6.bb
+++ b/recipes/gnome/libunique_1.1.6.bb
@@ -1,7 +1,7 @@
 LICENSE = "LGPL"
 SECTION = "x11/gnome"
 
-inherit autotools_stage gnome lib_package
+inherit gnome lib_package
 
 SRC_URI[archive.md5sum] = "7955769ef31f1bc4f83446dbb3625e6d"
 SRC_URI[archive.sha256sum] = "e5c8041cef8e33c55732f06a292381cb345db946cf792a4ae18aa5c66cdd4fbb"