old

19 files changed, 15 insertions, 1320 deletions

diff --git a/sys-devel/autoconf/Manifest b/sys-devel/autoconf/Manifest
index cbbe8404e41b..ba19873779aa 100644
--- a/sys-devel/autoconf/Manifest
+++ b/sys-devel/autoconf/Manifest
@@ -1,25 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 0893e11f99229cc9dc06ecc7e4230634 ChangeLog 8888
-MD5 783162523dd92f0cf8f28fd35e43c7a9 autoconf-2.57-r1.ebuild 3195
-MD5 2d1737f84f7850beca2ebec100547cb1 autoconf-2.57a-r1.ebuild 3350
-MD5 08d9c9b51271a8545700a8d5cda4f53d autoconf-2.58-r1.ebuild 3461
-MD5 fc0263a13002802a60fa6f21253d55c8 autoconf-2.58.ebuild 3459
-MD5 6d9160afdf1af58dde216ef7a12ec3dd autoconf-2.59-r3.ebuild 3455
-MD5 e189b7fb5191eeedbcbe64f8f80422d8 autoconf-2.59-r4.ebuild 3446
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 1afb97b888b8302d8083fc7a794b0e39 files/ac-wrapper-2.pl 2527
-MD5 6a3f9163d26cfd51653d90bebda1cb5d files/ac-wrapper-3.pl 2769
-MD5 c07cd3cad0342c7c9ccafdb4f0ae8b03 files/ac-wrapper-4.pl 2785
-MD5 28795f22763ef0683a8a1e72e8dd4646 files/ac-wrapper.pl 2133
+MD5 8bb0853049d202422060f89c2a4b6917 autoconf-2.59-r4.ebuild 3429
+MD5 c07cd3cad0342c7c9ccafdb4f0ae8b03 files/ac-wrapper.pl 2785
 MD5 12f8fb67eaf50f87ed7825356503e8d7 files/autoconf-2.13-configure-gentoo.diff 958
 MD5 f935499520b964a1fcfc23b68d8c8558 files/autoconf-2.13-configure.in-gentoo.diff 443
-MD5 e3137dce2883f1c5fa9adbee73a86113 files/autoconf-2.5-infopage-namechange.patch 4043
-MD5 c39fbf4a2c9bd249b6062e5b1cb67eae files/autoconf-2.57-infopage-namechange.patch 4628
-MD5 1e532467a5e16fbc8acf85b00d89ca85 files/autoconf-2.57a-AC_HELP_STRING.patch 403
-MD5 c98042870fa4228b40ce57442d91ca47 files/autoconf-2.57a-infopage-namechange.patch 5119
 MD5 372cd1fdd18a95f5a6af7cb36bfd12de files/autoconf-2.58-infopage-namechange.patch 5117
-MD5 cff703b5ddfcb647f18aeed0111b8138 files/digest-autoconf-2.57-r1 131
-MD5 f2802f3155defa9299baf6e5d0d79571 files/digest-autoconf-2.57a-r1 132
-MD5 d7f6caec3dfd602a77238546246b91b7 files/digest-autoconf-2.58 131
-MD5 d7f6caec3dfd602a77238546246b91b7 files/digest-autoconf-2.58-r1 131
-MD5 b310d32d1d5c26cb84206bfda473da1c files/digest-autoconf-2.59-r3 131
 MD5 b310d32d1d5c26cb84206bfda473da1c files/digest-autoconf-2.59-r4 131
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFBZDGoHTu7gpaalycRApivAKDQls2qXhI3+dBW7jHfp4GO1goIzACglvWT
+y71pQZ7Np7Gi8vcMQ874480=
+=/xFO
+-----END PGP SIGNATURE-----
diff --git a/sys-devel/autoconf/autoconf-2.57-r1.ebuild b/sys-devel/autoconf/autoconf-2.57-r1.ebuild
deleted file mode 100644
index d221ca35f780..000000000000
--- a/sys-devel/autoconf/autoconf-2.57-r1.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.57-r1.ebuild,v 1.14 2004/07/15 03:07:10 agriffis Exp $
-
-IUSE=""
-
-inherit eutils
-
-OLD_PV="2.13"
-OLD_P="${PN}-${OLD_PV}"
-OLD_S="${WORKDIR}/${OLD_P}"
-DESCRIPTION="Used to create autoconfiguration files"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2
-	mirror://gnu/${PN}/${OLD_P}.tar.gz"
-HOMEPAGE="http://www.gnu.org/software/autoconf/autoconf.html"
-
-LICENSE="GPL-2"
-SLOT="2.5"
-KEYWORDS="amd64 x86 ppc sparc alpha hppa mips ia64"
-
-DEPEND=">=sys-apps/texinfo-4.3
-	=sys-devel/m4-1.4*
-	dev-lang/perl"
-
-src_unpack() {
-
-	unpack ${A}
-
-	cd ${OLD_S}
-	epatch ${FILESDIR}/${OLD_P}-configure-gentoo.diff
-	epatch ${FILESDIR}/${OLD_P}-configure.in-gentoo.diff
-
-	cd ${S}
-	# Enable both autoconf-2.1 and autoconf-2.5 info pages
-	epatch ${FILESDIR}/${PN}-2.57-infopage-namechange.patch
-	ln -snf ${S}/doc/autoconf.texi ${S}/doc/autoconf25.texi
-}
-
-src_compile() {
-
-	#
-	# ************ autoconf-2.5x ************
-	#
-	cd ${S}
-	./configure --prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		--target=${CHOST} || die
-
-	emake || die
-
-	#
-	# ************ autoconf-2.13 ************
-	#
-	cd ${OLD_S}
-
-	sed -i 's|\* Autoconf:|\* Autoconf v2.1:|' autoconf.texi
-	cp autoconf.texi autoconf.texi.orig
-	sed -e '/START-INFO-DIR-ENTRY/ i INFO-DIR-SECTION GNU programming tools' \
-		autoconf.texi.orig > autoconf.texi
-
-	./configure --prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		--target=${CHOST} || die
-
-	emake || die
-}
-
-src_install() {
-
-	# install wrapper script for autodetecting the proper version
-	# to use.
-	exeinto /usr/lib/${PN}
-	doexe ${FILESDIR}/ac-wrapper.pl
-	dosed "s:2\.5x:${PV}:g" /usr/lib/${PN}/ac-wrapper.pl
-
-	#
-	# ************ autoconf-2.5x ************
-	#
-
-	# need to use 'DESTDIR' here, else perl stuff puke
-	cd ${S}
-	make DESTDIR=${D} \
-		install || die
-
-	for x in autoconf autoheader autoreconf autoscan autoupdate ifnames autom4te
-	do
-		mv ${D}/usr/bin/${x} ${D}/usr/bin/${x}-${PV}
-	done
-	# new in 2.5x
-	dosym ../lib/${PN}/ac-wrapper.pl /usr/bin/autom4te
-
-#	mv ${D}/usr/share/info/autoconf.info ${D}/usr/share/info/autoconf-2.5.info
-
-	docinto ${PV}
-	dodoc COPYING AUTHORS BUGS NEWS README TODO THANKS
-	dodoc ChangeLog ChangeLog.0 ChangeLog.1 ChangeLog.2
-
-	#
-	# ************ autoconf-2.13 ************
-	#
-
-	# need to use 'prefix' here, else we get sandbox problems
-	cd ${OLD_S}
-	make prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		install || die
-
-	for x in autoconf autoheader autoreconf autoscan autoupdate ifnames
-	do
-		mv ${D}/usr/bin/${x} ${D}/usr/bin/${x}-${OLD_PV}
-		dosym ../lib/${PN}/ac-wrapper.pl /usr/bin/${x}
-	done
-
-	docinto ${OLD_PV}
-	dodoc COPYING AUTHORS NEWS README TODO
-	dodoc ChangeLog ChangeLog.0 ChangeLog.1
-
-	# from binutils
-	rm -f ${D}/usr/share/info/standards.info*
-}
-
-pkg_preinst() {
-
-	# remove these to make sure symlinks install properly if old versions
-	# was binaries
-	for x in autoconf autoheader autoreconf autoscan autoupdate ifnames autom4te
-	do
-		if [ -e ${ROOT}/usr/bin/${x} ]
-		then
-			rm -f ${ROOT}/usr/bin/${x}
-		fi
-	done
-}
diff --git a/sys-devel/autoconf/autoconf-2.57a-r1.ebuild b/sys-devel/autoconf/autoconf-2.57a-r1.ebuild
deleted file mode 100644
index cfba33cfd9a7..000000000000
--- a/sys-devel/autoconf/autoconf-2.57a-r1.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.57a-r1.ebuild,v 1.9 2004/07/15 03:07:10 agriffis Exp $
-
-IUSE=""
-
-inherit eutils
-
-OLD_PV="2.13"
-OLD_P="${PN}-${OLD_PV}"
-OLD_S="${WORKDIR}/${OLD_P}"
-DESCRIPTION="Used to create autoconfiguration files"
-SRC_URI="ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.bz2
-	mirror://gnu/${PN}/${P}.tar.bz2
-	mirror://gnu/${PN}/${OLD_P}.tar.gz"
-HOMEPAGE="http://www.gnu.org/software/autoconf/autoconf.html"
-
-LICENSE="GPL-2"
-SLOT="2.5"
-KEYWORDS="~amd64 ~x86 ~ppc ~sparc ~alpha ~hppa ~mips ~ia64"
-
-DEPEND=">=sys-apps/texinfo-4.3
-	=sys-devel/m4-1.4*
-	dev-lang/perl"
-
-src_unpack() {
-
-	unpack ${A}
-
-	cd ${OLD_S}
-	epatch ${FILESDIR}/${OLD_P}-configure-gentoo.diff
-	epatch ${FILESDIR}/${OLD_P}-configure.in-gentoo.diff
-
-	cd ${S}
-	# Enable both autoconf-2.1 and autoconf-2.5 info pages
-	epatch ${FILESDIR}/${PN}-2.57a-infopage-namechange.patch
-	ln -snf ${S}/doc/autoconf.texi ${S}/doc/autoconf25.texi
-
-	# Fix a bug in AC_HELP_STRING definition, bug #29961.
-	epatch ${FILESDIR}/${P}-AC_HELP_STRING.patch
-}
-
-src_compile() {
-
-	#
-	# ************ autoconf-2.5x ************
-	#
-	cd ${S}
-	./configure --prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		--target=${CHOST} || die
-
-	emake || die
-
-	#
-	# ************ autoconf-2.13 ************
-	#
-	cd ${OLD_S}
-
-	sed -i 's|\* Autoconf:|\* Autoconf v2.1:|' autoconf.texi
-	cp autoconf.texi autoconf.texi.orig
-	sed -e '/START-INFO-DIR-ENTRY/ i INFO-DIR-SECTION GNU programming tools' \
-		autoconf.texi.orig > autoconf.texi
-
-	./configure --prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		--target=${CHOST} || die
-
-	emake || die
-}
-
-src_install() {
-
-	# install wrapper script for autodetecting the proper version
-	# to use.
-	exeinto /usr/lib/${PN}
-	doexe ${FILESDIR}/ac-wrapper.pl
-	dosed "s:2\.5x:${PV}:g" /usr/lib/${PN}/ac-wrapper.pl
-
-	#
-	# ************ autoconf-2.5x ************
-	#
-
-	# need to use 'DESTDIR' here, else perl stuff puke
-	cd ${S}
-	make DESTDIR=${D} \
-		install || die
-
-	for x in autoconf autoheader autoreconf autoscan autoupdate ifnames autom4te
-	do
-		mv ${D}/usr/bin/${x} ${D}/usr/bin/${x}-${PV}
-	done
-	# new in 2.5x
-	dosym ../lib/${PN}/ac-wrapper.pl /usr/bin/autom4te
-
-#	mv ${D}/usr/share/info/autoconf.info ${D}/usr/share/info/autoconf-2.5.info
-
-	docinto ${PV}
-	dodoc COPYING AUTHORS BUGS NEWS README TODO THANKS
-	dodoc ChangeLog ChangeLog.0 ChangeLog.1 ChangeLog.2
-
-	#
-	# ************ autoconf-2.13 ************
-	#
-
-	# need to use 'prefix' here, else we get sandbox problems
-	cd ${OLD_S}
-	make prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		install || die
-
-	for x in autoconf autoheader autoreconf autoscan autoupdate ifnames
-	do
-		mv ${D}/usr/bin/${x} ${D}/usr/bin/${x}-${OLD_PV}
-		dosym ../lib/${PN}/ac-wrapper.pl /usr/bin/${x}
-	done
-
-	docinto ${OLD_PV}
-	dodoc COPYING AUTHORS NEWS README TODO
-	dodoc ChangeLog ChangeLog.0 ChangeLog.1
-
-	# from binutils
-	rm -f ${D}/usr/share/info/standards.info*
-}
-
-pkg_preinst() {
-
-	# remove these to make sure symlinks install properly if old versions
-	# was binaries
-	for x in autoconf autoheader autoreconf autoscan autoupdate ifnames autom4te
-	do
-		if [ -e ${ROOT}/usr/bin/${x} ]
-		then
-			rm -f ${ROOT}/usr/bin/${x}
-		fi
-	done
-}
diff --git a/sys-devel/autoconf/autoconf-2.58-r1.ebuild b/sys-devel/autoconf/autoconf-2.58-r1.ebuild
deleted file mode 100644
index 096df95bdf50..000000000000
--- a/sys-devel/autoconf/autoconf-2.58-r1.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.58-r1.ebuild,v 1.4 2004/07/15 03:07:10 agriffis Exp $
-
-IUSE=""
-
-inherit eutils
-
-OLD_PV="2.13"
-OLD_P="${PN}-${OLD_PV}"
-OLD_S="${WORKDIR}/${OLD_P}"
-DESCRIPTION="Used to create autoconfiguration files"
-SRC_URI="ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.bz2
-	mirror://gnu/${PN}/${P}.tar.bz2
-	mirror://gnu/${PN}/${OLD_P}.tar.gz"
-HOMEPAGE="http://www.gnu.org/software/autoconf/autoconf.html"
-
-LICENSE="GPL-2"
-SLOT="2.5"
-KEYWORDS="amd64 x86 ppc sparc alpha hppa mips ia64 ppc64"
-
-DEPEND=">=sys-apps/texinfo-4.3
-	=sys-devel/m4-1.4*
-	dev-lang/perl"
-
-src_unpack() {
-
-	unpack ${A}
-
-	cd ${OLD_S}
-	epatch ${FILESDIR}/${OLD_P}-configure-gentoo.diff
-	epatch ${FILESDIR}/${OLD_P}-configure.in-gentoo.diff
-
-	cd ${S}
-	# Enable both autoconf-2.1 and autoconf-2.5 info pages
-	epatch ${FILESDIR}/${PN}-2.58-infopage-namechange.patch
-	ln -snf ${S}/doc/autoconf.texi ${S}/doc/autoconf25.texi
-}
-
-src_compile() {
-
-	#
-	# ************ autoconf-2.5x ************
-	#
-	cd ${S}
-	./configure --prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		--target=${CHOST} || die
-
-	emake || die
-
-	#
-	# ************ autoconf-2.13 ************
-	#
-	cd ${OLD_S}
-
-	sed -i 's|\* Autoconf:|\* Autoconf v2.1:|' autoconf.texi
-	cp autoconf.texi autoconf.texi.orig
-	sed -e '/START-INFO-DIR-ENTRY/ i INFO-DIR-SECTION GNU programming tools' \
-		autoconf.texi.orig > autoconf.texi
-
-	./configure --prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		--target=${CHOST} || die
-
-	emake || die
-}
-
-src_install() {
-
-	# install wrapper script for autodetecting the proper version
-	# to use.
-	exeinto /usr/lib/${PN}
-	newexe ${FILESDIR}/ac-wrapper-2.pl ac-wrapper.pl
-	dosed "s:2\.5x:${PV}:g" /usr/lib/${PN}/ac-wrapper.pl
-
-	#
-	# ************ autoconf-2.5x ************
-	#
-
-	# need to use 'DESTDIR' here, else perl stuff puke
-	cd ${S}
-	make DESTDIR=${D} \
-		install || die
-
-	for x in autoconf autoheader autoreconf autoscan autoupdate ifnames autom4te
-	do
-		mv ${D}/usr/bin/${x} ${D}/usr/bin/${x}-${PV}
-	done
-	# new in 2.5x
-	dosym ../lib/${PN}/ac-wrapper.pl /usr/bin/autom4te
-
-#	mv ${D}/usr/share/info/autoconf.info ${D}/usr/share/info/autoconf-2.5.info
-
-	docinto ${PV}
-	dodoc COPYING AUTHORS BUGS NEWS README TODO THANKS
-	dodoc ChangeLog ChangeLog.0 ChangeLog.1 ChangeLog.2
-
-	#
-	# ************ autoconf-2.13 ************
-	#
-
-	# need to use 'prefix' here, else we get sandbox problems
-	cd ${OLD_S}
-	make prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		install || die
-
-	for x in autoconf autoheader autoreconf autoscan autoupdate ifnames
-	do
-		mv ${D}/usr/bin/${x} ${D}/usr/bin/${x}-${OLD_PV}
-		dosym ../lib/${PN}/ac-wrapper.pl /usr/bin/${x}
-	done
-
-	docinto ${OLD_PV}
-	dodoc COPYING AUTHORS NEWS README TODO
-	dodoc ChangeLog ChangeLog.0 ChangeLog.1
-
-	# from binutils
-	rm -f ${D}/usr/share/info/standards.info*
-}
-
-pkg_preinst() {
-
-	# remove these to make sure symlinks install properly if old versions
-	# was binaries
-	for x in autoconf autoheader autoreconf autoscan autoupdate ifnames autom4te
-	do
-		if [ -e ${ROOT}/usr/bin/${x} ]
-		then
-			rm -f ${ROOT}/usr/bin/${x}
-		fi
-	done
-}
-
-pkg_postinst() {
-
-	echo
-	einfo "Please note that the 'WANT_AUTOCONF_?_?=1' have changed to:"
-	echo
-	einfo "  WANT_AUTOCONF=<required version>"
-	echo
-	einfo "For instance:  WANT_AUTOCONF=2.5"
-	echo
-}
diff --git a/sys-devel/autoconf/autoconf-2.58.ebuild b/sys-devel/autoconf/autoconf-2.58.ebuild
deleted file mode 100644
index d89e354ba77a..000000000000
--- a/sys-devel/autoconf/autoconf-2.58.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.58.ebuild,v 1.13 2004/07/15 03:07:10 agriffis Exp $
-
-IUSE=""
-
-inherit eutils
-
-OLD_PV="2.13"
-OLD_P="${PN}-${OLD_PV}"
-OLD_S="${WORKDIR}/${OLD_P}"
-DESCRIPTION="Used to create autoconfiguration files"
-SRC_URI="ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.bz2
-	mirror://gnu/${PN}/${P}.tar.bz2
-	mirror://gnu/${PN}/${OLD_P}.tar.gz"
-HOMEPAGE="http://www.gnu.org/software/autoconf/autoconf.html"
-
-LICENSE="GPL-2"
-SLOT="2.5"
-KEYWORDS="amd64 x86 ppc sparc alpha hppa mips ia64 ppc64"
-
-DEPEND=">=sys-apps/texinfo-4.3
-	=sys-devel/m4-1.4*
-	dev-lang/perl"
-
-src_unpack() {
-
-	unpack ${A}
-
-	cd ${OLD_S}
-	epatch ${FILESDIR}/${OLD_P}-configure-gentoo.diff
-	epatch ${FILESDIR}/${OLD_P}-configure.in-gentoo.diff
-
-	cd ${S}
-	# Enable both autoconf-2.1 and autoconf-2.5 info pages
-	epatch ${FILESDIR}/${PN}-2.58-infopage-namechange.patch
-	ln -snf ${S}/doc/autoconf.texi ${S}/doc/autoconf25.texi
-}
-
-src_compile() {
-
-	#
-	# ************ autoconf-2.5x ************
-	#
-	cd ${S}
-	./configure --prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		--target=${CHOST} || die
-
-	emake || die
-
-	#
-	# ************ autoconf-2.13 ************
-	#
-	cd ${OLD_S}
-
-	sed -i 's|\* Autoconf:|\* Autoconf v2.1:|' autoconf.texi
-	cp autoconf.texi autoconf.texi.orig
-	sed -e '/START-INFO-DIR-ENTRY/ i INFO-DIR-SECTION GNU programming tools' \
-		autoconf.texi.orig > autoconf.texi
-
-	./configure --prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		--target=${CHOST} || die
-
-	emake || die
-}
-
-src_install() {
-
-	# install wrapper script for autodetecting the proper version
-	# to use.
-	exeinto /usr/lib/${PN}
-	newexe ${FILESDIR}/ac-wrapper-2.pl ac-wrapper.pl
-	dosed "s:2\.5x:${PV}:g" /usr/lib/${PN}/ac-wrapper.pl
-
-	#
-	# ************ autoconf-2.5x ************
-	#
-
-	# need to use 'DESTDIR' here, else perl stuff puke
-	cd ${S}
-	make DESTDIR=${D} \
-		install || die
-
-	for x in autoconf autoheader autoreconf autoscan autoupdate ifnames autom4te
-	do
-		mv ${D}/usr/bin/${x} ${D}/usr/bin/${x}-${PV}
-	done
-	# new in 2.5x
-	dosym ../lib/${PN}/ac-wrapper.pl /usr/bin/autom4te
-
-#	mv ${D}/usr/share/info/autoconf.info ${D}/usr/share/info/autoconf-2.5.info
-
-	docinto ${PV}
-	dodoc COPYING AUTHORS BUGS NEWS README TODO THANKS
-	dodoc ChangeLog ChangeLog.0 ChangeLog.1 ChangeLog.2
-
-	#
-	# ************ autoconf-2.13 ************
-	#
-
-	# need to use 'prefix' here, else we get sandbox problems
-	cd ${OLD_S}
-	make prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		install || die
-
-	for x in autoconf autoheader autoreconf autoscan autoupdate ifnames
-	do
-		mv ${D}/usr/bin/${x} ${D}/usr/bin/${x}-${OLD_PV}
-		dosym ../lib/${PN}/ac-wrapper.pl /usr/bin/${x}
-	done
-
-	docinto ${OLD_PV}
-	dodoc COPYING AUTHORS NEWS README TODO
-	dodoc ChangeLog ChangeLog.0 ChangeLog.1
-
-	# from binutils
-	rm -f ${D}/usr/share/info/standards.info*
-}
-
-pkg_preinst() {
-
-	# remove these to make sure symlinks install properly if old versions
-	# was binaries
-	for x in autoconf autoheader autoreconf autoscan autoupdate ifnames autom4te
-	do
-		if [ -e ${ROOT}/usr/bin/${x} ]
-		then
-			rm -f ${ROOT}/usr/bin/${x}
-		fi
-	done
-}
-
-pkg_postinst() {
-
-	echo
-	einfo "Please note that the 'WANT_AUTOCONF_?_?=1' have changed to:"
-	echo
-	einfo "  WANT_AUTOCONF=<required version>"
-	echo
-	einfo "For instance:  WANT_AUTOCONF=2.5"
-	echo
-}
diff --git a/sys-devel/autoconf/autoconf-2.59-r3.ebuild b/sys-devel/autoconf/autoconf-2.59-r3.ebuild
deleted file mode 100644
index 9ae7bfa7fc57..000000000000
--- a/sys-devel/autoconf/autoconf-2.59-r3.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.59-r3.ebuild,v 1.10 2004/09/03 19:37:35 pvdabeel Exp $
-
-inherit eutils
-
-OLD_PV="2.13"
-OLD_P="${PN}-${OLD_PV}"
-OLD_S="${WORKDIR}/${OLD_P}"
-DESCRIPTION="Used to create autoconfiguration files"
-HOMEPAGE="http://www.gnu.org/software/autoconf/autoconf.html"
-SRC_URI="http://ftp.gnu.org/gnu/${PN}/${P}.tar.bz2
-	mirror://gnu/${PN}/${P}.tar.bz2
-	mirror://gnu/${PN}/${OLD_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="2.5"
-KEYWORDS="x86 ppc ~ppc64 ~sparc ~mips ~alpha arm hppa amd64 ~ia64 s390"
-IUSE=""
-
-DEPEND=">=sys-apps/texinfo-4.3
-	=sys-devel/m4-1.4*
-	dev-lang/perl"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${OLD_S}
-	epatch ${FILESDIR}/${OLD_P}-configure-gentoo.diff
-	epatch ${FILESDIR}/${OLD_P}-configure.in-gentoo.diff
-
-	cd ${S}
-	# Enable both autoconf-2.1 and autoconf-2.5 info pages
-	epatch ${FILESDIR}/${PN}-2.58-infopage-namechange.patch
-	ln -snf ${S}/doc/autoconf.texi ${S}/doc/autoconf25.texi
-}
-
-src_compile() {
-	#
-	# ************ autoconf-2.5x ************
-	#
-	cd ${S}
-	./configure --prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		--target=${CHOST} || die
-
-	emake || die
-
-	#
-	# ************ autoconf-2.13 ************
-	#
-	cd ${OLD_S}
-
-	sed -i 's|\* Autoconf:|\* Autoconf v2.1:|' autoconf.texi
-	cp autoconf.texi autoconf.texi.orig
-	sed -e '/START-INFO-DIR-ENTRY/ i INFO-DIR-SECTION GNU programming tools' \
-		autoconf.texi.orig > autoconf.texi
-
-	./configure --prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		--target=${CHOST} || die
-
-	emake || die
-}
-
-src_install() {
-	# install wrapper script for autodetecting the proper version
-	# to use.
-	exeinto /usr/lib/${PN}
-	newexe ${FILESDIR}/ac-wrapper-3.pl ac-wrapper.pl
-	dosed "s:2\.5x:${PV}:g" /usr/lib/${PN}/ac-wrapper.pl
-
-	#
-	# ************ autoconf-2.5x ************
-	#
-
-	# need to use 'DESTDIR' here, else perl stuff puke
-	cd ${S}
-	make DESTDIR=${D} \
-		install || die
-
-	for x in autoconf autoheader autoreconf autoscan autoupdate ifnames autom4te
-	do
-		mv ${D}/usr/bin/${x} ${D}/usr/bin/${x}-${PV}
-	done
-	# new in 2.5x
-	dosym ../lib/${PN}/ac-wrapper.pl /usr/bin/autom4te
-
-#	mv ${D}/usr/share/info/autoconf.info ${D}/usr/share/info/autoconf-2.5.info
-
-	docinto ${PV}
-	dodoc AUTHORS BUGS NEWS README TODO THANKS
-	dodoc ChangeLog ChangeLog.0 ChangeLog.1 ChangeLog.2
-
-	#
-	# ************ autoconf-2.13 ************
-	#
-
-	# need to use 'prefix' here, else we get sandbox problems
-	cd ${OLD_S}
-	make prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		install || die
-
-	for x in autoconf autoheader autoreconf autoscan autoupdate ifnames
-	do
-		mv ${D}/usr/bin/${x} ${D}/usr/bin/${x}-${OLD_PV}
-		dosym ../lib/${PN}/ac-wrapper.pl /usr/bin/${x}
-	done
-
-	docinto ${OLD_PV}
-	dodoc AUTHORS NEWS README TODO
-	dodoc ChangeLog ChangeLog.0 ChangeLog.1
-
-	# from binutils
-	rm -f ${D}/usr/share/info/standards.info*
-}
-
-pkg_preinst() {
-
-	# remove these to make sure symlinks install properly if old versions
-	# was binaries
-	for x in autoconf autoheader autoreconf autoscan autoupdate ifnames autom4te
-	do
-		if [ -e ${ROOT}/usr/bin/${x} ]
-		then
-			rm -f ${ROOT}/usr/bin/${x}
-		fi
-	done
-}
-
-pkg_postinst() {
-
-	echo
-	einfo "Please note that the 'WANT_AUTOCONF_?_?=1' have changed to:"
-	echo
-	einfo "  WANT_AUTOCONF=<required version>"
-	echo
-	einfo "For instance:  WANT_AUTOCONF=2.5"
-	echo
-}
diff --git a/sys-devel/autoconf/autoconf-2.59-r4.ebuild b/sys-devel/autoconf/autoconf-2.59-r4.ebuild
index 578b97d32f21..e34ca4d559da 100644
--- a/sys-devel/autoconf/autoconf-2.59-r4.ebuild
+++ b/sys-devel/autoconf/autoconf-2.59-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.59-r4.ebuild,v 1.10 2004/08/12 03:22:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.59-r4.ebuild,v 1.11 2004/10/06 17:55:37 vapier Exp $
 
 inherit eutils
 
@@ -15,7 +15,7 @@ SRC_URI="http://ftp.gnu.org/gnu/${PN}/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="2.5"
-KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 ppc64 s390"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 DEPEND=">=sys-apps/texinfo-4.3
@@ -69,7 +69,7 @@ src_install() {
 	# install wrapper script for autodetecting the proper version
 	# to use.
 	exeinto /usr/lib/${PN}
-	newexe ${FILESDIR}/ac-wrapper-4.pl ac-wrapper.pl
+	doexe ${FILESDIR}/ac-wrapper.pl
 	dosed "s:2\.5x:${PV}:g" /usr/lib/${PN}/ac-wrapper.pl
 
 	#
diff --git a/sys-devel/autoconf/files/ac-wrapper-2.pl b/sys-devel/autoconf/files/ac-wrapper-2.pl
deleted file mode 100644
index c720d9fefa10..000000000000
--- a/sys-devel/autoconf/files/ac-wrapper-2.pl
+++ /dev/null
@@ -1,72 +0,0 @@
-#!/usr/bin/perl
-#
-#
-# Guillaume Cottenceau (gc@mandrakesoft.com)
-#
-# Copyright 2001 MandrakeSoft
-#
-# This software may be freely redistributed under the terms of the GNU
-# public license.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-#
-#
-# Executes the correct autoconf version.
-#
-# - defaults to autoconf-2.13
-# - runs autoconf-2.5x if it exists and...
-#   - envvar WANT_AUTOCONF is set to `2.5'
-#     -or-
-#   - configure.ac is present
-#     -or-
-#   - `configure.in' contains AC_PREREQ and the value's 3 first letters
-#     are stringwise greater than '2.1'
-#     -or-
-#   - `configure' is already present and was generated by autoconf greater than
-#     '2.1'
-#     -or-
-#   - `Makefile.in' was generated by automake-1.6 or superior, which
-#     specifically needs autoconf-2.5x
-#
-
-#use MDK::Common;
-
-sub cat_ { local *F; open F, $_[0] or return; my @l = <F>; wantarray ? @l : join '', @l }
-
-my $binary     = "$0-2.13";
-my $binary_new = "$0-2.5x";
-
-# Autoconf is really getting out of hand, so rather start supporting
-# WANT_AUTOCONF = "2.5" the like.  Unfortunately it override the old
-# variables, so if not set, just convert the old variables ....
-if ($ENV{WANT_AUTOCONF} eq "") {
-	if ($ENV{WANT_AUTOCONF_2_1}) {
-		$ENV{WANT_AUTOCONF} = '2.1';
-	} elsif ($ENV{WANT_AUTOCONF_2_5}) {
-		$ENV{WANT_AUTOCONF} = '2.5';
-	}
-}
-
-if ($ENV{WANT_AUTOCONF} ne '2.1') {
-    if ((! -x $binary)                  # handle stuff like autom4te, where only 2.5x have the binary
-	|| (-x $binary_new              # user may have only 2.13
-	    && (($ENV{WANT_AUTOCONF} eq '2.5')
-	        || -r 'configure.ac'
-	        || (cat_('configure.in') =~ /^\s*\[?AC_PREREQ\(\[?([^\)]{3})[^\)]*\]?\)/m ? $1 : '') gt '2.1' 
-	        || (cat_('configure') =~ /^# Generated by Autoconf (\S+)/m ? $1 : '') gt '2.1'
-	        || (cat_('Makefile.in') =~ /^# Makefile\.in generated by automake (\S+)/ ? $1 : '') ge '1.6'
-	        || (cat_('aclocal.m4') =~ /^\s*\[?AC_PREREQ\(\[?([^\)]{3}[0-9]?)[^\)]*\]?\)/m ? $1 : '') gt '2.1'))) {
-	$ENV{WANT_AUTOCONF} = '2.5';    # to prevent further "cats" and to enhance consistency (possible cwd etc)
-	$binary 	    = $binary_new;
-    } else {
-	$ENV{WANT_AUTOCONF} = '2.1';    # for further consistency
-    }
-}
-
-$ENV{WANT_ACWRAPPER_DEBUG} and print STDERR "ac-wrapper: will execute <$binary>\n";
-
-exec $binary, @ARGV;
-
-die "ac-wrapper: ouch, couldn't call binary ($binary).\n";
diff --git a/sys-devel/autoconf/files/ac-wrapper-3.pl b/sys-devel/autoconf/files/ac-wrapper-3.pl
deleted file mode 100644
index 45efc78372e3..000000000000
--- a/sys-devel/autoconf/files/ac-wrapper-3.pl
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/usr/bin/perl
-#
-#
-# Guillaume Cottenceau (gc@mandrakesoft.com)
-#
-# Copyright 2001 MandrakeSoft
-#
-# This software may be freely redistributed under the terms of the GNU
-# public license.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-#
-#
-# Executes the correct autoconf version.
-#
-# - defaults to autoconf-2.13
-# - runs autoconf-2.5x if it exists and...
-#   - envvar WANT_AUTOCONF is set to `2.5'
-#     -or-
-#   - configure.ac is present
-#     -or-
-#   - `configure.in' contains AC_PREREQ and the value's 3 first letters
-#     are stringwise greater than '2.1'
-#     -or-
-#   - `configure' is already present and was generated by autoconf greater than
-#     '2.1'
-#     -or-
-#   - `Makefile.in' was generated by automake-1.6 or superior, which
-#     specifically needs autoconf-2.5x
-#
-
-#use MDK::Common;
-
-sub cat_ { local *F; open F, $_[0] or return; my @l = <F>; wantarray ? @l : join '', @l }
-
-my $binary     = "$0-2.13";
-my $binary_new = "$0-2.5x";
-
-# Autoconf is really getting out of hand, so rather start supporting
-# WANT_AUTOCONF = "2.5" the like.  Unfortunately it override the old
-# variables, so if not set, just convert the old variables ....
-if ($ENV{WANT_AUTOCONF} eq "") {
-	if ($ENV{WANT_AUTOCONF_2_1}) {
-		$ENV{WANT_AUTOCONF} = '2.1';
-	} elsif ($ENV{WANT_AUTOCONF_2_5}) {
-		$ENV{WANT_AUTOCONF} = '2.5';
-	}
-}
-
-if ($ENV{WANT_AUTOCONF} ne '2.1') {
-    if ((! -x $binary)                  # handle stuff like autom4te, where only 2.5x have the binary
-	|| (-x $binary_new              # user may have only 2.13
-	    && (($ENV{WANT_AUTOCONF} eq '2.5')
-	        || -r 'configure.ac'
-	        || (cat_('configure.in') =~ /^\s*\[?AC_PREREQ\(\[?([^\)]{3})[^\)]*\]?\)/m ? $1 : '') gt '2.1' 
-	        || (cat_('configure') =~ /^# Generated by Autoconf (\S+)/m ? $1 : '') gt '2.1'
-	        || (cat_('Makefile.in') =~ /^# Makefile\.in generated by automake (\S+)/ ? $1 : '') ge '1.6'
-	        || (cat_('aclocal.m4') =~ /^\s*\[?AC_PREREQ\(\[?([^\)]{3}[0-9]?)[^\)]*\]?\)/m ? $1 : '') gt '2.1'))) {
-	$ENV{WANT_AUTOCONF} = '2.5';    # to prevent further "cats" and to enhance consistency (possible cwd etc)
-	$binary 	    = $binary_new;
-    } else {
-	$ENV{WANT_AUTOCONF} = '2.1';    # for further consistency
-    }
-}
-
-# Set AUTOM4TE to the proper version (bug #40983).
-# Do not set it for 2.13 though, as it does not ship autom4te.
-if(($ENV{AUTOM4TE} eq "")
-   && ($ENV{WANT_AUTOCONF} = '2.5')
-   && ($0 ne 'autom4te')) {
-	$ENV{AUTOM4TE} = "autom4te-2.5x";
-}
-
-$ENV{WANT_ACWRAPPER_DEBUG} and print STDERR "ac-wrapper: will execute <$binary>\n";
-
-exec $binary, @ARGV;
-
-die "ac-wrapper: ouch, couldn't call binary ($binary).\n";
diff --git a/sys-devel/autoconf/files/ac-wrapper-4.pl b/sys-devel/autoconf/files/ac-wrapper-4.pl
deleted file mode 100644
index 984ce670f378..000000000000
--- a/sys-devel/autoconf/files/ac-wrapper-4.pl
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/usr/bin/perl
-#
-#
-# Guillaume Cottenceau (gc@mandrakesoft.com)
-#
-# Copyright 2001 MandrakeSoft
-#
-# This software may be freely redistributed under the terms of the GNU
-# public license.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-#
-#
-# Executes the correct autoconf version.
-#
-# - defaults to autoconf-2.13
-# - runs autoconf-2.5x if it exists and...
-#   - envvar WANT_AUTOCONF is set to `2.5'
-#     -or-
-#   - configure.ac is present
-#     -or-
-#   - `configure.in' contains AC_PREREQ and the value's 3 first letters
-#     are stringwise greater than '2.13'
-#     -or-
-#   - `configure' is already present and was generated by autoconf greater than
-#     '2.13'
-#     -or-
-#   - `Makefile.in' was generated by automake-1.6 or superior, which
-#     specifically needs autoconf-2.5x
-#
-
-#use MDK::Common;
-
-sub cat_ { local *F; open F, $_[0] or return; my @l = <F>; wantarray ? @l : join '', @l }
-sub ac_version {
-	return ((@versions = cat_(shift) =~ /^\s*\[?AC_PREREQ\(\[?([^\)]{3}[0-9]?)[^\)]*\]?\)/mg) ? ((sort @versions)[-1]) : '');
-}
-
-my $binary     = "$0-2.13";
-my $binary_new = "$0-2.5x";
-
-# Autoconf is really getting out of hand, so rather start supporting
-# WANT_AUTOCONF = "2.5" the like.  Unfortunately it override the old
-# variables, so if not set, just convert the old variables ....
-if ($ENV{WANT_AUTOCONF} eq "") {
-	if ($ENV{WANT_AUTOCONF_2_1}) {
-		$ENV{WANT_AUTOCONF} = '2.1';
-	} elsif ($ENV{WANT_AUTOCONF_2_5}) {
-		$ENV{WANT_AUTOCONF} = '2.5';
-	}
-}
-
-if ($ENV{WANT_AUTOCONF} ne '2.1') {
-    if ((! -x $binary)                  # handle stuff like autom4te, where only 2.5x have the binary
-	|| (-x $binary_new              # user may have only 2.13
-	    && (($ENV{WANT_AUTOCONF} eq '2.5')
-	        || -r 'configure.ac'
-		|| ac_version('configure.in') gt '2.13'
-	        || (cat_('configure') =~ /^# Generated by Autoconf (\S+)/m ? $1 : '') gt '2.13'
-	        || (cat_('Makefile.in') =~ /^# Makefile\.in generated by automake (\S+)/ ? $1 : '') ge '1.6'
-		|| ac_version('aclocal.m4') gt '2.13'))) {
-	$ENV{WANT_AUTOCONF} = '2.5';    # to prevent further "cats" and to enhance consistency (possible cwd etc)
-	$binary 	    = $binary_new;
-    } else {
-	$ENV{WANT_AUTOCONF} = '2.1';    # for further consistency
-    }
-}
-
-# Set AUTOM4TE to the proper version (bug #40983).
-# Do not set it for 2.13 though, as it does not ship autom4te.
-if(($ENV{AUTOM4TE} eq "")
-   && ($ENV{WANT_AUTOCONF} = '2.5')
-   && ($0 ne 'autom4te')) {
-	$ENV{AUTOM4TE} = "autom4te-2.5x";
-}
-
-$ENV{WANT_ACWRAPPER_DEBUG} and print STDERR "ac-wrapper: will execute <$binary>\n";
-
-exec $binary, @ARGV;
-
-die "ac-wrapper: ouch, couldn't call binary ($binary).\n";
diff --git a/sys-devel/autoconf/files/autoconf-2.5-infopage-namechange.patch b/sys-devel/autoconf/files/autoconf-2.5-infopage-namechange.patch
deleted file mode 100644
index 726f1d8d4b71..000000000000
--- a/sys-devel/autoconf/files/autoconf-2.5-infopage-namechange.patch
+++ /dev/null
@@ -1,94 +0,0 @@
---- autoconf-2.54/doc/autoconf.texi.orig	2002-12-14 20:17:38.000000000 +0200
-+++ autoconf-2.54/doc/autoconf.texi	2002-12-14 20:18:09.000000000 +0200
-@@ -1,9 +1,9 @@
- \input texinfo @c -*-texinfo-*-
- @comment ========================================================
- @comment %**start of header
--@setfilename autoconf.info
-+@setfilename autoconf25.info
- @include version.texi
--@settitle Autoconf
-+@settitle Autoconf v2.5
- @setchapternewpage odd
- @setcontentsaftertitlepage
- @finalout
-@@ -96,30 +96,30 @@
- 
- @dircategory GNU programming tools
- @direntry
--* Autoconf: (autoconf).         Create source code configuration scripts
-+* Autoconf v2.5: (autoconf25).  Create source code configuration scripts
- @end direntry
- 
- @dircategory Individual utilities
- @direntry
--* autoscan: (autoconf)autoscan Invocation.
-+* autoscan: (autoconf25)autoscan Invocation.
-                                 Semi-automatic @file{configure.ac} writing
--* ifnames: (autoconf)ifnames Invocation.
-+* ifnames: (autoconf25)ifnames Invocation.
-                                 Listing the conditionals in source code
--* autoconf: (autoconf)autoconf Invocation.
-+* autoconf: (autoconf25)autoconf Invocation.
-                                 How to create configuration scripts
--* autoreconf: (autoconf)autoreconf Invocation.
-+* autoreconf: (autoconf25)autoreconf Invocation.
-                                 Remaking multiple @command{configure} scripts
--* autoheader: (autoconf)autoheader Invocation.
-+* autoheader: (autoconf25)autoheader Invocation.
-                                 How to create configuration templates
--* autom4te: (autoconf)Invoking autom4te.
-+* autom4te: (autoconf25)Invoking autom4te.
-                                 The Autoconf executables backbone
--* configure: (autoconf)configure Invocation.
-+* configure: (autoconf25)configure Invocation.
-                                 Configuring a package
--* autoupdate: (autoconf)autoupdate Invocation.
-+* autoupdate: (autoconf25)autoupdate Invocation.
-                                 Automatic update of @file{configure.ac}
--* config.status: (autoconf)config.status Invocation.
-+* config.status: (autoconf25)config.status Invocation.
-                                 Recreating a configuration
--* testsuite: (autoconf)testsuite Invocation.
-+* testsuite: (autoconf25)testsuite Invocation.
-                                 Running an Autotest test suite
- @end direntry
- 
---- autoconf-2.54/doc/Makefile.in.orig	2002-12-14 20:26:08.000000000 +0200
-+++ autoconf-2.54/doc/Makefile.in	2002-12-14 20:28:12.000000000 +0200
-@@ -95,7 +95,7 @@
- TEXI2HTML = texi2html
- TEXI2HTML_FLAGS = -split_chapter
- 
--info_TEXINFOS = autoconf.texi standards.texi
-+info_TEXINFOS = autoconf25.texi standards.texi
- autoconf_TEXINFOS = fdl.texi install.texi
- standards_TEXINFOS = make-stds.texi
- 
-@@ -112,7 +112,7 @@
- DIST_SOURCES =
- TEXINFO_TEX = $(top_srcdir)/config/texinfo.tex
- am__TEXINFO_TEX_DIR = $(top_srcdir)/config
--INFO_DEPS = autoconf.info standards.info
-+INFO_DEPS = autoconf25.info standards.info
- DVIS = autoconf.dvi standards.dvi
- PDFS = autoconf.pdf standards.pdf
- PSS = autoconf.ps standards.ps
-@@ -143,13 +143,13 @@
- 	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
- 	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
- 	$(TEXI2PDF) `test -f '$<' || echo '$(srcdir)/'`$<
--autoconf.info: version.texi $(autoconf_TEXINFOS)
-+autoconf25.info: version.texi $(autoconf_TEXINFOS)
- autoconf.dvi: version.texi $(autoconf_TEXINFOS)
- autoconf.pdf: version.texi $(autoconf_TEXINFOS)
- version.texi:  stamp-vti
--stamp-vti: autoconf.texi $(top_srcdir)/configure.ac
--	@(dir=.; test -f ./autoconf.texi || dir=$(srcdir); \
--	set `$(SHELL) $(top_srcdir)/config/mdate-sh $$dir/autoconf.texi`; \
-+stamp-vti: autoconf25.texi $(top_srcdir)/configure.ac
-+	@(dir=.; test -f ./autoconf25.texi || dir=$(srcdir); \
-+	set `$(SHELL) $(top_srcdir)/config/mdate-sh $$dir/autoconf25.texi`; \
- 	echo "@set UPDATED $$1 $$2 $$3"; \
- 	echo "@set UPDATED-MONTH $$2 $$3"; \
- 	echo "@set EDITION $(VERSION)"; \
diff --git a/sys-devel/autoconf/files/autoconf-2.57-infopage-namechange.patch b/sys-devel/autoconf/files/autoconf-2.57-infopage-namechange.patch
deleted file mode 100644
index f7f6cbc98042..000000000000
--- a/sys-devel/autoconf/files/autoconf-2.57-infopage-namechange.patch
+++ /dev/null
@@ -1,107 +0,0 @@
---- autoconf-2.57/doc/autoconf.texi.orig	2003-01-20 21:25:17.000000000 +0200
-+++ autoconf-2.57/doc/autoconf.texi	2003-01-20 21:29:26.000000000 +0200
-@@ -1,9 +1,9 @@
- \input texinfo @c -*-texinfo-*-
- @comment ========================================================
- @comment %**start of header
--@setfilename autoconf.info
-+@setfilename autoconf25.info
- @include version.texi
--@settitle Autoconf
-+@settitle Autoconf v2.5
- @setchapternewpage odd
- @setcontentsaftertitlepage
- @finalout
-@@ -97,35 +97,35 @@
- 
- @dircategory GNU programming tools
- @direntry
--* Autoconf: (autoconf).         Create source code configuration scripts
-+* Autoconf v2.5: (autoconf25).         Create source code configuration scripts
- @end direntry
- 
- @dircategory Individual utilities
- @direntry
--* autoscan: (autoconf)autoscan Invocation.
-+* autoscan: (autoconf25)autoscan Invocation.
-                                 Semi-automatic @file{configure.ac} writing
--* ifnames: (autoconf)ifnames Invocation.
-+* ifnames: (autoconf25)ifnames Invocation.
-                                 Listing the conditionals in source code
--* autoconf: (autoconf)autoconf Invocation.
-+* autoconf: (autoconf25)autoconf Invocation.
-                                 How to create configuration scripts
--* autoreconf: (autoconf)autoreconf Invocation.
-+* autoreconf: (autoconf25)autoreconf Invocation.
-                                 Remaking multiple @command{configure} scripts
--* autoheader: (autoconf)autoheader Invocation.
-+* autoheader: (autoconf25)autoheader Invocation.
-                                 How to create configuration templates
--* autom4te: (autoconf)autom4te Invocation.
-+* autom4te: (autoconf25)autom4te Invocation.
-                                 The Autoconf executables backbone
--* configure: (autoconf)configure Invocation.
-+* configure: (autoconf25)configure Invocation.
-                                 Configuring a package
--* autoupdate: (autoconf)autoupdate Invocation.
-+* autoupdate: (autoconf25)autoupdate Invocation.
-                                 Automatic update of @file{configure.ac}
--* config.status: (autoconf)config.status Invocation.
-+* config.status: (autoconf25)config.status Invocation.
-                                 Recreating a configuration
--* testsuite: (autoconf)testsuite Invocation.
-+* testsuite: (autoconf25)testsuite Invocation.
-                                 Running an Autotest test suite
- @end direntry
- 
- @titlepage
--@title Autoconf
-+@title Autoconf v2.5
- @subtitle Creating Automatic Configuration Scripts
- @subtitle for version @value{VERSION}, @value{UPDATED}
- @author David MacKenzie
---- autoconf-2.57/doc/Makefile.in.orig	2003-01-20 21:29:55.000000000 +0200
-+++ autoconf-2.57/doc/Makefile.in	2003-01-20 21:31:12.000000000 +0200
-@@ -96,7 +96,7 @@
- TEXI2HTML = texi2html
- TEXI2HTML_FLAGS = -split_chapter
- 
--info_TEXINFOS = autoconf.texi standards.texi
-+info_TEXINFOS = autoconf25.texi standards.texi
- autoconf_TEXINFOS = fdl.texi install.texi
- standards_TEXINFOS = make-stds.texi
- 
-@@ -113,11 +113,11 @@
- DIST_SOURCES =
- TEXINFO_TEX = $(top_srcdir)/config/texinfo.tex
- am__TEXINFO_TEX_DIR = $(top_srcdir)/config
--INFO_DEPS = autoconf.info standards.info
-+INFO_DEPS = autoconf25.info standards.info
- DVIS = autoconf.dvi standards.dvi
- PDFS = autoconf.pdf standards.pdf
- PSS = autoconf.ps standards.ps
--TEXINFOS = autoconf.texi standards.texi
-+TEXINFOS = autoconf25.texi standards.texi
- DIST_COMMON = $(autoconf_TEXINFOS) $(standards_TEXINFOS) Makefile.am \
- 	Makefile.in stamp-vti version.texi
- all: all-am
-@@ -144,13 +144,13 @@
- 	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
- 	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
- 	$(TEXI2PDF) `test -f '$<' || echo '$(srcdir)/'`$<
--autoconf.info: autoconf.texi version.texi $(autoconf_TEXINFOS)
--autoconf.dvi: autoconf.texi version.texi $(autoconf_TEXINFOS)
--autoconf.pdf: autoconf.texi version.texi $(autoconf_TEXINFOS)
-+autoconf25.info: autoconf25.texi version.texi $(autoconf_TEXINFOS)
-+autoconf.dvi: autoconf25.texi version.texi $(autoconf_TEXINFOS)
-+autoconf.pdf: autoconf25.texi version.texi $(autoconf_TEXINFOS)
- version.texi:  stamp-vti
--stamp-vti: autoconf.texi $(top_srcdir)/configure
--	@(dir=.; test -f ./autoconf.texi || dir=$(srcdir); \
--	set `$(SHELL) $(top_srcdir)/config/mdate-sh $$dir/autoconf.texi`; \
-+stamp-vti: autoconf25.texi $(top_srcdir)/configure
-+	@(dir=.; test -f ./autoconf25.texi || dir=$(srcdir); \
-+	set `$(SHELL) $(top_srcdir)/config/mdate-sh $$dir/autoconf25.texi`; \
- 	echo "@set UPDATED $$1 $$2 $$3"; \
- 	echo "@set UPDATED-MONTH $$2 $$3"; \
- 	echo "@set EDITION $(VERSION)"; \
diff --git a/sys-devel/autoconf/files/autoconf-2.57a-AC_HELP_STRING.patch b/sys-devel/autoconf/files/autoconf-2.57a-AC_HELP_STRING.patch
deleted file mode 100644
index c0a2cdff18ea..000000000000
--- a/sys-devel/autoconf/files/autoconf-2.57a-AC_HELP_STRING.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -u -r1.817 -r1.818
---- autoconf/lib/autoconf/general.m4	2003/08/21 17:25:31	1.817
-+++ autoconf/lib/autoconf/general.m4	2003/09/26 09:11:23	1.818
-@@ -215,11 +215,8 @@
- 
- 
- # AU::AC_HELP_STRING(LHS, RHS, [COLUMN])
--# ----------------------------------
--AU_DEFUN([AC_HELP_STRING],
--[AS_HELP_STRING([$@])dnl
--])
--
-+# --------------------------------------
-+AU_ALIAS([AC_HELP_STRING], [AS_HELP_STRING])
diff --git a/sys-devel/autoconf/files/autoconf-2.57a-infopage-namechange.patch b/sys-devel/autoconf/files/autoconf-2.57a-infopage-namechange.patch
deleted file mode 100644
index 9552b333fc40..000000000000
--- a/sys-devel/autoconf/files/autoconf-2.57a-infopage-namechange.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-diff -urN autoconf-2.57a/doc/Makefile.in autoconf-2.57a.info/doc/Makefile.in
---- autoconf-2.57a/doc/Makefile.in	2003-09-28 16:42:23.267768088 +0200
-+++ autoconf-2.57a.info/doc/Makefile.in	2003-09-28 16:42:47.480087256 +0200
-@@ -44,12 +44,12 @@
- DIST_SOURCES =
- TEXINFO_TEX = $(top_srcdir)/config/texinfo.tex
- am__TEXINFO_TEX_DIR = $(top_srcdir)/config
--INFO_DEPS = autoconf.info standards.info
-+INFO_DEPS = autoconf25.info standards.info
- DVIS = autoconf.dvi standards.dvi
- PDFS = autoconf.pdf standards.pdf
- PSS = autoconf.ps standards.ps
- HTMLS = autoconf.html standards.html
--TEXINFOS = autoconf.texi standards.texi
-+TEXINFOS = autoconf25.texi standards.texi
- TEXI2PDF = $(TEXI2DVI) --pdf --batch
- DVIPS = dvips
- am__installdirs = $(DESTDIR)$(infodir)
-@@ -116,7 +116,7 @@
- TEXI2DVI = texi2dvi --batch
- TEXI2HTML = texi2html
- TEXI2HTML_FLAGS = -split_chapter
--info_TEXINFOS = autoconf.texi standards.texi
-+info_TEXINFOS = autoconf25.texi standards.texi
- autoconf_TEXINFOS = fdl.texi install.texi
- standards_TEXINFOS = make-stds.texi
- 
-@@ -192,14 +192,14 @@
- .texi.html:
- 	$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) --html -I $(srcdir) \
- 	 -o $@ $<
--autoconf.info: autoconf.texi version.texi $(autoconf_TEXINFOS)
--autoconf.dvi: autoconf.texi version.texi $(autoconf_TEXINFOS)
--autoconf.pdf: autoconf.texi version.texi $(autoconf_TEXINFOS)
--autoconf.html: autoconf.texi version.texi $(autoconf_TEXINFOS)
-+autoconf25.info: autoconf25.texi version.texi $(autoconf_TEXINFOS)
-+autoconf.dvi: autoconf25.texi version.texi $(autoconf_TEXINFOS)
-+autoconf.pdf: autoconf25.texi version.texi $(autoconf_TEXINFOS)
-+autoconf.html: autoconf25.texi version.texi $(autoconf_TEXINFOS)
- version.texi:  stamp-vti
--stamp-vti: autoconf.texi $(top_srcdir)/configure
--	@(dir=.; test -f ./autoconf.texi || dir=$(srcdir); \
--	set `$(SHELL) $(top_srcdir)/config/mdate-sh $$dir/autoconf.texi`; \
-+stamp-vti: autoconf25.texi $(top_srcdir)/configure
-+	@(dir=.; test -f ./autoconf25.texi || dir=$(srcdir); \
-+	set `$(SHELL) $(top_srcdir)/config/mdate-sh $$dir/autoconf25.texi`; \
- 	echo "@set UPDATED $$1 $$2 $$3"; \
- 	echo "@set UPDATED-MONTH $$2 $$3"; \
- 	echo "@set EDITION $(VERSION)"; \
-@@ -430,8 +430,8 @@
- 
- html: autoconf_1.html standards_1.html
- 
--autoconf_1.html: autoconf.texi install.texi
--	$(TEXI2HTML) $(TEXI2HTML_FLAGS) $(srcdir)/autoconf.texi
-+autoconf_1.html: autoconf25.texi install.texi
-+	$(TEXI2HTML) $(TEXI2HTML_FLAGS) $(srcdir)/autoconf25.texi
- 
- standards_1.html: standards.texi make-stds.texi
- 	$(TEXI2HTML) $(TEXI2HTML_FLAGS) $(srcdir)/standards.texi
-diff -urN autoconf-2.57a/doc/autoconf.texi autoconf-2.57a.info/doc/autoconf.texi
---- autoconf-2.57a/doc/autoconf.texi	2003-09-28 16:42:23.283765656 +0200
-+++ autoconf-2.57a.info/doc/autoconf.texi	2003-09-28 16:43:17.728488800 +0200
-@@ -1,9 +1,9 @@
- \input texinfo @c -*-texinfo-*-
- @comment ========================================================
- @comment %**start of header
--@setfilename autoconf.info
-+@setfilename autoconf25.info
- @include version.texi
--@settitle Autoconf
-+@settitle Autoconf v2.5
- @setchapternewpage odd
- @setcontentsaftertitlepage
- @finalout
-@@ -200,33 +200,33 @@
- 
- 
- 
--@dircategory Software development
-+@dircategory GNU programming tools
- @direntry
--* Autoconf: (autoconf).         Create source code configuration scripts.
-+* Autoconf v2.5: (autoconf25).         Create source code configuration scripts.
- @end direntry
- 
- @dircategory Individual utilities
- @direntry
--* autoscan: (autoconf)autoscan Invocation.
-+* autoscan: (autoconf25)autoscan Invocation.
- 				Semi-automatic @file{configure.ac} writing
--* ifnames: (autoconf)ifnames Invocation.        Listing conditionals in source.
--* autoconf: (autoconf)autoconf Invocation.
-+* ifnames: (autoconf25)ifnames Invocation.        Listing conditionals in source.
-+* autoconf: (autoconf25)autoconf Invocation.
- 				How to create configuration scripts
--* autoreconf: (autoconf)autoreconf Invocation.
-+* autoreconf: (autoconf25)autoreconf Invocation.
- 				Remaking multiple @command{configure} scripts
--* autoheader: (autoconf)autoheader Invocation.
-+* autoheader: (autoconf25)autoheader Invocation.
- 				How to create configuration templates
--* autom4te: (autoconf)autom4te Invocation.
-+* autom4te: (autoconf25)autom4te Invocation.
- 				The Autoconf executables backbone
--* configure: (autoconf)configure Invocation.    Configuring a package.
--* autoupdate: (autoconf)autoupdate Invocation.
-+* configure: (autoconf25)configure Invocation.    Configuring a package.
-+* autoupdate: (autoconf25)autoupdate Invocation.
- 				Automatic update of @file{configure.ac}
--* config.status: (autoconf)config.status Invocation. Recreating configurations.
--* testsuite: (autoconf)testsuite Invocation.    Running an Autotest test suite.
-+* config.status: (autoconf25)config.status Invocation. Recreating configurations.
-+* testsuite: (autoconf25)testsuite Invocation.    Running an Autotest test suite.
- @end direntry
- 
- @titlepage
--@title Autoconf
-+@title Autoconf v2.5
- @subtitle Creating Automatic Configuration Scripts
- @subtitle for version @value{VERSION}, @value{UPDATED}
- @author David MacKenzie
diff --git a/sys-devel/autoconf/files/digest-autoconf-2.57-r1 b/sys-devel/autoconf/files/digest-autoconf-2.57-r1
deleted file mode 100644
index 8c1eeddbdd02..000000000000
--- a/sys-devel/autoconf/files/digest-autoconf-2.57-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 407ea53787ce13f5ca427e9a51e05bc2 autoconf-2.57.tar.bz2 811439
-MD5 9de56d4a161a723228220b0f425dc711 autoconf-2.13.tar.gz 443844
diff --git a/sys-devel/autoconf/files/digest-autoconf-2.57a-r1 b/sys-devel/autoconf/files/digest-autoconf-2.57a-r1
deleted file mode 100644
index 469bd54bbd78..000000000000
--- a/sys-devel/autoconf/files/digest-autoconf-2.57a-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 61297397b9c5740132c34e32d7967ac1 autoconf-2.57a.tar.bz2 839100
-MD5 9de56d4a161a723228220b0f425dc711 autoconf-2.13.tar.gz 443844
diff --git a/sys-devel/autoconf/files/digest-autoconf-2.58 b/sys-devel/autoconf/files/digest-autoconf-2.58
deleted file mode 100644
index 0331bc77f727..000000000000
--- a/sys-devel/autoconf/files/digest-autoconf-2.58
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 db3fa3069c6554b3505799c7e1022e2b autoconf-2.58.tar.bz2 925208
-MD5 9de56d4a161a723228220b0f425dc711 autoconf-2.13.tar.gz 443844
diff --git a/sys-devel/autoconf/files/digest-autoconf-2.58-r1 b/sys-devel/autoconf/files/digest-autoconf-2.58-r1
deleted file mode 100644
index 0331bc77f727..000000000000
--- a/sys-devel/autoconf/files/digest-autoconf-2.58-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 db3fa3069c6554b3505799c7e1022e2b autoconf-2.58.tar.bz2 925208
-MD5 9de56d4a161a723228220b0f425dc711 autoconf-2.13.tar.gz 443844
diff --git a/sys-devel/autoconf/files/digest-autoconf-2.59-r3 b/sys-devel/autoconf/files/digest-autoconf-2.59-r3
deleted file mode 100644
index a9ae401381fd..000000000000
--- a/sys-devel/autoconf/files/digest-autoconf-2.59-r3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 1ee40f7a676b3cfdc0e3f7cd81551b5f autoconf-2.59.tar.bz2 925073
-MD5 9de56d4a161a723228220b0f425dc711 autoconf-2.13.tar.gz 443844