wrapper updates #71132

2 files changed, 17 insertions, 8 deletions

diff --git a/sys-devel/automake-wrapper/Manifest b/sys-devel/automake-wrapper/Manifest
index 4c103099fe80..c9667837929c 100644
--- a/sys-devel/automake-wrapper/Manifest
+++ b/sys-devel/automake-wrapper/Manifest
@@ -5,11 +5,11 @@ MD5 0dfe60f44a425d88456e93514bb89ac4 automake-wrapper-1.ebuild 752
 MD5 e35adb9d986d73a30339f4f5fcea3c5c ChangeLog 584
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-automake-wrapper-1 0
-MD5 e5683a0dfee85131c39d65accdbfeb06 files/am-wrapper-1.sh 3141
+MD5 e144cb70829218ab9da4e7d05412e4b0 files/am-wrapper-1.sh 3393
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.9.10 (GNU/Linux)
 
-iD8DBQFBlvFMHTu7gpaalycRAiWrAKDqCr4WYznYlsygapJc6fg8iN3pcwCfReSI
-hKaFTwj7jzpkogdgXuqLVR8=
-=Us+B
+iD8DBQFBl/82HTu7gpaalycRAtIuAJ0e02a8fs12rgDksuldlTRw5gM9VACfYhso
+pdnRwHYvGhKEnR+bfwJRnrs=
+=AcNi
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/automake-wrapper/files/am-wrapper-1.sh b/sys-devel/automake-wrapper/files/am-wrapper-1.sh
index e72cd349f53a..54935e0f7682 100644
--- a/sys-devel/automake-wrapper/files/am-wrapper-1.sh
+++ b/sys-devel/automake-wrapper/files/am-wrapper-1.sh
@@ -1,14 +1,20 @@
 #!/bin/bash
 # Copyright 1999-2004 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-1.sh,v 1.2 2004/11/14 05:46:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake-wrapper/files/am-wrapper-1.sh,v 1.3 2004/11/15 00:57:43 vapier Exp $
 
 # Based on the am-wrapper.pl script provided by MandrakeSoft
 # Rewritten in bash by Gregorio Guidi
 #
 # Executes the correct automake version.
 #
-# - defaults to automake-1.8
+# - defaults to automake-1.9
+# - runs automake-1.8 if:
+#   - envvar WANT_AUTOMAKE is set to `1.8'
+#     -or-
+#   - `Makefile.in' was generated by automake-1.8
+#     -or-
+#   - 'aclocal.m4' contain AM_AUTOMAKE_VERSION, specifying the use of 1.8
 # - runs automake-1.7 if:
 #   - envvar WANT_AUTOMAKE is set to `1.7'
 #     -or-
@@ -39,7 +45,7 @@ if [ "${0##*/}" = "am-wrapper.sh" ] ; then
 	exit 1
 fi
 
-vers="1.9 1.8 1.7 1.6 1.5 1.4)"
+vers="1.9 1.8 1.7 1.6 1.5 1.4"
 
 for v in ${vers} ; do
 	eval binary_${v/./_}="${0}-${v}"
@@ -47,7 +53,7 @@ done
 binary="${binary_1_9}"
 
 #
-# autodetect routine
+# Check the WANT_AUTOMAKE setting
 #
 for v in ${vers} x ; do
 	if [ "${v}" = "x" ] ; then
@@ -68,6 +74,9 @@ do_awk() {
 	echo $(awk "{ if (match(\$0, \"$*\", res)) { print res[${arg}]; exit } }" ${file})
 }
 
+#
+# autodetect routine
+#
 if [ -z "${WANT_AUTOMAKE}" ] ; then
 	if [ -r "Makefile.in" ] ; then
 		confversion_mf=$(do_awk Makefile.in 2 "^# Makefile.in generated (automatically )?by automake ([0-9].[0-9])")