added prefix support

Package-Manager: portage-2.2.0_alpha142/cvs/Linux i686
Manifest-Sign-Key: 0xC2000586

4 files changed, 166 insertions, 5 deletions

diff --git a/dev-libs/apr/ChangeLog b/dev-libs/apr/ChangeLog
index edafce1b3fdb..2c8080eac85d 100644
--- a/dev-libs/apr/ChangeLog
+++ b/dev-libs/apr/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/apr
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/ChangeLog,v 1.185 2012/11/27 18:43:05 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/ChangeLog,v 1.186 2012/11/28 04:40:54 ottxor Exp $
+
+*apr-1.4.6-r1 (28 Nov 2012)
+
+  28 Nov 2012; Christoph Junghans <ottxor@gentoo.org> +apr-1.4.6-r1.ebuild,
+  +files/apr-1.4.6-mint.patch:
+  added prefix support
 
   27 Nov 2012; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Drop apache herd as discussed in http://www.gossamer-
diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest
index f5641c35efeb..651824564809 100644
--- a/dev-libs/apr/Manifest
+++ b/dev-libs/apr/Manifest
@@ -1,17 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX apr-1.4.6-mint.patch 1200 SHA256 d1d8217efbf87f136ece47d06e224f23a585b1634d70a911c88778b8503b3d71 SHA512 531961bcd79850a4b6af59288a6aeb489632d64fd4a1bed80450d48e48f5ff3ea7c0d1e05d80a591c2d8d1a2c6f0c859ef8500b1f01614d83df74034782fd7bd WHIRLPOOL 52c98387ed240f94099f4587734b048fdc6899309d5b4b2f5b237fc7621ef5aa81f1a8b6602e7589ec55fbf391104db3e4451e62dbabdc55133530830dddecf1
 AUX config.layout.patch 818 SHA256 eeacaf654f23084e842bff02b97c083a8da5b5c056fd086166ba2d250edf3181 SHA512 4ff9a98c2a799c714d3b4c2cb42dd9c1cd6aa52b465570939710c0ac5800ea8806a9c38500d83b09a2bf61984d57c53ae934886d9f25e3111d721ef282a7d91e WHIRLPOOL a03f7e889a416ada14c62ca99727e2c8cba403972785c7d2282c1c914abe9c38a94b98489ec840b3c1e2cfc2af87ee08ac724d0434e8198596f7d2b44907d3db
 DIST apr-1.4.5.tar.bz2 754763 SHA256 38c61cacb39be649411cdab212979c71ce29495549c249c2e9a1b0d12480c93e SHA512 090edd67ecb571cb6b3697a37fc25da9336c6345025b25a530eaa32d1d9906bc6b2eebde9cff8b7cb6a20a0b45d9c36a69c468657ae6c1dc372e4eb181be0344 WHIRLPOOL 5bf5d859528cc470bcade626cfb2a8f39c6ad093291c09128fbd96068b9b26aeb47ee8bef77aa06d41fa4c2cbebf4f21742f3cdb9c1ced3eca4eaa0928e719fd
 DIST apr-1.4.6.tar.bz2 785724 SHA256 9b635e60feb163e6fc6c375721f71f44d7e26d6b9cd52f6b86b04e65d2481cbc SHA512 1842e2dfc9315d9dd39acd4545d80fad45dcb419c9bfb4423453ca8727aa78d864fd48f43e68a696345b4c0ee2e9eb50b3eddd96d3eaf6ed3c5d48211831b8e4 WHIRLPOOL 4d8a67dace2b7e1c41c778ad3d34f4a479f9885c0b11cd3c4be412da4e2e006765802f8756a52d97fbfe4e962302274fe0e67cd1b8ac1a673044e79fbec5dc6e
 EBUILD apr-1.4.5.ebuild 2131 SHA256 13c591ee66cdfef1d3da5fbcf18925b18f3415ede24255be1897156568d4d7e5 SHA512 392d57566c0e5ff44efcbcdc8a4a9825a0ecddc2bbd1df638a9e278a2ff9fb7d2186d5bf031a0bf5e2a7712a0df24bdc985af38e50ee8eda1983ad877e267a76 WHIRLPOOL d758fa4274a653b7a202526d2579a46978b8a0f144d5c693b3f0a7b3dd1553be4abbbc425780d5cd458d3bbb53405a7aaa2635a9cd12f02ee1ddf814da613e49
+EBUILD apr-1.4.6-r1.ebuild 3372 SHA256 955c07175b86199e9508084a1499056dbc5b29067102a6d498690cb6e1f9a62f SHA512 2fbd92db632db5a5faa2510dbfa0ef8e3c20768e3a1f8e2d59c069226bbf3402b8186a867a1a8b80790dc2319d11103d32fb00f1bc4177e2e25022411cd3e6eb WHIRLPOOL 7a23d6ef219cbd909202392721bd398d81dba0f073f7a3182bf90da84622a1112f7511e519bc2d2846a329c0025f279afd663479f36e32657176023160f29456
 EBUILD apr-1.4.6.ebuild 2138 SHA256 16b358e3787ae115fc3bd8de62356bb73b22feac889e69a57b5f4a7d8b589142 SHA512 77c9fa12cce1b61105fcfbd0bf4c6ac3714ded24b73828987b6b8c79944a21167d45bb22a41630e94153632ef73aca4112bfe29fb5f0c97de5997a203130c96a WHIRLPOOL 3b59a2d5ffc170e7a57ec80ed1ab9973e456db2dc83382e2a7985c0cf00ba5a2519b76487a338819f895d9cde5e68a894b951a3537d3c46b6c366d6c02851ce7
-MISC ChangeLog 22220 SHA256 ee9a3997d1ac55c223feaa278bd6dbd33d078228894f1ddce48bfd9c0cf96215 SHA512 6b7d27f103849c920001800706d0d3d9914f89463c669a8cabdc59216ac6f133a240f6d4b9e8b4d67dd0b8de611a86294939be196fdd87671cbcf0e075a0dcc0 WHIRLPOOL ac0d49a88e47a140faf564bb4da478f5b58192b84f2b219b68a9734f39787df9d628a253cd692c0e6b0c1e87638171141efaf516adfa800c420dc7c5fc188e96
+MISC ChangeLog 22381 SHA256 3ce3bd63ef1d99c1bc92fcd61aff60ca1ebddaf06415a57f5ba7c5c95bf05053 SHA512 78e1c9491f74d2dcb99940f785fba870995e40acf149a346bbc62a61598952a0abb1ffcf7b06daa878c27690bb8f3fc6b7045bbd119dc69a3036bd6905310db8 WHIRLPOOL e277ceac640e683de117b0af3ccc10c1b81f3bee7e1378be541086bbbf5edffcc48f737f9e1efd6f98de0634e74faa85322b640f6b1a3623f69784cdef183f8d
 MISC metadata.xml 443 SHA256 966327337370abc0213bdd1e4fc8723db10871adad7746e07e9b1ebaed188212 SHA512 b46c129b23e4ba9a27be4cf0592a80223726a38d022916a4032a00dc5ca117a15641003ecb302eed6a560c73515aa990800b80b1b48574fb58235ce8bafb5b4c WHIRLPOOL 48326ff95f79a6ddcdea9a915803497bc5a510503ee5bd91d2b7d4f5d113167784f9bdca9962b083395dbc2916846f8dbadce411dcc27a207ae211cba5a1c1e0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlC1CboACgkQCaWpQKGI+9R5ZgCaA10+1v2lCCh4q+v4W0cRa+58
-yeoAniL2UktusjYfoZ+V8suEPKFDPWtm
-=oxky
+iQEcBAEBCAAGBQJQtZXXAAoJEOeBhlrCAAWG/M4H/iXLMMGR24LWvrpPLe1LmJHK
+5IAuP+Qu7fe0GhzRsVwBixYktOwAhafqijs90S4X40TQhD3/Gs/BCS2Pl7wlNX57
+pwYdmj4bFNhySMsHfc0OVv1Bh5KZzHeRj3W/BHM1sV9MaROg5f8U/MKJav2kJHNs
+rNL1CcmzDiyGN/RnYsVLg/TJgwjydEtd5mKqbs1Ab557/qf2doqJ0ofJGqTidG0v
+p0Q1e0xctUQESS0mHkuw8ovIEzXtvA3sGI2gdJHgCcXvWz9U2FZdUo6fn3P8VbXH
+DKKzqgA5e7w5uZOAg4O86gyCVY0wpH92A3dE5od2GFNJP/eMf9Pw38SDcFwiUME=
+=NJxL
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/apr/apr-1.4.6-r1.ebuild b/dev-libs/apr/apr-1.4.6-r1.ebuild
new file mode 100644
index 000000000000..e8bda72a10ef
--- /dev/null
+++ b/dev-libs/apr/apr-1.4.6-r1.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/apr-1.4.6-r1.ebuild,v 1.1 2012/11/28 04:40:54 ottxor Exp $
+
+EAPI="4"
+
+inherit autotools eutils libtool multilib
+
+DESCRIPTION="Apache Portable Runtime Library"
+HOMEPAGE="http://apr.apache.org/"
+SRC_URI="mirror://apache/apr/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-aix ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc elibc_FreeBSD older-kernels-compatibility static-libs +urandom +uuid"
+
+RDEPEND="uuid? (
+	elibc_glibc? ( >=sys-apps/util-linux-2.16 )
+	elibc_mintlib? ( >=sys-apps/util-linux-2.18 )
+)"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
+
+DOCS=(CHANGES NOTICE README)
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-mint.patch
+
+	# Ensure that system libtool is used.
+	local g=
+	[[ ${CHOST} == *-darwin* ]] && g=g
+	sed -e 's:${installbuilddir}/libtool:'"${EPREFIX}/usr/bin/${g}libtool"':' -i apr-config.in || die "sed failed"
+	sed -e 's:@LIBTOOL@:$(SHELL) '"${EPREFIX}/usr/bin/${g}libtool"':' -i build/apr_rules.mk.in || die "sed failed"
+
+	AT_M4DIR="build" eautoreconf
+	elibtoolize
+
+	epatch "${FILESDIR}/config.layout.patch"
+}
+
+src_configure() {
+	local myconf
+
+	[[ ${CHOST} == *-mint* ]] && export ac_cv_func_poll=no
+
+	if use older-kernels-compatibility; then
+		local apr_cv_accept4 apr_cv_dup3 apr_cv_epoll_create1 apr_cv_sock_cloexec
+		export apr_cv_accept4="no"
+		export apr_cv_dup3="no"
+		export apr_cv_epoll_create1="no"
+		export apr_cv_sock_cloexec="no"
+	fi
+
+	if use urandom; then
+		myconf+=" --with-devrandom=/dev/urandom"
+	elif (( ${CHOST#*-hpux11.} <= 11 )); then
+		: # no /dev/*random on hpux11.11 and before, $PN detects this.
+	else
+		myconf+=" --with-devrandom=/dev/random"
+	fi
+
+	if [[ ${CHOST} == *-mint* ]] ; then
+		myconf+=" --disable-dso"
+	fi
+
+	# shl_load does not search runpath, but hpux11 supports dlopen
+	[[ ${CHOST} == *-hpux11* ]] && myconf="${myconf} --enable-dso=dlfcn"
+
+	if [[ ${CHOST} == *-solaris2.10 ]]; then
+		case $(<$([[ ${CHOST} != ${CBUILD} ]] && echo "${EPREFIX}/usr/${CHOST}")/usr/include/atomic.h) in
+		*atomic_cas_ptr*) ;;
+		*)
+			elog "You do not have Solaris Patch ID "$(
+				[[ ${CHOST} == sparc* ]] && echo 118884 || echo 118885
+			)" (Problem 4954703) installed on your host ($(hostname)),"
+			elog "using generic atomic operations instead."
+			myconf="${myconf} --disable-nonportable-atomics"
+			;;
+		esac
+	fi
+
+	if ! use uuid; then
+		local apr_cv_osuuid
+		export apr_cv_osuuid="no"
+	fi
+
+	CONFIG_SHELL="${EPREFIX}"/bin/bash econf \
+		--enable-layout=gentoo \
+		--enable-nonportable-atomics \
+		--enable-threads \
+		${myconf}
+
+	rm -f libtool
+}
+
+src_compile() {
+	emake
+
+	if use doc; then
+		emake dox
+	fi
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name "*.la" -exec rm -f {} +
+
+	if use doc; then
+		dohtml -r docs/dox/html/*
+	fi
+
+	if ! use static-libs; then
+		find "${ED}" -name "*.a" -exec rm -f {} +
+	fi
+
+	# This file is only used on AIX systems, which Gentoo is not,
+	# and causes collisions between the SLOTs, so remove it.
+	# Even in Prefix, we don't need this on AIX.
+	rm -f "${ED}usr/$(get_libdir)/apr.exp"
+}
diff --git a/dev-libs/apr/files/apr-1.4.6-mint.patch b/dev-libs/apr/files/apr-1.4.6-mint.patch
new file mode 100644
index 000000000000..43442da98834
--- /dev/null
+++ b/dev-libs/apr/files/apr-1.4.6-mint.patch
@@ -0,0 +1,27 @@
+diff -ur apr-1.2.11/build/apr_hints.m4 apr-1.2.11-mint/build/apr_hints.m4
+--- apr-1.2.11/build/apr_hints.m4	Tue Jun 26 23:47:46 2007
++++ apr-1.2.11-mint/build/apr_hints.m4	Tue Mar 25 12:00:14 2008
+@@ -44,8 +44,9 @@
+ 
+   case "$host" in
+     *mint)
+-	APR_ADDTO(CPPFLAGS, [-DMINT])
+-	APR_ADDTO(LIBS, [-lportlib])
++	APR_ADDTO(CPPFLAGS, [-DMINT -D_GNU_SOURCE])
++	apr_cv_pthreads_cflags="none"
++	apr_cv_pthreads_lib="-lpthread"
+ 	;;
+     *MPE/iX*)
+ 	APR_ADDTO(CPPFLAGS, [-DMPE -D_POSIX_SOURCE -D_SOCKET_SOURCE])
+diff -ur apr-1.2.11/build/apr_threads.m4 apr-1.2.11-mint/build/apr_threads.m4
+--- apr-1.2.11/build/apr_threads.m4	Thu Aug  3 11:05:26 2006
++++ apr-1.2.11-mint/build/apr_threads.m4	Wed Mar 19 08:38:56 2008
+@@ -198,7 +198,7 @@
+ AC_DEFUN(APR_CHECK_SIGWAIT_ONE_ARG,[
+   AC_CACHE_CHECK(whether sigwait takes one argument,ac_cv_sigwait_one_arg,[
+   AC_TRY_COMPILE([
+-#if defined(__NETBSD__) || defined(DARWIN)
++#if defined(__NETBSD__) || defined(DARWIN) || defined(MINT)
+     /* When using the unproven-pthreads package, we need to pull in this
+      * header to get a prototype for sigwait().  Else things will fail later
+      * on.  XXX Should probably be fixed in the unproven-pthreads package.