Update portage patch to define EGREP just in case (maybe a bit too much?).

Also make sure its global defined as well as LTCC.

Package-Manager: portage-2.0.51.22-r1

9 files changed, 228 insertions, 23 deletions

diff --git a/sys-devel/libtool/ChangeLog b/sys-devel/libtool/ChangeLog
index 2ceaca978609..ff4ed2919888 100644
--- a/sys-devel/libtool/ChangeLog
+++ b/sys-devel/libtool/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-devel/libtool
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.79 2005/05/18 06:03:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.80 2005/06/29 11:04:00 azarah Exp $
+
+*libtool-1.5.18-r1 (29 Jun 2005)
+
+  29 Jun 2005; Martin Schlemmer <azarah@gentoo.org>
+  files/1.5.10/libtool-1.5.10-portage.patch,
+  +files/1.5.14/libtool-1.5.14-egrep.patch, libtool-1.5.14.ebuild,
+  libtool-1.5.16.ebuild, libtool-1.5.18.ebuild, +libtool-1.5.18-r1.ebuild:
+  Update portage patch to define EGREP just in case (maybe a bit too much?).
+  Also make sure its global defined as well as LTCC.
 
 *libtool-1.5.18 (18 May 2005)
 
diff --git a/sys-devel/libtool/Manifest b/sys-devel/libtool/Manifest
index 9ad0854df01f..dd8e6de0bfa9 100644
--- a/sys-devel/libtool/Manifest
+++ b/sys-devel/libtool/Manifest
@@ -1,32 +1,45 @@
-MD5 ccbee2a305e02d72b2cc5ae102c667d6 ChangeLog 13642
-MD5 7c1e5d4419d643e169f3e664636c5b3e libtool-1.5.18.ebuild 5081
-MD5 c652c6c0274abee1d45e9c22b59d3901 libtool-1.5.16.ebuild 5068
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 c54286a98098600cd5bf65d3f55b0bd8 libtool-1.5.14.ebuild 5175
 MD5 856e14ff512ae227c3d32c3582618ff9 libtool-1.3.5.ebuild 1454
-MD5 47689e309c487f74b499e64ac3c242ec libtool-1.5.14.ebuild 5065
-MD5 e893eae0aa5740740c388dbf0a35b3c6 files/digest-libtool-1.3.5 65
+MD5 e30779229d2a1a041acef0125df919a0 libtool-1.5.18.ebuild 5191
+MD5 d7f1468c442bfb11cec71451630851cf ChangeLog 14046
+MD5 d1b70b0b6ef3648d2a9b7b05990fd801 libtool-1.5.18-r1.ebuild 5194
+MD5 e48784e20efad8d2437f1c271104a4b4 libtool-1.5.16.ebuild 5178
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 bd27a462a2a9fe3662d3d34179ed3200 files/libltdl-uclibc.patch 4590
 MD5 e052afbe0e1106d25d39eb3ba55cf1b7 files/digest-libtool-1.5.18 67
 MD5 87d955b2c948108538c60271fc732069 files/digest-libtool-1.5.14 67
-MD5 4186a4565c7e9eca281c8ccc852abd3d files/digest-libtool-1.5.16 67
+MD5 e893eae0aa5740740c388dbf0a35b3c6 files/digest-libtool-1.3.5 65
 MD5 2cd6110e84c85c183c7b8dcd0be814e7 files/ltconfig-uclibc.patch 1167
+MD5 4186a4565c7e9eca281c8ccc852abd3d files/digest-libtool-1.5.16 67
+MD5 e052afbe0e1106d25d39eb3ba55cf1b7 files/digest-libtool-1.5.18-r1 67
+MD5 0fb02114fa6b6cd63ea25510f04f346a files/1.5.2/libtool-1.5-testfailure.patch 6448
+MD5 6ef585a59058c79f3601bbd7787f2683 files/1.5.2/libtool-1.5-libtool.m4-x86_64.patch 466
 MD5 807631adcb4daeff2315f390d95d262f files/1.5.14/libtool-1.5.14-ltmain_sh-max_cmd_len.patch 1093
+MD5 459b7b4016cc12fb84f04622bb60939c files/1.5.14/libtool-1.5.14-egrep.patch 402
+MD5 37f17e123166d278fa6d7996443b0359 files/1.5.10/libtool-1.5.10-portage.patch 2894
 MD5 2196d46d17a239f4b4d7629ca264a9ff files/1.5.10/libtool-1.5.10-locking.patch 513
 MD5 c420dec3cd806113ecc347a457137ea6 files/1.5.10/libtool-1.5.10-version-checking.patch 1805
-MD5 31af600c8e04aa03291773b91ca1bc53 files/1.5.10/libtool-1.5.10-portage.patch 2841
-MD5 8ad4f6ed8863c26c4ac562e1d00e6db1 files/1.4.3/libtool-1.2f-cache.patch 698
 MD5 55544e163772c87195b893d27e00a0f8 files/1.4.3/libtool-1.3.5-mktemp.patch 642
-MD5 67757e15bfa1cdefb5c23f76198329ec files/1.4.3/libtool-1.3.5-nonneg.patch 895
-MD5 7c11e213296b02b7e4583d7c94e9c9e0 files/1.4.3/libtool-1.4.2-archive-shared.patch 633
 MD5 66ec977174eec4eba66454e4f0f5772a files/1.4.3/libtool-1.4.2-demo.patch 538
-MD5 d4838522fa55dc06521ddde517901767 files/1.4.3/libtool-1.4.2-expsym-linux.patch 1678
-MD5 3b185e86e062b438eb8d418fc5af462f files/1.4.3/libtool-1.4.2-fix-linkage-of-cxx-code-with-gcc.patch 816
-MD5 f6f24e776d832798365777c26c2c56fc files/1.4.3/libtool-1.4.2-multilib.patch 1780
-MD5 e03f7ed340f294fdb7ddd6c84d4b6b09 files/1.4.3/libtool-1.4.2-relink-58664.patch 3213
-MD5 191388758ae78d4982f143636e47f514 files/1.4.3/libtool-1.4.3-lib64.patch 1193
 MD5 ff5cf09ccda7f9a34f8c3c69e0c5047c files/1.4.3/libtool-1.4.3-libtoolize--config-only.patch 1288
+MD5 f6f24e776d832798365777c26c2c56fc files/1.4.3/libtool-1.4.2-multilib.patch 1780
+MD5 3b185e86e062b438eb8d418fc5af462f files/1.4.3/libtool-1.4.2-fix-linkage-of-cxx-code-with-gcc.patch 816
 MD5 a9be6866b7096092613595ccff0fd773 files/1.4.3/libtool-1.4.3-pass-thread-flags.patch 494
+MD5 67757e15bfa1cdefb5c23f76198329ec files/1.4.3/libtool-1.3.5-nonneg.patch 895
+MD5 d4838522fa55dc06521ddde517901767 files/1.4.3/libtool-1.4.2-expsym-linux.patch 1678
+MD5 191388758ae78d4982f143636e47f514 files/1.4.3/libtool-1.4.3-lib64.patch 1193
+MD5 8ad4f6ed8863c26c4ac562e1d00e6db1 files/1.4.3/libtool-1.2f-cache.patch 698
+MD5 7c11e213296b02b7e4583d7c94e9c9e0 files/1.4.3/libtool-1.4.2-archive-shared.patch 633
+MD5 e03f7ed340f294fdb7ddd6c84d4b6b09 files/1.4.3/libtool-1.4.2-relink-58664.patch 3213
 MD5 2badc5a56ce45a238edbef00b20677f7 files/1.5.6/libtool-1.5-filter-host-tags.patch 1146
 MD5 5e84c0a07a77ed6408b25453373914ab files/1.5.6/libtool-1.5.6-ltmain-SED.patch 431
-MD5 6ef585a59058c79f3601bbd7787f2683 files/1.5.2/libtool-1.5-libtool.m4-x86_64.patch 466
-MD5 0fb02114fa6b6cd63ea25510f04f346a files/1.5.2/libtool-1.5-testfailure.patch 6448
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCwoCH1ZcsMnZjRyIRAuQAAJ90InJKO+xH8Sul/zVr2fp/JZuUXACdHMla
+ajysHxy/Qv0RuLidCP8/xfo=
+=Xeb+
+-----END PGP SIGNATURE-----
diff --git a/sys-devel/libtool/files/1.5.10/libtool-1.5.10-portage.patch b/sys-devel/libtool/files/1.5.10/libtool-1.5.10-portage.patch
index f07161122e6b..bacff7c5245e 100644
--- a/sys-devel/libtool/files/1.5.10/libtool-1.5.10-portage.patch
+++ b/sys-devel/libtool/files/1.5.10/libtool-1.5.10-portage.patch
@@ -8,11 +8,14 @@ name should be bumped, but the patch content should stay fairly the same.
 
 --- ltmain.in.orig	Wed Apr  3 01:19:37 2002
 +++ ltmain.in	Sun May 26 19:50:52 2002
-@@ -3940,9 +3940,50 @@
+@@ -3940,9 +3940,53 @@
  		  $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
  		  exit 1
  		fi
 -		newdependency_libs="$newdependency_libs $libdir/$name"
++		if [ "x$EGREP" = x ] ; then
++			EGREP=egrep
++		fi
 +		# We do not want portage's install root ($D) present.  Check only for
 +		# this if the .la is being installed.
 +		if test "$installed" = yes && test "$D"; then
diff --git a/sys-devel/libtool/files/1.5.14/libtool-1.5.14-egrep.patch b/sys-devel/libtool/files/1.5.14/libtool-1.5.14-egrep.patch
new file mode 100644
index 000000000000..5c4098c40071
--- /dev/null
+++ b/sys-devel/libtool/files/1.5.14/libtool-1.5.14-egrep.patch
@@ -0,0 +1,16 @@
+--- 1/ltmain.in	2005-04-16 16:50:02.000000000 +0200
++++ 2/ltmain.in	2005-04-16 16:46:46.000000000 +0200
+@@ -39,6 +39,13 @@
+ if [ "x$SED" = x ] ; then
+     SED=sed
+ fi
++# Same for EGREP, and just to be sure, do LTCC as well
++if [ "x$EGREP" = x ] ; then
++    EGREP=egrep
++fi
++if [ "x$LTCC" = x ] ; then
++    LTCC=${CC-gcc}
++fi
+ 
+ # The name of this program:
+ progname=`echo "$progpath" | $SED $basename`
diff --git a/sys-devel/libtool/files/digest-libtool-1.5.18-r1 b/sys-devel/libtool/files/digest-libtool-1.5.18-r1
new file mode 100644
index 000000000000..f7cd6cc2b672
--- /dev/null
+++ b/sys-devel/libtool/files/digest-libtool-1.5.18-r1
@@ -0,0 +1 @@
+MD5 3c6630a02bf0858c365ee32e0599255e libtool-1.5.18.tar.gz 2780846
diff --git a/sys-devel/libtool/libtool-1.5.14.ebuild b/sys-devel/libtool/libtool-1.5.14.ebuild
index 701d93b5bb56..727e1ff6dc8e 100644
--- a/sys-devel/libtool/libtool-1.5.14.ebuild
+++ b/sys-devel/libtool/libtool-1.5.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-1.5.14.ebuild,v 1.2 2005/04/10 23:34:37 vapier Exp ${P}-r1.ebuild,v 1.8 2002/10/04 06:34:42 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-1.5.14.ebuild,v 1.3 2005/06/29 11:04:00 azarah Exp ${P}-r1.ebuild,v 1.8 2002/10/04 06:34:42 kloeri Exp $
 
 inherit eutils libtool
 
@@ -108,6 +108,9 @@ src_unpack() {
 	# so we have to use a diff source for the link.  #40992
 	epatch ${FILESDIR}/1.5.10/libtool-1.5.10-locking.patch
 
+	# In some cases EGREP is not set by the build system.
+	epatch ${FILESDIR}/1.5.14/libtool-1.5.14-egrep.patch
+
 	ebegin "Generating ltmain.sh"
 	gen_ltmain_sh || die "Failed to generate ltmain.sh!"
 	eend 0
diff --git a/sys-devel/libtool/libtool-1.5.16.ebuild b/sys-devel/libtool/libtool-1.5.16.ebuild
index 9489fdfcab4c..eb06551eccf5 100644
--- a/sys-devel/libtool/libtool-1.5.16.ebuild
+++ b/sys-devel/libtool/libtool-1.5.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-1.5.16.ebuild,v 1.1 2005/04/26 23:19:58 vapier Exp ${P}-r1.ebuild,v 1.8 2002/10/04 06:34:42 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-1.5.16.ebuild,v 1.2 2005/06/29 11:04:00 azarah Exp ${P}-r1.ebuild,v 1.8 2002/10/04 06:34:42 kloeri Exp $
 
 inherit eutils libtool
 
@@ -108,6 +108,9 @@ src_unpack() {
 	# so we have to use a diff source for the link.  #40992
 	epatch ${FILESDIR}/1.5.10/libtool-1.5.10-locking.patch
 
+	# In some cases EGREP is not set by the build system.
+	epatch ${FILESDIR}/1.5.14/libtool-1.5.14-egrep.patch
+
 	ebegin "Generating ltmain.sh"
 	gen_ltmain_sh || die "Failed to generate ltmain.sh!"
 	eend 0
diff --git a/sys-devel/libtool/libtool-1.5.18-r1.ebuild b/sys-devel/libtool/libtool-1.5.18-r1.ebuild
new file mode 100644
index 000000000000..e2a1706ffa71
--- /dev/null
+++ b/sys-devel/libtool/libtool-1.5.18-r1.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-1.5.18-r1.ebuild,v 1.1 2005/06/29 11:04:00 azarah Exp ${P}-r1.ebuild,v 1.8 2002/10/04 06:34:42 kloeri Exp $
+
+inherit eutils libtool
+
+DESCRIPTION="A shared library tool for developers"
+HOMEPAGE="http://www.gnu.org/software/libtool/libtool.html"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="1.5"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+DEPEND="sys-devel/gnuconfig
+	>=sys-devel/autoconf-2.59
+	>=sys-devel/automake-1.9"
+# the autoconf dep is due to it complaining 'configure.ac:55: error: Autoconf version 2.58 or higher is required'
+# the automake dep is due to Bug #46037
+
+lt_setup() {
+	export WANT_AUTOCONF=2.5
+	export WANT_AUTOMAKE=1.9
+}
+
+gen_ltmain_sh() {
+	local date=
+	local PACKAGE=
+	local VERSION=
+
+	rm -f ltmain.shT
+	date=`./mkstamp < ./ChangeLog` && \
+	eval `egrep '^[[:space:]]*PACKAGE' configure` && \
+	eval `egrep '^[[:space:]]*VERSION' configure` && \
+	sed -e "s/@PACKAGE@/${PACKAGE}/" -e "s/@VERSION@/${VERSION}/" \
+		-e "s%@TIMESTAMP@%$date%" ./ltmain.in > ltmain.shT || return 1
+
+	mv -f ltmain.shT ltmain.sh || {
+		(rm -f ltmain.sh && cp ltmain.shT ltmain.sh && rm -f ltmain.shT)
+		return 1
+	}
+
+	return 0
+}
+
+src_unpack() {
+	lt_setup
+	unpack ${A}
+	cd ${S}
+
+	# Make sure non of the patches touch ltmain.sh, but rather ltmain.in
+	rm -f ltmain.sh*
+
+	# Fix the relink problem where the relinked libs do not get
+	# installed.  It is *VERY* important that you get a updated
+	# 'libtool-1.4.3-relink.patch' if you update this, as it
+	# fixes a very serious bug.  Please not that this patch is
+	# included in 'libtool-1.4.3-gentoo.patch' for this ebuild.
+	#
+	# NOTE: all affected apps should get a 'libtoolize --copy --force'
+	#      added to update libtool
+	#
+# Seems to be included in shipped tarball ...
+#	epatch ${FILESDIR}/1.4.3/${PN}-1.4.2-relink-58664.patch
+
+	epatch ${FILESDIR}/1.4.3/${PN}-1.4.2-multilib.patch
+#	epatch ${FILESDIR}/1.4.3/${PN}-1.4.2-demo.patch
+# Seems to be included in shipped tarball ...
+#	epatch ${FILESDIR}/1.5.2/${PN}-1.5-libtool.m4-x86_64.patch
+#	epatch ${FILESDIR}/1.5.2/${PN}-1.5-testfailure.patch
+	# Mandrake patches
+	epatch ${FILESDIR}/1.4.3/${PN}-1.4.3-lib64.patch
+# Fix bug #43244
+#	epatch ${FILESDIR}/1.4.3/${PN}-1.4.2-fix-linkage-of-cxx-code-with-gcc.patch
+	epatch ${FILESDIR}/1.4.3/${PN}-1.4.2-archive-shared.patch
+	epatch ${FILESDIR}/1.5.6/${PN}-1.5.6-ltmain-SED.patch
+	epatch ${FILESDIR}/1.4.3/${PN}-1.4.2-expsym-linux.patch
+#	epatch ${FILESDIR}/1.4.3/${PN}-1.4.3-libtoolize--config-only.patch
+	epatch ${FILESDIR}/1.4.3/${PN}-1.4.3-pass-thread-flags.patch
+
+	# Gentoo Patches
+	# Do not create bogus entries in $dependency_libs or $libdir
+	# with ${D} or ${S} in them.
+	# <azarah@gentoo.org> - (07 April 2002)
+	epatch ${FILESDIR}/1.5.10/${PN}-1.5.10-portage.patch
+	# If a package use an older libtool, and libtool.m4 for that
+	# package is updated, but not libtool, then we may run into an
+	# issue where internal variables are named differently.  Often 
+	# this shows up as libs being built without '.so' extension #73140
+	epatch ${FILESDIR}/1.5.10/${PN}-1.5.10-version-checking.patch
+	sed -i "s:@_LT_VERSION@:${PV}:" libtool.m4 || die "sed libtool.m4"
+	# For older autoconf setups's that do not support libtool.m4,
+	# $max_cmd_len are never set, causing all tests against it to
+	# fail, resulting in 'integer expression expected' errors and
+	# possible misbehaviour.
+	# <azarah@gentoo.org> - (11 Feb 2004)
+	epatch ${FILESDIR}/1.5.14/${PN}-1.5.14-ltmain_sh-max_cmd_len.patch
+
+	# Libtool's autoguessing at tag's sucks ... it get's confused 
+	# if the tag's CC says '<CHOST>-gcc' and the env CC says 'gcc'
+	# or vice versa ... newer automakes specify the tag so no
+	# guessing is needed #67692
+	epatch ${FILESDIR}/1.5.6/libtool-1.5-filter-host-tags.patch
+
+	# Libtool uses links to handle locking object files with 
+	# dependencies.  Hard links can't cross filesystems though, 
+	# so we have to use a diff source for the link.  #40992
+	epatch ${FILESDIR}/1.5.10/libtool-1.5.10-locking.patch
+
+	# In some cases EGREP is not set by the build system.
+	epatch ${FILESDIR}/1.5.14/libtool-1.5.14-egrep.patch
+
+	ebegin "Generating ltmain.sh"
+	gen_ltmain_sh || die "Failed to generate ltmain.sh!"
+	eend 0
+
+	# Now let's run all our autotool stuff so that files we patch
+	# below don't get regenerated on us later
+	cp libtool.m4 acinclude.m4
+	local d p
+	for d in . libltdl ; do
+		ebegin "Running autotools in '${d}'"
+		cd ${S}/${d}
+		touch acinclude.m4
+		for p in aclocal "automake -c -a" autoconf ; do
+			${p} || die "${p}"
+		done
+		eend 0
+	done
+	cd "${S}"
+
+	uclibctoolize
+	epunt_cxx
+}
+
+src_compile() {
+	lt_setup
+	econf || die
+	emake || die
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog* NEWS README THANKS TODO doc/PLATFORMS
+
+	for x in $(find "${D}" -name config.guess -o -name config.sub) ; do
+		rm -f "${x}" ; ln -sf ../gnuconfig/$(basename "${x}") "${x}"
+	done
+	cd "${D}"/usr/share/libtool/libltdl
+	for x in config.guess config.sub ; do
+		rm -f ${x} ; ln -sfn ../${x} ${x}
+	done
+}
diff --git a/sys-devel/libtool/libtool-1.5.18.ebuild b/sys-devel/libtool/libtool-1.5.18.ebuild
index f668139f096a..47dac783f17b 100644
--- a/sys-devel/libtool/libtool-1.5.18.ebuild
+++ b/sys-devel/libtool/libtool-1.5.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-1.5.18.ebuild,v 1.1 2005/05/18 06:03:24 vapier Exp ${P}-r1.ebuild,v 1.8 2002/10/04 06:34:42 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-1.5.18.ebuild,v 1.2 2005/06/29 11:04:00 azarah Exp ${P}-r1.ebuild,v 1.8 2002/10/04 06:34:42 kloeri Exp $
 
 inherit eutils libtool
 
@@ -108,6 +108,9 @@ src_unpack() {
 	# so we have to use a diff source for the link.  #40992
 	epatch ${FILESDIR}/1.5.10/libtool-1.5.10-locking.patch
 
+	# In some cases EGREP is not set by the build system.
+	epatch ${FILESDIR}/1.5.14/libtool-1.5.14-egrep.patch
+
 	ebegin "Generating ltmain.sh"
 	gen_ltmain_sh || die "Failed to generate ltmain.sh!"
 	eend 0