Use a config.layout instead of command line options to work around bug 139033.

Package-Manager: portage-2.1.1_pre2-r2

5 files changed, 138 insertions, 15 deletions

diff --git a/dev-libs/apr/ChangeLog b/dev-libs/apr/ChangeLog
index af827a601918..a8c27577dca5 100644
--- a/dev-libs/apr/ChangeLog
+++ b/dev-libs/apr/ChangeLog
@@ -1,6 +1,12 @@
 # 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.66 2006/06/28 18:54:56 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/ChangeLog,v 1.67 2006/07/07 05:05:50 vericgar Exp $
+
+*apr-1.2.7-r3 (07 Jul 2006)
+
+  07 Jul 2006; Michael Stewart <vericgar@gentoo.org>
+  +files/config.layout.patch, +apr-1.2.7-r3.ebuild:
+  Use a config.layout instead of command line options to work around bug 139033.
 
   28 Jun 2006; Tobias Scherbaum <dertobi123@gentoo.org> apr-0.9.12.ebuild:
   ppc stable, #138011
diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest
index fa4abf6bef4d..b6d10f71f760 100644
--- a/dev-libs/apr/Manifest
+++ b/dev-libs/apr/Manifest
@@ -1,10 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX apr-0.9.12-linking.patch 349 RMD160 e33b286c74e7dd3bb381929cf78dcac203f9f498 SHA1 efc3042bf1a41d7c49adc965714661418ac05b08 SHA256 dea6bb956dc56d3001f743df2ee104d14b569e5281e2d3fb26dd0ad9f47f9af2
 MD5 a49beead42dd89f9753c55e305e69a19 files/apr-0.9.12-linking.patch 349
 RMD160 e33b286c74e7dd3bb381929cf78dcac203f9f498 files/apr-0.9.12-linking.patch 349
 SHA256 dea6bb956dc56d3001f743df2ee104d14b569e5281e2d3fb26dd0ad9f47f9af2 files/apr-0.9.12-linking.patch 349
+AUX config.layout.patch 818 RMD160 dada232c8b85e6c3c62fbc6caa1d05f36164dc27 SHA1 3822a0ec508165dd189e1b750bdf4e7778b6c21e SHA256 eeacaf654f23084e842bff02b97c083a8da5b5c056fd086166ba2d250edf3181
+MD5 3a0d2bae49b03d08d65da84b4b3beee6 files/config.layout.patch 818
+RMD160 dada232c8b85e6c3c62fbc6caa1d05f36164dc27 files/config.layout.patch 818
+SHA256 eeacaf654f23084e842bff02b97c083a8da5b5c056fd086166ba2d250edf3181 files/config.layout.patch 818
 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
@@ -38,14 +39,18 @@ EBUILD apr-1.2.7-r2.ebuild 2541 RMD160 1bcdc8473dab1ac33751d61596dca8df782124d0
 MD5 968b56c7740d4ed75213fab50e628f7f apr-1.2.7-r2.ebuild 2541
 RMD160 1bcdc8473dab1ac33751d61596dca8df782124d0 apr-1.2.7-r2.ebuild 2541
 SHA256 f218b3885772fdfd5b996324b153821dd5a60e393dcec3ac5eb9f09ffbccc229 apr-1.2.7-r2.ebuild 2541
+EBUILD apr-1.2.7-r3.ebuild 2620 RMD160 2e434f5db3db56599dd897519cb1e1c22a29a485 SHA1 5b5e7547d0d6b10df76b78cc4087336074c3f399 SHA256 762c211306bc27558049399187370a89166d9304585fa8646293f9708b673503
+MD5 aff59a0301d1b16d5870b6cf3801fee7 apr-1.2.7-r3.ebuild 2620
+RMD160 2e434f5db3db56599dd897519cb1e1c22a29a485 apr-1.2.7-r3.ebuild 2620
+SHA256 762c211306bc27558049399187370a89166d9304585fa8646293f9708b673503 apr-1.2.7-r3.ebuild 2620
 EBUILD apr-1.2.7.ebuild 1557 RMD160 3774769a8236b5a1c8503e2e3111ca141ab4d757 SHA1 bcc1ba578dbfd0c4313fd46610bbc3009807d3e1 SHA256 56d2756aa7c3b00c93f25787dc6345c3a5c18835639990fbd735e6b9fda09e15
 MD5 d0f3560135caff1eba14a54de39753f5 apr-1.2.7.ebuild 1557
 RMD160 3774769a8236b5a1c8503e2e3111ca141ab4d757 apr-1.2.7.ebuild 1557
 SHA256 56d2756aa7c3b00c93f25787dc6345c3a5c18835639990fbd735e6b9fda09e15 apr-1.2.7.ebuild 1557
-MISC ChangeLog 8316 RMD160 6db65f2c8b8f2f7ea1a1f88cd32d20ebb117052c SHA1 8ab9790cbf32065b638f3c034e86240fb2aaec8f SHA256 60cf77de288a1879884cd0bc1c140e74a06542aef9a8e6b33a87292d575bdb17
-MD5 9d3cb3aeadce3fbe39a0accad9322d31 ChangeLog 8316
-RMD160 6db65f2c8b8f2f7ea1a1f88cd32d20ebb117052c ChangeLog 8316
-SHA256 60cf77de288a1879884cd0bc1c140e74a06542aef9a8e6b33a87292d575bdb17 ChangeLog 8316
+MISC ChangeLog 8530 RMD160 987e6551bb4fce09b9e88f9b820e8638565f2f47 SHA1 9f81b15bd11673b2dfccd0fcf2b4b79a59b145f4 SHA256 a96c147a4232a9976015ecb98b2c3209aa0db892f036f2dd5acec8c6da311ebb
+MD5 907ba6a534a05e867ac6522ce20a747b ChangeLog 8530
+RMD160 987e6551bb4fce09b9e88f9b820e8638565f2f47 ChangeLog 8530
+SHA256 a96c147a4232a9976015ecb98b2c3209aa0db892f036f2dd5acec8c6da311ebb ChangeLog 8530
 MISC metadata.xml 226 RMD160 d11ce73e47adf4b3d91309ec6489fded2f4d4e0e SHA1 fe9f7ce6f2281683065abb3255c8b731665c82ac SHA256 376a327f91f69eb96f0c1b05cc1481dd7017a0570f631a03b1f6d14d58215ca8
 MD5 7272d8b6d09e3e301b6a08aa9c912eb0 metadata.xml 226
 RMD160 d11ce73e47adf4b3d91309ec6489fded2f4d4e0e metadata.xml 226
@@ -74,10 +79,6 @@ SHA256 638280a01796e1bd4275c9b50efc5c583c332a8a38973fd259177e148bf4ac36 files/di
 MD5 09fe6662358980713dc8869e8e7dcf98 files/digest-apr-1.2.7-r2 232
 RMD160 ca0ba31e6a8204bf8037d3fdfefa39eb25945b24 files/digest-apr-1.2.7-r2 232
 SHA256 638280a01796e1bd4275c9b50efc5c583c332a8a38973fd259177e148bf4ac36 files/digest-apr-1.2.7-r2 232
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
-
-iD8DBQFEqCaLamhnQswr0vIRAjwNAKC7xN1zBxOUdOLbgdJ4MurLNLfITACfQt9s
-NzpPZsIjqsb0ULsU3oiRLQs=
-=Zk3T
------END PGP SIGNATURE-----
+MD5 09fe6662358980713dc8869e8e7dcf98 files/digest-apr-1.2.7-r3 232
+RMD160 ca0ba31e6a8204bf8037d3fdfefa39eb25945b24 files/digest-apr-1.2.7-r3 232
+SHA256 638280a01796e1bd4275c9b50efc5c583c332a8a38973fd259177e148bf4ac36 files/digest-apr-1.2.7-r3 232
diff --git a/dev-libs/apr/apr-1.2.7-r3.ebuild b/dev-libs/apr/apr-1.2.7-r3.ebuild
new file mode 100644
index 000000000000..86c1328b1818
--- /dev/null
+++ b/dev-libs/apr/apr-1.2.7-r3.ebuild
@@ -0,0 +1,88 @@
+# 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-r3.ebuild,v 1.1 2006/07/07 05:05:50 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 debug"
+RESTRICT="test"
+
+DEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# for some reason not all the .m4 files that are referenced in 
+	# configure.in exist, so we remove all references and include every
+	# .m4 file in build using aclocal via eautoreconf
+	# See bug 135463
+	sed -i -e '/sinclude/d' configure.in
+	AT_M4DIR="build" eautoreconf
+
+	epatch ${FILESDIR}/config.layout.patch
+
+}
+
+src_compile() {
+
+
+	myconf="--enable-layout=gentoo"
+
+	# For now we always enable ipv6. Testing has shown that is still works
+	# correctly in ipv4 systems, and currently, the ipv4-only support
+	# is broken in apr. (ipv6 is enabled by default)
+	#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
+
+	useq debug && myconf="${myconf} --enable-maintainer-mode"
+
+	# 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/config.layout.patch b/dev-libs/apr/files/config.layout.patch
new file mode 100644
index 000000000000..66fa868c0bbe
--- /dev/null
+++ b/dev-libs/apr/files/config.layout.patch
@@ -0,0 +1,25 @@
+--- config.layout.orig	2006-07-06 21:44:41.000000000 -0700
++++ config.layout	2006-07-06 21:46:26.000000000 -0700
+@@ -229,3 +229,22 @@
+     infodir:       ${exec_prefix}/share/info
+     libsuffix:    -${APR_MAJOR_VERSION}
+ </Layout>
++
++# Gentoo layout
++<Layout gentoo>
++    prefix:        /usr
++    exec_prefix:   ${prefix}
++    bindir:        ${exec_prefix}/bin
++    sbindir:       ${exec_prefix}/bin
++    libdir:        ${exec_prefix}/lib
++    libexecdir:    ${exec_prefix}/modules
++    mandir:        ${prefix}/man
++    sysconfdir:    ${prefix}/conf
++    datadir:       /usr/share/apr-${APR_MAJOR_VERSION}
++    installbuilddir: ${datadir}/build-${APR_MAJOR_VERSION}
++    includedir:    ${prefix}/include/apr-${APR_MAJOR_VERSION}
++    localstatedir: ${prefix}
++    libsuffix:     -${APR_MAJOR_VERSION}
++</Layout>
++
++
diff --git a/dev-libs/apr/files/digest-apr-1.2.7-r3 b/dev-libs/apr/files/digest-apr-1.2.7-r3
new file mode 100644
index 000000000000..13dfeb0ca3cd
--- /dev/null
+++ b/dev-libs/apr/files/digest-apr-1.2.7-r3
@@ -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