fix dups

4 files changed, 121 insertions, 1 deletions

diff --git a/sys-devel/libtool/ChangeLog b/sys-devel/libtool/ChangeLog
index 6df3565866ba..d4780c6c0eb0 100644
--- a/sys-devel/libtool/ChangeLog
+++ b/sys-devel/libtool/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/libtool
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.5 2002/04/10 18:48:35 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.6 2002/05/26 17:59:59 azarah Exp $
+
+*libtool-1.4.1-r7 (10 April 2002)
+
+  26 May 2002; M.Schlemmer <azarah@gentoo.org> :
+
+  Update libtool portage patch not to add duplicates.
 
 *libtool-1.4.1-r6 (10 April 2002)
 
diff --git a/sys-devel/libtool/files/1.4.1/libtool-1.4.1-portage.patch-v4 b/sys-devel/libtool/files/1.4.1/libtool-1.4.1-portage.patch-v4
new file mode 100644
index 000000000000..282034db4cbb
--- /dev/null
+++ b/sys-devel/libtool/files/1.4.1/libtool-1.4.1-portage.patch-v4
@@ -0,0 +1,55 @@
+--- ltmain.sh.orig	Wed Apr  3 01:19:37 2002
++++ ltmain.sh	Sun May 26 19:50:52 2002
+@@ -3940,9 +3940,39 @@
+ 		  $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; then
++		  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 -z "`echo $newdependency_libs |grep -e "$mynewdependency_lib"`" 
++		then
++		  newdependency_libs="$newdependency_libs $mynewdependency_lib"
++		fi
++		;;
++	      *)
++	      	if test "$installed" = yes; then
++		  # We do not want portage's build root ($S} present.
++	          if test -n "`echo $deplib |grep -e "${S}"`"
++		  then
++	            newdependency_libs=""
++		  # We do not want portage's install root ($D) present.
++		  elif test -n "`echo $deplib |grep -e "${D}"`"
++		  then
++		    mynewdependency_lib="`echo "$deplib" |sed -e "s:${D}::g" -e 's://:/:g'`"
++		  fi
++		else
++		  mynewdependency_lib="$deplib"
++		fi
++		# Do not add duplicates
++		if test -z "`echo $newdependency_libs |grep -e "$mynewdependency_lib"`"
++		then
++			newdependency_libs="$newdependency_libs $mynewdependency_lib"
++		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; 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.4.1-r7 b/sys-devel/libtool/files/digest-libtool-1.4.1-r7
new file mode 100644
index 000000000000..ce6a480b1e86
--- /dev/null
+++ b/sys-devel/libtool/files/digest-libtool-1.4.1-r7
@@ -0,0 +1 @@
+MD5 28582af0b96513f223e970db1a9a5cde libtool-1.4.1.tar.gz 1129676
diff --git a/sys-devel/libtool/libtool-1.4.1-r7.ebuild b/sys-devel/libtool/libtool-1.4.1-r7.ebuild
new file mode 100644
index 000000000000..03da380fd10e
--- /dev/null
+++ b/sys-devel/libtool/libtool-1.4.1-r7.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Author Daniel Robbins <drobbins@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-1.4.1-r7.ebuild,v 1.1 2002/05/26 17:59:59 azarah Exp $
+
+S=${WORKDIR}/${P}
+DESCRIPTION="A shared library tool for developers"
+SRC_URI="ftp://ftp.gnu.org/gnu/${PN}/${P}.tar.gz"
+HOMEPAGE="http://www.gnu.org/software/libtool/libtool.html"
+
+DEPEND="virtual/glibc"
+
+SLOT="0"
+
+src_unpack() {
+	unpack ${A}
+
+	# Fix the relink problem where the relinked libs do not get
+	# installed.  It is *VERY* important that you get a updated
+	# 'libtool-${PV}-relink.patch' if you update this, as it
+	# fixes a very serious bug.  Please not that this patch is
+	# included in 'libtool-${PV}-gentoo.patch' for this ebuild.
+	#
+	# NOTE: all affected apps should get a 'libtoolize --copy --force'
+	#      added to upate libtool
+	#
+
+	cd ${S}
+	patch -p1 <${FILESDIR}/${PV}/${P}-nonneg.patch || die
+	patch -p0 <${FILESDIR}/${PV}/${P}-relink.patch || die
+	#fixes quoting for test's .. *VERY* important!
+	patch -p0 <${FILESDIR}/${PV}/${P}-test.patch || die
+	patch -p1 <${FILESDIR}/${PV}/${P}-duplicate-dependency.patch || die
+}
+
+src_compile() {
+	./configure --host=${CHOST} \
+			--prefix=/usr \
+			--infodir=/usr/share/info || die
+
+	emake || die
+}
+
+src_install() { 
+	make DESTDIR=${D} install || die
+
+	dodoc AUTHORS COPYING ChangeLog* NEWS \
+	      README THANKS TODO doc/PLATFORMS	
+
+	cd ${D}/usr/share/libtool
+	patch -p0 <${FILESDIR}/${PV}/${P}-ltmain.sh-hack.patch || die
+	# Do not create bogus entries in $dependency_libs or $libdir
+	# with ${D} or ${S} in them.
+	#
+	# Azarah - 07 April 2002
+	patch -p0 <${FILESDIR}/${PV}/${P}-portage.patch-v4 || die
+}
+