Utilize SYSROOT to locate build-time paths when cross-compiling, and drop redundent -L/-R libdir flags to simplify linking. Rewrite build/rules.mk to pick up current env settings rather than clobbering at make time. #385775 by Bertrand Jacquin.

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

4 files changed, 171 insertions, 15 deletions

diff --git a/dev-libs/apr-util/ChangeLog b/dev-libs/apr-util/ChangeLog
index cf11b957d4db..fe084fa8a8b8 100644
--- a/dev-libs/apr-util/ChangeLog
+++ b/dev-libs/apr-util/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-libs/apr-util
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/ChangeLog,v 1.196 2014/01/31 08:07:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/ChangeLog,v 1.197 2014/01/31 08:12:03 vapier Exp $
+
+*apr-util-1.5.3-r1 (31 Jan 2014)
+
+  31 Jan 2014; Mike Frysinger <vapier@gentoo.org> +apr-util-1.5.3-r1.ebuild,
+  +files/apr-util-1.5.3-sysroot.patch:
+  Utilize SYSROOT to locate build-time paths when cross-compiling, and drop
+  redundent -L/-R libdir flags to simplify linking.  Rewrite build/rules.mk to
+  pick up current env settings rather than clobbering at make time. #385775 by
+  Bertrand Jacquin.
 
   31 Jan 2014; Mike Frysinger <vapier@gentoo.org> apr-util-1.5.3.ebuild:
   Simplify src_compile/src_install a bit -- no functional changes.
diff --git a/dev-libs/apr-util/Manifest b/dev-libs/apr-util/Manifest
index 99269a09187b..a88662305853 100644
--- a/dev-libs/apr-util/Manifest
+++ b/dev-libs/apr-util/Manifest
@@ -3,26 +3,28 @@ Hash: SHA256
 
 AUX apr-util-1.3.12-bdb-5.2.patch 5199 SHA256 81339f327727775bb88a4530a620b0fd1f94d3fc4c0e65a810931acb638b7913 SHA512 0e3dfeac492229b6fa496a8dce4dd0706a6d189ba317c695c4e81d62711cd874faf4b248615f4ea787c4d19c28a33f46d0b7018a7006a2f962f1dde1184a363c WHIRLPOOL 711479f0dfea31e75acdcd4571880d59283b2b5ccbbcfaee22d2bf628230a085dd6319844a53c53dc18e1ed851c2004b4e3d1faa4c9f2e7a4911d67196a30883
 AUX apr-util-1.5.3-berkdb6.patch 2364 SHA256 e93792ef143f29c3baf64dea277e9dc4850a0f1989f72731a031cd30ee63c612 SHA512 d8dc0671ce24293d603acd13fbc7a3f9f65d872c2eb22cd77eaedd7244ff5fcb32c987780dd3e85578921f3519331d634e42e6dfb0554eef16fa9da33e1f0f1f WHIRLPOOL 93f960d32ba87ae2b2773845dea38fb85ff8e548f60e150bf8ac1f9563e817fdb80db466db0d4f759ccc6f83843b15737c0310b8f0719d459e484e937e919dff
+AUX apr-util-1.5.3-sysroot.patch 1234 SHA256 752ee44d3e9e39e4cba824556f829776a46e4f5e64d4f359de781d3bfd3a414f SHA512 44ee2a9cf61587f05d43976d40023f6313b310c3eeb37299840445e3faec7f0352367875f515b21d3b1fcdc8c082d8584a21cf8187deb1f6f69187c14f84f0b7 WHIRLPOOL 2017ccccfade6e99a490781100a7ca2ee1901a93b791db78291e3d7850e9916d183084abc6f46b2a80ffb451dfb5f1e999189f9ce6f994b51146563bef52a7af
 DIST apr-util-1.5.2.tar.bz2 693258 SHA256 9ace3d2e3129d5c244ef695a88b3b47897695e8e6ca2b96e92e4a635d9ed12a7 SHA512 14e890aa1a34369ddf0d041d397231e21994c0a51d3a07dd126985699184ee59c2df32dd752339dd90278988a9461c714f0a157126229be57450259646a1d6df WHIRLPOOL 94972bf43b21527015a489e640d81087021a7818fb4435b60a0b753d214e53b05630976894c81a70a069bb6918150c22df7621c63a539082a8b90ca442adce0e
 DIST apr-util-1.5.3.tar.bz2 695303 SHA256 78edb174f13e25ee15ded2b849b741a248b879a93a77a2d31c20f7e225be3968 SHA512 b03588fd10c8705ea72cb35e821a99ba160c5a480d91d766969672c72a4db5bc2ec01b13cbe0eccc1cd1eadd96e8198994296bc2f0232b3fce4e82271a382db6 WHIRLPOOL 4e3d131c2fcb5818db76c2d663caf7ab193a020011d21a1b03238075ba1ddb9778aa3df1e165cb13833efc446c81d13893a126d91e8da6cc55a5431e50f3b797
 EBUILD apr-util-1.5.2.ebuild 2863 SHA256 aac61e1f556e38f83ea97f9e88ff5d26cd9d5766061f2aaa7a21faf6baac9a19 SHA512 f59edcae1ff245467a7ad2c63f1801ac33bd7129c0ab2b1da4c60cb77c6c794aaff06fb824100763630d1a0be47c3a85ca694e3fc607fc650a5c16879381fd76 WHIRLPOOL 8933d1258dc2e23fb6a1b8bf8794f3968c0b2d83201265198132d3059864444f08a6a18c67dc201c2df8693300cb5aed5216ac054db07bf7c13d08a41dec3abd
+EBUILD apr-util-1.5.3-r1.ebuild 3362 SHA256 47f2cbe7a6ddf514c9c006572e56859de8aad827fb0e2d0e54394fd95ff264a1 SHA512 ee34dff16f6a102ec4702338e5bab44b75c56df884edbc78e44237cfd27657174b06c9ac5cce824d9ac174638af5bde41577ae722d3d89c6620b69734a3fe765 WHIRLPOOL 24a000dd8f254ce7b455d9670f32c9e3750767a65060b3778a147a8f40dffb474cdd07f1be127fb3d794beb9a97666445c99cf16bd7618477908e7fb1eec6b49
 EBUILD apr-util-1.5.3.ebuild 2876 SHA256 d09009b3f6c5c3fe1ec81ae9aaf8518f87cd4c62a707e75e0cfbc193c3690e08 SHA512 352e30904f9d0611e1c3e542f5d731eb337b20d30dfed63191a5524543e49fd99fb0f4053964cf76fb9ef50684fe0afb00ae92a1d181c60ce5124661e6f8de38 WHIRLPOOL fb330345e7fdfd8498aa37c28633ea23a2107af593de95f0cb02da21232489d394a14750d10c66a22bc25bb348e27a1a1f98d58bbdf72aca5fe9c259d3b21e01
-MISC ChangeLog 25153 SHA256 ad0de768450bf66955491648c848d6df3c24f36707f00ff6c87e259d81a4591a SHA512 08878082b935d14796bca4ab6c610a624a9b1d3ee0efafe74ecbcf79c7ce34ad60e2c650eb63d510ade97e03254de5538d3869173b0376f6416ade00cefaf708 WHIRLPOOL 309f9d9414e5900c8b920f36ccc227310bb614a3a79af4225e7b6cce6f6c9b74278a06a0a2a0816b3b6581ccefdb3c8d47e235ad487b00a3dd8d977a2af68266
+MISC ChangeLog 25558 SHA256 bb5d9188b2654548fa853b145dfd3c9e340806e23c0c06a89b111957a3f13cbd SHA512 f000287bbcbd7545b315f87538662a36d057fc4d09ff943e971f889221e56756b77cbb9813825cc82b9c9c14569ffe7a345a2fcb91efca65e8b7d1bd6883471b WHIRLPOOL 67b94e1c91408a3e1df641bc3354e572714cff9ab5dc137e635b6e1912c75c5134fbbc54cd2af8722be05709047a83f9b726b46344ad7b895f3e9e0cca0d43e8
 MISC metadata.xml 372 SHA256 c3db9ca815acd997e631711bb6ee12890e3d667ce1d95cd1edde9864f8779e2a SHA512 b48d1ab1d4f101d84dddf8e1ef4f27c1c72ca4d803d109ea926c88519c5131b999a5bb5b019e279c624e1f927ad17fce93113d2a8881be124b26d2f7d326b5ec WHIRLPOOL b3976f55407630b7dcb7eadfbde382aa66579a97db1befb80a07e1565c10731c3f1183a396a4d360b801b4e216c7a0ca3a56f57680af1fd49ffdc23722933e6b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJS61nUAAoJEPGu1DbS6WIAHaoP/3MsFYjpyU+XT7p6SIxg8aex
-bLRyMKM1zACBfJpoXBSKFiqwVBzVWUFlIrMqa0Gv6VrlYKqsAGMtubyebWtDLSBE
-jGf4UOxeJRgrNu/o4SZuNGV7J4OpcH0rqykDLbcKyhSzznmcXJTSQ20n2A+IaUjn
-Jm0AfNmz3PC8UTZak+R0cZaRrleiFL9+WXV+0k1TovuMJsv45cT5jmBOwXhDTSUJ
-O3fU+9gU44uL9EX5RUTcvP/RWiRKW9f+5s+JRTUNuSFB/H1ZTpBb4DqU/IECZ6Bm
-TidTFSA29LsWsKPFt5IzAU8rPh4XkICN8F5DApznlaFP42OxA6d9Wy2XKHuSUST/
-PAzXkmyyTnp32X5xKcZ4uBN6MtVnShtobtD9y5Lh63GHkOjhFOTHE5rPWQwBPIMV
-Wv5vhMMe9I1XwY3RuRQg0qa72OT5M2i2hjw4fJ1hTy2JoGUWPaKkTLYgAIdDVWn/
-y88JDgrmHJGIkdEE+2bRhzpop4ZIljD6nANndzO+9sBBmmVw4b/bp7z6gWa5TSLL
-dDAFyVTNAFO8+fbnyhVi+Ff77bfKB7ikKuJyAfqe3htz+9P+L5hzMIs5imlqWAmp
-aYWzRdqAAvUuwMns9CofKm4IBhI3hX9i9d5LF7BZhuRxyN9rqyrLPUYu6g/+6+ju
-uCEc4h7zCbnFEktounve
-=aouX
+iQIcBAEBCAAGBQJS61rVAAoJEPGu1DbS6WIAnoMP/0Y/0SY77qppU6if66y6I+Oc
+MSYL/Eq0GC+MWtZ8y5r+hhPWS9x1Pz70Uc287HWo+c1Ah2IaH96hqQSetrfuUqpj
+jdpDmdJ74NnnyeMlTrdxnr3JvYFWysHN0Ox1wnbPZmm78ORqXIb6BrY2BnFAe5FA
+XKiifBcdUR9T1Jh5w6NZaSNSB/iQZqZv+jYIo2JzpRc48p6pX8U3TaCJ02EZb0i7
+69O4TdyP6k1Vx+c0nsBh6f2XV42BAGJ2kvD2nLZtY3Gx5yEUvGEr0mQ7bpO/sdcH
+03pys4IRzkgSTpJpx7jpdUSrzM/YUKrawjDLpdF8wLac+97HNwHoyArmaqzAZ62B
+dtud3BYlJMMkAKeVI4uRYd0uWYV/W3iA1BML2vygiXfRa63aXhyEzar7E1FpbHmG
+1YSdCZ3wU6g/l7zBbnD7TBjsWrVqbCug3aIVLNoYXfNEwJN+u37tEWzF2l/lEnNg
+eQwIrfLKaym+7L8ZcECCvJopvNDbjs5cc8W4C1IxAwxtIZFsxDom0xed+60qsr8A
+EEJ3jmhYQyKGrgP6Xapqq7JTVqb+VRtcqeHc3qPlBjWXocoPPq2zvAFr9/Gu8SuU
+hrLtbM8VIRrqB7agLzhuJfxPWHIUfwIo8GLMbds7+/o3YS3uYZT3eaaWb4W3aFQp
+TZEErIL6aLrb5Ap7N9Zi
+=cuZ2
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/apr-util/apr-util-1.5.3-r1.ebuild b/dev-libs/apr-util/apr-util-1.5.3-r1.ebuild
new file mode 100644
index 000000000000..ee7086fdd6fb
--- /dev/null
+++ b/dev-libs/apr-util/apr-util-1.5.3-r1.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/apr-util-1.5.3-r1.ebuild,v 1.1 2014/01/31 08:12:03 vapier Exp $
+
+EAPI="4"
+
+# Usually apr-util has the same PV as apr, but in case of security fixes, this may change.
+# APR_PV="${PV}"
+APR_PV="1.4.6"
+
+inherit autotools db-use eutils libtool multilib toolchain-funcs
+
+DESCRIPTION="Apache Portable Runtime Utility 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="berkdb doc freetds gdbm ldap mysql nss odbc openssl postgres sqlite static-libs"
+RESTRICT="test"
+
+RDEPEND="dev-libs/expat
+	>=dev-libs/apr-${APR_PV}:1
+	berkdb? ( >=sys-libs/db-4 )
+	freetds? ( dev-db/freetds )
+	gdbm? ( sys-libs/gdbm )
+	ldap? ( =net-nds/openldap-2* )
+	mysql? ( =virtual/mysql-5* )
+	nss? ( dev-libs/nss )
+	odbc? ( dev-db/unixODBC )
+	openssl? ( dev-libs/openssl )
+	postgres? ( dev-db/postgresql-base )
+	sqlite? ( dev-db/sqlite:3 )"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
+
+DOCS=(CHANGES NOTICE README)
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-berkdb6.patch #476374
+	epatch "${FILESDIR}"/${PN}-1.5.3-sysroot.patch #385775
+	eautoreconf
+	elibtoolize
+}
+
+src_configure() {
+	local myconf=()
+
+	tc-is-static-only && myconf+=( --disable-util-dso )
+
+	if use berkdb; then
+		local db_version
+		db_version="$(db_findver sys-libs/db)" || die "Unable to find Berkeley DB version"
+		db_version="$(db_ver_to_slot "${db_version}")"
+		db_version="${db_version/\./}"
+		myconf+=(
+			--with-dbm=db${db_version}
+			# We use $T for the libdir because otherwise it'd simply be the normal
+			# system libdir.  That's pointless as the compiler will search it for
+			# us already.  This makes cross-compiling and such easier.
+			--with-berkeley-db="${SYSROOT}$(db_includedir 2>/dev/null):${T}"
+		)
+	else
+		myconf+=( --without-berkeley-db )
+	fi
+
+	econf \
+		--datadir="${EPREFIX}"/usr/share/apr-util-1 \
+		--with-apr="${SYSROOT}${EPREFIX}"/usr \
+		--with-expat="${EPREFIX}"/usr \
+		--without-sqlite2 \
+		$(use_with freetds) \
+		$(use_with gdbm) \
+		$(use_with ldap) \
+		$(use_with mysql) \
+		$(use_with nss) \
+		$(use_with odbc) \
+		$(use_with openssl) \
+		$(use_with postgres pgsql) \
+		$(use_with sqlite sqlite3) \
+		"${myconf[@]}"
+	# Use the current env build settings rather than whatever apr was built with.
+	sed -i -r \
+		-e "/^(apr_builddir|apr_builders|top_builddir)=/s:=:=${SYSROOT}:" \
+		-e "/^CC=/s:=.*:=$(tc-getCC):" \
+		-e '/^(C|CPP|CXX|LD)FLAGS=/d' \
+		-e '/^LTFLAGS/s:--silent::' \
+		build/rules.mk || die
+}
+
+src_compile() {
+	emake
+	use doc && emake dox
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name "*.la" -delete
+	find "${ED}usr/$(get_libdir)/apr-util-${SLOT}" -name "*.a" -delete
+	use static-libs || find "${ED}" -name "*.a" -delete
+
+	use doc && dohtml -r docs/dox/html/*
+
+	# This file is only used on AIX systems, which Gentoo is not,
+	# and causes collisions between the SLOTs, so remove it.
+	rm -f "${ED}usr/$(get_libdir)/aprutil.exp"
+}
diff --git a/dev-libs/apr-util/files/apr-util-1.5.3-sysroot.patch b/dev-libs/apr-util/files/apr-util-1.5.3-sysroot.patch
new file mode 100644
index 000000000000..ce07b1470525
--- /dev/null
+++ b/dev-libs/apr-util/files/apr-util-1.5.3-sysroot.patch
@@ -0,0 +1,36 @@
+https://bugs.gentoo.org/385775
+
+utilize $SYSROOT to find the right includedir tree
+
+drop the -L/-R paths since we know our libdir is the standard path which
+the compiler already knows how to locate
+
+--- a/apu-config.in
++++ b/apu-config.in
+@@ -25,7 +25,7 @@ prefix="@prefix@"
+ exec_prefix="@exec_prefix@"
+ bindir="@bindir@"
+ libdir="@libdir@"
+-includedir="@includedir@"
++includedir="${SYSROOT}@includedir@"
+ 
+ LIBS="@APRUTIL_EXPORT_LIBS@"
+ INCLUDES="@APRUTIL_INCLUDES@"
+@@ -166,7 +166,7 @@ while test $# -gt 0; do
+     --link-ld)
+     if test "$location" = "installed"; then
+         ### avoid using -L if libdir is a "standard" location like /usr/lib
+-        flags="$flags -L$libdir -l$APRUTIL_LIBNAME"
++        flags="$flags -l$APRUTIL_LIBNAME"
+     else
+         flags="$flags -L$APU_BUILD_DIR -l$APRUTIL_LIBNAME"
+     fi
+@@ -182,7 +182,7 @@ while test $# -gt 0; do
+         ### avoid using -L if libdir is a "standard" location like /usr/lib
+         # Since the user is specifying they are linking with libtool, we
+         # *know* that -R will be recognized by libtool.
+-        flags="$flags -L$libdir -R$libdir -l$APRUTIL_LIBNAME"
++        flags="$flags -l$APRUTIL_LIBNAME"
+     else
+         flags="$flags $LA_FILE"
+     fi