Remove libtool-1.4.2-fix-linkage-of-cxx-code-with-gcc.patch, as it breaks

things for newer gst-plugins, etc (bug #43244).

4 files changed, 253 insertions, 41 deletions

diff --git a/sys-devel/libtool/ChangeLog b/sys-devel/libtool/ChangeLog
index acec20ae1329..98b31f7dc166 100644
--- a/sys-devel/libtool/ChangeLog
+++ b/sys-devel/libtool/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/libtool
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.36 2004/02/19 22:49:48 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.37 2004/02/29 17:21:18 azarah Exp $
+
+*libtool-1.5.2-r4 (29 Feb 2004)
+
+  29 Feb 2004; Martin Schlemmer <azarah@gentoo.org> libtool-1.5.2-r4.ebuild:
+  Remove libtool-1.4.2-fix-linkage-of-cxx-code-with-gcc.patch, as it breaks
+  things for newer gst-plugins, etc (bug #43244).
 
   18 Feb 2004; Tom Gall <tgall@gentoo.org> libtool-1.5.2-r3.ebuild
   Fix for ppc64, older 1.3.x libtool needs to have configs etc regenerated
diff --git a/sys-devel/libtool/Manifest b/sys-devel/libtool/Manifest
index 6e7ea3dc9e14..010eb2e98c11 100644
--- a/sys-devel/libtool/Manifest
+++ b/sys-devel/libtool/Manifest
@@ -1,55 +1,57 @@
+MD5 e522a343c376acfb59e5f5a27ca905f7 ChangeLog 7085
+MD5 3cc52b6cadaaf9f2734b6bedb7ac6970 libtool-1.4.1-r10.ebuild 1778
 MD5 87dd0167953632e525b66f620f094760 libtool-1.5.2-r3.ebuild 5564
+MD5 a24190eaea1f0b5085988c1b953a6bc2 libtool-1.5.2-r4.ebuild 5581
 MD5 4d48b4072e8f2a4591a4d80a23f6042f libtool-1.4.2-r2.ebuild 2182
-MD5 d48b00452dbc1ab5f32c1312a0c440ac libtool-1.4.3-r3.ebuild 4784
-MD5 3cc52b6cadaaf9f2734b6bedb7ac6970 libtool-1.4.1-r10.ebuild 1778
-MD5 b8b91ca04473e687cfee03bcb11e5307 ChangeLog 6847
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 d48b00452dbc1ab5f32c1312a0c440ac libtool-1.4.3-r3.ebuild 4784
 MD5 0988730d91b787159d631c37932efef5 files/digest-libtool-1.4.2-r2 66
+MD5 cd3779fa4710870bb83597c39736e822 files/digest-libtool-1.4.1-r10 66
 MD5 6e892e6bd1ca4d9babce9f9163f6118e files/digest-libtool-1.4.3-r3 131
 MD5 3b92d43ab25bc1ad32ee87d89660f268 files/digest-libtool-1.5.2-r3 131
-MD5 cd3779fa4710870bb83597c39736e822 files/digest-libtool-1.4.1-r10 66
+MD5 3b92d43ab25bc1ad32ee87d89660f268 files/digest-libtool-1.5.2-r4 131
+MD5 d2313fcf3c18603f201627ca94850786 files/1.5.2/libtool-1.5.2-ltmain_sh-max_cmd_len.patch 1153
+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 8ccfbb70def73753ae1b2750c6e4e83c files/1.5.2/libtool-1.5.2-libtool_m4-shared_ext.patch 880
+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 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 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 73a7adc6c9b86c77affeeebccad0eedf files/1.4.3/libtool-1.4.2-portage.patch 2307
+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 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 8d3d48eebb6f73bb5973d9e92e832cf9 files/1.4.3/libtool-1.4.3-amd64-alias.patch 362
+MD5 3b6fe1afd09f09efd36d9f9f5225a207 files/1.4.1/libtool-1.4.1-test.patch 9320
+MD5 f7177c6432cecb38e31e0b9d8681d5b0 files/1.4.1/libtool-1.4.1-portage.patch-v6 2307
+MD5 964e7d53d1ee51d78d20bd2beb0c859c files/1.4.1/libtool-1.4.1-portage.patch-v4 1941
+MD5 be0c4444b82ac7cda7c40165174ef2a7 files/1.4.1/libtool-1.4.1-duplicate-dependency.patch 2895
+MD5 99bae50822db0d21d6fa358f17ebae72 files/1.4.1/libtool-1.4.1-portage.patch-v3 1444
+MD5 2356918d96b0760ab4e5b662fc2bd81b files/1.4.1/libtool-1.4.1-portage.patch-v5 2112
 MD5 ff0198ffcbdb0c56335422cd792d0bee files/1.4.1/libtool-1.4.1-nonneg.patch 935
+MD5 b85e2a6a099df7dd263d76899dda1f5a files/1.4.1/libtool-1.4.1-portage.patch-v2 890
 MD5 66866531be8e6be80d0ab249fd73f113 files/1.4.1/libtool-1.4.1-relink.patch 3722
-MD5 be0c4444b82ac7cda7c40165174ef2a7 files/1.4.1/libtool-1.4.1-duplicate-dependency.patch 2895
 MD5 63c00ae5db1e0c5c92e6d2c5fdf47c19 files/1.4.1/libtool-1.4.1-ltmain.sh-hack.patch 680
 MD5 dafd6bf5aafdd8c745d32d7a51f9bf5b files/1.4.1/libtool-1.4.1-portage.patch 495
-MD5 b85e2a6a099df7dd263d76899dda1f5a files/1.4.1/libtool-1.4.1-portage.patch-v2 890
-MD5 99bae50822db0d21d6fa358f17ebae72 files/1.4.1/libtool-1.4.1-portage.patch-v3 1444
-MD5 964e7d53d1ee51d78d20bd2beb0c859c files/1.4.1/libtool-1.4.1-portage.patch-v4 1941
-MD5 2356918d96b0760ab4e5b662fc2bd81b files/1.4.1/libtool-1.4.1-portage.patch-v5 2112
-MD5 f7177c6432cecb38e31e0b9d8681d5b0 files/1.4.1/libtool-1.4.1-portage.patch-v6 2307
-MD5 3b6fe1afd09f09efd36d9f9f5225a207 files/1.4.1/libtool-1.4.1-test.patch 9320
-MD5 ff0198ffcbdb0c56335422cd792d0bee files/1.4.2/libtool-1.4-nonneg.patch 935
 MD5 47fd700361b3cb3aae8dc44f28f613b0 files/1.4.2/libtool-1.4.2-add-x11r6-lib-in-ignores-for-rpath.patch 460
-MD5 63c00ae5db1e0c5c92e6d2c5fdf47c19 files/1.4.2/libtool-1.4.1-ltmain.sh-hack.patch 680
 MD5 7b1baabe9b60c5cd21d203e51dc4f005 files/1.4.2/libtool-1.4.2-archive-shared.patch 633
-MD5 a0dbdd9927749761d77ffd7bf2f7dfaa files/1.4.2/libtool-1.4.2-lib64.patch 1527
-MD5 e3285eea22373db2a63c309d00cbe041 files/1.4.2/libtool-1.4.2-fix-linkage-of-cxx-code-with-gcc.patch 1632
-MD5 f7177c6432cecb38e31e0b9d8681d5b0 files/1.4.2/libtool-1.4.2-portage.patch 2307
-MD5 cbfa90e559159a2197fc19df16bddf77 files/1.4.2/libtool-1.3.5-mktemp.patch 642
 MD5 be0c4444b82ac7cda7c40165174ef2a7 files/1.4.2/libtool-1.4.2-duplicate-dependency.patch 2895
 MD5 78aba04ebd4ec67b49228a470360878a files/1.4.2/libtool-1.4.2-test.patch 19511
+MD5 ff0198ffcbdb0c56335422cd792d0bee files/1.4.2/libtool-1.4-nonneg.patch 935
+MD5 f7177c6432cecb38e31e0b9d8681d5b0 files/1.4.2/libtool-1.4.2-portage.patch 2307
+MD5 e3285eea22373db2a63c309d00cbe041 files/1.4.2/libtool-1.4.2-fix-linkage-of-cxx-code-with-gcc.patch 1632
+MD5 cbfa90e559159a2197fc19df16bddf77 files/1.4.2/libtool-1.3.5-mktemp.patch 642
 MD5 aa0eb2966d772751eac3bccb6be508b4 files/1.4.2/libtool-1.4.2-relink.patch 3110
-MD5 ff5cf09ccda7f9a34f8c3c69e0c5047c files/1.4.3/libtool-1.4.3-libtoolize--config-only.patch 1288
-MD5 d4838522fa55dc06521ddde517901767 files/1.4.3/libtool-1.4.2-expsym-linux.patch 1678
-MD5 c7e04f642029498cc1652407b1ea74bf files/1.4.3/libtool-1.4-nonneg.patch 935
-MD5 c4fd959743953818fe6ab06c7d84e795 files/1.4.3/libtool-1.4.3-quotes.patch 12951
-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 e03f7ed340f294fdb7ddd6c84d4b6b09 files/1.4.3/libtool-1.4.2-relink-58664.patch 3213
-MD5 67757e15bfa1cdefb5c23f76198329ec files/1.4.3/libtool-1.3.5-nonneg.patch 895
-MD5 3b185e86e062b438eb8d418fc5af462f files/1.4.3/libtool-1.4.2-fix-linkage-of-cxx-code-with-gcc.patch 816
-MD5 8d3d48eebb6f73bb5973d9e92e832cf9 files/1.4.3/libtool-1.4.3-amd64-alias.patch 362
-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 66ec977174eec4eba66454e4f0f5772a files/1.4.3/libtool-1.4.2-demo.patch 538
-MD5 191388758ae78d4982f143636e47f514 files/1.4.3/libtool-1.4.3-lib64.patch 1193
-MD5 a9be6866b7096092613595ccff0fd773 files/1.4.3/libtool-1.4.3-pass-thread-flags.patch 494
-MD5 73a7adc6c9b86c77affeeebccad0eedf files/1.4.3/libtool-1.4.2-portage.patch 2307
-MD5 55544e163772c87195b893d27e00a0f8 files/1.4.3/libtool-1.3.5-mktemp.patch 642
-MD5 51df2f3c87ee74b80790edd735ddf565 files/1.4.3/libtool-1.4.2-s390_x86_64.patch 470
-MD5 f6f24e776d832798365777c26c2c56fc files/1.4.3/libtool-1.4.2-multilib.patch 1780
-MD5 0fb02114fa6b6cd63ea25510f04f346a files/1.5.2/libtool-1.5-testfailure.patch 6448
-MD5 8ccfbb70def73753ae1b2750c6e4e83c files/1.5.2/libtool-1.5.2-libtool_m4-shared_ext.patch 880
-MD5 6ef585a59058c79f3601bbd7787f2683 files/1.5.2/libtool-1.5-libtool.m4-x86_64.patch 466
-MD5 d2313fcf3c18603f201627ca94850786 files/1.5.2/libtool-1.5.2-ltmain_sh-max_cmd_len.patch 1153
+MD5 a0dbdd9927749761d77ffd7bf2f7dfaa files/1.4.2/libtool-1.4.2-lib64.patch 1527
+MD5 63c00ae5db1e0c5c92e6d2c5fdf47c19 files/1.4.2/libtool-1.4.1-ltmain.sh-hack.patch 680
diff --git a/sys-devel/libtool/files/digest-libtool-1.5.2-r4 b/sys-devel/libtool/files/digest-libtool-1.5.2-r4
new file mode 100644
index 000000000000..301451dc934e
--- /dev/null
+++ b/sys-devel/libtool/files/digest-libtool-1.5.2-r4
@@ -0,0 +1,2 @@
+MD5 db66ba05502f533ad0cfd84dc0e03bd5 libtool-1.5.2.tar.gz 2653072
+MD5 fa26a07c978ad05d1f88ed7a472daa49 libtool-1.3.5.tar.gz 538884
diff --git a/sys-devel/libtool/libtool-1.5.2-r4.ebuild b/sys-devel/libtool/libtool-1.5.2-r4.ebuild
new file mode 100644
index 000000000000..b44c325ebb03
--- /dev/null
+++ b/sys-devel/libtool/libtool-1.5.2-r4.ebuild
@@ -0,0 +1,202 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-1.5.2-r4.ebuild,v 1.1 2004/02/29 17:21:18 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 ~ia64 ppc64"
+
+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 `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 ${OLD_S}
+	echo
+	# Install updated missing script
+	portageq has_version / "sys-devel/automake" && {
+		rm -f missing
+		automake --add-missing
+	}
+
+	einfo "Patching ${OLD_S##*/} ..."
+	epatch ${FILESDIR}/1.4.3/${PN}-1.2f-cache.patch
+	epatch ${FILESDIR}/1.4.3/${PN}-1.3.5-nonneg.patch
+	epatch ${FILESDIR}/1.4.3/${PN}-1.3.5-mktemp.patch
+
+	use hppa && S="${OLD_S}" gnuconfig_update
+	use amd64 && S="${OLD_S}" gnuconfig_update
+	use ppc64 && S="${OLD_S}" gnuconfig_update
+
+	cd ${S}
+	echo
+	# Install updated missing script
+#	portageq has_version / "sys-devel/automake" && {
+#		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}/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 upate 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
+	epatch ${FILESDIR}/${PV}/${PN}-1.5-libtool.m4-x86_64.patch
+	epatch ${FILESDIR}/${PV}/${PN}-1.5-testfailure.patch
+	# Mandrake patches
+	epatch ${FILESDIR}/1.4.3/${PN}-1.4.3-lib64.patch
+	epatch ${FILESDIR}/1.4.3/${PN}-1.4.2-fix-linkage-of-cxx-code-with-gcc.patch
+# Fix bug #43244	
+#	epatch ${FILESDIR}/1.4.3/${PN}-1.4.2-archive-shared.patch
+	epatch ${FILESDIR}/1.4.3/${PN}-1.4.3-ltmain-SED.patch
+	epatch ${FILESDIR}/1.4.3/${PN}-1.4.2-expsym-linux.patch
+	epatch ${FILESDIR}/1.4.3/${PN}-1.4.3-amd64-alias.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.4.3/${PN}-1.4.2-portage.patch
+	# If a package use an older libtool, and libtool.m4 for that
+	# package is updated, but not libtool, then we run into an
+	# issue where $shared_ext is not set.  This results in libraries
+	# being built without '.so' extension, bug #40901
+	# <azarah@gentoo.org> - (11 Feb 2004)
+	epatch ${FILESDIR}/${PV}/${PN}-1.5.2-libtool_m4-shared_ext.patch
+	# 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}/${PV}/${PN}-1.5.2-ltmain_sh-max_cmd_len.patch
+
+	einfo "Generate ltmain.sh ..."
+	gen_ltmain_sh || die "Failed to generate ltmain.sh!"
+}
+
+src_compile() {
+	lt_setup
+
+	#
+	# ************ libtool-1.3x ************
+	#
+
+	cd ${OLD_S}
+
+	# Detect mips/mips64
+	use mips && gnuconfig_update
+
+	# regen to allow for build,host,target ppc64
+	use ppc64 && gnuconfig_update
+
+	einfo "Configuring ${OLD_S##*/} ..."
+	./configure --host=${CHOST} \
+			--prefix=/usr \
+			--infodir=/usr/share/info || die
+
+	einfo "Building ${OLD_S##*/} ..."
+	emake || die
+
+	#
+	# ************ libtool-1.5x ************
+	#
+
+	cd ${S}
+
+	# Detect mips/mips64
+	use mips && gnuconfig_update
+
+	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.5x ************
+	#
+
+	einfo "Installing ${S##*/} ..."
+	cd ${S}; make DESTDIR=${D} install || die
+
+	dodoc AUTHORS COPYING ChangeLog* NEWS \
+	      README THANKS TODO doc/PLATFORMS
+}
+