Generate & use local libtool #374355 by Justin Lecher.

Package-Manager: portage-2.2.8/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

4 files changed, 154 insertions, 15 deletions

diff --git a/dev-libs/apr/ChangeLog b/dev-libs/apr/ChangeLog
index 79d82e17f9ea..fbc92bbfe5f0 100644
--- a/dev-libs/apr/ChangeLog
+++ b/dev-libs/apr/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/apr
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/ChangeLog,v 1.203 2014/01/21 00:12:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/ChangeLog,v 1.204 2014/01/22 21:22:43 vapier Exp $
+
+*apr-1.5.0-r1 (22 Jan 2014)
+
+  22 Jan 2014; Mike Frysinger <vapier@gentoo.org> +apr-1.5.0-r1.ebuild,
+  +files/apr-1.5.0-libtool.patch:
+  Generate & use local libtool #374355 by Justin Lecher.
 
   21 Jan 2014; Mike Frysinger <vapier@gentoo.org> apr-1.4.8-r1.ebuild,
   apr-1.5.0.ebuild:
diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest
index 2c9a76a7f280..80f34f851c1a 100644
--- a/dev-libs/apr/Manifest
+++ b/dev-libs/apr/Manifest
@@ -2,28 +2,30 @@
 Hash: SHA256
 
 AUX apr-1.4.6-mint.patch 1200 SHA256 d1d8217efbf87f136ece47d06e224f23a585b1634d70a911c88778b8503b3d71 SHA512 531961bcd79850a4b6af59288a6aeb489632d64fd4a1bed80450d48e48f5ff3ea7c0d1e05d80a591c2d8d1a2c6f0c859ef8500b1f01614d83df74034782fd7bd WHIRLPOOL 52c98387ed240f94099f4587734b048fdc6899309d5b4b2f5b237fc7621ef5aa81f1a8b6602e7589ec55fbf391104db3e4451e62dbabdc55133530830dddecf1
+AUX apr-1.5.0-libtool.patch 514 SHA256 ec0cdc67b471da2666aeeb8d9b344320392331f79a123bfbc405c440c50ebce6 SHA512 e8c2a7a2b5c8171a0d2c8920e053bd861e4fb2044428cb3f6ffc9ccea05694c20b879411f86b967c4269918b5740b1450ecb0e720d74ea0fe9ac305f58ee88d5 WHIRLPOOL e0b7a06cf78a3eb1930639ea7e7d38c962ff847b990714e042e2d107575b4b26979198fbfec62bba5500b323caf0a01584e00b1bbc907fdc67cbaf8e6f3d2ec4
 AUX apr-1.5.0-mint.patch 872 SHA256 6ed43adba05db07f061d98f73c19aac0df3d9c0aafd86cf57c9ab4fdc851659a SHA512 ba71f17ef9f61a8379139f05ca17eb583ad34cbc3ebf5c4f59d011662db6b5c963da5c466c093c3eb98372299d8f202d927a05b52cc7515270ac52fe44ec6daf WHIRLPOOL 60966adf15e5301600f870ece96d34d4dd26d3e7dc99bb447f2afc1a86f7a46ef3bdf24613027636707b2fd5ac2f2bdd956a8eeb3b088b27862d7e86090b5db1
 AUX config.layout.patch 818 SHA256 eeacaf654f23084e842bff02b97c083a8da5b5c056fd086166ba2d250edf3181 SHA512 4ff9a98c2a799c714d3b4c2cb42dd9c1cd6aa52b465570939710c0ac5800ea8806a9c38500d83b09a2bf61984d57c53ae934886d9f25e3111d721ef282a7d91e WHIRLPOOL a03f7e889a416ada14c62ca99727e2c8cba403972785c7d2282c1c914abe9c38a94b98489ec840b3c1e2cfc2af87ee08ac724d0434e8198596f7d2b44907d3db
 DIST apr-1.4.8.tar.bz2 772927 SHA256 61b8d2f8d321c6365ee3d71d0bb41f3a89c44da6124cc5b407a3b8319d660421 SHA512 48483647fd958cae6b27672cfe10d3905fd2d4280b686a64deb5e166c239aa7d9838d61a199b5db836c47e63acebee9fa95804d60543cb581fef87bcc150c15b WHIRLPOOL c0e3e17470970734cd36b1b72837b3ed39e0488ef4291eb3a3f9482dffabb72aab85b4d9a8482d9c4cc3a66ce530bd81e8076b98e1fa10b086089266fa9b2f0a
 DIST apr-1.5.0.tar.bz2 813976 SHA256 17287d36a5917e27281e60d47e7b147bd5ddcd1ca832702c2318f5e0724f1221 SHA512 d54d995a67fe13a619d4781cbfcfae07679d15defa49634ee472c6a93f9521f7964e6e3e366188f1817c01a8fdb98b4ff042e56d8bd9bc379683d6c4ccff2a3e WHIRLPOOL 083da7589f85fb2212b4ced33004ee30848a40cf4718de36a21dfcba15b794dc9b57a9324cdd400e2df74564f9ad27899119de55075f1e0285415471b47f90e7
 EBUILD apr-1.4.8-r1.ebuild 3438 SHA256 b62a9787c5108fbbd88e2e76ca6e746bfff3ef51b8bf31c788ea609ebbe02ba9 SHA512 51f19448bd1fecbefea598536a96c1c21324de4c3d05420e19529e05f2a3e503ed12fc9253d04407ff3fe2bc5bffcfb5f545bc28b2353e48dae598d67f7e166b WHIRLPOOL 1ba0a1888e213ffc16c0fcae49e20e72bed70a3c1ec3e3028676f5dd214532ea05ab6ef018ca55b2ad75249943ddcf01d236012cf5ce70886136c893cc1935db
+EBUILD apr-1.5.0-r1.ebuild 3170 SHA256 c74cf591cef785a6bc6c08e417b71ddbd9d0c27347b11afe5f895dc29818b188 SHA512 fa4f9910fe1a496129df344748c31aff49fdb71218a80b1cca913db7029116dd3865ee7f98382ef204230b4e22e2606ec8e67af2208057ad6a8b5611e758ff19 WHIRLPOOL 88f89f2f6c57c1713b861b7b88410bb10e569f614a60caa753a0d54017a5c338aa6039304b5fdaeea632b852ebc390fe60bdb5ba65bc118dfec7fbfdff8b84cc
 EBUILD apr-1.5.0.ebuild 3445 SHA256 871d4eab5eb371f8991fc99176599967186bcaf6f15a3d0ef0b341632de704ff SHA512 bf47a226f449cc4b74de3ad59b20adfa2e5823ff70497cef0ce73f0a643b377acdc8ac57b29c766b24d3b0a8ac0b29c78f50387dd80b02659e604b6ac3952ea5 WHIRLPOOL cf063dc0e06b3718641b7df718b6e52836cfac542ed490831ca0b841bcc2be9b75f1f2ba873d94ed4e9e24e873c74538c49e81166b983f2246b1e1d0dea06367
-MISC ChangeLog 24419 SHA256 3d1b4005818129183dfc0dbc40c671fa982eb6d1425c3962e466cd47e41d9fa5 SHA512 0fb33fabb106bb204c97680c4cb6311ba10f3002c865a996a0a4a9b9bcd2c1f51197e83dace3e9c8d5a3ed508eccd7cd63d85c4c4914576b9d367d8d6a72a08d WHIRLPOOL c556090c977c5dce6b8eab2cb9ca7658a5b19d394519504c8a0bbd32e16407456a43c5ef064dd49b561e1e66dc6dd3ba9f98fa359f54eaab5019adccd89013c6
+MISC ChangeLog 24612 SHA256 c22904b8913bcc76dbab9eaa84a0334342ce1879830dfe67f7a89ab13ba71c71 SHA512 f6a3e16bde9483b35ceb16220f4d955a7b893a903dbe00e95a33fd79e53ac32e726ab77444e1a89e204fb6dd2c89c9639626d130abd5ea1be80f502deb5f98fd WHIRLPOOL 550187ff446a37920e8ec8a69803794f74be335a45690ea12deec96a9bf7640f7ba2206f508f4e761867d6b85322e48990580a4997a4ccf1b987efc1d8cf4674
 MISC metadata.xml 419 SHA256 803186ba5a9a84cf3fdf02db9c8922c4e63d75608268b352da2d68ba0249d5ec SHA512 85d64dc3256516cb3a46e01861d684384a108035744cc34615b7de23aa09847f8eafeec198b6135a6df100be5d6de02f0cea65815c617af1e252e87f95002274 WHIRLPOOL 532f9e3d27dcbc0b521bab043487f13b2bf7daa9a49b11760b1aa0610d30c1d62d39c940f545a8a3754e8f08ec041d428b4b98b6ebea45579073d6c12a43c30b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJS3btdAAoJEPGu1DbS6WIATBEP/AsWLbjIQyamHXKZRRoahRkq
-iQDl7Zp5DGgK0snKb7cg/Pix5N93FlRFsvgg3xvhET8U/5eNvO+SlOuk0jVzcRJe
-ckO5YshQ2gdbq/CXJ7xFxA70BTnooDRmBUKJzUU3CBrzvzFPyMhO/8FCefCb7v7I
-ll79Gm95jTel/iu8AhSbz89XNBQIrHVW3N600MyuTVucR/FxevwICFp7RUJSdRBH
-nBzl2jfccuwolRQQqM58YymSiyj4Dvy/n9GFLc+iKAjkVzGKT9itIUOtGilpmQlK
-H132MbcG8L8WduVFjl0MRHSzJZzA9dAYSnl1mCNyWX2MnY4eAI+/WFaIhZkBPhXX
-k3Ey9kqoxQSxqDOxPy0o1VIJ30z98c5jG1RKssCOWYOQz9Y0Yp3USThmgAfezjjz
-bsA9BPtiVq5af2wqETeHdm5eKc12gLQBOFxp/MrGKhZoJSmjqAzkl8h/vEgEUQq1
-mcAZE+FtA0eY6GcMFujap7M2CX7+gXdkGSfyUN4+5pwa3nzm65tI8D3Z5IrqCH6q
-8MmM1eeQ16jUUEFYaVIaMjmbOElM3OOc4arcfU2ZP8zRyboqNxwL2GFW79zI/Dd/
-EV8Z1ZsoKIYgPopQCICdrB5Cyn4b+cfc1FbthCZ+cVy3/p/riOGLDbf7mnMmsUM9
-DX0IGlw3J0F0PPk3reKH
-=RH0l
+iQIcBAEBCAAGBQJS4DaoAAoJEPGu1DbS6WIAjEMP/0+zR3MQ1l/HZ26duUUVSRea
+hNML2wKb9OtYv6DYwIVlJ345DM8lNuM9JAEFjUAjrT6lQXFI17oDv93Ulmvh/AN8
+SWUUIpT7JnxL4hls+lf40pQQhF7jT1kfnKUAalgFsr7RrCwN7Yb3LQIhlJ0UAF8m
+tjTAmMUCkdPrUojTyDLRP2qHekWlYFJbRAXy//T1qESOT+AxJasUD5Y9G7SZLYdH
+5JktGDBw5a8rA3KCdNGpepwtJxf1op1D+ef7dtybvI5051AYw6+Q2WtroGK8LJon
+Q3wya7KI+DD8iMIdkZjdm29AGdkdySk8zNOnNxuuYFvgok16PdB/HABjWTG1C5J6
+H4C8hCGvatFpANp67K9DVxg/VI3e+Zik1rsqUlEfOj6sJ5ZLYIwNSAzLTf+cZaVD
+NjYOaH/lb/qHFELGlN/VeuJ9zAOUr6tGFhWNap3XDStG1Yv+36roknEEvsRqRvYO
++aVK2jPVAKC8WEgKR3rjb6ahxIRCPQXX9YTwSj/reUVJY1PPpZtIKSfwSlD/LAJj
+qSY7DebVQlOELtWLtZfPialBypj4t8w9KjNIn7B23qrfYEAk2TyrU+2b7lJY4utZ
+Ap3QDXZ9UrojfjYR1TtrsB9kXnx12dYHiNWUaxXHTlpqFbBAepyZdvqEeqEjllor
+E673y5NSMix27ZOWR5VN
+=C0iq
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/apr/apr-1.5.0-r1.ebuild b/dev-libs/apr/apr-1.5.0-r1.ebuild
new file mode 100644
index 000000000000..da1613feca6e
--- /dev/null
+++ b/dev-libs/apr/apr-1.5.0-r1.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/apr-1.5.0-r1.ebuild,v 1.1 2014/01/22 21:22:43 vapier Exp $
+
+EAPI="4"
+
+inherit autotools eutils libtool multilib toolchain-funcs
+
+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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-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"
+
+RDEPEND="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}"/${PN}-1.5.0-mint.patch
+	epatch "${FILESDIR}"/${PN}-1.4.8-libtool.patch
+
+	# Apply user patches, bug #449048
+	epatch_user
+
+	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 tc-is-cross-compiler; then
+		export apr_cv_tcp_nodelay_with_cork="yes"
+	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
+
+	CONFIG_SHELL="${EPREFIX}"/bin/bash econf \
+		--enable-layout=gentoo \
+		--enable-nonportable-atomics \
+		--enable-threads \
+		${myconf}
+}
+
+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.5.0-libtool.patch b/dev-libs/apr/files/apr-1.5.0-libtool.patch
new file mode 100644
index 000000000000..5368a2689bdf
--- /dev/null
+++ b/dev-libs/apr/files/apr-1.5.0-libtool.patch
@@ -0,0 +1,17 @@
+generate a local copy of libtool for use in compiling
+
+https://bugs.gentoo.org/374355
+
+--- a/configure.in
++++ b/configure.in
+@@ -260,9 +260,7 @@ case $host in
+         fi
+     else
+     dnl libtoolize requires that the following not be indented
+-    dnl should become LT_INIT(win32-dll)
+-AC_LIBTOOL_WIN32_DLL
+-AC_PROG_LIBTOOL
++LT_INIT(win32-dll)
+         # get libtool's setting of shlibpath_var
+         eval `grep "^shlibpath_var=[[A-Z_]]*$" $apr_builddir/libtool`
+         if test "x$shlibpath_var" = "x"; then