old

4 files changed, 5 insertions, 180 deletions

diff --git a/sys-devel/autoconf-wrapper/autoconf-wrapper-3.2-r2.ebuild b/sys-devel/autoconf-wrapper/autoconf-wrapper-3.2-r2.ebuild
deleted file mode 100644
index f2afb6c6876e..000000000000
--- a/sys-devel/autoconf-wrapper/autoconf-wrapper-3.2-r2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/autoconf-wrapper-3.2-r2.ebuild,v 1.11 2006/12/29 22:10:55 vapier Exp $
-
-inherit multilib
-
-DESCRIPTION="wrapper for autoconf to manage multiple autoconf versions"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE=""
-
-S=${WORKDIR}
-
-src_install() {
-	exeinto /usr/$(get_libdir)/misc
-	newexe "${FILESDIR}"/ac-wrapper-${PV}.sh ac-wrapper.sh || die
-	dosed '/^binary_new=/s:2.59:2.60:' /usr/$(get_libdir)/misc/ac-wrapper.sh
-
-	dodir /usr/bin
-	local x=
-	for x in auto{conf,header,m4te,reconf,scan,update} ifnames ; do
-		dosym ../$(get_libdir)/misc/ac-wrapper.sh /usr/bin/${x} || die
-	done
-}
diff --git a/sys-devel/autoconf-wrapper/autoconf-wrapper-3.2.ebuild b/sys-devel/autoconf-wrapper/autoconf-wrapper-3.2.ebuild
deleted file mode 100644
index 2c88ab46a7e3..000000000000
--- a/sys-devel/autoconf-wrapper/autoconf-wrapper-3.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/autoconf-wrapper-3.2.ebuild,v 1.12 2006/11/03 18:39:27 grobian Exp $
-
-DESCRIPTION="wrapper for autoconf to manage multiple autoconf versions"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=sys-devel/autoconf-2.59-r6
-	~sys-devel/autoconf-2.13"
-
-S=${WORKDIR}
-
-src_install() {
-	exeinto /usr/lib/misc
-	newexe ${FILESDIR}/ac-wrapper-${PV}.sh ac-wrapper.sh || die
-
-	dodir /usr/bin
-	local x=
-	for x in auto{conf,header,m4te,reconf,scan,update} ifnames ; do
-		dosym ../lib/misc/ac-wrapper.sh /usr/bin/${x} || die
-	done
-}
diff --git a/sys-devel/autoconf-wrapper/files/ac-wrapper-3.2.sh b/sys-devel/autoconf-wrapper/files/ac-wrapper-3.2.sh
deleted file mode 100755
index 9701f84bd3ab..000000000000
--- a/sys-devel/autoconf-wrapper/files/ac-wrapper-3.2.sh
+++ /dev/null
@@ -1,119 +0,0 @@
-#!/bin/bash
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/files/ac-wrapper-3.2.sh,v 1.1 2005/09/09 23:15:25 azarah Exp $
-
-# Based on the ac-wrapper.pl script provided by MandrakeSoft
-# Rewritten in bash by Gregorio Guidi
-#
-# Executes the correct autoconf version.
-#
-# - defaults to latest version (2.5x)
-# - runs autoconf 2.13 only if:
-#   - envvar WANT_AUTOCONF is set to `2.1'
-#     -or-
-#   - `ac{local,include}.m4' or `configure.{in,ac}' have AC_PREREQ(2.1) (not higher)
-#     -or-
-#   - `configure' is already present and was generated by autoconf 2.13
-
-if [[ ${0##*/} == "ac-wrapper.sh" ]] ; then
-	echo "Don't call this script directly" >&2
-	exit 1
-fi
-
-if [[ ${WANT_AUTOCONF} == "2.1" && ${0##*/} == "autom4te" ]] ; then
-	echo "ac-wrapper: Autoconf 2.13 doesn't contain autom4te." >&2
-	echo "            Either unset WANT_AUTOCONF or don't execute anything" >&2
-	echo "            that would use autom4te." >&2
-	exit 1
-fi
-
-binary_new="${0}-2.59"
-binary_old="${0}-2.13"
-binary=${binary_new}
-
-acprereq_version() {
-	gawk \
-	'($0 !~ /^[[:space:]]*(#|dnl)/) {
-		if (match($0, "AC_PREREQ\\(\\[?([0-9]\\.[0-9])", res))
-			VERSIONS[COUNT++] = res[1]
-	}
-
-	END {
-		asort(VERSIONS)
-		print VERSIONS[COUNT]
-	}' "$@"
-}
-
-generated_version() {
-	gawk \
-	'{
-		if (match($0,
-		          "^# Generated (by (GNU )?Autoconf|automatically using autoconf version) ([0-9].[0-9])",
-		          res)) {
-			print res[3]
-			exit
-		}
-	}' "$@"
-}
-
-#
-# autodetect routine
-#
-if [[ ${WANT_AUTOCONF} != "2.5" ]] ; then 
-	if [[ ${WANT_AUTOCONF} == "2.1" ]] ; then
-		if [[ ! -f "configure.ac" ]] ; then
-			binary=${binary_old}
-		else
-			echo "ac-wrapper: Since configure.ac is present, aclocal always use" >&2
-			echo "            autoconf 2.59, which conflicts with your choice and" >&2
-			echo "            causes error. You have two options:" >&2
-			echo "            1. Try execute command again after removing configure.ac" >&2
-			echo "            2. Don't set WANT_AUTOCONF" >&2
-			exit 1
-		fi
-	else
-		# Automake-1.7 and better requie autoconf-2.5x
-		case "${WANT_AUTOMAKE}" in
-		1.[7-9]) ;;
-		*)
-			acfiles=$(ls ac{local,include}.m4 configure.{in,ac} 2>/dev/null)
-			[[ -n ${acfiles} ]] && confversion=$(acprereq_version ${acfiles})
-			
-			[[ -z ${confversion} && -r "configure" ]] && \
-				confversion=$(generated_version configure)
-
-			if [[ ${confversion} == "2.1" && ! -f "configure.ac" ]] ; then
-				binary="${binary_old}"
-			fi
-		esac
-	fi
-fi
-
-if [[ -n ${WANT_ACWRAPPER_DEBUG} ]] ; then
-	if [[ -n ${WANT_AUTOCONF} ]] ; then
-		echo "ac-wrapper: DEBUG: WANT_AUTOCONF is set to ${WANT_AUTOCONF}" >&2
-	fi
-	echo "ac-wrapper: DEBUG: will execute <${binary}>" >&2
-fi
-
-#
-# for further consistency
-#
-if [[ ${binary} == "${binary_new}" ]] ; then
-	export WANT_AUTOCONF="2.5"
-elif [[ ${binary} == "${binary_old}" ]] ; then
-	export WANT_AUTOCONF="2.1"
-fi
-
-if [[ ! -x ${binary} ]] ; then
-	# this shouldn't happen
-	echo "ac-wrapper: ${binary} is missing or not executable." >&2
-	echo "            Please try emerging the correct version of autoconf." >&2
-	exit 1
-fi
-
-exec "${binary}" "$@"
-
-echo "ac-wrapper: was unable to exec ${binary} !?" >&2
-exit 1
diff --git a/sys-devel/autoconf/Manifest b/sys-devel/autoconf/Manifest
index 3aa22c642913..7c17bd2cc1c6 100644
--- a/sys-devel/autoconf/Manifest
+++ b/sys-devel/autoconf/Manifest
@@ -13,14 +13,14 @@ DIST autoconf-2.62.tar.gz 1518427 RMD160 316220038dd0fc131fd93e1fbfe422f7c67b416
 EBUILD autoconf-2.13.ebuild 1504 RMD160 e9b161c7720bdbef8f0a17550dc2f676ebf2c6b4 SHA1 ecd64b961f41ae9f5091946acc92809f5d30e6e4 SHA256 74ee6c3d7e10b032df0516861c2b06b7af2197eb23dbb37a1bca9d1472acf43e
 EBUILD autoconf-2.59-r7.ebuild 1259 RMD160 1be4a2b95da4270bb4d11325d07aafae82f9bda9 SHA1 c0cda278c0002d4e4312a27717d4185213e6175c SHA256 b875f653f9bc9a15c6ca8a2465fd0298d0f6191b06387a6ca928ea491d63e982
 EBUILD autoconf-2.61-r1.ebuild 1214 RMD160 5e23930b4800631972ce905c5ed44357a12a3d9c SHA1 e9fa1f68331364c280879debe75f453ab3f23a1b SHA256 d75a6ab5a08f33d8d3dcc93af0bbd16656765d15110a9b3fc3318c26791ea53b
-EBUILD autoconf-2.62.ebuild 1219 RMD160 688246a89a43d0077ddb41632ef196ee179627ad SHA1 87ac2fe2aff6ac1310fc4f5d057e9ae2dc5c7c63 SHA256 303967c97912dcfd299530ddaf95c3cbff6ef9e1a5c03273a9cd497d436ed902
+EBUILD autoconf-2.62.ebuild 1216 RMD160 f7a72065ef446b18114a22e7b7f81d368ed15fae SHA1 a42ece14b0cdd9b738415d000eeac32e248a8aac SHA256 bcf8e80bbb1c4ac81c3702be5c4af094938598693a704330f933b55b99fbc7cf
 EBUILD autoconf-9999.ebuild 1262 RMD160 46da23705fa4033b0a420507aaba52eeb3364af1 SHA1 b64c10c9fbd1cf34e2802474e021576e712d78c8 SHA256 0fc59822d4289bbd38a6f0a55374b7cc5c3ff61fafeb25301728e6cd11d68d31
-MISC ChangeLog 15687 RMD160 86ca9d88b6466ada63def73720677dedb964731a SHA1 ff2da3af54d5f3bf2c648c0cc9e0aadde86022a1 SHA256 7174db53276daba98bab289aab6b8bffbb2377a46574e7ce2f2629d948d72374
+MISC ChangeLog 15800 RMD160 ecc6d14c379172b095fd05f47426437009318017 SHA1 b5ceef1684b9c5e199bc5c60635a138aea5d6e7d SHA256 4964af7f31c70102ec7774b231de6133f108ae6f87fb3ce89c27752d8d79b065
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFH/Zgxj9hvisErhMIRAhOEAKC7dN7dDkZt7GQp3cG8qARrRVTiLgCfRxSO
-RVIM2mLAWomagXse1gslfAg=
-=DaWf
+iD8DBQFH/cqaj9hvisErhMIRAiBdAKDjbexoFuTNDpAbeY8vEvLNklbccwCgykSu
+hRQ1699q/pPzTJCWkz10E8o=
+=ZZu0
 -----END PGP SIGNATURE-----