fix aclocal-1.6

5 files changed, 11 insertions, 180 deletions

diff --git a/sys-devel/automake/ChangeLog b/sys-devel/automake/ChangeLog
index e1c5f642ce5a..01d3467e9d83 100644
--- a/sys-devel/automake/ChangeLog
+++ b/sys-devel/automake/ChangeLog
@@ -1,6 +1,14 @@
 # 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.7 2002/05/19 20:58:55 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/ChangeLog,v 1.8 2002/05/19 23:16:08 azarah Exp $
+
+automake-1.6.1-r2 (20 May 2002)
+
+  20 May 2002; M.Schlemmer <azarah@gentoo.org> automake-1.6.1-r2.ebuild :
+
+  Seems aclocal-1.6 already searched /usr/share/aclocal-1.6/ and
+  /usr/share/aclocal/ by default, so no need to fix it like we have to
+  for 1.5 and 1.4.
 
 automake-1.6.1-r1 (19 May 2002)
 
diff --git a/sys-devel/automake/automake-1.6.1-r1.ebuild b/sys-devel/automake/automake-1.6.1-r2.ebuild
index a6b7bb14e41c..b0b572b78e15 100644
--- a/sys-devel/automake/automake-1.6.1-r1.ebuild
+++ b/sys-devel/automake/automake-1.6.1-r2.ebuild
@@ -155,7 +155,8 @@ src_install() {
 	#
 
 	cd ${S}
-	fix_bins ${NEW_PV}
+# not needed for 1.6.1
+#	fix_bins ${NEW_PV}
 	
 	make DESTDIR=${D} \
 		install || die
diff --git a/sys-devel/automake/automake-1.6.1.ebuild b/sys-devel/automake/automake-1.6.1.ebuild
deleted file mode 100644
index 95fe6ef3e01d..000000000000
--- a/sys-devel/automake/automake-1.6.1.ebuild
+++ /dev/null
@@ -1,175 +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>
-# /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}
-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://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-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.6.info:" \
-		automake.texi.orig >automake.texi
-	
-	./configure --prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		--target=${CHOST} || die
-	
-	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 ${OLD14_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.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 ************
-	#
-
-	cd ${S}
-	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 automake-1.6.info*
-
-	docinto ${PV}
-	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 ${OLD14_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 ${OLD14_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/files/digest-automake-1.6.1 b/sys-devel/automake/files/digest-automake-1.6.1
deleted file mode 100644
index 7cdd0f0f709d..000000000000
--- a/sys-devel/automake/files/digest-automake-1.6.1
+++ /dev/null
@@ -1,3 +0,0 @@
-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
diff --git a/sys-devel/automake/files/digest-automake-1.6.1-r1 b/sys-devel/automake/files/digest-automake-1.6.1-r2
index 12868257e467..12868257e467 100644
--- a/sys-devel/automake/files/digest-automake-1.6.1-r1
+++ b/sys-devel/automake/files/digest-automake-1.6.1-r2