Remove awk compat crap as gawk now works on Darwin.

(Portage version: 2.0.52-r1)

5 files changed, 164 insertions, 18 deletions

diff --git a/sys-devel/autoconf-wrapper/ChangeLog b/sys-devel/autoconf-wrapper/ChangeLog
index 09ea429d7412..6ae967f14b0e 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.18 2005/08/03 16:24:28 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/ChangeLog,v 1.19 2005/09/09 23:15:24 azarah Exp $
+
+*autoconf-wrapper-3.2 (09 Sep 2005)
+
+  09 Sep 2005; Martin Schlemmer <azarah@gentoo.org>
+  +files/ac-wrapper-3.2.sh, +autoconf-wrapper-3.2.ebuild:
+  Remove awk compat crap as gawk now works on Darwin.
 
   03 Aug 2005; Fernando J. Pereda <ferdy@gentoo.org>
   autoconf-wrapper-3-r1.ebuild:
diff --git a/sys-devel/autoconf-wrapper/Manifest b/sys-devel/autoconf-wrapper/Manifest
index 502e95e8708c..0c6c59982639 100644
--- a/sys-devel/autoconf-wrapper/Manifest
+++ b/sys-devel/autoconf-wrapper/Manifest
@@ -1,23 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 bf98ad6fc272da50d05501e9a0813bfd autoconf-wrapper-3.1.ebuild 823
-MD5 46a9fb7a4ebc3453feaf3a1dd2ca4d55 autoconf-wrapper-3-r1.ebuild 811
-MD5 5893addbc67d6e0d2fff9560a7e5198f autoconf-wrapper-3.ebuild 821
 MD5 84d41809a827ec0c2e3b3e0804c14886 autoconf-wrapper-2-r1.ebuild 811
-MD5 21a83a0a572b95fe250006ebc7c87a8e ChangeLog 2378
+MD5 5893addbc67d6e0d2fff9560a7e5198f autoconf-wrapper-3.ebuild 821
+MD5 46a9fb7a4ebc3453feaf3a1dd2ca4d55 autoconf-wrapper-3-r1.ebuild 811
+MD5 2052d5f6de3de0d3989e5c728d8ab3a9 ChangeLog 2580
+MD5 bf98ad6fc272da50d05501e9a0813bfd autoconf-wrapper-3.1.ebuild 823
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-autoconf-wrapper-3.1 0
+MD5 bf98ad6fc272da50d05501e9a0813bfd autoconf-wrapper-3.2.ebuild 823
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-autoconf-wrapper-2-r1 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-autoconf-wrapper-3-r1 0
-MD5 3e9722a6e019517139cea80014189736 files/ac-wrapper-3.1.sh 4688
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-autoconf-wrapper-3.1 0
 MD5 d4c9467b972dd2b40aa7a1b89d2226b6 files/ac-wrapper-2.sh 2717
 MD5 baa08513b5000a1ecf58715b8d654eae files/ac-wrapper-3.sh 3077
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-autoconf-wrapper-3 0
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC8PEKViELBEf1JB0RAiH5AJ4zzyDyHAvDtAsg/+dwBx8hn5jSOgCeI9Y9
-TdU8KhaxCh/42HetyP+9PKI=
-=/F52
------END PGP SIGNATURE-----
+MD5 676050e957b63020f68d1456336ab2ba files/ac-wrapper-3.2.sh 3242
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-autoconf-wrapper-3-r1 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-autoconf-wrapper-3.2 0
+MD5 3e9722a6e019517139cea80014189736 files/ac-wrapper-3.1.sh 4688
diff --git a/sys-devel/autoconf-wrapper/autoconf-wrapper-3.2.ebuild b/sys-devel/autoconf-wrapper/autoconf-wrapper-3.2.ebuild
new file mode 100644
index 000000000000..4900fdde0e75
--- /dev/null
+++ b/sys-devel/autoconf-wrapper/autoconf-wrapper-3.2.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.2.ebuild,v 1.1 2005/09/09 23:15:24 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.2.sh b/sys-devel/autoconf-wrapper/files/ac-wrapper-3.2.sh
new file mode 100755
index 000000000000..9701f84bd3ab
--- /dev/null
+++ b/sys-devel/autoconf-wrapper/files/ac-wrapper-3.2.sh
@@ -0,0 +1,119 @@
+#!/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-wrapper/files/digest-autoconf-wrapper-3.2 b/sys-devel/autoconf-wrapper/files/digest-autoconf-wrapper-3.2
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/sys-devel/autoconf-wrapper/files/digest-autoconf-wrapper-3.2