Enable test phase even if FEATURES=-userpriv. Pruning old ebuilds/patches.

(Portage version: 2.1.2_rc1-r7)
 (Unsigned Manifest commit)

10 files changed, 20 insertions, 390 deletions

diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index b4332bfd169e..8b90d3cd9ca6 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX macros/gnome.m4 16426 RMD160 d1e90c27d9b40c5c1d4f364794a39aa42aaba16f SHA1 ae123bad7103c88a6f850c25203d270ccbe30884 SHA256 635f8c7e29b3bb1f92de64e0fb4c94afe02391cc2e1ee0c60843a43697c69873
 MD5 7cb2f285f24e86a90c6a65b0b9356d39 files/macros/gnome.m4 16426
 RMD160 d1e90c27d9b40c5c1d4f364794a39aa42aaba16f files/macros/gnome.m4 16426
@@ -25,18 +22,6 @@ AUX nautilus-1.0.6-mozilla-embed-1.0_rc3.diff 526 RMD160 53c9860f9be855a83e790a7
 MD5 ddc1abbf275436c7fa5fd5c04a27cc94 files/nautilus-1.0.6-mozilla-embed-1.0_rc3.diff 526
 RMD160 53c9860f9be855a83e790a78dda59d74f6b8ecaf files/nautilus-1.0.6-mozilla-embed-1.0_rc3.diff 526
 SHA256 0edb6789ff30c46c58f5c0062138db8010c5a713fd2d90098eb88a11f0691b58 files/nautilus-1.0.6-mozilla-embed-1.0_rc3.diff 526
-AUX nautilus-2.10.1-deselect.patch 802 RMD160 64bb9c2ccadc997cde31b44c6b3202f4d6dbddfa SHA1 4ee453f75135c80b02af02eb8946d6ba6f38604c SHA256 e214ff8bc14e0ba1d97afeaf11e01196a82d3d31d5864b38e6cd9f918ae4e423
-MD5 889a29f6bea75973eafb3d64a1801a5f files/nautilus-2.10.1-deselect.patch 802
-RMD160 64bb9c2ccadc997cde31b44c6b3202f4d6dbddfa files/nautilus-2.10.1-deselect.patch 802
-SHA256 e214ff8bc14e0ba1d97afeaf11e01196a82d3d31d5864b38e6cd9f918ae4e423 files/nautilus-2.10.1-deselect.patch 802
-AUX nautilus-2.10.1-font_sizes.patch 1532 RMD160 31d87ac7f8ad6b12d090584cdead96f5b0ec0b40 SHA1 925cbce7d5403dc065006c4049bdab8ef57ca0fb SHA256 7cddbf0f88d72166164a8dcf22d290151faee587902f9164166f9bd8e32c6f2b
-MD5 29bf62fc0e7eaa6cd6aa5cf4e2dd291d files/nautilus-2.10.1-font_sizes.patch 1532
-RMD160 31d87ac7f8ad6b12d090584cdead96f5b0ec0b40 files/nautilus-2.10.1-font_sizes.patch 1532
-SHA256 7cddbf0f88d72166164a8dcf22d290151faee587902f9164166f9bd8e32c6f2b files/nautilus-2.10.1-font_sizes.patch 1532
-AUX nautilus-2.12.1-symlink-del.patch 1906 RMD160 64d6ed8c42b160c46356e752b29caaff7c4fa65d SHA1 91a693d54ade4e724c0b44702b091ccca336fa3d SHA256 f30b70428e25c79c769353b8963b3342e69ec0b4dd114f3002f8a913cf51649e
-MD5 6656801883a1b7be0c2f4f5b660c84c3 files/nautilus-2.12.1-symlink-del.patch 1906
-RMD160 64d6ed8c42b160c46356e752b29caaff7c4fa65d files/nautilus-2.12.1-symlink-del.patch 1906
-SHA256 f30b70428e25c79c769353b8963b3342e69ec0b4dd114f3002f8a913cf51649e files/nautilus-2.12.1-symlink-del.patch 1906
 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
@@ -54,48 +39,33 @@ MD5 76cc1af40c4dc75ce99179ae9b25a2cd files/nautilus-2.9.90-icon_view_gst.patch 8
 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-1.0.6.tar.gz 11481232 RMD160 01c2d5412ccf9998d8de24dcf6aef75db9d8b3b9 SHA1 3ecad4d460fd2a08534a69c903c4a7dfddb7f276 SHA256 d7f0e91a4c1f73124b09e13e69b9709dfd7886981447b0b7d66196f96e405629
-DIST nautilus-2.10.1.tar.bz2 5960278 RMD160 d3e7e0f66e972087d45975f2efa0fe3bfcb7620e SHA1 738a1c58bf83bb2034bf9466daecdf09d8f131cb SHA256 3bf0841e8d53ab5014807fc85eef9b16f077453910d2168c5baa747b4ec7201e
-DIST nautilus-2.12.2.tar.bz2 4057461 RMD160 6fedb1880febead00e5d4f4e71fb3cf219e1942e SHA1 9a7e01afb8db91c3b95b7aef9572a581fdb2f1b5 SHA256 9b1a11fde474d0bc0891afeef912aaa01bf8189e453bb555b2977f60f98d5455
 DIST nautilus-2.14.1.tar.bz2 4057351 RMD160 dd5b052a74e79a318ca9aba52da8dc3b95f6a58f SHA1 5267c76782190796743b0647025ef9079eee7f78 SHA256 ace7b821176159bf70cca61ee9a38384896878ec028e1fc1014ec975c08b12db
-DIST nautilus-2.16.0.tar.bz2 4257541 RMD160 5075cccb0a8407a67b3da408899553ac204873f3 SHA1 62a77bde9705a0edc67c6d7221cfce4f7f06aef8 SHA256 675f28f78f2b82b8d61e353b3ff4a97011e98013947495c7b980670144c69ab0
 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
 EBUILD nautilus-1.0.6-r10.ebuild 3181 RMD160 062308921ab7ac26f4d1a9687e043577c7f49e59 SHA1 8dee6c64755233a290b57724c4329c90e0121362 SHA256 4214a3f1bd3dcf3e4dfc9fa02adbb4df71e0e2cc588c63088a8deaa67fd33d37
 MD5 fa1c73ecb6cd6ab42a4327343cb2e2d7 nautilus-1.0.6-r10.ebuild 3181
 RMD160 062308921ab7ac26f4d1a9687e043577c7f49e59 nautilus-1.0.6-r10.ebuild 3181
 SHA256 4214a3f1bd3dcf3e4dfc9fa02adbb4df71e0e2cc588c63088a8deaa67fd33d37 nautilus-1.0.6-r10.ebuild 3181
-EBUILD nautilus-2.10.1-r1.ebuild 2547 RMD160 5bc3cf1c6e843e332aacf8876abbb76dec810154 SHA1 714c225690db6f1b1dc7afb508a6acd3039c2dbb SHA256 6e9114dfb50db756e513a3bb24726779d7663077034086db6609aaed32e2a857
-MD5 1984b896c256913325de500cc1cb3433 nautilus-2.10.1-r1.ebuild 2547
-RMD160 5bc3cf1c6e843e332aacf8876abbb76dec810154 nautilus-2.10.1-r1.ebuild 2547
-SHA256 6e9114dfb50db756e513a3bb24726779d7663077034086db6609aaed32e2a857 nautilus-2.10.1-r1.ebuild 2547
-EBUILD nautilus-2.12.2.ebuild 1896 RMD160 9fc4357d81f8081cbe5123966fc66f9f45e79a5d SHA1 d31a4f36de3b99961361add096445339b782f3ee SHA256 400dbd769e5bacaed3353badb520955024c24cda44d8da1927f44dec3be47e63
-MD5 0e41a9e8582ba7f718cf08f2348fd7bf nautilus-2.12.2.ebuild 1896
-RMD160 9fc4357d81f8081cbe5123966fc66f9f45e79a5d nautilus-2.12.2.ebuild 1896
-SHA256 400dbd769e5bacaed3353badb520955024c24cda44d8da1927f44dec3be47e63 nautilus-2.12.2.ebuild 1896
-EBUILD nautilus-2.14.1.ebuild 2052 RMD160 c4fc881e9c33363f3aa441590a83932ee7f9c85c SHA1 b170a88d41dfd0ab032f33b2087845ba69043c40 SHA256 fcb3c7437e7e5effac97b2af139eb687db5a9cede92ee8a40ef4466f3387b676
-MD5 cafe18afb14420efe16cf04269d555c5 nautilus-2.14.1.ebuild 2052
-RMD160 c4fc881e9c33363f3aa441590a83932ee7f9c85c nautilus-2.14.1.ebuild 2052
-SHA256 fcb3c7437e7e5effac97b2af139eb687db5a9cede92ee8a40ef4466f3387b676 nautilus-2.14.1.ebuild 2052
-EBUILD nautilus-2.16.0.ebuild 2017 RMD160 44b0f6a4c3e328cb72be48fc2e053c1f875c0937 SHA1 b85010a09d27ed74bbd27bb03729824dfcc8e1b5 SHA256 78c5a645c331720ac2927b059c9d55199e3c85205e4ccc30a8e47515104eea59
-MD5 d2a76784947bf399cb253bbec4814c5b nautilus-2.16.0.ebuild 2017
-RMD160 44b0f6a4c3e328cb72be48fc2e053c1f875c0937 nautilus-2.16.0.ebuild 2017
-SHA256 78c5a645c331720ac2927b059c9d55199e3c85205e4ccc30a8e47515104eea59 nautilus-2.16.0.ebuild 2017
-EBUILD nautilus-2.16.1.ebuild 2017 RMD160 8ba20c4ac9a9916c01a14b6cc91e62d6ef072a37 SHA1 09d9d3ffedee30673fe30a0daee562b71d36bf07 SHA256 6d3ca1781ad178c8d3603c20092828876c1166e35a6b6217a30bb6b4bdd4c946
-MD5 0ee9164e780891a9b01b443d16e4d6e0 nautilus-2.16.1.ebuild 2017
-RMD160 8ba20c4ac9a9916c01a14b6cc91e62d6ef072a37 nautilus-2.16.1.ebuild 2017
-SHA256 6d3ca1781ad178c8d3603c20092828876c1166e35a6b6217a30bb6b4bdd4c946 nautilus-2.16.1.ebuild 2017
-EBUILD nautilus-2.16.2-r1.ebuild 2141 RMD160 492af117e5ab23a1edf929ff206fbc06a93a3a98 SHA1 0c36e7b440d69b43cde164ea301036ab0c0f55fd SHA256 72c945fe736aef49f46bffa151fa1248d7195aa8d3022750c728defc52b1d6bf
-MD5 3434de2e33bb77f74a6711b794c66034 nautilus-2.16.2-r1.ebuild 2141
-RMD160 492af117e5ab23a1edf929ff206fbc06a93a3a98 nautilus-2.16.2-r1.ebuild 2141
-SHA256 72c945fe736aef49f46bffa151fa1248d7195aa8d3022750c728defc52b1d6bf nautilus-2.16.2-r1.ebuild 2141
-EBUILD nautilus-2.16.2.ebuild 2019 RMD160 33ec47f5bd60cfde38890acad4564d6928c7f10f SHA1 d1c079f674ac87e5a3b086ab0a0d49d81f375dfa SHA256 761af93869a2a9b0b62fabeca36bb862a02ca20969edb4c11fd0e5446826260b
-MD5 532cf360c889c245ccac555d255c3e49 nautilus-2.16.2.ebuild 2019
-RMD160 33ec47f5bd60cfde38890acad4564d6928c7f10f nautilus-2.16.2.ebuild 2019
-SHA256 761af93869a2a9b0b62fabeca36bb862a02ca20969edb4c11fd0e5446826260b nautilus-2.16.2.ebuild 2019
-MISC ChangeLog 27068 RMD160 a439a304fabeb43aa4f7bf0f18f4e643c66cc391 SHA1 05bada3bee5ee91a0dfda6ef3452ae3c43b72876 SHA256 ca795e14eeb4faf485773478607148474ca51e459076dc3e71d1da68db3956b8
-MD5 33629182f2fdd9d4418d74b9b0f0359e ChangeLog 27068
-RMD160 a439a304fabeb43aa4f7bf0f18f4e643c66cc391 ChangeLog 27068
-SHA256 ca795e14eeb4faf485773478607148474ca51e459076dc3e71d1da68db3956b8 ChangeLog 27068
+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
+MISC ChangeLog 27504 RMD160 f389a19027638acf11b3b46b467c131886eac9c9 SHA1 e983139ebd7899cfb168a6aa6f222be610ce3dda SHA256 4fbd2d4ae78ba2066b7c95f680329cafff05074f38038f785802e048f1213005
+MD5 e6cdcddaa3c41554ec1cf443a56ac537 ChangeLog 27504
+RMD160 f389a19027638acf11b3b46b467c131886eac9c9 ChangeLog 27504
+SHA256 4fbd2d4ae78ba2066b7c95f680329cafff05074f38038f785802e048f1213005 ChangeLog 27504
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -103,18 +73,9 @@ SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 metadata
 MD5 4a2765d028f354ecf9ce42311c68d02e files/digest-nautilus-1.0.6-r10 250
 RMD160 dc7c7c6a0ee885cc1bf4f6e996b8556b50a4c576 files/digest-nautilus-1.0.6-r10 250
 SHA256 882a0f1b7b3c7a35e56b4bc60b1b6447c7fcab526b7278e9b506954dd44175cb files/digest-nautilus-1.0.6-r10 250
-MD5 2f6d773deecd7c3f65b6bd271f159634 files/digest-nautilus-2.10.1-r1 253
-RMD160 5cb6c0ddd53794f52a5725b0c0731abeb5b41294 files/digest-nautilus-2.10.1-r1 253
-SHA256 b5c0a618f57f5819f44a6af363a05811b0dcf4780065fd93ee39cb3a67bf5329 files/digest-nautilus-2.10.1-r1 253
-MD5 6d2910c0d22cdc27feb2d63184bc6798 files/digest-nautilus-2.12.2 253
-RMD160 a3d55b8d579d1a97c4e1afa96ac99daa7cb79fe3 files/digest-nautilus-2.12.2 253
-SHA256 aadee03162fb1380bc4c73cb482cdbec5ef84e1d416516757a3eed2d883bc98d files/digest-nautilus-2.12.2 253
 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 4f66e425e28495ccd5a497d01e508014 files/digest-nautilus-2.16.0 253
-RMD160 7d2e8d4d2120f5b68438d38cb6f06f94e5d36ad5 files/digest-nautilus-2.16.0 253
-SHA256 3b25c0143386e96ff4db364d9586df731bf8c5b6ad5ee430cef16addb4b41a9c files/digest-nautilus-2.16.0 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
@@ -124,10 +85,3 @@ SHA256 452b53217e9351b7b431a30aef5d74ad60ba687e11fb948a9fa0d07cdd005f39 files/di
 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
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFWie8wUpWvClEHQoRAoUhAKCECLxA5Ct3+Sq0uaOaYTNnvszSwQCgipED
-uAAAiRUuwlYtdGKCRVaJGGU=
-=QVk3
------END PGP SIGNATURE-----
diff --git a/gnome-base/nautilus/files/digest-nautilus-2.10.1-r1 b/gnome-base/nautilus/files/digest-nautilus-2.10.1-r1
deleted file mode 100644
index c266db5124ee..000000000000
--- a/gnome-base/nautilus/files/digest-nautilus-2.10.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 976d725db15e901bc881dfb8c50145c1 nautilus-2.10.1.tar.bz2 5960278
-RMD160 d3e7e0f66e972087d45975f2efa0fe3bfcb7620e nautilus-2.10.1.tar.bz2 5960278
-SHA256 3bf0841e8d53ab5014807fc85eef9b16f077453910d2168c5baa747b4ec7201e nautilus-2.10.1.tar.bz2 5960278
diff --git a/gnome-base/nautilus/files/digest-nautilus-2.12.2 b/gnome-base/nautilus/files/digest-nautilus-2.12.2
deleted file mode 100644
index 1644b0f0b191..000000000000
--- a/gnome-base/nautilus/files/digest-nautilus-2.12.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1c1304e458eda551da11ed8c52b1faa2 nautilus-2.12.2.tar.bz2 4057461
-RMD160 6fedb1880febead00e5d4f4e71fb3cf219e1942e nautilus-2.12.2.tar.bz2 4057461
-SHA256 9b1a11fde474d0bc0891afeef912aaa01bf8189e453bb555b2977f60f98d5455 nautilus-2.12.2.tar.bz2 4057461
diff --git a/gnome-base/nautilus/files/digest-nautilus-2.16.0 b/gnome-base/nautilus/files/digest-nautilus-2.16.0
deleted file mode 100644
index c19355c08d4a..000000000000
--- a/gnome-base/nautilus/files/digest-nautilus-2.16.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 68318b70be545b6fc016017ae4e628aa nautilus-2.16.0.tar.bz2 4257541
-RMD160 5075cccb0a8407a67b3da408899553ac204873f3 nautilus-2.16.0.tar.bz2 4257541
-SHA256 675f28f78f2b82b8d61e353b3ff4a97011e98013947495c7b980670144c69ab0 nautilus-2.16.0.tar.bz2 4257541
diff --git a/gnome-base/nautilus/files/nautilus-2.10.1-deselect.patch b/gnome-base/nautilus/files/nautilus-2.10.1-deselect.patch
deleted file mode 100644
index 5dd1c10542aa..000000000000
--- a/gnome-base/nautilus/files/nautilus-2.10.1-deselect.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -NurdB nautilus-2.10.1/src/file-manager/fm-list-view.c nautilus-2.10.1-patched/src/file-manager/fm-list-view.c
---- nautilus-2.10.1/src/file-manager/fm-list-view.c	2005-04-11 03:05:58.000000000 -0500
-+++ nautilus-2.10.1-patched/src/file-manager/fm-list-view.c	2005-07-12 20:19:32.000000000 -0500
-@@ -248,8 +248,7 @@
- 		if ((event->button == 1 || event->button == 2)
- 		    && ((event->state & GDK_CONTROL_MASK) != 0 ||
- 			(event->state & GDK_SHIFT_MASK) == 0)
--		    && view->details->row_selected_on_button_down
--		    && (click_policy_auto_value == NAUTILUS_CLICK_POLICY_DOUBLE)) {
-+		    && view->details->row_selected_on_button_down) {
- 			if (!button_event_modifies_selection (event)) {
- 				gtk_tree_selection_unselect_all (selection);
- 				gtk_tree_selection_select_path (selection, path);
diff --git a/gnome-base/nautilus/files/nautilus-2.10.1-font_sizes.patch b/gnome-base/nautilus/files/nautilus-2.10.1-font_sizes.patch
deleted file mode 100644
index 28526de56364..000000000000
--- a/gnome-base/nautilus/files/nautilus-2.10.1-font_sizes.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -NurdB nautilus-2.10.1/libnautilus-private/nautilus-icon-container.c nautilus-2.10.1-patched/libnautilus-private/nautilus-icon-container.c
---- nautilus-2.10.1/libnautilus-private/nautilus-icon-container.c	2005-02-18 03:57:17.000000000 -0500
-+++ nautilus-2.10.1-patched/libnautilus-private/nautilus-icon-container.c	2005-07-12 08:10:01.000000000 -0500
-@@ -4353,13 +4353,13 @@
- 
-         details->zoom_level = NAUTILUS_ZOOM_LEVEL_STANDARD;
- 
--	details->font_size_table[NAUTILUS_ZOOM_LEVEL_SMALLEST] = -3 * PANGO_SCALE;
--        details->font_size_table[NAUTILUS_ZOOM_LEVEL_SMALLER] = -3 * PANGO_SCALE;
--        details->font_size_table[NAUTILUS_ZOOM_LEVEL_SMALL] = -2 * PANGO_SCALE;
-+	details->font_size_table[NAUTILUS_ZOOM_LEVEL_SMALLEST] = -2 * PANGO_SCALE;
-+        details->font_size_table[NAUTILUS_ZOOM_LEVEL_SMALLER] = -2 * PANGO_SCALE;
-+        details->font_size_table[NAUTILUS_ZOOM_LEVEL_SMALL] = -0 * PANGO_SCALE;
-         details->font_size_table[NAUTILUS_ZOOM_LEVEL_STANDARD] = 0 * PANGO_SCALE;
--        details->font_size_table[NAUTILUS_ZOOM_LEVEL_LARGE] = 2 * PANGO_SCALE;
--        details->font_size_table[NAUTILUS_ZOOM_LEVEL_LARGER] = 4 * PANGO_SCALE;
--        details->font_size_table[NAUTILUS_ZOOM_LEVEL_LARGEST] = 4 * PANGO_SCALE;
-+        details->font_size_table[NAUTILUS_ZOOM_LEVEL_LARGE] = 0 * PANGO_SCALE;
-+        details->font_size_table[NAUTILUS_ZOOM_LEVEL_LARGER] = 0 * PANGO_SCALE;
-+        details->font_size_table[NAUTILUS_ZOOM_LEVEL_LARGEST] = 0 * PANGO_SCALE;
- 
- 	container->details = details;
- 
diff --git a/gnome-base/nautilus/files/nautilus-2.12.1-symlink-del.patch b/gnome-base/nautilus/files/nautilus-2.12.1-symlink-del.patch
deleted file mode 100644
index 0bcae043dedd..000000000000
--- a/gnome-base/nautilus/files/nautilus-2.12.1-symlink-del.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --exclude-from=/home/dang/.diffrc -u -ruN nautilus-2.12.1.orig/libnautilus-private/nautilus-file-operations.c nautilus-2.12.1/libnautilus-private/nautilus-file-operations.c
---- nautilus-2.12.1.orig/libnautilus-private/nautilus-file-operations.c	2005-09-26 11:30:05.000000000 -0400
-+++ nautilus-2.12.1/libnautilus-private/nautilus-file-operations.c	2005-11-01 13:51:50.000000000 -0500
-@@ -1858,17 +1858,31 @@
- 		source_dir_uri = gnome_vfs_uri_get_parent (source_uri);
- 		target_uri = NULL;
- 		if (target_dir != NULL) {
-+			GnomeVFSURI *trash_find_uri;
-+
- 			if (target_is_trash) {
--				result = gnome_vfs_find_directory (source_uri, GNOME_VFS_DIRECTORY_KIND_TRASH,
-+				/* source_uri may be a symlink, which is resolved when finding the trash directory.
-+				 * Therefore, we use its parent dir if available */
-+				trash_find_uri = source_dir_uri != NULL ? source_dir_uri : source_uri;
-+				g_assert (trash_find_uri != NULL);
-+
-+				result = gnome_vfs_find_directory (trash_find_uri,
-+								   GNOME_VFS_DIRECTORY_KIND_TRASH,
- 								   &target_dir_uri, FALSE, FALSE, 0777);
--				if (result == GNOME_VFS_ERROR_NOT_FOUND && source_dir_uri != NULL) {
--					/* source_uri may be a broken symlink */
--					result = gnome_vfs_find_directory (source_dir_uri, GNOME_VFS_DIRECTORY_KIND_TRASH,
--									   &target_dir_uri, FALSE, FALSE, 0777);
--				}
- 
--				result = GNOME_VFS_OK;
-+				if (result != GNOME_VFS_OK) {
-+					char *trash_find_text_uri;
-+
-+					g_assert (target_dir_uri == NULL);
-+
-+					trash_find_text_uri = gnome_vfs_uri_to_string (trash_find_uri, GNOME_VFS_URI_HIDE_NONE);
-+					g_warning ("Unable to find trash for \"%s\": %s. Please file a bug report.",
-+						   trash_find_text_uri,
-+						   gnome_vfs_result_to_string (result));
-+					g_free (trash_find_text_uri);
-+				}
- 			}
-+
- 			if (target_dir_uri != NULL) {
- 				target_uri = append_basename (target_dir_uri, source_uri);
- 			}
diff --git a/gnome-base/nautilus/nautilus-2.10.1-r1.ebuild b/gnome-base/nautilus/nautilus-2.10.1-r1.ebuild
deleted file mode 100644
index 2291599ac10a..000000000000
--- a/gnome-base/nautilus/nautilus-2.10.1-r1.ebuild
+++ /dev/null
@@ -1,93 +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.10.1-r1.ebuild,v 1.15 2006/09/05 02:34:12 kumba Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="A filemanager for the Gnome2 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 sparc x86"
-IUSE="ogg vorbis gstreamer mad flac"
-# cups
-
-RDEPEND=">=dev-libs/glib-2.6
-	>=x11-libs/pango-1.2
-	>=x11-libs/gtk+-2.3
-	>=dev-libs/libxml2-2.4.7
-	=gnome-base/eel-${PV}*
-	>=gnome-base/gnome-vfs-2.9.1
-	>=media-sound/esound-0.2.27
-	>=gnome-base/gconf-2
-	>=gnome-base/libgnome-2.6
-	>=gnome-base/libgnomeui-2.6
-	>=gnome-base/gnome-desktop-2.9.91
-	>=media-libs/libart_lgpl-2.3.10
-	>=gnome-base/libbonobo-2.2
-	>=gnome-base/librsvg-2.0.1
-	>=gnome-base/orbit-2.4
-	>=x11-libs/startup-notification-0.8
-	>=media-libs/libexif-0.5.12
-	dev-libs/popt
-	virtual/fam
-	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* )
-	)"
-
-# FIXME : what to do with exif/jpeg config stuff ?
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.29
-	>=app-text/scrollkeeper-0.3.11
-	>=dev-util/pkgconfig-0.12.0"
-
-PDEPEND=">=x11-themes/gnome-icon-theme-1.1.91
-	x11-themes/gnome-themes"
-
-RESTRICT="test"
-
-DOCS="AUTHORS ChangeLo* HACKING MAINTAINERS NEWS README THANKS TODO"
-
-G2CONF="${G2CONF} $(use_enable gstreamer)"
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-
-	# use gstreamer for audio preview (patch by <foser@gentoo.org>)
-	use gstreamer && epatch ${FILESDIR}/${PN}-2.9.90-icon_view_gst.patch
-
-	# Upstream patch to improve font sizes for the icon view.
-	# See bug #96721.
-	epatch ${FILESDIR}/${P}-font_sizes.patch
-
-	# Upstream patch to fix deselecting items in list view and single click
-	# mode. See bug #95606.
-	epatch ${FILESDIR}/${P}-deselect.patch
-
-	# -- Component architecture has changed in 2.9 -- libgnomeprint patches
-	# no longer apply.
-
-	# stop nautilus linking to cdda/paranoia
-	sed -i -e "/^CORE_LIBS/s/\$CDDA_LIBS//" configure.in
-
-	if use gstreamer; then
-	WANT_AUTOCONF=2.5 autoheader || die
-	WANT_AUTOCONF=2.5 autoconf || die
-	WANT_AUTOMAKE=1.7 automake || die
-	fi
-}
-
-USE_DESTDIR="1"
diff --git a/gnome-base/nautilus/nautilus-2.12.2.ebuild b/gnome-base/nautilus/nautilus-2.12.2.ebuild
deleted file mode 100644
index 137ef1da995f..000000000000
--- a/gnome-base/nautilus/nautilus-2.12.2.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.12.2.ebuild,v 1.13 2006/09/05 02:34:12 kumba Exp $
-
-inherit virtualx gnome2 eutils
-
-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 sparc x86"
-IUSE=""
-# cups flac gstreamer mad ogg vorbis
-
-RDEPEND=">=media-libs/libart_lgpl-2.3.10
-	>=gnome-base/libbonobo-2.1
-	>=gnome-base/eel-2.12
-	>=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.11.1
-	>=gnome-base/orbit-2.4
-	>=x11-libs/pango-1.1.2
-	>=x11-libs/gtk+-2.6
-	>=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
-	dev-libs/popt
-	|| ( (
-		x11-libs/libICE
-		x11-libs/libSM )
-	virtual/x11 )
-	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.28
-	>=dev-util/pkgconfig-0.9"
-
-PDEPEND=">=x11-themes/gnome-icon-theme-1.1.91
-	x11-themes/gnome-themes"
-
-DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README THANKS TODO"
-USE_DESTDIR="1"
-
-
-src_unpack() {
-	unpack "${A}"
-	cd "${S}"
-
-	epatch ${FILESDIR}/${PN}-2.12.1-symlink-del.patch
-}
-
-src_test() {
-	if hasq userpriv $FEATURES ;
-	then
-		Xmake check || die "Test phase failed"
-	fi
-}
diff --git a/gnome-base/nautilus/nautilus-2.16.0.ebuild b/gnome-base/nautilus/nautilus-2.16.0.ebuild
deleted file mode 100644
index 768b6669cc1b..000000000000
--- a/gnome-base/nautilus/nautilus-2.16.0.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.0.ebuild,v 1.6 2006/10/14 20:50:07 vapier Exp $
-
-inherit virtualx gnome2 eutils
-
-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="${G2CONF} --disable-update-mimedb $(use_enable beagle)"
-}
-
-src_test() {
-	if hasq userpriv $FEATURES ; then
-		Xmake check || die "Test phase failed"
-	fi
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# fix relative include path breaking libIDL (#129366)
-	epatch ${FILESDIR}/${PN}-2.16.0-idl_include.patch
-}