Ensure correct automake version is used for regen. Remove old versions and (lots of) stale patches

(Portage version: 2.1.2_rc2)
 (Signed Manifest commit)

16 files changed, 12 insertions, 687 deletions

diff --git a/gnome-base/gnome-vfs/Manifest b/gnome-base/gnome-vfs/Manifest
index cda075c0ff97..38c3a9dae86c 100644
--- a/gnome-base/gnome-vfs/Manifest
+++ b/gnome-base/gnome-vfs/Manifest
@@ -25,22 +25,6 @@ AUX gnome-vfs-2-CAN-2005-0706.patch 490 RMD160 b0609022ed5ce0b782342ab7f1771ded6
 MD5 ba8ad5c040af8bd498c9ec71ac1df40e files/gnome-vfs-2-CAN-2005-0706.patch 490
 RMD160 b0609022ed5ce0b782342ab7f1771ded69b44fbf files/gnome-vfs-2-CAN-2005-0706.patch 490
 SHA256 aa360ff6aff9ad766b97f96659f3440a7c5fddad80166170b7cf2e43f3bf0964 files/gnome-vfs-2-CAN-2005-0706.patch 490
-AUX gnome-vfs-2.10.1-date_time_stamp.patch 2297 RMD160 209b4f2a34e405064afe3c5ee493fc97daa97e72 SHA1 cde3c45784fb97156c8a57d550a32f892c7d7b2d SHA256 5e605882a72ac220ab3f2d2066a4c0860f4bde49725c40dd2ef59b1dd27483f6
-MD5 c4482dd33a470e671d27a00eb8fbe044 files/gnome-vfs-2.10.1-date_time_stamp.patch 2297
-RMD160 209b4f2a34e405064afe3c5ee493fc97daa97e72 files/gnome-vfs-2.10.1-date_time_stamp.patch 2297
-SHA256 5e605882a72ac220ab3f2d2066a4c0860f4bde49725c40dd2ef59b1dd27483f6 files/gnome-vfs-2.10.1-date_time_stamp.patch 2297
-AUX gnome-vfs-2.10.1-fbsd.patch 1505 RMD160 db440f5ea084fa27d39fd7b7a5bc14082b75f3dc SHA1 cf4fea48a0d5e50c2ab6271fa04a386c8a9e3c36 SHA256 e684217ecfdf74ac75d124885a7281bbd9e112703544012f58a604afa40b6bde
-MD5 c599d081cb908d1fe6851ab69d80a7fa files/gnome-vfs-2.10.1-fbsd.patch 1505
-RMD160 db440f5ea084fa27d39fd7b7a5bc14082b75f3dc files/gnome-vfs-2.10.1-fbsd.patch 1505
-SHA256 e684217ecfdf74ac75d124885a7281bbd9e112703544012f58a604afa40b6bde files/gnome-vfs-2.10.1-fbsd.patch 1505
-AUX gnome-vfs-2.10.1-samba-close_fn.patch 1895 RMD160 9fca7c8e9c74ffb47b788a4cf9c81e492a091559 SHA1 9c497b8626e8e706499a32b31dc28df1af658379 SHA256 5f4974113f8c311559ed6d070a8e2c7188d3dd383aa84c71159d19ca7c9b94ac
-MD5 75d0133c9ee4ef3355b25dad13c6cd9a files/gnome-vfs-2.10.1-samba-close_fn.patch 1895
-RMD160 9fca7c8e9c74ffb47b788a4cf9c81e492a091559 files/gnome-vfs-2.10.1-samba-close_fn.patch 1895
-SHA256 5f4974113f8c311559ed6d070a8e2c7188d3dd383aa84c71159d19ca7c9b94ac files/gnome-vfs-2.10.1-samba-close_fn.patch 1895
-AUX gnome-vfs-2.11.92-fbsd.patch 1036 RMD160 d18f0ed611b42668b3592830c038b425d97ba278 SHA1 5cd5fddbc24cf02c28e59348aa835fc4649ec5e4 SHA256 d349d8b44324f1667215e3ec03ce34828dc81ad07a1ba4f655a70e084c54da13
-MD5 6aa77e036ebb110dad9bc8244c3a7081 files/gnome-vfs-2.11.92-fbsd.patch 1036
-RMD160 d18f0ed611b42668b3592830c038b425d97ba278 files/gnome-vfs-2.11.92-fbsd.patch 1036
-SHA256 d349d8b44324f1667215e3ec03ce34828dc81ad07a1ba4f655a70e084c54da13 files/gnome-vfs-2.11.92-fbsd.patch 1036
 AUX gnome-vfs-2.12.0-afs.patch 663 RMD160 a8ac6fbb9792b02090d3783ce10481bbc6b3b830 SHA1 fc7eb54b19a3bf43f1edc253c6517ea9bb60cb6c SHA256 a0bef85feae74a1ecc46f148a476d295e65c92b7a379546fb68186a7733e2e00
 MD5 59ad154c6254211757fde7973afffc14 files/gnome-vfs-2.12.0-afs.patch 663
 RMD160 a8ac6fbb9792b02090d3783ce10481bbc6b3b830 files/gnome-vfs-2.12.0-afs.patch 663
@@ -57,53 +41,25 @@ AUX gnome-vfs-2.16.0-no-dbus-crash.patch 710 RMD160 816b75d144fc264a34e45f0e2d17
 MD5 83ce05e705bb1615ecc14c41d848ab96 files/gnome-vfs-2.16.0-no-dbus-crash.patch 710
 RMD160 816b75d144fc264a34e45f0e2d17e37f528f1682 files/gnome-vfs-2.16.0-no-dbus-crash.patch 710
 SHA256 b68247cc6abf30d183efb51480793917e820ce461b0c62003321aceced177345 files/gnome-vfs-2.16.0-no-dbus-crash.patch 710
-AUX gnome-vfs-2.8.3-reiser4_support.patch 710 RMD160 62c33efed3b6dc44e283174b03fa577dcae98022 SHA1 87258bfba606d76719d6e946ceaa8a7b13e51733 SHA256 e13e61cb02eeeed5bb654fb203cb47c6da9dca4fa7f317e3bdcaf22d4d379bf5
-MD5 09f0fab6d414a859d0f979bef3e10dfb files/gnome-vfs-2.8.3-reiser4_support.patch 710
-RMD160 62c33efed3b6dc44e283174b03fa577dcae98022 files/gnome-vfs-2.8.3-reiser4_support.patch 710
-SHA256 e13e61cb02eeeed5bb654fb203cb47c6da9dca4fa7f317e3bdcaf22d4d379bf5 files/gnome-vfs-2.8.3-reiser4_support.patch 710
 DIST gnome-vfs-1.0.5.tar.gz 1048954 RMD160 76fbf8e590e41d2cac39faef9edc85e2df02c21a SHA1 41156323969d44e3f14ce481b81bfdb5d1deba49 SHA256 9616c0ba22dd0fd8b269645edc3539d0e8c8a3bee11c1fbf0c64b6a1d62654e1
-DIST gnome-vfs-2.12.1.1.tar.bz2 1726588 RMD160 b96cd620ce60131c0ff467fd277d89ac76419e09 SHA1 48e484663f0d0f5e2a858d2f6e6a5a702e831734 SHA256 c6294cb9553a0d059ac307427b8ac89048103d48255996a879686a74024cd01c
-DIST gnome-vfs-2.12.2.tar.bz2 1558218 RMD160 831d83c791631e7273fdebec1047da6055757104 SHA1 fa8248e18cb8b44f617a5b1bb776df37628828ea SHA256 46f80ead7c52a8c5a3fa7beac2d42385c6bc9552fa28aa5068e1a251d708e177
 DIST gnome-vfs-2.14.2.tar.bz2 1816194 RMD160 e0a67e3576d72a86c898208a93ad8ee52f72f870 SHA1 ffd2e5f229495f55587d8499e5f2b8b8a76e5448 SHA256 15da9d174d2373826a6921c8af2aac18aa64c6d93ac201903c9fb432e142bba7
-DIST gnome-vfs-2.16.0.tar.bz2 1890562 RMD160 9f4008c0e8cae26513006e4c1f1c1c126116d8ef SHA1 4f0f6e7288c5cd2bc667f11729596e8be92376a0 SHA256 d1854eed8ef93ac2f111d56367106159153bb5857793a880b13271bb5fb34361
-DIST gnome-vfs-2.16.1.tar.bz2 1893290 RMD160 e43d47a58dc9dd4ceb6155d5c4b8229dd8be85f0 SHA1 05d57800d18284d970d692190a08e06f1ed4b446 SHA256 8e6aaa1fb1fcf682484b27bbdf4335234752868ef3bc84ea1102a6ebf0d89067
 DIST gnome-vfs-2.16.2.tar.bz2 1852172 RMD160 805a009c439e3b416e99b0d543f1364db7c03c42 SHA1 6aaf7223ab95874d5171346ffa497ae262fd4653 SHA256 5ba60ec5172368674bcb1993995c498925e3cd9a409d07d0aaf9623def55a947
 EBUILD gnome-vfs-1.0.5-r4.ebuild 2344 RMD160 b640006a94f83e0ff03e42dc6c1b53d6284981b5 SHA1 71ead4df9ced58fc6da65f50171d42705547435b SHA256 e9e8994af504fcaa2488d8596a57b23aed21f58a1cdb76024856712446550310
 MD5 4d4561de0de97b0258e85a50c25d5301 gnome-vfs-1.0.5-r4.ebuild 2344
 RMD160 b640006a94f83e0ff03e42dc6c1b53d6284981b5 gnome-vfs-1.0.5-r4.ebuild 2344
 SHA256 e9e8994af504fcaa2488d8596a57b23aed21f58a1cdb76024856712446550310 gnome-vfs-1.0.5-r4.ebuild 2344
-EBUILD gnome-vfs-2.12.1.1-r1.ebuild 2154 RMD160 084a846cedc3ac19b979e0a48a7bc17701988c2d SHA1 d56acde76fc1e14cb3b6cf35e37d0c9ac0b1329a SHA256 3fc7f82bbcb8ebfc9247b58523f30d137c999a276aa037c68bb20e278df3c7c0
-MD5 bb8da45c64d9c097643a1e2ad4d9d1cf gnome-vfs-2.12.1.1-r1.ebuild 2154
-RMD160 084a846cedc3ac19b979e0a48a7bc17701988c2d gnome-vfs-2.12.1.1-r1.ebuild 2154
-SHA256 3fc7f82bbcb8ebfc9247b58523f30d137c999a276aa037c68bb20e278df3c7c0 gnome-vfs-2.12.1.1-r1.ebuild 2154
-EBUILD gnome-vfs-2.12.2.ebuild 2151 RMD160 b28b9e589db5301cea669143d1a6c15f690675a3 SHA1 42c618d23664e26e0df5243673681655fd49a05f SHA256 6b98f02de40832a2614ef64f4fc0e4bdf50bb6cfd5063ca3e94b80e259bc62c5
-MD5 506d0a0c3ac6e6b339c2db5eda2f4073 gnome-vfs-2.12.2.ebuild 2151
-RMD160 b28b9e589db5301cea669143d1a6c15f690675a3 gnome-vfs-2.12.2.ebuild 2151
-SHA256 6b98f02de40832a2614ef64f4fc0e4bdf50bb6cfd5063ca3e94b80e259bc62c5 gnome-vfs-2.12.2.ebuild 2151
 EBUILD gnome-vfs-2.14.2-r1.ebuild 1999 RMD160 f34199f452b2c04ff28f7b8450efc83b12a30163 SHA1 3af9d2023675b79e012e684a9e06b4afb9890635 SHA256 873e5ca38af3dfd7795c1599ad5f064c3ce4bb04f5ca3f6387d62621815222a0
 MD5 16e63b60b39516a2dc44751d3e59ba8a gnome-vfs-2.14.2-r1.ebuild 1999
 RMD160 f34199f452b2c04ff28f7b8450efc83b12a30163 gnome-vfs-2.14.2-r1.ebuild 1999
 SHA256 873e5ca38af3dfd7795c1599ad5f064c3ce4bb04f5ca3f6387d62621815222a0 gnome-vfs-2.14.2-r1.ebuild 1999
-EBUILD gnome-vfs-2.14.2.ebuild 1858 RMD160 dfce09e80ef925261242238408da62019149c2cb SHA1 012945ab6c9eebffc2315a521f9e10479727f177 SHA256 c4753afff8a8bf7b9f3a6cfb9fbe037c90eab505dc24d68ede2b057dc6110f2b
-MD5 60dc204e2204eead0a179e3f6ec479a4 gnome-vfs-2.14.2.ebuild 1858
-RMD160 dfce09e80ef925261242238408da62019149c2cb gnome-vfs-2.14.2.ebuild 1858
-SHA256 c4753afff8a8bf7b9f3a6cfb9fbe037c90eab505dc24d68ede2b057dc6110f2b gnome-vfs-2.14.2.ebuild 1858
-EBUILD gnome-vfs-2.16.0-r1.ebuild 2461 RMD160 532fdbff188fffbf2ca5d3fe9b196858d2aa75a0 SHA1 1a1f7ecce880bb57a635eeb221299f70db1b3314 SHA256 f85b69a36eae204eb10c194978586fa27fe760ab2c32e03056faed090bc851a4
-MD5 56c89f03bd4ae29a203cb6076d50fbc8 gnome-vfs-2.16.0-r1.ebuild 2461
-RMD160 532fdbff188fffbf2ca5d3fe9b196858d2aa75a0 gnome-vfs-2.16.0-r1.ebuild 2461
-SHA256 f85b69a36eae204eb10c194978586fa27fe760ab2c32e03056faed090bc851a4 gnome-vfs-2.16.0-r1.ebuild 2461
-EBUILD gnome-vfs-2.16.1.ebuild 2458 RMD160 745364b7239a617d92932084d3d20d9112d73b19 SHA1 2eb17c616515b871762045db9469d219636af2d7 SHA256 422389b392b01b3889718d1ea820b4d5edf18da755482eee7036a86b1701ccd7
-MD5 9d6feeec09ad2a43c58bea9acfff056e gnome-vfs-2.16.1.ebuild 2458
-RMD160 745364b7239a617d92932084d3d20d9112d73b19 gnome-vfs-2.16.1.ebuild 2458
-SHA256 422389b392b01b3889718d1ea820b4d5edf18da755482eee7036a86b1701ccd7 gnome-vfs-2.16.1.ebuild 2458
-EBUILD gnome-vfs-2.16.2.ebuild 2458 RMD160 4eef81f1dc75dcb5defdc557b5f7d231a9af4ee2 SHA1 62ea50d146641027b56735e89300fbeab34e2737 SHA256 e9114ea4c53e349257df527eeb5138cfb74cd87f34c1c782f2b59c0abf485b0b
-MD5 bb13246eab73d4a102288dfa042830ce gnome-vfs-2.16.2.ebuild 2458
-RMD160 4eef81f1dc75dcb5defdc557b5f7d231a9af4ee2 gnome-vfs-2.16.2.ebuild 2458
-SHA256 e9114ea4c53e349257df527eeb5138cfb74cd87f34c1c782f2b59c0abf485b0b gnome-vfs-2.16.2.ebuild 2458
-MISC ChangeLog 29207 RMD160 b3e2f6affd5275231542890d2de941398db65961 SHA1 fc1aae0e6f59a753356ae9402f189d2c346ca0cc SHA256 de63c046da72b9532e33530aad22f7158c9deaa9095c8e921bc50f82195581ef
-MD5 1d86442f85caa95cbe7f4ee04c3df17a ChangeLog 29207
-RMD160 b3e2f6affd5275231542890d2de941398db65961 ChangeLog 29207
-SHA256 de63c046da72b9532e33530aad22f7158c9deaa9095c8e921bc50f82195581ef ChangeLog 29207
+EBUILD gnome-vfs-2.16.2.ebuild 2450 RMD160 ec1c2017add4cca7d0d92b864b382125f6878e8f SHA1 4589485a90614b10aef2b49c73b4fdf1e33a4f6f SHA256 b791a07669cecb8b693d52f2c40a6c340d89fd1f2112e5fcfc7a497f7c5513f9
+MD5 f07dc836d9845fe3da907aa22cf6aa80 gnome-vfs-2.16.2.ebuild 2450
+RMD160 ec1c2017add4cca7d0d92b864b382125f6878e8f gnome-vfs-2.16.2.ebuild 2450
+SHA256 b791a07669cecb8b693d52f2c40a6c340d89fd1f2112e5fcfc7a497f7c5513f9 gnome-vfs-2.16.2.ebuild 2450
+MISC ChangeLog 29739 RMD160 4ece95aae92ac9cbb3dbd0123e7fdc4deec36596 SHA1 a871b868b927a4f3179010bbd43ca0653d91e039 SHA256 872be82946df97dc2938209d458cb4293eaf0979906f1f7db1f8eb89b3049c58
+MD5 06b621644ccd73f05b49caeef38b654a ChangeLog 29739
+RMD160 4ece95aae92ac9cbb3dbd0123e7fdc4deec36596 ChangeLog 29739
+SHA256 872be82946df97dc2938209d458cb4293eaf0979906f1f7db1f8eb89b3049c58 ChangeLog 29739
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -111,31 +67,16 @@ SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 metadata
 MD5 767983ee5ecee03dc79ed4733eb80cbc files/digest-gnome-vfs-1.0.5-r4 250
 RMD160 c6e3aaa50be28ce7cffdec11a9a98a075f31b424 files/digest-gnome-vfs-1.0.5-r4 250
 SHA256 7d329f59bf1edad718600431059a085ce7abe32c31d05bc4c1efa721d25dcbf3 files/digest-gnome-vfs-1.0.5-r4 250
-MD5 6486cd657178e70cab45b99156312eae files/digest-gnome-vfs-2.12.1.1-r1 262
-RMD160 b5fbc60ae21bfd239dd8bfdbe0255d56ceefc6c3 files/digest-gnome-vfs-2.12.1.1-r1 262
-SHA256 24bee624ac84e2e208dc5da6ac9a239e84b3dad96b99086771bf8265aa02d48c files/digest-gnome-vfs-2.12.1.1-r1 262
-MD5 e2667a783d3d83dbbd3e30a3f87f5384 files/digest-gnome-vfs-2.12.2 256
-RMD160 f56efeac7eb528be626ac29465dfa1de7de8e9bf files/digest-gnome-vfs-2.12.2 256
-SHA256 5b7654811e3e2d61f996efec3f936ffd068908dd3939bc42c1e287bee5f58190 files/digest-gnome-vfs-2.12.2 256
-MD5 524f567956bcd255067b935908595f46 files/digest-gnome-vfs-2.14.2 256
-RMD160 94eb0c6421e6f2d056120e84e6a1bc9ae1e2cf10 files/digest-gnome-vfs-2.14.2 256
-SHA256 bb570a6e1ed458d3e0173c04dcdddf3bd535f6a5cbda70592e5c472edbc9aa8a files/digest-gnome-vfs-2.14.2 256
 MD5 524f567956bcd255067b935908595f46 files/digest-gnome-vfs-2.14.2-r1 256
 RMD160 94eb0c6421e6f2d056120e84e6a1bc9ae1e2cf10 files/digest-gnome-vfs-2.14.2-r1 256
 SHA256 bb570a6e1ed458d3e0173c04dcdddf3bd535f6a5cbda70592e5c472edbc9aa8a files/digest-gnome-vfs-2.14.2-r1 256
-MD5 159d51b5a3c189bee847cd80eeb309ce files/digest-gnome-vfs-2.16.0-r1 256
-RMD160 7260a5f39064295fe4e11d6572b0c4203f10b180 files/digest-gnome-vfs-2.16.0-r1 256
-SHA256 74dddd6b6a6332cab3a356cf0656795443dbeb2ba66317c54dc3b5ee6fdf5b64 files/digest-gnome-vfs-2.16.0-r1 256
-MD5 528a94a39aedeb00e6cb2496c4a3b25e files/digest-gnome-vfs-2.16.1 256
-RMD160 c59f504ea9acfc300e0fa3dcdd040229b416783a files/digest-gnome-vfs-2.16.1 256
-SHA256 4bd59137e76e6400c8b5656838e1a06fe3a42fe8fa070b2ca9c78148b1856587 files/digest-gnome-vfs-2.16.1 256
 MD5 7448055a5029914820b4ed492031b304 files/digest-gnome-vfs-2.16.2 256
 RMD160 cbca2e6b91b5f8a901b0d85b80d0815bd680b6c6 files/digest-gnome-vfs-2.16.2 256
 SHA256 27f00d441abd897dca4bf9e1affba99edfb41769043b3ce0a5538930f61bd453 files/digest-gnome-vfs-2.16.2 256
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFXgNFomPajV0RnrERAqWGAJ4jlscJ13Gzgr42OjyPmkeOy8XS0gCggxXN
-o7xUu3qi6O6YcFkYcJUC2N0=
-=kMZP
+iD8DBQFFYQvPkeYb6olFHJcRAhJYAJ9xEf8rHqSke1uxvSG4LBVWdblrJwCeNJ+n
+zep5OKZORThopIYyqX6hUt0=
+=UgVd
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.12.1.1-r1 b/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.12.1.1-r1
deleted file mode 100644
index 264eee253749..000000000000
--- a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.12.1.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 bc62212600167acf78c9771add5cce7e gnome-vfs-2.12.1.1.tar.bz2 1726588
-RMD160 b96cd620ce60131c0ff467fd277d89ac76419e09 gnome-vfs-2.12.1.1.tar.bz2 1726588
-SHA256 c6294cb9553a0d059ac307427b8ac89048103d48255996a879686a74024cd01c gnome-vfs-2.12.1.1.tar.bz2 1726588
diff --git a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.12.2 b/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.12.2
deleted file mode 100644
index 7b30a1f2c98f..000000000000
--- a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.12.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 4d7b9c14af29a9bf813ab4831eeeacbb gnome-vfs-2.12.2.tar.bz2 1558218
-RMD160 831d83c791631e7273fdebec1047da6055757104 gnome-vfs-2.12.2.tar.bz2 1558218
-SHA256 46f80ead7c52a8c5a3fa7beac2d42385c6bc9552fa28aa5068e1a251d708e177 gnome-vfs-2.12.2.tar.bz2 1558218
diff --git a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.14.2 b/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.14.2
deleted file mode 100644
index c361566b351b..000000000000
--- a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.14.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b657e31974d6981adf9b2c4db981f62c gnome-vfs-2.14.2.tar.bz2 1816194
-RMD160 e0a67e3576d72a86c898208a93ad8ee52f72f870 gnome-vfs-2.14.2.tar.bz2 1816194
-SHA256 15da9d174d2373826a6921c8af2aac18aa64c6d93ac201903c9fb432e142bba7 gnome-vfs-2.14.2.tar.bz2 1816194
diff --git a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.16.0-r1 b/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.16.0-r1
deleted file mode 100644
index 29f11795b592..000000000000
--- a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.16.0-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 fdea9d7be42320c3fa6a09e645613480 gnome-vfs-2.16.0.tar.bz2 1890562
-RMD160 9f4008c0e8cae26513006e4c1f1c1c126116d8ef gnome-vfs-2.16.0.tar.bz2 1890562
-SHA256 d1854eed8ef93ac2f111d56367106159153bb5857793a880b13271bb5fb34361 gnome-vfs-2.16.0.tar.bz2 1890562
diff --git a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.16.1 b/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.16.1
deleted file mode 100644
index 986e9789c93c..000000000000
--- a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.16.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2d9f7b01496ecc227015bc7a08fb798f gnome-vfs-2.16.1.tar.bz2 1893290
-RMD160 e43d47a58dc9dd4ceb6155d5c4b8229dd8be85f0 gnome-vfs-2.16.1.tar.bz2 1893290
-SHA256 8e6aaa1fb1fcf682484b27bbdf4335234752868ef3bc84ea1102a6ebf0d89067 gnome-vfs-2.16.1.tar.bz2 1893290
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.10.1-date_time_stamp.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.10.1-date_time_stamp.patch
deleted file mode 100644
index 7164047f3cc5..000000000000
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.10.1-date_time_stamp.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-? .303470.patch.swp
-? compile
-? gnome-vfs-zip
-? imported/fnmatch/Makefile
-? imported/fnmatch/Makefile.in
-? libgnomevfs/.gnome-vfs-xfer.c.swp
-? libgnomevfs/171495.patch
-Index: libgnomevfs/gnome-vfs-xfer.c
-===================================================================
-RCS file: /cvs/gnome/gnome-vfs/libgnomevfs/gnome-vfs-xfer.c,v
-retrieving revision 1.123
-diff -u -p -r1.123 gnome-vfs-xfer.c
---- libgnomevfs/gnome-vfs-xfer.c	6 May 2005 12:19:40 -0000	1.123
-+++ libgnomevfs/gnome-vfs-xfer.c	9 May 2005 11:29:32 -0000
-@@ -1682,28 +1682,36 @@ copy_directory (GnomeVFSFileInfo *source
- 	gnome_vfs_directory_close (dest_directory_handle);
- 	gnome_vfs_directory_close (source_directory_handle);
- 
--	if (result == GNOME_VFS_OK) {
-+	if (result == GNOME_VFS_OK) {			
- 		GnomeVFSFileInfo *info;
--		info = gnome_vfs_file_info_new ();
-+
-+		if (target_dir_info && GNOME_VFS_FILE_INFO_SGID (target_dir_info)) {
-+			info = gnome_vfs_file_info_dup (source_file_info);
-+			info->gid = target_dir_info->gid;
-+		} else {
-+			/* No need to dup the file info in this case */
-+			gnome_vfs_file_info_ref (source_file_info);
-+			info = source_file_info;
-+		}
-+		
- 		/* FIXME the modules should ignore setting of permissions if
- 		 * "valid_fields & GNOME_VFS_FILE_INFO_FIELDS_PERMISSIONS" is clear
- 		 * for now, make sure permissions aren't set to 000
- 		 */
--		gnome_vfs_file_info_copy (source_file_info, info);
--		if (target_dir_info && GNOME_VFS_FILE_INFO_SGID(target_dir_info)) {
--			info->gid = target_dir_info->gid;
--		}
--		if ((source_file_info->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_PERMISSIONS) != 0) {
-+		if ((info->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_PERMISSIONS) != 0) {
-+			
- 			/* Call this separately from the time one, since one of them may fail,
- 			   making the other not run. */
- 			gnome_vfs_set_file_info_uri (target_dir_uri, info, 
--						     GNOME_VFS_SET_FILE_INFO_OWNER | GNOME_VFS_SET_FILE_INFO_PERMISSIONS);
-+						     GNOME_VFS_SET_FILE_INFO_OWNER | 
-+						     GNOME_VFS_SET_FILE_INFO_PERMISSIONS);
- 		}
- 		
- 		/* Call this last so nothing else changes the times */
- 		gnome_vfs_set_file_info_uri (target_dir_uri, info, GNOME_VFS_SET_FILE_INFO_TIME);
- 		gnome_vfs_file_info_unref (info);
- 	}
-+	
- 	if (target_dir_info) {
- 		gnome_vfs_file_info_unref (target_dir_info);
- 	}
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.10.1-fbsd.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.10.1-fbsd.patch
deleted file mode 100644
index e8a83da20092..000000000000
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.10.1-fbsd.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -ur gnome-vfs-2.10.1/libgnomevfs/gnome-vfs-resolve.c gnome-vfs-2.10.1-fbsd/libgnomevfs/gnome-vfs-resolve.c
---- gnome-vfs-2.10.1/libgnomevfs/gnome-vfs-resolve.c	2004-12-03 14:08:20.000000000 +0100
-+++ gnome-vfs-2.10.1-fbsd/libgnomevfs/gnome-vfs-resolve.c	2005-08-20 13:03:31.000000000 +0200
-@@ -172,8 +172,13 @@
- 	   switch (error) {
- 			 
- 	   case EAI_NONAME: return GNOME_VFS_ERROR_HOST_NOT_FOUND;
--	   case EAI_ADDRFAMILY:		
--	   case EAI_NODATA: return GNOME_VFS_ERROR_HOST_HAS_NO_ADDRESS;
-+#ifdef EAI_ADDRFAMILY
-+	   case EAI_ADDRFAMILY:
-+#endif
-+#ifdef EAI_NODATA
-+	   case EAI_NODATA:
-+#endif
-+	   	return GNOME_VFS_ERROR_HOST_HAS_NO_ADDRESS;
- 	   case EAI_SYSTEM: return gnome_vfs_result_from_errno ();
- 	   case EAI_FAIL:
- 	   case EAI_AGAIN: return GNOME_VFS_ERROR_NAMESERVER;
-diff -ur gnome-vfs-2.10.1/modules/sftp-method.c gnome-vfs-2.10.1-fbsd/modules/sftp-method.c
---- gnome-vfs-2.10.1/modules/sftp-method.c	2004-12-03 14:08:20.000000000 +0100
-+++ gnome-vfs-2.10.1-fbsd/modules/sftp-method.c	2005-08-20
-@@ -1243,7 +1243,9 @@
- 		if (io_status == G_IO_STATUS_NORMAL) {
- 			buffer[len] = 0;
- 			if (g_str_has_suffix (buffer, "password: ") ||
-+			    g_str_has_suffix (buffer, "password:")  ||
- 			    g_str_has_suffix (buffer, "Password: ") ||
-+			    g_str_has_suffix (buffer, "Password:")  ||
- 			    g_str_has_prefix (buffer, "Enter passphrase for key")) {
- 				if (!done_auth && gnome_vfs_uri_get_password (uri) != NULL) {
- 					password = g_strdup (gnome_vfs_uri_get_password (uri));
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.10.1-samba-close_fn.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.10.1-samba-close_fn.patch
deleted file mode 100644
index e8608b63509f..000000000000
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.10.1-samba-close_fn.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff --exclude-from=/home/dang/.diffrc -u -ruN gnome-vfs-2.10.1/config.h.in gnome-vfs-2.10.1.fixed/config.h.in
---- gnome-vfs-2.10.1/config.h.in	2005-04-11 03:07:33.000000000 -0400
-+++ gnome-vfs-2.10.1.fixed/config.h.in	2005-09-02 15:19:13.000000000 -0400
-@@ -253,6 +253,9 @@
- /* Defined if flags availible in SMBCCTXT */
- #undef HAVE_SAMBA_FLAGS
- 
-+/* Defined if close_fn is in SMBCCTXT instead of close */
-+#undef HAVE_SAMBA_CLOSE_FN
-+
- /* Define to 1 if you have the `setegid' function. */
- #undef HAVE_SETEGID
- 
-diff --exclude-from=/home/dang/.diffrc -u -ruN gnome-vfs-2.10.1/configure.in gnome-vfs-2.10.1.fixed/configure.in
---- gnome-vfs-2.10.1/configure.in	2005-03-31 21:28:41.000000000 -0500
-+++ gnome-vfs-2.10.1.fixed/configure.in	2005-09-02 14:54:27.000000000 -0400
-@@ -541,6 +541,9 @@
- 		AC_CHECK_MEMBER(SMBCCTX.flags,
- 				[AC_DEFINE(HAVE_SAMBA_FLAGS,, [Defined if flags availible in SMBCCTXT])],,
- 				[#include <libsmbclient.h>])
-+		AC_CHECK_MEMBER(SMBCCTX.close_fn,
-+				[AC_DEFINE(HAVE_SAMBA_CLOSE_FN,, [Defined if close_fn used in SMBCCTXT instead of close])],,
-+				[#include <libsmbclient.h>])
- 		CPPFLAGS="$CPPFLAGS_save"
- 	else
- 		SAMBA_CFLAGS=""
-diff --exclude-from=/home/dang/.diffrc -u -ruN gnome-vfs-2.10.1/modules/smb-method.c gnome-vfs-2.10.1.fixed/modules/smb-method.c
---- gnome-vfs-2.10.1/modules/smb-method.c	2005-03-02 18:44:11.000000000 -0500
-+++ gnome-vfs-2.10.1.fixed/modules/smb-method.c	2005-09-02 14:57:00.000000000 -0400
-@@ -1425,7 +1425,11 @@
- 
- 		/* Important: perform_authentication leaves and re-enters the lock! */
- 		while (perform_authentication (&actx) > 0) {
-+#ifndef HAVE_SAMBA_CLOSE_FN
- 			r = smb_context->close (smb_context, handle->file);
-+#else /* HAVE_SAMBA_CLOSE_FN */
-+			r = smb_context->close_fn (smb_context, handle->file);
-+#endif /* HAVE_SAMBA_CLOSE_FN */
- 			actx.res = (r >= 0) ? GNOME_VFS_OK : gnome_vfs_result_from_errno ();
- 		}
- 
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.11.92-fbsd.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.11.92-fbsd.patch
deleted file mode 100644
index a99bd26b5043..000000000000
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.11.92-fbsd.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: gnome-vfs-2.11.92/libgnomevfs/gnome-vfs-resolve.c
-===================================================================
---- gnome-vfs-2.11.92.orig/libgnomevfs/gnome-vfs-resolve.c
-+++ gnome-vfs-2.11.92/libgnomevfs/gnome-vfs-resolve.c
-@@ -174,7 +174,10 @@ _gnome_vfs_result_from_gai_error (int er
- #ifdef EAI_ADDRFAMILY
- 	   case EAI_ADDRFAMILY:		
- #endif
--	   case EAI_NODATA: return GNOME_VFS_ERROR_HOST_HAS_NO_ADDRESS;
-+#ifdef EAI_NODATA
-+	   case EAI_NODATA:
-+#endif
-+	   	return GNOME_VFS_ERROR_HOST_HAS_NO_ADDRESS;
- #ifdef EAI_SYSTEM
- 	   case EAI_SYSTEM: return gnome_vfs_result_from_errno ();
- #endif
-Index: gnome-vfs-2.11.92/modules/file-method.c
-===================================================================
---- gnome-vfs-2.11.92.orig/modules/file-method.c
-+++ gnome-vfs-2.11.92/modules/file-method.c
-@@ -51,6 +51,7 @@
- #include <string.h>
- #include <sys/stat.h>
- #include <sys/types.h>
-+#include <sys/param.h>
- #ifndef G_OS_WIN32		/* We don't want the ftruncate() in mingw's unistd.h */
- #include <unistd.h>
- #endif
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.8.3-reiser4_support.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.8.3-reiser4_support.patch
deleted file mode 100644
index 2fbddfc9ba3e..000000000000
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.8.3-reiser4_support.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -r -u --from-file=gnome-vfs-2.7.92.orig gnome-vfs-2.7.92.orig/libgnomevfs/gnome-vfs-filesystem-type.c gnome-vfs-2.7.92/libgnomevfs/gnome-vfs-filesystem-type.c
---- gnome-vfs-2.7.92.orig/libgnomevfs/gnome-vfs-filesystem-type.c	2004-09-12 16:25:59.650886232 +0100
-+++ gnome-vfs-2.7.92/libgnomevfs/gnome-vfs-filesystem-type.c	2004-09-12 22:43:46.278080336 +0100
-@@ -61,6 +61,7 @@
- 	{ "nwfs"     , N_("Netware Volume"), 0 },
- 	{ "proc"     , N_("System Volume"), 0 },
- 	{ "procfs"   , N_("System Volume"), 0 },
-+	{ "reiser4"  , N_("Reiser4 Linux Volume"), 1 },
- 	{ "reiserfs" , N_("ReiserFS Linux Volume"), 1 },
- 	{ "smbfs"    , N_("Windows Shared Volume"), 1 },
- 	{ "supermount",N_("SuperMount Volume"), 0 },
diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.12.1.1-r1.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.12.1.1-r1.ebuild
deleted file mode 100644
index 4ed706a6e3ce..000000000000
--- a/gnome-base/gnome-vfs/gnome-vfs-2.12.1.1-r1.ebuild
+++ /dev/null
@@ -1,88 +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/gnome-vfs/gnome-vfs-2.12.1.1-r1.ebuild,v 1.3 2006/09/06 05:10:14 kumba Exp $
-
-inherit eutils gnome2
-
-DESCRIPTION="Gnome Virtual Filesystem"
-HOMEPAGE="http://www.gnome.org/"
-LICENSE="GPL-2 LGPL-2"
-
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~sparc ~x86"
-IUSE="doc gnutls hal howl ipv6 samba ssl"
-
-RDEPEND=">=gnome-base/libbonobo-2.3.1
-	>=gnome-base/gconf-1.2
-	>=dev-libs/glib-2.6
-	>=gnome-base/orbit-2.12.4
-	>=dev-libs/libxml2-2.6
-	app-arch/bzip2
-	virtual/fam
-	gnome-base/gnome-mime-data
-	>=x11-misc/shared-mime-info-0.14
-	dev-libs/popt
-	samba? ( >=net-fs/samba-3 )
-	ssl? (
-		>=dev-libs/openssl-0.9.5
-		!gnome-extra/gnome-vfs-sftp )
-	gnutls? (
-		!ssl? (
-			net-libs/gnutls
-			!gnome-extra/gnome-vfs-sftp ) )
-	hal? (
-		>=sys-apps/hal-0.5
-		>=sys-apps/dbus-0.32
-		sys-apps/pmount )
-	howl? ( >=net-misc/howl-0.9.6-r1 )"
-
-# ssl/gnutls USE deps : if both are enabled choose openssl
-# foser <foser@gentoo.org> 19 Apr 2004
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.29
-	>=dev-util/pkgconfig-0.9
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README TODO"
-USE_DESTDIR="1"
-
-
-pkg_setup() {
-	G2CONF="--disable-schemas-install \
-		$(use_enable ssl openssl) \
-		$(use_enable gnutls)      \
-		$(use_enable samba)       \
-		$(use_enable ipv6)        \
-		$(use_enable hal)         \
-		$(use_enable howl)"
-
-	if use hal; then
-		G2CONF="${G2CONF} --with-hal-mount=/usr/bin/pmount-hal \
-			--with-hal-umount=/usr/bin/pumount \
-			--with-hal-eject=/usr/bin/eject"
-	fi
-
-	# this works because of the order of conifgure parsing
-	# so should always be behind the use_enable options
-	# foser <foser@gentoo.org 19 Apr 2004
-	use gnutls && use ssl && G2CONF="${G2CONF} --disable-gnutls"
-}
-
-src_unpack() {
-	unpack "${A}"
-	cd "${S}"
-
-	epatch ${FILESDIR}/${PN}-2.11.92-fbsd.patch
-	# Allow the Trash on afs filesystems (#106118)
-	epatch ${FILESDIR}/${PN}-2.12.0-afs.patch
-
-	autoconf || die "autoconf failed"
-}
-
-src_install() {
-	gnome2_src_install
-
-	# remove unused dir (#46567)
-	rmdir ${D}/usr/doc
-}
diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.12.2.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.12.2.ebuild
deleted file mode 100644
index 12ccd9ef45e7..000000000000
--- a/gnome-base/gnome-vfs/gnome-vfs-2.12.2.ebuild
+++ /dev/null
@@ -1,88 +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/gnome-vfs/gnome-vfs-2.12.2.ebuild,v 1.12 2006/09/06 05:10:14 kumba Exp $
-
-inherit eutils gnome2
-
-DESCRIPTION="Gnome Virtual Filesystem"
-HOMEPAGE="http://www.gnome.org/"
-LICENSE="GPL-2 LGPL-2"
-
-SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86"
-IUSE="doc gnutls hal howl ipv6 samba ssl"
-
-RDEPEND=">=gnome-base/libbonobo-2.3.1
-	>=gnome-base/gconf-1.2
-	>=dev-libs/glib-2.6
-	>=gnome-base/orbit-2.12.4
-	>=dev-libs/libxml2-2.6
-	app-arch/bzip2
-	virtual/fam
-	gnome-base/gnome-mime-data
-	>=x11-misc/shared-mime-info-0.14
-	dev-libs/popt
-	samba? ( >=net-fs/samba-3 )
-	ssl? (
-		>=dev-libs/openssl-0.9.5
-		!gnome-extra/gnome-vfs-sftp )
-	gnutls? (
-		!ssl? (
-			net-libs/gnutls
-			!gnome-extra/gnome-vfs-sftp ) )
-	hal? (
-		>=sys-apps/hal-0.5
-		>=sys-apps/dbus-0.32
-		sys-apps/pmount )
-	howl? ( >=net-misc/howl-0.9.6-r1 )"
-
-# ssl/gnutls USE deps : if both are enabled choose openssl
-# foser <foser@gentoo.org> 19 Apr 2004
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.29
-	>=dev-util/pkgconfig-0.9
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README TODO"
-USE_DESTDIR="1"
-
-
-pkg_setup() {
-	G2CONF="--disable-schemas-install \
-		$(use_enable ssl openssl) \
-		$(use_enable gnutls)      \
-		$(use_enable samba)       \
-		$(use_enable ipv6)        \
-		$(use_enable hal)         \
-		$(use_enable howl)"
-
-	if use hal; then
-		G2CONF="${G2CONF} --with-hal-mount=/usr/bin/pmount-hal \
-			--with-hal-umount=/usr/bin/pumount \
-			--with-hal-eject=/usr/bin/eject"
-	fi
-
-	# this works because of the order of conifgure parsing
-	# so should always be behind the use_enable options
-	# foser <foser@gentoo.org 19 Apr 2004
-	use gnutls && use ssl && G2CONF="${G2CONF} --disable-gnutls"
-}
-
-src_unpack() {
-	unpack "${A}"
-	cd "${S}"
-
-	epatch ${FILESDIR}/${PN}-2.11.92-fbsd.patch
-	# Allow the Trash on afs filesystems (#106118)
-	epatch ${FILESDIR}/${PN}-2.12.0-afs.patch
-
-	autoconf || die "autoconf failed"
-}
-
-src_install() {
-	gnome2_src_install
-
-	# remove unused dir (#46567)
-	rmdir ${D}/usr/doc
-}
diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.14.2.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.14.2.ebuild
deleted file mode 100644
index 9ac7882bb752..000000000000
--- a/gnome-base/gnome-vfs/gnome-vfs-2.14.2.ebuild
+++ /dev/null
@@ -1,72 +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/gnome-vfs/gnome-vfs-2.14.2.ebuild,v 1.11 2006/09/06 05:10:14 kumba Exp $
-
-inherit eutils gnome2
-
-DESCRIPTION="Gnome Virtual Filesystem"
-HOMEPAGE="http://www.gnome.org/"
-LICENSE="GPL-2 LGPL-2"
-
-SLOT="2"
-KEYWORDS="~alpha amd64 arm hppa ppc ppc64 sh sparc x86"
-IUSE="avahi doc gnutls hal ipv6 samba ssl"
-
-RDEPEND=">=gnome-base/libbonobo-2.3.1
-	>=gnome-base/gconf-1.2
-	>=dev-libs/glib-2.9.3
-	>=gnome-base/orbit-2.12.4
-	>=dev-libs/libxml2-2.6
-	>=net-misc/neon-0.25.3
-	app-arch/bzip2
-	virtual/fam
-	gnome-base/gnome-mime-data
-	>=x11-misc/shared-mime-info-0.14
-	dev-libs/popt
-	samba? ( >=net-fs/samba-3 )
-	ssl? (
-		>=dev-libs/openssl-0.9.5
-		!gnome-extra/gnome-vfs-sftp )
-	gnutls? (
-		!ssl? (
-			net-libs/gnutls
-			!gnome-extra/gnome-vfs-sftp ) )
-	hal? (
-		>=sys-apps/hal-0.5.7
-		>=sys-apps/dbus-0.32 )
-	avahi? ( >=net-dns/avahi-0.6 )"
-
-# ssl/gnutls USE deps : if both are enabled choose openssl
-# foser <foser@gentoo.org> 19 Apr 2004
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.29
-	>=dev-util/pkgconfig-0.9
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README TODO"
-
-pkg_setup() {
-	G2CONF="--disable-schemas-install \
-		--disable-howl			  \
-		--enable-http-neon        \
-		$(use_enable ssl openssl) \
-		$(use_enable gnutls)      \
-		$(use_enable samba)       \
-		$(use_enable ipv6)        \
-		$(use_enable hal)         \
-		$(use_enable avahi)"
-
-	# this works because of the order of conifgure parsing
-	# so should always be behind the use_enable options
-	# foser <foser@gentoo.org 19 Apr 2004
-	use gnutls && use ssl && G2CONF="${G2CONF} --disable-gnutls"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# Allow the Trash on afs filesystems (#106118)
-	epatch ${FILESDIR}/${PN}-2.12.0-afs.patch
-}
diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.16.0-r1.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.16.0-r1.ebuild
deleted file mode 100644
index 06166bf34a5f..000000000000
--- a/gnome-base/gnome-vfs/gnome-vfs-2.16.0-r1.ebuild
+++ /dev/null
@@ -1,91 +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/gnome-vfs/gnome-vfs-2.16.0-r1.ebuild,v 1.8 2006/11/17 18:45:01 dang Exp $
-
-inherit eutils gnome2 autotools
-
-DESCRIPTION="Gnome Virtual Filesystem"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE="avahi doc gnutls hal ipv6 samba ssl"
-
-RDEPEND=">=gnome-base/gconf-2
-	>=dev-libs/glib-2.9.3
-	>=gnome-base/orbit-2.12.4
-	>=dev-libs/libxml2-2.6
-	>=net-misc/neon-0.25.3
-	app-arch/bzip2
-	virtual/fam
-	gnome-base/gnome-mime-data
-	>=x11-misc/shared-mime-info-0.14
-	|| ( >=dev-libs/dbus-glib-0.71 <sys-apps/dbus-0.90 )
-	samba? ( >=net-fs/samba-3 )
-	gnutls?	(
-				net-libs/gnutls
-				!gnome-extra/gnome-vfs-sftp
-			)
-	ssl?	(
-		!gnutls?	(
-				>=dev-libs/openssl-0.9.5
-				!gnome-extra/gnome-vfs-sftp
-				)
-		)
-	hal?	(
-				>=sys-apps/hal-0.5.7
-			)
-	avahi? ( >=net-dns/avahi-0.6 )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.35
-	=sys-devel/automake-1.9*
-	>=dev-util/pkgconfig-0.9
-	doc? ( >=dev-util/gtk-doc-1 )"
-PDEPEND="hal? ( >=gnome-base/gnome-mount-0.4 )"
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README TODO"
-
-pkg_setup() {
-	if use hal ; then
-		G2CONF="--with-hal-mount=/usr/bin/gnome-mount \
-				--with-hal-umount=/usr/bin/gnome-umount \
-				--with-hal-eject=/usr/bin/gnome-eject"
-	fi
-
-	G2CONF="${G2CONF}                 \
-		--disable-schemas-install     \
-		--disable-cdda                \
-		--disable-howl                \
-		--enable-http-neon            \
-		$(use_enable ssl openssl)     \
-		$(use_enable gnutls)          \
-		$(use_enable samba)           \
-		$(use_enable ipv6)            \
-		$(use_enable hal)             \
-		$(use_enable avahi)"
-
-	# this works because of the order of conifgure parsing
-	# so should always be behind the use_enable options
-	# foser <foser@gentoo.org 19 Apr 2004
-	use gnutls && use ssl && G2CONF="${G2CONF} --disable-openssl"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# Allow the Trash on afs filesystems (#106118)
-	epatch "${FILESDIR}"/${PN}-2.12.0-afs.patch
-
-	# Fix compiling with headers missing
-	epatch "${FILESDIR}"/${PN}-2.15.2-headers-define.patch
-
-	# Fix for crashes running programs via sudo
-	epatch "${FILESDIR}"/${PN}-2.16.0-no-dbus-crash.patch
-
-	# For gtk-doc macro failure when it's not installed
-	cp aclocal.m4 old_macros.m4
-	AT_M4DIR="."
-	eautoreconf
-}
diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.16.1.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.16.1.ebuild
deleted file mode 100644
index 7b2284b9e3c1..000000000000
--- a/gnome-base/gnome-vfs/gnome-vfs-2.16.1.ebuild
+++ /dev/null
@@ -1,91 +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/gnome-vfs/gnome-vfs-2.16.1.ebuild,v 1.7 2006/11/17 18:45:01 dang Exp $
-
-inherit eutils gnome2 autotools
-
-DESCRIPTION="Gnome Virtual Filesystem"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE="avahi doc gnutls hal ipv6 samba ssl"
-
-RDEPEND=">=gnome-base/gconf-2
-	>=dev-libs/glib-2.9.3
-	>=gnome-base/orbit-2.12.4
-	>=dev-libs/libxml2-2.6
-	>=net-misc/neon-0.25.3
-	app-arch/bzip2
-	virtual/fam
-	gnome-base/gnome-mime-data
-	>=x11-misc/shared-mime-info-0.14
-	|| ( >=dev-libs/dbus-glib-0.71 <sys-apps/dbus-0.90 )
-	samba? ( >=net-fs/samba-3 )
-	gnutls?	(
-				net-libs/gnutls
-				!gnome-extra/gnome-vfs-sftp
-			)
-	ssl?	(
-		!gnutls?	(
-				>=dev-libs/openssl-0.9.5
-				!gnome-extra/gnome-vfs-sftp
-				)
-		)
-	hal?	(
-				>=sys-apps/hal-0.5.7
-			)
-	avahi? ( >=net-dns/avahi-0.6 )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.35
-	=sys-devel/automake-1.9*
-	>=dev-util/pkgconfig-0.9
-	doc? ( >=dev-util/gtk-doc-1 )"
-PDEPEND="hal? ( >=gnome-base/gnome-mount-0.4 )"
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README TODO"
-
-pkg_setup() {
-	if use hal ; then
-		G2CONF="--with-hal-mount=/usr/bin/gnome-mount \
-				--with-hal-umount=/usr/bin/gnome-umount \
-				--with-hal-eject=/usr/bin/gnome-eject"
-	fi
-
-	G2CONF="${G2CONF}                 \
-		--disable-schemas-install     \
-		--disable-cdda                \
-		--disable-howl                \
-		--enable-http-neon            \
-		$(use_enable ssl openssl)     \
-		$(use_enable gnutls)          \
-		$(use_enable samba)           \
-		$(use_enable ipv6)            \
-		$(use_enable hal)             \
-		$(use_enable avahi)"
-
-	# this works because of the order of conifgure parsing
-	# so should always be behind the use_enable options
-	# foser <foser@gentoo.org 19 Apr 2004
-	use gnutls && use ssl && G2CONF="${G2CONF} --disable-openssl"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# Allow the Trash on afs filesystems (#106118)
-	epatch "${FILESDIR}"/${PN}-2.12.0-afs.patch
-
-	# Fix compiling with headers missing
-	epatch "${FILESDIR}"/${PN}-2.15.2-headers-define.patch
-
-	# Fix for crashes running programs via sudo
-	epatch "${FILESDIR}"/${PN}-2.16.0-no-dbus-crash.patch
-
-	# For gtk-doc macro failure when it's not installed
-	cp aclocal.m4 old_macros.m4
-	AT_M4DIR="."
-	eautoreconf
-}