Version bump for automake-1.14.

Package-Manager: portage-2.2.0_alpha179/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

4 files changed, 239 insertions, 5 deletions

diff --git a/sys-devel/automake-wrapper/ChangeLog b/sys-devel/automake-wrapper/ChangeLog
index 8ca6cbcc4d8f..8dc9bb168e94 100644
--- a/sys-devel/automake-wrapper/ChangeLog
+++ b/sys-devel/automake-wrapper/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/automake-wrapper
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake-wrapper/ChangeLog,v 1.68 2013/02/17 20:37:32 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake-wrapper/ChangeLog,v 1.69 2013/06/23 04:50:40 vapier Exp $
+
+*automake-wrapper-9 (23 Jun 2013)
+
+  23 Jun 2013; Mike Frysinger <vapier@gentoo.org> +automake-wrapper-9.ebuild,
+  +files/am-wrapper-9.sh:
+  Version bump for automake-1.14.
 
   17 Feb 2013; Zac Medico <zmedico@gentoo.org> automake-wrapper-8.ebuild:
   Add ~arm-linux keyword.
diff --git a/sys-devel/automake-wrapper/Manifest b/sys-devel/automake-wrapper/Manifest
index 5d49cb7a4b71..7f4ce2261d56 100644
--- a/sys-devel/automake-wrapper/Manifest
+++ b/sys-devel/automake-wrapper/Manifest
@@ -7,18 +7,30 @@ AUX am-wrapper-5.sh 4130 SHA256 0546150d48e71d25ed3c909982fe30bdaccc6c79382ad198
 AUX am-wrapper-6.sh 4715 SHA256 6606032f25ef1253caa6ecb38ae8f196581157db1d83a6e2475001ab38c589b1 SHA512 859f002ff1175c562ab1ef6555654815faa26100aad17a2b6d355e0944d58993b2abe71e342237694a26e74e4ece0eeefa384f9f5332b367e774876945469ae1 WHIRLPOOL 0f691b3a4b2bcdbe0334663f708895ff72c540631d8a0326ba0be39c73f4a19fe17c9476c7509728686e61bba9b18a5b5595bce502c978f94f6b6b3b0b031312
 AUX am-wrapper-7.sh 4278 SHA256 c607adc7c6aedf94ceb00626bc0becd770c9fa26579118729c31789f3661ef0e SHA512 1d07da959dc06ba8cef8602d6d1e2a351e3bb2a9fa53d442aecbdec48906a3a41a369ba29d5e0d4473fdebc3869c4448662c22ef8d63ede17d5fc80a9da47ef7 WHIRLPOOL 0797859cfbd67fe4bc0e706192882f13800fe39fb3139a97de0d2b2a0ffcec450705eff2edf6c94c0a31bf5955172b2b349645c77f30f91566ff6cccab55b17d
 AUX am-wrapper-8.sh 4676 SHA256 415005eb5260187536b7c3535d1c73245dc936b17ca02fa4511788f4bf4b60b7 SHA512 809f492f6bfbc59906c1180e3f70a71f7937e76fe8604e41d5d6f5ada1d847ff9a3d699b6e66ac72d488b5e03c5f5d24e5dc832452ee4a72fcaafd0d221f1d31 WHIRLPOOL 5be62a662995baf9eebb988ab859075bfb07ddbd950747f4668145bb9b0e1b126626548b933d30c9a1327fbc711329811f98d8f9640bb86200e5a82b4af21619
+AUX am-wrapper-9.sh 4749 SHA256 5bed24a3c56a40797b74a2283bad52658745cd60e86550e297f95e276529840b SHA512 9c1baa9a0945b0558786ec207289676305829088b7fc72d2d008dd3d98867d2539e214bc641378db939e6ddc6593e8d815ff0601c7ed09bf9615fde354a3aa3d WHIRLPOOL e1338aff394b4ad4dcd4f68690453e003052836e07df22883928b00be5ac23a754137bf1c5c05ff245a36e14f8fdac77ad94f71ef40bd5e10dbcebc3c1e93394
 EBUILD automake-wrapper-3-r1.ebuild 785 SHA256 1d198667a858c507ecb0c28f07aa27a141d70c3d1707f759d568b96363af9a57 SHA512 9148e37dcd8842daa0008c16f803bff67c0207b925e2663bf8e40d8197d20bb0e3f8b8de6701f1cdb8bb75a475da04e7b612bf4bc1fc3a17eb96ff086b766e1b WHIRLPOOL aa72163a79e43ae2af1367245652883c39d942be0c6d590c60d84a8db6d989f99299ab509ec6bee298e9398208775bd015e9ec1cb557d5f26db2657f63046c76
 EBUILD automake-wrapper-4.ebuild 991 SHA256 0fc2b9d42af0586fba0da45aa723da93a92159d72f29a232ef4e8457277f60fe SHA512 09963ba967c0569c25219f028a5ca5630b415711184301675d15c7c6618df317b149ee49fea6eebe344f7e233c8fd7211c020d4470a08962c9ae5d702ccdbb14 WHIRLPOOL 30feff9b9a1ff4884c3e18ae3801fce7dff1642f787684e6457c925e27e07e301dbc53ff8f679c1af70d546de05ba3180c2ad69cb6b44bc6d4f3abad5027fcfc
 EBUILD automake-wrapper-5.ebuild 1215 SHA256 7d277e0299fc6d30b6d0c2011a1269743bc54ada7e85a81c18df282e5132926e SHA512 f849f4d310fc84d60413f074ec2227243cf4f96be6761540270d7dc5a6c3c761890d0ce919a5dae157ca26cc0093c91ac5974b1d10c463e596c12b8c6f64cdce WHIRLPOOL 8342f3ec000d8150d5e608d58e4e0997891e864cf1525b1bec201495d13a543ff0faaa259bfe263763b58d4269b8545ae100a3ca739d84e8223f4225aab9f9c1
 EBUILD automake-wrapper-6.ebuild 1212 SHA256 d09b28fe9c616750b7a67ea8ed56ac68850bffbbae851f03e27c41c547f1a44c SHA512 022347d1eb93bc38282ece426110208461dbb24e64fbffac5afb67f9c69177c51f5deea99093695cac038c1708e282a28efe23975a8bc4dc52689587a983ce2c WHIRLPOOL 13901633c652e7ab3750c062227d26bfa4fda0dd7ddd75663246109c1a45d548888d1237e2abbfd0cf88e9aba52b709acf35cbdfa4881045ca00f6d4c3e20346
 EBUILD automake-wrapper-7.ebuild 1079 SHA256 fef14d9da3783b1745545e8da469df17d126f4fdcf0ea786014c2666f6d8941a SHA512 cc74543933b6b131fba02ca33b827063a9492f3519d849d0a2b0bf8299813bc5c55fbfcdcc6ba9aa8bf2e66af81168e8e94d96eb89982a663783e10bc66c929b WHIRLPOOL 3cab47343c4ac4224e5dd30d9d556d264f2759206c08d1a25e139e3724a5c17b886efff6b7df4a1a6436a300d85e2c8325d4c4093c664191dd9ba18fef5e076e
 EBUILD automake-wrapper-8.ebuild 1102 SHA256 29a7d90ce1723692641206feea971a6d6fbca669e2f1826ec665e4c4ee8b1030 SHA512 e50910163067def0fc25e53b97a57bdad28b237bfa52cac74f15b089277bb41f585ad71f83fe1c04981cbad0d7a6e176edcecfa32875e763bf43fdcfb47a9464 WHIRLPOOL 27b48da155a0171c713e32d59204d49464004ffc71883c2a6e52d5ec73977d5ca80d32e087c390d3fc2fc3ad0e5bbfaf083b5ef869a3e92a4af11d819a56939e
-MISC ChangeLog 8383 SHA256 e8d4e560ce3d2a38cb715cbc1823742c1dbaaa0aac51627c4699f0539ec50285 SHA512 8321d659b4088ce3d9a960f067267784da41dc5adec8fb87e92420ec81375d6991b26916c01f2ff20282afaa0a0a5ef435dea795e9561786e676002cd91ab4b4 WHIRLPOOL bd272e1d43273a80f828aaeaa38086407c024656d90a2becd7226dc7c0daf41a5a9911d7da0c315acc1555c4ff1992c3a9f688617c084f595cebb9276f2902e4
+EBUILD automake-wrapper-9.ebuild 1101 SHA256 3e293c06beb3fa160342f3d46fb62a937623db4b65ad6981894dae1fd5a88b6b SHA512 b5c2dc7d56d1bf8c609c6e344a111fd1d6ccfac8ea1d1dbf06de70a528ba66ed2a4e3292ddb6760d4676f6453bdb02b8797631912a74383cc57f313dc0c3476d WHIRLPOOL 08c04287e6ab104c9d0bb7324eed11cd1009ae57794ad0dde5e0b0b3bd10fb09db9c8f067bac2df09e2aea5f8bd86d8c0922a1fd7c057efc1804bfc3e4dcadb3
+MISC ChangeLog 8556 SHA256 10bbd83e4f3d41d46d8269a20b74c4e65de46296c3d0e7544c4e08cd3dfa8e70 SHA512 1b2a859b1d0612d5caee9198f5adf45dd98689860cb1f98986518d6337fbd8bbe31ad71b2c68500982306d3547b0bdffd335493b69bdc023b43ee5221772ee39 WHIRLPOOL eb7a47e9741af004de8df97a04fc9b87e1bb2dcffc25ffe5343ecc63b2fdd4c6f06bc574aa5142463b43e8c825b73af20be9c8c44d89857b5709dcbcad5b853e
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlEhP44ACgkQ/ejvha5XGaPMoACgxy7TKJOUSv55NfCxJDsSePbr
-+YgAn2C+BjnbrOQ+mLCfkB/K1ND9U2fu
-=FSDT
+iQIcBAEBCAAGBQJRxn6nAAoJELEHsLL7fEFWCYsP/303soJNTfF06SFQWHfCqEZl
+SvoHZnMkXxVLeU2+jSg5gXqr+hL2vriDe94qzJrzeFp4dnzkL3x+EZxnI6aHY6ME
+qyzemY0BsCFyd3YbFsyYh1zBW8Ns8sx8xx79Qs9JXyicCvJwjdDM9Bi0zxdyBFRR
+EPoqgsSprP+4etZDY92YfkDN8n2TcLR2Yl9NZIb8x5PWX4D1iw1F/ze7GSliwrtv
+ZVO1Xz1FnWMcqaj9fuBp5yEMlfq2o5ypTlRbWK1a1S1TQ9Uxp2PYXxkVyma4SSYd
+QHokzVmk2YvX2kMFUOGE2XPt6La3OeHbQbYrzr6ASS3iwPQUVa4j2nwY9kxJk+d5
+5decLtrG7SnQ29HzmEEdkIJOwSWnHjSF/s0Z7tD14KDG2WpJbZsfY/HgcCOUzdpF
+vloFsYXkz8FVvt5CbLlhHoEUr5kTFHWyTn6pC5vJpYXo8gIU4EuDvIbL627cxJAt
+tcN8SKw/2+p0JjJiYyN6vd2J8qqkfqBQzqDQCsLG/zPd+zA9jZj33FkKSxTe0OQF
+fHClm2eWze5yPSHrYxXid8VBgXb033iknQJhprYvDoz6ou82tp79gnCsrsRKnqq+
+37h7vJObD/TcVOj5l7rWyDx9q2h5KFCtlywX8GJMiYv717wCZPr0OpKJ1QIbyW6N
+ANXtRAXdskEg16XfsRfq
+=BwO1
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/automake-wrapper/automake-wrapper-9.ebuild b/sys-devel/automake-wrapper/automake-wrapper-9.ebuild
new file mode 100644
index 000000000000..e7f344226244
--- /dev/null
+++ b/sys-devel/automake-wrapper/automake-wrapper-9.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake-wrapper/automake-wrapper-9.ebuild,v 1.1 2013/06/23 04:50:40 vapier Exp $
+
+DESCRIPTION="wrapper for automake to manage multiple automake 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 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+S=${WORKDIR}
+
+src_unpack() {
+	cp "${FILESDIR}"/am-wrapper-${PV}.sh "${S}"/
+	# usr/bin/aclocal: bad substitution -> /bin/sh != POSIX shell
+	if use prefix ; then
+		sed -i -e '1c\#!'"${EPREFIX}"'/bin/sh' "${S}"/am-wrapper-${PV}.sh || die
+	fi
+}
+
+src_install() {
+	newbin "${S}"/am-wrapper-${PV}.sh automake || die
+	dosym automake /usr/bin/aclocal
+
+	keepdir /usr/share/aclocal
+}
diff --git a/sys-devel/automake-wrapper/files/am-wrapper-9.sh b/sys-devel/automake-wrapper/files/am-wrapper-9.sh
new file mode 100755
index 000000000000..26455634d8dc
--- /dev/null
+++ b/sys-devel/automake-wrapper/files/am-wrapper-9.sh
@@ -0,0 +1,187 @@
+#!/bin/sh
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake-wrapper/files/am-wrapper-9.sh,v 1.1 2013/06/23 04:50:40 vapier Exp $
+
+# Executes the correct automake version.
+#
+# If WANT_AUTOMAKE is set (can be a whitespace delimited list of versions):
+#  - attempt to find an installed version using those
+#  - if magic keyword 'latest' is found, pick the latest version that exists
+#  - if nothing found, warn, and proceed as if WANT_AUTOMAKE was not set (below)
+# If WANT_AUTOMAKE is not set:
+#  - Try to detect the version of automake used to generate things (look at
+#    Makefile.in and aclocal.m4 and any other useful file)
+#  - If detected version is not found, warn and proceed as if blank slate
+#  - Try to locate the latest version of automake that exists and run it
+
+(set -o posix) 2>/dev/null && set -o posix
+
+_stderr() { printf 'am-wrapper: %s: %b\n' "${argv0}" "$*" 1>&2; }
+warn() { _stderr "warning: $*"; }
+err() { _stderr "error: $*"; exit 1; }
+unset IFS
+which() {
+	local p
+	IFS=: # we don't use IFS anywhere, so don't bother saving/restoring
+	for p in ${PATH} ; do
+		p="${p}/$1"
+		[ -e "${p}" ] && echo "${p}" && return 0
+	done
+	unset IFS
+	return 1
+}
+
+#
+# Sanitize argv[0] since it isn't always a full path #385201
+#
+argv0=${0##*/}
+case $0 in
+	${argv0})
+		# find it in PATH
+		if ! full_argv0=$(which "${argv0}") ; then
+			err "could not locate ${argv0}; file a bug"
+		fi
+		;;
+	*)
+		# re-use full/relative paths
+		full_argv0=$0
+		;;
+esac
+
+if ! seq 0 0 2>/dev/null 1>&2 ; then #338518
+	seq() {
+		local f l i
+		case $# in
+			1) f=1 i=1 l=$1;;
+			2) f=$1 i=1 l=$2;;
+			3) f=$1 i=$2 l=$3;;
+		esac
+		while :; do
+			[ $l -lt $f -a $i -gt 0 ] && break
+			[ $f -lt $l -a $i -lt 0 ] && break
+			echo $f
+			: $(( f += i ))
+		done
+		return 0
+	}
+fi
+
+#
+# Set up bindings between actual version and WANT_AUTOMAKE;
+# Start with last known versions to speed up lookup process.
+#
+LAST_KNOWN_AUTOMAKE_VER="14"
+vers=$(printf '1.%s ' `seq ${LAST_KNOWN_AUTOMAKE_VER} -1 4`)
+
+#
+# Helper to scan for a usable program based on version.
+#
+binary=
+all_vers=
+find_binary() {
+	local v
+	all_vers="${all_vers} $*" # For error messages.
+	for v ; do
+		if [ -x "${full_argv0}-${v}" ] ; then
+			binary="${full_argv0}-${v}"
+			binary_ver=${v}
+			return 0
+		fi
+	done
+	return 1
+}
+
+#
+# Try and find a usable automake version.  First check the WANT_AUTOMAKE
+# setting (whitespace delimited list), then fallback to the latest.
+#
+find_latest() {
+	if ! find_binary ${vers} ; then
+		# Brute force it.
+		find_binary $(printf '1.%s ' `seq 99 -1 ${LAST_KNOWN_AUTOMAKE_VER}`)
+	fi
+}
+for wx in ${WANT_AUTOMAKE:-latest} ; do
+	if [ "${wx}" = "latest" ] ; then
+		find_latest && break
+	else
+		find_binary ${wx} && break
+	fi
+done
+
+if [ -z "${binary}" ] && [ -n "${WANT_AUTOMAKE}" ] ; then
+	warn "could not locate installed version for WANT_AUTOMAKE='${WANT_AUTOMAKE}'; ignoring"
+	unset WANT_AUTOMAKE
+	find_latest
+fi
+
+if [ -z "${binary}" ] ; then
+	err "Unable to locate any usuable version of automake.\n" \
+	    "\tI tried these versions:${all_vers}\n" \
+	    "\tWith a base name of '${full_argv0}'."
+fi
+
+#
+# autodetect helpers
+#
+do_awk() {
+	local file=$1 ; shift
+	local v=$(awk -v regex="$*" '{
+		if (ret = match($0, regex)) {
+			s = substr($0, ret, RLENGTH)
+			ret = match(s, "[0-9]\\.[0-9]+")
+			print substr(s, ret, RLENGTH)
+			exit
+		}
+		}' "${file}")
+	case " ${auto_vers} " in
+	*" ${v} "*) ;;
+	*) auto_vers="${auto_vers:+${auto_vers} }${v}" ;;
+	esac
+}
+
+#
+# autodetect routine
+#
+if [ -z "${WANT_AUTOMAKE}" ] ; then
+	auto_vers=
+	if [ -r "Makefile.in" ] ; then
+		do_awk Makefile.in '^# Makefile.in generated (automatically )?by automake [0-9]\\.[0-9]+'
+	fi
+	if [ -r "aclocal.m4" ] ; then
+		do_awk aclocal.m4 'generated automatically by aclocal [0-9]\\.[0-9]+'
+		do_awk aclocal.m4 '[[:space:]]*\\[?AM_AUTOMAKE_VERSION\\(\\[?[0-9]\\.[0-9]+[^)]*\\]?\\)'
+	fi
+	# We don't need to set $binary here as it has already been setup for us
+	# earlier to the latest available version.
+	if [ -n "${auto_vers}" ] ; then
+		if ! find_binary ${auto_vers} ; then
+			warn "auto-detected versions not found (${auto_vers}); falling back to latest available"
+		fi
+	fi
+fi
+
+if [ -n "${WANT_AMWRAPPER_DEBUG}" ] ; then
+	if [ -n "${WANT_AUTOMAKE}" ] ; then
+		warn "DEBUG: WANT_AUTOMAKE is set to ${WANT_AUTOMAKE}"
+	fi
+	warn "DEBUG: will execute <${binary}>"
+fi
+
+#
+# for further consistency
+#
+export WANT_AUTOMAKE="${binary_ver}"
+
+#
+# Now try to run the binary
+#
+if [ ! -x "${binary}" ] ; then
+	# this shouldn't happen
+	err "${binary} is missing or not executable.\n" \
+	    "\tPlease try installing the correct version of automake."
+fi
+
+exec "${binary}" "$@"
+# The shell will error out if `exec` failed.