With 1.4.3, we have ltmain.in and ltmain.sh which both got patched, but not

with all the patches :/ Fix all the patches to only apply to ltmain.in, and
then fix the breakage that follows due to us having to remove ltmain.sh.

8 files changed, 187 insertions, 29 deletions

diff --git a/sys-devel/libtool/ChangeLog b/sys-devel/libtool/ChangeLog
index 8ad7e30035b8..fe789553b291 100644
--- a/sys-devel/libtool/ChangeLog
+++ b/sys-devel/libtool/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for sys-devel/libtool
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.23 2003/09/17 19:11:17 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.24 2003/09/24 18:13:53 azarah Exp $
+
+*libtool-1.4.3-r2 (24 Sep 2003)
+
+  24 Sep 2003; Martin Schlemmer <azarah@gentoo.org> libtool-1.4.3-r2.ebuild,
+  files/1.4.3/libtool-1.4.2-archive-shared.patch,
+  files/1.4.3/libtool-1.4.2-fix-linkage-of-cxx-code-with-gcc.patch,
+  files/1.4.3/libtool-1.4.2-portage.patch,
+  files/1.4.3/libtool-1.4.3-ltmain-SED.patch:
+  With 1.4.3, we have ltmain.in and ltmain.sh which both got patched, but not
+  with all the patches :/ Fix all the patches to only apply to ltmain.in, and
+  then fix the breakage that follows due to us having to remove ltmain.sh.
 
   17 Sep 2003; Jon Portnoy <avenj@gentoo.org> libtool-1.4.3-r1.ebuild :
   ia64 keywords.
diff --git a/sys-devel/libtool/Manifest b/sys-devel/libtool/Manifest
index 51d97aa9b8af..325a56c90ae1 100644
--- a/sys-devel/libtool/Manifest
+++ b/sys-devel/libtool/Manifest
@@ -1,7 +1,7 @@
 MD5 6d26b33bcad84d410dcc4f3a3719fe5b libtool-1.4.3.ebuild 2731
-MD5 8b9ca9e39100c617fe45891f3c12c4dc ChangeLog 3618
+MD5 10317561c9d19b712d9ca74e8d73fc51 ChangeLog 4168
 MD5 fbcf7a29349882a6f6c75491400d1953 libtool-1.4.1-r10.ebuild 1780
-MD5 4251c5ceb5326b069d88ae1f036441ff libtool-1.4.3-r2.ebuild 4393
+MD5 86339a82e2d12da4076dd936094e68d9 libtool-1.4.3-r2.ebuild 4277
 MD5 7acf95d7a52c695ccd163defb5facdad libtool-1.4.3-r1.ebuild 3197
 MD5 4d48b4072e8f2a4591a4d80a23f6042f libtool-1.4.2-r2.ebuild 2182
 MD5 6e892e6bd1ca4d9babce9f9163f6118e files/digest-libtool-1.4.3-r2 131
diff --git a/sys-devel/libtool/files/1.4.3/libtool-1.4.2-archive-shared.patch b/sys-devel/libtool/files/1.4.3/libtool-1.4.2-archive-shared.patch
index 52183b2f0f12..52183aff1e12 100644
--- a/sys-devel/libtool/files/1.4.3/libtool-1.4.2-archive-shared.patch
+++ b/sys-devel/libtool/files/1.4.3/libtool-1.4.2-archive-shared.patch
@@ -1,5 +1,5 @@
---- libtool-1.4.2/ltmain.sh.archive-shared	2002-07-15 09:12:03.000000000 -0400
-+++ libtool-1.4.2/ltmain.sh	2002-07-15 09:13:04.000000000 -0400
+--- libtool-1.4.2/ltmain.in.archive-shared	2002-07-15 09:12:03.000000000 -0400
++++ libtool-1.4.2/ltmain.in	2002-07-15 09:13:04.000000000 -0400
 @@ -2644,6 +2644,13 @@ EOF
  			*) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
  			esac
diff --git a/sys-devel/libtool/files/1.4.3/libtool-1.4.2-fix-linkage-of-cxx-code-with-gcc.patch b/sys-devel/libtool/files/1.4.3/libtool-1.4.2-fix-linkage-of-cxx-code-with-gcc.patch
index 7e5b69c74681..a89fef4f324d 100644
--- a/sys-devel/libtool/files/1.4.3/libtool-1.4.2-fix-linkage-of-cxx-code-with-gcc.patch
+++ b/sys-devel/libtool/files/1.4.3/libtool-1.4.2-fix-linkage-of-cxx-code-with-gcc.patch
@@ -18,23 +18,3 @@
  # If this variable is set in any of the actions, the command in it
  # will be execed at the end.  This prevents here-documents from being
  # left over by shells.
---- ./ltmain.sh.gege	2002-05-15 13:33:49.000000000 +0200
-+++ ./ltmain.sh	2002-05-15 13:36:53.000000000 +0200
-@@ -207,6 +207,17 @@
-   exit 1
- fi
- 
-+# Mandrake: (gc) It's bad to link C++ code with GCC, so we need to use the compiler name if provided
-+if test "$mode" = link && test -n "$archive_cmds" && test -x "/usr/bin/perl"; then
-+    case $nonopt in
-+    *cc | *++ | gcc* | *-gcc* | egcs*)
-+	    archive_cmds=`echo $archive_cmds | perl -pe 's/^\S+\s+//'`
-+	    archive_cmds="$nonopt $archive_cmds"
-+	    archive_expsym_cmds=`echo $archive_expsym_cmds | perl -pe 's/^\S+\s+//'`
-+	    archive_expsym_cmds="$nonopt $archive_expsym_cmds"
-+    esac
-+fi
-+
- # If this variable is set in any of the actions, the command in it
- # will be execed at the end.  This prevents here-documents from being
- # left over by shells.
diff --git a/sys-devel/libtool/files/1.4.3/libtool-1.4.2-portage.patch b/sys-devel/libtool/files/1.4.3/libtool-1.4.2-portage.patch
index 2d15d2e05676..290d040f6780 100644
--- a/sys-devel/libtool/files/1.4.3/libtool-1.4.2-portage.patch
+++ b/sys-devel/libtool/files/1.4.3/libtool-1.4.2-portage.patch
@@ -1,5 +1,5 @@
---- ltmain.sh.orig	Wed Apr  3 01:19:37 2002
-+++ ltmain.sh	Sun May 26 19:50:52 2002
+--- ltmain.in.orig	Wed Apr  3 01:19:37 2002
++++ ltmain.in	Sun May 26 19:50:52 2002
 @@ -3940,9 +3940,46 @@
  		  $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
  		  exit 1
diff --git a/sys-devel/libtool/files/1.4.3/libtool-1.4.3-ltmain-SED.patch b/sys-devel/libtool/files/1.4.3/libtool-1.4.3-ltmain-SED.patch
index fac977cbd483..f0f907205b55 100644
--- a/sys-devel/libtool/files/1.4.3/libtool-1.4.3-ltmain-SED.patch
+++ b/sys-devel/libtool/files/1.4.3/libtool-1.4.3-ltmain-SED.patch
@@ -1,5 +1,5 @@
---- libtool-1.4.3/ltmain.sh.ltmain-SED	2003-02-13 14:54:24.000000000 +0100
-+++ libtool-1.4.3/ltmain.sh	2003-02-13 15:24:49.000000000 +0100
+--- libtool-1.4.3/ltmain.in.ltmain-SED	2003-02-13 14:54:24.000000000 +0100
++++ libtool-1.4.3/ltmain.in	2003-02-13 15:24:49.000000000 +0100
 @@ -48,6 +48,9 @@ EOF
    exit 0
  fi
diff --git a/sys-devel/libtool/files/digest-libtool-1.4.3-r2 b/sys-devel/libtool/files/digest-libtool-1.4.3-r2
new file mode 100644
index 000000000000..e1f620300ee1
--- /dev/null
+++ b/sys-devel/libtool/files/digest-libtool-1.4.3-r2
@@ -0,0 +1,2 @@
+MD5 d11a3c835449d7fa50a025dc9c01ad81 libtool-1.4.3.tar.gz 1164463
+MD5 fa26a07c978ad05d1f88ed7a472daa49 libtool-1.3.5.tar.gz 538884
diff --git a/sys-devel/libtool/libtool-1.4.3-r2.ebuild b/sys-devel/libtool/libtool-1.4.3-r2.ebuild
new file mode 100644
index 000000000000..999e8220d965
--- /dev/null
+++ b/sys-devel/libtool/libtool-1.4.3-r2.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-1.4.3-r2.ebuild,v 1.1 2003/09/24 18:13:53 azarah Exp ${P}-r1.ebuild,v 1.8 2002/10/04 06:34:42 vapier Exp $
+
+IUSE=
+
+inherit eutils gnuconfig
+
+# NOTE:  We install libltdl of libtool-1.3x for compat reasons ...
+
+OLD_PV="1.3.5"
+S="${WORKDIR}/${P}"
+OLD_S="${WORKDIR}/${PN}-${OLD_PV}"
+DESCRIPTION="A shared library tool for developers"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
+	mirror://gnu/${PN}/${PN}-${OLD_PV}.tar.gz"
+HOMEPAGE="http://www.gnu.org/software/libtool/libtool.html"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~arm ~ia64"
+
+DEPEND="virtual/glibc"
+
+
+lt_setup() {
+	export WANT_AUTOCONF_2_5=1
+	export WANT_AUTOMAKE_1_5=1
+}
+
+gen_ltmain_sh() {
+	local date=
+	local PACKAGE=
+	local VERSION=
+
+	rm -f ltmain.shT
+	date=`./mkstamp < ./ChangeLog` && \
+	eval `grep '^PACKAGE' configure` && \
+	eval `grep '^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 ${OLD_S}
+	# Install updated missing script
+	echo; rm -f missing
+	automake --add-missing
+
+	einfo "Patching ${OLD_S##*/} ..."
+	epatch ${FILESDIR}/${PV}/${PN}-1.2f-cache.patch
+	epatch ${FILESDIR}/${PV}/${PN}-1.3.5-nonneg.patch
+	epatch ${FILESDIR}/${PV}/${PN}-1.3.5-mktemp.patch
+
+	use amd64 && S="${OLD_S}" gnuconfig_update
+	use hppa && S="${OLD_S}" gnuconfig_update
+
+	cd ${S}
+	# Install updated missing script
+	echo; rm -f missing
+	automake --add-missing
+
+	# Make sure non of the patches touch ltmain.sh, but rather ltmain.in
+	rm -f ltmain.sh*
+
+	einfo "Patching ${S##*/} ..."
+	# Redhat patches
+	epatch ${FILESDIR}/${PV}/${PN}-1.3.5-mktemp.patch
+	epatch ${FILESDIR}/${PV}/${PN}-1.4-nonneg.patch
+	epatch ${FILESDIR}/${PV}/${PN}-1.4.2-s390_x86_64.patch
+	# 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
+	#
+	epatch ${FILESDIR}/${PV}/${PN}-1.4.2-relink-58664.patch
+	epatch ${FILESDIR}/${PV}/${PN}-1.4.2-multilib.patch
+	epatch ${FILESDIR}/${PV}/${PN}-1.4.2-demo.patch
+	# Mandrake patches
+	epatch ${FILESDIR}/${PV}/${PN}-1.4.3-lib64.patch
+	epatch ${FILESDIR}/${PV}/${PN}-1.4.2-add-x11r6-lib-in-ignores-for-rpath.patch
+	epatch ${FILESDIR}/${PV}/${PN}-1.4.2-fix-linkage-of-cxx-code-with-gcc.patch
+	epatch ${FILESDIR}/${PV}/${PN}-1.4.2-archive-shared.patch
+	epatch ${FILESDIR}/${PV}/${PN}-1.4.3-ltmain-SED.patch
+	# Do not create bogus entries in $dependency_libs or $libdir
+	# with ${D} or ${S} in them.
+	#
+	# Azarah - 07 April 2002
+	epatch ${FILESDIR}/${PV}/${PN}-1.4.2-portage.patch
+
+	einfo "Generate ltmain.sh ..."
+	gen_ltmain_sh || die "Failed to generate ltmain.sh!"
+}
+
+src_compile() {
+	lt_setup
+
+	#
+	# ************ libtool-1.3x ************
+	#
+
+	cd ${OLD_S}
+	einfo "Configuring ${OLD_S##*/} ..."
+	./configure --host=${CHOST} \
+			--prefix=/usr \
+			--infodir=/usr/share/info || die
+
+	einfo "Building ${OLD_S##*/} ..."
+	emake || die
+
+	#
+	# ************ libtool-1.4x ************
+	#
+
+	cd ${S}
+	einfo "Configuring ${S##*/} ..."
+	./configure --host=${CHOST} \
+		--prefix=/usr \
+		--infodir=/usr/share/info || die
+
+	einfo "Building ${S##*/} ..."
+	emake || die
+}
+
+src_install() {
+	#
+	# ************ libtool-1.3x ************
+	#
+
+	einfo "Installing ${OLD_S##*/} ..."
+	cd ${OLD_S}/libltdl; make DESTDIR=${D} install || die
+
+	# Remove stuff we are not going to use ...
+	for x in libltdl.a  libltdl.la  libltdl.so
+	do
+		[ -f ${x} ] && rm -f ${D}/usr/lib/${x}
+	done
+	rm -rf ${D}/usr/include
+
+	#
+	# ************ libtool-1.4x ************
+	#
+
+	einfo "Installing ${S##*/} ..."
+	cd ${S}; make DESTDIR=${D} install || die
+
+	dodoc AUTHORS COPYING ChangeLog* NEWS \
+	      README THANKS TODO doc/PLATFORMS
+}
+