old
authorMike Frysinger <vapier@gentoo.org>
Wed, 6 Oct 2004 18:04:11 +0000 (18:04 +0000)
committerMike Frysinger <vapier@gentoo.org>
Wed, 6 Oct 2004 18:04:11 +0000 (18:04 +0000)
29 files changed:
sys-devel/automake/Manifest
sys-devel/automake/automake-1.6.1-r6.ebuild [deleted file]
sys-devel/automake/automake-1.6.3.ebuild [deleted file]
sys-devel/automake/automake-1.7.2.ebuild [deleted file]
sys-devel/automake/automake-1.7.5-r2.ebuild [deleted file]
sys-devel/automake/automake-1.7.7.ebuild [deleted file]
sys-devel/automake/automake-1.7.8.ebuild [deleted file]
sys-devel/automake/automake-1.8.2.ebuild [deleted file]
sys-devel/automake/automake-1.8.3.ebuild [deleted file]
sys-devel/automake/automake-1.8.5-r1.ebuild
sys-devel/automake/automake-1.8.5.ebuild [deleted file]
sys-devel/automake/files/am-wrapper.pl [moved from sys-devel/automake/files/am-wrapper.pl-1.8-v2 with 100% similarity]
sys-devel/automake/files/am-wrapper.pl-1.5 [deleted file]
sys-devel/automake/files/am-wrapper.pl-1.6 [deleted file]
sys-devel/automake/files/am-wrapper.pl-1.7 [deleted file]
sys-devel/automake/files/am-wrapper.pl-1.8 [deleted file]
sys-devel/automake/files/automake-1.7.2-infopage-namechange.patch [deleted file]
sys-devel/automake/files/automake-1.7.5-infopage-namechange.patch [deleted file]
sys-devel/automake/files/automake-1.7.7-infopage-namechange.patch [deleted file]
sys-devel/automake/files/automake-1.7.8-infopage-namechange.patch [deleted file]
sys-devel/automake/files/digest-automake-1.6.1-r6 [deleted file]
sys-devel/automake/files/digest-automake-1.6.3 [deleted file]
sys-devel/automake/files/digest-automake-1.7.2 [deleted file]
sys-devel/automake/files/digest-automake-1.7.5-r2 [deleted file]
sys-devel/automake/files/digest-automake-1.7.7 [deleted file]
sys-devel/automake/files/digest-automake-1.7.8 [deleted file]
sys-devel/automake/files/digest-automake-1.8.2 [deleted file]
sys-devel/automake/files/digest-automake-1.8.3 [deleted file]
sys-devel/automake/files/digest-automake-1.8.5 [deleted file]

index 355677144a6e57c5e61619c393380aa9d8e78335..cdf555561f20294e79902e4ceada57df58211952 100644 (file)
@@ -1,36 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 08693c4c42ffe4d3a7a64d0af79bde83 ChangeLog 9737
-MD5 9028ebf99fa0cbed88ed1e0f45838d34 automake-1.6.1-r6.ebuild 7868
-MD5 f7f51391bbf67890b3cfa427c63ea5a1 automake-1.6.3.ebuild 8592
-MD5 85416c6b86f91f0e3bc5bc254356e049 automake-1.7.2.ebuild 10497
-MD5 d07afa391d91cfe31ee0c08906b86fb0 automake-1.7.5-r2.ebuild 10527
-MD5 339e8d6e21f04ec863622f981ac2fd4f automake-1.7.7.ebuild 10527
-MD5 6710f3ab22f87801c2780c422131cb0b automake-1.7.8.ebuild 10533
-MD5 498a082dd8e74dc1dd3936d10a126a9f automake-1.8.2.ebuild 12371
-MD5 13d0432b99ac7b8264c7b71d4891c643 automake-1.8.3.ebuild 12625
-MD5 0ae0359ea53d659efb7d0e8128d17802 automake-1.8.5-r1.ebuild 12958
-MD5 9e70504747d174943694c3e4200eb711 automake-1.8.5.ebuild 12692
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-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 2b5aa34b9c688d919f6b06df0c428cc4 files/am-wrapper.pl-1.8-v2 6165
+MD5 f8813798f3cc27f66ec97dc6069bb855 automake-1.8.5-r1.ebuild 12936
 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 2b5aa34b9c688d919f6b06df0c428cc4 files/am-wrapper.pl 6165
+MD5 7abe94459d460b0af03ee8720383607b files/digest-automake-1.8.5-r1 332
 MD5 e93136e02eb000c938f564484d306d76 files/automake-1.7.9-infopage-namechange.patch 592
 MD5 9587f00ace066c11b5c22d72afe630a9 files/automake-1.8.2-infopage-namechange.patch 1131
 MD5 d576cbc9cda51d6288db8b8569eb9e2a files/automake-1.8.5-config-guess-uclibc.patch 4693
-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 499f34d60d911cb54caa2232ad4e4e4b files/digest-automake-1.7.7 265
-MD5 8323d1ae3957342232c30ee2a26ba556 files/digest-automake-1.7.8 265
-MD5 66a380a53b5136769e9adc454269c6b1 files/digest-automake-1.8.2 332
-MD5 d455e078ac4502784651e0fed838858e files/digest-automake-1.8.3 332
-MD5 7abe94459d460b0af03ee8720383607b files/digest-automake-1.8.5 332
-MD5 7abe94459d460b0af03ee8720383607b files/digest-automake-1.8.5-r1 332
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFBZDOjHTu7gpaalycRAr5+AKCT+CpGxnwoEKSNjVU+gr9RkOutCgCgnuHb
+KvYAOesLQ+CQylI3w4+foJE=
+=UJjB
+-----END PGP SIGNATURE-----
diff --git a/sys-devel/automake/automake-1.6.1-r6.ebuild b/sys-devel/automake/automake-1.6.1-r6.ebuild
deleted file mode 100644 (file)
index 16fc236..0000000
+++ /dev/null
@@ -1,320 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.6.1-r6.ebuild,v 1.21 2004/07/15 03:08:13 agriffis Exp $
-
-# OLD14 = 1.4
-# OLD15 = 1.5
-# NEW = 1.6 (.1)
-
-# 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.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.5
-OLD15_P=${PN}-${OLD15_PV}
-OLD14_PV=1.4-p5
-OLD14_P=${PN}-${OLD14_PV}
-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}/${OLD15_P}.tar.gz
-       mirror://gnu/${PN}/${OLD14_P}.tar.gz"
-HOMEPAGE="http://www.gnu.org/software/automake/automake.html"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc alpha "
-IUSE=""
-
-DEPEND="dev-lang/perl
-       >=sys-devel/autoconf-2.53-r1"
-
-SLOT="1.5"
-
-
-src_unpack() {
-
-       unpack ${A}
-
-       cd ${OLD15_S}
-       patch -p1 <${FILESDIR}/${PN}-${OLD15_PV}-target_hook.patch || die
-}
-
-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}
-
-       perl -pi -e "s:setfilename automake.info:setfilename automake-1.6.info:" \
-               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}
-
-       perl -pi -e "s:setfilename automake.info:setfilename automake-1.5.info:" \
-               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
-}
-
-# 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.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}
-# not needed for 1.6.1
-#      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 automake-1.6.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 automake-1.5.info*
-
-       docinto ${OLD15_PV}
-       dodoc COPYING NEWS README THANKS TODO AUTHORS ChangeLog
-
-       #
-       # ************ automake-1.4-p5 ************
-       #
-
-       cd ${OLD14_S}
-       fix_bins "1.4"
-
-       # Ignore duplicates like automake-1.5 and 1.6
-       patch -p0 <${FILESDIR}/${PN}-1.4_p5-ignore-duplicates.patch || die
-
-       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.
-       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 ${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
-}
diff --git a/sys-devel/automake/automake-1.6.3.ebuild b/sys-devel/automake/automake-1.6.3.ebuild
deleted file mode 100644 (file)
index 16c4e2b..0000000
+++ /dev/null
@@ -1,339 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.6.3.ebuild,v 1.16 2004/07/15 03:08:13 agriffis Exp $
-
-IUSE=""
-
-inherit eutils
-
-# OLD14 = 1.4
-# OLD15 = 1.5
-# NEW = 1.6 (.3)
-
-# 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.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.5"
-OLD15_P="${PN}-${OLD15_PV}"
-OLD14_PV="1.4-p5"
-OLD14_P="${PN}-${OLD14_PV}"
-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}/${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="x86 ppc sparc alpha mips hppa "
-
-DEPEND="dev-lang/perl
-       >=sys-devel/autoconf-2.53-r1"
-
-
-src_unpack() {
-
-       unpack ${A}
-
-       cd ${OLD15_S}
-       epatch ${FILESDIR}/${PN}-${OLD15_PV}-target_hook.patch
-}
-
-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}
-
-       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-p5 ************
-       #
-       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.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}
-# 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-p5 ************
-       #
-
-       cd ${OLD14_S}
-       fix_bins "1.4"
-
-       # Ignore duplicates like automake-1.5 and 1.6
-       patch -p0 <${FILESDIR}/${PN}-1.4_p5-ignore-duplicates.patch || die
-
-       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.
-       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 ${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
-}
diff --git a/sys-devel/automake/automake-1.7.2.ebuild b/sys-devel/automake/automake-1.7.2.ebuild
deleted file mode 100644 (file)
index 9411586..0000000
+++ /dev/null
@@ -1,421 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.7.2.ebuild,v 1.14 2004/08/24 08:42:18 seemant Exp $
-
-IUSE=""
-
-inherit eutils
-
-# OLD14 = 1.4
-# OLD15 = 1.5
-# OLD16 = 1.6
-# NEW = 1.7 (.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.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-p5"
-OLD14_P="${PN}-${OLD14_PV}"
-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 "
-
-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-p5 ************
-       #
-       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-p5 ************
-       #
-
-       cd ${OLD14_S}
-       fix_bins "1.4"
-
-       # Ignore duplicates like automake-1.5 and 1.6
-       patch -p0 <${FILESDIR}/${PN}-1.4_p5-ignore-duplicates.patch || die
-
-       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.
-       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' syntax has changed to:"
-       echo
-       einfo "  WANT_AUTOMAKE=<required version>"
-       echo
-       einfo "For instance:  WANT_AUTOMAKE=1.6"
-       echo
-}
diff --git a/sys-devel/automake/automake-1.7.5-r2.ebuild b/sys-devel/automake/automake-1.7.5-r2.ebuild
deleted file mode 100644 (file)
index 9fcbf83..0000000
+++ /dev/null
@@ -1,422 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.7.5-r2.ebuild,v 1.11 2004/08/24 08:42:18 seemant 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}"
-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 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 ..
-       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.
-       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' syntax has changed to:"
-       echo
-       einfo "  WANT_AUTOMAKE=<required version>"
-       echo
-       einfo "For instance:  WANT_AUTOMAKE=1.6"
-       echo
-}
diff --git a/sys-devel/automake/automake-1.7.7.ebuild b/sys-devel/automake/automake-1.7.7.ebuild
deleted file mode 100644 (file)
index 3208ada..0000000
+++ /dev/null
@@ -1,422 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# 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.12 2004/09/03 19:37:35 pvdabeel 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}"
-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="x86 ppc sparc ~alpha mips hppa amd64 ~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 ..
-       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.
-       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' syntax has changed to:"
-       echo
-       einfo "  WANT_AUTOMAKE=<required version>"
-       echo
-       einfo "For instance:  WANT_AUTOMAKE=1.6"
-       echo
-}
diff --git a/sys-devel/automake/automake-1.7.8.ebuild b/sys-devel/automake/automake-1.7.8.ebuild
deleted file mode 100644 (file)
index bc3102d..0000000
+++ /dev/null
@@ -1,422 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.7.8.ebuild,v 1.11 2004/08/24 08:42:18 seemant 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}"
-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 ia64 ppc64"
-
-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 ..
-       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.
-       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' syntax has changed to:"
-       echo
-       einfo "  WANT_AUTOMAKE=<required version>"
-       echo
-       einfo "For instance:  WANT_AUTOMAKE=1.6"
-       echo
-}
diff --git a/sys-devel/automake/automake-1.8.2.ebuild b/sys-devel/automake/automake-1.8.2.ebuild
deleted file mode 100644 (file)
index c9c7671..0000000
+++ /dev/null
@@ -1,496 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.8.2.ebuild,v 1.9 2004/08/24 08:42:18 seemant Exp $
-
-IUSE=""
-
-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}"
-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"
-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"
-HOMEPAGE="http://www.gnu.org/software/automake/automake.html"
-
-LICENSE="GPL-2"
-SLOT="1.5"
-KEYWORDS="~amd64 ~x86 ~ppc sparc ~alpha ~mips ~hppa ~ia64 ~ppc64 s390"
-
-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}/${P}-infopage-namechange.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
-
-       emake || die
-
-       #
-       # ************ 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
-
-       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.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' syntax has changed to:"
-       echo
-       einfo "  WANT_AUTOMAKE=<required version>"
-       echo
-       einfo "For instance:  WANT_AUTOMAKE=1.6"
-       echo
-}
diff --git a/sys-devel/automake/automake-1.8.3.ebuild b/sys-devel/automake/automake-1.8.3.ebuild
deleted file mode 100644 (file)
index 8fd353a..0000000
+++ /dev/null
@@ -1,497 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.8.3.ebuild,v 1.15 2004/08/24 08:42:18 seemant 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}"
-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 sparc mips alpha arm hppa amd64 ia64 ppc64 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
-}
-
-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' syntax has changed to:"
-       echo
-       einfo "  WANT_AUTOMAKE=<required version>"
-       echo
-       einfo "For instance:  WANT_AUTOMAKE=1.6"
-       echo
-}
index 0bc6ca0e9f78dad494691345e67562b3b9eb13f7..8f5669f16d0616f232c16f19be08ea58497644fc 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.8.5-r1.ebuild,v 1.10 2004/09/01 13:42:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.8.5-r1.ebuild,v 1.11 2004/10/06 18:04:10 vapier Exp $
 
 inherit eutils
 
@@ -62,7 +62,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="1.5"
-KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 ppc64 s390"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86"
 IUSE="uclibc"
 
 DEPEND="dev-lang/perl
@@ -232,7 +232,7 @@ src_install() {
        # install wrapper script for autodetecting the proper version
        # to use.
        exeinto /usr/lib/${PN}
-       newexe ${FILESDIR}/am-wrapper.pl-1.8-v2 am-wrapper.pl
+       doexe ${FILESDIR}/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
diff --git a/sys-devel/automake/automake-1.8.5.ebuild b/sys-devel/automake/automake-1.8.5.ebuild
deleted file mode 100644 (file)
index 2a7d624..0000000
+++ /dev/null
@@ -1,497 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# 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.4 2004/08/24 08:42:18 seemant 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}"
-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' syntax has changed to:"
-       echo
-       einfo "  WANT_AUTOMAKE=<required version>"
-       echo
-       einfo "For instance:  WANT_AUTOMAKE=1.6"
-       echo
-}
diff --git a/sys-devel/automake/files/am-wrapper.pl-1.5 b/sys-devel/automake/files/am-wrapper.pl-1.5
deleted file mode 100644 (file)
index 21a4d0d..0000000
+++ /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.5x if it exists and...
-#   - envvar WANT_AUTOMAKE_1_5 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.5x";
-
-if (!$ENV{WANT_AUTOMAKE_1_4}) {
-    if (-x $binary_new                  # user may have only 2.13
-       && ($ENV{WANT_AUTOMAKE_1_5}
-           || -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_5} = 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/am-wrapper.pl-1.6 b/sys-devel/automake/files/am-wrapper.pl-1.6
deleted file mode 100644 (file)
index bb397c7..0000000
+++ /dev/null
@@ -1,73 +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-
-#   - `Makefile.in' was generated by automake-1.6 or superior, which
-#     specifically needs automake-1.6x
-# - runs automake-1.5x if it exists and...
-#   - envvar WANT_AUTOMAKE_1_5 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'
-#     -or-
-#   - `configure' is already present and was generated by autoconf greater than
-#     '2.1'
-#     -or-
-#   - `Makefile.in' was generated by automake-1.5x or superior, which
-#     specifically needs automake-1.5x
-#
-#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.5x";
-my $binary_vnew = "$0-1.6x";
-
-# question here is do we really want 1.5 or 1.6?  Out of a KDE outlook, it
-# should rather be 1.5, and since most people would rather have migrated to
-# 1.5, and then stay with it for a bit (those 1.4 die hards ..), only have
-# the 'configure.ac' test for 1.5 ...
-if (!$ENV{WANT_AUTOMAKE_1_4}) {
-    if (-x $binary_vnew                  # user may not have _1_6
-       && ($ENV{WANT_AUTOMAKE_1_6}
-           || (cat_('Makefile.in') =~ /^# Makefile\.in generated by automake (\S+)/ ? $1 : '') ge '1.6')) {
-       $binary                 = $binary_vnew;
-    } elsif (-x $binary_new                  # user may have only 2.13
-       && ($ENV{WANT_AUTOMAKE_1_5}
-           || -r 'configure.ac'
-           || (cat_('configure.in') =~ /^\s*AC_PREREQ\(\[?([^\)]{3})[^\)]*\)/m ? $1 : '') gt '2.1' 
-           || (cat_('configure') =~ /^# Generated by Autoconf (\S+)/m ? $1 : '') gt '2.1'
-           || (cat_('Makefile.in') =~ /^# Makefile\.in generated by automake (\S+)/ ? $1 : '') ge '1.5'
-           || (cat_('aclocal.m4') =~ /^\s*AC_PREREQ\(\[?([^\)]{3})[^\)]*\)/m ? $1 : '') gt '2.1')) {
-       $ENV{WANT_AUTOMAKE_1_5} = 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/am-wrapper.pl-1.7 b/sys-devel/automake/files/am-wrapper.pl-1.7
deleted file mode 100644 (file)
index 83e926e..0000000
+++ /dev/null
@@ -1,119 +0,0 @@
-#!/usr/bin/perl
-#
-#
-# Author: Guillaume Cottenceau (gc@mandrakesoft.com)
-# Modified by: Martin Schlemmer (azarah@gentoo.org)
-#
-# 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.7 if it exists and...
-#   - envvar WANT_AUTOMAKE is set to `1.7'
-#     -or-
-#   - `Makefile.in' was generated by automake-1.7 or superior, which
-#     specifically needs automake-1.7
-#     -or_
-#   - 'aclocal.m4' contain AM_AUTOMAKE_VERSION, specifying the use of 1.7
-# - runs automake-1.6 if it exists and...
-#   - envvar WANT_AUTOMAKE is set to `1.6'
-#     -or-
-#   - `Makefile.in' was generated by automake-1.6 or superior, which
-#     specifically needs automake-1.6
-#     -or-
-#   - 'aclocal.m4' contain AM_AUTOMAKE_VERSION, specifyint the use of 1.6
-#     -or-
-#   - `configure.in' contains AC_PREREQ and the value's 3 first letters
-#      are stringwise greater than '2.53c'
-#     -or-
-#   - `configure' is already present and was generated by autoconf greater than
-#     '2.53c'
-# - runs automake-1.5 if it exists and...
-#   - envvar WANT_AUTOMAKE is set to `1.5'
-#     -or-
-#   - configure.ac is present
-#     -or-
-#   - `configure.in' contains AC_PREREQ and the value's 3 first letters
-#      are stringwise greater than '2.1'
-#     -or-
-#   - `configure' is already present and was generated by autoconf greater than
-#     '2.1'
-#     -or-
-#   - `Makefile.in' was generated by automake-1.5 or superior, which
-#     specifically needs automake-1.5
-#
-#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_1_5  = "$0-1.5x";
-my $binary_1_6  = "$0-1.6x";
-my $binary_1_7  = "$0-1.7x";
-
-# Automake is really getting out of hand, so rather start supporting
-# WANT_AUTOMAKE = "1.7" the like.  Unfortunately it override the old
-# variables, so if not set, just convert the old variables ....
-if ($ENV{WANT_AUTOMAKE} eq "") {
-       if ($ENV{WANT_AUTOMAKE_1_4}) {
-               $ENV{WANT_AUTOMAKE} = '1.4';
-       } elsif ($ENV{WANT_AUTOMAKE_1_6}) {
-               $ENV{WANT_AUTOMAKE} = '1.6';
-       } elsif ($ENV{WANT_AUTOMAKE_1_5}) {
-               $ENV{WANT_AUTOMAKE} = '1.5';
-       }
-}
-
-# question here is do we really want 1.5 or 1.6?  Out of a KDE outlook, it
-# should rather be 1.5, and since most people would rather have migrated to
-# 1.5, and then stay with it for a bit (those 1.4 die hards ..), only have
-# the 'configure.ac' test for 1.5 ...
-if ($ENV{WANT_AUTOMAKE} ne '1.4') {
-       if (-x $binary_1_7              # user may not have _1_7 ...
-       && (($ENV{WANT_AUTOMAKE} eq '1.7')
-           || (cat_('Makefile.in') =~ /^# Makefile\.in generated by automake (\S+)/ ? $1 : '') ge '1.7'
-           || (cat_('aclocal.m4') =~ /^# aclocal.m4 generated automatically by aclocal (\S+)/ ? $1 : '') ge '1.7'
-           || (cat_('aclocal.m4') =~ /^\s*\[?AM_AUTOMAKE_VERSION\(\[?([^\)]{3})[^\)]*\]?\)/m ? $1 : '') ge '1.7')) {
-       $ENV{WANT_AUTOMAKE} = '1.7';    # to prevent further "cats" and to enhance consistency (possible cwd etc)
-       $binary         = $binary_1_7;
-       } elsif (-x $binary_1_6         # user may not have 1.6 ...
-       && (($ENV{WANT_AUTOMAKE} eq '1.6')
-           || (cat_('Makefile.in') =~ /^# Makefile\.in generated by automake (\S+)/ ? $1 : '') ge '1.6'
-           || (cat_('aclocal.m4') =~ /^# aclocal.m4 generated automatically by aclocal (\S+)/ ? $1 : '') ge '1.6'
-           || (cat_('aclocal.m4') =~ /^\s*\[?AM_AUTOMAKE_VERSION\(\[?([^\)]{3})[^\)]*\]?\)/m ? $1 : '') ge '1.6'
-               # Autoconf 2.53d and later need automake-1.6c, so enable 1.6 for 2.53
-               # and up .....
-           || (cat_('configure.in') =~ /^\s*\[?AC_PREREQ\(\[?([^\)]{4})[^\)]*\]?\)/m ? $1 : '') gt '2.52'
-           || (cat_('configure') =~ /^# Generated by Autoconf (\S+)/m ? $1 : '') gt '2.52'
-           || (cat_('aclocal.m4') =~ /^\s*\[?AC_PREREQ\(\[?([^\)]{4})[^\)]*\]?\)/m ? $1 : '') gt '2.52')) {
-       $ENV{WANT_AUTOMAKE} = '1.6';    # to prevent further "cats" and to enhance consistency (possible cwd etc)
-       $binary                 = $binary_1_6;
-    } elsif (-x $binary_1_5         # user may have only 1.4 ...
-       && (($ENV{WANT_AUTOMAKE} eq '1.5')
-           || -r 'configure.ac'
-           || (cat_('Makefile.in') =~ /^# Makefile\.in generated by automake (\S+)/ ? $1 : '') ge '1.5'
-           || (cat_('aclocal.m4') =~ /^# aclocal.m4 generated automatically by aclocal (\S+)/ ? $1 : '') ge '1.5'
-           || (cat_('configure.in') =~ /^\s*\[?AC_PREREQ\(\[?([^\)]{3})[^\)]*\]?\)/m ? $1 : '') gt '2.1' 
-           || (cat_('configure') =~ /^# Generated by Autoconf (\S+)/m ? $1 : '') gt '2.1'
-           || (cat_('aclocal.m4') =~ /^\s*\[?AC_PREREQ\(\[?([^\)]{3})[^\)]*\]?\)/m ? $1 : '') gt '2.1')) {
-       $ENV{WANT_AUTOMAKE} = '1.5';    # to prevent further "cats" and to enhance consistency (possible cwd etc)
-       $binary                 = $binary_1_5;
-    } else {
-       $ENV{WANT_AUTOMAKE} = '1.4';    # 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/am-wrapper.pl-1.8 b/sys-devel/automake/files/am-wrapper.pl-1.8
deleted file mode 100644 (file)
index 33e30da..0000000
+++ /dev/null
@@ -1,140 +0,0 @@
-#!/usr/bin/perl
-#
-#
-# Author: Guillaume Cottenceau (gc@mandrakesoft.com)
-# Modified by: Martin Schlemmer (azarah@gentoo.org)
-#
-# 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.8 if it exists and...
-#   - envvar WANT_AUTOMAKE is set to `1.8'
-#     -or-
-#   - `Makefile.in' was generated by automake-1.8 or superior, which
-#     specifically needs automake-1.8
-#     -or_
-#   - 'aclocal.m4' contain AM_AUTOMAKE_VERSION, specifying the use of 1.8
-# - runs automake-1.7 if it exists and...
-#   - envvar WANT_AUTOMAKE is set to `1.7'
-#     -or-
-#   - `Makefile.in' was generated by automake-1.7 or superior, which
-#     specifically needs automake-1.7
-#     -or-
-#   - 'aclocal.m4' contain AM_AUTOMAKE_VERSION, specifyint the use of 1.7
-#     -or-
-# - runs automake-1.6 if it exists and...
-#   - envvar WANT_AUTOMAKE is set to `1.6'
-#     -or-
-#   - `Makefile.in' was generated by automake-1.6 or superior, which
-#     specifically needs automake-1.6
-#     -or-
-#   - 'aclocal.m4' contain AM_AUTOMAKE_VERSION, specifyint the use of 1.6
-#     -or-
-#   - `configure.in' contains AC_PREREQ and the value's 3 first letters
-#      are stringwise greater than '2.53c'
-#     -or-
-#   - `configure' is already present and was generated by autoconf greater than
-#     '2.53c'
-# - runs automake-1.5 if it exists and...
-#   - envvar WANT_AUTOMAKE is set to `1.5'
-#     -or-
-#   - configure.ac is present
-#     -or-
-#   - `configure.in' contains AC_PREREQ and the value's 3 first letters
-#      are stringwise greater than '2.1'
-#     -or-
-#   - `configure' is already present and was generated by autoconf greater than
-#     '2.1'
-#     -or-
-#   - `Makefile.in' was generated by automake-1.5 or superior, which
-#     specifically needs automake-1.5
-#
-#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_1_5  = "$0-1.5x";
-my $binary_1_6  = "$0-1.6x";
-my $binary_1_7  = "$0-1.7x";
-my $binary_1_8  = "$0-1.8x";
-
-# Automake is really getting out of hand, so rather start supporting
-# WANT_AUTOMAKE = "1.7" the like.  Unfortunately it override the old
-# variables, so if not set, just convert the old variables ....
-if ($ENV{WANT_AUTOMAKE} eq "") {
-       if ($ENV{WANT_AUTOMAKE_1_4}) {
-               $ENV{WANT_AUTOMAKE} = '1.4';
-       } elsif ($ENV{WANT_AUTOMAKE_1_6}) {
-               $ENV{WANT_AUTOMAKE} = '1.6';
-       } elsif ($ENV{WANT_AUTOMAKE_1_5}) {
-               $ENV{WANT_AUTOMAKE} = '1.5';
-       }
-}
-
-# question here is do we really want 1.5 or 1.6?  Out of a KDE outlook, it
-# should rather be 1.5, and since most people would rather have migrated to
-# 1.5, and then stay with it for a bit (those 1.4 die hards ..), only have
-# the 'configure.ac' test for 1.5 ...
-if ($ENV{WANT_AUTOMAKE} ne '1.4') {
-       if (-x $binary_1_8              # user may not have _1_8 ...
-       && (($ENV{WANT_AUTOMAKE} eq '1.8')
-           || (cat_('Makefile.in') =~ /^# Makefile\.in generated by automake (\S+)/ ? $1 : '') ge '1.8'
-           || (cat_('aclocal.m4') =~ /^# aclocal.m4 generated automatically by aclocal (\S+)/ ? $1 : '') ge '1.8'
-           || (cat_('aclocal.m4') =~ /^\s*\[?AM_AUTOMAKE_VERSION\(\[?([^\)]{3})[^\)]*\]?\)/m ? $1 : '') ge '1.8')) {
-       $ENV{WANT_AUTOMAKE} = '1.8';    # to prevent further "cats" and to enhance consistency (possible cwd etc)
-       $binary         = $binary_1_8;
-        } elsif (-x $binary_1_7         # user may not have 1.7 ...
-       && (($ENV{WANT_AUTOMAKE} eq '1.7')
-           || (cat_('Makefile.in') =~ /^# Makefile\.in generated by automake (\S+)/ ? $1 : '') ge '1.7'
-           || (cat_('aclocal.m4') =~ /^# aclocal.m4 generated automatically by aclocal (\S+)/ ? $1 : '') ge '1.7'
-           || (cat_('aclocal.m4') =~ /^\s*\[?AM_AUTOMAKE_VERSION\(\[?([^\)]{3})[^\)]*\]?\)/m ? $1 : '') ge '1.7')) {
-       $ENV{WANT_AUTOMAKE} = '1.7';    # to prevent further "cats" and to enhance consistency (possible cwd etc)
-       $binary         = $binary_1_7;
-       } elsif (-x $binary_1_6         # user may not have 1.6 ...
-       && (($ENV{WANT_AUTOMAKE} eq '1.6')
-           || (cat_('Makefile.in') =~ /^# Makefile\.in generated by automake (\S+)/ ? $1 : '') ge '1.6'
-           || (cat_('aclocal.m4') =~ /^# aclocal.m4 generated automatically by aclocal (\S+)/ ? $1 : '') ge '1.6'
-           || (cat_('aclocal.m4') =~ /^\s*\[?AM_AUTOMAKE_VERSION\(\[?([^\)]{3})[^\)]*\]?\)/m ? $1 : '') ge '1.6'
-               # Autoconf 2.53d and later need automake-1.6c, so enable 1.6 for 2.53
-               # and up .....
-           || (cat_('configure.in') =~ /^\s*\[?AC_PREREQ\(\[?([^\)]{4})[^\)]*\]?\)/m ? $1 : '') gt '2.52'
-           || (cat_('configure') =~ /^# Generated by Autoconf (\S+)/m ? $1 : '') gt '2.52'
-           || (cat_('aclocal.m4') =~ /^\s*\[?AC_PREREQ\(\[?([^\)]{4})[^\)]*\]?\)/m ? $1 : '') gt '2.52')) {
-       $ENV{WANT_AUTOMAKE} = '1.6';    # to prevent further "cats" and to enhance consistency (possible cwd etc)
-       $binary                 = $binary_1_6;
-    } elsif (-x $binary_1_5         # user may have only 1.4 ...
-       && (($ENV{WANT_AUTOMAKE} eq '1.5')
-           || -r 'configure.ac'
-           || (cat_('Makefile.in') =~ /^# Makefile\.in generated by automake (\S+)/ ? $1 : '') ge '1.5'
-           || (cat_('aclocal.m4') =~ /^# aclocal.m4 generated automatically by aclocal (\S+)/ ? $1 : '') ge '1.5'
-           || (cat_('configure.in') =~ /^\s*\[?AC_PREREQ\(\[?([^\)]{3})[^\)]*\]?\)/m ? $1 : '') gt '2.1' 
-           || (cat_('configure') =~ /^# Generated by Autoconf (\S+)/m ? $1 : '') gt '2.1'
-           || (cat_('aclocal.m4') =~ /^\s*\[?AC_PREREQ\(\[?([^\)]{3})[^\)]*\]?\)/m ? $1 : '') gt '2.1')) {
-       $ENV{WANT_AUTOMAKE} = '1.5';    # to prevent further "cats" and to enhance consistency (possible cwd etc)
-       $binary                 = $binary_1_5;
-    } else {
-       if (-r 'configure.in' || -r 'configure.ac') {
-               $ENV{WANT_AUTOMAKE} = '1.4';    # for further consistency
-       } else {
-               $ENV{WANT_AUTOMAKE} = '1.8';
-               $binary         = $binary_1_8;
-       }
-    }
-}
-
-$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/automake-1.7.2-infopage-namechange.patch b/sys-devel/automake/files/automake-1.7.2-infopage-namechange.patch
deleted file mode 100644 (file)
index 58151d1..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
---- automake-1.7.2/Makefile.in.orig    2003-01-21 05:48:48.000000000 +0200
-+++ automake-1.7.2/Makefile.in 2003-01-21 05:49:34.000000000 +0200
-@@ -197,8 +197,9 @@
- 
- .texi.info:
-       @rm -f $@ $@-[0-9] $@-[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" \
diff --git a/sys-devel/automake/files/automake-1.7.5-infopage-namechange.patch b/sys-devel/automake/files/automake-1.7.5-infopage-namechange.patch
deleted file mode 100644 (file)
index 0e6708a..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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/automake-1.7.7-infopage-namechange.patch b/sys-devel/automake/files/automake-1.7.7-infopage-namechange.patch
deleted file mode 100644 (file)
index 0e6708a..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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/automake-1.7.8-infopage-namechange.patch b/sys-devel/automake/files/automake-1.7.8-infopage-namechange.patch
deleted file mode 100644 (file)
index 0e6708a..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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.6.1-r6 b/sys-devel/automake/files/digest-automake-1.6.1-r6
deleted file mode 100644 (file)
index 42797d7..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 3a1354f0a8b9ab484f8837b022a71162 automake-1.6.1.tar.bz2 467744
-MD5 74a22ac0581378e807ecb334a55c5bab automake-1.5.tar.gz 526934
-MD5 e10679bba411f8602eed004012d915e3 automake-1.4-p5.tar.gz 376992
diff --git a/sys-devel/automake/files/digest-automake-1.6.3 b/sys-devel/automake/files/digest-automake-1.6.3
deleted file mode 100644 (file)
index 43c369b..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2e8053609e9d318f80db0fce29dca7e9 automake-1.6.3.tar.bz2 476275
-MD5 74a22ac0581378e807ecb334a55c5bab automake-1.5.tar.gz 526934
-MD5 e10679bba411f8602eed004012d915e3 automake-1.4-p5.tar.gz 376992
diff --git a/sys-devel/automake/files/digest-automake-1.7.2 b/sys-devel/automake/files/digest-automake-1.7.2
deleted file mode 100644 (file)
index 7db92dd..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 8cfa661dca69271b862bee4f841fcd80 automake-1.7.2.tar.bz2 530429
-MD5 2e8053609e9d318f80db0fce29dca7e9 automake-1.6.3.tar.bz2 476275
-MD5 74a22ac0581378e807ecb334a55c5bab automake-1.5.tar.gz 526934
-MD5 e10679bba411f8602eed004012d915e3 automake-1.4-p5.tar.gz 376992
diff --git a/sys-devel/automake/files/digest-automake-1.7.5-r2 b/sys-devel/automake/files/digest-automake-1.7.5-r2
deleted file mode 100644 (file)
index 722254e..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 21c51ad339224c5862d5abd23121c362 automake-1.7.5.tar.bz2 555516
-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
diff --git a/sys-devel/automake/files/digest-automake-1.7.7 b/sys-devel/automake/files/digest-automake-1.7.7
deleted file mode 100644 (file)
index e504c3a..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-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
diff --git a/sys-devel/automake/files/digest-automake-1.7.8 b/sys-devel/automake/files/digest-automake-1.7.8
deleted file mode 100644 (file)
index 7283899..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 8a934bdfb1d30cbeeb5f91af0970017c automake-1.7.8.tar.bz2 576951
-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
diff --git a/sys-devel/automake/files/digest-automake-1.8.2 b/sys-devel/automake/files/digest-automake-1.8.2
deleted file mode 100644 (file)
index 2856546..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 7a8138b29361baec06548e6a0ac63189 automake-1.8.2.tar.bz2 638894
-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
diff --git a/sys-devel/automake/files/digest-automake-1.8.3 b/sys-devel/automake/files/digest-automake-1.8.3
deleted file mode 100644 (file)
index 6c0d635..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 5e8a685a304c0def671decdfe453a631 automake-1.8.3.tar.bz2 658156
-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
diff --git a/sys-devel/automake/files/digest-automake-1.8.5 b/sys-devel/automake/files/digest-automake-1.8.5
deleted file mode 100644 (file)
index 4e5695d..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-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