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

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

14 files changed, 60 insertions, 621 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/Manifest b/gnome-base/nautilus/Manifest
index f581f53229a5..5e0dca087da3 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -1,29 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX nautilus-3.2.1-autostart-only-show-in.patch 849 SHA256 1eca642ae39f0a0fac2554882a9d5ab58c122545943b81a7755e11955e2f3026 SHA512 6c5fa8f46661bfbcd5ba99c684b1df668d4e633a809eaf6c52dd419b8d4d6827ac6b0eab1691075aa19b1a548bec58dec05221888808d6131c8a9a15c5948db7 WHIRLPOOL 6a5b9213fd038a9c2d13b869192b51775ce1b8cc433100ed555bfc8a63d7c18b2f78d03ffb792aa129038df2e6c25f71b7ab74dfa3ca4d9d2b7dc82b2ac80453
+AUX nautilus-2.32.2.1-gold-glib2.32.patch 698 SHA256 a9da048e66d4f326fbfa6b916dfb29e88a766b3c00e9da10df78a2e05d3382b1 SHA512 fe39cd441dbb38e13b9a0ee075b7a82b6681e77209d3386ab563adad3ddde9cf2642a98fcfa7584975388eb255578edeb138a56bede35f3c77bb50efd03bf7cb WHIRLPOOL 9ecab7b759cde6ab73b0409814f1570fcb442e893bc2b6d12f5a5241cd33457e28d1ccee05042fd2126c58e4889fa3fd86003d929a19e5194de5a23813995f6a
 AUX nautilus-3.2.1-delete.patch 1869 SHA256 51ebfb58d3b1217796dfa79386bdeade2255f879108963962c63124cbedb4fa0 SHA512 1230abdb73d3334dffffa0861b3bbaefdcf00773e66eb33877607bf38d73c314f56fd8a077d5918e640dff031f8ebc878b8c896535f6d806b44cb488586ee22f WHIRLPOOL 5430db3032027b4fcc8fb2765c935f18a354073e3028985069d0983ef2d011025dd5403edf695bb8c59899d0ee5cb5e46346f667816309dda8eb9d764b23fc7f
-AUX nautilus-3.2.1-gold-glib2.32.patch 437 SHA256 ea99b3b4af8ee0907ba7d3bb59a63204416ac85b9578d56566fd33b95235b9c1 SHA512 76e71b33609451d8bcedc8fd441c407e4f144eeea6111a98e189eb7ad440f40beebd8515debfc9216e26dc1405446c79037d3367f2982e49c4ce280281f7e4e2 WHIRLPOOL 7a5183d92bc16b4bad046147ca8a59fbc5c6f4142358496f66981466b4428d38197a1b04081d5781bf9aebc72af286078a40f75e220063166ef4cdf5e7a74257
 AUX nautilus-3.2.1-key-press-forwarding.patch 1716 SHA256 9222c08189e01a2bfb8a72d2d4c7dfd0d841e4d159f8045e2cf15cf7857aff05 SHA512 9b196e26cdeb704464ef38752140ee1127ac44be8f1503034aafe70e3a854c00a4b48cc3404a71cfc84658e0b82501f47b9cecc4e040d22d90eddf406e040c32 WHIRLPOOL ee0965bf75777aa30cec42d509d2137a3ff230833693e85e4c71e26c4838029ece56801af70330fb1c2f798e9ef915aa3b8d28d73b6a7944822a3eaa8aa6db7b
-AUX nautilus-3.4.1-gmount-double-unref.patch 1177 SHA256 b8ff50ac68915527811a7ed929fb1275a10b565a003c4a80d02325deea259d3c SHA512 9fe8aa3b2bab00f8a1771698831a3332d4f8b09a0b1019d2cdc5aaec9cfa907d6e03b8a474e785ce8470f79799255f7dde29cc8311cea24d79762c7e07d591df WHIRLPOOL b04939da3cb01b0d379d29d8910d4264b7ced65b395525ae262e514801672fb3c67e355eed8ae680f34cc77f2d2a9db594b024fdac0df0b0e8ca5b7860dff30c
 DIST nautilus-2.32.2.1-patches.tar.bz2 6984 SHA256 0b756ba661d1f9ed0d2e49a469e6f390e941530309e08a7f9e6ac07b566180bb SHA512 9c18c24001cc3cbf91242845f13bbe44160b85286ab82e29083e06905a0d278a5e9e554dc1e09445490fa723677d4beb080f2d23b934386b8de7704f8bb7e417 WHIRLPOOL d875e319a00288aa46d55c7edee5b1c53ff854ab41f73a4135a5f993e83f658da0b190d44d27fc9d4277de783f55e4e3f9ed3fede444b4b06384a8216a1d087b
 DIST nautilus-2.32.2.1.tar.bz2 6350203 SHA256 802dacc98c697afea2e6201dab1c8c800809f235fff39857983efb4340ecc303 SHA512 cb9d65d16c8d771d182bb94d9de59c4054b05603b8ad33beeca26b41c3ca3c84581b596625f6503924c4a26f5ca1218c6d1e81c9d94e6cc637a3e8a941cde9b4 WHIRLPOOL c98d2750f5b32896c67d1fc6060e1c288296a4a86142fa35eb261f8630fdd92ad974cf3bd66d3843f0073c7ec96081afd01063c4c2d10d70059efc58da9a2fa0
-DIST nautilus-3.2.1.tar.xz 4703588 SHA256 c482d6e7babcc238304cf55586cdf7e2b2806025214a143ed355f0d89b33b154
-DIST nautilus-3.4.1.tar.xz 4583100 SHA256 02581c9475e9c4250960555b248378a6a1c63a5c029728ec48347c78ca77392d
-DIST nautilus-3.4.2.tar.xz 4583996 SHA256 752afa41189b0b6c73dc3769cd885e184c29d6d394345ec05cd48b0004e0f452
-EBUILD nautilus-2.32.2.1-r1.ebuild 2252 SHA256 a80c76e5f2e4b5abbed382d4a5a2ef958a643e0e12d65b1375f63f14fb1ba273 SHA512 cd3208b283b0b56bbaa9fda5e4888d785ab8fe748355c7a1d6f941c364c26efc3f7f318f4b7f4840daecb62517e7a9e13b85fd49f395bdc93f653671ed6af131 WHIRLPOOL 4be0d4c0227ffa23baf3a711c43c7878b84625e55bf92c615fee52023f56de71320f7c81af7fbe4f76fd13d61f6d67b57f4318c0a3d94ea5ef74edc474a44f2d
-EBUILD nautilus-2.32.2.1-r2.ebuild 2252 SHA256 e05f4b26e652ae6e36db98ce55a1d197c3eccf33788649b6616a8ba13b30c5ea SHA512 79ce21ccce34fad1768dd6f50f5d3ebd913a3e06b1ab068b4995464d1a415296b7967e6f9246809f298f11baed400e24fb1fd06e61e17a22ff5f0a046fd3f413 WHIRLPOOL 64783218a3186c53e1f1b25817341bee30c50f230afefa3927f6d6e29eb97e34fb56fcbf695f1cb6477908b574a0c96e264aea5abd5495a4424159c76f387de8
-EBUILD nautilus-2.32.2.1.ebuild 2070 SHA256 1a960587495c351347bb1e3f5bf374ae6852e32e9f136511c58b92bbd8c712de SHA512 c2dc9d4fbfc1f312694f74f95719996b2176799e5ff4cf70129c76c2467bddec615f1a871bef2e16a446cff739d6bda50fda35a6705346c0f4535e51f508c00a WHIRLPOOL a71e1e0a818edbc4b535cb45e522d59783b44db543324eb6fc637dfff638de87da388db00dee44e6b9742a5b2be3dce54c8ff6141ee1a7a5e8a7cf66caf14194
-EBUILD nautilus-3.2.1-r1.ebuild 3375 SHA256 933272553e3b52d40e34b75347daf6e7dc51bbb1e88b5ab44c4488d2d152217b SHA512 8825c00a8d40363237804367976a5d5cb156257d42346efdbf95b061fcb8f7b1db60f85fc1c83c038d5068a6b8c58929036b03773505a00d49927c5ee3d047dd WHIRLPOOL ea0635c84a48aba0b4a2bba460e9dcab4979d4261552a2f8128d8a8f2c136cfe567eddf9d8acd7ba34b8b21deb61a8cdc37dc913b1e9be6dc032f7161d2ca027
-EBUILD nautilus-3.2.1.ebuild 2826 SHA256 1a6493b610145696bb28a8c72103cc5ad61aa226dd0b704eb343b709487ccb8a SHA512 60bc57769da3c96621a3aeccbbfd7909938419a3488599eef667a9aeb46e64e8e0b05707ba4a3c129b408a4777da0cae741d682d8b97b326bc56536036085c2f WHIRLPOOL a62fd6ed7bb6c9c80b23c7473f361c0cfe5d93ab2598fa38e46cd8c5916a2cbcf0655ae1fae1b72e4cd0e5cedb8d6e7245a5887f4066eac71da97187f14e0d9d
-EBUILD nautilus-3.4.1.ebuild 3168 SHA256 7add334b81835c0969499da9ae149546768ed947c5649bd10390671a5e3e1862 SHA512 cf8cb84eeba74c64775967b805e1170a6dee1013c82c34ae7c880b07e95e0101cd80ec9a6dbe5e8350b24243158e6c57b2732c9e452d931082e1fad14808f5a1 WHIRLPOOL 2861375b174e8e66c1cd58e165b0fafb62dcc44cf4265dd853cb11fded6ec40126d3a78da6cd02b5c0bb0642d5b707b062d89dc315e7a4f57f7992e8ea6ecbbd
-EBUILD nautilus-3.4.2.ebuild 3095 SHA256 b9b47dca84f279f1ead6a5b9c6b750fc67f112eb92e939e7a325c678509bbc46 SHA512 e9eb272227d20918e7b932b609dcb2202ec51e18bc8b2bd3adab8ea94c5716173957ca1c7e5d3fc762c8bb7f4e6cb3d82ea7e93e3e9f0daef01b85cc8dbd671e WHIRLPOOL 73178f36830a74c39a85afff8cd8fe8fbbe91fdf778dd337a52958adf77d0cbfcbb11a1d93c87fcc3efbc35d11edf3ae86b00c254eb890c8f50aff194fd91e86
-MISC ChangeLog 60143 SHA256 4f3884ff32dc614bc0eeaf806761ac2fb144c7b61a136320092fb4ccd6b279c6 SHA512 349f36e91cd4bf913e3a4646b10c5685bfba49d4c6f50e27051149339772af6b935005944e529902108fea8b4f99dbefc7a0f69acab68c96c2b429cbaa23a4d9 WHIRLPOOL 19ca1be48f9baea387a287bd4f6be2324bd720c4964baf7aea2b1f2293cd174c71bbc66e862be8c9555c092c913618a1409418a9056d825c1a3e98f8fc5b6a8e
-MISC metadata.xml 667 SHA256 b2769f7911c156b0692b95f3511adb651cee0486c6d8eb37b7d0a95786aad4c5 SHA512 43427a3720951ecb065cb38aaed68e52c163ba2881354d086904037ef80d59f06cb3e2f60473573238ee918039063ca62006d0f56cf1979f529bb6f7262f4e55 WHIRLPOOL fd6403c428c27e5944ea74d3eea5b12946f9796d92ec396bbf5211e3b95e57d7c4e8ed53e94b476d0b1241ef21ef80a801e436faea11fdce31ed3c82f5753c4d
+DIST nautilus-3.4.2.tar.xz 4583996 SHA256 752afa41189b0b6c73dc3769cd885e184c29d6d394345ec05cd48b0004e0f452 SHA512 a842488f58ed5c53a24c99b0f632b58fe7b67e58e8f05d4836adc5cbf4a1fe9754e65a3bc779e35a4d6b2efca482358c1fa4f7284b3b6b5e8b31a54466e1e210 WHIRLPOOL 83bf067fb3c64446e549dc402593eed3e89e0b494fa55527ff2cb8c3606520d77567a5a8e131521eab915f9599b455cd1a04aa157b72b14c88cd65380dc884d4
+EBUILD nautilus-2.32.2.1-r2.ebuild 2225 SHA256 0a9fd9c598526e17a80c185b74620db7d3fc7f5a8cee09016df74ba04e490bda SHA512 db21cd14f90f55a633a0cd8538148e12efbf20a5633a61024f521e40d1a1f60b72efe4b6ecfbfb3ae96d4032800be17a5cfab15c2d39b11d76e7d8dc344ad66f WHIRLPOOL baa604a25dccbc7955d692dd126453f589db4499c96dff39a7445970fa8e70e5f814613d33658eb85d4f61bcbe9bcf65f4fc67d82cc04aa1ea40a0dbb0a5acea
+EBUILD nautilus-3.4.2.ebuild 2934 SHA256 d884ed2fa167807b8c729cff464d134e1f75361f1900ee01d0345246ffd41b2c SHA512 a58d858fb0ad2cf968e4f714038cc01e59bb83d8424a9f197b0106f53586560875caab47f18af8d3497cacff5fa6f672247cd2c7a96445269271d5dd639867f6 WHIRLPOOL 8dc3bfd3116ae9054809ef524626b892cfc6019414f0c17a9aa908c87e93322bd1e6079cc3074da7430121a73c978cc49ce4ae304fbac71ea13f3b6de41df5e0
+MISC ChangeLog 60752 SHA256 64af398448a6f95f3b4e5a451f7b197f616bb6073475e67f1d378b25f0726a96 SHA512 b37f92df39be11ca6f784c98ab4ced99bd7381ca9b906029d84cf3db4456973c0b21a1c6f83494b9c92da22ab20e5ca0126f57260e2cb6635ab139e4851a61a8 WHIRLPOOL 912f5670c4cca611e19ff89063bc4d997d44e030fbcd618c3f5ff63c09ca0545c04fd329324eaa0dea8ae725238fa4c9eaee5d1ecc0e03c0ada3a96cfc69d13d
+MISC metadata.xml 566 SHA256 c278ed8fe54c80b07d7b2495826346538a7daaeea11dd9bdeff87ec0a30e74a1 SHA512 daefe3974dae1d708f909a2207f2d09128ab045f8aee11c823093da779e3f283c59459a0f4962631b1508dc545b6ab448c1ead519839011ddeb619f4017f802a WHIRLPOOL b662f3823904bc970b1a8bcd4ca863a7726eb89c76ef4c1d6954ba4b720f4d7490b4cfcf1d30b683a8ecf562d74977598db7b976ec4eea943e86aa07c4dde28b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAlAC/noACgkQuQc30/atMkBXYwCglXQlFFMgOizI2AXzP0qabVM+
-VBwAmwR3TlirKfsFbRtUO7FAQDBvcaRH
-=91kO
+iQEcBAEBCAAGBQJQ0zyNAAoJEJ0WA1zPCt1hz9YH/2I425+vyuctcxpLT5bTzQZP
+fuDB0jakp+bHur3S9yNx3ctXay2QMnXH3rdNFJYm4clxcfpw6fntQHmxRnFZbCMe
+pAGdyHIOVGbCrDxi/ZnxaO9/EOMI8NEk9WykWglgrkswJLhIRbRtTn6bggsQGBQ9
+D4k70Zr9EM5wZPjkWmt9SRYhJXszPd9xrmRN4M0VHWl3xGztyt/hFsiEGZVld2MX
+HDb22CTENd5T+ov7vtlTYDfKY6xbeE2nCGiTfn98dqd1URVMgJpGjSL858rEOYqw
+XStLQW24Fbc3RGTcvxyal+ja72r5atN9XpFAUASnmAxSFQJG9tMyxJ0Al3Ipzyg=
+=CQPj
 -----END PGP SIGNATURE-----
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() {