new version

12 files changed, 89 insertions, 278 deletions

diff --git a/sys-devel/automake/ChangeLog b/sys-devel/automake/ChangeLog
index c15ef6550db7..ec85d54b9ed4 100644
--- a/sys-devel/automake/ChangeLog
+++ b/sys-devel/automake/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for sys-devel/automake
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/ChangeLog,v 1.5 2002/04/22 20:56:55 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/ChangeLog,v 1.6 2002/05/19 17:46:30 azarah Exp $
+
+automake-1.6.1 (19 May 2002)
+
+  19 May 2002; M.Schlemmer <azarah@gentoo.org> automake-1.6.1.ebuild,
+                                               am-wrapper.pl-1.6 :
+
+  New version.  Thanks to Alexander Kelett for the initial version that
+  contains all three major releases, and also am-wrapper.pl-1.6.
+
+  Changes from his version:  1.5d has to have "-1.5d" as suffix, and
+  not "-1.5", as this causes calls by aclocal to automake to fail,
+  as they have multiversion support.  Also fixed some other problems
+  that was part of my first dual version.  Added the sed to change
+  the "-1.5x" in am-wrapper.pl-1.6 to "-1.5d".
+
+  Anyway, should resolve bug 2803.
 
   22 April 2002; M.Schlemmer <azarah@gentoo.org> am-wrapper.pl :
 
diff --git a/sys-devel/automake/automake-1.5-r1.ebuild b/sys-devel/automake/automake-1.5-r1.ebuild
deleted file mode 100644
index bb4c475246b2..000000000000
--- a/sys-devel/automake/automake-1.5-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Daniel robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.5-r1.ebuild,v 1.3 2002/04/27 23:34:20 bangert Exp $
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="Used to generate Makefile.in from Makefile.am"
-SRC_URI="ftp://prep.ai.mit.edu/gnu/automake/${A}"
-HOMEPAGE="http://www.gnu.org/software/automake/automake.html"
-
-DEPEND="sys-devel/perl"
-
-SLOT="1.5"
-
-src_compile() {
-    try ./configure --prefix=/usr --infodir=/usr/share/info --host=${CHOST}
-    try make ${MAKEOPTS}
-}
-
-src_install() {
-    try make prefix=${D}/usr infodir=${D}/usr/share/info install
-    dodoc COPYING NEWS README THANKS TODO AUTHORS ChangeLog
-}
diff --git a/sys-devel/automake/automake-1.5b.ebuild b/sys-devel/automake/automake-1.5b.ebuild
deleted file mode 100644
index a04478eb8e67..000000000000
--- a/sys-devel/automake/automake-1.5b.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Daniel robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.5b.ebuild,v 1.2 2002/04/07 13:46:10 gbevin Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Used to generate Makefile.in from Makefile.am"
-SRC_URI="ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.bz2"
-HOMEPAGE="http://www.gnu.org/software/automake/automake.html"
-
-DEPEND="sys-devel/perl"
-
-SLOT="1.5"
-
-src_compile() {
-
-	./configure --prefix=/usr \
-    		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--host=${CHOST} || die
-		
-	make ${MAKEOPTS} || die
-}
-
-src_install() {
-
-	make DESTDIR=${D} install || die
-	
-	dodoc COPYING NEWS README THANKS TODO AUTHORS ChangeLog
-}
diff --git a/sys-devel/automake/automake-1.5d-r1.ebuild b/sys-devel/automake/automake-1.5d-r1.ebuild
deleted file mode 100644
index 1024cd366e53..000000000000
--- a/sys-devel/automake/automake-1.5d-r1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.5d-r1.ebuild,v 1.3 2002/04/07 13:46:10 gbevin Exp $
-
-OLD_PV=1.4-p5
-OLD_P=${PN}-${OLD_PV}
-S=${WORKDIR}/${P}
-OLD_S=${WORKDIR}/${OLD_P}
-DESCRIPTION="Used to generate Makefile.in from Makefile.am"
-SRC_URI="ftp://sources.redhat.com/pub/${PN}/${P}.tar.bz2
-	ftp://ftp.gnu.org/gnu/${PN}/${OLD_P}.tar.gz"
-HOMEPAGE="http://www.gnu.org/software/automake/automake.html"
-
-DEPEND="sys-devel/perl
-	>=sys-devel/autoconf-2.52-r1"
-		
-SLOT="1.5"
-
-src_compile() {
-
-	#
-	# ************ 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 ${S}
-
-	cp automake.texi automake.texi.orig
-	sed -e "s:setfilename automake.info:setfilename automake-1.5.info:" \
-		automake.texi.orig >automake.texi
-	
-	./configure --prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		--target=${CHOST} || die
-	
-	emake ${MAKEOPTS} || die
-
-	unset WANT_AUTOCONF_2_5
-
-	#
-	# ************ automake-1.4-p5 ************
-	#
-	cd ${OLD_S}
-	./configure --prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		--target=${CHOST} || die
-		
-	emake ${MAKEOPTS} || die
-}
-
-src_install() {
-
-	# install wrapper script for autodetecting the proper version
-	# to use.
-	exeinto /usr/lib/${PN}
-	newexe ${FILESDIR}/am-wrapper.pl-1.5 am-wrapper.pl
-
-	#
-	# ************ automake-1.6x ************
-	#
-
-	cd ${S}
-	make DESTDIR=${D} \
-		install || die
-
-	for x in automake aclocal
-	do
-		mv ${D}/usr/bin/${x}-${PV} ${D}/usr/bin/${x}-1.5x
-		rm -f ${D}/usr/bin/${x}
-	done
-
-	doinfo automake-1.5.info*
-
-	docinto ${PF}/${PV}
-	dodoc COPYING NEWS README THANKS TODO AUTHORS ChangeLog
-
-	#
-	# ************ automake-1.4-p5 ************
-	#
-
-    cd ${OLD_S}
-	make prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		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 ${PF}/${OLD_PV}
-	dodoc COPYING NEWS README THANKS TODO AUTHORS ChangeLog
-}
-
-pkg_preinst() {
-	
-	# remove these to make sure symlinks install properly if old versions
-	# was binaries
-	for x in automake aclocal
-	do
-		if [ -e /usr/bin/${x} ]
-		then
-			rm -f /usr/bin/${x}
-		fi
-	done
-}
-
diff --git a/sys-devel/automake/automake-1.5d.ebuild b/sys-devel/automake/automake-1.5d.ebuild
deleted file mode 100644
index 5f2331c3b7d1..000000000000
--- a/sys-devel/automake/automake-1.5d.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author: Daniel robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.5d.ebuild,v 1.2 2002/04/07 13:46:10 gbevin Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Used to generate Makefile.in from Makefile.am"
-SRC_URI="ftp://sources.redhat.com/pub/automake/automake-1.5d.tar.bz2"
-#ftp://ftp.gnu.org/gnu/automake/${P}.tar.gz"
-#ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.bz2"
-HOMEPAGE="http://www.gnu.org/software/automake/automake.html"
-
-DEPEND="sys-devel/perl
-	>=sys-devel/autoconf-2.53"
-
-SLOT="1.5"
-
-src_compile() {
-	# 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
-
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--host=${CHOST} || die
-		
-	make ${MAKEOPTS} || die
-}
-
-src_install() {
-
-	make DESTDIR=${D} install || die
-	
-	dodoc COPYING NEWS README THANKS TODO AUTHORS ChangeLog
-}
-
diff --git a/sys-devel/automake/automake-1.6-r1.ebuild b/sys-devel/automake/automake-1.6.1.ebuild
index 7618da583984..95fe6ef3e01d 100644
--- a/sys-devel/automake/automake-1.6-r1.ebuild
+++ b/sys-devel/automake/automake-1.6.1.ebuild
@@ -1,19 +1,39 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Maintainer: Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.6-r1.ebuild,v 1.4 2002/04/23 19:42:16 azarah Exp $
-
-OLD_PV=1.4-p5
-OLD_P=${PN}-${OLD_PV}
+# /space/gentoo/cvsroot/gentoo-x86/sys-devel/automake/automake-1.6.1.ebuild,v 1.4 2002/04/23 19:42:16 azarah Exp
+
+# OLD14 = 1.4
+# OLD15 = 1.5d
+# NEW = 1.6 (.1)
+
+# Currently this is 1.6, but it could change to 1.6.x as it
+# does with 1.5d ... to determine this, install latest version
+# of 1.6, and look at the generated files in the bin dir ..
+# it should be something like (for 1.6.1):
+#
+# nosferatu automake-1.6.1 # ls /myinstallroot/bin/
+# aclocal  aclocal-1.6  automake  automake-1.6
+# nosferatu automake-1.6.1 #
+#
+# You should then set NEW_PV to 1.6, as this is the suffix
+NEW_PV=1.6
+
+OLD15_PV=1.5d
+OLD15_P=${PN}-${OLD15_PV}
+OLD14_PV=1.4-p5
+OLD14_P=${PN}-${OLD14_PV}
 S=${WORKDIR}/${P}
-OLD_S=${WORKDIR}/${OLD_P}
+OLD15_S=${WORKDIR}/${OLD15_P}
+OLD14_S=${WORKDIR}/${OLD14_P}
 DESCRIPTION="Used to generate Makefile.in from Makefile.am"
 SRC_URI="ftp://ftp.gnu.org/gnu/${PN}/${P}.tar.gz
-	ftp://ftp.gnu.org/gnu/${PN}/${OLD_P}.tar.gz"
+	ftp://sources.redhat.com/pub/${PN}/${OLD15_P}.tar.bz2
+	ftp://ftp.gnu.org/gnu/${PN}/${OLD14_P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/automake/automake.html"
 
 DEPEND="sys-devel/perl
-	>=sys-devel/autoconf-2.53"
+	>=sys-devel/autoconf-2.53-r1"
 
 SLOT="1.5"
 
@@ -41,12 +61,28 @@ src_compile() {
 	
 	emake ${MAKEOPTS} || die
 
+	#
+	# ************ automake-1.5x ************
+	#
+
+	cd ${OLD15_S}
+
+	cp automake.texi automake.texi.orig
+	sed -e "s:setfilename automake.info:setfilename automake-1.5.info:" \
+		automake.texi.orig >automake.texi
+	
+	./configure --prefix=/usr \
+		--infodir=/usr/share/info \
+		--mandir=/usr/share/man \
+		--target=${CHOST} || die
+	
+	emake ${MAKEOPTS} || die
 	unset WANT_AUTOCONF_2_5
 
 	#
 	# ************ automake-1.4-p5 ************
 	#
-	cd ${OLD_S}
+	cd ${OLD14_S}
 	./configure --prefix=/usr \
 		--infodir=/usr/share/info \
 		--mandir=/usr/share/man \
@@ -60,8 +96,11 @@ src_install() {
 	# install wrapper script for autodetecting the proper version
 	# to use.
 	exeinto /usr/lib/${PN}
-	doexe ${FILESDIR}/am-wrapper.pl
-	dosed "s:1\.6x:${PV}:g" /usr/lib/${PN}/am-wrapper.pl
+	newexe ${FILESDIR}/am-wrapper.pl-1.6 am-wrapper.pl
+	# Name binaries to exact version, as they have limited support for
+	# more than one version installs
+	dosed "s:1\.6x:${NEW_PV}:g" /usr/lib/${PN}/am-wrapper.pl
+	dosed "s:1\.5x:${OLD15_PV}:g" /usr/lib/${PN}/am-wrapper.pl
 
 	#
 	# ************ automake-1.6x ************
@@ -73,7 +112,7 @@ src_install() {
 
 	for x in automake aclocal
 	do
-		mv ${D}/usr/bin/${x}-${PV} ${D}/usr/bin/${x}-${PV}
+#		mv ${D}/usr/bin/${x} ${D}/usr/bin/${x}-${NEW_PV}
 		rm -f ${D}/usr/bin/${x}
 	done
 
@@ -83,10 +122,29 @@ src_install() {
 	dodoc COPYING NEWS README THANKS TODO AUTHORS ChangeLog
 
 	#
+	# ************ automake-1.5x ************
+	#
+
+	cd ${OLD15_S}
+	make DESTDIR=${D} \
+		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 automake-1.5.info*
+
+	docinto ${OLD15_PV}
+	dodoc COPYING NEWS README THANKS TODO AUTHORS ChangeLog
+
+	#
 	# ************ automake-1.4-p5 ************
 	#
 
-    cd ${OLD_S}
+    cd ${OLD14_S}
 	make prefix=${D}/usr \
 		mandir=${D}/usr/share/man \
 		infodir=${D}/usr/share/info \
@@ -98,7 +156,7 @@ src_install() {
 		dosym ../lib/${PN}/am-wrapper.pl /usr/bin/${x}
 	done
 
-	docinto ${OLD_PV}
+	docinto ${OLD14_PV}
 	dodoc COPYING NEWS README THANKS TODO AUTHORS ChangeLog
 }
 
diff --git a/sys-devel/automake/files/am-wrapper.pl b/sys-devel/automake/files/am-wrapper.pl
deleted file mode 100644
index 3d71e75a9711..000000000000
--- a/sys-devel/automake/files/am-wrapper.pl
+++ /dev/null
@@ -1,52 +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 automake-1.4
-# - runs automake-1.6x if it exists and...
-#   - envvar WANT_AUTOMAKE_1_6 is set to `1'
-#     -or-
-#   - configure.ac is present
-#     -or-
-#   - `configure.in' contains AC_PREREQ and the value's 3 first letters
-#     are stringwise greater than '2.1'
-#
-
-#use MDK::Common;
-
-sub cat_ { local *F; open F, $_[0] or return; my @l = <F>; wantarray ? @l : join '', @l }
-
-my $binary     = "$0-1.4";
-my $binary_new = "$0-1.6x";
-
-if (!$ENV{WANT_AUTOMAKE_1_4}) {
-    if (-x $binary_new                  # user may have only 2.13
-	&& ($ENV{WANT_AUTOMAKE_1_6}
-	    || -r 'configure.ac'
-	    || (cat_('configure.in') =~ /^\s*AC_PREREQ\(\[?([^\)]{3})[^\)]*\)/m ? $1 : '') gt '2.1' 
-	    || (cat_('aclocal.m4') =~ /^\s*AC_PREREQ\(\[?([^\)]{3})[^\)]*\)/m ? $1 : '') gt '2.1')) {
-	$ENV{WANT_AUTOMAKE_1_6} = 1;    # to prevent further "cats" and to enhance consistency (possible cwd etc)
-	$binary 		= $binary_new;
-    } else {
-	$ENV{WANT_AUTOMAKE_1_4} = 1;    # for further consistency
-    }
-}
-
-$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/digest-automake-1.5-r1 b/sys-devel/automake/files/digest-automake-1.5-r1
deleted file mode 100644
index bda1b103bfdf..000000000000
--- a/sys-devel/automake/files/digest-automake-1.5-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 74a22ac0581378e807ecb334a55c5bab automake-1.5.tar.gz 526934
diff --git a/sys-devel/automake/files/digest-automake-1.5b b/sys-devel/automake/files/digest-automake-1.5b
deleted file mode 100644
index 1ddf25961077..000000000000
--- a/sys-devel/automake/files/digest-automake-1.5b
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f5cc037f05f3b80d6cfd4ebe615ac5a7 automake-1.5b.tar.bz2 444248
diff --git a/sys-devel/automake/files/digest-automake-1.5d b/sys-devel/automake/files/digest-automake-1.5d
deleted file mode 100644
index 576050465468..000000000000
--- a/sys-devel/automake/files/digest-automake-1.5d
+++ /dev/null
@@ -1 +0,0 @@
-MD5 78b3eb4d3d593ceaa32c1d33d6abcdf6 automake-1.5d.tar.bz2 455041
diff --git a/sys-devel/automake/files/digest-automake-1.6-r1 b/sys-devel/automake/files/digest-automake-1.6-r1
deleted file mode 100644
index a550e54bdf7c..000000000000
--- a/sys-devel/automake/files/digest-automake-1.6-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 549af723e3757f71e2a904dbd46d9e76 automake-1.6.tar.gz 588712
-MD5 e10679bba411f8602eed004012d915e3 automake-1.4-p5.tar.gz 376992
diff --git a/sys-devel/automake/files/digest-automake-1.5d-r1 b/sys-devel/automake/files/digest-automake-1.6.1
index feb51fd9db4a..7cdd0f0f709d 100644
--- a/sys-devel/automake/files/digest-automake-1.5d-r1
+++ b/sys-devel/automake/files/digest-automake-1.6.1
@@ -1,2 +1,3 @@
+MD5 8729428639b5baa74a5a708776727ff5 automake-1.6.1.tar.gz 595788
 MD5 78b3eb4d3d593ceaa32c1d33d6abcdf6 automake-1.5d.tar.bz2 455041
 MD5 e10679bba411f8602eed004012d915e3 automake-1.4-p5.tar.gz 376992