Remove useless doc USE flag (bug #447938), fix nautilus-2 build with ld.gold, update license, switch to global introspection flag. Drop old.

(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

13 files changed, 45 insertions, 601 deletions

diff --git a/gnome-base/nautilus/ChangeLog b/gnome-base/nautilus/ChangeLog
index 6960ef492d84..cc252910efba 100644
--- a/gnome-base/nautilus/ChangeLog
+++ b/gnome-base/nautilus/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for gnome-base/nautilus
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.399 2012/07/15 17:31:31 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.400 2012/12/20 16:27:56 tetromino Exp $
+
+  20 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -nautilus-2.32.2.1.ebuild, -nautilus-2.32.2.1-r1.ebuild,
+  nautilus-2.32.2.1-r2.ebuild, +files/nautilus-2.32.2.1-gold-glib2.32.patch,
+  -nautilus-3.2.1.ebuild, -nautilus-3.2.1-r1.ebuild,
+  -files/nautilus-3.2.1-autostart-only-show-in.patch,
+  -files/nautilus-3.2.1-gold-glib2.32.patch, -nautilus-3.4.1.ebuild,
+  -files/nautilus-3.4.1-gmount-double-unref.patch, nautilus-3.4.2.ebuild,
+  metadata.xml:
+  Remove useless doc USE flag (bug #447938), fix nautilus-2 build with ld.gold,
+  update license, switch to global introspection flag. Drop old.
 
   15 Jul 2012; Raúl Porcel <armin76@gentoo.org> nautilus-2.32.2.1-r2.ebuild:
   alpha/ia64/sh/sparc stable wrt #410611
diff --git a/gnome-base/nautilus/files/nautilus-2.32.2.1-gold-glib2.32.patch b/gnome-base/nautilus/files/nautilus-2.32.2.1-gold-glib2.32.patch
new file mode 100644
index 000000000000..86c66ec7604f
--- /dev/null
+++ b/gnome-base/nautilus/files/nautilus-2.32.2.1-gold-glib2.32.patch
@@ -0,0 +1,13 @@
+diff --git a/configure.in b/configure.in
+index 97e171e..4cf7827 100644
+--- a/configure.in
++++ b/configure.in
+@@ -336,7 +336,7 @@ LIBNAUTILUS_EXTENSION_LIBS="`$PKG_CONFIG --libs $LIBNAUTILUS_EXTENSION_MODULES`"
+ AC_SUBST(LIBNAUTILUS_EXTENSION_LIBS)
+ 
+ dnl core nautilus
+-CORE_MODULES="glib-2.0 gnome-desktop-2.0 gthread-2.0 gio-2.0 gio-unix-2.0 unique-1.0 gail gconf-2.0 libxml-2.0 $EXTRA_CORE_MODULES"
++CORE_MODULES="glib-2.0 gnome-desktop-2.0 gthread-2.0 gmodule-no-export-2.0 gio-2.0 gio-unix-2.0 unique-1.0 gail gconf-2.0 libxml-2.0 $EXTRA_CORE_MODULES"
+ CORE_CFLAGS="`$PKG_CONFIG --cflags $CORE_MODULES` $x_cflags"
+ AC_SUBST(CORE_CFLAGS)
+ CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $x_libs"
diff --git a/gnome-base/nautilus/files/nautilus-3.2.1-autostart-only-show-in.patch b/gnome-base/nautilus/files/nautilus-3.2.1-autostart-only-show-in.patch
deleted file mode 100644
index efc56ef1e7e9..000000000000
--- a/gnome-base/nautilus/files/nautilus-3.2.1-autostart-only-show-in.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 0d64367e9abb67329133b2e05cb63309479b7f24 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Wed, 14 Dec 2011 16:34:46 -0500
-Subject: [PATCH] Autostart only in GNOME and Unity
-
-We do not want to autostart and manage the desktop in DEs that use other
-applications for managing the desktop.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=666218
----
- data/nautilus-autostart.desktop.in |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/data/nautilus-autostart.desktop.in b/data/nautilus-autostart.desktop.in
-index f105b7b..7252f87 100644
---- a/data/nautilus-autostart.desktop.in
-+++ b/data/nautilus-autostart.desktop.in
-@@ -2,4 +2,5 @@
- Type=Application
- Name=Files
- Exec=nautilus -n
-+OnlyShowIn=GNOME;Unity;
- AutostartCondition=GSettings org.gnome.desktop.background show-desktop-icons
--- 
-1.7.8
-
diff --git a/gnome-base/nautilus/files/nautilus-3.2.1-gold-glib2.32.patch b/gnome-base/nautilus/files/nautilus-3.2.1-gold-glib2.32.patch
deleted file mode 100644
index c185d1a222d9..000000000000
--- a/gnome-base/nautilus/files/nautilus-3.2.1-gold-glib2.32.patch
+++ /dev/null
@@ -1,15 +0,0 @@
- configure.in |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index 0a83bc9..2c9ebbc 100644
---- a/configure.in
-+++ b/configure.in
-@@ -313,6 +313,7 @@ AC_SUBST(COMMON_LIBS)
- dnl additional nautilus libs
- PKG_CHECK_MODULES(NAUTILUS, [
- 	gthread-2.0 >= glib_minver
-+	gmodule-no-export-2.0 >= glib_minver
- 	gio-2.0 >= glib_minver
- 	gio-unix-2.0 >= glib_minver
- 	gsettings-desktop-schemas
diff --git a/gnome-base/nautilus/files/nautilus-3.4.1-gmount-double-unref.patch b/gnome-base/nautilus/files/nautilus-3.4.1-gmount-double-unref.patch
deleted file mode 100644
index 6f3268ab178c..000000000000
--- a/gnome-base/nautilus/files/nautilus-3.4.1-gmount-double-unref.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 4e59e4cfc7bc68534664d9f72d0c7ea680b79db3 Mon Sep 17 00:00:00 2001
-From: Cosimo Cecchi <cosimoc@gnome.org>
-Date: Fri, 4 May 2012 14:38:43 -0400
-Subject: [PATCH] places-sidebar: don't double unref GMount objects
-
-Fixes a lot of reported crashers with NFS/Samba volumes.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=674659
----
- src/nautilus-places-sidebar.c |    3 +--
- 1 files changed, 1 insertions(+), 2 deletions(-)
-
-diff --git a/src/nautilus-places-sidebar.c b/src/nautilus-places-sidebar.c
-index 61f3658..672a4b0 100644
---- a/src/nautilus-places-sidebar.c
-+++ b/src/nautilus-places-sidebar.c
-@@ -774,7 +774,7 @@ update_places (NautilusPlacesSidebar *sidebar)
- 		root = g_mount_get_default_location (mount);
- 
- 		if (!g_file_is_native (root)) {
--			network_mounts = g_list_prepend (network_mounts, g_object_ref (mount));
-+			network_mounts = g_list_prepend (network_mounts, mount);
- 			continue;
- 		}
- 
-@@ -856,7 +856,6 @@ update_places (NautilusPlacesSidebar *sidebar)
- 			   name, icon, mount_uri,
- 			   NULL, NULL, mount, 0, tooltip);
- 		g_object_unref (root);
--		g_object_unref (mount);
- 		g_object_unref (icon);
- 		g_free (name);
- 		g_free (mount_uri);
--- 
-1.7.8.6
-
diff --git a/gnome-base/nautilus/metadata.xml b/gnome-base/nautilus/metadata.xml
index 26994994a0f5..2442ab3cd9a5 100644
--- a/gnome-base/nautilus/metadata.xml
+++ b/gnome-base/nautilus/metadata.xml
@@ -3,8 +3,6 @@
 <pkgmetadata>
 <herd>gnome</herd>
 <use>
-	<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for
-		introspection</flag>
 	<flag name="packagekit">Use packagekit to search for programs to open
 		unknown file types</flag>
 	<flag name="previewer">Use <pkg>gnome-extra/sushi</pkg> to preview files
diff --git a/gnome-base/nautilus/nautilus-2.32.2.1-r1.ebuild b/gnome-base/nautilus/nautilus-2.32.2.1-r1.ebuild
deleted file mode 100644
index 8b035e711d44..000000000000
--- a/gnome-base/nautilus/nautilus-2.32.2.1-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.32.2.1-r1.ebuild,v 1.10 2012/05/05 05:38:08 jdhore Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-
-inherit eutils gnome2 virtualx
-
-DESCRIPTION="A file manager for the GNOME desktop"
-HOMEPAGE="http://live.gnome.org/Nautilus"
-
-SRC_URI="${SRC_URI} http://dev.gentoo.org/~pacho/gnome/${P}-patches.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux"
-IUSE="doc gnome +introspection xmp"
-
-RDEPEND=">=dev-libs/glib-2.28.0:2
-	>=gnome-base/gnome-desktop-2.29.91:2
-	>=x11-libs/pango-1.1.2
-	>=x11-libs/gtk+-2.22:2[introspection?]
-	>=dev-libs/libxml2-2.4.7:2
-	>=media-libs/libexif-0.5.12
-	>=gnome-base/gconf-2:2
-	dev-libs/libunique:1
-	gnome-base/dconf
-	x11-libs/libXext
-	x11-libs/libXrender
-	introspection? ( >=dev-libs/gobject-introspection-0.6.4 )
-	xmp? ( media-libs/exempi:2 )"
-
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5
-	sys-devel/gettext
-	virtual/pkgconfig
-	>=dev-util/intltool-0.40.1
-	doc? ( >=dev-util/gtk-doc-1.4 )"
-# For eautoreconf
-#	gnome-base/gnome-common
-#	dev-util/gtk-doc-am"
-
-PDEPEND="gnome? ( >=x11-themes/gnome-icon-theme-1.1.91 )
-	>=gnome-base/gvfs-0.1.2"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-update-mimedb
-		--disable-packagekit
-		$(use_enable introspection)
-		$(use_enable xmp)"
-	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README THANKS TODO"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Apply multiple upstream fixes
-	epatch "${WORKDIR}/${P}-patches"/*.patch
-
-	# Remove crazy CFLAGS
-	sed -i \
-		-e 's:-DG.*DISABLE_DEPRECATED::g' \
-		configure{,.in} eel/Makefile.{am,in} || die
-}
-
-src_test() {
-	addpredict "/root/.gnome2_private"
-	unset SESSION_MANAGER
-	unset ORBIT_SOCKETDIR
-	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check || die "Test phase failed"
-}
-
-src_install() {
-	gnome2_src_install
-	find "${ED}" -name "*.la" -delete || die "remove of la files failed"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	elog "nautilus can use gstreamer to preview audio files. Just make sure"
-	elog "to have the necessary plugins available to play the media type you"
-	elog "want to preview"
-}
diff --git a/gnome-base/nautilus/nautilus-2.32.2.1-r2.ebuild b/gnome-base/nautilus/nautilus-2.32.2.1-r2.ebuild
index 71eb1bc46cc3..1dba0db37c6c 100644
--- a/gnome-base/nautilus/nautilus-2.32.2.1-r2.ebuild
+++ b/gnome-base/nautilus/nautilus-2.32.2.1-r2.ebuild
@@ -1,21 +1,22 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.32.2.1-r2.ebuild,v 1.8 2012/07/15 17:31:31 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.32.2.1-r2.ebuild,v 1.9 2012/12/20 16:27:56 tetromino Exp $
 
-EAPI="3"
+EAPI="4"
 GCONF_DEBUG="no"
+GNOME_TARBALL_SUFFIX="bz2"
 
-inherit eutils gnome2 virtualx
+inherit autotools eutils gnome2 virtualx
 
 DESCRIPTION="A file manager for the GNOME desktop"
 HOMEPAGE="http://live.gnome.org/Nautilus"
 
 SRC_URI="${SRC_URI} http://dev.gentoo.org/~pacho/gnome/${P}-patches.tar.bz2"
 
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
+LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux"
-IUSE="doc gnome +introspection xmp"
+IUSE="gnome +introspection xmp"
 
 RDEPEND=">=dev-libs/glib-2.28.0:2
 	>=gnome-base/gnome-desktop-2.29.91:2
@@ -35,34 +36,30 @@ DEPEND="${RDEPEND}
 	>=dev-lang/perl-5
 	sys-devel/gettext
 	virtual/pkgconfig
-	>=dev-util/intltool-0.40.1
-	doc? ( >=dev-util/gtk-doc-1.4 )"
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.40.1"
 # For eautoreconf
 #	gnome-base/gnome-common
-#	dev-util/gtk-doc-am"
 
 PDEPEND="gnome? ( >=x11-themes/gnome-icon-theme-1.1.91 )
 	>=gnome-base/gvfs-0.1.2"
 
-pkg_setup() {
+src_prepare() {
 	G2CONF="${G2CONF}
 		--disable-update-mimedb
 		--disable-packagekit
 		$(use_enable introspection)
 		$(use_enable xmp)"
 	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README THANKS TODO"
-}
-
-src_prepare() {
-	gnome2_src_prepare
 
 	# Apply multiple upstream fixes
 	epatch "${WORKDIR}/${P}-patches"/*.patch
 
-	# Remove crazy CFLAGS
-	sed -i \
-		-e 's:-DG.*DISABLE_DEPRECATED::g' \
-		configure{,.in} eel/Makefile.{am,in} || die
+	# build failure with ld.gold, fixed in 3.4
+	epatch "${FILESDIR}/${P}-gold-glib2.32.patch"
+	eautoreconf
+
+	gnome2_src_prepare
 }
 
 src_test() {
diff --git a/gnome-base/nautilus/nautilus-2.32.2.1.ebuild b/gnome-base/nautilus/nautilus-2.32.2.1.ebuild
deleted file mode 100644
index 715a730c8e77..000000000000
--- a/gnome-base/nautilus/nautilus-2.32.2.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.32.2.1.ebuild,v 1.9 2012/05/05 05:38:08 jdhore Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-
-inherit eutils gnome2 virtualx
-
-DESCRIPTION="A file manager for the GNOME desktop"
-HOMEPAGE="http://live.gnome.org/Nautilus"
-
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux"
-IUSE="doc gnome +introspection xmp"
-
-RDEPEND=">=dev-libs/glib-2.25.9:2
-	>=gnome-base/gnome-desktop-2.29.91:2
-	>=x11-libs/pango-1.1.2
-	>=x11-libs/gtk+-2.22:2[introspection?]
-	>=dev-libs/libxml2-2.4.7:2
-	>=media-libs/libexif-0.5.12
-	>=gnome-base/gconf-2:2
-	dev-libs/libunique:1
-	x11-libs/libXext
-	x11-libs/libXrender
-	introspection? ( >=dev-libs/gobject-introspection-0.6.4 )
-	xmp? ( media-libs/exempi:2 )"
-
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5
-	sys-devel/gettext
-	virtual/pkgconfig
-	>=dev-util/intltool-0.40.1
-	doc? ( >=dev-util/gtk-doc-1.4 )"
-# For eautoreconf
-#	gnome-base/gnome-common
-#	dev-util/gtk-doc-am"
-
-PDEPEND="gnome? ( >=x11-themes/gnome-icon-theme-1.1.91 )
-	>=gnome-base/gvfs-0.1.2"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-update-mimedb
-		--disable-packagekit
-		$(use_enable introspection)
-		$(use_enable xmp)"
-	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README THANKS TODO"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Remove crazy CFLAGS
-	sed 's:-DG.*DISABLE_DEPRECATED::g' -i configure.in configure \
-		|| die "sed 1 failed"
-}
-
-src_test() {
-	addpredict "/root/.gnome2_private"
-	unset SESSION_MANAGER
-	unset ORBIT_SOCKETDIR
-	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check || die "Test phase failed"
-}
-
-src_install() {
-	gnome2_src_install
-	find "${ED}" -name "*.la" -delete || die "remove of la files failed"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	elog "nautilus can use gstreamer to preview audio files. Just make sure"
-	elog "to have the necessary plugins available to play the media type you"
-	elog "want to preview"
-}
diff --git a/gnome-base/nautilus/nautilus-3.2.1-r1.ebuild b/gnome-base/nautilus/nautilus-3.2.1-r1.ebuild
deleted file mode 100644
index 2b32a76b38c5..000000000000
--- a/gnome-base/nautilus/nautilus-3.2.1-r1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-3.2.1-r1.ebuild,v 1.4 2012/05/05 05:38:08 jdhore Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2 virtualx
-
-DESCRIPTION="A file manager for the GNOME desktop"
-HOMEPAGE="http://live.gnome.org/Nautilus"
-
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux"
-IUSE="doc exif gnome +introspection packagekit +previewer sendto tracker xmp"
-
-# Require {glib,gdbus-codegen}-2.30.0 due to GDBus API changes between 2.29.92
-# and 2.30.0
-COMMON_DEPEND=">=dev-libs/glib-2.30.0:2
-	>=x11-libs/pango-1.28.3
-	>=x11-libs/gtk+-3.1.6:3[introspection?]
-	>=dev-libs/libxml2-2.7.8:2
-	>=gnome-base/gnome-desktop-3.0.0:3
-
-	gnome-base/dconf
-	gnome-base/gsettings-desktop-schemas
-	>=x11-libs/libnotify-0.7
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender
-
-	exif? ( >=media-libs/libexif-0.6.20 )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.4 )
-	tracker? ( >=app-misc/tracker-0.12 )
-	xmp? ( >=media-libs/exempi-2.1.0 )"
-DEPEND="${COMMON_DEPEND}
-	>=dev-lang/perl-5
-	>=dev-util/gdbus-codegen-2.30.0
-	virtual/pkgconfig
-	>=dev-util/intltool-0.40.1
-	sys-devel/gettext
-	x11-proto/xproto
-	doc? ( >=dev-util/gtk-doc-1.4 )"
-RDEPEND="${COMMON_DEPEND}
-	packagekit? ( app-admin/packagekit-base )
-	sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 )"
-# For eautoreconf
-#	gnome-base/gnome-common
-#	dev-util/gtk-doc-am"
-PDEPEND="gnome? (
-		>=x11-themes/gnome-icon-theme-1.1.91
-		x11-themes/gnome-icon-theme-symbolic )
-	tracker? ( >=gnome-extra/nautilus-tracker-tags-0.12 )
-	previewer? ( >=gnome-extra/sushi-0.1.9 )
-	sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 )
-	>=gnome-base/gvfs-0.1.2"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-maintainer-mode
-		--disable-update-mimedb
-		$(use_enable exif libexif)
-		$(use_enable introspection)
-		$(use_enable packagekit)
-		$(use_enable sendto nst-extension)
-		$(use_enable tracker)
-		$(use_enable xmp)"
-	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README THANKS TODO"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Restore the nautilus-2.x Delete shortcut (Ctrl+Delete will still work);
-	# bug #393663
-	epatch "${FILESDIR}/${PN}-3.2.1-delete.patch"
-
-	# https://bugzilla.gnome.org/show_bug.cgi?id=664573
-	epatch "${FILESDIR}/${PN}-3.2.1-key-press-forwarding.patch"
-
-	# bug #394379, https://bugzilla.gnome.org/show_bug.cgi?id=666218
-	epatch "${FILESDIR}/${PN}-3.2.1-autostart-only-show-in.patch"
-
-	# Remove crazy CFLAGS
-	sed 's:-DG.*DISABLE_DEPRECATED::g' -i configure.in configure \
-		|| die "sed 1 failed"
-
-	# gold plus glib-2.32 #414121
-	epatch "${FILESDIR}/${P}-gold-glib2.32.patch"
-	AT_NOELIBTOOLIZE=yes eautoreconf
-}
-
-src_test() {
-	addpredict "/root/.gnome2_private"
-	unset SESSION_MANAGER
-	unset ORBIT_SOCKETDIR
-	unset DBUS_SESSION_BUS_ADDRESS
-	export GSETTINGS_BACKEND="memory"
-	Xemake check
-	unset GSETTINGS_BACKEND
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if use previewer; then
-		elog "nautilus uses gnome-extra/sushi to preview media files."
-		elog "To activate the previewer, select a file and press space; to"
-		elog "close the previewer, press space again."
-	else
-		elog "To preview media files, emerge nautilus with USE=previewer"
-	fi
-}
diff --git a/gnome-base/nautilus/nautilus-3.2.1.ebuild b/gnome-base/nautilus/nautilus-3.2.1.ebuild
deleted file mode 100644
index d020b03d8749..000000000000
--- a/gnome-base/nautilus/nautilus-3.2.1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-3.2.1.ebuild,v 1.2 2012/05/05 05:38:08 jdhore Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 virtualx
-
-DESCRIPTION="A file manager for the GNOME desktop"
-HOMEPAGE="http://live.gnome.org/Nautilus"
-
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux"
-IUSE="doc exif gnome +introspection packagekit +previewer sendto tracker xmp"
-
-# Require {glib,gdbus-codegen}-2.30.0 due to GDBus API changes between 2.29.92
-# and 2.30.0
-COMMON_DEPEND=">=dev-libs/glib-2.30.0:2
-	>=x11-libs/pango-1.28.3
-	>=x11-libs/gtk+-3.1.6:3[introspection?]
-	>=dev-libs/libxml2-2.7.8:2
-	>=gnome-base/gnome-desktop-3.0.0:3
-
-	gnome-base/dconf
-	gnome-base/gsettings-desktop-schemas
-	>=x11-libs/libnotify-0.7
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender
-
-	exif? ( >=media-libs/libexif-0.6.20 )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.4 )
-	tracker? ( >=app-misc/tracker-0.12 )
-	xmp? ( >=media-libs/exempi-2.1.0 )"
-DEPEND="${COMMON_DEPEND}
-	>=dev-lang/perl-5
-	>=dev-util/gdbus-codegen-2.30.0
-	virtual/pkgconfig
-	>=dev-util/intltool-0.40.1
-	sys-devel/gettext
-	x11-proto/xproto
-	doc? ( >=dev-util/gtk-doc-1.4 )"
-RDEPEND="${COMMON_DEPEND}
-	packagekit? ( app-admin/packagekit-base )
-	sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 )"
-# For eautoreconf
-#	gnome-base/gnome-common
-#	dev-util/gtk-doc-am"
-PDEPEND="gnome? (
-		>=x11-themes/gnome-icon-theme-1.1.91
-		x11-themes/gnome-icon-theme-symbolic )
-	tracker? ( >=gnome-extra/nautilus-tracker-tags-0.12 )
-	previewer? ( >=gnome-extra/sushi-0.1.9 )
-	sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 )
-	>=gnome-base/gvfs-0.1.2"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-maintainer-mode
-		--disable-update-mimedb
-		$(use_enable exif libexif)
-		$(use_enable introspection)
-		$(use_enable packagekit)
-		$(use_enable sendto nst-extension)
-		$(use_enable tracker)
-		$(use_enable xmp)"
-	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README THANKS TODO"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Remove crazy CFLAGS
-	sed 's:-DG.*DISABLE_DEPRECATED::g' -i configure.in configure \
-		|| die "sed 1 failed"
-}
-
-src_test() {
-	addpredict "/root/.gnome2_private"
-	unset SESSION_MANAGER
-	unset ORBIT_SOCKETDIR
-	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check || die "Test phase failed"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if use previewer; then
-		elog "nautilus uses gnome-extra/sushi to preview media files."
-		elog "To activate the previewer, select a file and press space; to"
-		elog "close the previewer, press space again."
-	else
-		elog "To preview media files, emerge nautilus with USE=previewer"
-	fi
-}
diff --git a/gnome-base/nautilus/nautilus-3.4.1.ebuild b/gnome-base/nautilus/nautilus-3.4.1.ebuild
deleted file mode 100644
index e9f3ee884d23..000000000000
--- a/gnome-base/nautilus/nautilus-3.4.1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-3.4.1.ebuild,v 1.1 2012/05/07 08:05:12 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils gnome2 virtualx
-
-DESCRIPTION="A file manager for the GNOME desktop"
-HOMEPAGE="http://live.gnome.org/Nautilus"
-
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux"
-IUSE="doc exif gnome +introspection packagekit +previewer sendto tracker xmp"
-
-# Require {glib,gdbus-codegen}-2.30.0 due to GDBus API changes between 2.29.92
-# and 2.30.0
-COMMON_DEPEND=">=dev-libs/glib-2.31.9:2
-	>=x11-libs/pango-1.28.3
-	>=x11-libs/gtk+-3.3.17:3[introspection?]
-	>=dev-libs/libxml2-2.7.8:2
-	>=gnome-base/gnome-desktop-3.0.0:3
-
-	gnome-base/dconf
-	gnome-base/gsettings-desktop-schemas
-	>=x11-libs/libnotify-0.7
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender
-
-	exif? ( >=media-libs/libexif-0.6.20 )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.4 )
-	tracker? ( >=app-misc/tracker-0.12 )
-	xmp? ( >=media-libs/exempi-2.1.0 )"
-DEPEND="${COMMON_DEPEND}
-	>=dev-lang/perl-5
-	>=dev-util/gdbus-codegen-2.31.0
-	>=dev-util/intltool-0.40.1
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-proto/xproto
-	doc? ( >=dev-util/gtk-doc-1.4 )"
-RDEPEND="${COMMON_DEPEND}
-	packagekit? ( app-admin/packagekit-base )
-	sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 )"
-# For eautoreconf
-#	gnome-base/gnome-common
-#	dev-util/gtk-doc-am"
-PDEPEND="gnome? (
-		>=x11-themes/gnome-icon-theme-1.1.91
-		x11-themes/gnome-icon-theme-symbolic )
-	tracker? ( >=gnome-extra/nautilus-tracker-tags-0.12 )
-	previewer? ( >=gnome-extra/sushi-0.1.9 )
-	sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 )
-	>=gnome-base/gvfs-0.1.2"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-update-mimedb
-		$(use_enable exif libexif)
-		$(use_enable introspection)
-		$(use_enable packagekit)
-		$(use_enable sendto nst-extension)
-		$(use_enable tracker)
-		$(use_enable xmp)"
-	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README THANKS TODO"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Restore the nautilus-2.x Delete shortcut (Ctrl+Delete will still work);
-	# bug #393663
-	epatch "${FILESDIR}/${PN}-3.2.1-delete.patch"
-
-	# https://bugzilla.gnome.org/show_bug.cgi?id=664573
-	epatch "${FILESDIR}/${PN}-3.2.1-key-press-forwarding.patch"
-
-	# In next release
-	epatch "${FILESDIR}/${P}-gmount-double-unref.patch"
-
-	# Remove crazy CFLAGS
-	sed 's:-DG.*DISABLE_DEPRECATED::g' -i configure.in configure \
-		|| die "sed 1 failed"
-}
-
-src_test() {
-	addpredict "/root/.gnome2_private"
-	unset SESSION_MANAGER
-	unset ORBIT_SOCKETDIR
-	unset DBUS_SESSION_BUS_ADDRESS
-	export GSETTINGS_BACKEND="memory"
-	Xemake check
-	unset GSETTINGS_BACKEND
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if use previewer; then
-		elog "nautilus uses gnome-extra/sushi to preview media files."
-		elog "To activate the previewer, select a file and press space; to"
-		elog "close the previewer, press space again."
-	else
-		elog "To preview media files, emerge nautilus with USE=previewer"
-	fi
-}
diff --git a/gnome-base/nautilus/nautilus-3.4.2.ebuild b/gnome-base/nautilus/nautilus-3.4.2.ebuild
index d01b6cf436c0..97ea8f5dd5c0 100644
--- a/gnome-base/nautilus/nautilus-3.4.2.ebuild
+++ b/gnome-base/nautilus/nautilus-3.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-3.4.2.ebuild,v 1.1 2012/05/20 10:57:43 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-3.4.2.ebuild,v 1.2 2012/12/20 16:27:56 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -11,7 +11,7 @@ inherit eutils gnome2 virtualx
 DESCRIPTION="A file manager for the GNOME desktop"
 HOMEPAGE="http://live.gnome.org/Nautilus"
 
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
+LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux"
 IUSE="doc exif gnome +introspection packagekit +previewer sendto tracker xmp"
@@ -38,17 +38,16 @@ COMMON_DEPEND=">=dev-libs/glib-2.31.9:2
 DEPEND="${COMMON_DEPEND}
 	>=dev-lang/perl-5
 	>=dev-util/gdbus-codegen-2.31.0
+	dev-util/gtk-doc-am
 	>=dev-util/intltool-0.40.1
 	sys-devel/gettext
 	virtual/pkgconfig
-	x11-proto/xproto
-	doc? ( >=dev-util/gtk-doc-1.4 )"
+	x11-proto/xproto"
 RDEPEND="${COMMON_DEPEND}
 	packagekit? ( app-admin/packagekit-base )
 	sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 )"
 # For eautoreconf
 #	gnome-base/gnome-common
-#	dev-util/gtk-doc-am"
 PDEPEND="gnome? (
 		>=x11-themes/gnome-icon-theme-1.1.91
 		x11-themes/gnome-icon-theme-symbolic )
@@ -57,7 +56,7 @@ PDEPEND="gnome? (
 	sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 )
 	>=gnome-base/gvfs-0.1.2"
 
-pkg_setup() {
+src_prepare() {
 	G2CONF="${G2CONF}
 		--disable-update-mimedb
 		$(use_enable exif libexif)
@@ -67,10 +66,6 @@ pkg_setup() {
 		$(use_enable tracker)
 		$(use_enable xmp)"
 	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README THANKS TODO"
-}
-
-src_prepare() {
-	gnome2_src_prepare
 
 	# Restore the nautilus-2.x Delete shortcut (Ctrl+Delete will still work);
 	# bug #393663
@@ -79,9 +74,7 @@ src_prepare() {
 	# https://bugzilla.gnome.org/show_bug.cgi?id=664573
 	epatch "${FILESDIR}/${PN}-3.2.1-key-press-forwarding.patch"
 
-	# Remove crazy CFLAGS
-	sed 's:-DG.*DISABLE_DEPRECATED::g' -i configure.in configure \
-		|| die "sed 1 failed"
+	gnome2_src_prepare
 }
 
 src_test() {