Update portage.patch to verify that we always have a leading '/' when we replace $D.

(Portage version: 2.0.51-r15)

5 files changed, 255 insertions, 22 deletions

diff --git a/sys-devel/libtool/ChangeLog b/sys-devel/libtool/ChangeLog
index c216af092781..3bbf75b370b4 100644
--- a/sys-devel/libtool/ChangeLog
+++ b/sys-devel/libtool/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-devel/libtool
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.73 2005/02/15 14:55:13 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.74 2005/02/23 17:17:01 azarah Exp $
+
+*libtool-1.5.10-r5 (23 Feb 2005)
+
+  23 Feb 2005; Martin Schlemmer <azarah@gentoo.org>
+  +files/1.5.10/libtool-1.5.10-portage.patch, +libtool-1.5.10-r5.ebuild:
+  Update portage.patch to verify that we always have a leading '/' when we
+  replace $D.
 
   15 Feb 2005; Markus Rothe <corsair@gentoo.org> libtool-1.5.10-r4.ebuild:
   Stable on ppc64
diff --git a/sys-devel/libtool/Manifest b/sys-devel/libtool/Manifest
index dfaebe0cd1f2..59393e61e161 100644
--- a/sys-devel/libtool/Manifest
+++ b/sys-devel/libtool/Manifest
@@ -1,38 +1,41 @@
+MD5 a1f86f2231e99833a2d38181b5422531 libtool-1.5.10-r5.ebuild 5199
 MD5 3646181dff3fffeb03280643457ad08b ChangeLog 12720
 MD5 881a558c5699deb251c9f73ee30a90d3 libtool-1.5.10-r4.ebuild 5187
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 38555a9183ab61935f3db1c1560dc4a1 libtool-1.5.2-r7.ebuild 6227
 MD5 c941fdf418f07781f32ec26b239a6a65 libtool-1.3.5.ebuild 1487
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 bb976ab258ba1974bf1a3cd0a51ce34b files/digest-libtool-1.5.10-r5 67
+MD5 bd27a462a2a9fe3662d3d34179ed3200 files/libltdl-uclibc.patch 4590
 MD5 bb976ab258ba1974bf1a3cd0a51ce34b files/digest-libtool-1.5.10-r4 67
 MD5 e893eae0aa5740740c388dbf0a35b3c6 files/digest-libtool-1.3.5 65
-MD5 bd27a462a2a9fe3662d3d34179ed3200 files/libltdl-uclibc.patch 4590
-MD5 2cd6110e84c85c183c7b8dcd0be814e7 files/ltconfig-uclibc.patch 1167
 MD5 3b92d43ab25bc1ad32ee87d89660f268 files/digest-libtool-1.5.2-r7 131
-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 2cd6110e84c85c183c7b8dcd0be814e7 files/ltconfig-uclibc.patch 1167
+MD5 b81a86ce5e9014e53bd7beb12e46ed12 files/1.5.2/libtool-1.5.2-ltmain_sh-max_cmd_len.patch 1155
+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 8ac4aa8ff1c680fe44447274d9f3a673 files/1.5.2/libtool-1.5.2-libtool_m4-shared_ext.patch 882
+MD5 ec9cd0c9953bac111564122a5c209278 files/1.5.2/libtool-1.5-filter-host-tags.patch 1846
+MD5 5fc838faf61964397b525e579783c190 files/1.4.3/libtool-1.4.3-uclibc.patch 5911
+MD5 51df2f3c87ee74b80790edd735ddf565 files/1.4.3/libtool-1.4.2-s390_x86_64.patch 470
 MD5 67757e15bfa1cdefb5c23f76198329ec files/1.4.3/libtool-1.3.5-nonneg.patch 895
-MD5 c7e04f642029498cc1652407b1ea74bf files/1.4.3/libtool-1.4-nonneg.patch 935
+MD5 e03f7ed340f294fdb7ddd6c84d4b6b09 files/1.4.3/libtool-1.4.2-relink-58664.patch 3213
+MD5 d4838522fa55dc06521ddde517901767 files/1.4.3/libtool-1.4.2-expsym-linux.patch 1678
 MD5 47fd700361b3cb3aae8dc44f28f613b0 files/1.4.3/libtool-1.4.2-add-x11r6-lib-in-ignores-for-rpath.patch 460
 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 696b0d0d16bb9f928647cff1cdf1099d files/1.4.3/libtool-1.4.2-portage.patch 2505
-MD5 e03f7ed340f294fdb7ddd6c84d4b6b09 files/1.4.3/libtool-1.4.2-relink-58664.patch 3213
-MD5 51df2f3c87ee74b80790edd735ddf565 files/1.4.3/libtool-1.4.2-s390_x86_64.patch 470
-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 8ad4f6ed8863c26c4ac562e1d00e6db1 files/1.4.3/libtool-1.2f-cache.patch 698
 MD5 94591cd9fb847704a323c0faf31fdbf2 files/1.4.3/libtool-1.4.3-ltmain-SED.patch 363
+MD5 c7e04f642029498cc1652407b1ea74bf files/1.4.3/libtool-1.4-nonneg.patch 935
 MD5 a9be6866b7096092613595ccff0fd773 files/1.4.3/libtool-1.4.3-pass-thread-flags.patch 494
+MD5 66ec977174eec4eba66454e4f0f5772a files/1.4.3/libtool-1.4.2-demo.patch 538
+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 55544e163772c87195b893d27e00a0f8 files/1.4.3/libtool-1.3.5-mktemp.patch 642
 MD5 c4fd959743953818fe6ab06c7d84e795 files/1.4.3/libtool-1.4.3-quotes.patch 12951
-MD5 5fc838faf61964397b525e579783c190 files/1.4.3/libtool-1.4.3-uclibc.patch 5911
-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
-MD5 8ac4aa8ff1c680fe44447274d9f3a673 files/1.5.2/libtool-1.5.2-libtool_m4-shared_ext.patch 882
-MD5 b81a86ce5e9014e53bd7beb12e46ed12 files/1.5.2/libtool-1.5.2-ltmain_sh-max_cmd_len.patch 1155
-MD5 ec9cd0c9953bac111564122a5c209278 files/1.5.2/libtool-1.5-filter-host-tags.patch 1846
+MD5 ff5cf09ccda7f9a34f8c3c69e0c5047c files/1.4.3/libtool-1.4.3-libtoolize--config-only.patch 1288
+MD5 191388758ae78d4982f143636e47f514 files/1.4.3/libtool-1.4.3-lib64.patch 1193
+MD5 696b0d0d16bb9f928647cff1cdf1099d files/1.4.3/libtool-1.4.2-portage.patch 2505
 MD5 5e84c0a07a77ed6408b25453373914ab files/1.5.6/libtool-1.5.6-ltmain-SED.patch 431
 MD5 2badc5a56ce45a238edbef00b20677f7 files/1.5.6/libtool-1.5-filter-host-tags.patch 1146
 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 29a35c156998b785947217ca749a3a96 files/1.5.10/libtool-1.5.10-portage.patch 2509
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
new file mode 100644
index 000000000000..7cb831bb250b
--- /dev/null
+++ b/sys-devel/libtool/files/1.5.10/libtool-1.5.10-portage.patch
@@ -0,0 +1,66 @@
+--- ltmain.in.orig	Wed Apr  3 01:19:37 2002
++++ ltmain.in	Sun May 26 19:50:52 2002
+@@ -3940,9 +3940,50 @@
+ 		  $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
+ 		  exit 1
+ 		fi
+-		newdependency_libs="$newdependency_libs $libdir/$name"
++		# 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
++		  eval mynewdependency_lib=`echo "$libdir/$name" |sed -e "s:$D:/:g" -e 's:/\+:/:g'`
++		else
++		  mynewdependency_lib="$libdir/$name"
++		fi
++		# Do not add duplicates
++		if test "$mynewdependency_lib"; then
++		  my_little_ninja_foo_1=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"`
++		  if test -z "$my_little_ninja_foo_1"; then
++		    newdependency_libs="$newdependency_libs $mynewdependency_lib"
++		  fi
++		fi
++		;;
++		  *)
++		if test "$installed" = yes; then
++		  # Rather use S=WORKDIR if our version of portage supports it.
++		  # This is because some ebuild (gcc) do not use $S as buildroot.
++		  if test "$PWORKDIR"; then
++		    S="$PWORKDIR"
++		  fi
++		  # We do not want portage's build root ($S) present.
++		  my_little_ninja_foo_2=`echo $deplib |$EGREP -e "$S"`
++		  if test -n "$my_little_ninja_foo_2" && test "$S"; then
++		    mynewdependency_lib=""
++		  # We do not want portage's install root ($D) present.
++		  my_little_ninja_foo_3=`echo $deplib |$EGREP -e "$D"`
++		  elif test -n "$my_little_ninja_foo_3" && test "$D"; then
++		    eval mynewdependency_lib=`echo "$deplib" |sed -e "s:$D:/:g" -e 's:/\+:/:g'`
++		  else
++		    mynewdependency_lib="$deplib"
++		  fi
++		else
++		  mynewdependency_lib="$deplib"
++		fi
++		# Do not add duplicates
++		if test "$mynewdependency_lib"; then
++		  my_little_ninja_foo_4=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"`
++		  if test -z "$my_little_ninja_foo_4"; then
++			newdependency_libs="$newdependency_libs $mynewdependency_lib"
++		  fi
++		fi
+ 		;;
+-	      *) newdependency_libs="$newdependency_libs $deplib" ;;
+ 	      esac
+ 	    done
+ 	    dependency_libs="$newdependency_libs"
+@@ -3975,6 +4005,10 @@
+ 	  case $host,$output,$installed,$module,$dlname in
+ 	    *cygwin*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
+ 	  esac
++	  # Do not add duplicates
++	  if test "$installed" = yes && test "$D"; then
++	    install_libdir=`echo "$install_libdir" |sed -e "s:$D::g" -e 's://:/:g'`
++	  fi
+ 	  $echo > $output "\
+ # $outputname - a libtool library file
+ # Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
diff --git a/sys-devel/libtool/files/digest-libtool-1.5.10-r5 b/sys-devel/libtool/files/digest-libtool-1.5.10-r5
new file mode 100644
index 000000000000..cab20e0c9462
--- /dev/null
+++ b/sys-devel/libtool/files/digest-libtool-1.5.10-r5
@@ -0,0 +1 @@
+MD5 e2093a85f6d48f1562c36920087502d6 libtool-1.5.10.tar.gz 2699923
diff --git a/sys-devel/libtool/libtool-1.5.10-r5.ebuild b/sys-devel/libtool/libtool-1.5.10-r5.ebuild
new file mode 100644
index 000000000000..ef2845c831c8
--- /dev/null
+++ b/sys-devel/libtool/libtool-1.5.10-r5.ebuild
@@ -0,0 +1,156 @@
+# 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.10-r5.ebuild,v 1.1 2005/02/23 17:17:01 azarah Exp ${P}-r1.ebuild,v 1.8 2002/10/04 06:34:42 kloeri Exp $
+
+inherit eutils gnuconfig 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 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="uclibc"
+
+DEPEND="virtual/libc
+	>=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*
+
+	# Redhat patches
+	epatch ${FILESDIR}/1.4.3/${PN}-1.4-nonneg.patch
+	# 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.2/${PN}-1.5.2-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
+
+	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
+	gnuconfig_update ${WORKDIR}
+	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
+
+	if use uclibc ; then
+		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
+	fi
+}