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.

Package-Manager: portage-2.1_rc2-r3

4 files changed, 105 insertions, 20 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/Manifest b/dev-libs/apr/Manifest
index 9a03a523a52c..97513d48f3e6 100644
--- a/dev-libs/apr/Manifest
+++ b/dev-libs/apr/Manifest
@@ -1,37 +1,41 @@
-DIST apr-0.9.12.tar.gz 1048890 RMD160 a6604478b3d09c860bc27a21859248dfd5f6b259 SHA256 a4e9eaa1c5cbac1bb82fb08b6414cf077555353423e8fc5ae93145c33a607dc2 size 1048890
-DIST apr-0.9.6.tar.gz 1025231 RMD160 5ae7ddf3976b9c3a03db2f3df6b5eda96c142b76 SHA256 df9cdac4e99fd8a5f666a7cfd9e9097666d5a80e34f3e1431e8f0f185e413fe5 size 1025231
-DIST apr-0.9.7.tar.gz 1045136 RMD160 d2978d3f3d505885e0782b2b2b40fa1ccc2e9e7a SHA256 9d102909d840b2e2960a8175408e6d6a6e28a35112bd1190a22d346b0b66b2ba size 1045136
-DIST apr-1.2.2.tar.gz 1096029 RMD160 13a4edd59fb93596c8cae4549d38a0022a5c6758 SHA256 23826f62b305efef3f6c6e7e6b8ddad05ec48a2f36410ff508b3fc4714a33dfc size 1096029
-DIST apr-1.2.7.tar.gz 1102370 RMD160 9dfeb562b376c32261b8a263887a05515c4afbe2 SHA256 4bde26d8168216f00e0f652e34e20e527dab38edca6a7c0d85aea542bf0fc5fa size 1102370
-EBUILD apr-0.9.12.ebuild 2138 RMD160 07746389e57f73fecee41e7a9487d7a81358733b SHA1 8abf1935b87a4348d39c7f73877b63044fe0b275 SHA256 2a0c3a41910052eb49f6ccd3e47f35451cacc1b77d8c28bd2be7f417a7e3a75a size 2138
-MD5 0640458528bab0a8835b6ecd6d47b1f5 apr-0.9.12.ebuild 2138
-RMD160 07746389e57f73fecee41e7a9487d7a81358733b apr-0.9.12.ebuild 2138
-SHA256 2a0c3a41910052eb49f6ccd3e47f35451cacc1b77d8c28bd2be7f417a7e3a75a apr-0.9.12.ebuild 2138
-EBUILD apr-0.9.6-r3.ebuild 1534 RMD160 7c2e849526b2de3e59606a0939adee47db1a3f11 SHA1 63ecf41ab814152095cca916d7b69cda90f3aa1b SHA256 0795ed7fb1daed9fa97160ce1d117ce43ec063d48b06f1a6b56ab28a0497db08 size 1534
+DIST apr-0.9.12.tar.gz 1048890 RMD160 a6604478b3d09c860bc27a21859248dfd5f6b259 SHA1 091da09c06a97f9feb0b2a67af0cadc55c1b312f SHA256 a4e9eaa1c5cbac1bb82fb08b6414cf077555353423e8fc5ae93145c33a607dc2
+DIST apr-0.9.6.tar.gz 1025231 RMD160 5ae7ddf3976b9c3a03db2f3df6b5eda96c142b76 SHA1 31782328c51f207a7d2e1224b9dec7dfefa2b065 SHA256 df9cdac4e99fd8a5f666a7cfd9e9097666d5a80e34f3e1431e8f0f185e413fe5
+DIST apr-0.9.7.tar.gz 1045136 RMD160 d2978d3f3d505885e0782b2b2b40fa1ccc2e9e7a SHA1 c95983aac24bed3d0fea0eb430901dc6db5f6f5c SHA256 9d102909d840b2e2960a8175408e6d6a6e28a35112bd1190a22d346b0b66b2ba
+DIST apr-1.2.2.tar.gz 1096029 RMD160 13a4edd59fb93596c8cae4549d38a0022a5c6758 SHA1 41204a42d3d95b9c7b430f233a57ce60181c2b7b SHA256 23826f62b305efef3f6c6e7e6b8ddad05ec48a2f36410ff508b3fc4714a33dfc
+DIST apr-1.2.7.tar.gz 1102370 RMD160 9dfeb562b376c32261b8a263887a05515c4afbe2 SHA1 437ad4066f71a197029ff86a8cb55f3b6817a1f3 SHA256 4bde26d8168216f00e0f652e34e20e527dab38edca6a7c0d85aea542bf0fc5fa
+EBUILD apr-0.9.12.ebuild 2184 RMD160 1ef5cc7a57bbfd15bf9a0b1bc3327709ac3686ce SHA1 3c09f3db0da448e8b051aa62819e09ef44a93253 SHA256 e719db658cddd5d384e7638d34e7a16630e4966c918e3aae510e64adf35e7ebd
+MD5 3e1403efcfc2e2989403516f0edd9748 apr-0.9.12.ebuild 2184
+RMD160 1ef5cc7a57bbfd15bf9a0b1bc3327709ac3686ce apr-0.9.12.ebuild 2184
+SHA256 e719db658cddd5d384e7638d34e7a16630e4966c918e3aae510e64adf35e7ebd apr-0.9.12.ebuild 2184
+EBUILD apr-0.9.6-r3.ebuild 1534 RMD160 7c2e849526b2de3e59606a0939adee47db1a3f11 SHA1 63ecf41ab814152095cca916d7b69cda90f3aa1b SHA256 0795ed7fb1daed9fa97160ce1d117ce43ec063d48b06f1a6b56ab28a0497db08
 MD5 2fc416814f4a3443b28fc548cf8d86dc apr-0.9.6-r3.ebuild 1534
 RMD160 7c2e849526b2de3e59606a0939adee47db1a3f11 apr-0.9.6-r3.ebuild 1534
 SHA256 0795ed7fb1daed9fa97160ce1d117ce43ec063d48b06f1a6b56ab28a0497db08 apr-0.9.6-r3.ebuild 1534
-EBUILD apr-0.9.6-r4.ebuild 1741 RMD160 d814da08bca64f1e8772c4cd6259910ca0a8a7dc SHA1 064bcfb11caa67215bcb3602d46a53663e6f8f02 SHA256 2f0fb1cb303381110e350d314c7a57f2f31b0a651e823be0d826b9c108dc4d90 size 1741
+EBUILD apr-0.9.6-r4.ebuild 1741 RMD160 d814da08bca64f1e8772c4cd6259910ca0a8a7dc SHA1 064bcfb11caa67215bcb3602d46a53663e6f8f02 SHA256 2f0fb1cb303381110e350d314c7a57f2f31b0a651e823be0d826b9c108dc4d90
 MD5 e60102c3837e3d05e9d2cbf520bce415 apr-0.9.6-r4.ebuild 1741
 RMD160 d814da08bca64f1e8772c4cd6259910ca0a8a7dc apr-0.9.6-r4.ebuild 1741
 SHA256 2f0fb1cb303381110e350d314c7a57f2f31b0a651e823be0d826b9c108dc4d90 apr-0.9.6-r4.ebuild 1741
-EBUILD apr-0.9.7.ebuild 1783 RMD160 c127e7da7804d328b938b6acb2ce740834b8d852 SHA1 60290106afd04ff13a4402af17400aecaaffeee1 SHA256 7dd8832595abfd739648a3b4d4e0d0eac79121dbb94787c72f400c3a85f90cc9 size 1783
+EBUILD apr-0.9.7.ebuild 1783 RMD160 c127e7da7804d328b938b6acb2ce740834b8d852 SHA1 60290106afd04ff13a4402af17400aecaaffeee1 SHA256 7dd8832595abfd739648a3b4d4e0d0eac79121dbb94787c72f400c3a85f90cc9
 MD5 5d14ffb10973e4676b60f799094863cd apr-0.9.7.ebuild 1783
 RMD160 c127e7da7804d328b938b6acb2ce740834b8d852 apr-0.9.7.ebuild 1783
 SHA256 7dd8832595abfd739648a3b4d4e0d0eac79121dbb94787c72f400c3a85f90cc9 apr-0.9.7.ebuild 1783
-EBUILD apr-1.2.2.ebuild 1153 RMD160 c79ec24d344374620276ed4375560d979101e64a SHA1 4f84459647d0178e7da15d064a6fc428ca100869 SHA256 67cc8e69d39cbda0ea7516776cab9215c3c90ca685f0c98c1faf5e65cb82cecf size 1153
+EBUILD apr-1.2.2.ebuild 1153 RMD160 c79ec24d344374620276ed4375560d979101e64a SHA1 4f84459647d0178e7da15d064a6fc428ca100869 SHA256 67cc8e69d39cbda0ea7516776cab9215c3c90ca685f0c98c1faf5e65cb82cecf
 MD5 c31a13985fd8919d13a7bd06d3058d52 apr-1.2.2.ebuild 1153
 RMD160 c79ec24d344374620276ed4375560d979101e64a apr-1.2.2.ebuild 1153
 SHA256 67cc8e69d39cbda0ea7516776cab9215c3c90ca685f0c98c1faf5e65cb82cecf apr-1.2.2.ebuild 1153
-EBUILD apr-1.2.7.ebuild 1602 RMD160 9e68fbea619c665fd2b1a040ee115eabaaae81ca SHA1 62e5d6520d0d6e6135f9b6b564f34cb3199f9aa9 SHA256 2bb72c371e834b882929885942acbdff00cbb25e16e1c7ae1f0b98fc103b168d size 1602
+EBUILD apr-1.2.7-r1.ebuild 2026 RMD160 c2a2be8536c9d0367526ac7f589a2248fffc329b SHA1 d4cd96d3f7d3f7bf7e7bea1b55f571e6966ccb85 SHA256 8778a912f22550fd9dee8f747931f3f8599529fffa5fc5c6d8fd5a8ed51b53f3
+MD5 9c8d3913dc8860c16c92b88863c9c9d1 apr-1.2.7-r1.ebuild 2026
+RMD160 c2a2be8536c9d0367526ac7f589a2248fffc329b apr-1.2.7-r1.ebuild 2026
+SHA256 8778a912f22550fd9dee8f747931f3f8599529fffa5fc5c6d8fd5a8ed51b53f3 apr-1.2.7-r1.ebuild 2026
+EBUILD apr-1.2.7.ebuild 1602 RMD160 9e68fbea619c665fd2b1a040ee115eabaaae81ca SHA1 62e5d6520d0d6e6135f9b6b564f34cb3199f9aa9 SHA256 2bb72c371e834b882929885942acbdff00cbb25e16e1c7ae1f0b98fc103b168d
 MD5 5d02c0647d55e4e86b948ee5695fd491 apr-1.2.7.ebuild 1602
 RMD160 9e68fbea619c665fd2b1a040ee115eabaaae81ca apr-1.2.7.ebuild 1602
 SHA256 2bb72c371e834b882929885942acbdff00cbb25e16e1c7ae1f0b98fc103b168d apr-1.2.7.ebuild 1602
-MISC ChangeLog 6878 RMD160 a7e2601a16bdcbbd86dd3bbb6e508b49bfe1736c SHA1 bc98d26360303431f6fb249c60cfe3bffd1b6f03 SHA256 16be0b9d63ea7f6dbe249140b19018bde58d6d42e484adf47f417db0f625e65e size 6878
-MD5 a716bd3c0acbb04eee5d12810abbc767 ChangeLog 6878
-RMD160 a7e2601a16bdcbbd86dd3bbb6e508b49bfe1736c ChangeLog 6878
-SHA256 16be0b9d63ea7f6dbe249140b19018bde58d6d42e484adf47f417db0f625e65e ChangeLog 6878
-MISC metadata.xml 226 RMD160 d11ce73e47adf4b3d91309ec6489fded2f4d4e0e SHA1 fe9f7ce6f2281683065abb3255c8b731665c82ac SHA256 376a327f91f69eb96f0c1b05cc1481dd7017a0570f631a03b1f6d14d58215ca8 size 226
+MISC ChangeLog 7170 RMD160 7dfb3a751fa1301101aa4cc1c34f9a557a7e5964 SHA1 446de54c1fb6fc98c0853b5306e3740dfc67f179 SHA256 492464566bbdf865212a40a7af59023fdf2b03aa596a21374574551d975f3966
+MD5 b8311895fb6404a30955e4c78f414930 ChangeLog 7170
+RMD160 7dfb3a751fa1301101aa4cc1c34f9a557a7e5964 ChangeLog 7170
+SHA256 492464566bbdf865212a40a7af59023fdf2b03aa596a21374574551d975f3966 ChangeLog 7170
+MISC metadata.xml 226 RMD160 d11ce73e47adf4b3d91309ec6489fded2f4d4e0e SHA1 fe9f7ce6f2281683065abb3255c8b731665c82ac SHA256 376a327f91f69eb96f0c1b05cc1481dd7017a0570f631a03b1f6d14d58215ca8
 MD5 7272d8b6d09e3e301b6a08aa9c912eb0 metadata.xml 226
 RMD160 d11ce73e47adf4b3d91309ec6489fded2f4d4e0e metadata.xml 226
 SHA256 376a327f91f69eb96f0c1b05cc1481dd7017a0570f631a03b1f6d14d58215ca8 metadata.xml 226
@@ -53,3 +57,6 @@ SHA256 0470c016cff11975573657a5dfbad7f8c3e902e6841d39de4f349dcb61b95e8d files/di
 MD5 09fe6662358980713dc8869e8e7dcf98 files/digest-apr-1.2.7 232
 RMD160 ca0ba31e6a8204bf8037d3fdfefa39eb25945b24 files/digest-apr-1.2.7 232
 SHA256 638280a01796e1bd4275c9b50efc5c583c332a8a38973fd259177e148bf4ac36 files/digest-apr-1.2.7 232
+MD5 09fe6662358980713dc8869e8e7dcf98 files/digest-apr-1.2.7-r1 232
+RMD160 ca0ba31e6a8204bf8037d3fdfefa39eb25945b24 files/digest-apr-1.2.7-r1 232
+SHA256 638280a01796e1bd4275c9b50efc5c583c332a8a38973fd259177e148bf4ac36 files/digest-apr-1.2.7-r1 232
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