Version bump. Added config.guess-uclibc.patch from Peter S. Mazinger

5 files changed, 665 insertions, 8 deletions

diff --git a/sys-devel/automake/ChangeLog b/sys-devel/automake/ChangeLog
index 918ea7e62642..ad7391415053 100644
--- a/sys-devel/automake/ChangeLog
+++ b/sys-devel/automake/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/automake
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/ChangeLog,v 1.54 2004/04/27 02:52:31 randy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/ChangeLog,v 1.55 2004/05/29 21:59:41 solar Exp $
+
+*automake-1.8.5 (29 May 2004)
+
+  29 May 2004; <solar@gentoo.org> automake-1.8.5.ebuild,
+  files/automake-1.8.5-config-guess-uclibc.patch:
+  Version bump. Added config.guess-uclibc.patch from Peter S. Mazinger
 
   26 Apr 2004; Michael McCabe <randy@gentoo.org> automake-1.8.3.ebuild:
   Stable on s390
diff --git a/sys-devel/automake/Manifest b/sys-devel/automake/Manifest
index fe38c9d794aa..b1fe717f37dd 100644
--- a/sys-devel/automake/Manifest
+++ b/sys-devel/automake/Manifest
@@ -1,30 +1,33 @@
-MD5 2b5b0e758b7a3fec446228f0af0e37d1 ChangeLog 8875
+MD5 f70de7031479b790b77cb0046ca74aa1 ChangeLog 9085
 MD5 a0fb02c0fae4db3b42655b4ef3107409 automake-1.6.1-r6.ebuild 7888
 MD5 f312e2d0bb13bdd8fa94895bf1983a24 automake-1.6.3.ebuild 8622
 MD5 601b7353b670e74b71861fece6858537 automake-1.7.2.ebuild 10522
 MD5 00a8c18a2333ce2715965247edfe9607 automake-1.7.5-r2.ebuild 10551
 MD5 7f1beee0d0dc42c63be04f4d3e9b1e8e automake-1.7.7.ebuild 10551
 MD5 d5968b682665a6c988cfe2ba210dad61 automake-1.7.8.ebuild 10557
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 1ef60e39199a988af88594a0ace79dcc automake-1.8.2.ebuild 12393
 MD5 3896b4a5a8818e560fff5d033f6b6242 automake-1.8.3.ebuild 12648
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 adf619ab82f43eb4cbbd0ec4667f1a3f automake-1.8.5.ebuild 12714
 MD5 0aceb83a953ea5fb93e7dfbca4055e07 files/am-wrapper.pl-1.5 1599
 MD5 50b9b3413db5942659f7ec0bf5fc1cb5 files/am-wrapper.pl-1.6 2735
 MD5 d17e61bff6e2fcbcc019892df9504afd files/am-wrapper.pl-1.7 5233
-MD5 a354af1de0e1321fb5b8fdc0e5fa9c45 files/am-wrapper.pl-1.8 6246
 MD5 41ad4c592f0cb2cbc83ff461fc36eea9 files/automake-1.4_p5-ignore-duplicates.patch 882
 MD5 fbf3743bc8590dcb5bd34c675cb9d9f0 files/automake-1.5-target_hook.patch 1132
 MD5 efeb425eb64e48fb408abbb521c13be0 files/automake-1.7.2-infopage-namechange.patch 507
 MD5 e93136e02eb000c938f564484d306d76 files/automake-1.7.5-infopage-namechange.patch 592
-MD5 e93136e02eb000c938f564484d306d76 files/automake-1.7.7-infopage-namechange.patch 592
-MD5 e93136e02eb000c938f564484d306d76 files/automake-1.7.8-infopage-namechange.patch 592
-MD5 e93136e02eb000c938f564484d306d76 files/automake-1.7.9-infopage-namechange.patch 592
-MD5 9587f00ace066c11b5c22d72afe630a9 files/automake-1.8.2-infopage-namechange.patch 1131
 MD5 14581f79becf382f8dadeacb3f617356 files/digest-automake-1.6.1-r6 198
 MD5 edda410a5e7d1a809f7bd679289c7a5f files/digest-automake-1.6.3 198
 MD5 d9fa713e36ec2111a2fa03c0d6644f5b files/digest-automake-1.7.2 265
 MD5 6f85249cd60cd57baa49f351b058be56 files/digest-automake-1.7.5-r2 265
+MD5 e93136e02eb000c938f564484d306d76 files/automake-1.7.7-infopage-namechange.patch 592
 MD5 499f34d60d911cb54caa2232ad4e4e4b files/digest-automake-1.7.7 265
+MD5 e93136e02eb000c938f564484d306d76 files/automake-1.7.8-infopage-namechange.patch 592
 MD5 8323d1ae3957342232c30ee2a26ba556 files/digest-automake-1.7.8 265
+MD5 a354af1de0e1321fb5b8fdc0e5fa9c45 files/am-wrapper.pl-1.8 6246
+MD5 e93136e02eb000c938f564484d306d76 files/automake-1.7.9-infopage-namechange.patch 592
+MD5 9587f00ace066c11b5c22d72afe630a9 files/automake-1.8.2-infopage-namechange.patch 1131
 MD5 66a380a53b5136769e9adc454269c6b1 files/digest-automake-1.8.2 332
 MD5 d455e078ac4502784651e0fed838858e files/digest-automake-1.8.3 332
+MD5 d576cbc9cda51d6288db8b8569eb9e2a files/automake-1.8.5-config-guess-uclibc.patch 4693
+MD5 7abe94459d460b0af03ee8720383607b files/digest-automake-1.8.5 332
diff --git a/sys-devel/automake/automake-1.8.5.ebuild b/sys-devel/automake/automake-1.8.5.ebuild
new file mode 100644
index 000000000000..fb6daf6208a9
--- /dev/null
+++ b/sys-devel/automake/automake-1.8.5.ebuild
@@ -0,0 +1,499 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.8.5.ebuild,v 1.1 2004/05/29 21:59:41 solar 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}"
+S="${WORKDIR}/${P}"
+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://www.gnu.org/software/automake/automake.html"
+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="~x86 ~ppc ~ppc64 ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~s390"
+IUSE=""
+
+DEPEND="dev-lang/perl
+	>=sys-devel/autoconf-2.58"
+
+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=1
+
+	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=1
+
+	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=1
+
+	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}
+	newexe ${FILESDIR}/am-wrapper.pl-1.8 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
+}
+
+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' have changed to:"
+	echo
+	einfo "  WANT_AUTOMAKE=<required version>"
+	echo
+	einfo "For instance:  WANT_AUTOMAKE=1.6"
+	echo
+}
+
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
new file mode 100644
index 000000000000..f166a556c6da
--- /dev/null
+++ b/sys-devel/automake/files/automake-1.8.5-config-guess-uclibc.patch
@@ -0,0 +1,144 @@
+--- ./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 b/sys-devel/automake/files/digest-automake-1.8.5
new file mode 100644
index 000000000000..4e5695d11b21
--- /dev/null
+++ b/sys-devel/automake/files/digest-automake-1.8.5
@@ -0,0 +1,5 @@
+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