Update version; Also update version of 1.7 versions to 1.7.9

4 files changed, 196 insertions, 0 deletions

diff --git a/sys-devel/automake/files/am-wrapper.pl-1.8 b/sys-devel/automake/files/am-wrapper.pl-1.8
new file mode 100644
index 000000000000..33e30da078b5
--- /dev/null
+++ b/sys-devel/automake/files/am-wrapper.pl-1.8
@@ -0,0 +1,140 @@
+#!/usr/bin/perl
+#
+#
+# Author: Guillaume Cottenceau (gc@mandrakesoft.com)
+# Modified by: Martin Schlemmer (azarah@gentoo.org)
+#
+# Copyright 2001 MandrakeSoft
+#
+# This software may be freely redistributed under the terms of the GNU
+# public license.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+#
+#
+# Executes the correct autoconf version.
+#
+# - defaults to automake-1.4
+# - runs automake-1.8 if it exists and...
+#   - envvar WANT_AUTOMAKE is set to `1.8'
+#     -or-
+#   - `Makefile.in' was generated by automake-1.8 or superior, which
+#     specifically needs automake-1.8
+#     -or_
+#   - 'aclocal.m4' contain AM_AUTOMAKE_VERSION, specifying the use of 1.8
+# - runs automake-1.7 if it exists and...
+#   - envvar WANT_AUTOMAKE is set to `1.7'
+#     -or-
+#   - `Makefile.in' was generated by automake-1.7 or superior, which
+#     specifically needs automake-1.7
+#     -or-
+#   - 'aclocal.m4' contain AM_AUTOMAKE_VERSION, specifyint the use of 1.7
+#     -or-
+# - runs automake-1.6 if it exists and...
+#   - envvar WANT_AUTOMAKE is set to `1.6'
+#     -or-
+#   - `Makefile.in' was generated by automake-1.6 or superior, which
+#     specifically needs automake-1.6
+#     -or-
+#   - 'aclocal.m4' contain AM_AUTOMAKE_VERSION, specifyint the use of 1.6
+#     -or-
+#   - `configure.in' contains AC_PREREQ and the value's 3 first letters
+#      are stringwise greater than '2.53c'
+#     -or-
+#   - `configure' is already present and was generated by autoconf greater than
+#     '2.53c'
+# - runs automake-1.5 if it exists and...
+#   - envvar WANT_AUTOMAKE is set to `1.5'
+#     -or-
+#   - configure.ac is present
+#     -or-
+#   - `configure.in' contains AC_PREREQ and the value's 3 first letters
+#      are stringwise greater than '2.1'
+#     -or-
+#   - `configure' is already present and was generated by autoconf greater than
+#     '2.1'
+#     -or-
+#   - `Makefile.in' was generated by automake-1.5 or superior, which
+#     specifically needs automake-1.5
+#
+#use MDK::Common;
+
+sub cat_ { local *F; open F, $_[0] or return; my @l = <F>; wantarray ? @l : join '', @l }
+
+my $binary      = "$0-1.4";
+my $binary_1_5  = "$0-1.5x";
+my $binary_1_6  = "$0-1.6x";
+my $binary_1_7  = "$0-1.7x";
+my $binary_1_8  = "$0-1.8x";
+
+# Automake is really getting out of hand, so rather start supporting
+# WANT_AUTOMAKE = "1.7" the like.  Unfortunately it override the old
+# variables, so if not set, just convert the old variables ....
+if ($ENV{WANT_AUTOMAKE} eq "") {
+	if ($ENV{WANT_AUTOMAKE_1_4}) {
+		$ENV{WANT_AUTOMAKE} = '1.4';
+	} elsif ($ENV{WANT_AUTOMAKE_1_6}) {
+		$ENV{WANT_AUTOMAKE} = '1.6';
+	} elsif ($ENV{WANT_AUTOMAKE_1_5}) {
+		$ENV{WANT_AUTOMAKE} = '1.5';
+	}
+}
+
+# question here is do we really want 1.5 or 1.6?  Out of a KDE outlook, it
+# should rather be 1.5, and since most people would rather have migrated to
+# 1.5, and then stay with it for a bit (those 1.4 die hards ..), only have
+# the 'configure.ac' test for 1.5 ...
+if ($ENV{WANT_AUTOMAKE} ne '1.4') {
+	if (-x $binary_1_8              # user may not have _1_8 ...
+	&& (($ENV{WANT_AUTOMAKE} eq '1.8')
+	    || (cat_('Makefile.in') =~ /^# Makefile\.in generated by automake (\S+)/ ? $1 : '') ge '1.8'
+	    || (cat_('aclocal.m4') =~ /^# aclocal.m4 generated automatically by aclocal (\S+)/ ? $1 : '') ge '1.8'
+	    || (cat_('aclocal.m4') =~ /^\s*\[?AM_AUTOMAKE_VERSION\(\[?([^\)]{3})[^\)]*\]?\)/m ? $1 : '') ge '1.8')) {
+	$ENV{WANT_AUTOMAKE} = '1.8';    # to prevent further "cats" and to enhance consistency (possible cwd etc)
+	$binary         = $binary_1_8;
+        } elsif (-x $binary_1_7         # user may not have 1.7 ...
+	&& (($ENV{WANT_AUTOMAKE} eq '1.7')
+	    || (cat_('Makefile.in') =~ /^# Makefile\.in generated by automake (\S+)/ ? $1 : '') ge '1.7'
+	    || (cat_('aclocal.m4') =~ /^# aclocal.m4 generated automatically by aclocal (\S+)/ ? $1 : '') ge '1.7'
+	    || (cat_('aclocal.m4') =~ /^\s*\[?AM_AUTOMAKE_VERSION\(\[?([^\)]{3})[^\)]*\]?\)/m ? $1 : '') ge '1.7')) {
+	$ENV{WANT_AUTOMAKE} = '1.7';    # to prevent further "cats" and to enhance consistency (possible cwd etc)
+	$binary         = $binary_1_7;
+	} elsif (-x $binary_1_6         # user may not have 1.6 ...
+	&& (($ENV{WANT_AUTOMAKE} eq '1.6')
+	    || (cat_('Makefile.in') =~ /^# Makefile\.in generated by automake (\S+)/ ? $1 : '') ge '1.6'
+	    || (cat_('aclocal.m4') =~ /^# aclocal.m4 generated automatically by aclocal (\S+)/ ? $1 : '') ge '1.6'
+	    || (cat_('aclocal.m4') =~ /^\s*\[?AM_AUTOMAKE_VERSION\(\[?([^\)]{3})[^\)]*\]?\)/m ? $1 : '') ge '1.6'
+		# Autoconf 2.53d and later need automake-1.6c, so enable 1.6 for 2.53
+		# and up .....
+	    || (cat_('configure.in') =~ /^\s*\[?AC_PREREQ\(\[?([^\)]{4})[^\)]*\]?\)/m ? $1 : '') gt '2.52'
+	    || (cat_('configure') =~ /^# Generated by Autoconf (\S+)/m ? $1 : '') gt '2.52'
+	    || (cat_('aclocal.m4') =~ /^\s*\[?AC_PREREQ\(\[?([^\)]{4})[^\)]*\]?\)/m ? $1 : '') gt '2.52')) {
+	$ENV{WANT_AUTOMAKE} = '1.6';    # to prevent further "cats" and to enhance consistency (possible cwd etc)
+	$binary 		= $binary_1_6;
+    } elsif (-x $binary_1_5         # user may have only 1.4 ...
+	&& (($ENV{WANT_AUTOMAKE} eq '1.5')
+	    || -r 'configure.ac'
+	    || (cat_('Makefile.in') =~ /^# Makefile\.in generated by automake (\S+)/ ? $1 : '') ge '1.5'
+	    || (cat_('aclocal.m4') =~ /^# aclocal.m4 generated automatically by aclocal (\S+)/ ? $1 : '') ge '1.5'
+	    || (cat_('configure.in') =~ /^\s*\[?AC_PREREQ\(\[?([^\)]{3})[^\)]*\]?\)/m ? $1 : '') gt '2.1' 
+	    || (cat_('configure') =~ /^# Generated by Autoconf (\S+)/m ? $1 : '') gt '2.1'
+	    || (cat_('aclocal.m4') =~ /^\s*\[?AC_PREREQ\(\[?([^\)]{3})[^\)]*\]?\)/m ? $1 : '') gt '2.1')) {
+	$ENV{WANT_AUTOMAKE} = '1.5';    # to prevent further "cats" and to enhance consistency (possible cwd etc)
+	$binary 		= $binary_1_5;
+    } else {
+	if (-r 'configure.in' || -r 'configure.ac') {
+		$ENV{WANT_AUTOMAKE} = '1.4';    # for further consistency
+	} else {
+		$ENV{WANT_AUTOMAKE} = '1.8';
+		$binary         = $binary_1_8;
+	}
+    }
+}
+
+$ENV{WANT_AMWRAPPER_DEBUG} and print STDERR "am-wrapper: will execute <$binary>\n";
+
+exec $binary, @ARGV;
+
+die "am-wrapper: ouch, couldn't call binary ($binary).\n";
diff --git a/sys-devel/automake/files/automake-1.7.9-infopage-namechange.patch b/sys-devel/automake/files/automake-1.7.9-infopage-namechange.patch
new file mode 100644
index 000000000000..0e6708a55099
--- /dev/null
+++ b/sys-devel/automake/files/automake-1.7.9-infopage-namechange.patch
@@ -0,0 +1,15 @@
+--- Makefile.in	2003-06-30 17:07:30.000000000 +0000
++++ Makefile.in	2003-06-30 17:09:28.000000000 +0000
+@@ -199,8 +199,9 @@
+ 
+ .texi.info:
+ 	@rm -f $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]
+-	$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
+-	 -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++	cd $(srcdir) \
++		&& $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \
++			`echo $< | sed 's,.*/,,'`
+ 
+ .texi.dvi:
+ 	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
+ 	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
diff --git a/sys-devel/automake/files/automake-1.8.2-infopage-namechange.patch b/sys-devel/automake/files/automake-1.8.2-infopage-namechange.patch
new file mode 100644
index 000000000000..bc7d58ed35ec
--- /dev/null
+++ b/sys-devel/automake/files/automake-1.8.2-infopage-namechange.patch
@@ -0,0 +1,36 @@
+--- automake-1.8.2/doc/Makefile.in	2004-02-03 21:59:01.585999688 +0200
++++ automake-1.8.2.info/doc/Makefile.in	2004-02-03 22:04:03.893042032 +0200
+@@ -175,29 +175,10 @@
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ .texi.info:
+-	restore=: && \
+-	backupdir="$(am__leading_dot)am$$$$" && \
+-	am__cwd=`pwd` && cd $(srcdir) && \
+-	rm -rf $$backupdir && mkdir $$backupdir && \
+-	for f in $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]; do \
+-	  if test -f $$f; then \
+-	    mv $$f $$backupdir; \
+-	    restore=mv; \
+-	  fi; \
+-	done; \
+-	cd "$$am__cwd"; \
+-	if $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
+-	 -o $@ $<; \
+-	then \
+-	  rc=0; \
+-	  cd $(srcdir); \
+-	else \
+-	  rc=$$?; \
+-	  cd $(srcdir) && \
+-	  $$restore $$backupdir/* `echo "./$@" | sed 's|[^/]*$$||'`; \
+-	fi; \
+-	rm -rf $$backupdir; \
+-	exit $$rc
++	@rm -f $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]
++	cd $(srcdir) \
++		&& $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \
++		`echo $< | sed 's,.*/,,'`
+ 
+ .texi.dvi:
+ 	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
diff --git a/sys-devel/automake/files/digest-automake-1.8.2 b/sys-devel/automake/files/digest-automake-1.8.2
new file mode 100644
index 000000000000..2856546f8891
--- /dev/null
+++ b/sys-devel/automake/files/digest-automake-1.8.2
@@ -0,0 +1,5 @@
+MD5 7a8138b29361baec06548e6a0ac63189 automake-1.8.2.tar.bz2 638894
+MD5 571fd0b0598eb2a27dcf68adcfddfacb automake-1.7.9.tar.bz2 577705
+MD5 2e8053609e9d318f80db0fce29dca7e9 automake-1.6.3.tar.bz2 476275
+MD5 74a22ac0581378e807ecb334a55c5bab automake-1.5.tar.gz 526934
+MD5 24872b81b95d78d05834c39af2cfcf05 automake-1.4-p6.tar.gz 375060