gentoo resync : 18.03.2018

19 files changed, 20 insertions, 723 deletions

diff --git a/sys-devel/automake/Manifest b/sys-devel/automake/Manifest
index 84bd02462ef1..5a706e1f6380 100644
--- a/sys-devel/automake/Manifest
+++ b/sys-devel/automake/Manifest
@@ -52,27 +52,19 @@ DIST automake-1.6.3.tar.bz2 476275 BLAKE2B 5d0b7f69cbf9fda3b1f1426548fae45c63137
 DIST automake-1.7.9.tar.bz2 577705 BLAKE2B 0fdd9eec855f79dba2067374d2fb902d92fa4c2ec1e3fe292376383b3f8cef62799d880610af51b7b31b4a17812b9cd25d1bbc8687fd30ee98de88d4e7625f53 SHA512 372f326cdf9c893a016473b959f0d3b92a7a82a13978e3950a887a79c93856a635549ebc63945faafba30b8be6db1c4cd68385f7dfe1cbb36386400acb2aa7a2
 DIST automake-1.8.5.tar.bz2 663182 BLAKE2B a1488fe8653517d16e69e64655829119283ae9f49d5a29c4886100197fb08d6893abf2701000125fcbaa9923c76a2466de25e056ffcf856eb2878c34284c00b6 SHA512 862f9fe8dd4f0fd51b97d80b767304b982d9c9307bf66933298187bf121f5c827f0b4880eab92f07d16e0c1d41ff5179923c7ae8d8aabd635db8574d4a3021b0
 DIST automake-1.9.6.tar.bz2 765505 BLAKE2B 078d4dff44be18d93a8b1b30367a6010fff0be890a61a23926910ac2d92ac87672e7fec8f3548815eaa72310b3c4e042ce0f5df0250423446b39924eee4d044b SHA512 6aa8824876003bcac804e88d58f014a2449c7e1d824e46b5e971d3e2d070bc6ac0a3881e8eaae12e2f7f310c6b81dfb83ad4647d58785fc7e6759aa37478784e
-EBUILD automake-1.10.3-r2.ebuild 2193 BLAKE2B ad0b6db8051ba050182e0635d2907dc24bfdd9b03748ebd18a213f241d80972439151121ab0774a33746d0cbf48c9b313a198d409a131bfa941f44baa4594e7a SHA512 6b92b5d94e7d46c3ae233ae7102faf0e2b27f51d11878acce9e991a196e45dcd5ce09c4ca92331b8b5887d9cc1dc10ae6a5a8262cb3d5498f9a28cf3b73373b3
-EBUILD automake-1.10.3-r3.ebuild 2422 BLAKE2B 279e889852b2f2db3505d42b97e78a15a72917a0b8366fd2c8d1d5ad6cdae451c9a62fdbbd8f3eefab665f3686bd8b171521e1fabada2203c88832a26e9f86ee SHA512 060559cc3e0ecbbd2fde49904f469e87fbec0c521f4c484a3f9c2a9771a53a5487a3e0404c7b6864d7f3e3e727f88a9b73af950a142032d8824fc3b5b71fd445
-EBUILD automake-1.11.6-r2.ebuild 2364 BLAKE2B 33a33b8b8b3852fb77bbe7b31d45fd172ab09a787c330ce5221c6e5dba141a2e3b1940b4f0b8064f661cf011d5adb1cc65eea18ad81cf388da083f54bc6a58a3 SHA512 fad55a76b4307f12623b956306dc8b5671a90e393ab357600a0327a9af9b272497567bd7ff24ffeaac3eb68ec884a62af66f40c2dcd80297a5be926de701a4ff
-EBUILD automake-1.11.6-r3.ebuild 2646 BLAKE2B f583d627627110e94c06f45af8745f1b57699771ff16478b54f3b46bff454f4618673ac41558e98ff3aca1c9ede6d1793c9b65342b23a5dcfc35c5a479f652a2 SHA512 d8db1234feb584f6ad6abb7548c4bc9939d261e79be68480dbf4ecfb97bdee95ea679821e41ce0a8554b0fd69344cb42decfc9ef80b34366e6a43a3fe8c68bf5
-EBUILD automake-1.12.6-r1.ebuild 2194 BLAKE2B 28f5632ee81fd266afe21d9862c043c5e852c073550a1f8e005ebecd59f4fc42066284792fc30ac5b80b6a5022cdc616ac6f00816d9806463932dc28cff4e746 SHA512 197da1ebc2d08199bdee702360c54a5d52a175f23761da25a1ce8e72cc70a2c7aec044544c8a310ed1333c67869e220ec499fae84b2df3f3c68c1606c29f3b2f
-EBUILD automake-1.12.6-r2.ebuild 2434 BLAKE2B 4cf4d51947220fd2e9b8590040217f81beb1b3d7177f790506897fddcd5497fd56054290d22aacc5c19883cd62bae49a817cd8296d746a98246f6529e0138532 SHA512 ad4502a2c777f0aa1af91f28f260865c11606cb9d6ba7ec6fd742bfeeae907abb9bb7d89b70ffeab39ccabf480245f6b7c821c14a6e1e89d23dc9d384828b164
-EBUILD automake-1.12.6.ebuild 2124 BLAKE2B 138882c17f0191b598f1d0979b36e6bfeb219a8fea92d7d3840aea594f62fc36a949da6d927cf16a4e3c73e00c7300a5795eebd0510b6061e3e0eb2fa264d3b1 SHA512 0e7dbf281831b7e94655a1ad505472845cfd9eab52d02a78b67b3b90f2dc0514e5006e55cf501606486e1fe720be2ba8378358a9c73980312c91840ebed42846
-EBUILD automake-1.13.4-r1.ebuild 2421 BLAKE2B 9c858d89626d8c75f089baf6261e69d127db735337e2b572916589dc85a52ce907a800d560bad2813f464c1941f2602bff2df0fc3788cb53c98ad11efc1c1ff8 SHA512 98cdd9b84eb42477f7fb3411d7ce77a21e25a122f9b5141c8c7c8b874d8771709aa5513856a6fa24c6d8175a9dbaea2a0370f223587bd6f33a050b9bd8ad4afb
-EBUILD automake-1.13.4-r2.ebuild 2681 BLAKE2B c79e60a5d764fb9744a42f11976cf15ebc40dccfe753bcf539693f4313f8858b6387b769a6b248c9384af5be2eb2845acfa22f78a5b1d3bd3b9ef0fdedd5cd54 SHA512 b00a3b074ab2a68e3763471aabf0f9590230aeaefad9338211b11e4b3689e59e6ee94f2c233a014bb5718087c734652b098cf969a764fd146d52af300fd057d5
-EBUILD automake-1.14.1-r1.ebuild 2733 BLAKE2B 149f5f1a99b9b569f457304bc07ce359b6622ad21e05bf3d3cd058f199abedee71a55531a624190516e9c6dfb00ec01e5d390501fed241fcd23986eb5a12bae3 SHA512 df61f8c6c0cc1e4dd93cfd2432b1a4ab1dc4f695947455627fd96c0d203c484b7ee1ff3d45db861f5553d122267d0ba6c889c9d513d047a3ce8820f65d18c0bf
-EBUILD automake-1.14.1-r2.ebuild 3107 BLAKE2B a2dee77358dd88b56103c39708272a6998854e53c99643935e21357e238f0f19f31b869e3e84586d36e9f6727a90449d93f982cea0d691b7f6ac7f474d6b6495 SHA512 6e4ac071aa277376053ce19f3fcd22c362c602bdd5fd8b2d4a294224619f5a42f1d4c77610b82576149f8bc11b3b5e93f78838b8d9b5eed13598dae585d65c50
-EBUILD automake-1.15.1-r1.ebuild 2910 BLAKE2B 4f2efb028801ae608a8e2cdd5e23fa81f19b3a20dcc6fb61c450db6ccbfcbdf1d3663c63a2e49cddc780d093115be713b715388e03f7890c797125d929ad61a8 SHA512 0ea6f2b3149c347d6c60b58ccc1c7f503c4849c6fb8e1f6012a57029d309831a251ffa74bb8bffa97fc46d09081ea366bc28255a8545ebbe65bb6d420a8837af
-EBUILD automake-1.15.1-r2.ebuild 3211 BLAKE2B 079210086b01920e72500441cc69348732af1a57a51c23001036661f0d5c524e0cb76653f08743bcab8ccd21dd23c29fc7f99a46d655affc3fc4047779b9727b SHA512 37b83b19db71802ef0d8ffc9926c72c113f06126819ab49fb99c926a753a1b32e66aca6315ecd5abc11c0d6ec7c6887d5f80b986ba5995e7d09d544dd59837e6
-EBUILD automake-1.16-r1.ebuild 3271 BLAKE2B 8a12206ef54365c57de82c9cbe79ccb388075d54680d9e83c6b27ebaed181eece9ff8d6bf33d3718954a375d544f5f7c1b50784e8126a7e9d7549aca14f683c9 SHA512 bc291cc88086bf4dc7aefdc216ce2f1159c347d4ddae574efc0e2fcb394df726767d014a6065c07cb8c629517debef8a9a159c3f343d9ff3df50f415a189222f
-EBUILD automake-1.16.1.ebuild 3137 BLAKE2B 2df72cbb5728abefc159e8c036b7836c03b1ce9ec334f45b3971c12979118f9529b485c03c535e55644355f9716c489936194f8b734022d08e63b83fbfd78f9e SHA512 210ba8965fd404526f711f98e7f40b350f2fae0517d90ca0343967b5e76245178e447534ce92b17267d9367aeeb091745c390025d3af94a0ab9fb44d1c51c5bf
+EBUILD automake-1.10.3-r3.ebuild 2420 BLAKE2B b4bcbc2cc32adaeeec7712afd73480ff94645092bc4b465a36633d73e0dad74c34c5bb62f7131afbee83bfe59bb01e40624b63436035d94ec38672778655e8e6 SHA512 2e617254191ba750c75ec19d206d76fe65e06348aca2d558a0aa249f39bca1adddc7c4a6a63cc1f4be607ddb6ab937598d361355052100ef72c44e0ee8b4c33b
+EBUILD automake-1.11.6-r3.ebuild 2644 BLAKE2B 6d8cdedda9c889ac036eacbd7c6b5484c39ab3155e796d09144a8171a368dc08a6d3d41757a3d4b039c87a02df5f291b3ba4380fbd1efad464be2d954f1b3dcd SHA512 8dfa0d293ad6d410da7a3a37557f24033693a28646ec0f2ddc674ee7d07084f1e8d98ab11f1696a09b0b0e3d5f48674d8ed29a7884c630ce96a525ab53343ced
+EBUILD automake-1.12.6-r2.ebuild 2432 BLAKE2B 4e9df22fb18e89c59272ca7f3aa8a7834234328a6c46a84ada1c106c7c91b775c33d3988c11a74951f3f49d8c6bcc797a5a3a17a56fe1dd7d50a413c6164d291 SHA512 4659c53fb0964821474f56e73105a5e6d96951e4de11b3a9dc7e2cf4369c19fcae4f123a500620da065b5ca10276af023e8a278a16d15a45b5bc569a6dcef375
+EBUILD automake-1.13.4-r2.ebuild 2679 BLAKE2B de1fdb65749628c123a15c077592e530828fe510518d9eb1120ed54e2ed7f4359a1fed878f3f9f29c6d6fd581de70ad6cc3af0b8d2ede6e1f3affd6022cf60ce SHA512 a5fafae8e08eb7915627c5857d8471309fb800c6ff0d39f85cc2341ea5913f73177bbd351532d41f0cf8b6dace92ed7fef5c948cf1e516030b74716b3739757d
+EBUILD automake-1.14.1-r2.ebuild 3105 BLAKE2B e21d74390c1d3e085a1a7d1446dc0aa24c10e90cfbb65a3a8f9a198b0532d862ddfa4a1f576f7604e9a1bc38afb1a63e1a0a7dd39fa8e938d82e20688fd1e16f SHA512 6e964708cb90d22f10cbf80a5a95ef1f2ce76981c09e41e6a194a6240e02a32a28812338ebcaca039703ff17971f47661c54131764d8c70f0563ebee9b211936
+EBUILD automake-1.15.1-r2.ebuild 3209 BLAKE2B 921eaa954de4221ffc66767864aa0b45345b33b7720640f15f5e9de5c3df6d592579fc0760415935739328ff5bb23aaddbc557cccf84a8021d7e6e3323454b7e SHA512 2fdac0dcf39c323ac58b81cac9701d131d7606e8ce96a6aa0c34a51e2431854e8bb1800d83d0ac4035f9353acf3121abf8dfd4cc0f6d0da32f9d000bd685d2b9
+EBUILD automake-1.16-r2.ebuild 3271 BLAKE2B e651d682f387c9e673df4022102bc35030d428b3023385e18e6734df82606e0b792dd70b09203f63d35834cfec5852f13da740f98ccf5ce352707eb15aad6779 SHA512 f91410336cb5de6a49fe4dbfc4fd3a5ac76f3aa2c8c585289805a7e283d4095a9542e3a0a56e4f15eca5cb490023925815980fed4e32fe832924722c68508dc0
+EBUILD automake-1.16.1-r1.ebuild 3137 BLAKE2B e9902d508c7ba39cc2b13db711320cbc1aca8a7cdd6a0b1a975f6dab72e0fc6cd1bd40f41cb518a7f08ea1f3553f383df7724e6864f024b56dab8a2fefcb5b27 SHA512 d73d2b692a4692eb2134fdedaf21777ce90df3f27b5ce8c11c1c9fb5beb8bad07fe21fe0608276365cf7533c02883a1dea0ce64365af0027c6d3f9cd5d71533d
 EBUILD automake-1.4_p6-r2.ebuild 2481 BLAKE2B 6247d6b13d0b5902ffc48b15936e69a45300bda12b236a80a99ba31562e7e1706201a1ff56c8cf0a6539c50a2e2b44972018f5e882e42b4801b6b1e7ce1b1e53 SHA512 db4daa874be88149d6eef10a8babe82bdaba6125c7cb5413a1c6b01a28cc7d0933adca8c1b6eb2aa31cb1e708cb6ec0404138f1c2661b4c008ce0c2a80d5c0fc
 EBUILD automake-1.5-r2.ebuild 2299 BLAKE2B 4d2c160631fb5dd5f3803a37168c90941f1d60890e0ec707a1e27a6dafd4dc960f54aa71c1beb0d646948dbc6a317aec7e2fa7805d587cef417d0e5227ea7984 SHA512 13f0e0ffb4b322743bb7e7922f380f77faf5fb9106055a540a66cce0663bca3bfb670d6d22d5dfa0e3c9678b4b20e7cbd17bd6719497d99e334adf592cf1d9fa
 EBUILD automake-1.6.3-r2.ebuild 2047 BLAKE2B 92a42f972d1d976370774166e25a13c399b9b720a228f2c7cfbdfde9ca005bbb33c6fbc53a3b40db8984b0682f512510dc0ec3f0476edec7785224fe6f8da9f0 SHA512 22e21b1a05187f1535f082b16a3607bc9f88270f2cfdf2b720491ab9615c226b2229ffb7b38dadb8a20b32fbea1d54cc7737d72b5c1aaed7b488dc88450f8a7f
 EBUILD automake-1.7.9-r3.ebuild 2202 BLAKE2B 53799091072558b9f99744cedf87aafb8a7970cf45bfb3a73875ebac250ed89b4304d1a0591ab8fd721936e4a9ee449722ad0d2f20a6abe5bceb800f6709ab48 SHA512 61897ab690599c4b653b847aa668a1ef22f477237fe57bc69acb8024c326157b85d49527a1555aa6799d682475052a8cc88a6de0682bcba59f8618b473489e86
 EBUILD automake-1.8.5-r5.ebuild 2229 BLAKE2B 057da2c27f531aa821021a9decf048452a7f5733d36e417cd707bc9a23ed2c91201f0bcd6fd9d9eec179f21531019e71cf682daad40efa06df6e510a37c3f892 SHA512 16264cc047c6e0df06ec3d921c778852fe27a63902a26acb1edfe2ff9bd74bfb316237edd618f38fd77a40d3a3af140d24ecacc6fa78ed5e026a37e4c75a96af
-EBUILD automake-1.9.6-r4.ebuild 2444 BLAKE2B 315aeb35b63d282beb7c715aa093426451817c41d2a4899d90db0adb0d8fadfa86a8a710990f901619eecf4a86c3e4985efd6d6a207dd469703a7499327f2076 SHA512 458b186f09016902160bbf8c2df786a2315fa7676551aca0d35f765f9126beeda938577defb859e58ed18af3049dd3e98960ba9ca7399083471b661c8b51a549
-EBUILD automake-1.9.6-r5.ebuild 2570 BLAKE2B c09bdd58278fefda1990e56b96b54decd7c42012f5550f0b96bd1396b9032e74b1f199c82001832ab036ea80da943616c8d4819dfca8d7a847534c1cd19c76a5 SHA512 29e2afe2c32efeb71c77d93202c45cc9cfe98a8adf803e746f71f2713d000e6b0e8457eb33f25206f95801ff6b242bd752e3b90bfc11e4d04e1312f3d6f73ee2
-EBUILD automake-9999.ebuild 3137 BLAKE2B 2df72cbb5728abefc159e8c036b7836c03b1ce9ec334f45b3971c12979118f9529b485c03c535e55644355f9716c489936194f8b734022d08e63b83fbfd78f9e SHA512 210ba8965fd404526f711f98e7f40b350f2fae0517d90ca0343967b5e76245178e447534ce92b17267d9367aeeb091745c390025d3af94a0ab9fb44d1c51c5bf
+EBUILD automake-1.9.6-r5.ebuild 2568 BLAKE2B cc5f831106ca343af86866dfffc12f6a8a6f87911b83c95d5e74b65ca944a567d3d6ea77f52931f9b95ba2f88a7c1982db082568b6ea9b0cb5b31e89e354c2c9 SHA512 361777f2c4eb1f7ce0321deeee39ca57901140aa694a514753e716b9e445d566faf1eec0f21f2aca56de3412c16fc8c717295be261e00d2ed31a44316e409f16
+EBUILD automake-9999.ebuild 3137 BLAKE2B e9902d508c7ba39cc2b13db711320cbc1aca8a7cdd6a0b1a975f6dab72e0fc6cd1bd40f41cb518a7f08ea1f3553f383df7724e6864f024b56dab8a2fefcb5b27 SHA512 d73d2b692a4692eb2134fdedaf21777ce90df3f27b5ce8c11c1c9fb5beb8bad07fe21fe0608276365cf7533c02883a1dea0ce64365af0027c6d3f9cd5d71533d
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/automake/automake-1.10.3-r2.ebuild b/sys-devel/automake/automake-1.10.3-r2.ebuild
deleted file mode 100644
index d9b4d259f360..000000000000
--- a/sys-devel/automake/automake-1.10.3-r2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils
-
-DESCRIPTION="Used to generate Makefile.in from Makefile.am"
-HOMEPAGE="https://www.gnu.org/software/automake/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-# Use Gentoo versioning for slotting.
-SLOT="${PV:0:4}"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND="dev-lang/perl
-	>=sys-devel/automake-wrapper-10
-	>=sys-devel/autoconf-2.69
-	sys-devel/gnuconfig"
-DEPEND="${RDEPEND}
-	sys-apps/help2man"
-
-src_prepare() {
-	export WANT_AUTOCONF=2.5
-	epatch "${FILESDIR}"/${PN}-1.10-perl-5.16.patch #424453
-	epatch "${FILESDIR}"/${PN}-1.13-perl-escape-curly-bracket.patch
-	chmod a+rx tests/*.test
-}
-
-src_configure() {
-	econf --docdir="\$(datarootdir)/doc/${PF}"
-}
-
-# slot the info pages.  do this w/out munging the source so we don't have
-# to depend on texinfo to regen things.  #464146 (among others)
-slot_info_pages() {
-	pushd "${ED}"/usr/share/info >/dev/null
-	rm -f dir
-
-	# Rewrite all the references to other pages.
-	# before: * aclocal-invocation: (automake)aclocal Invocation.   Generating aclocal.m4.
-	# after:  * aclocal-invocation v1.13: (automake-1.13)aclocal Invocation.   Generating aclocal.m4.
-	local p pages=( *.info ) args=()
-	for p in "${pages[@]/%.info}" ; do
-		args+=(
-			-e "/START-INFO-DIR-ENTRY/,/END-INFO-DIR-ENTRY/s|: (${p})| v${SLOT}&|"
-			-e "s:(${p}):(${p}-${SLOT}):g"
-		)
-	done
-	sed -i "${args[@]}" * || die
-
-	# Rewrite all the file references, and rename them in the process.
-	local f d
-	for f in * ; do
-		d=${f/.info/-${SLOT}.info}
-		mv "${f}" "${d}" || die
-		sed -i -e "s:${f}:${d}:g" * || die
-	done
-
-	popd >/dev/null
-}
-
-src_install() {
-	default
-	slot_info_pages
-
-	# SLOT the docs and junk
-	local x
-	for x in aclocal automake ; do
-		help2man "perl -Ilib ${x}" > ${x}-${SLOT}.1
-		doman ${x}-${SLOT}.1
-		rm -f "${ED}"/usr/bin/${x}
-	done
-
-	# remove all config.guess and config.sub files replacing them
-	# w/a symlink to a specific gnuconfig version
-	for x in guess sub ; do
-		dosym ../gnuconfig/config.${x} /usr/share/${PN}-${SLOT}/config.${x}
-	done
-}
diff --git a/sys-devel/automake/automake-1.10.3-r3.ebuild b/sys-devel/automake/automake-1.10.3-r3.ebuild
index 3b9d4576cd2e..03cc609a6970 100644
--- a/sys-devel/automake/automake-1.10.3-r3.ebuild
+++ b/sys-devel/automake/automake-1.10.3-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
 SLOT="${PV:0:4}"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="test"
 
 RDEPEND="dev-lang/perl
diff --git a/sys-devel/automake/automake-1.11.6-r2.ebuild b/sys-devel/automake/automake-1.11.6-r2.ebuild
deleted file mode 100644
index 8602a0c63920..000000000000
--- a/sys-devel/automake/automake-1.11.6-r2.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils
-
-DESCRIPTION="Used to generate Makefile.in from Makefile.am"
-HOMEPAGE="https://www.gnu.org/software/automake/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-# Use Gentoo versioning for slotting.
-SLOT="${PV:0:4}"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND="dev-lang/perl
-	>=sys-devel/automake-wrapper-10
-	>=sys-devel/autoconf-2.69
-	sys-devel/gnuconfig"
-DEPEND="${RDEPEND}
-	sys-apps/help2man"
-
-src_prepare() {
-	export WANT_AUTOCONF=2.5
-	epatch "${FILESDIR}"/${PN}-1.10-perl-5.16.patch #424453
-	epatch "${FILESDIR}"/${PN}-1.13-perl-escape-curly-bracket.patch
-	chmod a+rx tests/*.test
-	export HELP2MAN=true
-	sed -i -e "/APIVERSION=/s:=.*:=${SLOT}:" configure || die
-	export TZ="UTC"  #589138
-}
-
-src_configure() {
-	econf --docdir="\$(datarootdir)/doc/${PF}"
-}
-
-src_compile() {
-	default
-
-	local x
-	for x in aclocal automake; do
-		help2man "perl -Ilib ${x}" > doc/${x}-${SLOT}.1
-	done
-}
-
-# slot the info pages.  do this w/out munging the source so we don't have
-# to depend on texinfo to regen things.  #464146 (among others)
-slot_info_pages() {
-	pushd "${ED}"/usr/share/info >/dev/null
-	rm -f dir
-
-	# Rewrite all the references to other pages.
-	# before: * aclocal-invocation: (automake)aclocal Invocation.   Generating aclocal.m4.
-	# after:  * aclocal-invocation v1.13: (automake-1.13)aclocal Invocation.   Generating aclocal.m4.
-	local p pages=( *.info ) args=()
-	for p in "${pages[@]/%.info}" ; do
-		args+=(
-			-e "/START-INFO-DIR-ENTRY/,/END-INFO-DIR-ENTRY/s|: (${p})| v${SLOT}&|"
-			-e "s:(${p}):(${p}-${SLOT}):g"
-		)
-	done
-	sed -i "${args[@]}" * || die
-
-	# Rewrite all the file references, and rename them in the process.
-	local f d
-	for f in * ; do
-		d=${f/.info/-${SLOT}.info}
-		mv "${f}" "${d}" || die
-		sed -i -e "s:${f}:${d}:g" * || die
-	done
-
-	popd >/dev/null
-}
-
-src_install() {
-	default
-	slot_info_pages
-
-	rm \
-		"${ED}"/usr/bin/{aclocal,automake} \
-		"${ED}"/usr/share/man/man1/{aclocal,automake}.1 || die
-
-	# remove all config.guess and config.sub files replacing them
-	# w/a symlink to a specific gnuconfig version
-	local x
-	for x in guess sub ; do
-		dosym ../gnuconfig/config.${x} /usr/share/${PN}-${SLOT}/config.${x}
-	done
-}
diff --git a/sys-devel/automake/automake-1.11.6-r3.ebuild b/sys-devel/automake/automake-1.11.6-r3.ebuild
index 47c8b6d46ecd..eb6b460c7af6 100644
--- a/sys-devel/automake/automake-1.11.6-r3.ebuild
+++ b/sys-devel/automake/automake-1.11.6-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
 SLOT="${PV:0:4}"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="test"
 
 RDEPEND="dev-lang/perl
diff --git a/sys-devel/automake/automake-1.12.6-r1.ebuild b/sys-devel/automake/automake-1.12.6-r1.ebuild
deleted file mode 100644
index a391b4c3a2f9..000000000000
--- a/sys-devel/automake/automake-1.12.6-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils
-
-DESCRIPTION="Used to generate Makefile.in from Makefile.am"
-HOMEPAGE="https://www.gnu.org/software/automake/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-# Use Gentoo versioning for slotting.
-SLOT="${PV:0:4}"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND="dev-lang/perl
-	>=sys-devel/automake-wrapper-10
-	>=sys-devel/autoconf-2.69
-	sys-devel/gnuconfig"
-DEPEND="${RDEPEND}
-	sys-apps/help2man"
-
-src_prepare() {
-	export WANT_AUTOCONF=2.5
-	epatch "${FILESDIR}"/${PN}-1.13-perl-escape-curly-bracket.patch
-	sed -i -e "/APIVERSION=/s:=.*:=${SLOT}:" configure || die
-}
-
-src_configure() {
-	econf --docdir="\$(datarootdir)/doc/${PF}"
-}
-
-# slot the info pages.  do this w/out munging the source so we don't have
-# to depend on texinfo to regen things.  #464146 (among others)
-slot_info_pages() {
-	pushd "${ED}"/usr/share/info >/dev/null
-	rm -f dir
-
-	# Rewrite all the references to other pages.
-	# before: * aclocal-invocation: (automake)aclocal Invocation.   Generating aclocal.m4.
-	# after:  * aclocal-invocation v1.13: (automake-1.13)aclocal Invocation.   Generating aclocal.m4.
-	local p pages=( *.info ) args=()
-	for p in "${pages[@]/%.info}" ; do
-		args+=(
-			-e "/START-INFO-DIR-ENTRY/,/END-INFO-DIR-ENTRY/s|: (${p})| v${SLOT}&|"
-			-e "s:(${p}):(${p}-${SLOT}):g"
-		)
-	done
-	sed -i "${args[@]}" * || die
-
-	# Rewrite all the file references, and rename them in the process.
-	local f d
-	for f in * ; do
-		d=${f/.info/-${SLOT}.info}
-		mv "${f}" "${d}" || die
-		sed -i -e "s:${f}:${d}:g" * || die
-	done
-
-	popd >/dev/null
-}
-
-src_install() {
-	default
-
-	slot_info_pages
-	rm "${ED}"/usr/share/aclocal/README || die
-	rmdir "${ED}"/usr/share/aclocal || die
-	rm \
-		"${ED}"/usr/bin/{aclocal,automake} \
-		"${ED}"/usr/share/man/man1/{aclocal,automake}.1 || die
-
-	# remove all config.guess and config.sub files replacing them
-	# w/a symlink to a specific gnuconfig version
-	local x
-	for x in guess sub ; do
-		dosym ../gnuconfig/config.${x} /usr/share/${PN}-${SLOT}/config.${x}
-	done
-}
diff --git a/sys-devel/automake/automake-1.12.6-r2.ebuild b/sys-devel/automake/automake-1.12.6-r2.ebuild
index 8ce777683ba3..ef0d5b1156f4 100644
--- a/sys-devel/automake/automake-1.12.6-r2.ebuild
+++ b/sys-devel/automake/automake-1.12.6-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
 SLOT="${PV:0:4}"
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="test"
 
 RDEPEND="dev-lang/perl
diff --git a/sys-devel/automake/automake-1.12.6.ebuild b/sys-devel/automake/automake-1.12.6.ebuild
deleted file mode 100644
index d28b8940444b..000000000000
--- a/sys-devel/automake/automake-1.12.6.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils
-
-DESCRIPTION="Used to generate Makefile.in from Makefile.am"
-HOMEPAGE="https://www.gnu.org/software/automake/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-# Use Gentoo versioning for slotting.
-SLOT="${PV:0:4}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND="dev-lang/perl
-	>=sys-devel/automake-wrapper-10
-	>=sys-devel/autoconf-2.69
-	sys-devel/gnuconfig"
-DEPEND="${RDEPEND}
-	sys-apps/help2man"
-
-src_prepare() {
-	export WANT_AUTOCONF=2.5
-	sed -i -e "/APIVERSION=/s:=.*:=${SLOT}:" configure || die
-}
-
-src_configure() {
-	econf --docdir="\$(datarootdir)/doc/${PF}"
-}
-
-# slot the info pages.  do this w/out munging the source so we don't have
-# to depend on texinfo to regen things.  #464146 (among others)
-slot_info_pages() {
-	pushd "${ED}"/usr/share/info >/dev/null
-	rm -f dir
-
-	# Rewrite all the references to other pages.
-	# before: * aclocal-invocation: (automake)aclocal Invocation.   Generating aclocal.m4.
-	# after:  * aclocal-invocation v1.13: (automake-1.13)aclocal Invocation.   Generating aclocal.m4.
-	local p pages=( *.info ) args=()
-	for p in "${pages[@]/%.info}" ; do
-		args+=(
-			-e "/START-INFO-DIR-ENTRY/,/END-INFO-DIR-ENTRY/s|: (${p})| v${SLOT}&|"
-			-e "s:(${p}):(${p}-${SLOT}):g"
-		)
-	done
-	sed -i "${args[@]}" * || die
-
-	# Rewrite all the file references, and rename them in the process.
-	local f d
-	for f in * ; do
-		d=${f/.info/-${SLOT}.info}
-		mv "${f}" "${d}" || die
-		sed -i -e "s:${f}:${d}:g" * || die
-	done
-
-	popd >/dev/null
-}
-
-src_install() {
-	default
-
-	slot_info_pages
-	rm "${ED}"/usr/share/aclocal/README || die
-	rmdir "${ED}"/usr/share/aclocal || die
-	rm \
-		"${ED}"/usr/bin/{aclocal,automake} \
-		"${ED}"/usr/share/man/man1/{aclocal,automake}.1 || die
-
-	# remove all config.guess and config.sub files replacing them
-	# w/a symlink to a specific gnuconfig version
-	local x
-	for x in guess sub ; do
-		dosym ../gnuconfig/config.${x} /usr/share/${PN}-${SLOT}/config.${x}
-	done
-}
diff --git a/sys-devel/automake/automake-1.13.4-r1.ebuild b/sys-devel/automake/automake-1.13.4-r1.ebuild
deleted file mode 100644
index 73d9d4d61e25..000000000000
--- a/sys-devel/automake/automake-1.13.4-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils
-
-DESCRIPTION="Used to generate Makefile.in from Makefile.am"
-HOMEPAGE="https://www.gnu.org/software/automake/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-# Use Gentoo versioning for slotting.
-SLOT="${PV:0:4}"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="dev-lang/perl
-	>=sys-devel/automake-wrapper-10
-	>=sys-devel/autoconf-2.69
-	sys-devel/gnuconfig"
-DEPEND="${RDEPEND}
-	sys-apps/help2man"
-
-src_prepare() {
-	export WANT_AUTOCONF=2.5
-	epatch "${FILESDIR}"/${PN}-1.13-dyn-ithreads.patch
-	epatch "${FILESDIR}"/${PN}-1.13-perl-escape-curly-bracket.patch
-	sed -i -e "/APIVERSION=/s:=.*:=${SLOT}:" configure || die
-}
-
-src_configure() {
-	econf --docdir="\$(datarootdir)/doc/${PF}"
-}
-
-src_test() {
-	emake check
-}
-
-# slot the info pages.  do this w/out munging the source so we don't have
-# to depend on texinfo to regen things.  #464146 (among others)
-slot_info_pages() {
-	pushd "${ED}"/usr/share/info >/dev/null
-	rm -f dir
-
-	# Rewrite all the references to other pages.
-	# before: * aclocal-invocation: (automake)aclocal Invocation.   Generating aclocal.m4.
-	# after:  * aclocal-invocation v1.13: (automake-1.13)aclocal Invocation.   Generating aclocal.m4.
-	local p pages=( *.info ) args=()
-	for p in "${pages[@]/%.info}" ; do
-		args+=(
-			-e "/START-INFO-DIR-ENTRY/,/END-INFO-DIR-ENTRY/s|: (${p})| v${SLOT}&|"
-			-e "s:(${p}):(${p}-${SLOT}):g"
-		)
-	done
-	sed -i "${args[@]}" * || die
-
-	# Rewrite all the file references, and rename them in the process.
-	local f d
-	for f in * ; do
-		d=${f/.info/-${SLOT}.info}
-		mv "${f}" "${d}" || die
-		sed -i -e "s:${f}:${d}:g" * || die
-	done
-
-	popd >/dev/null
-}
-
-src_install() {
-	default
-
-	slot_info_pages
-	rm "${ED}"/usr/share/aclocal/README || die
-	rmdir "${ED}"/usr/share/aclocal || die
-	rm \
-		"${ED}"/usr/bin/{aclocal,automake} \
-		"${ED}"/usr/share/man/man1/{aclocal,automake}.1 || die
-
-	# remove all config.guess and config.sub files replacing them
-	# w/a symlink to a specific gnuconfig version
-	local x
-	for x in guess sub ; do
-		dosym ../gnuconfig/config.${x} /usr/share/${PN}-${SLOT}/config.${x}
-	done
-}
diff --git a/sys-devel/automake/automake-1.13.4-r2.ebuild b/sys-devel/automake/automake-1.13.4-r2.ebuild
index 2df4eb3835c3..5c44949993fb 100644
--- a/sys-devel/automake/automake-1.13.4-r2.ebuild
+++ b/sys-devel/automake/automake-1.13.4-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
 SLOT="${PV:0:4}"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="dev-lang/perl
diff --git a/sys-devel/automake/automake-1.14.1-r1.ebuild b/sys-devel/automake/automake-1.14.1-r1.ebuild
deleted file mode 100644
index a7ac066e9479..000000000000
--- a/sys-devel/automake/automake-1.14.1-r1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils versionator
-
-if [[ ${PV/_beta} == ${PV} ]]; then
-	MY_P=${P}
-	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
-		ftp://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz"
-else
-	MY_PV="$(get_major_version).$(($(get_version_component_range 2)-1))b"
-	MY_P="${PN}-${MY_PV}"
-
-	# Alpha/beta releases are not distributed on the usual mirrors.
-	SRC_URI="ftp://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz"
-fi
-
-DESCRIPTION="Used to generate Makefile.in from Makefile.am"
-HOMEPAGE="https://www.gnu.org/software/automake/"
-
-LICENSE="GPL-2"
-# Use Gentoo versioning for slotting.
-SLOT="${PV:0:4}"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="dev-lang/perl
-	>=sys-devel/automake-wrapper-10
-	>=sys-devel/autoconf-2.69
-	sys-devel/gnuconfig"
-DEPEND="${RDEPEND}
-	sys-apps/help2man"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	export WANT_AUTOCONF=2.5
-	epatch "${FILESDIR}"/${PN}-1.15-perl-escape-curly-bracket.patch
-	sed -i -e "/APIVERSION=/s:=.*:=${SLOT}:" configure || die
-}
-
-src_configure() {
-	econf --docdir="\$(datarootdir)/doc/${PF}"
-}
-
-src_test() {
-	emake check
-}
-
-# slot the info pages.  do this w/out munging the source so we don't have
-# to depend on texinfo to regen things.  #464146 (among others)
-slot_info_pages() {
-	pushd "${ED}"/usr/share/info >/dev/null
-	rm -f dir
-
-	# Rewrite all the references to other pages.
-	# before: * aclocal-invocation: (automake)aclocal Invocation.   Generating aclocal.m4.
-	# after:  * aclocal-invocation v1.13: (automake-1.13)aclocal Invocation.   Generating aclocal.m4.
-	local p pages=( *.info ) args=()
-	for p in "${pages[@]/%.info}" ; do
-		args+=(
-			-e "/START-INFO-DIR-ENTRY/,/END-INFO-DIR-ENTRY/s|: (${p})| v${SLOT}&|"
-			-e "s:(${p}):(${p}-${SLOT}):g"
-		)
-	done
-	sed -i "${args[@]}" * || die
-
-	# Rewrite all the file references, and rename them in the process.
-	local f d
-	for f in * ; do
-		d=${f/.info/-${SLOT}.info}
-		mv "${f}" "${d}" || die
-		sed -i -e "s:${f}:${d}:g" * || die
-	done
-
-	popd >/dev/null
-}
-
-src_install() {
-	default
-
-	slot_info_pages
-	rm "${ED}"/usr/share/aclocal/README || die
-	rmdir "${ED}"/usr/share/aclocal || die
-	rm \
-		"${ED}"/usr/bin/{aclocal,automake} \
-		"${ED}"/usr/share/man/man1/{aclocal,automake}.1 || die
-
-	# remove all config.guess and config.sub files replacing them
-	# w/a symlink to a specific gnuconfig version
-	local x
-	for x in guess sub ; do
-		dosym ../gnuconfig/config.${x} /usr/share/${PN}-${SLOT}/config.${x}
-	done
-}
diff --git a/sys-devel/automake/automake-1.14.1-r2.ebuild b/sys-devel/automake/automake-1.14.1-r2.ebuild
index 4e59b967b3f9..e00c166505f2 100644
--- a/sys-devel/automake/automake-1.14.1-r2.ebuild
+++ b/sys-devel/automake/automake-1.14.1-r2.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="https://www.gnu.org/software/automake/"
 LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
 SLOT="${PV:0:4}"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="dev-lang/perl
diff --git a/sys-devel/automake/automake-1.15.1-r1.ebuild b/sys-devel/automake/automake-1.15.1-r1.ebuild
deleted file mode 100644
index e4df14aef565..000000000000
--- a/sys-devel/automake/automake-1.15.1-r1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eutils versionator
-
-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
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	if [[ ${PV/_beta} == ${PV} ]]; then
-		MY_P=${P}
-		SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
-			ftp://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz"
-	else
-		MY_PV="$(get_major_version).$(($(get_version_component_range 2)-1))b"
-		MY_P="${PN}-${MY_PV}"
-
-		# Alpha/beta releases are not distributed on the usual mirrors.
-		SRC_URI="ftp://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz"
-	fi
-	S="${WORKDIR}/${MY_P}"
-fi
-
-DESCRIPTION="Used to generate Makefile.in from Makefile.am"
-HOMEPAGE="https://www.gnu.org/software/automake/"
-
-LICENSE="GPL-2"
-# Use Gentoo versioning for slotting.
-SLOT="${PV:0:4}"
-IUSE=""
-
-RDEPEND="dev-lang/perl
-	>=sys-devel/automake-wrapper-10
-	>=sys-devel/autoconf-2.69:*
-	sys-devel/gnuconfig"
-DEPEND="${RDEPEND}
-	sys-apps/help2man"
-
-src_prepare() {
-	default
-	export WANT_AUTOCONF=2.5
-	# Don't try wrapping the autotools this thing runs as it tends
-	# to be a bit esoteric, and the script does `set -e` itself.
-	./bootstrap || die
-	sed -i -e "/APIVERSION=/s:=.*:=${SLOT}:" configure || die
-}
-
-# slot the info pages.  do this w/out munging the source so we don't have
-# to depend on texinfo to regen things.  #464146 (among others)
-slot_info_pages() {
-	pushd "${ED}"/usr/share/info >/dev/null || die
-	rm -f dir || dir
-
-	# Rewrite all the references to other pages.
-	# before: * aclocal-invocation: (automake)aclocal Invocation.   Generating aclocal.m4.
-	# after:  * aclocal-invocation v1.13: (automake-1.13)aclocal Invocation.   Generating aclocal.m4.
-	local p pages=( *.info ) args=()
-	for p in "${pages[@]/%.info}" ; do
-		args+=(
-			-e "/START-INFO-DIR-ENTRY/,/END-INFO-DIR-ENTRY/s|: (${p})| v${SLOT}&|"
-			-e "s:(${p}):(${p}-${SLOT}):g"
-		)
-	done
-	sed -i "${args[@]}" * || die
-
-	# Rewrite all the file references, and rename them in the process.
-	local f d
-	for f in * ; do
-		d=${f/.info/-${SLOT}.info}
-		mv "${f}" "${d}" || die
-		sed -i -e "s:${f}:${d}:g" * || die
-	done
-
-	popd >/dev/null || die
-}
-
-src_install() {
-	default
-
-	slot_info_pages
-	rm "${ED}"/usr/share/aclocal/README || die
-	rmdir "${ED}"/usr/share/aclocal || die
-	rm \
-		"${ED}"/usr/bin/{aclocal,automake} \
-		"${ED}"/usr/share/man/man1/{aclocal,automake}.1 || die
-
-	# remove all config.guess and config.sub files replacing them
-	# w/a symlink to a specific gnuconfig version
-	local x
-	for x in guess sub ; do
-		dosym ../gnuconfig/config.${x} /usr/share/${PN}-${SLOT}/config.${x}
-	done
-}
diff --git a/sys-devel/automake/automake-1.15.1-r2.ebuild b/sys-devel/automake/automake-1.15.1-r2.ebuild
index 6d6c8322a185..658edd053219 100644
--- a/sys-devel/automake/automake-1.15.1-r2.ebuild
+++ b/sys-devel/automake/automake-1.15.1-r2.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]] ; then
 
 	inherit git-r3
 else
-	KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	if [[ ${PV/_beta} == ${PV} ]]; then
 		MY_P=${P}
 		SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
diff --git a/sys-devel/automake/automake-1.16-r1.ebuild b/sys-devel/automake/automake-1.16-r2.ebuild
index 616c4ff8646f..511463989b4c 100644
--- a/sys-devel/automake/automake-1.16-r1.ebuild
+++ b/sys-devel/automake/automake-1.16-r2.ebuild
@@ -35,7 +35,7 @@ SLOT="${PV:0:4}"
 IUSE="test"
 
 RDEPEND="dev-lang/perl
-	>=sys-devel/automake-wrapper-10
+	>=sys-devel/automake-wrapper-11
 	>=sys-devel/autoconf-2.69:*
 	sys-devel/gnuconfig"
 DEPEND="${RDEPEND}
diff --git a/sys-devel/automake/automake-1.16.1.ebuild b/sys-devel/automake/automake-1.16.1-r1.ebuild
index 4ef29d02f84e..d912687b31b4 100644
--- a/sys-devel/automake/automake-1.16.1.ebuild
+++ b/sys-devel/automake/automake-1.16.1-r1.ebuild
@@ -35,7 +35,7 @@ SLOT="${PV:0:4}"
 IUSE="test"
 
 RDEPEND="dev-lang/perl
-	>=sys-devel/automake-wrapper-10
+	>=sys-devel/automake-wrapper-11
 	>=sys-devel/autoconf-2.69:*
 	sys-devel/gnuconfig"
 DEPEND="${RDEPEND}
diff --git a/sys-devel/automake/automake-1.9.6-r4.ebuild b/sys-devel/automake/automake-1.9.6-r4.ebuild
deleted file mode 100644
index 3da890f1dd37..000000000000
--- a/sys-devel/automake/automake-1.9.6-r4.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils
-
-DESCRIPTION="Used to generate Makefile.in from Makefile.am"
-HOMEPAGE="https://www.gnu.org/software/automake/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-# Use Gentoo versioning for slotting.
-SLOT="${PV:0:3}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND="dev-lang/perl
-	>=sys-devel/automake-wrapper-10
-	>=sys-devel/autoconf-2.69
-	>=sys-apps/texinfo-4.7
-	sys-devel/gnuconfig"
-DEPEND="${RDEPEND}
-	sys-apps/help2man"
-
-src_prepare() {
-	export WANT_AUTOCONF=2.5
-	epatch "${FILESDIR}"/${PN}-1.9.6-infopage-namechange.patch
-	epatch "${FILESDIR}"/${P}-include-dir-prefix.patch #107435
-	epatch "${FILESDIR}"/${P}-ignore-comments.patch #126388
-	epatch "${FILESDIR}"/${P}-aclocal7-test-sleep.patch #197366
-	epatch "${FILESDIR}"/${PN}-1.9.6-subst-test.patch #222225
-	epatch "${FILESDIR}"/${PN}-1.10-ccnoco-ldflags.patch #203914
-	epatch "${FILESDIR}"/${PN}-1.8.5-CVE-2009-4029.patch #295357
-	epatch "${FILESDIR}"/${PN}-1.8-perl-5.11.patch
-}
-
-# slot the info pages.  do this w/out munging the source so we don't have
-# to depend on texinfo to regen things.  #464146 (among others)
-slot_info_pages() {
-	pushd "${ED}"/usr/share/info >/dev/null
-	rm -f dir
-
-	# Rewrite all the references to other pages.
-	# before: * aclocal-invocation: (automake)aclocal Invocation.   Generating aclocal.m4.
-	# after:  * aclocal-invocation v1.13: (automake-1.13)aclocal Invocation.   Generating aclocal.m4.
-	local p pages=( *.info ) args=()
-	for p in "${pages[@]/%.info}" ; do
-		args+=(
-			-e "/START-INFO-DIR-ENTRY/,/END-INFO-DIR-ENTRY/s|: (${p})| v${SLOT}&|"
-			-e "s:(${p}):(${p}-${SLOT}):g"
-		)
-	done
-	sed -i "${args[@]}" * || die
-
-	# Rewrite all the file references, and rename them in the process.
-	local f d
-	for f in * ; do
-		d=${f/.info/-${SLOT}.info}
-		mv "${f}" "${d}" || die
-		sed -i -e "s:${f}:${d}:g" * || die
-	done
-
-	popd >/dev/null
-}
-
-src_install() {
-	default
-	slot_info_pages
-
-	local x
-	for x in aclocal automake ; do
-		help2man "perl -Ilib ${x}" > ${x}-${SLOT}.1
-		doman ${x}-${SLOT}.1
-		rm -f "${ED}"/usr/bin/${x}
-	done
-
-	# remove all config.guess and config.sub files replacing them
-	# w/a symlink to a specific gnuconfig version
-	for x in guess sub ; do
-		dosym ../gnuconfig/config.${x} /usr/share/${PN}-${SLOT}/config.${x}
-	done
-}
diff --git a/sys-devel/automake/automake-1.9.6-r5.ebuild b/sys-devel/automake/automake-1.9.6-r5.ebuild
index 0cb426b7899d..1515fe154002 100644
--- a/sys-devel/automake/automake-1.9.6-r5.ebuild
+++ b/sys-devel/automake/automake-1.9.6-r5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
 SLOT="${PV:0:3}"
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="test"
 
 RDEPEND="dev-lang/perl
diff --git a/sys-devel/automake/automake-9999.ebuild b/sys-devel/automake/automake-9999.ebuild
index 4ef29d02f84e..d912687b31b4 100644
--- a/sys-devel/automake/automake-9999.ebuild
+++ b/sys-devel/automake/automake-9999.ebuild
@@ -35,7 +35,7 @@ SLOT="${PV:0:4}"
 IUSE="test"
 
 RDEPEND="dev-lang/perl
-	>=sys-devel/automake-wrapper-10
+	>=sys-devel/automake-wrapper-11
 	>=sys-devel/autoconf-2.69:*
 	sys-devel/gnuconfig"
 DEPEND="${RDEPEND}