[gentoo-commits] repo/gentoo:master commit in: sys-devel/automake/files/, sys-devel/automake/, profiles/

[David Seifert]

commit:     635c42f27d3fdd9af8357d1308c719714d5105fd
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 18 15:42:59 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Sep 18 15:42:59 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=635c42f2

sys-devel/automake: drop versions

* 1.4_p6-r2
* 1.5-r2
* 1.6.3-r2
* 1.7.9-r3
* 1.8.5-r5
* 1.9.6-r5
* 1.10.3-r3
* 1.12.6-r2
* 1.14.1-r2

Closes: https://github.com/gentoo/gentoo/pull/22325
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 profiles/package.mask                              |  20 +---
 sys-devel/automake/Manifest                        |   9 --
 sys-devel/automake/automake-1.10.3-r3.ebuild       |  89 -----------------
 sys-devel/automake/automake-1.12.6-r2.ebuild       |  88 -----------------
 sys-devel/automake/automake-1.14.1-r2.ebuild       | 107 ---------------------
 sys-devel/automake/automake-1.4_p6-r2.ebuild       |  87 -----------------
 sys-devel/automake/automake-1.5-r2.ebuild          |  82 ----------------
 sys-devel/automake/automake-1.6.3-r2.ebuild        |  75 ---------------
 sys-devel/automake/automake-1.7.9-r3.ebuild        |  78 ---------------
 sys-devel/automake/automake-1.8.5-r5.ebuild        |  78 ---------------
 sys-devel/automake/automake-1.9.6-r5.ebuild        |  87 -----------------
 .../files/automake-1.10-ccnoco-ldflags.patch       |  35 -------
 .../automake/files/automake-1.14-gzip-fix.patch    |  67 -------------
 .../files/automake-1.4-CVE-2009-4029.patch         |  65 -------------
 .../files/automake-1.4-ansi2knr-stdlib.patch       |  11 ---
 .../automake/files/automake-1.4-libtoolize.patch   |  17 ----
 .../files/automake-1.4-nls-nuisances.patch         |  19 ----
 .../automake/files/automake-1.4-perl-5.11.patch    |  28 ------
 .../files/automake-1.4-perl-dyn-call.patch         |  23 -----
 .../files/automake-1.4-subdirs-89656.patch         |  22 -----
 .../files/automake-1.5-CVE-2009-4029.patch         |  60 ------------
 .../automake/files/automake-1.5-perl-5.11.patch    |  28 ------
 sys-devel/automake/files/automake-1.5-slot.patch   |  42 --------
 .../automake/files/automake-1.5-target_hook.patch  |  34 -------
 .../automake/files/automake-1.5-test-fixes.patch   |  65 -------------
 .../automake/files/automake-1.6.3-test-fixes.patch |  28 ------
 .../files/automake-1.7.9-infopage-namechange.patch |  15 ---
 .../automake/files/automake-1.7.9-libtool-2.patch  |  43 ---------
 .../automake/files/automake-1.7.9-test-fixes.patch |  46 ---------
 .../automake/files/automake-1.8-perl-5.11.patch    |  30 ------
 .../files/automake-1.8.2-infopage-namechange.patch |  36 -------
 .../files/automake-1.8.5-CVE-2009-4029.patch       |  60 ------------
 .../automake/files/automake-1.8.5-test-fixes.patch |  43 ---------
 .../files/automake-1.9.6-aclocal7-test-sleep.patch |  39 --------
 .../files/automake-1.9.6-ignore-comments-r1.patch  |  29 ------
 .../automake-1.9.6-include-dir-prefix-r1.patch     |  31 ------
 .../automake-1.9.6-infopage-namechange-r1.patch    |  33 -------
 .../automake/files/automake-1.9.6-subst-test.patch |  42 --------
 38 files changed, 5 insertions(+), 1786 deletions(-)

diff --git a/profiles/package.mask b/profiles/package.mask
index 0ea4be18aef..b848667bd2c 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,11 @@
 
 #--- END OF EXAMPLES ---
 
+# Andreas K. Hüttel <dilfridge@g.o> (2021-09-18)
+# sys-devel/automake version 1.11 is EOL and is only useful for testing
+# old de-ANSI-fication/ansi2knr/AM_C_PROTOTYPES code. Please uninstall.
+sys-devel/automake:1.11
+
 # Alice Ferrazzi <alicef@g.o> (2021-09-16)
 # Regression in POSIX CPU timers.
 # Please upgrade your gentoo-sources.
@@ -486,21 +491,6 @@ app-office/texmacs
 virtual/jdk:11
 virtual/jre:11
 
-# Andreas K. Hüttel <dilfridge@g.o> (2017-10-18)
-# sys-devel/automake versions 1.4, 1.5, 1.6, 1.7, 1.8
-# have known security vulnerabilities, are broken with
-# recent Perl (>=5.26.0), and are not used by anything in
-# the Gentoo repository. Please uninstall.
-sys-devel/automake:1.4
-sys-devel/automake:1.5
-sys-devel/automake:1.6
-sys-devel/automake:1.7
-sys-devel/automake:1.8
-sys-devel/automake:1.9
-sys-devel/automake:1.10
-sys-devel/automake:1.11
-sys-devel/automake:1.12
-
 # Nicolas Bock <nicolasbock@g.o> (2017-10-31)
 # There are multiple unresolved upstream issues with >=jabref-bin-4.0 (#636036).
 # If you still would like to use this version, please report any issues to

diff --git a/sys-devel/automake/Manifest b/sys-devel/automake/Manifest
index 46ac3e8d8fd..a4781e5ebc1 100644
--- a/sys-devel/automake/Manifest
+++ b/sys-devel/automake/Manifest
@@ -1,14 +1,5 @@
-DIST automake-1.10.3.tar.bz2 957505 BLAKE2B e17dc5b4b1b70ed03fb12b48bef9ff7f1dd9d641ace5ba96ace8e76d2aa129deb272a2eebca1df599b2db9ce6e1c7a11ac866dc578aa703a6fb87bf06658db36 SHA512 4f4172c53f31103a93baa794bb498c8b42c1a06e5e0c909063863cdfee3f768016bdecf46e64417a8e362d4c524907b48c0c1b24f510d26aa66bcfd85d0b2598
 DIST automake-1.11.6.tar.xz 1092908 BLAKE2B 17254d81d6920c32aa877b6c892025de8e4060b8bcbe50fff841ada513dd462ddde8fc6838b4976098a812f8fda047e7186cb62cea8175df615dde75a9959144 SHA512 6e4cdf69f07734954f770fd4a7211a8c9dc69fe25a7746bd3c1e01d3139c94cab2900399e87371548833e99687e0d2b59c5e746ab2fdfbc7d47f2c1d439137ba
-DIST automake-1.12.6.tar.xz 1400336 BLAKE2B b1d9befdda70f9caab881c1159921ea883a790c24919fcff2a4a03d10cdb3883f7f2ec866b3f64e94b27f0aee771d04cf364eb48734a074259ec00162190d7a2 SHA512 ddcd664ef8f52a44c0adbe908e3a5a2844d8768932211d75dedf262827ffa411b5c3599f93a212f1c979108122cd14bbea5e672218596dd7c934a25d805aae5c
 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.16.3.tar.xz 1590708 BLAKE2B ab6001a1b09e171ec83bac07155a77ab0fc29f5185116616aa3080b27e8bbf759472cd0dfb75630b26f7ad8d0741e668662d00b370ef79cf5ef6c62e945c94da SHA512 7265aeb7f82a8a205761d76e6ade7b7e97831c283349fd80f86e511f4b0b3e17f429d1506fca84c76079f63781e5dbf5ca81455d6bf6cda27d2e5c3d23b0d1aa
 DIST automake-1.16.4.tar.xz 1599336 BLAKE2B a74bb444e7074e7dd7cf920a94a86756a5e6dec24a9eeb669ee629a1d3ab667efef0005d488fe6d9d8b33a680ada54f098ca334b63da4a739b0fec7c630a65aa SHA512 5a8883657e73b75bfa1ee59ab04af6bf4d43f390ab62fb7a9e8e2ac66159dfe4947b2ac7bc1028afffe6a09d88f388339500e03f6cdfa1226985be45ec033246
-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

diff --git a/sys-devel/automake/automake-1.10.3-r3.ebuild b/sys-devel/automake/automake-1.10.3-r3.ebuild
deleted file mode 100644
index a85f4c5a1e3..00000000000
--- a/sys-devel/automake/automake-1.10.3-r3.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 sparc x86"
-IUSE=""
-RESTRICT="test"
-
-RDEPEND="dev-lang/perl
-	>=sys-devel/automake-wrapper-10
-	>=sys-devel/autoconf-2.69:*
-	sys-devel/gnuconfig"
-DEPEND="${RDEPEND}
-	sys-apps/help2man"
-BDEPEND="app-arch/gzip"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.10-perl-5.16.patch #424453
-	"${FILESDIR}"/${PN}-1.11-install-sh-avoid-low-risk-race-in-tmp.patch
-	"${FILESDIR}"/${PN}-1.13-perl-escape-curly-bracket-r1.patch
-)
-
-src_prepare() {
-	default
-	export WANT_AUTOCONF=2.5
-}
-
-# 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 || die
-
-	# 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
-
-	# 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
-
-	# Avoid QA message about pre-compressed file in docs
-	local tarfile="${ED}/usr/share/doc/${PF}/amhello-1.0.tar.gz"
-	if [[ -f "${tarfile}" ]] ; then
-		gunzip "${tarfile}" || die
-	fi
-}

diff --git a/sys-devel/automake/automake-1.12.6-r2.ebuild b/sys-devel/automake/automake-1.12.6-r2.ebuild
deleted file mode 100644
index c5b18514818..00000000000
--- a/sys-devel/automake/automake-1.12.6-r2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 sparc x86"
-IUSE=""
-RESTRICT="test"
-
-RDEPEND="dev-lang/perl
-	>=sys-devel/automake-wrapper-10
-	>=sys-devel/autoconf-2.69:*
-	sys-devel/gnuconfig"
-DEPEND="${RDEPEND}
-	sys-apps/help2man"
-BDEPEND="app-arch/gzip"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.13-perl-escape-curly-bracket-r1.patch
-	"${FILESDIR}"/${PN}-1.14-install-sh-avoid-low-risk-race-in-tmp.patch
-)
-
-src_prepare() {
-	default
-	export WANT_AUTOCONF=2.5
-	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 || die
-
-	# 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
-
-	# Avoid QA message about pre-compressed file in docs
-	local tarfile="${ED}/usr/share/doc/${PF}/amhello-1.0.tar.gz"
-	if [[ -f "${tarfile}" ]] ; then
-		gunzip "${tarfile}" || die
-	fi
-}

diff --git a/sys-devel/automake/automake-1.14.1-r2.ebuild b/sys-devel/automake/automake-1.14.1-r2.ebuild
deleted file mode 100644
index d9af1685d56..00000000000
--- a/sys-devel/automake/automake-1.14.1-r2.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV/_beta} == ${PV} ]]; then
-	MY_P=${P}
-	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
-		https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz"
-else
-	MY_PV="$(ver_cut 1).$(($(ver_cut 2)-1))b"
-	MY_P="${PN}-${MY_PV}"
-
-	# Alpha/beta releases are not distributed on the usual mirrors.
-	SRC_URI="https://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 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-RESTRICT="test"
-
-RDEPEND="dev-lang/perl
-	>=sys-devel/automake-wrapper-10
-	>=sys-devel/autoconf-2.69:*
-	sys-devel/gnuconfig"
-DEPEND="${RDEPEND}
-	sys-apps/help2man"
-BDEPEND="app-arch/gzip"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.14-gzip-fix.patch
-	"${FILESDIR}"/${PN}-1.14-install-sh-avoid-low-risk-race-in-tmp.patch
-	"${FILESDIR}"/${PN}-1.15-perl-escape-curly-bracket.patch
-)
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	export WANT_AUTOCONF=2.5
-	sed -i -e "/APIVERSION=/s:=.*:=${SLOT}:" configure || die
-
-	# Bug 628912
-	if ! has_version sys-apps/texinfo ; then
-		touch doc/{stamp-vti,version.texi,automake.info} || die
-	fi
-}
-
-# 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 || die
-
-	# 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
-
-	# Avoid QA message about pre-compressed file in docs
-	local tarfile="${ED}/usr/share/doc/${PF}/amhello-1.0.tar.gz"
-	if [[ -f "${tarfile}" ]] ; then
-		gunzip "${tarfile}" || die
-	fi
-}

diff --git a/sys-devel/automake/automake-1.4_p6-r2.ebuild b/sys-devel/automake/automake-1.4_p6-r2.ebuild
deleted file mode 100644
index 47f6590cfc3..00000000000
--- a/sys-devel/automake/automake-1.4_p6-r2.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="${P/_/-}"
-DESCRIPTION="Used to generate Makefile.in from Makefile.am"
-HOMEPAGE="https://www.gnu.org/software/automake/"
-SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-# Use Gentoo versioning for slotting.
-SLOT="${PV:0:3}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-IUSE=""
-
-RDEPEND="dev-lang/perl
-	>=sys-devel/automake-wrapper-10
-	>=sys-devel/autoconf-2.69:*
-	sys-devel/gnuconfig"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4-nls-nuisances.patch #121151
-	"${FILESDIR}"/${PN}-1.4-libtoolize.patch
-	"${FILESDIR}"/${PN}-1.4-subdirs-89656.patch
-	"${FILESDIR}"/${PN}-1.4-ansi2knr-stdlib.patch
-	"${FILESDIR}"/${PN}-1.4-CVE-2009-4029.patch #295357
-	"${FILESDIR}"/${PN}-1.4-perl-5.11.patch
-	"${FILESDIR}"/${PN}-1.4-perl-dyn-call.patch
-)
-
-src_prepare() {
-	default
-	export WANT_AUTOCONF=2.5
-	sed -i 's:error\.test::' tests/Makefile.in #79529
-}
-
-# 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 || die
-
-	# 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() {
-	emake install DESTDIR="${D}" \
-		pkgdatadir=/usr/share/automake-${SLOT} \
-		m4datadir=/usr/share/aclocal-${SLOT}
-	slot_info_pages
-	rm -f "${ED}"/usr/bin/{aclocal,automake} || die
-	dosym automake-${SLOT} /usr/share/automake
-
-	dodoc NEWS README THANKS TODO AUTHORS ChangeLog
-
-	# 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.5-r2.ebuild b/sys-devel/automake/automake-1.5-r2.ebuild
deleted file mode 100644
index 740ac091ff4..00000000000
--- a/sys-devel/automake/automake-1.5-r2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Used to generate Makefile.in from Makefile.am"
-HOMEPAGE="https://www.gnu.org/software/automake/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-# Use Gentoo versioning for slotting.
-SLOT="${PV:0:3}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-IUSE=""
-
-RDEPEND="dev-lang/perl
-	>=sys-devel/automake-wrapper-10
-	>=sys-devel/autoconf-2.69:*
-	sys-devel/gnuconfig"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/automake-1.4-nls-nuisances.patch #121151
-	"${FILESDIR}"/${P}-target_hook.patch
-	"${FILESDIR}"/${P}-slot.patch
-	"${FILESDIR}"/${P}-test-fixes.patch #79505
-	"${FILESDIR}"/${PN}-1.10-ccnoco-ldflags.patch #203914
-	"${FILESDIR}"/${P}-CVE-2009-4029.patch #295357
-	"${FILESDIR}"/${PN}-1.5-perl-5.11.patch
-)
-
-src_prepare() {
-	default
-	export WANT_AUTOCONF=2.5
-}
-
-# 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 || die
-
-	# 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
-
-	local x
-	for x in aclocal automake ; do
-		mv "${ED}"/usr/bin/${x}{,-${SLOT}} || die
-		mv "${ED}"/usr/share/${x}{,-${SLOT}} || die
-	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.6.3-r2.ebuild b/sys-devel/automake/automake-1.6.3-r2.ebuild
deleted file mode 100644
index 2f292029568..00000000000
--- a/sys-devel/automake/automake-1.6.3-r2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 sparc x86"
-IUSE=""
-
-RDEPEND="dev-lang/perl
-	>=sys-devel/automake-wrapper-10
-	>=sys-devel/autoconf-2.69:*
-	sys-devel/gnuconfig"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-test-fixes.patch #159557
-	"${FILESDIR}"/${PN}-1.10-ccnoco-ldflags.patch #203914
-	"${FILESDIR}"/${PN}-1.5-CVE-2009-4029.patch #295357
-	"${FILESDIR}"/${PN}-1.5-perl-5.11.patch
-)
-
-src_prepare() {
-	default
-	export WANT_AUTOCONF=2.5
-}
-
-# 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 || die
-
-	# 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 -f "${ED}"/usr/bin/{aclocal,automake} || 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.7.9-r3.ebuild b/sys-devel/automake/automake-1.7.9-r3.ebuild
deleted file mode 100644
index 8ec3a1b1d3a..00000000000
--- a/sys-devel/automake/automake-1.7.9-r3.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 sparc x86"
-IUSE=""
-
-RDEPEND="dev-lang/perl
-	>=sys-devel/automake-wrapper-10
-	>=sys-devel/autoconf-2.69:*
-	sys-devel/gnuconfig"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-infopage-namechange.patch
-	"${FILESDIR}"/${P}-test-fixes.patch
-	"${FILESDIR}"/${PN}-1.9.6-subst-test.patch #222225
-	"${FILESDIR}"/${P}-libtool-2.patch #257544
-	"${FILESDIR}"/${PN}-1.10-ccnoco-ldflags.patch #203914
-	"${FILESDIR}"/${PN}-1.5-CVE-2009-4029.patch #295357
-	"${FILESDIR}"/${PN}-1.5-perl-5.11.patch
-)
-
-src_prepare() {
-	default
-	export WANT_AUTOCONF=2.5
-}
-
-# 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 || die
-
-	# 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 -f "${ED}"/usr/bin/{aclocal,automake} || 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.8.5-r5.ebuild b/sys-devel/automake/automake-1.8.5-r5.ebuild
deleted file mode 100644
index 6c6447a52c0..00000000000
--- a/sys-devel/automake/automake-1.8.5-r5.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 sparc x86"
-IUSE=""
-
-RDEPEND="dev-lang/perl
-	>=sys-devel/automake-wrapper-10
-	>=sys-devel/autoconf-2.69:*
-	sys-devel/gnuconfig"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.8.2-infopage-namechange.patch
-	"${FILESDIR}"/${P}-test-fixes.patch #159557
-	"${FILESDIR}"/${PN}-1.9.6-aclocal7-test-sleep.patch #197366
-	"${FILESDIR}"/${PN}-1.9.6-subst-test.patch #222225
-	"${FILESDIR}"/${PN}-1.10-ccnoco-ldflags.patch #203914
-	"${FILESDIR}"/${P}-CVE-2009-4029.patch #295357
-	"${FILESDIR}"/${PN}-1.8-perl-5.11.patch
-)
-
-src_prepare() {
-	default
-	export WANT_AUTOCONF=2.5
-}
-
-# 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 || die
-
-	# 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 -f "${ED}"/usr/bin/{aclocal,automake} || 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.9.6-r5.ebuild b/sys-devel/automake/automake-1.9.6-r5.ebuild
deleted file mode 100644
index ef506d0fa07..00000000000
--- a/sys-devel/automake/automake-1.9.6-r5.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 sparc x86"
-IUSE=""
-RESTRICT="test"
-
-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"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.9.6-infopage-namechange-r1.patch
-	"${FILESDIR}"/${P}-include-dir-prefix-r1.patch #107435
-	"${FILESDIR}"/${P}-ignore-comments-r1.patch #126388
-	"${FILESDIR}"/${P}-aclocal7-test-sleep.patch #197366
-	"${FILESDIR}"/${PN}-1.9.6-subst-test.patch #222225
-	"${FILESDIR}"/${PN}-1.10-ccnoco-ldflags.patch #203914
-	"${FILESDIR}"/${PN}-1.8.5-CVE-2009-4029.patch #295357
-	"${FILESDIR}"/${PN}-1.8-perl-5.11.patch
-)
-
-src_prepare() {
-	default
-	export WANT_AUTOCONF=2.5
-}
-
-# 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 || die
-
-	# 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
-
-	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/files/automake-1.10-ccnoco-ldflags.patch b/sys-devel/automake/files/automake-1.10-ccnoco-ldflags.patch
deleted file mode 100644
index f48c6304bdc..00000000000
--- a/sys-devel/automake/files/automake-1.10-ccnoco-ldflags.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-http://bugs.gentoo.org/203914
-
-From 6e86514729c6dccb6213fdde8d93d7061c8108a5 Mon Sep 17 00:00:00 2001
-From: Ralf Wildenhues <Ralf.Wildenhues@×××.de>
-Date: Mon, 7 Jan 2008 21:53:38 +0100
-Subject: [PATCH] Fix ccnoco.test for uncommon LDFLAGS settings.
-
-* tests/ccnoco.test (Mycomp): Use a tighter match for -c -o,
-to avoid matching for example `LDFLAGS=-Wl,--sort-common'.
-* THANKS: Update.
-Report and analysis by Carsten Lohrke and Mike Frysinger.
----
- ChangeLog         |    7 +++++++
- THANKS            |    1 +
- tests/ccnoco.test |    6 +++---
- 3 files changed, 11 insertions(+), 3 deletions(-)
-
-diff --git a/tests/ccnoco.test b/tests/ccnoco.test
-index 8b37fe8..ca75922 100755
---- a/tests/ccnoco.test
-+++ b/tests/ccnoco.test
-@@ -57,8 +57,8 @@ END
- cat > Mycomp << 'END'
- #!/bin/sh
- 
--case "$@" in
-- *-c*-o* | *-o*-c*)
-+case " "$* in
-+ *\ -c*\ -o* | *\ -o*\ -c*)
-     exit 1
-     ;;
- esac
--- 
-1.6.3
-

diff --git a/sys-devel/automake/files/automake-1.14-gzip-fix.patch b/sys-devel/automake/files/automake-1.14-gzip-fix.patch
deleted file mode 100644
index 39c201aba65..00000000000
--- a/sys-devel/automake/files/automake-1.14-gzip-fix.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-commit 749468ac63042820bc3da85ece5bed64b0c15d62
-Author: Paul Eggert <eggert at>
-Date:   Mon Mar 28 19:44:19 2016 -0700
-
-    automake: port better to future gzip
-    
-    * lib/am/distdir.am (dist-gzip, dist-shar, distcheck):
-    Port better to future versions of gzip, which are planned to
-    deprecate the GZIP environment variable (Bug#20132).
-
-diff --git a/lib/am/distdir.am b/lib/am/distdir.am
-index d4dd8cc9b..87c6730f5 100644
---- a/lib/am/distdir.am
-+++ b/lib/am/distdir.am
-@@ -309,6 +309,16 @@ endif %?TOPDIR_P%
- ## We order DIST_TARGETS by expected duration of the compressors,
- ## slowest first, for better parallelism in "make dist".  Do not
- ## reorder DIST_ARCHIVES, users may expect gzip to be first.
-+##
-+## Traditionally, gzip prepended the contents of the GZIP environment
-+## variable to its arguments, and the commands below formerly used
-+## this by invoking 'GZIP=$(GZIP_ENV) gzip'.  The GZIP environment
-+## variable is now considered to be obsolescent, so the commands below
-+## now use 'eval GZIP= gzip $(GZIP_ENV)' instead; this should work
-+## with both older and newer gzip implementations.  The 'eval' is to
-+## support makefile assignments like 'GZIP_ENV = "-9 -n"' that quote
-+## the GZIP_ENV right-hand side because that was needed with the
-+## former invocation pattern.
- 
- if %?TOPDIR_P%
- 
-@@ -316,7 +326,7 @@ if %?TOPDIR_P%
- GZIP_ENV = --best
- .PHONY: dist-gzip
- dist-gzip: distdir
--	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-+	tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
- 	$(am__post_remove_distdir)
- 
- ?BZIP2?DIST_ARCHIVES += $(distdir).tar.bz2
-@@ -352,7 +362,7 @@ dist-shar: distdir
- 	@echo WARNING: "Support for shar distribution archives is" \
- 	               "deprecated." >&2
- 	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
--	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-+	shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
- 	$(am__post_remove_distdir)
- 
- ?ZIP?DIST_ARCHIVES += $(distdir).zip
-@@ -412,7 +422,7 @@ endif %?SUBDIRS%
- distcheck: dist
- 	case '$(DIST_ARCHIVES)' in \
- 	*.tar.gz*) \
--	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
-+	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
- 	*.tar.bz2*) \
- 	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
- 	*.tar.lz*) \
-@@ -422,7 +432,7 @@ distcheck: dist
- 	*.tar.Z*) \
- 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
- 	*.shar.gz*) \
--	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
-+	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
- 	*.zip*) \
- 	  unzip $(distdir).zip ;;\
- 	esac

diff --git a/sys-devel/automake/files/automake-1.4-CVE-2009-4029.patch b/sys-devel/automake/files/automake-1.4-CVE-2009-4029.patch
deleted file mode 100644
index 42aef8c8e1b..00000000000
--- a/sys-devel/automake/files/automake-1.4-CVE-2009-4029.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-http://bugs.gentoo.org/295357
-
-(Makefile.in mangled a little for 1.4_p6)
-
-From 449d20aa12e13fefd848604225fc83d0c39c61d0 Mon Sep 17 00:00:00 2001
-From: Jim Meyering <meyering@××××××.com>
-Date: Tue, 1 Dec 2009 22:48:15 +0100
-Subject: [PATCH 1/1] do not put world-writable directories in distribution tarballs
-
-* automake.in (handle_dist_worker): Do not make all directories
-group- or world-writable.  Instead, use 755.
-
-Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@×××.de>
----
- Makefile.in |    4 ++--
- automake.in |    4 ++--
- 4 files changed, 14 insertions(+), 4 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 93da407..59eb9f4 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -456,7 +456,7 @@ dist-all: distdir
- distdir: $(DISTFILES)
- 	-rm -rf $(distdir)
- 	mkdir $(distdir)
--	-chmod 777 $(distdir)
-+	-chmod 755 $(distdir)
- 	@for file in $(DISTFILES); do \
- 	  d=$(srcdir); \
- 	  if test -d $$d/$$file; then \
-@@ -477,7 +477,7 @@ distdir: $(DISTFILES)
- 	    test -d $(distdir)/$$subdir \
- 	    || mkdir $(distdir)/$$subdir \
- 	    || exit 1; \
--	    chmod 777 $(distdir)/$$subdir; \
-+	    chmod 755 $(distdir)/$$subdir; \
- 	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
- 	      || exit 1; \
- 	  fi; \
-diff --git a/automake.in b/automake.in
-index 8eceea7..8f48236 100755
---- a/automake.in
-+++ b/automake.in
-@@ -2336,7 +2336,7 @@ sub handle_dist_worker
- 	# Create dist directory.
- 	$output_rules .= ("\t-rm -rf \$(distdir)\n"
- 			  . "\tmkdir \$(distdir)\n"
--			  . "\t-chmod 777 \$(distdir)\n");
-+			  . "\t-chmod 755 \$(distdir)\n");
-     }
- 
-     # Only run automake in `dist' target if --include-deps and
-@@ -2468,7 +2468,7 @@ sub handle_dist_worker
- 	     . "\t" . '    test -d $(distdir)/$$subdir ' . "\\\n"
- 	     . "\t" . '    || mkdir $(distdir)/$$subdir ' . "\\\n"
- 	     . "\t" . '    || exit 1; ' . "\\\n"
--	     . "\t" . '    chmod 777 $(distdir)/$$subdir; ' . "\\\n"
-+	     . "\t" . '    chmod 755 $(distdir)/$$subdir; ' . "\\\n"
- 	     . "\t" . '    (cd $$subdir'
- 	     . ' && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$('
- 	     . (($relative_dir eq '.') ? 'distdir' : 'top_distdir')
--- 
-1.6.5.4
-

diff --git a/sys-devel/automake/files/automake-1.4-ansi2knr-stdlib.patch b/sys-devel/automake/files/automake-1.4-ansi2knr-stdlib.patch
deleted file mode 100644
index 62a076107ee..00000000000
--- a/sys-devel/automake/files/automake-1.4-ansi2knr-stdlib.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/ansi2knr.c
-+++ b/ansi2knr.c
-@@ -132,7 +132,7 @@
- 
- #endif /* not HAVE_CONFIG_H */
- 
--#if STDC_HEADERS
-+#if STDC_HEADERS || HAVE_STDLIB_H
- # include <stdlib.h>
- #else
- /*

diff --git a/sys-devel/automake/files/automake-1.4-libtoolize.patch b/sys-devel/automake/files/automake-1.4-libtoolize.patch
deleted file mode 100644
index 3e818ca960b..00000000000
--- a/sys-devel/automake/files/automake-1.4-libtoolize.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Patch from redhat/fedora which made it into upstream.
-
---- a/automake.in
-+++ b/automake.in
-@@ -6882,9 +6882,11 @@
- 		    $suppress = 1;
- 
- 		    # Maybe run libtoolize.
-+		    @libtoolize_args = ('--automake');
-+		    push @libtoolize_args, '-c'  if $copy_missing;
- 		    if ($seen_libtool
- 			&& grep ($_ eq $file, @libtoolize_files)
--			&& system ('libtoolize', '--automake'))
-+			&& system ('libtoolize', @libtoolize_args))
- 		    {
- 			$message = "installing \`$errfile'";
- 			$suppress = 0;

diff --git a/sys-devel/automake/files/automake-1.4-nls-nuisances.patch b/sys-devel/automake/files/automake-1.4-nls-nuisances.patch
deleted file mode 100644
index d84d29698e6..00000000000
--- a/sys-devel/automake/files/automake-1.4-nls-nuisances.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/configure
-+++ b/configure
-@@ -46,6 +46,16 @@
- infodir='${prefix}/info'
- mandir='${prefix}/man'
- 
-+# NLS nuisances.
-+# Only set these to C if already set.  These must not be set unconditionally
-+# because not all systems understand e.g. LANG=C (notably SCO).
-+# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-+# Non-C LC_CTYPE values break the ctype check.
-+if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-+if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-+if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-+if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
-+
- # Initialize some other variables.
- subdirs=
- MFLAGS= MAKEFLAGS=

diff --git a/sys-devel/automake/files/automake-1.4-perl-5.11.patch b/sys-devel/automake/files/automake-1.4-perl-5.11.patch
deleted file mode 100644
index f0423a64fbb..00000000000
--- a/sys-devel/automake/files/automake-1.4-perl-5.11.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 375912c466b28a6121d351b9ff5513133a1c7227 Mon Sep 17 00:00:00 2001
-From: Jim Meyering <meyering@××××××.com>
-Date: Sun, 29 Nov 2009 20:35:03 +0100
-Subject: [PATCH] avoid a warning from perl-5.11
-
-* lib/Automake/Wrap.pm (_tab_length): Remove useless use of tr's
-"/d" modifier.
-
-Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@×××.de>
----
- ChangeLog            | 6 ++++++
- lib/Automake/Wrap.pm | 2 +-
- 2 files changed, 7 insertions(+), 1 deletion(-)
-
---- a/automake.in
-+++ b/automake.in
-@@ -5126,7 +5126,7 @@ sub pretty_print_internal
-     # character counts for eight.  So we count the number of Tabs and
-     # multiply by 7.
-     local ($fill_length) = length ($fill);
--    $fill_length += 7 * ($fill =~ tr/\t/\t/d);
-+    $fill_length += 7 * ($fill =~ tr/\t/\t/);
- 
-     local ($bol) = ($head eq '');
-     foreach (@values)
--- 
-2.1.3
-

diff --git a/sys-devel/automake/files/automake-1.4-perl-dyn-call.patch b/sys-devel/automake/files/automake-1.4-perl-dyn-call.patch
deleted file mode 100644
index 9a140aa5051..00000000000
--- a/sys-devel/automake/files/automake-1.4-perl-dyn-call.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-at some point, a perl update broke this syntax.  use a newer style that works
-with at least perl-5.16.
-
---- a/automake.in
-+++ b/automake.in
-@@ -983,7 +983,7 @@ sub finish_languages
- 
- 	# Compute the function name of the finisher and then call it.
- 	$name = 'lang_' . $lang . '_finish';
--	do $name ();
-+	&$name ();
-     }
- 
-     # If the project is entirely C++ or entirely Fortran 77, don't
-@@ -1144,7 +1144,7 @@ sub handle_single_transform_list
- 		# Found the language, so see what it says.
- 		local ($subr) = 'lang_' . $lang . '_rewrite';
- 		# Note: computed subr call.
--		local ($r) = do $subr ($base, $extension);
-+		local ($r) = &$subr ($base, $extension);
- 		# Skip this entry if we were asked not to process it.
- 		next if ! $r;
- 

diff --git a/sys-devel/automake/files/automake-1.4-subdirs-89656.patch b/sys-devel/automake/files/automake-1.4-subdirs-89656.patch
deleted file mode 100644
index 7500fc98d9a..00000000000
--- a/sys-devel/automake/files/automake-1.4-subdirs-89656.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Patch from redhat/fedora which made it into upstream.
-
---- automake-1.4-p6/subdirs.am.subdirs	2001-07-16 22:47:36.000000000 -0700
-+++ automake-1.4-p6/subdirs.am	2003-04-25 08:24:35.000000000 -0700
-@@ -27,7 +27,7 @@
- all-recursive install-data-recursive install-exec-recursive \
- installdirs-recursive install-recursive uninstall-recursive @INSTALLINFO@ \
- check-recursive installcheck-recursive info-recursive dvi-recursive:
--	@set fnord $(MAKEFLAGS); amf=$$2; \
-+	@set fnord $$MAKEFLAGS; amf=$$2; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -55,7 +55,7 @@ check-recursive installcheck-recursive i
- ## bombs.
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $(MAKEFLAGS); amf=$$2; \
-+	@set fnord $$MAKEFLAGS; amf=$$2; \
- 	dot_seen=no; \
- 	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
- 	  rev="$$subdir $$rev"; \

diff --git a/sys-devel/automake/files/automake-1.5-CVE-2009-4029.patch b/sys-devel/automake/files/automake-1.5-CVE-2009-4029.patch
deleted file mode 100644
index d91139b3017..00000000000
--- a/sys-devel/automake/files/automake-1.5-CVE-2009-4029.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-http://bugs.gentoo.org/295357
-
-From b1c42762931e9cd03aee3e4b4284dc2920c9eabc Mon Sep 17 00:00:00 2001
-From: Jim Meyering <meyering@××××××.com>
-Date: Tue, 1 Dec 2009 22:48:15 +0100
-Subject: [PATCH 1/1] do not put world-writable directories in distribution tarballs
-
-* lib/am/distdir.am (distdir): Do not make all directories
-group- or world-writable.  Instead, use 755.
-
-Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@×××.de>
----
- Makefile.in       |    3 ++-
- lib/am/distdir.am |    9 +++------
- 4 files changed, 15 insertions(+), 7 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index ebbfd2f..76991db 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -379,7 +379,8 @@ distdir: $(DISTFILES)
- 	$(MAKE) $(AM_MAKEFLAGS) \
- 	  top_distdir="${top_distdir}" distdir="$(distdir)" \
- 	  dist-info
--	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
-+	-find "$(distdir)" -type d ! -perm -755 \
-+		-exec chmod u+rwx,go+rx {} \; -o \
- 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
- 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
- 	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
-diff --git a/lib/am/distdir.am b/lib/am/distdir.am
-index e808966..0a01c4e 100644
---- a/lib/am/distdir.am
-+++ b/lib/am/distdir.am
-@@ -127,11 +127,7 @@ if %?DIST-TARGETS%
- endif %?DIST-TARGETS%
- ##
- ## This complex find command will try to avoid changing the modes of
--## links into the source tree, in case they're hard-linked.  It will
--## also make directories writable by everybody, because some
--## brain-dead tar implementations change ownership and permissions of
--## a directory before extracting the files, thus becoming unable to
--## extract them.
-+## links into the source tree, in case they're hard-linked.
- ##
- ## Ignore return result from chmod, because it might give an error
- ## if we chmod a symlink.
-@@ -144,7 +140,8 @@ endif %?DIST-TARGETS%
- ## the file in place in the source tree.
- ##
- if %?TOPDIR_P%
--	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
-+	-find "$(distdir)" -type d ! -perm -755 \
-+		-exec chmod u+rwx,go+rx {} \; -o \
- 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
- 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
- 	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
--- 
-1.6.5.4
-

diff --git a/sys-devel/automake/files/automake-1.5-perl-5.11.patch b/sys-devel/automake/files/automake-1.5-perl-5.11.patch
deleted file mode 100644
index 1ee36468c31..00000000000
--- a/sys-devel/automake/files/automake-1.5-perl-5.11.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 375912c466b28a6121d351b9ff5513133a1c7227 Mon Sep 17 00:00:00 2001
-From: Jim Meyering <meyering@××××××.com>
-Date: Sun, 29 Nov 2009 20:35:03 +0100
-Subject: [PATCH] avoid a warning from perl-5.11
-
-* lib/Automake/Wrap.pm (_tab_length): Remove useless use of tr's
-"/d" modifier.
-
-Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@×××.de>
----
- ChangeLog            | 6 ++++++
- lib/Automake/Wrap.pm | 2 +-
- 2 files changed, 7 insertions(+), 1 deletion(-)
-
---- a/automake.in
-+++ b/automake.in
-@@ -5277,7 +5277,7 @@ sub pretty_print_internal
-     # character counts for eight.  So we count the number of Tabs and
-     # multiply by 7.
-     my $fill_length = length ($fill);
--    $fill_length += 7 * ($fill =~ tr/\t/\t/d);
-+    $fill_length += 7 * ($fill =~ tr/\t/\t/);
- 
-     foreach (@values)
-     {
--- 
-2.1.3
-

diff --git a/sys-devel/automake/files/automake-1.5-slot.patch b/sys-devel/automake/files/automake-1.5-slot.patch
deleted file mode 100644
index 640e73c7b79..00000000000
--- a/sys-devel/automake/files/automake-1.5-slot.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/aclocal.in
-+++ b/aclocal.in
-@@ -33,5 +33,5 @@
- $prefix = "@prefix@";
- # Note that this isn't pkgdatadir, but a separate directory.
--$acdir = "@datadir@/aclocal";
-+$acdir = "@datadir@/aclocal-1.5";
- 
- # Some globals.
-@@ -116,4 +116,5 @@
- 
- local (@dirlist) = &parse_arguments (@ARGV);
-+push (@dirlist, "/usr/share/aclocal") if (!grep(/^--acdir/, @ARGV));
- &scan_m4_files (@dirlist);
- &scan_configure;
-@@ -203,5 +204,5 @@
-     if ($print_and_exit)
-     {
--	print $acdir, "\n";
-+	print "/usr/share/aclocal", "\n";
- 	exit 0;
-     }
---- a/automake.in
-+++ b/automake.in
-@@ -32,7 +32,7 @@
- BEGIN
- {
-   my $prefix = "@prefix@";
--  my $perllibdir = $ENV{'perllibdir'} || "@datadir@/@PACKAGE@";
-+  my $perllibdir = $ENV{'perllibdir'} || "@datadir@/@PACKAGE@-1.5";
-   unshift @INC, "$perllibdir";
- }
- 
-@@ -127,7 +127,7 @@
- my $VERSION = "@VERSION@";
- my $PACKAGE = "@PACKAGE@";
- my $prefix = "@prefix@";
--my $libdir = "@datadir@/@PACKAGE@";
-+my $libdir = "@datadir@/@PACKAGE@-1.5";
- 
- # String constants.
- my $IGNORE_PATTERN = '^\s*##([^#\n].*)?\n';

diff --git a/sys-devel/automake/files/automake-1.5-target_hook.patch b/sys-devel/automake/files/automake-1.5-target_hook.patch
deleted file mode 100644
index 5f3bdb1f06c..00000000000
--- a/sys-devel/automake/files/automake-1.5-target_hook.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-*** automake-1.5/automake.in
---- automake-1.5/automake.in
-***************
-*** 1941,1945 ****
-  
-  	# Let the language do some special magic if required.
-! 	$lang->target_hook ($aggregate, $object, $full);
-  
-  	if ($derived_source)
---- 1941,1947 ----
-  
-  	# Let the language do some special magic if required.
-! 	if (defined $lang) {
-! 		$lang->target_hook ($aggregate, $object, $full);
-! 	}
-  
-  	if ($derived_source)
-*** automake-1.5/m4/depout.m4
---- automake-1.5/m4/depout.m4
-***************
-*** 13,18 ****
-  for mf in $CONFIG_FILES; do
-    case "$mf" in
-!   Makefile) dirpart=.;;
-!   */Makefile) dirpart=`echo "$mf" | sed -e 's|/[^/]*$||'`;;
-    *) continue;;
-    esac
---- 13,18 ----
-  for mf in $CONFIG_FILES; do
-    case "$mf" in
-!   Makefile|GNUmakefile) dirpart=.;;
-!   */Makefile|*/GNUmakefile) dirpart=`echo "$mf" | sed -e 's|/[^/]*$||'`;;
-    *) continue;;
-    esac

diff --git a/sys-devel/automake/files/automake-1.5-test-fixes.patch b/sys-devel/automake/files/automake-1.5-test-fixes.patch
deleted file mode 100644
index 8f34a793e45..00000000000
--- a/sys-devel/automake/files/automake-1.5-test-fixes.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-Fix the tests so they don't fail :)
-http://bugs.gentoo.org/79505
-
-insthook:
-update the head/tail syntax since coreutils has deprecated the old style
-
-dirname:
-just disable the pos
-
-ccnoco:
-rip patches from fedora
-
-depcomp2: #181484
-fix false positive when using newer autoconf -- it throws a warning based
-on dataroot which causes a failure when there was none
-
---- automake-1.5/tests/insthook.test
-+++ automake-1.5/tests/insthook.test
-@@ -17 +17 @@
--test x$lnum != x && tail +$lnum Makefile.in | head -3 | grep install-exec-hook
-+test x$lnum != x && tail -n +$lnum Makefile.in | head -n 3 | grep install-exec-hook
---- automake-1.5/tests/dirname.test
-+++ automake-1.5/tests/dirname.test
-@@ -1,2 +1,3 @@
- #! /bin/sh
-+exit 0
- 
---- automake-1.5/tests/ccnoco.test
-+++ automake-1.5/tests/ccnoco.test
-@@ -39,7 +39,6 @@
- }
- END
- 
--$needs_autoconf
- gcc -v || exit 77
- 
- cat > Mycomp << 'END'
-@@ -51,7 +50,7 @@
-     ;;
- esac
- 
--exec gcc ${1+"$@"}
-+exec gcc "$@"
- END
- 
- chmod +x Mycomp
-@@ -59,6 +58,10 @@
- set -e
- 
- 
-+# Ignore user CFLAGS.
-+CFLAGS=
-+export CFLAGS
-+
- for conf in configure.1 configure.3; do
-    cp $conf configure.in
- 
---- automake-1.5/tests/depcomp2.test
-+++ automake-1.5/tests/depcomp2.test
-@@ -17,4 +17,5 @@
- cat > Makefile.am << 'END'
- SUBDIRS = subdir
-+datarootdir = @datarootdir@
- END
- 

diff --git a/sys-devel/automake/files/automake-1.6.3-test-fixes.patch b/sys-devel/automake/files/automake-1.6.3-test-fixes.patch
deleted file mode 100644
index 666517754a9..00000000000
--- a/sys-devel/automake/files/automake-1.6.3-test-fixes.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Fix the tests so they don't fail :)
-
-depcomp2: #159557 #181484
-fix false positive when using newer autoconf -- it throws a warning based
-on dataroot which causes a failure when there was none
-
-man2: #159557
-grab update from newer automake
-
---- automake-1.6.3/tests/depcomp2.test
-+++ automake-1.6.3/tests/depcomp2.test
-@@ -17,4 +17,5 @@
- cat > Makefile.am << 'END'
- SUBDIRS = subdir
-+datarootdir = @datarootdir@
- END
- 
---- automake-1.6.3/tests/man2.test
-+++ automake-1.6.3/tests/man2.test
-@@ -23,7 +23,7 @@
- $AUTOMAKE
- 
- # Let's play with $DESTDIR too, it shouldn't hurt.
--./configure --prefix=''
-+./configure --prefix='' --mandir=/man
- DESTDIR="`pwd`/=inst" $MAKE -e SHELL=/bin/sh install
- 
- test -f ./=inst/man/man2/foo.2

diff --git a/sys-devel/automake/files/automake-1.7.9-infopage-namechange.patch b/sys-devel/automake/files/automake-1.7.9-infopage-namechange.patch
deleted file mode 100644
index bb1c2117517..00000000000
--- a/sys-devel/automake/files/automake-1.7.9-infopage-namechange.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -199,8 +199,9 @@
- 
- .texi.info:
- 	@rm -f $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]
--	$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
--	 -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-+	cd $(srcdir) \
-+		&& $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \
-+			`echo $< | sed 's,.*/,,'`
- 
- .texi.dvi:
- 	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
- 	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \

diff --git a/sys-devel/automake/files/automake-1.7.9-libtool-2.patch b/sys-devel/automake/files/automake-1.7.9-libtool-2.patch
deleted file mode 100644
index ad1d75d8caa..00000000000
--- a/sys-devel/automake/files/automake-1.7.9-libtool-2.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-fixup tests w/libtool-2
-
-https://bugs.gentoo.org/257544
-
---- automake-1.7.9/tests/libtool5.test
-+++ automake-1.7.9/tests/libtool5.test
-@@ -45,5 +45,6 @@
- END
- 
- libtoolize
-+[ -e config.guess ] || libtoolize --install
- $ACLOCAL
- $AUTOMAKE
---- automake-1.7.9/tests/ltcond2.test
-+++ automake-1.7.9/tests/ltcond2.test
-@@ -73,6 +73,7 @@
- echo 'int main() { print(); return 0; }' >main.c
- 
- libtoolize
-+[ -e config.guess ] || libtoolize --install
- $ACLOCAL
- $AUTOCONF
- $AUTOMAKE
---- automake-1.7.9/tests/ltcond.test
-+++ automake-1.7.9/tests/ltcond.test
-@@ -62,6 +62,7 @@
- mkdir empty
- 
- libtoolize
-+[ -e config.guess ] || libtoolize --install
- $ACLOCAL
- $AUTOCONF
- $AUTOMAKE
---- automake-1.7.9/tests/ltconv.test
-+++ automake-1.7.9/tests/ltconv.test
-@@ -111,6 +111,7 @@
- EOF
- 
- libtoolize
-+[ -e config.guess ] || libtoolize --install
- $ACLOCAL
- $AUTOCONF
- $AUTOMAKE

diff --git a/sys-devel/automake/files/automake-1.7.9-test-fixes.patch b/sys-devel/automake/files/automake-1.7.9-test-fixes.patch
deleted file mode 100644
index 00854886d66..00000000000
--- a/sys-devel/automake/files/automake-1.7.9-test-fixes.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Fix the tests so they don't fail :)
-
-exdir2 man2 transform: #159557 #162565
-grab updates from newer automake
-
-mkdir-tests.m4:
-when mixing newer gettext with this automake, the tests bomb out
-as AM_PROG_MKDIR_P is not provided properly
-
---- automake-1.7.9/tests/man2.test
-+++ automake-1.7.9/tests/man2.test
-@@ -41,7 +41,7 @@
- $AUTOMAKE
- 
- # Let's play with $DESTDIR too, it shouldn't hurt.
--./configure --prefix=''
-+./configure --prefix='' --mandir=/man
- DESTDIR="`pwd`/_inst" $MAKE -e install
- 
- test -f ./_inst/man/man2/foo.2
---- automake-1.7.9/tests/transform.test
-+++ automake-1.7.9/tests/transform.test
-@@ -56,7 +56,7 @@
- $AUTOCONF
- $AUTOMAKE
- 
--./configure --program-prefix=gnu- --prefix `pwd`/inst
-+./configure --program-prefix=gnu- --prefix `pwd`/inst --mandir `pwd`/inst/man
- $MAKE
- $MAKE test-install
- $MAKE uninstall
---- automake-1.7.9/tests/exdir2.test
-+++ automake-1.7.9/tests/exdir2.test
-@@ -23,7 +23,7 @@
- . ./defs || exit 1
- 
- cat > Makefile.am << 'EOF'
--html_DATA = zot.html
-+quuz_DATA = zot.html
- pkgdata_DATA = qbert
- EOF
- 
---- automake-1.7.9/m4/mkdir-tests.m4
-+++ automake-1.7.9/m4/mkdir-tests.m4
-@@ -0,0 +1 @@
-+AC_DEFUN([AM_PROG_MKDIR_P])

diff --git a/sys-devel/automake/files/automake-1.8-perl-5.11.patch b/sys-devel/automake/files/automake-1.8-perl-5.11.patch
deleted file mode 100644
index 0808174f010..00000000000
--- a/sys-devel/automake/files/automake-1.8-perl-5.11.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 375912c466b28a6121d351b9ff5513133a1c7227 Mon Sep 17 00:00:00 2001
-From: Jim Meyering <meyering@××××××.com>
-Date: Sun, 29 Nov 2009 20:35:03 +0100
-Subject: [PATCH] avoid a warning from perl-5.11
-
-* lib/Automake/Wrap.pm (_tab_length): Remove useless use of tr's
-"/d" modifier.
-
-Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@×××.de>
----
- ChangeLog            | 6 ++++++
- lib/Automake/Wrap.pm | 2 +-
- 2 files changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/lib/Automake/Wrap.pm b/lib/Automake/Wrap.pm
-index 09a135a..66213d1 100644
---- a/lib/Automake/Wrap.pm
-+++ b/lib/Automake/Wrap.pm
-@@ -55,7 +55,7 @@ sub tab_length($)
- {
-   my ($txt) = @_;
-   my $len = length ($txt);
--  $len += 7 * ($txt =~ tr/\t/\t/d);
-+  $len += 7 * ($txt =~ tr/\t/\t/);
-   return $len;
- }
- 
--- 
-2.1.3
-

diff --git a/sys-devel/automake/files/automake-1.8.2-infopage-namechange.patch b/sys-devel/automake/files/automake-1.8.2-infopage-namechange.patch
deleted file mode 100644
index bc7d58ed35e..00000000000
--- a/sys-devel/automake/files/automake-1.8.2-infopage-namechange.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- automake-1.8.2/doc/Makefile.in	2004-02-03 21:59:01.585999688 +0200
-+++ automake-1.8.2.info/doc/Makefile.in	2004-02-03 22:04:03.893042032 +0200
-@@ -175,29 +175,10 @@
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- .texi.info:
--	restore=: && \
--	backupdir="$(am__leading_dot)am$$$$" && \
--	am__cwd=`pwd` && cd $(srcdir) && \
--	rm -rf $$backupdir && mkdir $$backupdir && \
--	for f in $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]; do \
--	  if test -f $$f; then \
--	    mv $$f $$backupdir; \
--	    restore=mv; \
--	  fi; \
--	done; \
--	cd "$$am__cwd"; \
--	if $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
--	 -o $@ $<; \
--	then \
--	  rc=0; \
--	  cd $(srcdir); \
--	else \
--	  rc=$$?; \
--	  cd $(srcdir) && \
--	  $$restore $$backupdir/* `echo "./$@" | sed 's|[^/]*$$||'`; \
--	fi; \
--	rm -rf $$backupdir; \
--	exit $$rc
-+	@rm -f $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]
-+	cd $(srcdir) \
-+		&& $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \
-+		`echo $< | sed 's,.*/,,'`
- 
- .texi.dvi:
- 	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \

diff --git a/sys-devel/automake/files/automake-1.8.5-CVE-2009-4029.patch b/sys-devel/automake/files/automake-1.8.5-CVE-2009-4029.patch
deleted file mode 100644
index 9e42e52c80b..00000000000
--- a/sys-devel/automake/files/automake-1.8.5-CVE-2009-4029.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-http://bugs.gentoo.org/295357
-
-From 4331fc7423036e68a9e480fb0ff56934b5d2be0e Mon Sep 17 00:00:00 2001
-From: Jim Meyering <meyering@××××××.com>
-Date: Tue, 1 Dec 2009 22:07:45 +0100
-Subject: [PATCH 1/1] do not put world-writable directories in distribution tarballs
-
-* lib/am/distdir.am (distdir): Do not make all directories
-group- or world-writable.  Instead, use 755.
-
-Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@×××.de>
----
- Makefile.in       |    3 ++-
- lib/am/distdir.am |    9 +++------
- 4 files changed, 17 insertions(+), 8 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index f6971b4..c753eaa 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -389,7 +389,8 @@ distdir: $(DISTFILES)
- 	      || exit 1; \
- 	  fi; \
- 	done
--	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
-+	-find "$(distdir)" -type d ! -perm -755 \
-+		-exec chmod u+rwx,go+rx {} \; -o \
- 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
- 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
- 	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
-diff --git a/lib/am/distdir.am b/lib/am/distdir.am
-index 0ed0593..91dbe6b 100644
---- a/lib/am/distdir.am
-+++ b/lib/am/distdir.am
-@@ -190,11 +190,7 @@ if %?DIST-TARGETS%
- endif %?DIST-TARGETS%
- ##
- ## This complex find command will try to avoid changing the modes of
--## links into the source tree, in case they're hard-linked.  It will
--## also make directories writable by everybody, because some
--## brain-dead tar implementations change ownership and permissions of
--## a directory before extracting the files, thus becoming unable to
--## extract them.
-+## links into the source tree, in case they're hard-linked.
- ##
- ## Ignore return result from chmod, because it might give an error
- ## if we chmod a symlink.
-@@ -207,7 +203,8 @@ endif %?DIST-TARGETS%
- ## the file in place in the source tree.
- ##
- if %?TOPDIR_P%
--	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
-+	-find "$(distdir)" -type d ! -perm -755 \
-+		-exec chmod u+rwx,go+rx {} \; -o \
- 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
- 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
- 	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
--- 
-1.6.5.4
-

diff --git a/sys-devel/automake/files/automake-1.8.5-test-fixes.patch b/sys-devel/automake/files/automake-1.8.5-test-fixes.patch
deleted file mode 100644
index 43290d1e0d4..00000000000
--- a/sys-devel/automake/files/automake-1.8.5-test-fixes.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Fix the tests so they don't fail :)
-
-exdir2 man2 transform: #159557 #162565
-grab updates from newer automake
-
---- automake-1.8.5/tests/man2.test
-+++ automake-1.8.5/tests/man2.test
-@@ -41,7 +41,7 @@
- $AUTOMAKE
- 
- # Let's play with $DESTDIR too, it shouldn't hurt.
--./configure --prefix=''
-+./configure --prefix='' --mandir=/man
- DESTDIR="`pwd`/_inst" $MAKE -e install
- 
- test -f ./_inst/man/man2/foo.2
---- automake-1.8.5/tests/transform.test
-+++ automake-1.8.5/tests/transform.test
-@@ -56,7 +56,7 @@
- $AUTOCONF
- $AUTOMAKE
- 
--./configure --program-prefix=gnu- --prefix `pwd`/inst
-+./configure --program-prefix=gnu- --prefix `pwd`/inst --mandir `pwd`/inst/man
- $MAKE
- $MAKE test-install
- $MAKE uninstall
---- automake-1.8.5/tests/exdir2.test
-+++ automake-1.8.5/tests/exdir2.test
-@@ -25,11 +25,11 @@
- set -e
- 
- cat > Makefile.am << 'EOF'
--html_DATA = zot.html
-+quuz_DATA = zot.html
- pkgdata_DATA = qbert
- EOF
- 
- $ACLOCAL
- AUTOMAKE_fails
- grep 'pkgdatadir' stderr && exit 1
--grep 'Makefile.am:1:.*htmldir.*undefined' stderr
-+grep 'Makefile.am:1:.*quuzdir.*undefined' stderr

diff --git a/sys-devel/automake/files/automake-1.9.6-aclocal7-test-sleep.patch b/sys-devel/automake/files/automake-1.9.6-aclocal7-test-sleep.patch
deleted file mode 100644
index ea2b227b8d4..00000000000
--- a/sys-devel/automake/files/automake-1.9.6-aclocal7-test-sleep.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-http://bugs.gentoo.org/197366
-
-commit 8952f7248c2637426bcf83d38f07a8b02124a06e
-Author: Ralf Wildenhues <Ralf.Wildenhues@×××.de>
-Date:   Wed May 10 20:50:53 2006 +0000
-
-    * tests/aclocal7.test: Add `$sleep's between file touching
-    and automake resp aclocal+automake invocations, to ensure
-    they complete with a time stamp strictly later than the touched
-    file.
-
-diff --git a/tests/aclocal7.test b/tests/aclocal7.test
-index 787565c..f6d5e31 100755
---- a/tests/aclocal7.test
-+++ b/tests/aclocal7.test
-@@ -89,6 +89,7 @@ test `ls -1t sub/Makefile.in foo | sed 1q` = sub/Makefile.in
- touch fragment.inc
- $sleep
- touch foo
-+$sleep
- $ACLOCAL -I m4
- $AUTOMAKE --no-force
- # Only ./Makefile.in should change.
-@@ -101,6 +102,7 @@ grep README Makefile.in && exit 1
- : > README
- $sleep
- touch foo
-+$sleep
- $AUTOMAKE --no-force
- # Even if no dependency change, the content changed.
- test `ls -1t Makefile.in foo | sed 1q` = Makefile.in
-@@ -111,6 +113,7 @@ grep README Makefile.in
- : > sub/Makefile.in
- $sleep
- touch foo
-+$sleep
- $ACLOCAL -I m4
- $AUTOMAKE --no-force
- # Only sub/Makefile.in should change.

diff --git a/sys-devel/automake/files/automake-1.9.6-ignore-comments-r1.patch b/sys-devel/automake/files/automake-1.9.6-ignore-comments-r1.patch
deleted file mode 100644
index da3f288d739..00000000000
--- a/sys-devel/automake/files/automake-1.9.6-ignore-comments-r1.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-http://bugs.gentoo.org/126388
-
-2006-03-16  Mike Frysinger  <vapier@g.o>
-
-	* aclocal.in (scan_configure_dep): Ignore ## lines.
-	(scan_file): Remove dnl and # comments.
-
---- a/aclocal.in
-+++ b/aclocal.in
-@@ -227,6 +227,8 @@
-   foreach (split ("\n", $contents))
-     {
-       ++$line;
-+      # Ignore `##' lines.
-+      next if /^##/;
-       # Remove comments from current line.
-       s/\bdnl\b.*$//;
-       s/\#.*$//;
-@@ -311,6 +313,10 @@
- 
-       $contents .= $_;
- 
-+      # Remove comments from current line.
-+      s/\bdnl\b.*$//;
-+      s/\#.*$//;
-+
-       while (/$ac_defun_rx/go)
- 	{
- 	  if (! defined $1)

diff --git a/sys-devel/automake/files/automake-1.9.6-include-dir-prefix-r1.patch b/sys-devel/automake/files/automake-1.9.6-include-dir-prefix-r1.patch
deleted file mode 100644
index a1cc613e880..00000000000
--- a/sys-devel/automake/files/automake-1.9.6-include-dir-prefix-r1.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-http://bugs.gentoo.org/107435
-http://lists.gnu.org/archive/html/automake/2005-09/msg00088.html
-
-2005-09-27  Stepan Kasal  <address@hidden>
-
-	* automake.in (handle_single_transform): Direct suffix rule preserves
-	  the directory prefix, so the generated object name should contain
-	  it, too.
-
---- a/automake.in	2005-09-17 15:05:39.000000000 +0200
-+++ b/automake.in	2005-09-27 17:10:47.000000000 +0200
-@@ -1755,6 +1755,10 @@
-             # This is probably the result of a direct suffix rule.
-             # In this case we just accept the rewrite.
-             $object = "$base$extension";
-+            if ($directory ne '')
-+            {
-+                $object = $directory . '/' . $object;
-+            }
-             $linker = '';
-         }
-         else
-@@ -1824,7 +1828,7 @@
- 
- 		# For Java, the way we're handling it right now, a
- 		# `..' component doesn't make sense.
--                if ($lang->name eq 'java' && $object =~ /(\/|^)\.\.\//)
-+                if ($lang && $lang->name eq 'java' && $object =~ /(\/|^)\.\.\//)
- 		  {
- 		    err_am "`$full' should not contain a `..' component";
- 		  }

diff --git a/sys-devel/automake/files/automake-1.9.6-infopage-namechange-r1.patch b/sys-devel/automake/files/automake-1.9.6-infopage-namechange-r1.patch
deleted file mode 100644
index d99c442e93a..00000000000
--- a/sys-devel/automake/files/automake-1.9.6-infopage-namechange-r1.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/doc/Makefile.in.orig	2005-07-11 00:39:31.000000000 -0400
-+++ b/doc/Makefile.in	2005-07-11 00:40:46.000000000 -0400
-@@ -187,26 +187,10 @@
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- .texi.info:
--	restore=: && backupdir="$(am__leading_dot)am$$$$" && \
--	am__cwd=`pwd` && cd $(srcdir) && \
--	rm -rf $$backupdir && mkdir $$backupdir && \
--	if ($(MAKEINFO) --version) >/dev/null 2>&1; then \
--	  for f in $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]; do \
--	    if test -f $$f; then mv $$f $$backupdir; restore=mv; else :; fi; \
--	  done; \
--	else :; fi && \
--	cd "$$am__cwd"; \
--	if $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
--	 -o $@ $<; \
--	then \
--	  rc=0; \
--	  cd $(srcdir); \
--	else \
--	  rc=$$?; \
--	  cd $(srcdir) && \
--	  $$restore $$backupdir/* `echo "./$@" | sed 's|[^/]*$$||'`; \
--	fi; \
--	rm -rf $$backupdir; exit $$rc
-+	@rm -f $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]
-+	cd $(srcdir) \
-+		&& $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \
-+		`echo $< | sed 's,.*/,,'`
- 
- .texi.dvi:
- 	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \

diff --git a/sys-devel/automake/files/automake-1.9.6-subst-test.patch b/sys-devel/automake/files/automake-1.9.6-subst-test.patch
deleted file mode 100644
index 6b794b1e137..00000000000
--- a/sys-devel/automake/files/automake-1.9.6-subst-test.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-https://bugs.gentoo.org/222225
-
-Patch from automake upstream git-repo to fix "make check" with newer versions of autoconf
-
-From: Ralf Wildenhues <Ralf.Wildenhues@×××.de>
-Date: Sun, 22 Jul 2007 09:06:23 +0000 (+0000)
-Subject: * tests/subst.test: Move the AC_SUBST into a macro definition.
-X-Git-Url: http://git.savannah.gnu.org/gitweb/?p=automake.git;a=commitdiff_plain;h=3d85de7baa9edf21c56401db3d25ef8a8e8d7797
-
-* tests/subst.test: Move the AC_SUBST into a macro definition.
-Avoids an error from CVS Autoconf.
-* THANKS: Update.
-Report by Benoit Sigoure.
----
-diff --git a/tests/subst.test b/tests/subst.test
-index 33e925d..a72af85 100755
---- a/tests/subst.test
-+++ b/tests/subst.test
-@@ -1,5 +1,5 @@
- #! /bin/sh
--# Copyright (C) 1996, 2001, 2002  Free Software Foundation, Inc.
-+# Copyright (C) 1996, 2001, 2002, 2007  Free Software Foundation, Inc.
- #
- # This file is part of GNU Automake.
- #
-@@ -24,8 +24,14 @@
- . ./defs || exit 1
- 
- cat >> configure.in << 'END'
--AC_SUBST($1)
--AC_SUBST([$]$1)  dnl this is the actual invocation that was used
-+dnl This test used to have the following lines, which cannot have
-+dnl worked sensibly with Autoconf for years, however:
-+dnl AC_SUBST($1)
-+dnl AC_SUBST([$]$1)  dnl this is the actual invocation that was used
-+dnl
-+AC_DEFUN([FOO],
-+[AC_SUBST([$1])])
-+FOO([BAR])
- END
- 
- : > Makefile.am