gentoo resync : 15.01.2020

13 files changed, 113 insertions, 301 deletions

diff --git a/sys-devel/libtool/Manifest b/sys-devel/libtool/Manifest
index 3250878e4e55..f057ae87fd8a 100644
--- a/sys-devel/libtool/Manifest
+++ b/sys-devel/libtool/Manifest
@@ -1,20 +1,19 @@
 AUX libtool-2.2.10-eprefix.patch 462 BLAKE2B d219aac1c2b68926a6c3c83bc85b51fe5e69cbbf76e3af096b024d649180f9cc4a025ceae14ada4ddb2b8836f669318a700b59811a4b44c91db82098099565bc SHA512 c9657a2726d0750241558337af57ac7d55afa4e74ac5eef411261394cbf7070b52876074367390ed5a2bbc09d9286ba200133ec6afd88a5fe5af08b8db04e189
-AUX libtool-2.2.6a-darwin-module-bundle.patch 1202 BLAKE2B dfc1de3f09ceb164f757700e12c514ab5846a1bac8eb55b63fd27a24118ebcae36a9f7619eed3d63e02a2d5aff23efd1252975822fa136f5fd860b1172283152 SHA512 aca1cfbab9b1c9508f7fac85b346865106ce1f63d69095cd5b13e02f8d3605f04cd1142e077f19e4f6f8174cb9a9f39823061e494dfafc4fe4589c4e11120353
-AUX libtool-2.4.3-use-linux-version-in-fbsd.patch 1124 BLAKE2B 69aad533a01e88a87ea73eade9e9c510ad2e72f0601839ff3872d7df854c186642f0a1ec0c0fc103369885588a6758f3050aca25cf577076ea512e5897d0a602 SHA512 6134fb39cf0e115a91cf69de175c9a088d405684139f8ba3dcf77f2c039e5f4603e2b70652f27bb59773aacb562560c1bcdbf439de1564bd19095d524b0ee5c7
-AUX libtool-2.4.6-darwin-use-linux-version.patch 493 BLAKE2B 39c0b2e630fec412a3dbb31ab93ba1686496c7f0939f1f737e0ca929aded9c3f0b1b47102cdebccced9f7ac6107c02f10d772df9802152da03eae5c4fdefd97e SHA512 5cce0c85a59fef8c3c605e72f3f4a8a16c0ee2da464643c67fcf675fedfcb227866938fb98b1379506616b4141cca5b29175d976402510987053bade4fc482f9
+AUX libtool-2.2.6a-darwin-module-bundle.patch 1184 BLAKE2B 29fcb8ab11e2960fbf233dbf7776a334e7c399ef16dca4248eb8b5fe70505602f13c052b53a4ee10b03a19cbc4bef40d586441dc1e07b952bc8055a9b6359618 SHA512 7fe59a0f4c452fa3a619539d426f7b2dccc9eb740eb2121c36d568f9c7dff31139386bf698412de489d169fba77d723f99f05632e4bce8999facc5ccc33c1df3
+AUX libtool-2.4.3-use-linux-version-in-fbsd.patch 1108 BLAKE2B da9673ca8234cf35d3b5358d53ab3701bb453b2e827d955d0c2336bf0ae476474eb253354d1282adba134abd896dd7ca44c1cf831d5b95393f72e904ebf4d03f SHA512 ae21b7b7315ff50451d087fc87feaf949ff9094c236657b7a9b6aa381e998fa131930dcb55c099f1da8285ae5e471a2d981c78727cada931d55209c0797be65d
+AUX libtool-2.4.6-darwin-use-linux-version.patch 469 BLAKE2B 00abc1635036d1a1cdb4b1ce7ffd8a0f52f6eb0ce3f87babe6fc3468f9f990a8c2bb09bab416ee33ab77554732d86ce0a8deaf4cf83db048dd651adf4e3e59d7 SHA512 910fb30f49779f855faebfa4cdbb1a454d5cc711d366e76e16dc1f45855f518ea80027fa5f2515c8eb80dd7dfe06368c81498ba08dbb00b49982eaa851a3d53b
 AUX libtool-2.4.6-libtoolize-delay-help.patch 1591 BLAKE2B 0a2eef74ef726d71e425c5aa7d82018bf596db66baa5ea1e02db758d5bf74ade52edc482b1c4b62e7e986be20e73ae869818905954b0688c682fbad2ac1726f5 SHA512 19c160cc706081d63b65d6580fd8cb4d01e6a5e45652dd3c4fd83e71df5b765c355e861e257ab37489c2d4c78b4aa14bc94ad9718c91c90b467e4604f484b9c3
 AUX libtool-2.4.6-libtoolize-slow.patch 4659 BLAKE2B 79abc560d5e0654457a8ba26e0777bd91b4e15ad0b33e689709d31d12b6b28bed54285d3688d04a45bae4bb9c6c6d99862219335ab7cd2f7a3cdb5f237fc3f21 SHA512 a98333983a493b27f4188b83d75548abc63c1d50720a8720d47a1f88f231331de078a78440f0f0569e6aeb646b14f16db26a7eefd20fdac6fc7321b9428ddbfd
-AUX libtool-2.4.6-link-fsanitize.patch 2364 BLAKE2B 97cbf349945c315000d694f5f156835078f079998d568ebfdd1a9a664300fcbcc1a785e34cec535ffa3ac4c902cc5095517f4f0b0b8575cd66d2dbd47251bc1c SHA512 567487334e4084b94f0431561213ac520a7871a0acb904b019204e728b750a8ab8155b88f0b5a90cefdd5f524130f9f3f9f0de34d8d9a2bd821bb8be6266cf69
-AUX libtool-2.4.6-link-fuse-ld.patch 2365 BLAKE2B 806e47a27b0c73bcf67d1d1cf00412eb0114cb71955bf3248eb9529b3c73a5730bcb4c0887e441cd72ec6c8111ade8e72d765b6e5d9586e643d37a8e155f6809 SHA512 273f9bef6dffc50f9773a8a91101d13ed2a13c72e077c4620f1e3da37b27271acb005fdcde7bcd9acc7cfcb1ee71ec2cb3eba3c9fcf262eb141e12f43fd06b6e
-AUX libtool-2.4.6-link-specs.patch 2438 BLAKE2B 99dcefe58ea905e89d7169b926ed9d9f186c5603c84f262a1feff3a926a26aa839d205e47dacbfa87cadd118d8940ac58d60fba4a9ed19e019dfb838d1094c42 SHA512 349675e58a82227930859d7ced1f7bafc7b05f3d4d902e4bfec3f4f1337c7a724ff7d8f509da4212c74c6f4c07b7f3604a6c28070ca5091543a8c4616e0263c9
-AUX libtool-2.4.6-mint.patch 1672 BLAKE2B 0a7eee18610dd1126d058360f8fdadb190c6f3cb37c3c4bfc17617a06330fab5ad6f6dea7a027777d112ac19ea06586e42d907a0e8bb2a6f929188ffb34bc75a SHA512 a022703b39596ca5aafd27f463aee403c2d4565d3283c0ea20c259996c3d32056096536bbec079e3ed08b03618f9d5e46c0684db08c90477fe31e4219596e22b
+AUX libtool-2.4.6-link-fsanitize.patch 2046 BLAKE2B ba7a04b03290d4f0ac4dfe9397625f250622ba801be1246ee6a1f6aaccdbc04f35376b32fff59cc1b0401ecee45151bab4f72b68076f58410529aab971734032 SHA512 9469987b93e9335d5baa2085e47b3e16cd95b456abbd5e81de33be0330094a3ed378ea8c945dda35aa4e84c59726e998414cb7e7e83eef1fbb354e3d124dc062
+AUX libtool-2.4.6-link-fuse-ld.patch 2047 BLAKE2B 32743aecff31e1db75d16e76b8743717b5b9f4ba7602bd1435595f42e60a5c2ad1837673dd7e4bfa72e5b69c33a43f1ca1687614fc2f4315dbbe649c755a8a0e SHA512 96a05d314d764adcc45db5b23006c4a3199ff6a41448db50abcf05f959c6a2a6c8fd88d7d1daa4ee7ebb854cbe58959db4609d68dce257569e65ac49597edf4c
+AUX libtool-2.4.6-link-specs.patch 2119 BLAKE2B 9ad6203dd06b32ea5bff40731ea97855015f351a34a51320802933c2364e04b9de0c49403ece0a6b7c180d80bd17c5ce1d54615cb18db64aa5eb6fa08e195bbc SHA512 89eebfbfd1a32daf2cbedc61f358dce20e19608ea2d882e6ab2eb06c39671bde4ce88de8a2023783deddc414dd2b3cab78d60fa15ea6d5917cc06476295b058a
+AUX libtool-2.4.6-mint.patch 1158 BLAKE2B aef4853bd00a459c939c1afbaf5ab70da22dc206a75addb8a5c60fc3537037b976f5e83db173242aff114c944b18a6d2712a80ae7fef1903a46b7ef06ff64b8f SHA512 78f75c3c54039816c2fef4cde7edd53d719f356b048d343bd71e35eaef0bcf34ad195a9cc04ee04f4240a9b2a95a2d9757a3f2045a786ce9428b236c9679b6ee
 AUX libtool-2.4.6-ppc64le.patch 3672 BLAKE2B 1c1f068f0f1ab8b8180a98412e6a3bb1e4cc84c3e9c8894b4a0a2f8e110ea7ce198fc02d07ba2f18023cf38696d8cfd46e9fae979d5ab30ace2c82b020493f34 SHA512 e9dc9fad5eebabcc65506dddabf3a917c73237485f2ad24765a20437404f654a8c04411755381c7c5d90c2ae13cabd5d89f9ad15839e2e1b9d43300d57adf178
 AUX libtool-2.4.6-pthread.patch 1496 BLAKE2B dc49604133c6c65a2290a8879c243b35b2019cb63b4901b6de68f5efcfe9d42dbaafd7c40ea03f1b247cea8718ef92a51c1bd0ce429ec49665f05a61e26d25fa SHA512 037cf598c644d167de5fef9f4ecee6ccd573d2516f2f777eeaad94135ff05dd0775191d3e21cca397bb664bc0449a5db0b9ef0bbaa16e178762be9769c13c31e
-AUX libtool-2.4.6-pthread_bootstrapped.patch 556 BLAKE2B a381e0a8d8c585f6f79cd2f15d473f4cd46dec0cf28657a4fa695efaad4bbfc963cc71fc5d8a4681a7a9f3e789b41c6e281329dae3117df2ec4c14a2cf5ca051 SHA512 22d7ba329f7e4c6a9b157f460e2076f1a08cd8f16fc68572c3f07b9ee10f8249855b2d7044be33710ce5ef1fecca3db351dd587001940cb834f9351f901df7fb
-AUX libtool-2.4.6-sed-quote-speedup.patch 8262 BLAKE2B c9194732921aa28713c9e0019d5e9de7e1ad2d6a18059c0f7681b0d683bdf460bb8257381269e8193ead866f26af000a6bddfc7c56410f7fde94fbf32bdbe8af SHA512 d4a1ab01e1d6f3b05221bded3fc7c8204e686b1ac11dc00267a7a75a6759adfa8ac3d7041dc5710084031c7fe47f2deb88bc9c23e3502a944a97244942529927
+AUX libtool-2.4.6-pthread_bootstrapped.patch 532 BLAKE2B aeb1592c07a9c5eeed81c483e348786fb1cede29b09fa8e74d0fcf7fdb6ad36fd980823d13b3e20cc7a54d5c518e0f557928b440ef9d0fd6723a8d5f8774c098 SHA512 05c1cee7a3d90bf4768cabaaba47290dc668db7c14173abf99ed8e64dae92191537f89c3304a4d42c01ecc2280d37104c47f621e44b3d19db481846bb225a2a1
+AUX libtool-2.4.6-sed-quote-speedup.patch 7619 BLAKE2B 14e0341bb5b5878dd9bab5996a63d849c5d8c257618a87792bf7c904481d07430553102da2917cb518c37790d2321ae6202572ab59614a8291e475fc8a043ee6 SHA512 f5658f87edc24e494fff1ad2b1932dcd4a8a1515e88a10f3d5bc076ac69570e11c4559a8a56d577dc24181de262c97d6c1cfb16b9cd8315264cf55bc1351bf71
 DIST libtool-2.4.6.tar.xz 973080 BLAKE2B 0865af9f8701ca9dc62eec8294a088d24f4a3ff541bc76acfe7b69f70637d7e8261a17d69f7d54a4177f974c429be68467883a1560edb539061966cbf7d4a356 SHA512 a6eef35f3cbccf2c9e2667f44a476ebc80ab888725eb768e91a3a6c33b8c931afc46eb23efaee76c8696d3e4eed74ab1c71157bcb924f38ee912c8a90a6521a4
 EBUILD libtool-2.4.6-r3.ebuild 2564 BLAKE2B 3eaae24785c03a7ad35a5e6ab7d06b5ab553b9fa1e3065aa8b4b8f75b98f76e0449d55f778e9b56a73e988014af2c0c0e9af9dbe7a47efc54ef4cd5d7181858a SHA512 eeba50e6d2bfdf056ba88fda462e8658acd7373d4cb2902470aa57356aad91294ab60b70db4a834de51b6b4346cf7929a3246939af7ce9e4efcbe6324ba87caa
-EBUILD libtool-2.4.6-r4.ebuild 3524 BLAKE2B 9d29818985a5bf3bf92af0ed0503640ad6d365bdd112b1fecd789e036f4faf99f1abc9a056070b11638bfddbb0126a10b49c11437ec709e0d174e12f10cd8f5a SHA512 c0637d6ccd622500d9cefcec5410fcfda4d35ed55dc55ea5aeefb7036b8b9dbec20b790ee726c72a2efa3ec246c72f4d64dc43ad69a59efaf0ab22268f5a71c0
-EBUILD libtool-2.4.6-r5.ebuild 3664 BLAKE2B 0d7071dfde38723d1fb76b8b80d742b542ac43abd0326c7a3de348cff3c254ffdb03fc6d1882c6920b2387985eb33652c718cc22e3e8283e715e352483054f48 SHA512 f93d15624ad853809c4c1c8ad4bbd15faf5b33b34ffcb1bf52d745c12286e4430e9bc9aa0a326919971af273f59eb1198b4200afb2ee16efd909247ea97d99b3
-EBUILD libtool-9999.ebuild 3316 BLAKE2B be8a8c44f454a714c8c13d6e7cb5c57ed8cf8306aa5065c8c6afc99b68196bc4242692b342d82695bd23ac817d44825b2e97378b12731334d7b30527988d06b0 SHA512 e5fa949c085dbe2af282e468c58511fc32d5a0f6982002ce2807dd0687a4e5015bf3ec5db199cea84f93c3f8368dfce152d6e036e6f642c701fc0cee63c36fb5
+EBUILD libtool-2.4.6-r6.ebuild 3594 BLAKE2B 61f9bebebbd6d4da7116a3a8ae175f0197c83ababa60286d4b5b2748e89edd8dda5d6295de6bb4aa1b9a68712dd421f00109bd89c01d572f45725e84a166f3ab SHA512 a6823a9f68b14b91ddef2e3e300697dbadc10eba591f56e94d7f55ce8f28f8adbd5e925a7cfb365b1733e2fcc35849ed2f9e009804eb775e41e8ae399c8f5fef
+EBUILD libtool-9999.ebuild 3236 BLAKE2B 2f47c0b3326d3f88b70591d3b23c5c8eeecb2b974e04b8ee08528e28fa83f9b3cae0ace76b94d53b21309f45003b5b730c21636e1a8ced3db8b2db183a7b6e1f SHA512 eb064c77276e9c912c667ef075779c5a0423270ba6cf0b11e39fccb4dadea7910d18437e12b72604b6c82ee0238a667f6e81842eab0dc0734d26a44519f2572b
 MISC metadata.xml 330 BLAKE2B 5678614b52e8b602999e8a3d3a551cf0096f6bd1e765b4181d4183a33cdb0782dc16b959556b410d5c630ec3d36d00df80c204a0ef825361235bfb3165b41a04 SHA512 524ff4bb47aa1a020112c86f625f3f0a9bf385e7399a7a9aecdebb99c5699dbe770b3bc6de4e3e969c8a4c5107a4a214be1f6a06a075b7301069fb2f0e7939a1
diff --git a/sys-devel/libtool/files/libtool-2.2.6a-darwin-module-bundle.patch b/sys-devel/libtool/files/libtool-2.2.6a-darwin-module-bundle.patch
index c6b63ed32766..81364d4d02af 100644
--- a/sys-devel/libtool/files/libtool-2.2.6a-darwin-module-bundle.patch
+++ b/sys-devel/libtool/files/libtool-2.2.6a-darwin-module-bundle.patch
@@ -11,10 +11,10 @@ in this context refers to the binary itself, not to a structured
 hierarchy. Bundles have the .bundle extension; for example,
 MyBundle.bundle.)
 
---- libltdl/m4/libtool.m4
-+++ libltdl/m4/libtool.m4
-@@ -2271,7 +2271,7 @@
-   soname_spec='${libname}${release}${major}$shared_ext'
+--- a/m4/libtool.m4
++++ b/m4/libtool.m4
+@@ -2645,7 +2645,7 @@
+   soname_spec='$libname$release$major$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
 -  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
diff --git a/sys-devel/libtool/files/libtool-2.4.3-use-linux-version-in-fbsd.patch b/sys-devel/libtool/files/libtool-2.4.3-use-linux-version-in-fbsd.patch
index 8244eaa7e3e7..aa1e870649b6 100644
--- a/sys-devel/libtool/files/libtool-2.4.3-use-linux-version-in-fbsd.patch
+++ b/sys-devel/libtool/files/libtool-2.4.3-use-linux-version-in-fbsd.patch
@@ -7,7 +7,7 @@ http://bugs.gentoo.org/109105
 
 --- a/m4/libtool.m4
 +++ b/m4/libtool.m4
-@@ -1375,7 +1375,14 @@
+@@ -2666,7 +2666,14 @@
      *) objformat=elf ;;
      esac
    fi
@@ -22,9 +22,9 @@ http://bugs.gentoo.org/109105
 +
    case $version_type in
      freebsd-elf*)
-       library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-@@ -1386,6 +1392,12 @@
-       library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+       library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+@@ -2678,6 +2685,12 @@
+       library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
        need_version=yes
        ;;
 +    linux)
diff --git a/sys-devel/libtool/files/libtool-2.4.6-darwin-use-linux-version.patch b/sys-devel/libtool/files/libtool-2.4.6-darwin-use-linux-version.patch
index b4409815f8b4..aded304989d2 100644
--- a/sys-devel/libtool/files/libtool-2.4.6-darwin-use-linux-version.patch
+++ b/sys-devel/libtool/files/libtool-2.4.6-darwin-use-linux-version.patch
@@ -1,8 +1,8 @@
 * revert old 1.5 behaviour
 
---- libtool-2.4.6/m4/libtool.m4
-+++ libtool-2.4.6/m4/libtool.m4
-@@ -2272,7 +2272,7 @@
+--- a/m4/libtool.m4
++++ b/m4/libtool.m4
+@@ -2641,7 +2641,7 @@
    version_type=darwin
    need_lib_prefix=no
    need_version=no
diff --git a/sys-devel/libtool/files/libtool-2.4.6-link-fsanitize.patch b/sys-devel/libtool/files/libtool-2.4.6-link-fsanitize.patch
index c1ea8a82940f..853a22eff54f 100644
--- a/sys-devel/libtool/files/libtool-2.4.6-link-fsanitize.patch
+++ b/sys-devel/libtool/files/libtool-2.4.6-link-fsanitize.patch
@@ -13,15 +13,10 @@ linker to allow trivial use of the clang address sanitizer.
 
 Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
 Copyright-paperwork-exempt: Yes
----
- build-aux/ltmain.in | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
 
-diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
-index 1cbe875..2a5aaad 100644
 --- a/build-aux/ltmain.in
 +++ b/build-aux/ltmain.in
-@@ -5382,10 +5382,11 @@ func_mode_link ()
+@@ -5362,10 +5362,11 @@
        # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
        # -specs=*             GCC specs files
        # -stdlib=*            select c++ std lib with clang
@@ -34,13 +29,9 @@ index 1cbe875..2a5aaad 100644
          func_quote_for_eval "$arg"
  	arg=$func_quote_for_eval_result
          func_append compile_command " $arg"
-
-patch the generated file too to keep help2man from generating man pages
-https://bugs.gentoo.org/556512
-
 --- a/build-aux/ltmain.sh
 +++ b/build-aux/ltmain.sh
-@@ -5382,10 +5382,11 @@ func_mode_link ()
+@@ -7274,10 +7274,11 @@
        # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
        # -specs=*             GCC specs files
        # -stdlib=*            select c++ std lib with clang
@@ -53,6 +44,3 @@ https://bugs.gentoo.org/556512
          func_quote_for_eval "$arg"
  	arg=$func_quote_for_eval_result
          func_append compile_command " $arg"
--- 
-2.6.2
-
diff --git a/sys-devel/libtool/files/libtool-2.4.6-link-fuse-ld.patch b/sys-devel/libtool/files/libtool-2.4.6-link-fuse-ld.patch
index 55ec5ae9e0a6..f6c0a3dc89f1 100644
--- a/sys-devel/libtool/files/libtool-2.4.6-link-fuse-ld.patch
+++ b/sys-devel/libtool/files/libtool-2.4.6-link-fuse-ld.patch
@@ -10,15 +10,10 @@ Starting with gcc-4.8, there's a -fuse-ld flag that can be used to select
 between bfd & gold.  Make sure we pass it through to the linking stage.
 
 * build-aux/ltmain.in (func_mode_link): Pass -fuse-ld=* flags through.
----
- build-aux/ltmain.in | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
 
-diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
-index 2a5aaad..4c24d5d 100644
 --- a/build-aux/ltmain.in
 +++ b/build-aux/ltmain.in
-@@ -5383,10 +5383,11 @@ func_mode_link ()
+@@ -5363,10 +5363,11 @@
        # -specs=*             GCC specs files
        # -stdlib=*            select c++ std lib with clang
        # -fsanitize=*         Clang/GCC memory and address sanitizer
@@ -31,13 +26,9 @@ index 2a5aaad..4c24d5d 100644
          func_quote_for_eval "$arg"
  	arg=$func_quote_for_eval_result
          func_append compile_command " $arg"
-
-patch the generated file too to keep help2man from generating man pages
-https://bugs.gentoo.org/556512
-
 --- a/build-aux/ltmain.sh
 +++ b/build-aux/ltmain.sh
-@@ -5383,10 +5383,11 @@ func_mode_link ()
+@@ -7275,10 +7275,11 @@
        # -specs=*             GCC specs files
        # -stdlib=*            select c++ std lib with clang
        # -fsanitize=*         Clang/GCC memory and address sanitizer
@@ -50,5 +41,3 @@ https://bugs.gentoo.org/556512
          func_quote_for_eval "$arg"
  	arg=$func_quote_for_eval_result
          func_append compile_command " $arg"
--- 
-2.3.2
diff --git a/sys-devel/libtool/files/libtool-2.4.6-link-specs.patch b/sys-devel/libtool/files/libtool-2.4.6-link-specs.patch
index a8fbf28f80c0..c7720935d8fd 100644
--- a/sys-devel/libtool/files/libtool-2.4.6-link-specs.patch
+++ b/sys-devel/libtool/files/libtool-2.4.6-link-specs.patch
@@ -10,15 +10,10 @@ https://bugzilla.redhat.com/show_bug.cgi?id=985592
 to the linker, Fedora uses this option for hardening.
 
 Signed-off-by: Pavel Raiskup <praiskup@redhat.com>
----
- build-aux/ltmain.in | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
 
-diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
-index d5cf07a..0c40da0 100644
 --- a/build-aux/ltmain.in
 +++ b/build-aux/ltmain.in
-@@ -5360,10 +5360,12 @@ func_mode_link ()
+@@ -5360,10 +5360,12 @@
        # -tp=*                Portland pgcc target processor selection
        # --sysroot=*          for sysroot support
        # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
@@ -32,13 +27,9 @@ index d5cf07a..0c40da0 100644
          func_quote_for_eval "$arg"
  	arg=$func_quote_for_eval_result
          func_append compile_command " $arg"
-
-patch the generated file too to keep help2man from generating man pages
-https://bugs.gentoo.org/556512
-
 --- a/build-aux/ltmain.sh
 +++ b/build-aux/ltmain.sh
-@@ -5360,10 +5360,12 @@ func_mode_link ()
+@@ -7272,10 +7272,12 @@
        # -tp=*                Portland pgcc target processor selection
        # --sysroot=*          for sysroot support
        # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
@@ -52,6 +43,3 @@ https://bugs.gentoo.org/556512
          func_quote_for_eval "$arg"
  	arg=$func_quote_for_eval_result
          func_append compile_command " $arg"
--- 
-2.6.2
-
diff --git a/sys-devel/libtool/files/libtool-2.4.6-mint.patch b/sys-devel/libtool/files/libtool-2.4.6-mint.patch
index 341a0f02ef1e..4fe5bcede5a3 100644
--- a/sys-devel/libtool/files/libtool-2.4.6-mint.patch
+++ b/sys-devel/libtool/files/libtool-2.4.6-mint.patch
@@ -2,10 +2,9 @@ Patch by Alan Hourihane
 
 http://bugs.gentoo.org/show_bug.cgi?id=266984
 
-diff -ur libtool-2.2.6/configure libtool-2.2.6-mint/configure
---- libtool-2.2.6/configure	2008-09-07 17:52:50.000000000 +0000
-+++ libtool-2.2.6/configure	2009-04-21 08:49:27.000000000 +0000
-@@ -4986,6 +4986,11 @@
+--- a/configure
++++ b/configure
+@@ -5897,6 +5897,11 @@
      lt_cv_sys_max_cmd_len=8192;
      ;;
  
@@ -17,10 +16,9 @@ diff -ur libtool-2.2.6/configure libtool-2.2.6-mint/configure
    amigaos*)
      # On AmigaOS with pdksh, this test takes hours, literally.
      # So we just punt and use a minimum line length of 8192.
-diff -ur libtool-2.2.6/libltdl/configure libtool-2.2.6-mint/libltdl/configure
---- libtool-2.2.6/libltdl/configure	2008-09-07 17:53:05.000000000 +0000
-+++ libtool-2.2.6/libltdl/configure	2009-04-21 08:50:08.000000000 +0000
-@@ -4422,6 +4422,11 @@
+--- a/libltdl/configure
++++ b/libltdl/configure
+@@ -4782,6 +4782,11 @@
      lt_cv_sys_max_cmd_len=8192;
      ;;
  
@@ -32,10 +30,9 @@ diff -ur libtool-2.2.6/libltdl/configure libtool-2.2.6-mint/libltdl/configure
    amigaos*)
      # On AmigaOS with pdksh, this test takes hours, literally.
      # So we just punt and use a minimum line length of 8192.
-diff -ur libtool-2.2.6/libltdl/m4/libtool.m4 libtool-2.2.6-mint/libltdl/m4/libtool.m4
---- libtool-2.2.6/m4/libtool.m4	2008-09-05 11:54:41.000000000 +0000
-+++ libtool-2.2.6/m4/libtool.m4	2009-04-21 08:50:26.000000000 +0000
-@@ -1527,6 +1527,11 @@
+--- a/m4/libtool.m4
++++ b/m4/libtool.m4
+@@ -1708,6 +1708,11 @@
      lt_cv_sys_max_cmd_len=8192;
      ;;
  
diff --git a/sys-devel/libtool/files/libtool-2.4.6-pthread_bootstrapped.patch b/sys-devel/libtool/files/libtool-2.4.6-pthread_bootstrapped.patch
index 54461ccc54ee..b093d74266f2 100644
--- a/sys-devel/libtool/files/libtool-2.4.6-pthread_bootstrapped.patch
+++ b/sys-devel/libtool/files/libtool-2.4.6-pthread_bootstrapped.patch
@@ -1,8 +1,8 @@
 https://bugs.gentoo.org/650876
 
---- libtool-2.4.6/build-aux/ltmain.sh
-+++ libtool-2.4.6/build-aux/ltmain.sh
-@@ -7079,6 +7079,16 @@
+--- a/build-aux/ltmain.sh
++++ b/build-aux/ltmain.sh
+@@ -7127,6 +7127,16 @@
  	    *" $arg "*) ;;
  	    * ) func_append new_inherited_linker_flags " $arg" ;;
  	esac
diff --git a/sys-devel/libtool/files/libtool-2.4.6-sed-quote-speedup.patch b/sys-devel/libtool/files/libtool-2.4.6-sed-quote-speedup.patch
index 0eeffac7a0da..580d635d04aa 100644
--- a/sys-devel/libtool/files/libtool-2.4.6-sed-quote-speedup.patch
+++ b/sys-devel/libtool/files/libtool-2.4.6-sed-quote-speedup.patch
@@ -20,18 +20,10 @@ of '$SED $sed_quote_subst'.
 (func_mode_link): Likewise.
 * NEWS: Document.
 * bootstrap: Sync with funclib.sh.
----
- NEWS                    |  3 +++
- bootstrap               | 61 +++++++++++++++++++++++++++++++++++++++++++------
- build-aux/ltmain.in     | 10 ++++----
- gl/build-aux/funclib.sh | 61 +++++++++++++++++++++++++++++++++++++++++++------
- 4 files changed, 117 insertions(+), 18 deletions(-)
 
-diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
-index 0c40da0..24acefd 100644
 --- a/build-aux/ltmain.in
 +++ b/build-aux/ltmain.in
-@@ -3346,7 +3346,8 @@ else
+@@ -3346,7 +3346,8 @@
    if test \"\$libtool_execute_magic\" != \"$magic\"; then
      file=\"\$0\""
  
@@ -41,7 +33,7 @@ index 0c40da0..24acefd 100644
      $ECHO "\
  
  # A function that is used when there is no print builtin or printf.
-@@ -8596,8 +8597,8 @@ EOF
+@@ -8598,8 +8599,8 @@
  	    relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
  	  fi
  	done
@@ -52,7 +44,7 @@ index 0c40da0..24acefd 100644
        fi
  
        # Only actually do things if not in dry run mode.
-@@ -8843,7 +8844,8 @@ EOF
+@@ -8845,7 +8846,8 @@
        done
        # Quote the link command for shipping.
        relink_command="(cd `pwd`; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
@@ -62,8 +54,6 @@ index 0c40da0..24acefd 100644
        if test yes = "$hardcode_automatic"; then
  	relink_command=
        fi
-diff --git a/gl/build-aux/funclib.sh b/gl/build-aux/funclib.sh
-index 39d972e..47d8b95 100644
 --- a/build-aux/funclib.sh
 +++ b/build-aux/funclib.sh
 @@ -1,5 +1,5 @@
@@ -73,7 +63,7 @@ index 39d972e..47d8b95 100644
  
  # General shell script boiler plate, and helper functions.
  # Written by Gary V. Vaughan, 2004
-@@ -1026,6 +1026,57 @@ func_relative_path ()
+@@ -1026,6 +1026,57 @@
  }
  
  
@@ -131,7 +121,7 @@ index 39d972e..47d8b95 100644
  # func_quote_for_eval ARG...
  # --------------------------
  # Aesthetically quote ARGs to be evaled later.
-@@ -1042,12 +1093,8 @@ func_quote_for_eval ()
+@@ -1042,12 +1093,8 @@
      func_quote_for_eval_unquoted_result=
      func_quote_for_eval_result=
      while test 0 -lt $#; do
@@ -146,20 +136,18 @@ index 39d972e..47d8b95 100644
        if test -n "$func_quote_for_eval_unquoted_result"; then
  	func_append func_quote_for_eval_unquoted_result " $_G_unquoted_arg"
        else
-
-patch the generated file too to keep help2man from generating man pages
-https://bugs.gentoo.org/556512
-
 --- a/build-aux/ltmain.sh
 +++ b/build-aux/ltmain.sh
-@@ -1,5 +1,5 @@
+@@ -64,7 +64,7 @@
+ # libraries, which are installed to $pkgauxdir.
+ 
  # Set a version string for this script.
 -scriptversion=2015-01-20.17; # UTC
 +scriptversion=2015-10-04.22; # UTC
  
  # General shell script boiler plate, and helper functions.
  # Written by Gary V. Vaughan, 2004
-@@ -1026,6 +1026,57 @@ func_relative_path ()
+@@ -1091,6 +1091,57 @@
  }
  
  
@@ -217,7 +205,7 @@ https://bugs.gentoo.org/556512
  # func_quote_for_eval ARG...
  # --------------------------
  # Aesthetically quote ARGs to be evaled later.
-@@ -1042,12 +1093,8 @@ func_quote_for_eval ()
+@@ -1107,12 +1158,8 @@
      func_quote_for_eval_unquoted_result=
      func_quote_for_eval_result=
      while test 0 -lt $#; do
@@ -232,7 +220,7 @@ https://bugs.gentoo.org/556512
        if test -n "$func_quote_for_eval_unquoted_result"; then
  	func_append func_quote_for_eval_unquoted_result " $_G_unquoted_arg"
        else
-@@ -3346,7 +3346,8 @@ else
+@@ -5258,7 +5305,8 @@
    if test \"\$libtool_execute_magic\" != \"$magic\"; then
      file=\"\$0\""
  
@@ -242,7 +230,7 @@ https://bugs.gentoo.org/556512
      $ECHO "\
  
  # A function that is used when there is no print builtin or printf.
-@@ -8596,8 +8597,8 @@ EOF
+@@ -10510,8 +10558,8 @@
  	    relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
  	  fi
  	done
@@ -253,7 +241,7 @@ https://bugs.gentoo.org/556512
        fi
  
        # Only actually do things if not in dry run mode.
-@@ -8843,7 +8844,8 @@ EOF
+@@ -10757,7 +10805,8 @@
        done
        # Quote the link command for shipping.
        relink_command="(cd `pwd`; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
@@ -263,6 +251,3 @@ https://bugs.gentoo.org/556512
        if test yes = "$hardcode_automatic"; then
  	relink_command=
        fi
--- 
-2.6.2
-
diff --git a/sys-devel/libtool/libtool-2.4.6-r4.ebuild b/sys-devel/libtool/libtool-2.4.6-r4.ebuild
deleted file mode 100644
index a7dc840c4d43..000000000000
--- a/sys-devel/libtool/libtool-2.4.6-r4.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-LIBTOOLIZE="true" #225559
-WANT_LIBTOOL="none"
-inherit autotools epatch epunt-cxx multilib unpacker prefix
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.savannah.gnu.org/${PN}.git
-		http://git.savannah.gnu.org/r/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-fi
-
-DESCRIPTION="A shared library tool for developers"
-HOMEPAGE="https://www.gnu.org/software/libtool/"
-
-LICENSE="GPL-2"
-SLOT="2"
-IUSE="vanilla"
-
-# Pull in libltdl directly until we convert packages to the new dep.
-RDEPEND="sys-devel/gnuconfig
-	>=sys-devel/autoconf-2.69
-	>=sys-devel/automake-1.13
-	dev-libs/libltdl:0
-	!<sys-apps/sandbox-2.10-r4"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils"
-[[ ${PV} == "9999" ]] && DEPEND+=" sys-apps/help2man"
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		git-r3_src_unpack
-		cd "${S}"
-		./bootstrap || die
-	else
-		unpacker_src_unpack
-	fi
-}
-
-src_prepare() {
-	use vanilla && return 0
-
-	epatch "${FILESDIR}"/${PN}-2.4.3-use-linux-version-in-fbsd.patch #109105
-	epatch "${FILESDIR}"/${P}-link-specs.patch
-	epatch "${FILESDIR}"/${P}-link-fsanitize.patch #573744
-	epatch "${FILESDIR}"/${P}-link-fuse-ld.patch
-	epatch "${FILESDIR}"/${P}-libtoolize-slow.patch
-	epatch "${FILESDIR}"/${P}-libtoolize-delay-help.patch
-	epatch "${FILESDIR}"/${P}-sed-quote-speedup.patch #542252
-	epatch "${FILESDIR}"/${P}-ppc64le.patch #581314
-
-	epatch "${FILESDIR}"/${PN}-2.4.6-mint.patch
-	epatch "${FILESDIR}"/${PN}-2.2.6a-darwin-module-bundle.patch
-	epatch "${FILESDIR}"/${PN}-2.4.6-darwin-use-linux-version.patch
-	if use prefix ; then
-		# seems that libtool has to know about EPREFIX a little bit
-		# better, since it fails to find prefix paths to search libs
-		# from, resulting in some packages building static only, since
-		# libtool is fooled into thinking that libraries are unavailable
-		# (argh...). This could also be fixed by making the gcc wrapper
-		# return the correct result for -print-search-dirs (doesn't
-		# include prefix dirs ...).
-		epatch "${FILESDIR}"/${PN}-2.2.10-eprefix.patch
-		eprefixify m4/libtool.m4
-	fi
-
-	pushd libltdl >/dev/null
-	AT_NOELIBTOOLIZE=yes eautoreconf
-	popd >/dev/null
-	AT_NOELIBTOOLIZE=yes eautoreconf
-	epunt_cxx
-
-	# Make sure timestamps don't trigger a rebuild of man pages. #556512
-	if [[ ${PV} != "9999" ]] ; then
-		touch doc/*.1
-		export HELP2MAN=false
-	fi
-}
-
-src_configure() {
-	# the libtool script uses bash code in it and at configure time, tries
-	# to find a bash shell.  if /bin/sh is bash, it uses that.  this can
-	# cause problems for people who switch /bin/sh on the fly to other
-	# shells, so just force libtool to use /bin/bash all the time.
-	export CONFIG_SHELL=$(type -P bash)
-
-	# Do not bother hardcoding the full path to sed.  Just rely on $PATH. #574550
-	export ac_cv_path_SED=$(basename "$(type -P sed)")
-
-	local myconf
-	[[ ${CHOST} == *-darwin* ]] && myconf="--program-prefix=g"
-	ECONF_SOURCE=${S} econf ${myconf} --disable-ltdl-install
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	default
-
-	local x
-	while read -d $'\0' -r x ; do
-		ln -sf "${EPREFIX}"/usr/share/gnuconfig/${x##*/} "${x}" || die
-	done < <(find "${ED}" '(' -name config.guess -o -name config.sub ')' -print0)
-}
diff --git a/sys-devel/libtool/libtool-2.4.6-r5.ebuild b/sys-devel/libtool/libtool-2.4.6-r6.ebuild
index 9f5c38a68cd5..0ac78632b965 100644
--- a/sys-devel/libtool/libtool-2.4.6-r5.ebuild
+++ b/sys-devel/libtool/libtool-2.4.6-r6.ebuild
@@ -1,19 +1,18 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 LIBTOOLIZE="true" #225559
 WANT_LIBTOOL="none"
-inherit autotools epatch epunt-cxx multilib unpacker prefix
+inherit autotools prefix
 
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.savannah.gnu.org/${PN}.git
-		http://git.savannah.gnu.org/r/${PN}.git"
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/libtool.git"
 	inherit git-r3
 else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 fi
 
 DESCRIPTION="A shared library tool for developers"
@@ -24,48 +23,42 @@ SLOT="2"
 IUSE="vanilla"
 
 # Pull in libltdl directly until we convert packages to the new dep.
-RDEPEND="sys-devel/gnuconfig
-	>=sys-devel/autoconf-2.69
-	>=sys-devel/automake-1.13
-	dev-libs/libltdl:0
-	!<sys-apps/sandbox-2.10-r4"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils"
-[[ ${PV} == "9999" ]] && DEPEND+=" sys-apps/help2man"
+RDEPEND="
+	sys-devel/gnuconfig
+	>=sys-devel/autoconf-2.69:*
+	>=sys-devel/automake-1.13:*
+	dev-libs/libltdl:0"
+DEPEND="${RDEPEND}"
+[[ ${PV} == *9999 ]] && BDEPEND="sys-apps/help2man"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.4.3-use-linux-version-in-fbsd.patch #109105
-	"${FILESDIR}"/${P}-link-specs.patch
-	"${FILESDIR}"/${P}-link-fsanitize.patch #573744
-	"${FILESDIR}"/${P}-link-fuse-ld.patch
-	"${FILESDIR}"/${P}-libtoolize-slow.patch
-	"${FILESDIR}"/${P}-libtoolize-delay-help.patch
-	"${FILESDIR}"/${P}-sed-quote-speedup.patch #542252
-	"${FILESDIR}"/${P}-ppc64le.patch #581314
+	"${FILESDIR}"/${PN}-2.4.6-link-specs.patch
+	"${FILESDIR}"/${PN}-2.4.6-link-fsanitize.patch #573744
+	"${FILESDIR}"/${PN}-2.4.6-link-fuse-ld.patch
+	"${FILESDIR}"/${PN}-2.4.6-libtoolize-slow.patch
+	"${FILESDIR}"/${PN}-2.4.6-libtoolize-delay-help.patch
+	"${FILESDIR}"/${PN}-2.4.6-sed-quote-speedup.patch #542252
+	"${FILESDIR}"/${PN}-2.4.6-ppc64le.patch #581314
 
 	"${FILESDIR}"/${PN}-2.4.6-mint.patch
 	"${FILESDIR}"/${PN}-2.2.6a-darwin-module-bundle.patch
 	"${FILESDIR}"/${PN}-2.4.6-darwin-use-linux-version.patch
 )
 
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		git-r3_src_unpack
-	else
-		unpacker_src_unpack
-	fi
-}
-
 src_prepare() {
-	if [[ "${PV}" = 9999 ]] ; then
-		eapply "${FILESDIR}"/${P}-pthread.patch #650876
+	if [[ ${PV} == *9999 ]] ; then
+		eapply "${FILESDIR}"/${PN}-2.4.6-pthread.patch #650876
 		./bootstrap || die
 	else
 		PATCHES+=(
-			"${FILESDIR}"/${P}-pthread_bootstrapped.patch #650876
+			"${FILESDIR}"/${PN}-2.4.6-pthread_bootstrapped.patch #650876
 		)
 	fi
 
+	# WARNING: File build-aux/ltmain.sh is read-only; trying to patch anyway
+	chmod +w build-aux/ltmain.sh || die
+
 	if use vanilla ; then
 		eapply_user
 		return 0
@@ -85,15 +78,14 @@ src_prepare() {
 		eprefixify m4/libtool.m4
 	fi
 
-	pushd libltdl >/dev/null
+	pushd libltdl >/dev/null || die
 	AT_NOELIBTOOLIZE=yes eautoreconf
-	popd >/dev/null
+	popd >/dev/null || die
 	AT_NOELIBTOOLIZE=yes eautoreconf
-	epunt_cxx
 
 	# Make sure timestamps don't trigger a rebuild of man pages. #556512
-	if [[ ${PV} != "9999" ]] ; then
-		touch doc/*.1
+	if [[ ${PV} != *9999 ]] ; then
+		touch doc/*.1 || die
 		export HELP2MAN=false
 	fi
 }
@@ -108,15 +100,10 @@ src_configure() {
 	# Do not bother hardcoding the full path to sed.  Just rely on $PATH. #574550
 	export ac_cv_path_SED="$(basename "$(type -P sed)")"
 
-	local myconf
-	[[ ${CHOST} == *-darwin* ]] && myconf="--program-prefix=g"
+	[[ ${CHOST} == *-darwin* ]] && local myconf="--program-prefix=g"
 	ECONF_SOURCE=${S} econf ${myconf} --disable-ltdl-install
 }
 
-src_test() {
-	emake check
-}
-
 src_install() {
 	default
 
diff --git a/sys-devel/libtool/libtool-9999.ebuild b/sys-devel/libtool/libtool-9999.ebuild
index 96ef613cceea..a929635d35d7 100644
--- a/sys-devel/libtool/libtool-9999.ebuild
+++ b/sys-devel/libtool/libtool-9999.ebuild
@@ -1,19 +1,18 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 LIBTOOLIZE="true" #225559
 WANT_LIBTOOL="none"
-inherit autotools epunt-cxx multilib unpacker prefix
+inherit autotools prefix
 
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.savannah.gnu.org/${PN}.git
-		http://git.savannah.gnu.org/r/${PN}.git"
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/libtool.git"
 	inherit git-r3
 else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 fi
 
 DESCRIPTION="A shared library tool for developers"
@@ -24,14 +23,13 @@ SLOT="2"
 IUSE="vanilla"
 
 # Pull in libltdl directly until we convert packages to the new dep.
-RDEPEND="sys-devel/gnuconfig
-	>=sys-devel/autoconf-2.69
-	>=sys-devel/automake-1.13
-	dev-libs/libltdl:0
-	!<sys-apps/sandbox-2.10-r4"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils"
-[[ ${PV} == "9999" ]] && DEPEND+=" sys-apps/help2man"
+RDEPEND="
+	sys-devel/gnuconfig
+	>=sys-devel/autoconf-2.69:*
+	>=sys-devel/automake-1.13:*
+	dev-libs/libltdl:0"
+DEPEND="${RDEPEND}"
+[[ ${PV} == *9999 ]] && BDEPEND="sys-apps/help2man"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.4.3-use-linux-version-in-fbsd.patch #109105
@@ -40,27 +38,25 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.4.6-darwin-use-linux-version.patch
 )
 
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		git-r3_src_unpack
-	else
-		unpacker_src_unpack
-	fi
-}
-
 src_prepare() {
-	if [[ "${PV}" = 9999 ]] ; then
+	if [[ ${PV} == *9999 ]] ; then
 		eapply "${FILESDIR}"/${PN}-2.4.6-pthread.patch #650876
 		./bootstrap || die
 	else
 		PATCHES+=(
-			"${FILESDIR}"/${P}-pthread_bootstrapped.patch #650876
+			"${FILESDIR}"/${PN}-2.4.6-pthread_bootstrapped.patch #650876
 		)
 	fi
 
-	use vanilla && return 0
+	# WARNING: File build-aux/ltmain.sh is read-only; trying to patch anyway
+	chmod +w build-aux/ltmain.sh || die
 
-	default
+	if use vanilla ; then
+		eapply_user
+		return 0
+	else
+		default
+	fi
 
 	if use prefix ; then
 		# seems that libtool has to know about EPREFIX a little bit
@@ -73,15 +69,15 @@ src_prepare() {
 		eapply "${FILESDIR}"/${PN}-2.2.10-eprefix.patch
 		eprefixify m4/libtool.m4
 	fi
-	pushd libltdl >/dev/null
+
+	pushd libltdl >/dev/null || die
 	AT_NOELIBTOOLIZE=yes eautoreconf
-	popd >/dev/null
+	popd >/dev/null || die
 	AT_NOELIBTOOLIZE=yes eautoreconf
-	epunt_cxx
 
 	# Make sure timestamps don't trigger a rebuild of man pages. #556512
-	if [[ ${PV} != "9999" ]] ; then
-		touch doc/*.1
+	if [[ ${PV} != *9999 ]] ; then
+		touch doc/*.1 || die
 		export HELP2MAN=false
 	fi
 }
@@ -96,15 +92,10 @@ src_configure() {
 	# Do not bother hardcoding the full path to sed.  Just rely on $PATH. #574550
 	export ac_cv_path_SED="$(basename "$(type -P sed)")"
 
-	local myconf
-	[[ ${CHOST} == *-darwin* ]] && myconf="--program-prefix=g"
+	[[ ${CHOST} == *-darwin* ]] && local myconf="--program-prefix=g"
 	ECONF_SOURCE=${S} econf ${myconf} --disable-ltdl-install
 }
 
-src_test() {
-	emake check
-}
-
 src_install() {
 	default