Fix empty VERSION and PACKAGE, bug #39576.

4 files changed, 194 insertions, 2 deletions

diff --git a/sys-devel/libtool/ChangeLog b/sys-devel/libtool/ChangeLog
index dabae6396447..50ac43ac8483 100644
--- a/sys-devel/libtool/ChangeLog
+++ b/sys-devel/libtool/ChangeLog
@@ -1,6 +1,11 @@
 # 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.32 2004/02/07 05:45:14 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.33 2004/02/07 21:36:26 azarah Exp $
+
+*libtool-1.5.2-r1 (07 Feb 2004)
+
+  07 Feb 2004; Martin Schlemmer <azarah@gentoo.org> libtool-1.5.2-r1.ebuild:
+  Fix empty VERSION and PACKAGE, bug #39576.
 
   07 Feb 2004; Martin Schlemmer <azarah@gentoo.org> libtool-1.5.2.ebuild:
   Mask again as it have some issues.
diff --git a/sys-devel/libtool/Manifest b/sys-devel/libtool/Manifest
index bf3c23227b0a..fe4e74295968 100644
--- a/sys-devel/libtool/Manifest
+++ b/sys-devel/libtool/Manifest
@@ -1,5 +1,4 @@
 MD5 6d26b33bcad84d410dcc4f3a3719fe5b libtool-1.4.3.ebuild 2731
-MD5 75ea8da99cc9e0c0545d6d77dfd7d944 libtool-1.5.2.ebuild 4736
 MD5 760c68b6836d81bf6d3f009f086d860f ChangeLog 5679
 MD5 fbcf7a29349882a6f6c75491400d1953 libtool-1.4.1-r10.ebuild 1780
 MD5 b95e1ebe01edaa3fce9ffe9b39f99ce2 libtool-1.4.3-r2.ebuild 4387
@@ -7,8 +6,10 @@ MD5 7acf95d7a52c695ccd163defb5facdad libtool-1.4.3-r1.ebuild 3197
 MD5 4d48b4072e8f2a4591a4d80a23f6042f libtool-1.4.2-r2.ebuild 2182
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 3a0095e2cf87981d079b9ca02c2556ee libtool-1.4.3-r3.ebuild 4786
+MD5 d919e52b1dd272441b6e4e8c656ab0e1 libtool-1.5.2-r1.ebuild 4747
 MD5 6e892e6bd1ca4d9babce9f9163f6118e files/digest-libtool-1.4.3-r2 131
 MD5 0988730d91b787159d631c37932efef5 files/digest-libtool-1.4.2-r2 66
+MD5 3b92d43ab25bc1ad32ee87d89660f268 files/digest-libtool-1.5.2-r1 131
 MD5 cd3779fa4710870bb83597c39736e822 files/digest-libtool-1.4.1-r10 66
 MD5 6e892e6bd1ca4d9babce9f9163f6118e files/digest-libtool-1.4.3 131
 MD5 3b92d43ab25bc1ad32ee87d89660f268 files/digest-libtool-1.5.2 131
diff --git a/sys-devel/libtool/files/digest-libtool-1.5.2-r1 b/sys-devel/libtool/files/digest-libtool-1.5.2-r1
new file mode 100644
index 000000000000..301451dc934e
--- /dev/null
+++ b/sys-devel/libtool/files/digest-libtool-1.5.2-r1
@@ -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-r1.ebuild b/sys-devel/libtool/libtool-1.5.2-r1.ebuild
new file mode 100644
index 000000000000..96a3cb0377c8
--- /dev/null
+++ b/sys-devel/libtool/libtool-1.5.2-r1.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.5.2-r1.ebuild,v 1.1 2004/02/07 21:36:26 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 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
+
+	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
+	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
+	# Do not create bogus entries in $dependency_libs or $libdir
+	# with ${D} or ${S} in them.
+	#
+	# Azarah - 07 April 2002
+	epatch ${FILESDIR}/1.4.3/${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.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
+}
+