fix m4 depend

9 files changed, 303 insertions, 12 deletions

diff --git a/sys-devel/autoconf/ChangeLog b/sys-devel/autoconf/ChangeLog
index 340f7446b678..f51f18e9973f 100644
--- a/sys-devel/autoconf/ChangeLog
+++ b/sys-devel/autoconf/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/autoconf
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/ChangeLog,v 1.22 2003/03/09 16:46:20 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/ChangeLog,v 1.23 2003/03/15 14:48:28 azarah Exp $
+
+*autoconf-2.54-r1 (15 Mar 2003)
+*autoconf-2.57-r1 (15 Mar 2003)
+
+  15 Mar 2003; Martin Schlemmer <azarah@gentoo.org> :
+  Update m4 DEPEND to work with m4-1.4 we are now using.
 
   09 Mar 2003; Martin Schlemmer <azarah@gentoo.org> files/ac-wrapper.pl :
   Some new stuff have AC_PREREQ in [].
diff --git a/sys-devel/autoconf/autoconf-2.13-r2.ebuild b/sys-devel/autoconf/autoconf-2.13-r2.ebuild
index 160f90687b6f..3dfa03199924 100644
--- a/sys-devel/autoconf/autoconf-2.13-r2.ebuild
+++ b/sys-devel/autoconf/autoconf-2.13-r2.ebuild
@@ -1,17 +1,20 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.13-r2.ebuild,v 1.12 2003/02/13 16:25:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.13-r2.ebuild,v 1.13 2003/03/15 14:48:28 azarah Exp $
 
-S=${WORKDIR}/${P}
+IUSE=""
+
+S="${WORKDIR}/${P}"
 DESCRIPTION="Used to create autoconfiguration files"
 SRC_URI="ftp://prep.ai.mit.edu/gnu/autoconf/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/autoconf/autoconf.html"
-LICENSE="GPL-2"
-KEYWORDS="x86 sparc "
-DEPEND=">=sys-devel/m4-1.4o-r2"
 
+LICENSE="GPL-2"
+KEYWORDS="x86 sparc"
 SLOT="2"
 
+DEPEND="~sys-devel/m4-1.4"
+
 src_unpack() {
 
 	unpack ${A}
diff --git a/sys-devel/autoconf/autoconf-2.53a.ebuild b/sys-devel/autoconf/autoconf-2.53a.ebuild
index 0378359c9553..d8e51c183e84 100644
--- a/sys-devel/autoconf/autoconf-2.53a.ebuild
+++ b/sys-devel/autoconf/autoconf-2.53a.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.53a.ebuild,v 1.13 2003/03/11 21:11:47 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.53a.ebuild,v 1.14 2003/03/15 14:48:28 azarah Exp $
 
 OLD_PV=2.13
 OLD_P=${PN}-${OLD_PV}
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.gnu.org/software/autoconf/autoconf.html"
 LICENSE="GPL-2"
 KEYWORDS="x86 ppc sparc alpha mips arm"
 
-DEPEND=">=sys-devel/m4-1.4p
+DEPEND="~sys-devel/m4-1.4
 	dev-lang/perl"
 
 SLOT="2.5"
diff --git a/sys-devel/autoconf/autoconf-2.54-r1.ebuild b/sys-devel/autoconf/autoconf-2.54-r1.ebuild
new file mode 100644
index 000000000000..35529abe9ef2
--- /dev/null
+++ b/sys-devel/autoconf/autoconf-2.54-r1.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.54-r1.ebuild,v 1.1 2003/03/15 14:48:28 azarah Exp $
+
+IUSE=""
+
+inherit eutils
+
+OLD_PV="2.13"
+OLD_P="${PN}-${OLD_PV}"
+S="${WORKDIR}/${P}"
+OLD_S="${WORKDIR}/${OLD_P}"
+DESCRIPTION="Used to create autoconfiguration files"
+SRC_URI="ftp://ftp.gnu.org/gnu/${PN}/${P}.tar.bz2
+	ftp://ftp.gnu.org/gnu/${PN}/${OLD_P}.tar.gz"
+HOMEPAGE="http://www.gnu.org/software/autoconf/autoconf.html"
+
+LICENSE="GPL-2"
+SLOT="2.5"
+KEYWORDS="x86 ppc sparc alpha hppa mips arm"
+
+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.5-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}
+
+	perl -pi -e '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 /usr/bin/${x} ]
+		then
+			rm -f /usr/bin/${x}
+		fi
+	done
+}
+
diff --git a/sys-devel/autoconf/autoconf-2.54.ebuild b/sys-devel/autoconf/autoconf-2.54.ebuild
index 4300b941393f..b7d6cca4fbbc 100644
--- a/sys-devel/autoconf/autoconf-2.54.ebuild
+++ b/sys-devel/autoconf/autoconf-2.54.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.54.ebuild,v 1.12 2003/03/11 21:11:47 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.54.ebuild,v 1.13 2003/03/15 14:48:28 azarah Exp $
 
 IUSE=""
 
@@ -20,7 +20,7 @@ SLOT="2.5"
 KEYWORDS="x86 ppc sparc alpha hppa mips arm"
 
 DEPEND=">=sys-apps/texinfo-4.3
-	>=sys-devel/m4-1.4p
+	~sys-devel/m4-1.4
 	dev-lang/perl"
 
 
diff --git a/sys-devel/autoconf/autoconf-2.57-r1.ebuild b/sys-devel/autoconf/autoconf-2.57-r1.ebuild
new file mode 100644
index 000000000000..93e9c2a234a3
--- /dev/null
+++ b/sys-devel/autoconf/autoconf-2.57-r1.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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.1 2003/03/15 14:48:28 azarah Exp $
+
+IUSE=""
+
+inherit eutils
+
+OLD_PV="2.13"
+OLD_P="${PN}-${OLD_PV}"
+S="${WORKDIR}/${P}"
+OLD_S="${WORKDIR}/${OLD_P}"
+DESCRIPTION="Used to create autoconfiguration files"
+SRC_URI="ftp://ftp.gnu.org/gnu/${PN}/${P}.tar.bz2
+	ftp://ftp.gnu.org/gnu/${PN}/${OLD_P}.tar.gz"
+HOMEPAGE="http://www.gnu.org/software/autoconf/autoconf.html"
+
+LICENSE="GPL-2"
+SLOT="2.5"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~mips arm"
+
+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}
+
+	perl -pi -e '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 /usr/bin/${x} ]
+		then
+			rm -f /usr/bin/${x}
+		fi
+	done
+}
+
diff --git a/sys-devel/autoconf/autoconf-2.57.ebuild b/sys-devel/autoconf/autoconf-2.57.ebuild
index 86466314641e..9fb063c3ab4f 100644
--- a/sys-devel/autoconf/autoconf-2.57.ebuild
+++ b/sys-devel/autoconf/autoconf-2.57.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.57.ebuild,v 1.7 2003/03/11 21:11:47 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.57.ebuild,v 1.8 2003/03/15 14:48:28 azarah Exp $
 
 IUSE=""
 
@@ -20,7 +20,7 @@ SLOT="2.5"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~mips arm"
 
 DEPEND=">=sys-apps/texinfo-4.3
-	>=sys-devel/m4-1.4p
+	~sys-devel/m4-1.4
 	dev-lang/perl"
 
 
diff --git a/sys-devel/autoconf/files/digest-autoconf-2.54-r1 b/sys-devel/autoconf/files/digest-autoconf-2.54-r1
new file mode 100644
index 000000000000..8fe2d315b92c
--- /dev/null
+++ b/sys-devel/autoconf/files/digest-autoconf-2.54-r1
@@ -0,0 +1,2 @@
+MD5 572ef5257f6927ad21dbad395f3da799 autoconf-2.54.tar.bz2 782420
+MD5 9de56d4a161a723228220b0f425dc711 autoconf-2.13.tar.gz 443844
diff --git a/sys-devel/autoconf/files/digest-autoconf-2.57-r1 b/sys-devel/autoconf/files/digest-autoconf-2.57-r1
new file mode 100644
index 000000000000..8c1eeddbdd02
--- /dev/null
+++ b/sys-devel/autoconf/files/digest-autoconf-2.57-r1
@@ -0,0 +1,2 @@
+MD5 407ea53787ce13f5ca427e9a51e05bc2 autoconf-2.57.tar.bz2 811439
+MD5 9de56d4a161a723228220b0f425dc711 autoconf-2.13.tar.gz 443844