Update version.

5 files changed, 454 insertions, 3 deletions

diff --git a/sys-devel/automake/ChangeLog b/sys-devel/automake/ChangeLog
index 2f27b287a728..4de0add2c66f 100644
--- a/sys-devel/automake/ChangeLog
+++ b/sys-devel/automake/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/automake
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/ChangeLog,v 1.35 2003/09/17 18:58:12 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/ChangeLog,v 1.36 2003/09/28 12:30:41 azarah Exp $
+
+*automake-1.7.7 (28 Sep 2003)
+
+  28 Sep 2003; Martin Schlemmer <azarah@gentoo.org> automake-1.7.7.ebuild,
+  files/automake-1.7.7-infopage-namechange.patch:
+  Update version.
 
   17 Sep 2003; Jon Portnoy <avenj@gentoo.org> automake-1.7.5-r2.ebuild :
   ia64 keywords.
diff --git a/sys-devel/automake/Manifest b/sys-devel/automake/Manifest
index c57d6d41f0e1..65aca5be2466 100644
--- a/sys-devel/automake/Manifest
+++ b/sys-devel/automake/Manifest
@@ -1,13 +1,14 @@
 MD5 a3f43b0dc20de682ced9aa0e1020f87d automake-1.6.3.ebuild 8659
-MD5 7989432d7955b532fea2141cd3258af4 ChangeLog 6338
+MD5 3626a305fdcc818923a008a8bafcc937 ChangeLog 6514
 MD5 13217e119923c46fa2ec537611cda19f automake-1.6.1-r6.ebuild 7925
 MD5 fa0b3732a4e73b95a062faa646ee44ab automake-1.7.5-r2.ebuild 10586
 MD5 dcbcb204a53815b6d540cac81eb6f9cb automake-1.7.2.ebuild 10558
-MD5 fa0b3732a4e73b95a062faa646ee44ab automake-1.7.7.ebuild 10586
+MD5 19800a58651755337ea77e000cd9d39e automake-1.7.7.ebuild 10593
 MD5 499f34d60d911cb54caa2232ad4e4e4b files/digest-automake-1.7.7 265
 MD5 50b9b3413db5942659f7ec0bf5fc1cb5 files/am-wrapper.pl-1.6 2735
 MD5 6f85249cd60cd57baa49f351b058be56 files/digest-automake-1.7.5-r2 265
 MD5 d17e61bff6e2fcbcc019892df9504afd files/am-wrapper.pl-1.7 5233
+MD5 e93136e02eb000c938f564484d306d76 files/automake-1.7.7-infopage-namechange.patch 592
 MD5 d9fa713e36ec2111a2fa03c0d6644f5b files/digest-automake-1.7.2 265
 MD5 efeb425eb64e48fb408abbb521c13be0 files/automake-1.7.2-infopage-namechange.patch 507
 MD5 edda410a5e7d1a809f7bd679289c7a5f files/digest-automake-1.6.3 198
diff --git a/sys-devel/automake/automake-1.7.7.ebuild b/sys-devel/automake/automake-1.7.7.ebuild
new file mode 100644
index 000000000000..ef804e4f25d4
--- /dev/null
+++ b/sys-devel/automake/automake-1.7.7.ebuild
@@ -0,0 +1,425 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.7.7.ebuild,v 1.1 2003/09/28 12:30:41 azarah Exp $
+
+IUSE=""
+
+inherit eutils
+
+# OLD14 = 1.4
+# OLD15 = 1.5
+# OLD16 = 1.6
+# NEW = 1.7 (.5)
+
+# 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.7, but it could change to 1.7.x as it
+# does with 1.5d ... to determine this, install latest version
+# of 1.7, and look at the generated files in the bin dir ..
+# it should be something like (for 1.7.1):
+#
+# nosferatu automake-1.7.1 # ls /myinstallroot/bin/
+# aclocal  aclocal-1.7  automake  automake-1.7
+# nosferatu automake-1.7.1 #
+#
+# You should then set NEW_PV to 1.7, as this is the suffix
+NEW_PV="1.7"
+
+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}"
+OLD16_S="${WORKDIR}/${OLD16_P}"
+OLD15_S="${WORKDIR}/${OLD15_P}"
+OLD14_S="${WORKDIR}/${OLD14_P}"
+DESCRIPTION="Used to generate Makefile.in from Makefile.am"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2
+	mirror://gnu/${PN}/${OLD16_P}.tar.bz2
+	mirror://gnu/${PN}/${OLD15_P}.tar.gz
+	mirror://gnu/${PN}/${OLD14_P}.tar.gz"
+HOMEPAGE="http://www.gnu.org/software/automake/automake.html"
+
+LICENSE="GPL-2"
+SLOT="1.5"
+KEYWORDS="~amd64 ~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~arm ~ia64"
+
+DEPEND="dev-lang/perl
+	>=sys-devel/autoconf-2.57"
+
+
+src_unpack() {
+
+	unpack ${A}
+
+	cd ${OLD15_S}
+	epatch ${FILESDIR}/${PN}-${OLD15_PV}-target_hook.patch
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-infopage-namechange.patch
+}
+
+src_compile() {
+
+	#
+	# ************ 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 ${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
+
+	emake || die
+
+	#
+	# ************ 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
+
+	emake || die
+
+	#
+	# ************ 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
+
+	emake || die
+	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
+
+	emake || die
+}
+
+# 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.7 am-wrapper.pl
+	# Name binaries to exact version, as they have limited support for
+	# more than one version installs
+	dosed "s:1\.7x:${NEW_PV}: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.6x ************
+	#
+
+	cd ${S}
+# not needed for 1.7.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 automake17.info*
+
+	docinto ${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 ${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 ..
+	dodir /usr/share/aclocal
+	touch ${D}/usr/share/aclocal/.keep
+}
+
+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.
+	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 ${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.7.7-infopage-namechange.patch b/sys-devel/automake/files/automake-1.7.7-infopage-namechange.patch
new file mode 100644
index 000000000000..0e6708a55099
--- /dev/null
+++ b/sys-devel/automake/files/automake-1.7.7-infopage-namechange.patch
@@ -0,0 +1,15 @@
+--- Makefile.in	2003-06-30 17:07:30.000000000 +0000
++++ Makefile.in	2003-06-30 17:09:28.000000000 +0000
+@@ -199,8 +199,9 @@
+ 
+ .texi.info:
+ 	@rm -f $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]
+-	$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
+-	 -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++	cd $(srcdir) \
++		&& $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \
++			`echo $< | sed 's,.*/,,'`
+ 
+ .texi.dvi:
+ 	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
+ 	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
diff --git a/sys-devel/automake/files/digest-automake-1.7.7 b/sys-devel/automake/files/digest-automake-1.7.7
new file mode 100644
index 000000000000..e504c3a63dec
--- /dev/null
+++ b/sys-devel/automake/files/digest-automake-1.7.7
@@ -0,0 +1,4 @@
+MD5 4323c25644ed092c3d4fdfef434ab28d automake-1.7.7.tar.bz2 575207
+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