old

(Portage version: 2.0.51-r15)

10 files changed, 0 insertions, 1188 deletions

diff --git a/sys-devel/autoconf/autoconf-2.59-r5.ebuild b/sys-devel/autoconf/autoconf-2.59-r5.ebuild
deleted file mode 100644
index 6eaa57349190..000000000000
--- a/sys-devel/autoconf/autoconf-2.59-r5.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.59-r5.ebuild,v 1.3 2005/01/02 23:58:57 ciaranm 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="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
-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}
-	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 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/files/ac-wrapper.pl b/sys-devel/autoconf/files/ac-wrapper.pl
deleted file mode 100644
index 984ce670f378..000000000000
--- a/sys-devel/autoconf/files/ac-wrapper.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.13-configure-gentoo.diff b/sys-devel/autoconf/files/autoconf-2.13-configure-gentoo.diff
deleted file mode 100644
index 9188ffdad024..000000000000
--- a/sys-devel/autoconf/files/autoconf-2.13-configure-gentoo.diff
+++ /dev/null
@@ -1,27 +0,0 @@
---- configure.orig	Wed Feb 28 20:51:53 2001
-+++ configure	Wed Feb 28 20:52:03 2001
-@@ -654,12 +654,10 @@
-   echo "$ac_t""no" 1>&6
- fi
- 
--if test "$PERL" != no; then
--  SCRIPTS=autoscan
--else
--  echo "configure: warning: autoscan will not be built since perl is not found" 1>&2
-+if test "$PERL" = no; then
-+  PERL=/usr/bin/perl
- fi
--
-+SCRIPTS=autoscan
- ac_aux_dir=
- for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
-   if test -f $ac_dir/install-sh; then
-@@ -691,7 +689,7 @@
- # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
- # ./install, which can be erroneously created by make from ./install.sh.
- echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
--echo "configure:695: checking for a BSD compatible install" >&5
-+echo "configure:693: checking for a BSD compatible install" >&5
- if test -z "$INSTALL"; then
- if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
diff --git a/sys-devel/autoconf/files/autoconf-2.13-configure.in-gentoo.diff b/sys-devel/autoconf/files/autoconf-2.13-configure.in-gentoo.diff
deleted file mode 100644
index a8b505897ac2..000000000000
--- a/sys-devel/autoconf/files/autoconf-2.13-configure.in-gentoo.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- configure.orig	Wed Feb 28 20:53:24 2001
-+++ configure.in	Wed Feb 28 20:53:28 2001
-@@ -14,12 +14,10 @@
- AC_PATH_PROG(PERL, perl, no)
- AC_SUBST(PERL)dnl
- AC_SUBST(SCRIPTS)dnl
--if test "$PERL" != no; then
--  SCRIPTS=autoscan
--else
--  AC_MSG_WARN(autoscan will not be built since perl is not found)
-+if test "$PERL" = no; then
-+  PERL=/usr/bin/perl
- fi
--
-+SCRIPTS=autoscan
- AC_PROG_INSTALL
- 
- # Work with the GNU or Cygnus source tree layout.
diff --git a/sys-devel/autoconf/files/autoconf-2.58-infopage-namechange.patch b/sys-devel/autoconf/files/autoconf-2.58-infopage-namechange.patch
deleted file mode 100644
index b1ef64cd7bbf..000000000000
--- a/sys-devel/autoconf/files/autoconf-2.58-infopage-namechange.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-diff -urN autoconf-2.58/doc/Makefile.in autoconf-2.58.info/doc/Makefile.in
---- autoconf-2.58/doc/Makefile.in	2003-09-28 16:42:23.267768088 +0200
-+++ autoconf-2.58.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.58/doc/autoconf.texi autoconf-2.58.info/doc/autoconf.texi
---- autoconf-2.58/doc/autoconf.texi	2003-09-28 16:42:23.283765656 +0200
-+++ autoconf-2.58.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
-@@ -210,27 +210,27 @@
- 
- @dircategory Software development
- @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 v2.5: (autoconf25)autoscan Invocation.
-                                 Semi-automatic @file{configure.ac} writing
--* ifnames: (autoconf)ifnames Invocation.        Listing conditionals in source.
--* autoconf: (autoconf)autoconf Invocation.
-+* ifnames v2.5: (autoconf25)ifnames Invocation.        Listing conditionals in source.
-+* autoconf v2.5: (autoconf25)autoconf Invocation.
-                                 How to create configuration scripts
--* autoreconf: (autoconf)autoreconf Invocation.
-+* autoreconf v2.5: (autoconf25)autoreconf Invocation.
-                                 Remaking multiple @command{configure} scripts
--* autoheader: (autoconf)autoheader Invocation.
-+* autoheader v2.5: (autoconf25)autoheader Invocation.
-                                 How to create configuration templates
--* autom4te: (autoconf)autom4te Invocation.
-+* autom4te v2.5: (autoconf25)autom4te Invocation.
-                                 The Autoconf executables backbone
--* configure: (autoconf)configure Invocation.    Configuring a package.
--* autoupdate: (autoconf)autoupdate Invocation.
-+* configure v2.5: (autoconf25)configure Invocation.    Configuring a package.
-+* autoupdate v2.5: (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 v2.5: (autoconf25)config.status Invocation. Recreating configurations.
-+* testsuite v2.5: (autoconf25)testsuite Invocation.    Running an Autotest test suite.
- @end direntry
- 
- @titlepage
diff --git a/sys-devel/autoconf/files/digest-autoconf-2.59-r5 b/sys-devel/autoconf/files/digest-autoconf-2.59-r5
deleted file mode 100644
index a9ae401381fd..000000000000
--- a/sys-devel/autoconf/files/digest-autoconf-2.59-r5
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 1ee40f7a676b3cfdc0e3f7cd81551b5f autoconf-2.59.tar.bz2 925073
-MD5 9de56d4a161a723228220b0f425dc711 autoconf-2.13.tar.gz 443844
diff --git a/sys-devel/automake/automake-1.8.5-r1.ebuild b/sys-devel/automake/automake-1.8.5-r1.ebuild
deleted file mode 100644
index e5da8d28cfb9..000000000000
--- a/sys-devel/automake/automake-1.8.5-r1.ebuild
+++ /dev/null
@@ -1,503 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.8.5-r1.ebuild,v 1.16 2005/01/11 01:15:24 vapier Exp $
-
-inherit eutils
-
-# OLD14 = 1.4
-# OLD15 = 1.5
-# OLD16 = 1.6
-# OLD17 = 1.7
-# NEW = 1.8 (.2)
-
-# NOTE:  For all of those brave souls out there that wants to fix
-#        or update this, note that all three versions install
-#        .m4 files to /usr/share/aclocal-${ver}/ and .am files
-#        to /usr/share/automake-${ver}/.  We then add the default
-#        /usr/share/aclocal/ to aclocal's search path by adding
-#        "push (@dirlist, \"/usr/share/aclocal\");" after @dirlist
-#        is defined the first time (done in fix_bins() function).
-#
-#        The theory thus is, all version specific data goes into
-#        version specific directories, but programs like ogg/whatever
-#        can still install thier .m4 macros into /usr/share/aclocal/.
-#
-#        Martin Schlemmer <azarah@gentoo.org>
-#        19 May 2002
-
-
-# Currently this is 1.8, but it could change to 1.8.x as it
-# does with 1.5d ... to determine this, install latest version
-# of 1.8, and look at the generated files in the bin dir ..
-# it should be something like (for 1.8.1):
-#
-# nosferatu automake-1.8.1 # ls /myinstallroot/bin/
-# aclocal  aclocal-1.8  automake  automake-1.8
-# nosferatu automake-1.8.1 #
-#
-# You should then set NEW_PV to 1.8, as this is the suffix
-NEW_PV="1.8"
-
-OLD17_PV="1.7.9"
-OLD17_PV_S="1.7"
-OLD17_P="${PN}-${OLD17_PV}"
-OLD16_PV="1.6.3"
-OLD16_PV_S="1.6"
-OLD16_P="${PN}-${OLD16_PV}"
-OLD15_PV="1.5"
-OLD15_P="${PN}-${OLD15_PV}"
-OLD14_PV="1.4-p6"
-OLD14_P="${PN}-${OLD14_PV}"
-OLD17_S="${WORKDIR}/${OLD17_P}"
-OLD16_S="${WORKDIR}/${OLD16_P}"
-OLD15_S="${WORKDIR}/${OLD15_P}"
-OLD14_S="${WORKDIR}/${OLD14_P}"
-DESCRIPTION="Used to generate Makefile.in from Makefile.am"
-HOMEPAGE="http://sources.redhat.com/automake/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2
-	mirror://gnu/${PN}/${OLD17_P}.tar.bz2
-	mirror://gnu/${PN}/${OLD16_P}.tar.bz2
-	mirror://gnu/${PN}/${OLD15_P}.tar.gz
-	mirror://gnu/${PN}/${OLD14_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="1.5"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
-IUSE="uclibc"
-
-DEPEND="dev-lang/perl
-	>=sys-devel/autoconf-2.59-r5"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${OLD15_S}
-	epatch ${FILESDIR}/${PN}-${OLD15_PV}-target_hook.patch
-	cd ${OLD17_S}
-	epatch ${FILESDIR}/${PN}-${OLD17_PV}-infopage-namechange.patch
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-1.8.2-infopage-namechange.patch
-	epatch ${FILESDIR}/${PN}-1.8.5-config-guess-uclibc.patch
-}
-
-src_compile() {
-	#
-	# ************ automake-1.8x ************
-	#
-
-	# stupid configure script goes and run autoconf in a subdir,
-	# so 'ac-wrapper.pl' do not detect that it should use
-	# autoconf-2.5x
-	export WANT_AUTOCONF=2.5
-
-	cd ${S}
-
-	perl -pi -e 's:setfilename automake.info:setfilename automake18.info:' \
-		doc/automake.texi
-	perl -pi -e 's|\* automake: \(automake\)|\* Automake v1\.8: \(automake\)|' \
-		doc/automake.texi
-	perl -pi -e 's|\* aclocal:|\* aclocal v1.8:|' doc/automake.texi
-	perl -pi -e 's:\(automake\):\(automake18\):' doc/automake.texi
-
-	./configure \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		--target=${CHOST} \
-		|| die "configure 1.8x failed"
-	emake || die "emake 1.8x failed"
-
-	#
-	# ************ automake-1.7x ************
-	#
-
-	# stupid configure script goes and run autoconf in a subdir,
-	# so 'ac-wrapper.pl' do not detect that it should use
-	# autoconf-2.5x
-	export WANT_AUTOCONF=2.5
-
-	cd ${OLD17_S}
-
-	perl -pi -e 's:setfilename automake.info:setfilename automake17.info:' \
-		automake.texi
-	perl -pi -e 's|\* automake: \(automake\)|\* Automake v1\.7: \(automake\)|' \
-		automake.texi
-	perl -pi -e 's|\* aclocal:|\* aclocal v1.7:|' automake.texi
-	perl -pi -e 's:\(automake\):\(automake17\):' automake.texi
-
-	./configure \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		--target=${CHOST} \
-		|| die "configure 1.7x failed"
-	emake || die "emake 1.7x failed"
-
-	#
-	# ************ automake-1.6x ************
-	#
-
-	# stupid configure script goes and run autoconf in a subdir,
-	# so 'ac-wrapper.pl' do not detect that it should use
-	# autoconf-2.5x
-	export WANT_AUTOCONF=2.5
-
-	cd ${OLD16_S}
-
-	perl -pi -e 's:setfilename automake.info:setfilename automake16.info:' \
-		automake.texi
-	perl -pi -e 's|\* automake: \(automake\)|\* Automake v1\.6: \(automake\)|' \
-		automake.texi
-	perl -pi -e 's|\* aclocal:|\* aclocal v1.6:|' automake.texi
-	perl -pi -e 's:\(automake\):\(automake16\):' automake.texi
-
-	./configure \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		--target=${CHOST} \
-		|| die "configure 1.6x failed"
-	emake || die "emake 1.6x failed"
-
-	#
-	# ************ automake-1.5x ************
-	#
-
-	cd ${OLD15_S}
-
-	perl -pi -e 's:setfilename automake.info:setfilename automake15.info:' \
-		automake.texi
-	perl -pi -e 's|\* automake: \(automake\)|\* Automake v1\.5: \(automake\)|' \
-		automake.texi
-	perl -pi -e 's|\* aclocal:|\* aclocal v1.5:|' automake.texi
-	perl -pi -e 's:\(automake\):\(automake15\):' automake.texi
-
-	./configure \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		--target=${CHOST} \
-		|| die "configure 1.5x failed"
-	emake || die "emake 1.5x failed"
-	unset WANT_AUTOCONF=2.5
-
-	#
-	# ************ automake-1.4-p6 ************
-	#
-	cd ${OLD14_S}
-
-	perl -pi -e 's|\* automake: \(automake\)|\* Automake v1\.4: \(automake\)|' \
-		automake.texi
-	perl -pi -e 's|\* aclocal:|\* aclocal v1.4:|' automake.texi
-	perl -pi -e 's:GNU admin:GNU programming tools:' automake.texi
-#	perl -pi -e 's|\* automake: \(automake\)|\* Automake: \(automake\)|' \
-#		automake.texi
-
-	./configure \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		--target=${CHOST} \
-		|| die "configure 1.4 failed"
-	emake || die "emake 1.4 failed"
-}
-
-# This basically fix aclocal and automake so that they
-# use the correct directories, and also adds the normal
-# /usr/share/aclocal for aclocal to include.
-fix_bins() {
-
-	for x in aclocal automake
-	do
-		perl -pi -e "s:share/automake\":share/automake-${1}\":g" ${x}
-		perl -pi -e "s:share/aclocal\":share/aclocal-${1}\":g" ${x}
-	done
-
-	# add "/usr/share/aclocal" to m4 search patch
-	cp aclocal aclocal.orig
-	sed -e '/&scan_m4_files (@dirlist);/i \push (@dirlist, \"/usr/share/aclocal\");' \
-		aclocal.orig > aclocal
-	# same as above, but 1.4 looks a bit differently
-	cp aclocal aclocal.orig
-	sed -e '/&scan_m4_files ($acdir, @dirlist);/i \push (@dirlist, \"/usr/share/aclocal\");' \
-		aclocal.orig > aclocal
-	# "aclocal --print-ac-dir" should return "/usr/share/aclocal"
-	cp aclocal aclocal.orig
-	sed -e 's:print $acdir:print "/usr/share/aclocal":' \
-		aclocal.orig > aclocal
-}
-
-src_install() {
-
-	# install wrapper script for autodetecting the proper version
-	# to use.
-	exeinto /usr/lib/${PN}
-	doexe ${FILESDIR}/am-wrapper.pl
-	# Name binaries to exact version, as they have limited support for
-	# more than one version installs
-	dosed "s:1\.8x:${NEW_PV}:g" /usr/lib/${PN}/am-wrapper.pl
-	dosed "s:1\.7x:${OLD17_PV_S}:g" /usr/lib/${PN}/am-wrapper.pl
-	dosed "s:1\.6x:${OLD16_PV_S}:g" /usr/lib/${PN}/am-wrapper.pl
-	dosed "s:1\.5x:${OLD15_PV}:g" /usr/lib/${PN}/am-wrapper.pl
-
-	#
-	# ************ automake-1.8x ************
-	#
-
-	cd ${S}
-# not needed for 1.8.2
-#	fix_bins ${NEW_PV}
-
-	make DESTDIR=${D} \
-		install || die
-
-	for x in automake aclocal
-	do
-#		mv ${D}/usr/bin/${x} ${D}/usr/bin/${x}-${NEW_PV}
-		rm -f ${D}/usr/bin/${x}
-	done
-
-	doinfo doc/automake18.info*
-
-	docinto ${PV}
-	dodoc COPYING NEWS README THANKS TODO AUTHORS ChangeLog
-
-	#
-	# ************ automake-1.7x ************
-	#
-
-	cd ${OLD17_S}
-# not needed for 1.7.8
-#	fix_bins ${NEW_PV}
-
-	make DESTDIR=${D} \
-		install || die
-
-	for x in automake aclocal
-	do
-#		mv ${D}/usr/bin/${x} ${D}/usr/bin/${x}-${NEW_PV}
-		rm -f ${D}/usr/bin/${x}
-	done
-
-	doinfo automake17.info*
-
-	docinto ${OLD17_PV}
-	dodoc COPYING NEWS README THANKS TODO AUTHORS ChangeLog
-
-	#
-	# ************ automake-1.6x ************
-	#
-
-	cd ${OLD16_S}
-# not needed for 1.6.3
-#	fix_bins ${NEW_PV}
-
-	make DESTDIR=${D} \
-		install || die
-
-	for x in automake aclocal
-	do
-#		mv ${D}/usr/bin/${x} ${D}/usr/bin/${x}-${NEW_PV}
-		rm -f ${D}/usr/bin/${x}
-	done
-
-	doinfo automake16.info*
-
-	docinto ${OLD16_PV}
-	dodoc COPYING NEWS README THANKS TODO AUTHORS ChangeLog
-
-	#
-	# ************ automake-1.5x ************
-	#
-
-	cd ${OLD15_S}
-	fix_bins ${OLD15_PV}
-
-	make DESTDIR=${D} \
-		pkgdatadir=/usr/share/automake-${OLD15_PV} \
-		m4datadir=/usr/share/aclocal-${OLD15_PV} \
-		install || die
-
-	for x in automake aclocal
-	do
-		mv ${D}/usr/bin/${x} ${D}/usr/bin/${x}-${OLD15_PV}
-		rm -f ${D}/usr/bin/${x}
-	done
-
-	doinfo automake15.info*
-
-	docinto ${OLD15_PV}
-	dodoc COPYING NEWS README THANKS TODO AUTHORS ChangeLog
-
-	#
-	# ************ automake-1.4-p6 ************
-	#
-
-	cd ${OLD14_S}
-# Not needed anymore for 1.4-p6
-#	fix_bins "1.4"
-
-	# Ignore duplicates like automake-1.5 and 1.6
-	#epatch ${FILESDIR}/${PN}-1.4_p5-ignore-duplicates.patch
-
-	make DESTDIR=${D} \
-		pkgdatadir=/usr/share/automake-1.4 \
-		m4datadir=/usr/share/aclocal-1.4 \
-		install || die
-
-	for x in automake aclocal
-	do
-		mv ${D}/usr/bin/${x} ${D}/usr/bin/${x}-1.4
-		dosym ../lib/${PN}/am-wrapper.pl /usr/bin/${x}
-	done
-
-	docinto ${OLD14_PV}
-	dodoc COPYING NEWS README THANKS TODO AUTHORS ChangeLog
-
-	#
-	# ************ misc stuff ****************
-
-	# Some packages needs a /usr/share/automake directory
-	dosym automake-1.4 /usr/share/automake
-
-	# This is the default macro directory that apps use ..
-	keepdir /usr/share/aclocal
-
-	# remove all config.guess and config.sub files replacing them
-	# w/ a symlink to a specific gnuconfig version
-	use uclibc && for x in $(find ${D}/usr/share -name config.guess -o -name config.sub) ; do
-		rm -f ${x}; ln -sf ../gnuconfig/$(basename ${x}) ${x}
-	done
-}
-
-pkg_preinst() {
-
-	# remove these to make sure symlinks install properly if old versions
-	# was binaries
-	for x in automake aclocal
-	do
-		if [ -e ${ROOT}/usr/bin/${x} ]
-		then
-			rm -f ${ROOT}/usr/bin/${x}
-		fi
-	done
-
-	# nuke this if it is a directory, as the new one is a symlink
-	if [ -d ${ROOT}/usr/share/automake ]
-	then
-		rm -rf ${ROOT}/usr/share/automake
-	fi
-
-	# Make sure we move all the macros not installed with automake
-	# to the non version specific aclocal dir.
-	# !!! NOTE: I should really think about removing this lot !!!
-	if [ ! -d ${ROOT}/usr/share/aclocal ]
-	then
-		mkdir -p ${ROOT}/usr/share/aclocal
-	fi
-	if [ -d ${OLD14_S}/m4 ] && [ -d ${ROOT}/usr/share/aclocal-1.4 ]
-	then
-		for x in ${ROOT}/usr/share/aclocal-1.4/*.m4
-		do
-			if [ ! -f ${OLD14_S}/m4/${x##*/} ]
-			then
-				if [ ! -f ${ROOT}/usr/share/aclocal/${x##*/} ]
-				then
-					einfo "Moving ${x} to aclocal..."
-					mv -f ${x} ${ROOT}/usr/share/aclocal
-				else
-					einfo "Deleting duplicate ${x}..."
-					rm -f ${x}
-				fi
-			fi
-		done
-	fi
-	if [ -d ${OLD15_S}/m4 ] && [ -d ${ROOT}/usr/share/aclocal-${OLD15_PV} ]
-	then
-		for x in ${ROOT}/usr/share/aclocal-${OLD15_PV}/*.m4
-		do
-			if [ ! -f ${OLD15_S}/m4/${x##*/} ]
-			then
-				if [ ! -f ${ROOT}/usr/share/aclocal/${x##*/} ]
-				then
-					einfo "Moving ${x} to aclocal..."
-					mv -f ${x} ${ROOT}/usr/share/aclocal
-				else
-					einfo "Deleting duplicate ${x}..."
-					rm -f ${x}
-				fi
-			fi
-		done
-	fi
-	if [ -d ${OLD16_S}/m4 ] && [ -d ${ROOT}/usr/share/aclocal-${OLD16_PV_S} ]
-	then
-		for x in ${ROOT}/usr/share/aclocal-${OLD16_PV_S}/*.m4
-		do
-			if [ ! -f ${OLD16_S}/m4/${x##*/} ]
-			then
-				if [ ! -f ${ROOT}/usr/share/aclocal/${x##*/} ]
-				then
-					einfo "Moving ${x} to aclocal..."
-					mv -f ${x} ${ROOT}/usr/share/aclocal
-				else
-					einfo "Deleting duplicate ${x}..."
-					rm -f ${x}
-				fi
-			fi
-		done
-	fi
-	if [ -d ${OLD17_S}/m4 ] && [ -d ${ROOT}/usr/share/aclocal-${OLD17_PV_S} ]
-	then
-		for x in ${ROOT}/usr/share/aclocal-${OLD17_PV_S}/*.m4
-		do
-			if [ ! -f ${OLD17_S}/m4/${x##*/} ]
-			then
-				if [ ! -f ${ROOT}/usr/share/aclocal/${x##*/} ]
-				then
-					einfo "Moving ${x} to aclocal..."
-					mv -f ${x} ${ROOT}/usr/share/aclocal
-				else
-					einfo "Deleting duplicate ${x}..."
-					rm -f ${x}
-				fi
-			fi
-		done
-	fi
-	if [ -d ${S}/m4 ] && [ -d ${ROOT}/usr/share/aclocal-${NEW_PV} ]
-	then
-		for x in ${ROOT}/usr/share/aclocal-${NEW_PV}/*.m4
-		do
-			if [ ! -f ${S}/m4/${x##*/} ]
-			then
-				if [ ! -f ${ROOT}/usr/share/aclocal/${x##*/} ]
-				then
-					einfo "Moving ${x} to aclocal..."
-					mv -f ${x} ${ROOT}/usr/share/aclocal
-				else
-					einfo "Deleting duplicate ${x}..."
-					rm -f ${x}
-				fi
-			fi
-		done
-	fi
-}
-
-pkg_postinst() {
-
-	# nuke duplicate macros
-	for x in ${ROOT}/usr/share/aclocal-1.4/*.m4
-	do
-		if [ -f ${ROOT}/usr/share/aclocal/${x##*/} ]
-		then
-			rm -f ${ROOT}/usr/share/aclocal/${x##*/}
-		fi
-	done
-
-	echo
-	einfo "Please note that the 'WANT_AUTOMAKE_1_?=1' syntax has changed to:"
-	echo
-	einfo "  WANT_AUTOMAKE=<required version>"
-	echo
-	einfo "For instance:  WANT_AUTOMAKE=1.6"
-	echo
-}
diff --git a/sys-devel/automake/files/am-wrapper.pl b/sys-devel/automake/files/am-wrapper.pl
deleted file mode 100644
index 06df18861346..000000000000
--- a/sys-devel/automake/files/am-wrapper.pl
+++ /dev/null
@@ -1,150 +0,0 @@
-#!/usr/bin/perl
-#
-#
-# Author: Guillaume Cottenceau (gc@mandrakesoft.com)
-# Modified by: Martin Schlemmer (azarah@gentoo.org)
-#
-# 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 automake-1.4
-# - runs automake-1.8 if it exists and...
-#   - envvar WANT_AUTOMAKE is set to `1.8'
-#     -or-
-#   - `Makefile.in' was generated by automake-1.8 or superior, which
-#     specifically needs automake-1.8
-#     -or_
-#   - 'aclocal.m4' contain AM_AUTOMAKE_VERSION, specifying the use of 1.8
-# - runs automake-1.7 if it exists and...
-#   - envvar WANT_AUTOMAKE is set to `1.7'
-#     -or-
-#   - `Makefile.in' was generated by automake-1.7 or superior, which
-#     specifically needs automake-1.7
-#     -or-
-#   - 'aclocal.m4' contain AM_AUTOMAKE_VERSION, specifyint the use of 1.7
-#     -or-
-# - runs automake-1.6 if it exists and...
-#   - envvar WANT_AUTOMAKE is set to `1.6'
-#     -or-
-#   - `Makefile.in' was generated by automake-1.6 or superior, which
-#     specifically needs automake-1.6
-#     -or-
-#   - 'aclocal.m4' contain AM_AUTOMAKE_VERSION, specifyint the use of 1.6
-#     -or-
-#   - `configure.in' contains AC_PREREQ and the value's 3 first letters
-#      are stringwise greater than '2.53c'
-#     -or-
-#   - `configure' is already present and was generated by autoconf greater than
-#     '2.53c'
-# - runs automake-1.5 if it exists and...
-#   - envvar WANT_AUTOMAKE is set to `1.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.5 or superior, which
-#     specifically needs automake-1.5
-#
-#use MDK::Common;
-
-sub cat_ { local *F; open F, $_[0] or return; my @l = <F>; wantarray ? @l : join '', @l }
-sub am_version {
-	my $file = cat_(shift);
-	return (@versions = $file =~ /^\s*\[?AM_AUTOMAKE_VERSION\(\[?([^\)]{3}[0-9]?)[^\)]*\]?\)/mg) ? ((sort @versions)[-1]) : '';
-}
-sub ac_version {
-	my $file = cat_(shift);
-	return (@versions = $file =~ /^\s*\[?AC_PREREQ\(\[?([^\)]{3}[0-9]?)[^\)]*\]?\)/mg) ? ((sort @versions)[-1]) : '';
-}
-
-
-
-my $binary      = "$0-1.4";
-my $binary_1_5  = "$0-1.5x";
-my $binary_1_6  = "$0-1.6x";
-my $binary_1_7  = "$0-1.7x";
-my $binary_1_8  = "$0-1.8x";
-
-# Automake is really getting out of hand, so rather start supporting
-# WANT_AUTOMAKE = "1.7" the like.  Unfortunately it override the old
-# variables, so if not set, just convert the old variables ....
-if ($ENV{WANT_AUTOMAKE} eq "") {
-	if ($ENV{WANT_AUTOMAKE_1_4}) {
-		$ENV{WANT_AUTOMAKE} = '1.4';
-	} elsif ($ENV{WANT_AUTOMAKE_1_6}) {
-		$ENV{WANT_AUTOMAKE} = '1.6';
-	} elsif ($ENV{WANT_AUTOMAKE_1_5}) {
-		$ENV{WANT_AUTOMAKE} = '1.5';
-	}
-}
-
-# question here is do we really want 1.5 or 1.6?  Out of a KDE outlook, it
-# should rather be 1.5, and since most people would rather have migrated to
-# 1.5, and then stay with it for a bit (those 1.4 die hards ..), only have
-# the 'configure.ac' test for 1.5 ...
-if ($ENV{WANT_AUTOMAKE} ne '1.4') {
-	if (-x $binary_1_8              # user may not have _1_8 ...
-	&& (($ENV{WANT_AUTOMAKE} eq '1.8')
-	    || (cat_('Makefile.in') =~ /^# Makefile\.in generated by automake (\S+)/ ? $1 : '') ge '1.8'
-	    || (cat_('aclocal.m4') =~ /^# aclocal.m4 generated automatically by aclocal (\S+)/ ? $1 : '') ge '1.8'
-	    || am_version('aclocal.m4') ge '1.8')) {
-	$ENV{WANT_AUTOMAKE} = '1.8';    # to prevent further "cats" and to enhance consistency (possible cwd etc)
-	$binary         = $binary_1_8;
-        } elsif (-x $binary_1_7         # user may not have 1.7 ...
-	&& (($ENV{WANT_AUTOMAKE} eq '1.7')
-	    || (cat_('Makefile.in') =~ /^# Makefile\.in generated by automake (\S+)/ ? $1 : '') ge '1.7'
-	    || (cat_('aclocal.m4') =~ /^# aclocal.m4 generated automatically by aclocal (\S+)/ ? $1 : '') ge '1.7'
-	    || am_version('aclocal.m4') ge '1.7')) {
-	$ENV{WANT_AUTOMAKE} = '1.7';    # to prevent further "cats" and to enhance consistency (possible cwd etc)
-	$binary         = $binary_1_7;
-	} elsif (-x $binary_1_6         # user may not have 1.6 ...
-	&& (($ENV{WANT_AUTOMAKE} eq '1.6')
-	    || (cat_('Makefile.in') =~ /^# Makefile\.in generated by automake (\S+)/ ? $1 : '') ge '1.6'
-	    || (cat_('aclocal.m4') =~ /^# aclocal.m4 generated automatically by aclocal (\S+)/ ? $1 : '') ge '1.6'
-	    || am_version('aclocal.m4') ge '1.6'
-		# Autoconf 2.53d and later need automake-1.6c, so enable 1.6 for 2.53
-		# and up .....
-	    || ac_version('configure.in') gt '2.52'
-	    || (cat_('configure') =~ /^# Generated by Autoconf (\S+)/m ? $1 : '') gt '2.52'
-	    || ac_version('aclocal.m4') gt '2.52')) {
-	$ENV{WANT_AUTOMAKE} = '1.6';    # to prevent further "cats" and to enhance consistency (possible cwd etc)
-	$binary 		= $binary_1_6;
-    } elsif (-x $binary_1_5         # user may have only 1.4 ...
-	&& (($ENV{WANT_AUTOMAKE} eq '1.5')
-	    || -r 'configure.ac'
-	    || (cat_('Makefile.in') =~ /^# Makefile\.in generated by automake (\S+)/ ? $1 : '') ge '1.5'
-	    || (cat_('aclocal.m4') =~ /^# aclocal.m4 generated automatically by aclocal (\S+)/ ? $1 : '') ge '1.5'
-	    || ac_version('configure.in') gt '2.13'
-	    || (cat_('configure') =~ /^# Generated by Autoconf (\S+)/m ? $1 : '') gt '2.13'
-	    || ac_version('aclocal.m4') gt '2.13')) {
-	$ENV{WANT_AUTOMAKE} = '1.5';    # to prevent further "cats" and to enhance consistency (possible cwd etc)
-	$binary 		= $binary_1_5;
-    } else {
-	if (-r 'configure.in' || -r 'configure.ac') {
-		$ENV{WANT_AUTOMAKE} = '1.4';    # for further consistency
-	} else {
-		$ENV{WANT_AUTOMAKE} = '1.8';
-		$binary         = $binary_1_8;
-	}
-    }
-}
-
-$ENV{WANT_AMWRAPPER_DEBUG} and print STDERR "am-wrapper: will execute <$binary>\n";
-
-exec $binary, @ARGV;
-
-die "am-wrapper: ouch, couldn't call binary ($binary).\n";
diff --git a/sys-devel/automake/files/automake-1.8.5-config-guess-uclibc.patch b/sys-devel/automake/files/automake-1.8.5-config-guess-uclibc.patch
deleted file mode 100644
index f166a556c6da..000000000000
--- a/sys-devel/automake/files/automake-1.8.5-config-guess-uclibc.patch
+++ /dev/null
@@ -1,144 +0,0 @@
---- ./lib/config.guess.guess~	Sun Apr 18 12:50:36 2004
-+++ ./lib/config.guess	Fri May 28 23:29:50 2004
-@@ -136,6 +136,19 @@
- UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
- UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
- 
-+# Detect uclibc systems.
-+
-+LIBC="gnu"
-+if [ -f /usr/include/bits/uClibc_config.h ]
-+then
-+	LIBC=uclibc
-+	if [[ -n `grep "#define __UCLIBC_CONFIG_VERSION__" /usr/include/bits/uClibc_config.h` ]]
-+	then
-+		UCLIBC_SUBVER=`sed -n "/#define __UCLIBC_CONFIG_VERSION__ /s///p" /usr/include/bits/uClibc_config.h`
-+		LIBC=$LIBC$UCLIBC_SUBVER
-+	fi
-+fi
-+
- # Note: order is significant - the case branches are not exclusive.
- 
- case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-@@ -845,19 +858,19 @@
- 	echo ${UNAME_MACHINE}-pc-minix
- 	exit 0 ;;
-     arm*:Linux:*:*)
--	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- 	exit 0 ;;
-     cris:Linux:*:*)
--	echo cris-axis-linux-gnu
-+	echo cris-axis-linux-${LIBC}
- 	exit 0 ;;
-     ia64:Linux:*:*)
--	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- 	exit 0 ;;
-     m32r*:Linux:*:*)
--	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- 	exit 0 ;;
-     m68*:Linux:*:*)
--	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- 	exit 0 ;;
-     mips:Linux:*:*)
- 	eval $set_cc_for_build
-@@ -876,7 +889,7 @@
- 	#endif
- EOF
- 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
--	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
-+	test x"${CPU}" != x && echo "${CPU}-unknown-linux-${LIBC}" && exit 0
- 	;;
-     mips64:Linux:*:*)
- 	eval $set_cc_for_build
-@@ -895,13 +908,13 @@
- 	#endif
- EOF
- 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
--	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
-+	test x"${CPU}" != x && echo "${CPU}-unknown-linux-${LIBC}" && exit 0
- 	;;
-     ppc:Linux:*:*)
--	echo powerpc-unknown-linux-gnu
-+	echo powerpc-unknown-linux-${LIBC}
- 	exit 0 ;;
-     ppc64:Linux:*:*)
--	echo powerpc64-unknown-linux-gnu
-+	echo powerpc64-unknown-linux-${LIBC}
- 	exit 0 ;;
-     alpha:Linux:*:*)
- 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-@@ -914,34 +927,34 @@
- 	  EV68*) UNAME_MACHINE=alphaev68 ;;
-         esac
- 	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
--	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
--	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-+	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
-+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- 	exit 0 ;;
-     parisc:Linux:*:* | hppa:Linux:*:*)
- 	# Look for CPU level
- 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
--	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
--	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
--	  *)    echo hppa-unknown-linux-gnu ;;
-+	  PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
-+	  PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
-+	  *)    echo hppa-unknown-linux-${LIBC} ;;
- 	esac
- 	exit 0 ;;
-     parisc64:Linux:*:* | hppa64:Linux:*:*)
--	echo hppa64-unknown-linux-gnu
-+	echo hppa64-unknown-linux-${LIBC}
- 	exit 0 ;;
-     s390:Linux:*:* | s390x:Linux:*:*)
- 	echo ${UNAME_MACHINE}-ibm-linux
- 	exit 0 ;;
-     sh64*:Linux:*:*)
--    	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+    	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- 	exit 0 ;;
-     sh*:Linux:*:*)
--	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- 	exit 0 ;;
-     sparc:Linux:*:* | sparc64:Linux:*:*)
--	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- 	exit 0 ;;
-     x86_64:Linux:*:*)
--	echo x86_64-unknown-linux-gnu
-+	echo x86_64-unknown-linux-${LIBC}
- 	exit 0 ;;
-     i*86:Linux:*:*)
- 	# The BFD linker knows what the default object file format is, so
-@@ -956,20 +969,21 @@
- 				    p'`
-         case "$ld_supported_targets" in
- 	  elf32-i386)
--		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-+		TENTATIVE="${UNAME_MACHINE}-pc-linux-${LIBC}"
- 		;;
- 	  a.out-i386-linux)
--		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-+		echo "${UNAME_MACHINE}-pc-linux-${LIBC}aout"
- 		exit 0 ;;
- 	  coff-i386)
--		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-+		echo "${UNAME_MACHINE}-pc-linux-${LIBC}coff"
- 		exit 0 ;;
- 	  "")
- 		# Either a pre-BFD a.out linker (linux-gnuoldld) or
- 		# one that does not give us useful --help.
--		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-+		echo "${UNAME_MACHINE}-pc-linux-${LIBC}oldld"
- 		exit 0 ;;
- 	esac
-+	if [ $LIBC != "gnu" -o $LIBC != "gnulibc1" ];then echo "$TENTATIVE" && exit 0; fi
- 	# Determine whether the default compiler is a.out or elf
- 	eval $set_cc_for_build
- 	sed 's/^	//' << EOF >$dummy.c
diff --git a/sys-devel/automake/files/digest-automake-1.8.5-r1 b/sys-devel/automake/files/digest-automake-1.8.5-r1
deleted file mode 100644
index 4e5695d11b21..000000000000
--- a/sys-devel/automake/files/digest-automake-1.8.5-r1
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 0114aa6d7dc32112834b68105fb8d7e2 automake-1.8.5.tar.bz2 663182
-MD5 571fd0b0598eb2a27dcf68adcfddfacb automake-1.7.9.tar.bz2 577705
-MD5 2e8053609e9d318f80db0fce29dca7e9 automake-1.6.3.tar.bz2 476275
-MD5 74a22ac0581378e807ecb334a55c5bab automake-1.5.tar.gz 526934
-MD5 24872b81b95d78d05834c39af2cfcf05 automake-1.4-p6.tar.gz 375060