Actually remove the correct patch for bug #43244.

6 files changed, 401 insertions, 1 deletions

diff --git a/sys-devel/libtool/ChangeLog b/sys-devel/libtool/ChangeLog
index 98b31f7dc166..3bfbe9659e67 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.37 2004/02/29 17:21:18 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.38 2004/03/01 19:39:08 azarah Exp $
+
+*libtool-1.5.2-r5 (01 Mar 2004)
+
+  01 Mar 2004; Martin Schlemmer <azarah@gentoo.org> libtool-1.4.3-r4.ebuild,
+  libtool-1.5.2-r5.ebuild:
+  Actually remove the correct patch for bug #43244.
 
 *libtool-1.5.2-r4 (29 Feb 2004)
 
diff --git a/sys-devel/libtool/Manifest b/sys-devel/libtool/Manifest
index 0a675d140a2c..a84c10efea48 100644
--- a/sys-devel/libtool/Manifest
+++ b/sys-devel/libtool/Manifest
@@ -1,12 +1,16 @@
+MD5 d48b00452dbc1ab5f32c1312a0c440ac libtool-1.4.3-r4.ebuild 4784
 MD5 e522a343c376acfb59e5f5a27ca905f7 ChangeLog 7085
 MD5 614e0b3cdb7b2d84017bc210858fc4c7 libtool-1.4.1-r10.ebuild 1776
 MD5 87dd0167953632e525b66f620f094760 libtool-1.5.2-r3.ebuild 5564
 MD5 a24190eaea1f0b5085988c1b953a6bc2 libtool-1.5.2-r4.ebuild 5581
 MD5 55755b00d5f8ce1ee30fb295f77950e0 libtool-1.4.2-r2.ebuild 2180
+MD5 7ad73249cea1cd3c37e931deaf00a959 libtool-1.5.2-r5.ebuild 5580
 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 3b92d43ab25bc1ad32ee87d89660f268 files/digest-libtool-1.5.2-r5 131
 MD5 cd3779fa4710870bb83597c39736e822 files/digest-libtool-1.4.1-r10 66
+MD5 6e892e6bd1ca4d9babce9f9163f6118e files/digest-libtool-1.4.3-r4 131
 MD5 6e892e6bd1ca4d9babce9f9163f6118e files/digest-libtool-1.4.3-r3 131
 MD5 3b92d43ab25bc1ad32ee87d89660f268 files/digest-libtool-1.5.2-r3 131
 MD5 3b92d43ab25bc1ad32ee87d89660f268 files/digest-libtool-1.5.2-r4 131
diff --git a/sys-devel/libtool/files/digest-libtool-1.4.3-r4 b/sys-devel/libtool/files/digest-libtool-1.4.3-r4
new file mode 100644
index 000000000000..e1f620300ee1
--- /dev/null
+++ b/sys-devel/libtool/files/digest-libtool-1.4.3-r4
@@ -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/files/digest-libtool-1.5.2-r5 b/sys-devel/libtool/files/digest-libtool-1.5.2-r5
new file mode 100644
index 000000000000..301451dc934e
--- /dev/null
+++ b/sys-devel/libtool/files/digest-libtool-1.5.2-r5
@@ -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.4.3-r4.ebuild b/sys-devel/libtool/libtool-1.4.3-r4.ebuild
new file mode 100644
index 000000000000..4762f3deda1f
--- /dev/null
+++ b/sys-devel/libtool/libtool-1.4.3-r4.ebuild
@@ -0,0 +1,184 @@
+# 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.4.3-r4.ebuild,v 1.1 2004/03/01 19:39:09 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 `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}
+	echo
+	# Install updated missing script
+	portageq has_version / "sys-devel/automake" && {
+		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 hppa && S="${OLD_S}" gnuconfig_update
+	use amd64 && 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}/${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-quotes.patch
+	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
+	epatch ${FILESDIR}/${PV}/${PN}-1.4.2-expsym-linux.patch
+	epatch ${FILESDIR}/${PV}/${PN}-1.4.3-amd64-alias.patch
+	epatch ${FILESDIR}/${PV}/${PN}-1.4.3-libtoolize--config-only.patch
+	epatch ${FILESDIR}/${PV}/${PN}-1.4.3-pass-thread-flags.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}
+
+	# Detect mips/mips64
+	use mips && gnuconfig_update
+
+	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}
+
+	# 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.4x ************
+	#
+
+	einfo "Installing ${S##*/} ..."
+	cd ${S}; make DESTDIR=${D} install || die
+
+	dodoc AUTHORS COPYING ChangeLog* NEWS \
+	      README THANKS TODO doc/PLATFORMS
+}
+
diff --git a/sys-devel/libtool/libtool-1.5.2-r5.ebuild b/sys-devel/libtool/libtool-1.5.2-r5.ebuild
new file mode 100644
index 000000000000..942ca66d25ff
--- /dev/null
+++ b/sys-devel/libtool/libtool-1.5.2-r5.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-r5.ebuild,v 1.1 2004/03/01 19:39:09 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
+# 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.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
+}
+