initial import

7 files changed, 192 insertions, 4 deletions

diff --git a/sys-devel/autoconf-wrapper/ChangeLog b/sys-devel/autoconf-wrapper/ChangeLog
new file mode 100644
index 000000000000..4e3b9b6a30fb
--- /dev/null
+++ b/sys-devel/autoconf-wrapper/ChangeLog
@@ -0,0 +1,9 @@
+# ChangeLog for sys-devel/autoconf-wrapper
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/ChangeLog,v 1.1 2004/10/21 01:06:11 vapier Exp $
+
+*autoconf-wrapper-1 (20 Oct 2004)
+
+  20 Oct 2004; Mike Frysinger <vapier@gentoo.org>:
+  Break the autoconf wrapper (ac-wrapper.pl) off into its own package.
+  This updated version resolves #56670 and #66478.
diff --git a/sys-devel/autoconf-wrapper/Manifest b/sys-devel/autoconf-wrapper/Manifest
new file mode 100644
index 000000000000..0cb34c32d857
--- /dev/null
+++ b/sys-devel/autoconf-wrapper/Manifest
@@ -0,0 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 3285105b0b36f54b35d246df1e6e75fc autoconf-wrapper-1.ebuild 745
+MD5 076d1b4bb28d498a1565e59abd92e5ca ChangeLog 433
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 f0aebf1e8164550818d53396a30af91d files/ac-wrapper-1.pl 3816
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-autoconf-wrapper-1 0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFBdwunHTu7gpaalycRAgeAAJ4leuaYTkBHhxJ2QaVTWnaeq5VGcgCgx7oT
+tpP4qc0Lhmg079sRMTKncng=
+=Znsf
+-----END PGP SIGNATURE-----
diff --git a/sys-devel/autoconf-wrapper/autoconf-wrapper-1.ebuild b/sys-devel/autoconf-wrapper/autoconf-wrapper-1.ebuild
new file mode 100644
index 000000000000..577a41be1207
--- /dev/null
+++ b/sys-devel/autoconf-wrapper/autoconf-wrapper-1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/autoconf-wrapper-1.ebuild,v 1.1 2004/10/21 01:06:11 vapier 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 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="dev-lang/perl"
+
+S=${WORKDIR}
+
+src_install() {
+	exeinto /usr/lib/misc
+	newexe ${FILESDIR}/ac-wrapper-${PV}.pl ac-wrapper.pl
+
+	dodir /usr/bin
+	local x=
+	for x in auto{conf,header,m4te,reconf,scan,update} ifnames ; do
+		dosym ../lib/misc/ac-wrapper.pl /usr/bin/${x}
+	done
+}
diff --git a/sys-devel/autoconf-wrapper/files/ac-wrapper-1.pl b/sys-devel/autoconf-wrapper/files/ac-wrapper-1.pl
new file mode 100644
index 000000000000..f041cdbb5de9
--- /dev/null
+++ b/sys-devel/autoconf-wrapper/files/ac-wrapper-1.pl
@@ -0,0 +1,126 @@
+#!/usr/bin/perl
+#
+#
+# Guillaume Cottenceau (gc@mandrakesoft.com)
+# Abel Cheung (deaddog@deaddog.org)
+#
+# Copyright 2001-2002, 2004 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 autoconf-2.59
+# - runs autoconf-2.13 only if:
+#   - envvar WANT_AUTOCONF_2_1 is set to `1'
+#     -or-
+#   - `configure' is already present and was generated by autoconf 2.13
+#
+#######################################################################
+#
+# ChangeLog:
+# 
+# * Fri May 14 2004
+# - Use autoconf 2.59 by default, unless `configure' is generated by
+#   autoconf 2.13, or WANT_AUTOCONF_2_1 is set.
+# - WANT_AUTOCONF_2_5 has no effect now
+#
+# * Thu May 27 2004
+# - Almost rewrite
+# - Introduce FORCE_AUTOCONF_2_5 (avoid misuse with WANT_*), which can be used
+#   when you want to play with fire :-)
+# - More verbose and user oriented messages (gc et. al.)
+#
+# * Sat Jul 03 2004
+# - require autoconf2.1 and remove special error message
+# - allow use of tools without configure.in or configure.ac (2.5 only)
+#   required for autodetection by apps
+
+use File::Basename qw(basename);
+use strict;
+
+sub cat_ { local *F; open F, $_[0] or return; my @l = <F>; wantarray ? @l : join '', @l }
+
+sub errmsg {
+	my $dummy = 0;
+	my @msg = @_;
+	foreach (@msg) {
+		print STDERR (($dummy++ == 0)? "ac-wrapper: " : "            ") . $_ . "\n";
+	}
+	exit 1;
+}
+
+errmsg ("Don't call this script directly.") if (basename("$0") eq "ac-wrapper.pl");
+
+#
+# go away naughty guys/gals
+#
+if (($ENV{WANT_AUTOCONF_2_1}) && ($ENV{FORCE_AUTOCONF_2_5})) {
+	errmsg ("You can only set either WANT_AUTOCONF_2_1 or FORCE_AUTOCONF_2_5,",
+		"but not both.");
+}
+
+if (($ENV{WANT_AUTOCONF_2_1}) && (basename("$0") eq "autom4te")) {
+	errmsg ("Autoconf 2.13 doesn't contain autom4te.",
+		"Either unset WANT_AUTOCONF_2_1 or don't execute anything",
+		"that would use autom4te.");
+}
+
+my $binary_new = "$0-2.59";
+my $binary_old = "$0-2.13";
+my $binary = $binary_new;
+my $confversion = 'Undetected';
+
+if ((-f "configure.ac") || (-f "configure.in")) {
+#
+# autodetect routine
+#
+	if ($ENV{WANT_AUTOCONF_2_1}) {
+		if ((-f "configure.in") && (! -f "configure.ac")) {
+			$binary = $binary_old;
+		} else {
+			errmsg ("Since configure.ac is present, aclocal always use",
+				"autoconf 2.59, which conflicts with your choice and",
+				"causes error. You have two options:",
+				"1. Try execute command again after removing configure.ac",
+				"2. Don't set WANT_AUTOCONF_2_1 variable");
+		}
+	} elsif (!($ENV{FORCE_AUTOCONF_2_5})) {
+		# U > [0-9] in lexicon comparison
+		$confversion = (cat_('configure') =~ /^# Generated (by (?:GNU )?Autoconf|automatically using autoconf version) (\S+)/m ? $2 : 'Unknown');
+	
+		if (("$confversion" lt '2.5') && (! -f "configure.ac")) {
+			$binary = $binary_old;
+		}
+	}
+}
+
+if ($ENV{WANT_ACWRAPPER_DEBUG}) {
+	print STDERR "ac-wrapper: DEBUG: Detected version is '$confversion'\n";
+	print STDERR "ac-wrapper: DEBUG: WANT_AUTOCONF_2_1 is set\n" if ($ENV{WANT_AUTOCONF_2_1});
+	print STDERR "ac-wrapper: DEBUG: FORCE_AUTOCONF_2_5 is set\n" if ($ENV{FORCE_AUTOCONF_2_5});
+	print STDERR "ac-wrapper: DEBUG: will execute <$binary>\n";
+}
+
+#
+# for further consistency
+#
+$ENV{WANT_AUTOCONF_2_1} = 1 if ("$binary" eq "$binary_old");
+$ENV{FORCE_AUTOCONF_2_5} = 1 if ("$binary" eq "$binary_new");
+
+if (! -x "$binary") {
+	# this shouldn't happen
+	errmsg ("$binary is missing or not executable.",
+		"Something is very wrong.");
+}
+
+exec $binary, @ARGV;
+
+errmsg ("was unable to exec $binary !?");
diff --git a/sys-devel/autoconf-wrapper/files/digest-autoconf-wrapper-1 b/sys-devel/autoconf-wrapper/files/digest-autoconf-wrapper-1
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/sys-devel/autoconf-wrapper/files/digest-autoconf-wrapper-1
diff --git a/sys-devel/autoconf-wrapper/metadata.xml b/sys-devel/autoconf-wrapper/metadata.xml
new file mode 100644
index 000000000000..96a2d586367d
--- /dev/null
+++ b/sys-devel/autoconf-wrapper/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>base-system</herd>
+</pkgmetadata>
diff --git a/sys-devel/autoconf/Manifest b/sys-devel/autoconf/Manifest
index 219f5db01af2..0c9f28997837 100644
--- a/sys-devel/autoconf/Manifest
+++ b/sys-devel/autoconf/Manifest
@@ -1,18 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 cf979209a664d2621b669221b6c5a080 ChangeLog 9130
+MD5 6789c1d757d10e7b7ca50fc8d5967709 ChangeLog 9367
+MD5 9794b8761f9f20fabf1cd602fdf96054 autoconf-2.13.ebuild 1542
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 c9afbb6295dd968b7d4a7b5936086b21 autoconf-2.59-r5.ebuild 3428
+MD5 f11bea1d4d982828e099d246a40ae59e autoconf-2.59-r6.ebuild 1145
 MD5 c07cd3cad0342c7c9ccafdb4f0ae8b03 files/ac-wrapper.pl 2785
 MD5 12f8fb67eaf50f87ed7825356503e8d7 files/autoconf-2.13-configure-gentoo.diff 958
 MD5 f935499520b964a1fcfc23b68d8c8558 files/autoconf-2.13-configure.in-gentoo.diff 443
 MD5 372cd1fdd18a95f5a6af7cb36bfd12de files/autoconf-2.58-infopage-namechange.patch 5117
+MD5 02c192b9ea3e4945d007a8cfde221c73 files/digest-autoconf-2.13 65
 MD5 b310d32d1d5c26cb84206bfda473da1c files/digest-autoconf-2.59-r5 131
+MD5 dee8e039dbcfd6a6543e28688615ee17 files/autoconf-2.13-destdir.patch 677
+MD5 edfa347b2a6e2c0de846cabda899b429 files/autoconf-2.13-gentoo.patch 898
+MD5 ed1c29020cbdfc79d6a1ece183afd936 files/digest-autoconf-2.59-r6 66
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.9.10 (GNU/Linux)
 
-iD8DBQFBaGiTHTu7gpaalycRAgsDAJ40J1RjXVrlMm3atrDtFiPcYiqTQQCg2dg6
-nYATCe52Oc3bodGcpUCz5c4=
-=I4C8
+iD8DBQFBdwurHTu7gpaalycRAr8SAKDQoyMvOZDTOsZMibrFSyIwptnrOgCgv4vQ
+yUghhc24S+2B71u8li6Lydc=
+=HiRN
 -----END PGP SIGNATURE-----