Also check configure.{in,ac} for AC_PREREQ, bug #97470.

Package-Manager: portage-2.0.51.22-r1

5 files changed, 45 insertions, 9 deletions

diff --git a/sys-devel/autoconf-wrapper/ChangeLog b/sys-devel/autoconf-wrapper/ChangeLog
index 9ee5da68511f..12354a261fed 100644
--- a/sys-devel/autoconf-wrapper/ChangeLog
+++ b/sys-devel/autoconf-wrapper/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/autoconf-wrapper
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/ChangeLog,v 1.11 2005/06/28 21:17:42 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/ChangeLog,v 1.12 2005/06/30 12:58:52 azarah Exp $
+
+*autoconf-wrapper-3-r1 (30 Jun 2005)
+
+  30 Jun 2005; Martin Schlemmer <azarah@gentoo.org> files/ac-wrapper-3.sh,
+  +autoconf-wrapper-3-r1.ebuild:
+  Also check configure.{in,ac} for AC_PREREQ, bug #97470.
 
 *autoconf-wrapper-3 (28 Jun 2005)
 
diff --git a/sys-devel/autoconf-wrapper/Manifest b/sys-devel/autoconf-wrapper/Manifest
index 60cb5ef382c4..0926f583599c 100644
--- a/sys-devel/autoconf-wrapper/Manifest
+++ b/sys-devel/autoconf-wrapper/Manifest
@@ -3,16 +3,18 @@ Hash: SHA1
 
 MD5 84d41809a827ec0c2e3b3e0804c14886 autoconf-wrapper-2-r1.ebuild 811
 MD5 5893addbc67d6e0d2fff9560a7e5198f autoconf-wrapper-3.ebuild 821
-MD5 fda666499d1dda5124c69a63fcc72ecb ChangeLog 1438
+MD5 6dcf6b2fd13d4649744e545fbbc75741 autoconf-wrapper-3-r1.ebuild 824
+MD5 80fb5f5a3b695d80e25c698819cc4008 ChangeLog 1643
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-autoconf-wrapper-2-r1 0
 MD5 d4c9467b972dd2b40aa7a1b89d2226b6 files/ac-wrapper-2.sh 2717
-MD5 05bfd519bb0f3ff73296069a59c86514 files/ac-wrapper-3.sh 3059
+MD5 baa08513b5000a1ecf58715b8d654eae files/ac-wrapper-3.sh 3077
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-autoconf-wrapper-3 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-autoconf-wrapper-3-r1 0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCwb7R1ZcsMnZjRyIRAnYUAJ9wdLIq+uJEDZhekSnmnBNeNizaFACfcK03
-ZRLE2qt57w8B7GKjapgyjQs=
-=KiQ8
+iD8DBQFCw+z41ZcsMnZjRyIRAnbIAKCmQJNNXZxzciA5rva61EZ3R486wQCfV8zs
+ExGyao36HOGAHviiaGXbD1k=
+=6bfy
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/autoconf-wrapper/autoconf-wrapper-3-r1.ebuild b/sys-devel/autoconf-wrapper/autoconf-wrapper-3-r1.ebuild
new file mode 100644
index 000000000000..32c520515784
--- /dev/null
+++ b/sys-devel/autoconf-wrapper/autoconf-wrapper-3-r1.ebuild
@@ -0,0 +1,28 @@
+# 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/autoconf-wrapper-3-r1.ebuild,v 1.1 2005/06/30 12:58:52 azarah 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 ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86"
+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.sh b/sys-devel/autoconf-wrapper/files/ac-wrapper-3.sh
index 55250ae0c9fe..0c2a056fffb6 100644
--- a/sys-devel/autoconf-wrapper/files/ac-wrapper-3.sh
+++ b/sys-devel/autoconf-wrapper/files/ac-wrapper-3.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
-# Copyright 1999-2004 Gentoo Foundation
+# 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.sh,v 1.1 2005/06/28 21:17:42 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/files/ac-wrapper-3.sh,v 1.2 2005/06/30 12:58:52 azarah Exp $
 
 # Based on the ac-wrapper.pl script provided by MandrakeSoft
 # Rewritten in bash by Gregorio Guidi
@@ -50,7 +50,7 @@ if [[ ${WANT_AUTOCONF} != "2.5" ]] ; then
 		case "${WANT_AUTOMAKE}" in
 		1.[7-9]) ;;
 		*)
-			acfiles=$(ls ac{local,include}.m4 2>/dev/null)
+			acfiles=$(ls ac{local,include}.m4 configure.{in,ac} 2>/dev/null)
 			if [[ -n ${acfiles} ]] ; then
 				confversion=$(gawk \
 				'{
diff --git a/sys-devel/autoconf-wrapper/files/digest-autoconf-wrapper-3-r1 b/sys-devel/autoconf-wrapper/files/digest-autoconf-wrapper-3-r1
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/sys-devel/autoconf-wrapper/files/digest-autoconf-wrapper-3-r1