Use the system's libtool instead of the bundled libtool. Fixes bug 81260. Note that some software that hardcodes the APR libtool location (such as Apache) may need to be recompiled.

(Portage version: 2.1_rc2-r3)

3 files changed, 79 insertions, 1 deletions

diff --git a/dev-libs/apr/ChangeLog b/dev-libs/apr/ChangeLog
index db843b0d3140..86b7504b8532 100644
--- a/dev-libs/apr/ChangeLog
+++ b/dev-libs/apr/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/apr
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/ChangeLog,v 1.55 2006/05/18 01:22:33 vericgar Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/ChangeLog,v 1.56 2006/05/26 04:04:59 vericgar Exp $
+
+*apr-1.2.7-r1 (26 May 2006)
+
+  26 May 2006; Michael Stewart <vericgar@gentoo.org> +apr-1.2.7-r1.ebuild:
+  Use the system's libtool instead of the bundled libtool. Fixes bug 81260
+  Note that some software that hardcodes the APR libtool location (such as
+  Apache) may need to be recompiled.
 
   18 May 2006; Michael Stewart <vericgar@gentoo.org> apr-0.9.12.ebuild,
   apr-1.2.7.ebuild:
diff --git a/dev-libs/apr/apr-1.2.7-r1.ebuild b/dev-libs/apr/apr-1.2.7-r1.ebuild
new file mode 100644
index 000000000000..afb04b9daf47
--- /dev/null
+++ b/dev-libs/apr/apr-1.2.7-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/apr-1.2.7-r1.ebuild,v 1.1 2006/05/26 04:04:59 vericgar Exp $
+
+inherit autotools
+
+DESCRIPTION="Apache Portable Runtime Library"
+HOMEPAGE="http://apr.apache.org/"
+SRC_URI="mirror://apache/apr/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="ipv6 urandom"
+RESTRICT="test"
+
+DEPEND=""
+
+src_compile() {
+
+	eautoreconf
+
+	myconf="--datadir=/usr/share/apr-1"
+
+	myconf="${myconf} $(use_enable ipv6)"
+	myconf="${myconf} --enable-threads"
+	myconf="${myconf} --enable-nonportable-atomics"
+	if use urandom; then
+		einfo "Using /dev/urandom as random device"
+		myconf="${myconf} --with-devrandom=/dev/urandom"
+	else
+		einfo "Using /dev/random as random device"
+		myconf="${myconf} --with-devrandom=/dev/random"
+	fi
+
+	# We pre-load the cache with the correct answer!  This avoids
+	# it violating the sandbox.  This may have to be changed for
+	# non-Linux systems or if sem_open changes on Linux.  This
+	# hack is built around documentation in /usr/include/semaphore.h
+	# and the glibc (pthread) source
+	# See bugs 24215 and 133573
+	echo 'ac_cv_func_sem_open=${ac_cv_func_sem_open=no}' >> ${S}/config.cache
+
+	econf ${myconf} || die "Configure failed"
+
+	# Make sure we use the system libtool
+	sed -i 's,$(apr_builddir)/libtool,/usr/bin/libtool,' build/apr_rules.mk
+	sed -i 's,${installbuilddir}/libtool,/usr/bin/libtool,' apr-1-config
+	rm libtool
+
+	emake || die "Make failed"
+}
+
+src_install() {
+
+	make DESTDIR="${D}" install || die "make install failed"
+
+	dodoc CHANGES NOTICE LICENSE
+}
+
+pkg_postinst() {
+	ewarn "We are now using the system's libtool rather then bundling"
+	ewarn "our own. You will need to rebuild Apache and possibly other"
+	ewarn "software if you get a message similiar to the following:"
+	ewarn
+	ewarn "   /usr/share/apr-1/build-1/libtool: No such file or directory"
+	ewarn
+}
diff --git a/dev-libs/apr/files/digest-apr-1.2.7-r1 b/dev-libs/apr/files/digest-apr-1.2.7-r1
new file mode 100644
index 000000000000..13dfeb0ca3cd
--- /dev/null
+++ b/dev-libs/apr/files/digest-apr-1.2.7-r1
@@ -0,0 +1,3 @@
+MD5 aea926cbe588f844ad9e317157d60175 apr-1.2.7.tar.gz 1102370
+RMD160 9dfeb562b376c32261b8a263887a05515c4afbe2 apr-1.2.7.tar.gz 1102370
+SHA256 4bde26d8168216f00e0f652e34e20e527dab38edca6a7c0d85aea542bf0fc5fa apr-1.2.7.tar.gz 1102370