Refix bug #120403 with permission from robbat2

(Portage version: 2.1_rc2-r3)
 (Unsigned Manifest commit)

4 files changed, 53 insertions, 190 deletions

diff --git a/net-fs/autofs/Manifest b/net-fs/autofs/Manifest
index 06da3f895f4e..b36afcc9adb0 100644
--- a/net-fs/autofs/Manifest
+++ b/net-fs/autofs/Manifest
@@ -1,138 +1,131 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX auto.master 267 RMD160 4e8e79ef65122f4a1c6227298c8c4e39f3dd5846 SHA1 88da29f5d82a1073471eed654c99ff1fc3c064f3 SHA256 47df928601dc31bc8c23781bd0475b7ecb5bd09525c92a8772d51e0dc660b414 size 267
+AUX auto.master 267 RMD160 4e8e79ef65122f4a1c6227298c8c4e39f3dd5846 SHA1 88da29f5d82a1073471eed654c99ff1fc3c064f3 SHA256 47df928601dc31bc8c23781bd0475b7ecb5bd09525c92a8772d51e0dc660b414
 MD5 759f43aeed6787d6b6d7556d03afe782 files/auto.master 267
 RMD160 4e8e79ef65122f4a1c6227298c8c4e39f3dd5846 files/auto.master 267
 SHA256 47df928601dc31bc8c23781bd0475b7ecb5bd09525c92a8772d51e0dc660b414 files/auto.master 267
-AUX auto.misc 319 RMD160 363c7b0be2d0d79c93b3b74968ae197df49962b4 SHA1 17a5e54accde91da5130599c4375ff3beda99f52 SHA256 7fa3f3cee3d8b0e859316b89fa3fcbad9da03f757de2d3d1a317af94b700e078 size 319
+AUX auto.misc 319 RMD160 363c7b0be2d0d79c93b3b74968ae197df49962b4 SHA1 17a5e54accde91da5130599c4375ff3beda99f52 SHA256 7fa3f3cee3d8b0e859316b89fa3fcbad9da03f757de2d3d1a317af94b700e078
 MD5 aa40e8bef91418943312910e73d05eed files/auto.misc 319
 RMD160 363c7b0be2d0d79c93b3b74968ae197df49962b4 files/auto.misc 319
 SHA256 7fa3f3cee3d8b0e859316b89fa3fcbad9da03f757de2d3d1a317af94b700e078 files/auto.misc 319
-AUX auto.net 1132 RMD160 6dabbc22e9207e72241edba9bd6ec035f4dc7fb0 SHA1 dcb55129002bcafcd09fd6e3d3eab17fd1070db7 SHA256 3b3f37275f561d0cad8d710048b51ec2e76a5ea59dd2b0faf594d7b265dd04d6 size 1132
-MD5 b7b301269f0796121d1f29c4a128b79e files/auto.net 1132
-RMD160 6dabbc22e9207e72241edba9bd6ec035f4dc7fb0 files/auto.net 1132
-SHA256 3b3f37275f561d0cad8d710048b51ec2e76a5ea59dd2b0faf594d7b265dd04d6 files/auto.net 1132
-AUX autofs-4.1.3-fix-sort-opts.patch 539 RMD160 026c1a40dab227c7cb663a0e7befeb82477bd83e SHA1 78d0f1106c31b2953c6eb0898001c01faef1498d SHA256 ed8c93feef1d48c8c2de7fb74da2a5572cfc3a218a02fc9cdf57c8c0ee80b15e size 539
-MD5 a90df91a7952cabfd61422864d746341 files/autofs-4.1.3-fix-sort-opts.patch 539
-RMD160 026c1a40dab227c7cb663a0e7befeb82477bd83e files/autofs-4.1.3-fix-sort-opts.patch 539
-SHA256 ed8c93feef1d48c8c2de7fb74da2a5572cfc3a218a02fc9cdf57c8c0ee80b15e files/autofs-4.1.3-fix-sort-opts.patch 539
-AUX autofs-4.1.3-signal-race-fix.patch 426 RMD160 1cd4bdc099d29e75d5b6833ffbd2c93f22bf4a3d SHA1 31d20235bd414e8a74de19d951e3f7cf3b61c035 SHA256 1f7f25ce97546c038b71cb9a4ba7dd1fe88e9cd66f0fc34c8411fd76bd7b60de size 426
+AUX auto.net 1134 RMD160 788335062852cf4e804bf23d37eb415bfb86c083 SHA1 3cd856c2b941c317cf6eaae1dae913c65ea56348 SHA256 106b3e1f312deb9e23fe74f846a1e25d00c831f667fb5b8e0c7fdbe5ec8dbf71
+MD5 20d6fb2986cb580c583bde09a80215d2 files/auto.net 1134
+RMD160 788335062852cf4e804bf23d37eb415bfb86c083 files/auto.net 1134
+SHA256 106b3e1f312deb9e23fe74f846a1e25d00c831f667fb5b8e0c7fdbe5ec8dbf71 files/auto.net 1134
+AUX autofs-4.1.3-signal-race-fix.patch 426 RMD160 1cd4bdc099d29e75d5b6833ffbd2c93f22bf4a3d SHA1 31d20235bd414e8a74de19d951e3f7cf3b61c035 SHA256 1f7f25ce97546c038b71cb9a4ba7dd1fe88e9cd66f0fc34c8411fd76bd7b60de
 MD5 be9e796b14bbb9f659368203127602c4 files/autofs-4.1.3-signal-race-fix.patch 426
 RMD160 1cd4bdc099d29e75d5b6833ffbd2c93f22bf4a3d files/autofs-4.1.3-signal-race-fix.patch 426
 SHA256 1f7f25ce97546c038b71cb9a4ba7dd1fe88e9cd66f0fc34c8411fd76bd7b60de files/autofs-4.1.3-signal-race-fix.patch 426
-AUX autofs.confd 186 RMD160 812709be1af1cfc35fa313907496bfb4e9490386 SHA1 51cfe6ffa36ee5bc02f61a3d500469d73e3aa266 SHA256 d32c102ae6bab4958d230366cd42c1a67fab4f38e0d6abdf0c4a94cd71dffa45 size 186
+AUX autofs.confd 186 RMD160 812709be1af1cfc35fa313907496bfb4e9490386 SHA1 51cfe6ffa36ee5bc02f61a3d500469d73e3aa266 SHA256 d32c102ae6bab4958d230366cd42c1a67fab4f38e0d6abdf0c4a94cd71dffa45
 MD5 a132f5883b92e2b509fa66e429f913ab files/autofs.confd 186
 RMD160 812709be1af1cfc35fa313907496bfb4e9490386 files/autofs.confd 186
 SHA256 d32c102ae6bab4958d230366cd42c1a67fab4f38e0d6abdf0c4a94cd71dffa45 files/autofs.confd 186
-AUX autofs.confd9 799 RMD160 ef61372f9f804dc5b9f662d3810b8a8c80b635de SHA1 80612d8fa46c2b9b7ffdd8d3e711e6d14f0af19f SHA256 c19db9095a5b21bcc0da40adad7141800ddb43db09548adf4c91fd813d9b5e1f size 799
+AUX autofs.confd9 799 RMD160 ef61372f9f804dc5b9f662d3810b8a8c80b635de SHA1 80612d8fa46c2b9b7ffdd8d3e711e6d14f0af19f SHA256 c19db9095a5b21bcc0da40adad7141800ddb43db09548adf4c91fd813d9b5e1f
 MD5 552ad0cdacd4354b83dba94670ec0e99 files/autofs.confd9 799
 RMD160 ef61372f9f804dc5b9f662d3810b8a8c80b635de files/autofs.confd9 799
 SHA256 c19db9095a5b21bcc0da40adad7141800ddb43db09548adf4c91fd813d9b5e1f files/autofs.confd9 799
-AUX autofs.rc10 6373 RMD160 bbff8d48111f33a36afd4bf1628d7366a87478fd SHA1 957f37f6e61c89ab0cb452f7a1e7e55e4d0f9070 SHA256 e8ddf8aac8ae593be10ad9640f739f2ddc4d23566bdaeb9b1ac70a3d5c4f31ec size 6373
+AUX autofs.rc10 6373 RMD160 bbff8d48111f33a36afd4bf1628d7366a87478fd SHA1 957f37f6e61c89ab0cb452f7a1e7e55e4d0f9070 SHA256 e8ddf8aac8ae593be10ad9640f739f2ddc4d23566bdaeb9b1ac70a3d5c4f31ec
 MD5 7873ddfcc4d52b6ca78d4e8faebe8cfc files/autofs.rc10 6373
 RMD160 bbff8d48111f33a36afd4bf1628d7366a87478fd files/autofs.rc10 6373
 SHA256 e8ddf8aac8ae593be10ad9640f739f2ddc4d23566bdaeb9b1ac70a3d5c4f31ec files/autofs.rc10 6373
-AUX autofs.rc11 7469 RMD160 e8472a75e3804a83cdb31fb1a9e293a87492ba0b SHA1 be29dc822d5216bd40edf1067df04eb5b56455a1 SHA256 a050aff19d249598d789859fbfd01ac72d73a68f83d9edb96661aae76a5f5481 size 7469
+AUX autofs.rc11 7469 RMD160 e8472a75e3804a83cdb31fb1a9e293a87492ba0b SHA1 be29dc822d5216bd40edf1067df04eb5b56455a1 SHA256 a050aff19d249598d789859fbfd01ac72d73a68f83d9edb96661aae76a5f5481
 MD5 2b16150b63dd0701d0a973b027550512 files/autofs.rc11 7469
 RMD160 e8472a75e3804a83cdb31fb1a9e293a87492ba0b files/autofs.rc11 7469
 SHA256 a050aff19d249598d789859fbfd01ac72d73a68f83d9edb96661aae76a5f5481 files/autofs.rc11 7469
-AUX autofs.rc12 7807 RMD160 bdd91c47ee5c223ca6eb7b395a4f82f36abd26f6 SHA1 a5efe6948c9674c4d2019db5e81de9d0a64ffaca SHA256 dc08949c2d47614be7fcea8be9988de52715b8072753ee3df77a87c19962975c size 7807
+AUX autofs.rc12 7807 RMD160 bdd91c47ee5c223ca6eb7b395a4f82f36abd26f6 SHA1 a5efe6948c9674c4d2019db5e81de9d0a64ffaca SHA256 dc08949c2d47614be7fcea8be9988de52715b8072753ee3df77a87c19962975c
 MD5 3333b278adbd13edd82115ea686763f9 files/autofs.rc12 7807
 RMD160 bdd91c47ee5c223ca6eb7b395a4f82f36abd26f6 files/autofs.rc12 7807
 SHA256 dc08949c2d47614be7fcea8be9988de52715b8072753ee3df77a87c19962975c files/autofs.rc12 7807
-AUX autofs.rc6 3717 RMD160 9124279f8c70b0f4f9c4729a71469b178bd2395a SHA1 b17efbf35768395ea25c9ea4037d49c3eb61d4a2 SHA256 96ecff3e66a4364aaea5bdce7a33454b3315a04745cc5897208c33e749692016 size 3717
+AUX autofs.rc6 3717 RMD160 9124279f8c70b0f4f9c4729a71469b178bd2395a SHA1 b17efbf35768395ea25c9ea4037d49c3eb61d4a2 SHA256 96ecff3e66a4364aaea5bdce7a33454b3315a04745cc5897208c33e749692016
 MD5 1b6efbe0072911c5c960a27e09a9d024 files/autofs.rc6 3717
 RMD160 9124279f8c70b0f4f9c4729a71469b178bd2395a files/autofs.rc6 3717
 SHA256 96ecff3e66a4364aaea5bdce7a33454b3315a04745cc5897208c33e749692016 files/autofs.rc6 3717
-AUX autofs.rc7 3624 RMD160 898c771eedbf52cbf856449370640873db7c4fd2 SHA1 f72e598317ba58fe6c9598547876e8dd60b9e007 SHA256 406a9025829c8485ef73400a76f678a6c1c87694241936db1dfae5241e751e5e size 3624
+AUX autofs.rc7 3624 RMD160 898c771eedbf52cbf856449370640873db7c4fd2 SHA1 f72e598317ba58fe6c9598547876e8dd60b9e007 SHA256 406a9025829c8485ef73400a76f678a6c1c87694241936db1dfae5241e751e5e
 MD5 4cc7219397b1bdb60da3f150bd7d9230 files/autofs.rc7 3624
 RMD160 898c771eedbf52cbf856449370640873db7c4fd2 files/autofs.rc7 3624
 SHA256 406a9025829c8485ef73400a76f678a6c1c87694241936db1dfae5241e751e5e files/autofs.rc7 3624
-AUX autofs.rc8 5186 RMD160 7a97786ecbca979a1b3aa754b6a638b580a9836d SHA1 f1f5b9837d176085c5e81bfe2321bdec15f90e74 SHA256 e9c094b03fec0a184800f750d79bf73ee6daf614c312b5c927110d8f2b0d1511 size 5186
+AUX autofs.rc8 5186 RMD160 7a97786ecbca979a1b3aa754b6a638b580a9836d SHA1 f1f5b9837d176085c5e81bfe2321bdec15f90e74 SHA256 e9c094b03fec0a184800f750d79bf73ee6daf614c312b5c927110d8f2b0d1511
 MD5 539a3f843f501558cb01ca8c124e83f4 files/autofs.rc8 5186
 RMD160 7a97786ecbca979a1b3aa754b6a638b580a9836d files/autofs.rc8 5186
 SHA256 e9c094b03fec0a184800f750d79bf73ee6daf614c312b5c927110d8f2b0d1511 files/autofs.rc8 5186
-AUX autofs.rc9 5617 RMD160 2822212b6717504aecc29cab029e5247bddecca9 SHA1 2b159ab25f390cdc230b20046ce8b4adcc8e99fb SHA256 6534a2c96f915132d7834478bf8913a8f00bf97ae91c5df55bf5e612f403735b size 5617
+AUX autofs.rc9 5617 RMD160 2822212b6717504aecc29cab029e5247bddecca9 SHA1 2b159ab25f390cdc230b20046ce8b4adcc8e99fb SHA256 6534a2c96f915132d7834478bf8913a8f00bf97ae91c5df55bf5e612f403735b
 MD5 d90bdf558a0602f0e37aa0b42ff8bbfd files/autofs.rc9 5617
 RMD160 2822212b6717504aecc29cab029e5247bddecca9 files/autofs.rc9 5617
 SHA256 6534a2c96f915132d7834478bf8913a8f00bf97ae91c5df55bf5e612f403735b files/autofs.rc9 5617
-AUX autofs1.confd 137 RMD160 35c5171eb57db792830e94f28058b1b50534c236 SHA1 d5e415b4bb74b1fd91f9ad4ce863cd70ca5460d1 SHA256 d4be4500623e3ba986ad124b273c9119da78b12eb94c6d39e358ed9d623a1a8a size 137
+AUX autofs1.confd 137 RMD160 35c5171eb57db792830e94f28058b1b50534c236 SHA1 d5e415b4bb74b1fd91f9ad4ce863cd70ca5460d1 SHA256 d4be4500623e3ba986ad124b273c9119da78b12eb94c6d39e358ed9d623a1a8a
 MD5 7fa23f910baa8aa00609bd74a60c8e34 files/autofs1.confd 137
 RMD160 35c5171eb57db792830e94f28058b1b50534c236 files/autofs1.confd 137
 SHA256 d4be4500623e3ba986ad124b273c9119da78b12eb94c6d39e358ed9d623a1a8a files/autofs1.confd 137
-AUX automount.diff 322 RMD160 7fdfa7bd519451b47cbb9795e2ae482ddd45ff59 SHA1 c6bf3d6b2433cafe122d821142f44eee1a8b6ad7 SHA256 eef2d99787fc8967f10c5c308e3a271532013225bdfe28578d0ecb5e3c0c16c1 size 322
+AUX automount.diff 322 RMD160 7fdfa7bd519451b47cbb9795e2ae482ddd45ff59 SHA1 c6bf3d6b2433cafe122d821142f44eee1a8b6ad7 SHA256 eef2d99787fc8967f10c5c308e3a271532013225bdfe28578d0ecb5e3c0c16c1
 MD5 41de856a77a074078968ff244b863f88 files/automount.diff 322
 RMD160 7fdfa7bd519451b47cbb9795e2ae482ddd45ff59 files/automount.diff 322
 SHA256 eef2d99787fc8967f10c5c308e3a271532013225bdfe28578d0ecb5e3c0c16c1 files/automount.diff 322
-AUX ldap_config.patch 785 RMD160 47b296b3dcb005fd65a8b707dbc0ace319d3ace7 SHA1 b81701d25b583d0382b41059be11e2e9ef6a523b SHA256 5f0eb87ea8e20fc4fac46afde8d50fe9307a1835979c279855d36d323e8ff57d size 785
+AUX ldap_config.patch 785 RMD160 47b296b3dcb005fd65a8b707dbc0ace319d3ace7 SHA1 b81701d25b583d0382b41059be11e2e9ef6a523b SHA256 5f0eb87ea8e20fc4fac46afde8d50fe9307a1835979c279855d36d323e8ff57d
 MD5 3e9a4415d9928180bd9d1a7a09d4d2e7 files/ldap_config.patch 785
 RMD160 47b296b3dcb005fd65a8b707dbc0ace319d3ace7 files/ldap_config.patch 785
 SHA256 5f0eb87ea8e20fc4fac46afde8d50fe9307a1835979c279855d36d323e8ff57d files/ldap_config.patch 785
-AUX nisyp.patch 419 RMD160 338ad78c60e048aad661b98c008b8f7cafd7ba8b SHA1 079f558edc12ed022b6f843026aedcf2c6f290c1 SHA256 e85a998ed1f40d41c32b15e1184fcd0b96a9d86f42cf10ebd76c3e553eea19f0 size 419
+AUX nisyp.patch 419 RMD160 338ad78c60e048aad661b98c008b8f7cafd7ba8b SHA1 079f558edc12ed022b6f843026aedcf2c6f290c1 SHA256 e85a998ed1f40d41c32b15e1184fcd0b96a9d86f42cf10ebd76c3e553eea19f0
 MD5 77884391a3fbf365a88f5d2230b548d9 files/nisyp.patch 419
 RMD160 338ad78c60e048aad661b98c008b8f7cafd7ba8b files/nisyp.patch 419
 SHA256 e85a998ed1f40d41c32b15e1184fcd0b96a9d86f42cf10ebd76c3e553eea19f0 files/nisyp.patch 419
-DIST autofs-3.1.7.tar.bz2 57000 size 57000
-DIST autofs-4.0.0-1.tar.bz2 90036 size 90036
-DIST autofs-4.1.3-bad_chdir.patch 6343 RMD160 a406cdaa048c7b44cf93bb05df35bf2f790c6cfb SHA256 ba89a372971daa3d689366f7708ec24034c294e485a88d921fb2eac573f95b0f size 6343
-DIST autofs-4.1.3-miscfixes.patch.gz 3058 RMD160 ad3d831ac3dd60eba633f976bf0cd38c4f05c6a6 SHA256 630f9ee90d23b02ffaa5fe379c4f1bca7db61b8f24f9cd5a2764a0c99a7eddfc size 3058
-DIST autofs-4.1.3-mtab_lock.patch 551 RMD160 f34aeb1e29d8ddc06259c51fcc1bccd48e2b7efc SHA256 13494713f698c29281bc5d27a7b4b2dbb7692b6d18f770fada71ab3b28c33fca size 551
-DIST autofs-4.1.3-non_block_ping.patch 7934 RMD160 6df2da01f032d8d33ef56db62964b68e14b16ca8 SHA256 882a8ddb30b30232bed1afe9b891721ebbaec54c7122e625df3382e6099e8460 size 7934
-DIST autofs-4.1.3-replicated_server_select.patch 962 RMD160 52f13fed9e443e0810d3e29408b06e797344e8c1 SHA256 95e2f7d1ca19c67b8116a8d5f382a7bb116255fbd507dc6689faea7da9a67dad size 962
-DIST autofs-4.1.3-signal-race-fix.patch 635 size 635
-DIST autofs-4.1.3-sock-leak-fix.patch 1236 RMD160 09ca250b5711d04336f61fb7a227d99ae2b4d053 SHA256 6aaa548688e7d48eb735dfa9acb1c097b82f8ef68a3ca30aab70a92b9b36453b size 1236
-DIST autofs-4.1.3-strict.patch 1626 RMD160 8527db5b40eb7d0bf7fcc6f47a5be5beb22905d3 SHA256 518a7930cb6bad18f045dfc493ce39816e6fbce0f80c444dd75a33d722a8caff size 1626
-DIST autofs-4.1.3.tar.bz2 125234 RMD160 7df2839fce00222609bd7977a9d6275276e232b4 SHA256 9257a603815ee8c8d0f2935ff3c254b23f8007eee5fa8c9bf2e3661fdc171035 size 125234
-EBUILD autofs-3.1.7-r3.ebuild 1285 RMD160 ba36b6a4dcf4164e79e75fca03bd9a13b53beb49 SHA1 dc51bd1d3f3db641c6087001bbf45f22704055d8 SHA256 66d8b470cf2f10b08a71a4a588a67371a92323de0f91d7c12637d3b6cd925bab size 1285
+DIST autofs-3.1.7.tar.bz2 57000
+DIST autofs-4.0.0-1.tar.bz2 90036
+DIST autofs-4.1.3-bad_chdir.patch 6343 RMD160 a406cdaa048c7b44cf93bb05df35bf2f790c6cfb SHA256 ba89a372971daa3d689366f7708ec24034c294e485a88d921fb2eac573f95b0f
+DIST autofs-4.1.3-miscfixes.patch.gz 3058 RMD160 ad3d831ac3dd60eba633f976bf0cd38c4f05c6a6 SHA256 630f9ee90d23b02ffaa5fe379c4f1bca7db61b8f24f9cd5a2764a0c99a7eddfc
+DIST autofs-4.1.3-mtab_lock.patch 551 RMD160 f34aeb1e29d8ddc06259c51fcc1bccd48e2b7efc SHA256 13494713f698c29281bc5d27a7b4b2dbb7692b6d18f770fada71ab3b28c33fca
+DIST autofs-4.1.3-non_block_ping.patch 7934 RMD160 6df2da01f032d8d33ef56db62964b68e14b16ca8 SHA256 882a8ddb30b30232bed1afe9b891721ebbaec54c7122e625df3382e6099e8460
+DIST autofs-4.1.3-replicated_server_select.patch 962 RMD160 52f13fed9e443e0810d3e29408b06e797344e8c1 SHA256 95e2f7d1ca19c67b8116a8d5f382a7bb116255fbd507dc6689faea7da9a67dad
+DIST autofs-4.1.3-signal-race-fix.patch 635
+DIST autofs-4.1.3-sock-leak-fix.patch 1236 RMD160 09ca250b5711d04336f61fb7a227d99ae2b4d053 SHA256 6aaa548688e7d48eb735dfa9acb1c097b82f8ef68a3ca30aab70a92b9b36453b
+DIST autofs-4.1.3-strict.patch 1626 RMD160 8527db5b40eb7d0bf7fcc6f47a5be5beb22905d3 SHA256 518a7930cb6bad18f045dfc493ce39816e6fbce0f80c444dd75a33d722a8caff
+DIST autofs-4.1.3.tar.bz2 125234 RMD160 7df2839fce00222609bd7977a9d6275276e232b4 SHA256 9257a603815ee8c8d0f2935ff3c254b23f8007eee5fa8c9bf2e3661fdc171035
+EBUILD autofs-3.1.7-r3.ebuild 1285 RMD160 ba36b6a4dcf4164e79e75fca03bd9a13b53beb49 SHA1 dc51bd1d3f3db641c6087001bbf45f22704055d8 SHA256 66d8b470cf2f10b08a71a4a588a67371a92323de0f91d7c12637d3b6cd925bab
 MD5 44f4d9269d0d413a5705c63763d13b89 autofs-3.1.7-r3.ebuild 1285
 RMD160 ba36b6a4dcf4164e79e75fca03bd9a13b53beb49 autofs-3.1.7-r3.ebuild 1285
 SHA256 66d8b470cf2f10b08a71a4a588a67371a92323de0f91d7c12637d3b6cd925bab autofs-3.1.7-r3.ebuild 1285
-EBUILD autofs-3.1.7-r4.ebuild 1735 RMD160 607670a545723b4230192b7cc9cf38c582db224e SHA1 55c5605590abe94b9b5a2136342eb6a8828bf10b SHA256 0c919ce21c18afb08e682408db76418d3ae1bd652ac7aa2ebafe7a3ae422c6a8 size 1735
+EBUILD autofs-3.1.7-r4.ebuild 1735 RMD160 607670a545723b4230192b7cc9cf38c582db224e SHA1 55c5605590abe94b9b5a2136342eb6a8828bf10b SHA256 0c919ce21c18afb08e682408db76418d3ae1bd652ac7aa2ebafe7a3ae422c6a8
 MD5 517e323f25fec842b06d2fe2dd3fbe4a autofs-3.1.7-r4.ebuild 1735
 RMD160 607670a545723b4230192b7cc9cf38c582db224e autofs-3.1.7-r4.ebuild 1735
 SHA256 0c919ce21c18afb08e682408db76418d3ae1bd652ac7aa2ebafe7a3ae422c6a8 autofs-3.1.7-r4.ebuild 1735
-EBUILD autofs-3.1.7-r5.ebuild 1750 RMD160 b8518183b6f28e99270b1364745adc83efed5de5 SHA1 faf00c4a465f13f49183fb37911d88b5a3a0c593 SHA256 4fab20b1ff1a22349112a876265403fff4ae901e3c58a999dc39af52fce26c26 size 1750
+EBUILD autofs-3.1.7-r5.ebuild 1750 RMD160 b8518183b6f28e99270b1364745adc83efed5de5 SHA1 faf00c4a465f13f49183fb37911d88b5a3a0c593 SHA256 4fab20b1ff1a22349112a876265403fff4ae901e3c58a999dc39af52fce26c26
 MD5 273b8d80da0015d4784c4e944dab4098 autofs-3.1.7-r5.ebuild 1750
 RMD160 b8518183b6f28e99270b1364745adc83efed5de5 autofs-3.1.7-r5.ebuild 1750
 SHA256 4fab20b1ff1a22349112a876265403fff4ae901e3c58a999dc39af52fce26c26 autofs-3.1.7-r5.ebuild 1750
-EBUILD autofs-3.1.7-r6.ebuild 1784 RMD160 e40ffe9d63746cd70974fbe855bc02f10ac34ff4 SHA1 39ecdd4c261e2454c2b99915c334a6154f0bf575 SHA256 a597a1f4245bade5ba89fb425d4e7ca1e0776686595944996746734ec92a8eaf size 1784
+EBUILD autofs-3.1.7-r6.ebuild 1784 RMD160 e40ffe9d63746cd70974fbe855bc02f10ac34ff4 SHA1 39ecdd4c261e2454c2b99915c334a6154f0bf575 SHA256 a597a1f4245bade5ba89fb425d4e7ca1e0776686595944996746734ec92a8eaf
 MD5 8cfa18e9b94510d2a2ed5e128f28dfe0 autofs-3.1.7-r6.ebuild 1784
 RMD160 e40ffe9d63746cd70974fbe855bc02f10ac34ff4 autofs-3.1.7-r6.ebuild 1784
 SHA256 a597a1f4245bade5ba89fb425d4e7ca1e0776686595944996746734ec92a8eaf autofs-3.1.7-r6.ebuild 1784
-EBUILD autofs-4.0.0.ebuild 1930 RMD160 beff8ab3ce0e7f243512d8b7d0c09837389993d6 SHA1 2e609321a01a1e70ac4725eb31e8f7e5ce82b1fd SHA256 dcb125f84baa96b888253d0ebfe5f2247b8eef170fd8d0795d7f867a6ff4ce77 size 1930
+EBUILD autofs-4.0.0.ebuild 1930 RMD160 beff8ab3ce0e7f243512d8b7d0c09837389993d6 SHA1 2e609321a01a1e70ac4725eb31e8f7e5ce82b1fd SHA256 dcb125f84baa96b888253d0ebfe5f2247b8eef170fd8d0795d7f867a6ff4ce77
 MD5 d3574f8185d41bdb815a1a3ea90d177f autofs-4.0.0.ebuild 1930
 RMD160 beff8ab3ce0e7f243512d8b7d0c09837389993d6 autofs-4.0.0.ebuild 1930
 SHA256 dcb125f84baa96b888253d0ebfe5f2247b8eef170fd8d0795d7f867a6ff4ce77 autofs-4.0.0.ebuild 1930
-EBUILD autofs-4.1.3-r1.ebuild 2865 RMD160 21b08e6fe2029a3381539e139cc64ee87ed5815d SHA1 b9911472f252e3b3f394cc85f832df63a22fbb88 SHA256 8acf8aafb7d0ebbba5bead1ad84bd80144cb3d05f9300f496e759c788de692f4 size 2865
+EBUILD autofs-4.1.3-r1.ebuild 2865 RMD160 21b08e6fe2029a3381539e139cc64ee87ed5815d SHA1 b9911472f252e3b3f394cc85f832df63a22fbb88 SHA256 8acf8aafb7d0ebbba5bead1ad84bd80144cb3d05f9300f496e759c788de692f4
 MD5 0747442a4bf2d9358fe4cb5ba3edf9e2 autofs-4.1.3-r1.ebuild 2865
 RMD160 21b08e6fe2029a3381539e139cc64ee87ed5815d autofs-4.1.3-r1.ebuild 2865
 SHA256 8acf8aafb7d0ebbba5bead1ad84bd80144cb3d05f9300f496e759c788de692f4 autofs-4.1.3-r1.ebuild 2865
-EBUILD autofs-4.1.3-r2.ebuild 2923 RMD160 801345a7c848d9e1bca255410373c85c18b0eb39 SHA1 b83422f3a85dc30abfeb74d560e6ed6bb71bfb56 SHA256 1ffbbbba531c3ec518dad828e131dc129a06231f91ef0153f64c3a05c7d7282e size 2923
+EBUILD autofs-4.1.3-r2.ebuild 2923 RMD160 801345a7c848d9e1bca255410373c85c18b0eb39 SHA1 b83422f3a85dc30abfeb74d560e6ed6bb71bfb56 SHA256 1ffbbbba531c3ec518dad828e131dc129a06231f91ef0153f64c3a05c7d7282e
 MD5 755272708a0c1bf9d7500355cae8a259 autofs-4.1.3-r2.ebuild 2923
 RMD160 801345a7c848d9e1bca255410373c85c18b0eb39 autofs-4.1.3-r2.ebuild 2923
 SHA256 1ffbbbba531c3ec518dad828e131dc129a06231f91ef0153f64c3a05c7d7282e autofs-4.1.3-r2.ebuild 2923
-EBUILD autofs-4.1.3-r3.ebuild 2953 RMD160 00dac0515e578c067cf1587c2031d4177c1c0342 SHA1 02eadcbb7e7d371d0e480aa97d0a5a06c0a59308 SHA256 fe6e3e4c143c17ec62c961846bda7e637aa88e8b09aa23d522760c22a1127c0f size 2953
+EBUILD autofs-4.1.3-r3.ebuild 2953 RMD160 00dac0515e578c067cf1587c2031d4177c1c0342 SHA1 02eadcbb7e7d371d0e480aa97d0a5a06c0a59308 SHA256 fe6e3e4c143c17ec62c961846bda7e637aa88e8b09aa23d522760c22a1127c0f
 MD5 d088786415a46eef0b0dbf5074e9f4b2 autofs-4.1.3-r3.ebuild 2953
 RMD160 00dac0515e578c067cf1587c2031d4177c1c0342 autofs-4.1.3-r3.ebuild 2953
 SHA256 fe6e3e4c143c17ec62c961846bda7e637aa88e8b09aa23d522760c22a1127c0f autofs-4.1.3-r3.ebuild 2953
-EBUILD autofs-4.1.3-r4.ebuild 2979 RMD160 d3a1a41bca3b3f3e28bbffc9c1fffc948dba8134 SHA1 6d564c77a3fc6fa6de7c01d5c3864bc5112d18e7 SHA256 b1f347e8a2f77fbb73628ca92c8970a29e24ea867e531f425debead7e2b9b7e3 size 2979
+EBUILD autofs-4.1.3-r4.ebuild 2979 RMD160 d3a1a41bca3b3f3e28bbffc9c1fffc948dba8134 SHA1 6d564c77a3fc6fa6de7c01d5c3864bc5112d18e7 SHA256 b1f347e8a2f77fbb73628ca92c8970a29e24ea867e531f425debead7e2b9b7e3
 MD5 1f1ddee7a1fa797b4e3ca0740219d4d9 autofs-4.1.3-r4.ebuild 2979
 RMD160 d3a1a41bca3b3f3e28bbffc9c1fffc948dba8134 autofs-4.1.3-r4.ebuild 2979
 SHA256 b1f347e8a2f77fbb73628ca92c8970a29e24ea867e531f425debead7e2b9b7e3 autofs-4.1.3-r4.ebuild 2979
-EBUILD autofs-4.1.3-r5.ebuild 3030 RMD160 5a89d859fcd2f256c8d36960110932ae260149de SHA1 b7b0888eff90b57e6d0657922525b94e529f916b SHA256 316f0ceff8707975ca4f4f64d3225334c051ad117eb0db6077d0a599932c2402 size 3030
-MD5 ee8551f6ed9fe9a79d75e7c42dfde8f6 autofs-4.1.3-r5.ebuild 3030
-RMD160 5a89d859fcd2f256c8d36960110932ae260149de autofs-4.1.3-r5.ebuild 3030
-SHA256 316f0ceff8707975ca4f4f64d3225334c051ad117eb0db6077d0a599932c2402 autofs-4.1.3-r5.ebuild 3030
-EBUILD autofs-4.1.3.ebuild 1933 RMD160 148cbff66e664a2c7ac22255f12c77702841ee80 SHA1 90c0f7078a3b5833087f1b2e9eb4c68e7f3d28ff SHA256 b8764432438cd63c9197c889b718c17b256f166cf5afb6a79a1470c233f67eca size 1933
+EBUILD autofs-4.1.3-r6.ebuild 2983 RMD160 e59334d2a2ae5e70b744a593437260821fc24505 SHA1 455401def00f9f5a7930b726c9ea80a71f8afdf1 SHA256 f6e73bb0c20840c05b7044fc6ac2e8497969ebea8372886cd4216504f7c69da6
+MD5 a92a5cffcfd4b43c7cf479a413fe9a77 autofs-4.1.3-r6.ebuild 2983
+RMD160 e59334d2a2ae5e70b744a593437260821fc24505 autofs-4.1.3-r6.ebuild 2983
+SHA256 f6e73bb0c20840c05b7044fc6ac2e8497969ebea8372886cd4216504f7c69da6 autofs-4.1.3-r6.ebuild 2983
+EBUILD autofs-4.1.3.ebuild 1933 RMD160 148cbff66e664a2c7ac22255f12c77702841ee80 SHA1 90c0f7078a3b5833087f1b2e9eb4c68e7f3d28ff SHA256 b8764432438cd63c9197c889b718c17b256f166cf5afb6a79a1470c233f67eca
 MD5 25496cb18a229b633f0b0a207e8a3acc autofs-4.1.3.ebuild 1933
 RMD160 148cbff66e664a2c7ac22255f12c77702841ee80 autofs-4.1.3.ebuild 1933
 SHA256 b8764432438cd63c9197c889b718c17b256f166cf5afb6a79a1470c233f67eca autofs-4.1.3.ebuild 1933
-MISC ChangeLog 7764 RMD160 614063e76909fb39c321ad3f2e4dcba4ee530260 SHA1 fab1dd72eab40c30fbb4fb156f7479225e2abc3d SHA256 d0f7f9498a0da126259de2b75f6360c94aa9c8e803566276e8de9e227865d2fd size 7764
-MD5 04643c75c0a3ee07eacd557db5c6d81a ChangeLog 7764
-RMD160 614063e76909fb39c321ad3f2e4dcba4ee530260 ChangeLog 7764
-SHA256 d0f7f9498a0da126259de2b75f6360c94aa9c8e803566276e8de9e227865d2fd ChangeLog 7764
-MISC metadata.xml 287 RMD160 a59e66d378414c1e9cb916ec962d9ff3c048026b SHA1 317b3d429c34004ecc3a7545b20f80b1d812b78f SHA256 98662515cc9cca50028b4b93df9542ca05d67ce367fffe73229daf7794e0bcaf size 287
+MISC ChangeLog 8005 RMD160 2d4648e643961d127a5af595858c9cea15c9b8e7 SHA1 eb9404d8f6336a8de551a2598ebef8ae0bfd770b SHA256 571243b78589b90e40fc1aa2fe679eb5be6a146f8699a48f8a18936592d70612
+MD5 90951b5b231894a3806658701d5de5cb ChangeLog 8005
+RMD160 2d4648e643961d127a5af595858c9cea15c9b8e7 ChangeLog 8005
+SHA256 571243b78589b90e40fc1aa2fe679eb5be6a146f8699a48f8a18936592d70612 ChangeLog 8005
+MISC metadata.xml 287 RMD160 a59e66d378414c1e9cb916ec962d9ff3c048026b SHA1 317b3d429c34004ecc3a7545b20f80b1d812b78f SHA256 98662515cc9cca50028b4b93df9542ca05d67ce367fffe73229daf7794e0bcaf
 MD5 3281a009cd789c5c937c9e6a3124e792 metadata.xml 287
 RMD160 a59e66d378414c1e9cb916ec962d9ff3c048026b metadata.xml 287
 SHA256 98662515cc9cca50028b4b93df9542ca05d67ce367fffe73229daf7794e0bcaf metadata.xml 287
@@ -166,13 +159,6 @@ SHA256 7df84f4c249bb6efb72dab0800da9b80273c0495c4449e21d29e798acf3de231 files/di
 MD5 fd65d006460a7416a99dd78a93d623d3 files/digest-autofs-4.1.3-r4 2120
 RMD160 7a3053d87128160ce006e4cec080b6db256f03be files/digest-autofs-4.1.3-r4 2120
 SHA256 7df84f4c249bb6efb72dab0800da9b80273c0495c4449e21d29e798acf3de231 files/digest-autofs-4.1.3-r4 2120
-MD5 fd65d006460a7416a99dd78a93d623d3 files/digest-autofs-4.1.3-r5 2120
-RMD160 7a3053d87128160ce006e4cec080b6db256f03be files/digest-autofs-4.1.3-r5 2120
-SHA256 7df84f4c249bb6efb72dab0800da9b80273c0495c4449e21d29e798acf3de231 files/digest-autofs-4.1.3-r5 2120
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEbo5sCRZPokWLroQRAvx5AJ9gCYHoU6uiH2WUxr/TtBSKCRKEGQCfdZUR
-6V2EAAAXWQ42/Sg7Cy4e1CU=
-=1tOz
------END PGP SIGNATURE-----
+MD5 fd65d006460a7416a99dd78a93d623d3 files/digest-autofs-4.1.3-r6 2120
+RMD160 7a3053d87128160ce006e4cec080b6db256f03be files/digest-autofs-4.1.3-r6 2120
+SHA256 7df84f4c249bb6efb72dab0800da9b80273c0495c4449e21d29e798acf3de231 files/digest-autofs-4.1.3-r6 2120
diff --git a/net-fs/autofs/autofs-4.1.3-r5.ebuild b/net-fs/autofs/autofs-4.1.3-r5.ebuild
deleted file mode 100644
index 87eee4f5e6dc..000000000000
--- a/net-fs/autofs/autofs-4.1.3-r5.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-4.1.3-r5.ebuild,v 1.1 2006/05/20 03:34:57 halcy0n Exp $
-
-inherit eutils multilib
-
-IUSE="ldap"
-DESCRIPTION="Kernel based automounter"
-HOMEPAGE="http://www.linux-consulting.com/Amd_AutoFS/autofs.html"
-SRC_URI_BASE="mirror://kernel/linux/daemons/${PN}/v4"
-SRC_URI="${SRC_URI_BASE}/${P}.tar.bz2
-		${SRC_URI_BASE}/${P}-strict.patch
-		${SRC_URI_BASE}/${P}-mtab_lock.patch
-		${SRC_URI_BASE}/${P}-bad_chdir.patch
-		${SRC_URI_BASE}/${P}-non_block_ping.patch
-		${SRC_URI_BASE}/${P}-sock-leak-fix.patch
-		${SRC_URI_BASE}/${P}-replicated_server_select.patch
-		mirror://gentoo/${P}-miscfixes.patch.gz"
-DEPEND="virtual/libc
-		ldap? ( >=net-nds/openldap-2.0 )"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ia64 ~mips ppc ppc64 sparc x86"
-
-src_unpack() {
-	unpack ${P}.tar.bz2
-	PATCH_LIST="${P}-strict.patch ${P}-mtab_lock.patch ${P}-bad_chdir.patch ${P}-non_block_ping.patch ${P}-sock-leak-fix.patch ${P}-replicated_server_select.patch ${P}-miscfixes.patch.gz"
-	for i in ${PATCH_LIST}; do
-		EPATCH_OPTS="-p1 -d ${S}" epatch ${DISTDIR}/${i}
-	done
-
-	# Upstream version of this patch is incorrect
-	epatch "${FILESDIR}"/${P}-signal-race-fix.patch
-	epatch "${FILESDIR}"/${P}-fix-sort-opts.patch
-
-	cd ${S}
-	autoconf || die "Autoconf failed"
-
-	cd ${S}/daemon
-	sed -i 's/LIBS \= \-ldl/LIBS \= \-ldl \-lnsl \$\{LIBLDAP\}/' Makefile || die "LIBLDAP change failed"
-}
-
-src_compile() {
-	local myconf
-	use ldap || myconf="--without-openldap"
-
-	econf ${myconf} || die
-	sed -i -e '/^\(CFLAGS\|CXXFLAGS\|LDFLAGS\)[[:space:]]*=/d' Makefile.rules || die "Failed to remove (C|CXX|LD)FLAGS"
-	emake || die "make failed"
-}
-
-src_install() {
-	into /usr
-	dosbin daemon/automount
-	exeinto /usr/$(get_libdir)/autofs
-	doexe modules/*.so
-
-	dodoc COPYING COPYRIGHT NEWS README* TODO CHANGELOG CREDITS
-	cd ${S}/samples
-	docinto samples ; dodoc auto.misc auto.master
-	cd ${S}/man
-	sed -i 's:\/etc\/:\/etc\/autofs\/:g' *.8 *.5 *.in || die "Failed to update path in manpages"
-	doman auto.master.5 autofs.5 autofs.8 automount.8
-
-	dodir /etc/autofs /etc/init.d /etc/conf.d
-	insinto /etc/autofs ; doins ${FILESDIR}/auto.master
-	insinto /etc/autofs ; doins ${FILESDIR}/auto.misc
-	exeinto /etc/autofs ; doexe ${FILESDIR}/auto.net # chmod 755 is important!
-
-	exeinto /etc/init.d ; newexe ${FILESDIR}/autofs.rc11 autofs
-	insinto /etc/conf.d ; newins ${FILESDIR}/autofs.confd9 autofs
-	if use ldap; then
-		cd ${S}/samples
-		docinto samples ; dodoc ldap* auto.master.ldap
-		insinto /etc/openldap/schema ; doins autofs.schema
-		exeinto /usr/$(get_libdir)/autofs ; doexe autofs-ldap-auto-master
-	fi
-}
-
-pkg_postinst() {
-	einfo "Note: If you plan on using autofs for automounting"
-	einfo "remote NFS mounts without having the NFS daemon running"
-	einfo "please add portmap to your default run-level."
-	echo ""
-	einfo "Also the normal autofs status has been renamed stats"
-	einfo "as there is already a predefined Gentoo status"
-}
diff --git a/net-fs/autofs/files/autofs-4.1.3-fix-sort-opts.patch b/net-fs/autofs/files/autofs-4.1.3-fix-sort-opts.patch
deleted file mode 100644
index 8a5be27c7d0b..000000000000
--- a/net-fs/autofs/files/autofs-4.1.3-fix-sort-opts.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur autofs-4.1.3-orig/samples/auto.net autofs-4.1.3/samples/auto.net
---- autofs-4.1.3-orig/samples/auto.net	2006-05-19 23:24:51.000000000 -0400
-+++ autofs-4.1.3/samples/auto.net	2006-05-19 23:25:17.000000000 -0400
-@@ -21,7 +21,7 @@
- # Newer distributions get this right
- SHOWMOUNT="/usr/sbin/showmount --no-headers -e $key"
- 
--$SHOWMOUNT | sort +0 | \
-+$SHOWMOUNT | LC_ALL=C sort -k 1 | \
- 	awk -v key="$key" -v opts="$opts" -- '
- 	BEGIN		{ ORS=""; first=1 }
- 			{ if (first) { print opts; first=0 }; print " \\\n\t" $1, key ":" $1 }
diff --git a/net-fs/autofs/files/digest-autofs-4.1.3-r5 b/net-fs/autofs/files/digest-autofs-4.1.3-r5
deleted file mode 100644
index c5a58779c3e8..000000000000
--- a/net-fs/autofs/files/digest-autofs-4.1.3-r5
+++ /dev/null
@@ -1,24 +0,0 @@
-MD5 9efa8126decb509011646d4a4ed0779f autofs-4.1.3-bad_chdir.patch 6343
-RMD160 a406cdaa048c7b44cf93bb05df35bf2f790c6cfb autofs-4.1.3-bad_chdir.patch 6343
-SHA256 ba89a372971daa3d689366f7708ec24034c294e485a88d921fb2eac573f95b0f autofs-4.1.3-bad_chdir.patch 6343
-MD5 5d2cb735d77cd397d3de600bf3e321e6 autofs-4.1.3-miscfixes.patch.gz 3058
-RMD160 ad3d831ac3dd60eba633f976bf0cd38c4f05c6a6 autofs-4.1.3-miscfixes.patch.gz 3058
-SHA256 630f9ee90d23b02ffaa5fe379c4f1bca7db61b8f24f9cd5a2764a0c99a7eddfc autofs-4.1.3-miscfixes.patch.gz 3058
-MD5 f2e7950dab204719162be84b63857abc autofs-4.1.3-mtab_lock.patch 551
-RMD160 f34aeb1e29d8ddc06259c51fcc1bccd48e2b7efc autofs-4.1.3-mtab_lock.patch 551
-SHA256 13494713f698c29281bc5d27a7b4b2dbb7692b6d18f770fada71ab3b28c33fca autofs-4.1.3-mtab_lock.patch 551
-MD5 e404ec690f3ef118ade6f0e605228258 autofs-4.1.3-non_block_ping.patch 7934
-RMD160 6df2da01f032d8d33ef56db62964b68e14b16ca8 autofs-4.1.3-non_block_ping.patch 7934
-SHA256 882a8ddb30b30232bed1afe9b891721ebbaec54c7122e625df3382e6099e8460 autofs-4.1.3-non_block_ping.patch 7934
-MD5 bc536e7fe6e3c79f9b66a4254bf0ad43 autofs-4.1.3-replicated_server_select.patch 962
-RMD160 52f13fed9e443e0810d3e29408b06e797344e8c1 autofs-4.1.3-replicated_server_select.patch 962
-SHA256 95e2f7d1ca19c67b8116a8d5f382a7bb116255fbd507dc6689faea7da9a67dad autofs-4.1.3-replicated_server_select.patch 962
-MD5 14681387a1fc5229c2c73f593334071b autofs-4.1.3-sock-leak-fix.patch 1236
-RMD160 09ca250b5711d04336f61fb7a227d99ae2b4d053 autofs-4.1.3-sock-leak-fix.patch 1236
-SHA256 6aaa548688e7d48eb735dfa9acb1c097b82f8ef68a3ca30aab70a92b9b36453b autofs-4.1.3-sock-leak-fix.patch 1236
-MD5 d408ddcd5dafca8d2907b788f93b225c autofs-4.1.3-strict.patch 1626
-RMD160 8527db5b40eb7d0bf7fcc6f47a5be5beb22905d3 autofs-4.1.3-strict.patch 1626
-SHA256 518a7930cb6bad18f045dfc493ce39816e6fbce0f80c444dd75a33d722a8caff autofs-4.1.3-strict.patch 1626
-MD5 f43a09e94c4bd512ec58ac06e9d42c60 autofs-4.1.3.tar.bz2 125234
-RMD160 7df2839fce00222609bd7977a9d6275276e232b4 autofs-4.1.3.tar.bz2 125234
-SHA256 9257a603815ee8c8d0f2935ff3c254b23f8007eee5fa8c9bf2e3661fdc171035 autofs-4.1.3.tar.bz2 125234