Prune old versions

(Portage version: 2.1.2_rc4-r7)
 (Signed Manifest commit)

9 files changed, 14 insertions, 524 deletions

diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index 29b1c5ccf721..b97baa695c91 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX nautilus-2.14-idl_include.patch 384 RMD160 0b040794d5b90baf662ff9d5fbdd8ab3168af5e4 SHA1 b7b0b325df513f63f83526d5e848d97e88e33a50 SHA256 f82e430fd9366e8d2306b586df90efc721f0cf17ea51987b747849c85f6b0116
 MD5 51f1e68a3c1b45c4b2188200398960f0 files/nautilus-2.14-idl_include.patch 384
 RMD160 0b040794d5b90baf662ff9d5fbdd8ab3168af5e4 files/nautilus-2.14-idl_include.patch 384
@@ -6,42 +9,20 @@ AUX nautilus-2.16.0-idl_include.patch 575 RMD160 8ee41c84f597683e2d34eea5acdb43f
 MD5 c496549444ef2727f6c0555b590ef4fe files/nautilus-2.16.0-idl_include.patch 575
 RMD160 8ee41c84f597683e2d34eea5acdb43f5592d3262 files/nautilus-2.16.0-idl_include.patch 575
 SHA256 07cd75e4cf1c34c5fcd3f4d2257ae1d9c578cb2c2f014e69280e511de28862f0 files/nautilus-2.16.0-idl_include.patch 575
-AUX nautilus-2.16.2-desktop-icon-position.patch 902 RMD160 16b9a019f89535f659ee14f4c9498aaed9f34f6f SHA1 48799304e8e2abafd4c2cc709557c7787218618c SHA256 6068a3fce125cf509753c5be16c3b22ebfd19f5afaba1121b03c51ffdc717de6
-MD5 d502695e15c21e2389b4a6d34c6de286 files/nautilus-2.16.2-desktop-icon-position.patch 902
-RMD160 16b9a019f89535f659ee14f4c9498aaed9f34f6f files/nautilus-2.16.2-desktop-icon-position.patch 902
-SHA256 6068a3fce125cf509753c5be16c3b22ebfd19f5afaba1121b03c51ffdc717de6 files/nautilus-2.16.2-desktop-icon-position.patch 902
-AUX nautilus-2.9.90-icon_view_gst.patch 8136 RMD160 adc024c514ce2dd2af2962caa8941fce250ab2b1 SHA1 ca768f9ba16908d487abbdbc941082a58a528ed9 SHA256 b6e7eef6e3ff11a9e3490e371ec06a9cd24b9251b7cad7262204071ff67a8a31
-MD5 76cc1af40c4dc75ce99179ae9b25a2cd files/nautilus-2.9.90-icon_view_gst.patch 8136
-RMD160 adc024c514ce2dd2af2962caa8941fce250ab2b1 files/nautilus-2.9.90-icon_view_gst.patch 8136
-SHA256 b6e7eef6e3ff11a9e3490e371ec06a9cd24b9251b7cad7262204071ff67a8a31 files/nautilus-2.9.90-icon_view_gst.patch 8136
 DIST nautilus-2.14.1.tar.bz2 4057351 RMD160 dd5b052a74e79a318ca9aba52da8dc3b95f6a58f SHA1 5267c76782190796743b0647025ef9079eee7f78 SHA256 ace7b821176159bf70cca61ee9a38384896878ec028e1fc1014ec975c08b12db
-DIST nautilus-2.16.1.tar.bz2 4258919 RMD160 6fd06a3af58c2ba9e2df3a3847e20d2f9d719206 SHA1 cadc91efd926bd49d376a2bcd2be9f103b989f4c SHA256 48818f5e2c9e981a6c75a61e462ac4050f7ffbf1c620a62fd7b3e57669484e37
-DIST nautilus-2.16.2.tar.bz2 4266971 RMD160 db9e392aa9357f85e44bb03052ecf38f6c87f46d SHA1 1583c87ccbe486a5088937c7f1fcaa77f0d966af SHA256 6306fe9ee0371da309a870627a94fba88c3848a5fa83b863d28688ed57d9ba11
 DIST nautilus-2.16.3.tar.bz2 4268274 RMD160 a7723054cacb954f48376e68de66dd144b36d3c5 SHA1 329e11d4c5e77346350b69f34cf2eb749807b12e SHA256 af2ff5ad922e28cc831b4ac3d83f0f35eedcf7a3230d3df76aa9f91c3ffbc36c
 EBUILD nautilus-2.14.1.ebuild 2038 RMD160 63280906078b62d63753888cbd3ce18c992de0f6 SHA1 8add5b82c4e64e7a3cf1843694bc712b9341abeb SHA256 e46e7f84109d1cfeef4309d12c08a5808f8b822f4988315fe221eec9e45d28b7
 MD5 95e133474e19fc0f2e7184adcdf230b5 nautilus-2.14.1.ebuild 2038
 RMD160 63280906078b62d63753888cbd3ce18c992de0f6 nautilus-2.14.1.ebuild 2038
 SHA256 e46e7f84109d1cfeef4309d12c08a5808f8b822f4988315fe221eec9e45d28b7 nautilus-2.14.1.ebuild 2038
-EBUILD nautilus-2.16.1.ebuild 2005 RMD160 cb7b44181899665c30de6f9fe4d89475b4622fbf SHA1 c7de86467364d54ef246c86717117d81e1490349 SHA256 81a0dbc396842dfc6a43e0bc2b4ca4e517f943357e68003ac1aa212459d595f4
-MD5 8de837f3dd298fe105084b320ed6800b nautilus-2.16.1.ebuild 2005
-RMD160 cb7b44181899665c30de6f9fe4d89475b4622fbf nautilus-2.16.1.ebuild 2005
-SHA256 81a0dbc396842dfc6a43e0bc2b4ca4e517f943357e68003ac1aa212459d595f4 nautilus-2.16.1.ebuild 2005
-EBUILD nautilus-2.16.2-r1.ebuild 2127 RMD160 511ccd6f80fea6eb35886802920b775f84fe1a0b SHA1 22b340005efcb6aa43da900588084ebca83bd889 SHA256 19fbd8ba31c68a361c9e58963798b9bc18e25c3e500aa368194f749f695f8198
-MD5 c3c3ae29979d1cd70f327cf1bc1031a5 nautilus-2.16.2-r1.ebuild 2127
-RMD160 511ccd6f80fea6eb35886802920b775f84fe1a0b nautilus-2.16.2-r1.ebuild 2127
-SHA256 19fbd8ba31c68a361c9e58963798b9bc18e25c3e500aa368194f749f695f8198 nautilus-2.16.2-r1.ebuild 2127
-EBUILD nautilus-2.16.2.ebuild 2005 RMD160 16141832b140106533d8b1256e5103f38d0dcc32 SHA1 796bc9a64799c84b7870ac6d86ac86947dbdeffb SHA256 bd6536bb62514013c9ad402ca506f98191644e2ee709a3d262752e460711a488
-MD5 66a603288a97b810c37474ba20a2ae87 nautilus-2.16.2.ebuild 2005
-RMD160 16141832b140106533d8b1256e5103f38d0dcc32 nautilus-2.16.2.ebuild 2005
-SHA256 bd6536bb62514013c9ad402ca506f98191644e2ee709a3d262752e460711a488 nautilus-2.16.2.ebuild 2005
 EBUILD nautilus-2.16.3.ebuild 1998 RMD160 c93422616975b7a8c286ea82a2cc639221b21bfb SHA1 029637259126f95e968a496fb154d79453efba54 SHA256 74e73936cfad79622ca28ee076f8c96a5f777d41f9db16c4e19e5a751fa7cead
 MD5 bef0f90152c6064ebc0c802e9f80a050 nautilus-2.16.3.ebuild 1998
 RMD160 c93422616975b7a8c286ea82a2cc639221b21bfb nautilus-2.16.3.ebuild 1998
 SHA256 74e73936cfad79622ca28ee076f8c96a5f777d41f9db16c4e19e5a751fa7cead nautilus-2.16.3.ebuild 1998
-MISC ChangeLog 28564 RMD160 bbbc91a95541dfc308aeb38dca109f412cc6acd4 SHA1 dabd37b3333c860763f0b474dcaed557abdf4e40 SHA256 68f23f819a109d3136777df150b37ca5640984753c7f2871085d63c64b120def
-MD5 8d6cb1e1fac628c8e35792c970788bdd ChangeLog 28564
-RMD160 bbbc91a95541dfc308aeb38dca109f412cc6acd4 ChangeLog 28564
-SHA256 68f23f819a109d3136777df150b37ca5640984753c7f2871085d63c64b120def ChangeLog 28564
+MISC ChangeLog 28812 RMD160 95070ee17f685d21b20533c1a84637bf6254c916 SHA1 73d0900173f5089e84e3384654bba031585d14cd SHA256 e8d54a6833a301da988181eaba9eae6192fd8db0eb3a555aebdbe4514eb4e0b4
+MD5 9577bded1ef3bc49edb353157eef62aa ChangeLog 28812
+RMD160 95070ee17f685d21b20533c1a84637bf6254c916 ChangeLog 28812
+SHA256 e8d54a6833a301da988181eaba9eae6192fd8db0eb3a555aebdbe4514eb4e0b4 ChangeLog 28812
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -49,15 +30,13 @@ SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 metadata
 MD5 fc2a75544738593fbff53de2a321a5e4 files/digest-nautilus-2.14.1 253
 RMD160 f1d718562414a65fc550588a7ae3ce0b1b015f70 files/digest-nautilus-2.14.1 253
 SHA256 afccacd3d3b1e0e359b562ba6be45afb6b259ec5bcaada24539d98d8069362df files/digest-nautilus-2.14.1 253
-MD5 f1831d52be76583c87ee12aeea43fe3b files/digest-nautilus-2.16.1 253
-RMD160 bd9d2191824e9a1b56370efeed6bdb25439e08d6 files/digest-nautilus-2.16.1 253
-SHA256 dab5793faff426a9f24597616494d8c4362e6f94f2f621656f465d11bf06e210 files/digest-nautilus-2.16.1 253
-MD5 3803821dbfe023094f40d89f7aa2dcc6 files/digest-nautilus-2.16.2 253
-RMD160 4789bc87b36d1ca16489bde892d37e97eae0095b files/digest-nautilus-2.16.2 253
-SHA256 452b53217e9351b7b431a30aef5d74ad60ba687e11fb948a9fa0d07cdd005f39 files/digest-nautilus-2.16.2 253
-MD5 3803821dbfe023094f40d89f7aa2dcc6 files/digest-nautilus-2.16.2-r1 253
-RMD160 4789bc87b36d1ca16489bde892d37e97eae0095b files/digest-nautilus-2.16.2-r1 253
-SHA256 452b53217e9351b7b431a30aef5d74ad60ba687e11fb948a9fa0d07cdd005f39 files/digest-nautilus-2.16.2-r1 253
 MD5 a7b9bb53870e1c7064d989e245404811 files/digest-nautilus-2.16.3 253
 RMD160 cf7a09b61dae1e1c0e96b53004ab80b14d4dff56 files/digest-nautilus-2.16.3 253
 SHA256 ca8f76281e887de02c557f18a1ebd97066875a6331e0b460d959bb301f6def6c files/digest-nautilus-2.16.3 253
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFFpIaBkeYb6olFHJcRAmSTAJ4jeH5piAJASRFTFP2jMIAQzUGwrACgonwk
+Bk687FRTO6bCEfjp+Pqzw80=
+=fMzR
+-----END PGP SIGNATURE-----
diff --git a/gnome-base/nautilus/files/digest-nautilus-2.16.1 b/gnome-base/nautilus/files/digest-nautilus-2.16.1
deleted file mode 100644
index 92072d02088e..000000000000
--- a/gnome-base/nautilus/files/digest-nautilus-2.16.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 bac53a70c9517cda421f440721e095c9 nautilus-2.16.1.tar.bz2 4258919
-RMD160 6fd06a3af58c2ba9e2df3a3847e20d2f9d719206 nautilus-2.16.1.tar.bz2 4258919
-SHA256 48818f5e2c9e981a6c75a61e462ac4050f7ffbf1c620a62fd7b3e57669484e37 nautilus-2.16.1.tar.bz2 4258919
diff --git a/gnome-base/nautilus/files/digest-nautilus-2.16.2 b/gnome-base/nautilus/files/digest-nautilus-2.16.2
deleted file mode 100644
index c6f9b825ef46..000000000000
--- a/gnome-base/nautilus/files/digest-nautilus-2.16.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d6354ad96efcd0f89ed4c13ad940d5f5 nautilus-2.16.2.tar.bz2 4266971
-RMD160 db9e392aa9357f85e44bb03052ecf38f6c87f46d nautilus-2.16.2.tar.bz2 4266971
-SHA256 6306fe9ee0371da309a870627a94fba88c3848a5fa83b863d28688ed57d9ba11 nautilus-2.16.2.tar.bz2 4266971
diff --git a/gnome-base/nautilus/files/digest-nautilus-2.16.2-r1 b/gnome-base/nautilus/files/digest-nautilus-2.16.2-r1
deleted file mode 100644
index c6f9b825ef46..000000000000
--- a/gnome-base/nautilus/files/digest-nautilus-2.16.2-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d6354ad96efcd0f89ed4c13ad940d5f5 nautilus-2.16.2.tar.bz2 4266971
-RMD160 db9e392aa9357f85e44bb03052ecf38f6c87f46d nautilus-2.16.2.tar.bz2 4266971
-SHA256 6306fe9ee0371da309a870627a94fba88c3848a5fa83b863d28688ed57d9ba11 nautilus-2.16.2.tar.bz2 4266971
diff --git a/gnome-base/nautilus/files/nautilus-2.16.2-desktop-icon-position.patch b/gnome-base/nautilus/files/nautilus-2.16.2-desktop-icon-position.patch
deleted file mode 100644
index 935864c5d13a..000000000000
--- a/gnome-base/nautilus/files/nautilus-2.16.2-desktop-icon-position.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- src/file-manager/fm-icon-view.c.orig	2006-11-14 16:35:04.304162544 +0000
-+++ src/file-manager/fm-icon-view.c	2006-11-14 16:51:02.820445920 +0000
-@@ -531,12 +531,20 @@
- file_has_lazy_position (FMDirectoryView *view,
- 			NautilusFile *file)
- {
-+	gboolean lazy_position;
-+
- 	/* For volumes (i.e. cdrom icon) we use lazy positioning so that when
- 	 * an old cdrom gets re-mounted in a place that now has another
- 	 * icon we don't overlap that one.
- 	 */
--
--	return NAUTILUS_IS_DESKTOP_ICON_FILE (file);
-+	lazy_position = nautilus_file_has_volume (file);
-+	if (lazy_position && fm_directory_view_get_loading (view)) {
-+		/* if volumes are loaded during directory load, don't mark them
-+		 * as lazy. This is wrong for files that were mounted during user
-+		 * log-off, but it is right for files that were mounted during login. */
-+		lazy_position = FALSE;
-+	}
-+	return lazy_position;
- }
- 
- static void
diff --git a/gnome-base/nautilus/files/nautilus-2.9.90-icon_view_gst.patch b/gnome-base/nautilus/files/nautilus-2.9.90-icon_view_gst.patch
deleted file mode 100644
index 43017e6c0d97..000000000000
--- a/gnome-base/nautilus/files/nautilus-2.9.90-icon_view_gst.patch
+++ /dev/null
@@ -1,240 +0,0 @@
-diff -ur nautilus-2.9.90/configure.in nautilus-2.9.90-patched/configure.in
---- nautilus-2.9.90/configure.in	2005-01-25 22:57:34.000000000 +0800
-+++ nautilus-2.9.90-patched/configure.in	2005-02-03 19:35:49.240088040 +0800
-@@ -19,6 +19,7 @@
- m4_define(xml_minver,                  2.4.7)
- m4_define(startup_notification_minver, 0.5)
- m4_define(exif_minver,                 0.5.12)
-+m4_define(gstreamer_minver,			   0.6.0)
- 
- AC_INIT(nautilus, 2.9.90,
-         [http://bugzilla.gnome.org/enter_bug.cgi?product=nautilus])
-@@ -48,6 +49,7 @@
- AC_SUBST(RSVG_REQUIRED, [rsvg_minver])
- AC_SUBST(XML_REQUIRED, [xml_minver])
- AC_SUBST(STARTUP_NOTIFICATION_REQUIRED, [startup_notification_minver])
-+AC_SUBST(GSTREAMER_REQUIRED, [gstreamer_minver])
- 
- 
- AC_C_BIGENDIAN
-@@ -260,6 +262,53 @@
- 	AC_MSG_RESULT(no)
- fi
- 
-+ dnl ==========================================================================
-+  
-+dnl gstreamer checking
-+
-+AC_ARG_ENABLE(gstreamer,
-+	AC_HELP_STRING([--enable-gstreamer],[use GStreamer for sound preview]),
-+	[case "${enableval}" in
-+		yes) ENABLE_GST=yes ;;
-+	    no)  ENABLE_GST=no ;;
-+	*) AC_MSG_ERROR(bad value ${enableval} for --enable-gstreamer) ;;
-+	esac],
-+	[ENABLE_GST=no]) dnl Default value
-+		
-+AC_MSG_CHECKING(for backend libraries)
-+
-+if test x$ENABLE_GST = xyes; then
-+
-+dnl Now we're ready to ask for gstreamer libs and cflags
-+dnl And we can also ask for the right version of gstreamer
-+	HAVE_GSTREAMER=no
-+
-+dnl start with 0.7
-+	GST_MAJORMINOR=0.8
-+	PKG_CHECK_MODULES(GST, \
-+				gstreamer-gconf-$GST_MAJORMINOR >= $GSTREAMER_REQUIRED,
-+				HAVE_GSTREAMER=yes,HAVE_GSTREAMER=no)
-+
-+dnl try 0.6
-+	if test "x$HAVE_GSTREAMER" = "xno"; then
-+		GST_MAJORMINOR=0.6
-+		PKG_CHECK_MODULES(GST, \
-+				gstreamer-gconf-$GST_MAJORMINOR >= $GSTREAMER_REQUIRED,
-+				HAVE_GSTREAMER=yes,HAVE_GSTREAMER=no)
-+	fi
-+
-+dnl Give error and exit if we don't have gstreamer
-+	if test "x$HAVE_GSTREAMER" = "xno"; then
-+		AC_MSG_ERROR(you need gstreamer development packages installed !)
-+	fi
-+
-+	MM="gstreamer-libs-$GST_MAJORMINOR >= $GSTREAMER_REQUIRED gstreamer-gconf-$GST_MAJORMINOR >= $GSTREAMER_REQUIRED"
-+
-+	AC_MSG_RESULT(GStreamer)
-+	AC_DEFINE(USE_GST_AUDIO_PREVIEW,1,[Define if you want to use the GStreamer media framework])
-+
-+fi
-+
- dnl ==========================================================================
- 
- dnl gimphwrapbox
-@@ -285,7 +334,7 @@
- AC_SUBST(LIBNAUTILUS_EXTENSION_LIBS)
- 
- dnl core nautilus (must list bonobo-activation and libbonobo because idldir does not respect "requires")
--CORE_MODULES="eel-2.0 librsvg-2.0 bonobo-activation-2.0 libbonobo-2.0 esound gnome-desktop-2.0 $EXTRA_CORE_MODULES"
-+CORE_MODULES="eel-2.0 librsvg-2.0 bonobo-activation-2.0 libbonobo-2.0 esound gnome-desktop-2.0 $MM $EXTRA_CORE_MODULES"
- CORE_CFLAGS="`$PKG_CONFIG --cflags $CORE_MODULES` $x_cflags"
- AC_SUBST(CORE_CFLAGS)
- CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $CDDA_LIBS $LIBJPEG $x_libs"
-diff -ur nautilus-2.9.90/src/file-manager/fm-icon-view.c nautilus-2.9.90-patched/src/file-manager/fm-icon-view.c
---- nautilus-2.9.90/src/file-manager/fm-icon-view.c	2005-01-17 17:05:03.000000000 +0800
-+++ nautilus-2.9.90-patched/src/file-manager/fm-icon-view.c	2005-02-03 19:36:04.634747696 +0800
-@@ -79,8 +79,13 @@
- #include <sys/wait.h>
- #include <unistd.h>
- 
-+#ifdef USE_GST_AUDIO_PREVIEW
-+#include <gst/gst.h>
-+#include <gst/gconf/gconf.h>
-+#else
- #define USE_OLD_AUDIO_PREVIEW 1
- #define READ_CHUNK_SIZE 16384
-+#endif
- 
- #define POPUP_PATH_ICON_APPEARANCE		"/selection/Icon Appearance Items"
- 
-@@ -168,6 +173,10 @@
- static int preview_sound_auto_value;
- static gboolean gnome_esd_enabled_auto_value;
- 
-+#ifdef USE_GST_AUDIO_PREVIEW
-+static GstElement *thread;
-+#endif
-+
- static void                 fm_icon_view_set_directory_sort_by        (FMIconView           *icon_view,
- 								       NautilusFile         *file,
- 								       const char           *sort_by);
-@@ -1682,6 +1691,22 @@
- 	fm_directory_view_stop_batching_selection_changes (FM_DIRECTORY_VIEW (icon_view));
- }
- 
-+#ifdef USE_GST_AUDIO_PREVIEW
-+static void
-+gst_end_of_stream_callback (GstElement *src, gpointer callback_data)
-+{
-+	FMIconView *icon_view;
-+	icon_view = FM_ICON_VIEW (callback_data);
-+
-+	gst_element_set_state (GST_ELEMENT (thread), GST_STATE_NULL);
-+
-+	if (icon_view->details->audio_preview_timeout != 0 ) {
-+		g_source_remove (icon_view->details->audio_preview_timeout);
-+		icon_view->details->audio_preview_timeout = 0;
-+	}
-+}
-+#endif
-+
- /* handle the preview signal by inspecting the mime type.  For now, we only preview local sound files. */
- 
- /* here's the timer task that actually plays the file using mpg123, ogg123 or play. */
-@@ -1689,6 +1714,34 @@
- static gboolean
- play_file (gpointer callback_data)
- {
-+#ifdef USE_GST_AUDIO_PREVIEW
-+	gchar *file_uri;
-+	GstElement *filesrc, *decoder, *audiosink;
-+	FMIconView *icon_view;
-+
-+	icon_view = FM_ICON_VIEW (callback_data);
-+	file_uri = nautilus_file_get_uri (icon_view->details->audio_preview_file);
-+
-+	if (file_uri != NULL && gst_init_check (NULL, NULL)) { 
-+		thread = gst_thread_new ("thread");
-+		filesrc = gst_element_factory_make ("gnomevfssrc", "disk_source");
-+		decoder = gst_element_factory_make ("spider", "spider");
-+		audiosink = gst_gconf_get_default_audio_sink (); 
-+
-+		g_object_set (G_OBJECT (filesrc), "location", file_uri, NULL);
-+		g_signal_connect (G_OBJECT (filesrc), "eos", G_CALLBACK (gst_end_of_stream_callback), icon_view);
-+
-+		gst_bin_add_many (GST_BIN (thread), filesrc, decoder, audiosink, NULL);
-+		gst_element_link_many (filesrc, decoder, audiosink, NULL);
-+
-+		gst_element_set_state (GST_ELEMENT (thread), GST_STATE_PLAYING);
-+	}
-+
-+	g_free (file_uri);
-+
-+	icon_view->details->audio_preview_file = NULL;
-+	icon_view->details->audio_preview_timeout = 0;
-+#else
- #if USE_OLD_AUDIO_PREVIEW	
- 	NautilusFile *file;
- 	FMIconView *icon_view;
-@@ -1813,6 +1866,7 @@
- 	icon_view->details->audio_preview_timeout = 0;
- 	icon_view->details->audio_preview_file = NULL;
- #endif
-+#endif /* End USE_GST_AUDIO_PREVIEW */
- 	return FALSE;
- }
- 
-@@ -1827,6 +1881,21 @@
- static void
- preview_audio (FMIconView *icon_view, NautilusFile *file, gboolean start_flag)
- {		
-+#ifdef USE_GST_AUDIO_PREVIEW
-+	if (thread != NULL) {
-+		gst_element_set_state (GST_ELEMENT (thread), GST_STATE_NULL);
-+	}
-+
-+	if (icon_view->details->audio_preview_timeout != 0) {
-+		g_source_remove (icon_view->details->audio_preview_timeout);
-+		icon_view->details->audio_preview_timeout = 0;
-+	}
-+
-+	if (start_flag) {
-+		icon_view->details->audio_preview_file = file;
-+		icon_view->details->audio_preview_timeout = g_timeout_add (1000, play_file, icon_view);
-+	}
-+#else
- 	/* Stop current audio playback */
- #if USE_OLD_AUDIO_PREVIEW
- 	nautilus_sound_kill_sound ();
-@@ -1851,15 +1920,18 @@
- 		icon_view->details->audio_preview_timeout = g_timeout_add (1000, play_file, icon_view);
- #endif
- 	}
-+#endif /* End USE_GST_AUDIO_PREVIEW */
- }
- 
- static gboolean
- should_preview_sound (NautilusFile *file)
- {
-+#ifndef USE_GST_AUDIO_PREVIEW
- 	/* Check gnome config sound preference */
- 	if (!gnome_esd_enabled_auto_value) {
- 		return FALSE;
- 	}
-+#endif /* USE_GST_AUDIO_PREVIEW */
- 
- 	/* Check user performance preference */	
- 	if (preview_sound_auto_value == NAUTILUS_SPEED_TRADEOFF_NEVER) {
-@@ -1890,11 +1962,22 @@
- 		mime_type = nautilus_file_get_mime_type (file);
- 
- 		if ((eel_istr_has_prefix (mime_type, "audio/")
-+#ifdef USE_GST_AUDIO_PREVIEW
-+			 || eel_istr_has_prefix (mime_type, "application/ogg")
-+			 || eel_istr_has_prefix (mime_type, "application/x-ogg")
-+			 || eel_istr_has_prefix (mime_type, "application/flac")
-+			 || eel_istr_has_prefix (mime_type, "application/x-flac"))
-+			 && eel_strcasecmp (mime_type, "audio/x-pn-realaudio") != 0
-+			 && eel_strcasecmp (mime_type, "audio/x-mpegurl") != 0
-+		   ) {
-+#else
-+
- 		     || eel_istr_has_prefix (mime_type, "application/ogg")
- 		     || eel_istr_has_prefix (mime_type, "application/x-ogg"))
- 		    && eel_strcasecmp (mime_type, "audio/x-pn-realaudio") != 0
- 		    && eel_strcasecmp (mime_type, "audio/x-mpegurl") != 0
- 		    && nautilus_sound_can_play_sound ()) {
-+#endif
- 			result = 1;
- 			preview_audio (icon_view, file, start_flag);
- 		}	
diff --git a/gnome-base/nautilus/nautilus-2.16.1.ebuild b/gnome-base/nautilus/nautilus-2.16.1.ebuild
deleted file mode 100644
index 0e28845d1afa..000000000000
--- a/gnome-base/nautilus/nautilus-2.16.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.16.1.ebuild,v 1.4 2006/11/16 21:29:51 leonardop Exp $
-
-inherit virtualx eutils gnome2
-
-DESCRIPTION="A file manager for the GNOME desktop"
-HOMEPAGE="http://www.gnome.org/projects/nautilus/"
-
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE="beagle gnome"
-# cups flac gstreamer mad ogg vorbis
-
-RDEPEND=">=media-libs/libart_lgpl-2.3.10
-	>=gnome-base/libbonobo-2.1
-	>=gnome-base/eel-2.15.92
-	>=media-sound/esound-0.2.27
-	>=dev-libs/glib-2.6
-	>=gnome-base/gnome-desktop-2.9.91
-	>=gnome-base/libgnome-2.1.1
-	>=gnome-base/libgnomeui-2.6
-	>=gnome-base/gnome-vfs-2.15
-	>=gnome-base/orbit-2.4
-	>=x11-libs/pango-1.1.2
-	>=x11-libs/gtk+-2.10
-	>=gnome-base/librsvg-2.0.1
-	>=dev-libs/libxml2-2.4.7
-	>=x11-libs/startup-notification-0.8
-	>=media-libs/libexif-0.5.12
-	>=gnome-base/gconf-2
-	beagle? ( >=app-misc/beagle-0.0.12 )
-	x11-libs/libICE
-	x11-libs/libSM
-	virtual/eject"
-#	!gstreamer? ( vorbis? ( media-sound/vorbis-tools ) )
-#	gstreamer? (
-#		>=media-libs/gstreamer-0.8
-#		>=media-libs/gst-plugins-0.8
-#		>=media-plugins/gst-plugins-gnomevfs-0.8
-#		mad? ( >=media-plugins/gst-plugins-mad-0.8 )
-#		ogg? ( >=media-plugins/gst-plugins-ogg-0.8 )
-#		vorbis? ( >=media-plugins/gst-plugins-vorbis-0.8 )
-#		flac? (	>=media-plugins/gst-plugins-flac-0.8 ) )"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.9"
-
-PDEPEND="gnome? ( >=x11-themes/gnome-icon-theme-1.1.91 )"
-
-DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README THANKS TODO"
-
-
-pkg_setup() {
-	G2CONF="--disable-update-mimedb $(use_enable beagle)"
-}
-
-src_test() {
-	addwrite "/root/.gnome2_private"
-	Xmake check || die "Test phase failed"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# fix relative include path breaking libIDL (#129366)
-	epatch ${FILESDIR}/${PN}-2.16.0-idl_include.patch
-}
diff --git a/gnome-base/nautilus/nautilus-2.16.2-r1.ebuild b/gnome-base/nautilus/nautilus-2.16.2-r1.ebuild
deleted file mode 100644
index 97d7838fb6a8..000000000000
--- a/gnome-base/nautilus/nautilus-2.16.2-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.16.2-r1.ebuild,v 1.2 2006/11/16 21:29:51 leonardop Exp $
-
-inherit virtualx eutils gnome2
-
-DESCRIPTION="A file manager for the GNOME desktop"
-HOMEPAGE="http://www.gnome.org/projects/nautilus/"
-
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE="beagle gnome"
-# cups flac gstreamer mad ogg vorbis
-
-RDEPEND=">=media-libs/libart_lgpl-2.3.10
-	>=gnome-base/libbonobo-2.1
-	>=gnome-base/eel-2.15.92
-	>=media-sound/esound-0.2.27
-	>=dev-libs/glib-2.6
-	>=gnome-base/gnome-desktop-2.9.91
-	>=gnome-base/libgnome-2.1.1
-	>=gnome-base/libgnomeui-2.6
-	>=gnome-base/gnome-vfs-2.15
-	>=gnome-base/orbit-2.4
-	>=x11-libs/pango-1.1.2
-	>=x11-libs/gtk+-2.10
-	>=gnome-base/librsvg-2.0.1
-	>=dev-libs/libxml2-2.4.7
-	>=x11-libs/startup-notification-0.8
-	>=media-libs/libexif-0.5.12
-	>=gnome-base/gconf-2
-	beagle? ( >=app-misc/beagle-0.0.12 )
-	x11-libs/libICE
-	x11-libs/libSM
-	virtual/eject"
-#	!gstreamer? ( vorbis? ( media-sound/vorbis-tools ) )
-#	gstreamer? (
-#		>=media-libs/gstreamer-0.8
-#		>=media-libs/gst-plugins-0.8
-#		>=media-plugins/gst-plugins-gnomevfs-0.8
-#		mad? ( >=media-plugins/gst-plugins-mad-0.8 )
-#		ogg? ( >=media-plugins/gst-plugins-ogg-0.8 )
-#		vorbis? ( >=media-plugins/gst-plugins-vorbis-0.8 )
-#		flac? (	>=media-plugins/gst-plugins-flac-0.8 ) )"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.9"
-
-PDEPEND="gnome? ( >=x11-themes/gnome-icon-theme-1.1.91 )"
-
-DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README THANKS TODO"
-
-
-pkg_setup() {
-	G2CONF="--disable-update-mimedb $(use_enable beagle)"
-}
-
-src_test() {
-	addwrite "/root/.gnome2_private"
-	Xmake check || die "Test phase failed"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# fix relative include path breaking libIDL (#129366)
-	epatch ${FILESDIR}/${PN}-2.16.0-idl_include.patch
-	# fix desktop icon position bug Gnome (#373895) Gentoo (#154766)
-	epatch ${FILESDIR}/${P}-desktop-icon-position.patch
-}
diff --git a/gnome-base/nautilus/nautilus-2.16.2.ebuild b/gnome-base/nautilus/nautilus-2.16.2.ebuild
deleted file mode 100644
index 4d17fb5c3fe3..000000000000
--- a/gnome-base/nautilus/nautilus-2.16.2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.16.2.ebuild,v 1.2 2006/11/16 21:29:51 leonardop Exp $
-
-inherit virtualx eutils gnome2
-
-DESCRIPTION="A file manager for the GNOME desktop"
-HOMEPAGE="http://www.gnome.org/projects/nautilus/"
-
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE="beagle gnome"
-# cups flac gstreamer mad ogg vorbis
-
-RDEPEND=">=media-libs/libart_lgpl-2.3.10
-	>=gnome-base/libbonobo-2.1
-	>=gnome-base/eel-2.15.92
-	>=media-sound/esound-0.2.27
-	>=dev-libs/glib-2.6
-	>=gnome-base/gnome-desktop-2.9.91
-	>=gnome-base/libgnome-2.1.1
-	>=gnome-base/libgnomeui-2.6
-	>=gnome-base/gnome-vfs-2.15
-	>=gnome-base/orbit-2.4
-	>=x11-libs/pango-1.1.2
-	>=x11-libs/gtk+-2.10
-	>=gnome-base/librsvg-2.0.1
-	>=dev-libs/libxml2-2.4.7
-	>=x11-libs/startup-notification-0.8
-	>=media-libs/libexif-0.5.12
-	>=gnome-base/gconf-2
-	beagle? ( >=app-misc/beagle-0.0.12 )
-	x11-libs/libICE
-	x11-libs/libSM
-	virtual/eject"
-#	!gstreamer? ( vorbis? ( media-sound/vorbis-tools ) )
-#	gstreamer? (
-#		>=media-libs/gstreamer-0.8
-#		>=media-libs/gst-plugins-0.8
-#		>=media-plugins/gst-plugins-gnomevfs-0.8
-#		mad? ( >=media-plugins/gst-plugins-mad-0.8 )
-#		ogg? ( >=media-plugins/gst-plugins-ogg-0.8 )
-#		vorbis? ( >=media-plugins/gst-plugins-vorbis-0.8 )
-#		flac? (	>=media-plugins/gst-plugins-flac-0.8 ) )"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.9"
-
-PDEPEND="gnome? ( >=x11-themes/gnome-icon-theme-1.1.91 )"
-
-DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README THANKS TODO"
-
-
-pkg_setup() {
-	G2CONF="--disable-update-mimedb $(use_enable beagle)"
-}
-
-src_test() {
-	addwrite "/root/.gnome2_private"
-	Xmake check || die "Test phase failed"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# fix relative include path breaking libIDL (#129366)
-	epatch ${FILESDIR}/${PN}-2.16.0-idl_include.patch
-}