Remove useless C++ checks #73344. Means we have to run all the autotool stuff ourself (whee!).

4 files changed, 170 insertions, 5 deletions

diff --git a/sys-devel/libtool/ChangeLog b/sys-devel/libtool/ChangeLog
index 1077dba2d7e9..2147f5d6cb9f 100644
--- a/sys-devel/libtool/ChangeLog
+++ b/sys-devel/libtool/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/libtool
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.62 2004/12/17 07:00:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.63 2004/12/17 08:14:24 vapier Exp $
+
+*libtool-1.5.10-r2 (17 Dec 2004)
+
+  17 Dec 2004; Mike Frysinger <vapier@gentoo.org> +libtool-1.5.10-r2.ebuild:
+  Remove useless C++ checks #73344. Means we have to run all the autotool
+  stuff ourself (whee!).
 
   17 Dec 2004; Mike Frysinger <vapier@gentoo.org>
   -files/1.4.3/libtool-1.4.3-amd64-alias.patch, libtool-1.5.10-r1.ebuild,
diff --git a/sys-devel/libtool/Manifest b/sys-devel/libtool/Manifest
index 4a455ff5b5d9..13c951b86446 100644
--- a/sys-devel/libtool/Manifest
+++ b/sys-devel/libtool/Manifest
@@ -1,7 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 f01694fa944e58f05545a01ff33ff879 ChangeLog 11231
+MD5 295b7f2b2282772165840171e0255cca ChangeLog 11442
+MD5 e55847cee2e8c24275ecd85e3a344c10 libtool-1.5.10-r2.ebuild 5196
 MD5 8edc66ed3c36a0c38cd00d5a97f70854 libtool-1.5.2-r5.ebuild 5839
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 e2d0fc200b734149d8ab0aa017c39b32 libtool-1.3.5.ebuild 1495
@@ -9,6 +10,7 @@ MD5 d15b4a9dd167fa087575279ab779e651 libtool-1.5.2-r7.ebuild 6116
 MD5 8d3418dde9cd58a9403e046d7f66a9bf libtool-1.5.10-r1.ebuild 4842
 MD5 e893eae0aa5740740c388dbf0a35b3c6 files/digest-libtool-1.3.5 65
 MD5 bd27a462a2a9fe3662d3d34179ed3200 files/libltdl-uclibc.patch 4590
+MD5 bb976ab258ba1974bf1a3cd0a51ce34b files/digest-libtool-1.5.10-r2 67
 MD5 3b92d43ab25bc1ad32ee87d89660f268 files/digest-libtool-1.5.2-r7 131
 MD5 bb976ab258ba1974bf1a3cd0a51ce34b files/digest-libtool-1.5.10-r1 67
 MD5 3b92d43ab25bc1ad32ee87d89660f268 files/digest-libtool-1.5.2-r5 131
@@ -44,7 +46,7 @@ MD5 b81a86ce5e9014e53bd7beb12e46ed12 files/1.5.2/libtool-1.5.2-ltmain_sh-max_cmd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.9.10 (GNU/Linux)
 
-iD8DBQFBwoQSroRuSHgZdywRAiTmAJ4pM0lCNVWPjtT8ZMyDLx6Gu2UxpQCfaVp+
-vCdfL1DtlRkd4F5FxFpG/Bk=
-=BAfX
+iD8DBQFBwpVxroRuSHgZdywRAnxpAJ0aSb0gBEQI1fPCe5Y/t1tNhNiW7gCeOHbW
+W7tf6uIme3szmFKL/9k1g0g=
+=rudK
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/libtool/files/digest-libtool-1.5.10-r2 b/sys-devel/libtool/files/digest-libtool-1.5.10-r2
new file mode 100644
index 000000000000..cab20e0c9462
--- /dev/null
+++ b/sys-devel/libtool/files/digest-libtool-1.5.10-r2
@@ -0,0 +1 @@
+MD5 e2093a85f6d48f1562c36920087502d6 libtool-1.5.10.tar.gz 2699923
diff --git a/sys-devel/libtool/libtool-1.5.10-r2.ebuild b/sys-devel/libtool/libtool-1.5.10-r2.ebuild
new file mode 100644
index 000000000000..839f89b26d89
--- /dev/null
+++ b/sys-devel/libtool/libtool-1.5.10-r2.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-1.5.10-r2.ebuild,v 1.1 2004/12/17 08:14:24 vapier Exp ${P}-r1.ebuild,v 1.8 2002/10/04 06:34:42 kloeri Exp $
+
+inherit eutils gnuconfig libtool
+
+DESCRIPTION="A shared library tool for developers"
+HOMEPAGE="http://www.gnu.org/software/libtool/libtool.html"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="1.5"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="uclibc"
+
+DEPEND="virtual/libc
+	>=sys-devel/autoconf-2.59
+	>=sys-devel/automake-1.9"
+# the autoconf dep is due to it complaining 'configure.ac:55: error: Autoconf version 2.58 or higher is required'
+# the automake dep is due to Bug #46037
+
+lt_setup() {
+	export WANT_AUTOCONF=2.5
+	export WANT_AUTOMAKE=1.9
+}
+
+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 ${S}
+
+	# Make sure non of the patches touch ltmain.sh, but rather ltmain.in
+	rm -f ltmain.sh*
+
+	# 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 update 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
+# Seems to be included in shipped tarball ...
+#	epatch ${FILESDIR}/1.5.2/${PN}-1.5-libtool.m4-x86_64.patch
+	epatch ${FILESDIR}/1.5.2/${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.5.6/${PN}-1.5.6-ltmain-SED.patch
+	epatch ${FILESDIR}/1.4.3/${PN}-1.4.2-expsym-linux.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 may run into an
+	# issue where internal variables are named differently.  Often 
+	# this shows up as libs being built without '.so' extension #73140
+	epatch ${FILESDIR}/1.5.10/${PN}-1.5.10-version-checking.patch
+	sed -i "s:@_LT_VERSION@:${PV}:" libtool.m4 || die "sed libtool.m4"
+	# 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}/1.5.2/${PN}-1.5.2-ltmain_sh-max_cmd_len.patch
+
+	# Libtool's autoguessing at tag's sucks ... it get's confused 
+	# if the tag's CC says '<CHOST>-gcc' and the env CC says 'gcc'
+	# or vice versa ... newer automakes specify the tag so no
+	# guessing is needed #67692
+	epatch ${FILESDIR}/1.5.6/libtool-1.5-filter-host-tags.patch
+
+	# Libtool uses links to handle locking object files with 
+	# dependencies.  Hard links can't cross filesystems though, 
+	# so we have to use a diff source for the link.  #40992
+	epatch ${FILESDIR}/1.5.10/libtool-1.5.10-locking.patch
+
+	ebegin "Generating ltmain.sh"
+	gen_ltmain_sh || die "Failed to generate ltmain.sh!"
+	eend 0
+
+	# Now let's run all our autotool stuff so that files we patch
+	# below don't get regenerated on us later
+	cp libtool.m4 acinclude.m4
+	local d p
+	for d in . libltdl ; do
+		ebegin "Running autotools in '${d}'"
+		cd ${S}/${d}
+		touch acinclude.m4
+		for p in aclocal "automake -c -a" autoconf ; do
+			${p} || die "${p}"
+		done
+		eend 0
+	done
+	cd ${S}
+
+	uclibctoolize
+	gnuconfig_update ${WORKDIR}
+	epunt_cxx
+}
+
+src_compile() {
+	lt_setup
+	econf || die
+	emake || die
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog* NEWS README THANKS TODO doc/PLATFORMS
+
+	if use uclibc ; then
+		for x in $(find ${D} -name config.guess -o -name config.sub) ; do
+			rm -f ${x}; ln -sf ../gnuconfig/$(basename ${x}) ${x}
+		done
+		cd ${D}/usr/share/libtool/libltdl
+		for x in config.guess config.sub ; do
+			rm -f ${x} ; ln -sfn ../${x} ${x}
+		done
+	fi
+}