gentoo resync : 05.01.2018

18 files changed, 19 insertions, 757 deletions

diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index b698f2408e39..b3fac0afedd9 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/autoconf/Manifest b/sys-devel/autoconf/Manifest
index fdade38ca492..5a82c044d15c 100644
--- a/sys-devel/autoconf/Manifest
+++ b/sys-devel/autoconf/Manifest
@@ -10,7 +10,7 @@ DIST autoconf-2.64.tar.xz 1113892 BLAKE2B 598873209a67725150cd4cf09c4b78b26b3d17
 DIST autoconf-2.69.tar.xz 1214744 BLAKE2B 71d33d72a06e9a05fbed0eda73bc9d8a3805c7c90bf082959862f93f3c5f01192114176e84d84ecb58fa99512eafbc0ab21ad1407be18c8c63bb3dc1117c482d SHA512 995d3e5a8eb1eb37e2b7fae53c6ec7a9b4df997286b7d643344818f94636756b1bf5ff5ea9155e755cb9461149a853dfbf2886fc6bd7132e5afa9c168e306e9b
 EBUILD autoconf-2.13.ebuild 1521 BLAKE2B 745ce1ba4d39b75cf89ed701bbf102092854922f1dc0be421326c0f3a95f2a32aa69dae8ca4ac0e7b0e738f0e4c0553126636674571376df8870d77afa5e1998 SHA512 493ba0d22c90ed02e77e2406f76bc6e2cc6c9c56e824ca8c7ce73a2e3e265868de5824ed9b0261f457903ca12068e24ea55c77e2709f9d28366fc25c9ac13091
 EBUILD autoconf-2.64.ebuild 566 BLAKE2B a0488603af961a72257e96959d28ff6fb552de3b19a9773a8af845f8a0c5e0f54ee5f93c40192d3c3409b7d16489cd4ae5aaad8925404962fc0c4d9fe0357bed SHA512 9449a2616671cac6a34f632c965a0bb59f38d0c0694b4412e547769d5f957b7ab82cef995c77641814c7c6e0682df3f3b754cd48252f44e38ba71e7d72fc448f
-EBUILD autoconf-2.69-r4.ebuild 1564 BLAKE2B 3ff6bd7077eb8c149d1bee842cf325677c9e25ff8a56894a1a2e664d07d86188ce6559af63d0c7ce628a50375c98a2ce8b82207a1d29d5ebe24f07ec504096a3 SHA512 85953dfb953cfdeb0cac73e56e6af04d340d3791a8ec41f49a4cdc99f95a5758d5aa7d78b366a6ea118e8c09760cee544e73bb53174af35557e8052ea1bd2401
+EBUILD autoconf-2.69-r4.ebuild 1562 BLAKE2B e1a458209939aab920d4a25c4e9e7d34f974bbaebdac4698c2455951f5b5c27d96534784ce953e92279d98e5a4f950e415798c2576d2f3835d71abc544bf0741 SHA512 9ace3492275b950d8b197db4495fa3b8b027801c37572fc0bf50b71f609b6c258c0bf41fbb9adcbc7eb3d246910648c876cbac0a794fc76c8dbf76777bed3448
 EBUILD autoconf-2.69.ebuild 1517 BLAKE2B 0ffa84941b0f394404b767506cc3a0efedbc19e6b50e8cd3386ebbb75ae657e3c828791f72c01e95982670ab1783c4be301f7562884b93c1eca6c8d5065b912c SHA512 9ac5e366d81466493aa7e8202bc688670e219071b8bcf0801dec14df0c2977bd3520a95cd343b9658ae7327a4e09b5b9fe4e5c5f9faa4982260b83c1e4368cd4
 EBUILD autoconf-9999.ebuild 1361 BLAKE2B 70f04f869ac9481058e94197b617498fc5551ba3358a7f418d4fe2dd87a2263f47eeb431a2422e872a2e4d7fed903933a8914bfc19ba2e372e6a7b2285854a1b SHA512 cbd6d7f64866419b258c7f711eff2dff2f1dbb11847d80d2d7dfa3cadc11c37ec457e9e351ca56dadbeb73b0466e81d24efae4121a02751abdbf63c7595cbce2
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/autoconf/autoconf-2.69-r4.ebuild b/sys-devel/autoconf/autoconf-2.69-r4.ebuild
index bd9e73b13202..de99da3e030e 100644
--- a/sys-devel/autoconf/autoconf-2.69-r4.ebuild
+++ b/sys-devel/autoconf/autoconf-2.69-r4.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 		ftp://alpha.gnu.org/pub/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-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 inherit toolchain-autoconf
diff --git a/sys-devel/automake/Manifest b/sys-devel/automake/Manifest
index 9850085207b8..cfa342ff762e 100644
--- a/sys-devel/automake/Manifest
+++ b/sys-devel/automake/Manifest
@@ -35,28 +35,19 @@ DIST automake-1.12.6.tar.xz 1400336 BLAKE2B b1d9befdda70f9caab881c1159921ea883a7
 DIST automake-1.13.4.tar.xz 1449608 BLAKE2B 03dee42d65362a6f36e81c83d516c85faba1aac59bdc0d941077fde9be7742da0f57b48d678169e7a0e8b652c3ef46c314cdd3efb0fc489c389852fed1c39a02 SHA512 c9b145c1b822a4d83f2899f4280a76ccae932301b273f4c9718dc7f53161aa03dc1be2c1fb1a61083c54186e1908ae2c8284250aa1d8f6dea484767aca1344d3
 DIST automake-1.14.1.tar.xz 1488984 BLAKE2B a4c9b1f2c5ca35fba62e57423be2b6c060c63df8198d06a904a236745053072cb14ca4b333fb6cf370ef73378ee8771f4c10bcc111dcbd69e40f75abc16475fa SHA512 5de971159dfca2ec74c3c9a2f1368331efc437b146d675740c8735fcb0d32a30d0560fd29df64c3279efdf9278152c82a9ff09040b3e64d84743aaf25b26ce69
 DIST automake-1.15.1.tar.xz 1509496 BLAKE2B e6ade31089f969140472004cd9854318470228c64e4f8e829d48c5379f62d2c5f8ef9509131c577653e81868d94544ecf6520f86b5d582ebb6ed65c832039f30 SHA512 02f661b2676f1d44334ce1c7188f9913a6874bf46ba487708ad8090ad57905f14aead80fefed815e21effacfbb925e23b944ea7dd32563dca39c1a4174eda688
-DIST automake-1.15.tar.xz 1496708 BLAKE2B de2e903891195a61d8c5e347b2f67d7805d13d9a82524d8867b7176685a6fd4b0e87a7dd18d19d355011f4b307fd4d27f9e7a50ca068fe7feae1ba404137dca7 SHA512 200a13f49a3f492ed27bc2eb615aa2f47e775e470a781f6821cd43e0f7b927d091e690b4a23fe5cc8fa79c48daaa9436be4b968784696c3bdbf1634b456cda47
 DIST automake-1.4-p6.tar.gz 375060 BLAKE2B 681c70a2932ae1697d0b9907c8a8d12ed0d506be4a2812dff93af7c3b659ee1ed24a97f0a653f9a49c0d4a78a70965482b39f1297e9f6d6099d3857a2d451f69 SHA512 3f3235e68ab6703668deac015926124c7eeeea6925e830c6820cb156f15f8ee3febd0fd0cc2ab4f4b5c405b528e4ce12b2459347f62ed6a1a862bc9969163d9e
 DIST automake-1.5.tar.gz 526934 BLAKE2B 4b613c81f933d550cc9e5e40dd9ce1160f49c388f4e9292b1a8843b0f4cfc57d72a3dc10bce03260cffa61ab8d67a5b27d781bd7a4c2d842764135158dc2b54f SHA512 b9dbece18935b6c08f7d17c456b0359a17362dc030692629cf5d66db675e46a5f24d60dfd20a50780e4096163454f1922d4281c4bb7af336d61e527b579e3bfc
 DIST automake-1.6.3.tar.bz2 476275 BLAKE2B 5d0b7f69cbf9fda3b1f1426548fae45c631375898568b442cc5d3561a618ad3f15b6103f55539487dcbf4088a6f75887dce5d00851bc4c09c5db45012d6bc2f1 SHA512 8407ea7d51a238622326d89c22777050c2a49d456e3e33c53985f40e4108094ef149693568d926cd1e9b2ddbdb5693c0d0ec6220e0f7bbae4341b6be9f0d060f
 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-r1.ebuild 2136 BLAKE2B 23634121851bb0708e4d67024c9e41d3ec3ea9863a5f19bfdd9d51f990715ee38d8733fd75af5f7a44086db52cea893fc6a620b2a6dd8fb960987533b153f7ae SHA512 41817b8c074c3a5c440d69b3198cd7a654ed12080751628a029a8b1b8a4037a44575329039aa85ac53e3d6ecb17e7639fd6a55f97bd3373731e2602f5219465c
 EBUILD automake-1.10.3-r2.ebuild 2205 BLAKE2B 60c8f66ec01eaa9ddda826de66538bc91c23649b4699ea64745bdb7bb5d096e1f8f5bd10cc32b4f50e02d821cc1726453c5ff3106d2a4054b22ea828d9048730 SHA512 43ffba799f9ab5c6749a5c327a5c8b4dce0f64ed3064198288548d142c780b69db56eeaa5cf47d2ebcf2c8440708eee9c4f09e837e0f45b3d65f65976dc15b2d
-EBUILD automake-1.11.6-r1.ebuild 2299 BLAKE2B c7b8158f2464bf91abca1f8820aebc6fdd559b2ddb5df2b2038b3bd907a7e8d764d70056159136dd66c72049791ca36c80479d8c09ca725a81d384f57102c720 SHA512 9b62d923218da82f939dac7694e814930723caa430529e6b7e49cb376042317df1e17a3f1386af3a7a3226ef28a6ae4e5ecd05ac747dcb96dd851cf759091950
 EBUILD automake-1.11.6-r2.ebuild 2376 BLAKE2B dbd71da4fd65654bd37af30a2cb105478fcb9fbb56fe0643790089657ae2fd724ca2ccfa4de33592855b17d9dec572faf01e610b354bfd2106e67bed0d08dcff SHA512 0a13925bf5f025df81e052e89db47a83081c3ceda78752763fdd9a06154e3ad973e18e77065dd4a31c2b71353b08bcd75bf2692a1f02a2feb7154f81ea34c7a9
 EBUILD automake-1.12.6-r1.ebuild 2206 BLAKE2B c7c04722fbe9879d9c770e1515788f7e53617e38331d9da55e2b6c22d40df5c9825f82dfcf2a01e334759b719d7e4fc2e42641f03f4492224963e081e58bb61f SHA512 1f98949dd5e8f90f37f14129f2c82de5af008cb6ed7a18a0e55a81039ff418b910efbec888cd151c94aa9aff1cb6c22a6259c6c97924973cac19702df6a7b0fa
 EBUILD automake-1.12.6.ebuild 2136 BLAKE2B 28a7ba299808909bc488d8d83d64b9cbed4f1bf183539fc89357793dbabb5eb9b1f3ebc3218de8e575a08172c2cc69c7bee85a308f06a23d99fa9316bcf7d66a SHA512 93f0abd1cfcb93328a3473cd4300563fe05d0de1c9e6a700a39e69a5d531566065c9477920cccbd63b0435308bb98109d7f93f345e2ff6eea5f1aeba524df535
 EBUILD automake-1.13.4-r1.ebuild 2433 BLAKE2B a52a44d9257dedf75f2e70c4807056feb3ae42410738d30a4c9b87ab579ac8765c7844415be141e5a6d6ce0eee5467241c8ffdbf9fb33057ab533e11bee6caa5 SHA512 7819b9a8cb190a2dccfc1ed25d8a7afb52e79e5584035164133436603faa8e108cc30169ac7aeee8a54da21f9beef6a31e8eb4de85eb7b2586c1c2a7c00c3dc4
-EBUILD automake-1.13.4.ebuild 2217 BLAKE2B 7c98b1aa3b01f688afb80f1b6cbe5548771a059e3858b356690649782f709f71f8fd4c19b70898d5ec71356f62051535163e4ede3c2d6c28bf23865e72eedca4 SHA512 f9d1970643c35f49269cf3ede21c6c60f386cdebe5787208c2c2347dde194ea247de46b665a14e9197468c5c1dc18d124333ada4fe456184ad7b91ff532a3ae9
 EBUILD automake-1.14.1-r1.ebuild 2745 BLAKE2B 38575acbb0fee6557c192e8f2c523220a296d305d67cde01bc86e512124f48dde1bc7a16439df88205a0b59afd90ff57aeb4d7f94d130c27907e1cc70879502f SHA512 6fad77ae5acbbabfce37555d2f46739012708b135e7f4e8ad9ed326b087bd9ffe6f3878a1f6abd3253a49a24dfc849ef3d43ab20d413fab63f65391f93c3b3f3
-EBUILD automake-1.14.1.ebuild 2529 BLAKE2B b8169fc031a14fc70008439590b877c854b3f76fec868e0e2ffd6f6a331993a09c18c7ada36f518e662a0f94a651922875f62ca038a19ebf6121f2fade7a2638 SHA512 ccdd5e045c12d7ec8f99243e611f1e9c45d605bef5ca1a754332843fd424a528450c529c0289993a4b0025c8bbbe5107bd6663ba6cd45a729e8158135f00af71
-EBUILD automake-1.15-r1.ebuild 2607 BLAKE2B 1a3a89733ba5d20a37d3a616313af766f0ccd4ae4092a5ac03ecc53ff540790eace3a61d1b865e2e9639d3b17f5009128439e893689e1dab48e5d5d62c54d2cd SHA512 e4d3bf262b452663b011b08e59bd6fbf578d8509d2ae0cc8a42b829f450f080e2126808c3916cb1dc2bbac84fd0259d3996fdd6bc3c986f2ae1fc843602e722f
-EBUILD automake-1.15-r2.ebuild 2809 BLAKE2B 62271b852eea9ba354d249c99ddc8a7af3cae61b6a266e34473f92bf871b943c7015d18b0be8e3d6c6c77bb0d3a3a21654f4221ab8339cb2ca708f8e6c452696 SHA512 f2317f01a0e3fe98090bed4d10431e611ff2d84010ee7ab9d40487e2f75e2d4db1e50ea41c9f51470d053b2e0f3a5ef903792edab44aeee3739f5cc8660e05b0
 EBUILD automake-1.15.1-r1.ebuild 2926 BLAKE2B 736c81847d36c28d8103841f2ed609f9f37b7cd17e8ec15ea988708231e28efb99030e65dd035ec1d3daac5ad8e79d1fe2438296870e2005fd3c9601d13b47c5 SHA512 a3a570cb1e5d872171803dc4992ee6636e4608e370122d983f2b4e981f5d40b441ed1d34729854561efc8680de319d31f82f1c9dfe2a89eb6a7356149cc9ee66
-EBUILD automake-1.15.1.ebuild 2689 BLAKE2B 6ac45a716798d71bcb687b4326bbd1291a91280df0966bc1a2286effdf62f6e9462f6b2396925ccd82c57cdb52deb05a58c64a72c94d1307f6116aaca0a238df SHA512 302a37dec3e7944a29754ec7a3f7adef389a57fc408a353eaff2f9d6d6408a0460a56e9410f5640caf6945511549f367ddf42290e356b3fdb7da2eb979e1aeaf
-EBUILD automake-1.15.ebuild 2529 BLAKE2B b8169fc031a14fc70008439590b877c854b3f76fec868e0e2ffd6f6a331993a09c18c7ada36f518e662a0f94a651922875f62ca038a19ebf6121f2fade7a2638 SHA512 ccdd5e045c12d7ec8f99243e611f1e9c45d605bef5ca1a754332843fd424a528450c529c0289993a4b0025c8bbbe5107bd6663ba6cd45a729e8158135f00af71
 EBUILD automake-1.4_p6-r2.ebuild 2493 BLAKE2B 8b23e17f23f54dc17a91e54260d28a667ea2f12653d0b5eee320b5058a36019c00ac55c246d36951e437bae5b6faecd31002d74035ee5890425d02b35e95ae02 SHA512 7077f282076cb741cd54080654ab2098f6a4fe55536147c5c4c7a807e0e1b63179cac9aadb4220f92ae601455a4f231c045b6b85faa4c044408d4b0ba0563407
 EBUILD automake-1.5-r2.ebuild 2311 BLAKE2B 2138e2aeee91fee2f7a1ff7b35ea57e128117ffcddaac5b8b36309243aec0d116695a4df6463bdd4b6eade1fa460aa1a3d2a047d453de96d919b67ca5a94917f SHA512 68c46578ba7f8c7b81ab0bb723115f8f336cba2b7af6d7a5dc3726de34fe4dfbd810cb976363983b0737716ec46514b92c83666cbae0e0bb34590950c9bb9060
 EBUILD automake-1.6.3-r2.ebuild 2059 BLAKE2B d377b1b11491b20b208f1afde99309c80c3e892518b3b30ad8ba20e66a0ec3bd4ea8880376b651c9171e9e7e95f93f5e5368eb199e98b3742fdadb2709858987 SHA512 588753996cf13aa49b251fb55cfe9bacd9015474ff4824a988bbe38ea0826e05cb3e6079264d47bc64460e1cd44bcfc5a233af7cd769a6476fce29f4bdc2d4f0
diff --git a/sys-devel/automake/automake-1.10.3-r1.ebuild b/sys-devel/automake/automake-1.10.3-r1.ebuild
deleted file mode 100644
index fc86a449d55b..000000000000
--- a/sys-devel/automake/automake-1.10.3-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2014 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 ~sparc-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
-	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.11.6-r1.ebuild b/sys-devel/automake/automake-1.11.6-r1.ebuild
deleted file mode 100644
index 14f4d3e9b4c0..000000000000
--- a/sys-devel/automake/automake-1.11.6-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2016 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 ~sparc-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
-	chmod a+rx tests/*.test
-	sed -i -e "/APIVERSION=/s:=.*:=${SLOT}:" configure || die
-	export TZ="UTC"  #589138
-}
-
-src_configure() {
-	econf --docdir="\$(datarootdir)/doc/${PF}" HELP2MAN=true
-}
-
-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.13.4.ebuild b/sys-devel/automake/automake-1.13.4.ebuild
deleted file mode 100644
index a5f269c07dfa..000000000000
--- a/sys-devel/automake/automake-1.13.4.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2016 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 ~sparc-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-dyn-ithreads.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.ebuild b/sys-devel/automake/automake-1.14.1.ebuild
deleted file mode 100644
index be5a268a5453..000000000000
--- a/sys-devel/automake/automake-1.14.1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2016 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 ~amd64-fbsd ~sparc-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"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	export WANT_AUTOCONF=2.5
-	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.15-r1.ebuild b/sys-devel/automake/automake-1.15-r1.ebuild
deleted file mode 100644
index b261355458ec..000000000000
--- a/sys-devel/automake/automake-1.15-r1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2016 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 ~amd64-fbsd ~sparc-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"
-
-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.15-r2.ebuild b/sys-devel/automake/automake-1.15-r2.ebuild
deleted file mode 100644
index 162bc51f3c72..000000000000
--- a/sys-devel/automake/automake-1.15-r2.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2017 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 ~sparc-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
-	epatch "${FILESDIR}"/${PN}-1.15-mdate-tz.patch #520818 #574492
-	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.15.1.ebuild b/sys-devel/automake/automake-1.15.1.ebuild
deleted file mode 100644
index 3d30181746d1..000000000000
--- a/sys-devel/automake/automake-1.15.1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2017 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 ~sparc-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
-	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.15.ebuild b/sys-devel/automake/automake-1.15.ebuild
deleted file mode 100644
index be5a268a5453..000000000000
--- a/sys-devel/automake/automake-1.15.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2016 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 ~amd64-fbsd ~sparc-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"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	export WANT_AUTOCONF=2.5
-	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/bc/Manifest b/sys-devel/bc/Manifest
index 4766bb55411c..85a045903a23 100644
--- a/sys-devel/bc/Manifest
+++ b/sys-devel/bc/Manifest
@@ -3,6 +3,6 @@ AUX bc-1.06.95-void_uninitialized.patch 351 BLAKE2B ad293d5efcebc2cf85a2d1a99e85
 DIST bc-1.06.95.tar.bz2 290069 BLAKE2B 774f07b1f85b4de7c4707baa355caed5a9fc7b3a5ee1a14f4e9fd59f47a4bbdf34bcb76dc05de4dd8c65615284c3588ad7961fa493ed559a0e8880647835bda0 SHA512 16ec13f87ef76ad4de77d378ef8d65a582adca1bf661c9d7675e78d940680c77e81a00a01817fde7c1ad1524562d6f933caa5c42a0686f3f85aadbb39393afb1
 DIST bc-1.07.1.tar.gz 419850 BLAKE2B dcedc193be5521aa0fa3a19746233ed65bc1fe8ef12e15155341706de6fbeecb6dd7ee4ab11e2d4b3aca2ae7097cce89e389b3573493bbc893e00b4ed3239594 SHA512 02126d0db6b6ed06d56cfc292d6f5475ff1e574779d7e69c7809bbb1e13f946f57ea07da2a7666baa092507a951a822044b0970075f75eefe65a5c1999b75d34
 EBUILD bc-1.06.95-r1.ebuild 1510 BLAKE2B 2d4e498eebe76077986a82c249c6bcbd2fcf6628b27c499cdab4952822b992d11854cac88832f30c5a7b618f96bc9b2063fdce9bb3f118d8df5b0400f7f0a52f SHA512 d246ee01a277848789ac860c52d4b1bbab93246b02e5baf09099ba1e88978f824e34abaefa732a4cdf7b41bc7186f959c622fbe2b9fceb14af41e0a313f3b1f4
-EBUILD bc-1.06.95-r2.ebuild 1638 BLAKE2B cbb52c9ea674745c49acedb92a2f4ae28061b2314e855136aaf05bbf57551137c5680a8a8cc6d88a5c614c61db5bdf8053d1e8fbde673dfae9d4669667d69200 SHA512 79c65179779809389e16d4ec51d9d33b42b115c7fe8d6ab29cbbd5bec4bfadc15be578bcc42feafa0a8bd62391bc497ba0fd9f7863349f2ad9667273e506d4a9
+EBUILD bc-1.06.95-r2.ebuild 1635 BLAKE2B 9345b01d00b68d3dd393c68bbd97972cf6432c0cbb00f546e4b5eb0deecc58a81c20f2b7981b72a990cf174dc169924957d0768af83f26c8ad6480d470ccd6c6 SHA512 01aa34317588f392298f8ea59c51709e08e34e5573c20223fcbe77a076c908641a01d510fde533c8b54dc599ce767298b0dec0a2e25d91e005ecad2a1e3cb9ad
 EBUILD bc-1.07.1-r1.ebuild 1273 BLAKE2B afc42976eb7c32847e0979a9d551c4504e3fc702781c7dea59efafb21937d8a824bfa6bfa67880aead8c3fb129e5bf2a4c065d28108f64bb0cda33ce730dadf3 SHA512 16bd0dc631c798e1ff3a1a42b887a149204bb48ec9efdd097a6ebfe8d31a1fa163530dbc7fa77b9ab174cacc96cb31ae1f9dac298cf51a13aff89d0c127fc964
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/bc/bc-1.06.95-r2.ebuild b/sys-devel/bc/bc-1.06.95-r2.ebuild
index e74a6b74e03b..bf5debfbd036 100644
--- a/sys-devel/bc/bc-1.06.95-r2.ebuild
+++ b/sys-devel/bc/bc-1.06.95-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu-alpha/bc/${P}.tar.bz2
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="libedit readline static"
 
 RDEPEND="
diff --git a/sys-devel/gcc-apple/Manifest b/sys-devel/gcc-apple/Manifest
index 3ebf2207b45d..d46fba0b8309 100644
--- a/sys-devel/gcc-apple/Manifest
+++ b/sys-devel/gcc-apple/Manifest
@@ -12,5 +12,5 @@ DIST gcc-apple-4.2.1_p5646-gfortran.patch 38284 BLAKE2B 83934d5e52a27a0db750f725
 DIST gcc-fortran-4.2.4.tar.bz2 905688 BLAKE2B 6a7e030e3261b147f5add7c8b936ecb7a7a20b99db96e957fa94591560a2e303f2cdf931ca8d73b7c29464d288d1db52c2619bbf1cce30d7326a668aab303dad SHA512 1a36587a3691b8d7ecd23938efcdfca42642b6b260a1c830f6d791bb1b8ac32953998c45d77eee2d557861d631431569503c796b61aeaea9ac5fffbce1982faa
 DIST libstdcxx-16.tar.gz 64695692 BLAKE2B 3660778be1f28761fdf93d6db77eba54836f3ed45af756786f94abc3556f2013a84af8a2585ffee16925cd84634c96196c4392a80ed7e34db6dcb8f96f979d60 SHA512 2f0e8d694aaaf94fc2a0463ebd4a5775865421dedb431a6f6f701a8d33078e768bef232f72e2cf1f8e2d278eb60ff54030f5ad22b43eb0643d49bc4717e96b05
 DIST libstdcxx-39.tar.gz 117081330 BLAKE2B 03df012edd588e27bb1e17439e1b213bbf08a9656579f4a938c3026b993158962a44660d0dd2027ad6f12aa2b0cfaa7880a0ecfbd27b2e976bba3260e56bb377 SHA512 c640292c0f371069fbb635ed0385627c8abab869db93513922e19b25886864d093eef3684c49bf1ba82325f2d1d3cd1eb382ef6ea9dee039208fe99fe8653db6
-EBUILD gcc-apple-4.2.1_p5666-r2.ebuild 13193 BLAKE2B a5018dc49113379261ca93ce0de0c57774b2a199cfcef9f6f3cb04cc1e8e741d8f3a76db5de6d07c402b3dabbd2932b0d08df28324404a43a2f84f6642b6f837 SHA512 4d85007f599e285ef6f91d40e422a9d380c0eb3e8eb6be522d2b635b7e6da98fe9ea62ad63e73b61aa04fd6546cc497246a1dc75ee1fc669f2cbea1734e12f12
+EBUILD gcc-apple-4.2.1_p5666-r2.ebuild 13260 BLAKE2B bf4d2cb919ea56baa32dfc78595703c068dbee42e19b1254e57683391e5f13af0fe49540e428273547dd7b92e560973c7776455530b48638207ee7bfe651ff48 SHA512 4cbef8da34ac6d9df2724dee29057e48288e8e70600240cdff516b585fd60f2a8e74b5a9e32f46eccd4c11e6f2f60f007bf19cc97e8f0478001f06d84bea70b9
 MISC metadata.xml 530 BLAKE2B 9cbe53672ff6d681bda4893ac4630e70e80129fcfbd0abe5862eddb51008b60220b5c3bffa15177c9d5c0308d0569dfcec7eeaf2ea87042b28a32714efb83530 SHA512 29922e179098de072d1a5bd869ba4505a88ee1340ceb66b0898b58446ddd74b6a6dcc961b4a1445d2db3b95259c6cb31030b9c0b7ea036a92b303b7f7ac3b371
diff --git a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r2.ebuild b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r2.ebuild
index bd1d11209952..12f3d99760d9 100644
--- a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r2.ebuild
+++ b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -138,6 +138,7 @@ src_prepare() {
 
 	local BRANDING_GCC_PKGVERSION="$(sed -n -e '/^#define VERSUFFIX/s/^[^"]*"\([^"]\+\)".*$/\1/p' "${S}"/gcc/version.c)"
 	BRANDING_GCC_PKGVERSION=${BRANDING_GCC_PKGVERSION/(/(Gentoo ${PVR}, }
+	# ) ) } # <- to help Vim highlight this correctly
 	einfo "patching gcc version: ${GCC_VERS}${BRANDING_GCC_PKGVERSION}"
 
 	sed -i -e "s~VERSUFFIX \"[^\"]*~VERSUFFIX \"${BRANDING_GCC_PKGVERSION}~" \
@@ -314,9 +315,9 @@ src_install() {
 			ln -sf ${CTARGET}-${x} ${x}
 
 			# Create version-ed symlinks
-			dosym ${BINPATH#${EPREFIX}}/${CTARGET}-${x} \
+			dosym ../${BINPATH#${EPREFIX}/usr/}/${CTARGET}-${x} \
 				/usr/bin/${CTARGET}-${x}-${GCC_VERS}
-			dosym ${BINPATH#${EPREFIX}}/${CTARGET}-${x} \
+			dosym ../${BINPATH#${EPREFIX}/usr/}/${CTARGET}-${x} \
 				/usr/bin/${x}-${GCC_VERS}
 		fi
 
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 54bd1f8a772c..0b7aad1800a5 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -16,6 +16,7 @@ DIST compiler-rt-3.9.1.src.tar.xz 1376372 BLAKE2B 1c7391a429329591d96e474c9ac5b3
 DIST lldb-3.7.1.src.tar.xz 10650524 BLAKE2B 432e7064f4f48b62b96c80ca184fc2a69ac7e2ee62d14020017c01659aa15299b5f5c47852855b1ff12606d264c1cccf9a31b5818909dd779c8f353df62d12dc SHA512 d2d3e1052026edd6ef9113ff5362acb4a32cef598098b4031c35e389301130ef2e1bda594f30de4d65c9fdc0beaecdd35afcf36676eb540baad34015aca294d1
 DIST lldb-3.9.1.src.tar.xz 13750816 BLAKE2B 40bd2797e1e06f600cdd88ba56af8e3c315cd9f2bc2ca12c3172623ae16750f051f9e6d76df354a3fc0c6a4fb802fa842952e1ff1d47a28f5cd218546da89563 SHA512 e2957a1da60284595b21c205b07fa3db5c474bfad1935ab8e1bc832f30af497e9eb709efeb703591ef62e7dd73a28d22fc21398097a232c8a729946d72eb5df7
 DIST llvm-3.4-manpages.tar.bz2 33753 BLAKE2B b6a57cc492d133eddad08507521395f8c4cd6c7609b6134e61c330045d68a222bee88f8d0ab7883654db55157b185b59690ca3024957ddaaaa3054fcb9ccf831 SHA512 8e438a9392c9b896ccb2b1460a8f57ffa01633e3a6bba61e2bf2f718d970ff96c17d63b0bc0d4da1162e1d1dc4cb9b2a9e9a14a722e8a5b5d2f205f037ae665d
+DIST llvm-3.4-patchset-darwin-leopard.tar.gz 7704 BLAKE2B a46dacae703b19ad2876d3f1f4f59ca12be96e2368d35d2578d4d67e4ea28051e37279e79cd5169f63277ba4d591d2ac8baf3a6f6af6b45e1019c4aa83f1515d SHA512 1f34ef6a20fe09e6de473bd15f9ef30e3d7a16a5a9fdb62d88d1ac22ffc31a2a7814e0a2e677b21dbf0865241786aa2b8b4646737cede1765c8f3c6b5202fccc
 DIST llvm-3.4.2-patchset.tar.gz 4612 BLAKE2B e7be0957dac5ceae7e81beef2dbb914554809095fd4857d45809b00ae06f297649f8a5e7baaa1602b711b678120ca18aee1f60413136d0572c8226f7fabae03e SHA512 32c7cf229a6a8917f0fc67efa1fb11994945281f6906395cee7e5c51399c8fb4c06f554a03253c8f9073890a7bc7af151a8adfe887ad62f45f1523e6e358f769
 DIST llvm-3.4.2.src.tar.gz 15938155 BLAKE2B 51b2f5e04f448d71fdd757a84c71157de0f9958aace6e8837971e3c62f2b017387b1bc8b310bacfae137b48501d25be8decb4ffa3caa7fcd0083a73c4c65949e SHA512 6c1453f7d9d9110257db3574cc4f6227fed8938705cbb09851ac09a868089b48f1556a1b6e758aff6d97520b08b5605d3ed20411ad9dd22cdc573d62176905f0
 DIST llvm-3.5.0-manpages.tar.bz2 35314 BLAKE2B 5368ddc4471d4ebf7e6f2bbd6525293dc8f6300fecf9a303e344b4e5415e5e04e9a9d0fbd636b2a1b554e8a55a69e4306842491ad3cc7c4c227b6ac35f52cc8b SHA512 d99d6096d7f21a81923297584fe5eeb23e0d83d4538fe376615c92fffc8aff3189999f7ab3c537b5aa5d6bc2c22c53eb05717d48c7ab99c42315b8665bac62c3
@@ -37,7 +38,7 @@ DIST llvm-5.0.1-patchset.tar.bz2 4204 BLAKE2B e7282e84578631d88549bdf34e5a44e029
 DIST llvm-5.0.1.src.tar.xz 23428720 BLAKE2B 3db4d33df21018d17eef0042c0d8d82a8412bd5daa99cfb5405a6ec83c5774178fa76b220e8731c2a9a64dabf898aa90fe29c685327bd63a4f078e8e94a9a77e SHA512 bee1d45fca15ce725b1f2b1339b13eb6f750a3a321cfd099075477ec25835a8ca55b5366172c4aad46592dfd8afe372349ecf264f581463d017f9cee2d63c1cb
 DIST llvm-manpages-4.0.1.tar.bz2 87981 BLAKE2B 79ffd254ee5c6e09159c954913ef820f74107d4fcea5e3ed82592dc36af8fdfbf1e850547ba8bfc20aa9a5ecdd26c50329e6a6d558ae3aa5475a930789ce3e01 SHA512 d5b3213567c25db58ef364d272314a79c311a80fc21d98c09a5540af45a8190a38f489228663fe9a9b63bf0f2b952c460c4196a8fc8d6f221619f6e7ed2fc415
 DIST llvm-manpages-5.0.0.tar.bz2 94240 BLAKE2B 1657edefa2e839f401b7c30ba1c0cfde45bcb0fa9bcfc3ea6070bc0addc237be898c5a79e54b2120f98b2a9550ab286cfd0bc835751a4e8cc30005d4081fb9f9 SHA512 0bccfb00caa0796bed8ea4e591616e025e43d304f05589180820c17f8567fa3a1f1f76c323098ed0d0e4590765415b1c1c272a94c6e2e7544788f4088ef0ffea
-EBUILD llvm-3.4.2-r100.ebuild 7025 BLAKE2B b494ca2548a0d759e0eb3eac8c609406010da506e707ba98fed7e53858612d51ffbc87344c240b77eb82b2bb67bd5b8f4a4dd99d2925065a6b3293839297188a SHA512 9829abe6dbd09d786236ed4b05edbdbdd96c82af22dee5e4d4eb33fa28c80102024eeed057bc15140cf4bb646e84e8ed86e152a10df99b59f9ce84790af53593
+EBUILD llvm-3.4.2-r100.ebuild 7300 BLAKE2B fec797fe8f78b6892cce6bf6aab11ea13d1b294bdc2ea763ba07fb812448a11665967a1069a25e9da1d1439239edf91cef6ab292a2b2f9b1c77a005cb7d4fed7 SHA512 86f5f739714352e588d270e66fc667901ccbbe2ddf77d960c0c2175e86b8eff99fee2db66f5661d6b593746d724c1273461233178a5f65dc74aeae97818b3589
 EBUILD llvm-3.5.2-r100.ebuild 7837 BLAKE2B 224f7bf982e0f65a512a873e6eca951d05d4e81e7ae636e95d03308c19faea77016357207c2e4d2534d9c4de561a7ff5215f37e9d02e6c6c68aa02191f63610f SHA512 3753dab4281fa0fd5061a9b4231e6fceb567bf40ac89f3bc9b2f52164e21e1b6283d3e6bb48b72dc8dfb0c21a7567ef0661d1a820943c032bb3a6ebdff59c5c9
 EBUILD llvm-3.6.2-r100.ebuild 7982 BLAKE2B fd247bb8877a421ec4f00ed499cddaa982ab7662cc31ef145bbc6e49c177df32f2d3e55090b4d63b12d8a83103b17cf9179edb0504df22e88a8861ea5124e80e SHA512 4a1673e289d67385d2971f367251e1e301e30be59d8931f2c73ed9ce6708fee0c993a11a243f134101f5e2fffb662cad09173791ad80a11e052c073ee6f48419
 EBUILD llvm-3.7.1-r3.ebuild 16958 BLAKE2B fd7a7890b0041c216fe4b21937a578b2a00da2f25baf648ad4847becdd49757c551f9fe9708c4c1757ab9991ca2468133746816372f26116c98788da5d059df6 SHA512 5e1824bb8e24faa592cdade50282c96a77bdc8574c0afee3984ab536d6a1c575babcc458c22acdc526c50838d20ce7fe7c4dff3d4cd7fcb2bcb11b2e7a2a3033
diff --git a/sys-devel/llvm/llvm-3.4.2-r100.ebuild b/sys-devel/llvm/llvm-3.4.2-r100.ebuild
index c533ef6f68e8..430d90928c05 100644
--- a/sys-devel/llvm/llvm-3.4.2-r100.ebuild
+++ b/sys-devel/llvm/llvm-3.4.2-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,8 @@ SRC_URI="https://llvm.org/releases/${PV}/${P}.src.tar.gz
 	clang? ( https://llvm.org/releases/3.4/compiler-rt-3.4.src.tar.gz
 		https://llvm.org/releases/${PV}/cfe-${PV}.src.tar.gz )
 	https://dev.gentoo.org/~mgorny/dist/llvm/${PN}-3.4-manpages.tar.bz2
-	https://dev.gentoo.org/~mgorny/dist/llvm/${P}-patchset.tar.gz"
+	https://dev.gentoo.org/~mgorny/dist/llvm/${P}-patchset.tar.gz
+	https://dev.gentoo.org/~grobian/distfiles/${PN}-3.4-patchset-darwin-leopard.tar.gz"
 
 # Additional licenses:
 # 1. OpenBSD regex: Henry Spencer's license ('rc' in Gentoo) + BSD.
@@ -105,6 +106,11 @@ src_prepare() {
 		epatch "${WORKDIR}/${P}-patchset"/clang/gentoo-runtime-gcc-detection-v3.patch
 
 		epatch "${WORKDIR}/${P}-patchset"/clang/gentoo-install.patch
+
+		if [[ ${CHOST} == *-darwin8 ]] || [[ ${CHOST} == *-darwin9 ]] ; then
+			EPATCH_SOURCE="${WORKDIR}"/${PN}-3.4-patchset-darwin-leopard \
+				EPATCH_SUFFIX=patch EPATCH_FORCE=yes epatch
+		fi
 		epatch "${WORKDIR}/${P}-patchset"/clang/darwin_build_fix.patch
 		epatch "${WORKDIR}/${P}-patchset"/clang/darwin_prefix-include-paths.patch
 		eprefixify tools/clang/lib/Frontend/InitHeaderSearch.cpp