gentoo resync 08.09.2018

7 files changed, 35 insertions, 12 deletions

diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest
index 35c6959dd722..e15e3b0f85a0 100644
--- a/dev-libs/apr/Manifest
+++ b/dev-libs/apr/Manifest
@@ -3,13 +3,14 @@ AUX apr-1.5.0-libtool.patch 514 BLAKE2B b9d33d1317293c7614a3f0f753e466c7f8acf079
 AUX apr-1.5.0-mint.patch 872 BLAKE2B dda2941cbed87117a8a6c488bd8045894686aef0ba219ff489f67dd03b58fb07a05f9e67c54cdff330c65e579c41c992446a465104661bbacbb2525a5b9518eb SHA512 ba71f17ef9f61a8379139f05ca17eb583ad34cbc3ebf5c4f59d011662db6b5c963da5c466c093c3eb98372299d8f202d927a05b52cc7515270ac52fe44ec6daf
 AUX apr-1.5.0-sysroot.patch 1309 BLAKE2B de3dc13a44a9d5071c249875322b7d6be9ed765176f8232b96a5e5088c5764dff8b810377b214999b59380522fdc9d0577217fe1acff5a7ab4b17461d6daf909 SHA512 48609c522225b47df96039174dafa043f77ce5b91f464b14250dd2b30590d6685c9baa03d4ca34937532c26afea8d208fb78158dfc8026a606ff90543b5c8d5d
 AUX apr-1.6.3-fix-overflow-check-in-overflow_strfsize.patch 567 BLAKE2B 7a41d3aeb1e69af2a90bc55ac5aeb1e8395c5b0f6ff569f65f88de15c29c1df794415526b1ef13ca2deedfe48f8801e93b2eca655086518d9cd7bc5159252d1a SHA512 d2c4e0fbd9d4b909669820c30642c34de51b87edfc746875c0743430a7cc2599b68a037a6146f9c0f49d8e78844617c392819367636e2b6175bd919fce5ec5a8
+AUX apr-1.6.3-skip-known-failing-tests.patch 512 BLAKE2B 29607bce9a35853d824f8872557f361f3d5ffa0f2c7cd35e06cbf4d449e54f1b12978c0220b8ce4ae5d590ee9e04b5cd77af22876e3880deef115efbeb5a1dcc SHA512 ac097d28d5ae0b2437522da0578ff8bd049190d8df576e4e5298426f827b2bf69891e4f33bd1ffaf1a3c53143927e71f10d8362567121faa03cdf908d4fbc6c2
 AUX config.layout.patch 745 BLAKE2B 9877db3d76339b70f2bd354d118eff0df4d63bc81e4af9e65169c1c5862c3fa3532cc02df8e084b540e7a81091c3b16d50388c6234cba469b15fff896d0428fc SHA512 3a87e718859c8f95793f828b764d240907d65c21fe2c99143815ab835f8b657154092c4ad496e86d79490bd85ef03d394d3acb57a15186f2f06a518b32d77fdf
 DIST apr-1.5.2.tar.bz2 826885 BLAKE2B 62953c31cd6cb9a80142cf65f791543febffd1716d9e4babd55c8010c6fc6e60ba3c287b21e146c19446185c03407f3990d862a0b9816039c2d1b7158ac90cd3 SHA512 d1156ad16abf07887797777b56c2147c890f16d8445829b3e3b4917950d24c5fd2f8febd439992467a5ea0511da562c0fb4a7cfd8a235ab55882388bfa2b919d
 DIST apr-1.6.2.tar.bz2 853363 BLAKE2B 99ff559a5a974c1cd116dbaa65a03c731ed8cdb4393c395b66daee3d6217f17ff1c895dc1cba498b0244f32b8b00dccc76f2d84a5b3dde053458e7557753e446 SHA512 20f449fde522f186b919b64ce6f90073b267557e17438607d31af917eca7941222dd7a7379d66f1430ff68f7e28fbccd140d24f3ca7aae8a876a550b19de284a
 DIST apr-1.6.3.tar.bz2 854100 BLAKE2B ac3d38ef201d92bb2e50a35b6f41de6120e6196f1412377eae56f013dfebbe7fe8461fcd4e5e82be275bde51253a7f1c5f708e780203382b64fe61637d97226c SHA512 f6b8679ae7fafff793c825c78775c84a646267c441710a50664589850e13148719b4eab48ab6e7c95b7aed085cff831115687434a7b160dcc2faa0eae63ac996
-EBUILD apr-1.5.2.ebuild 4088 BLAKE2B 42d181fe7480bffff9577aff115731ac62e70513ee49fe459db6d82ac62431ac2323c698d139285449defe377c7fd90c586342773fb05722003cd4075807f165 SHA512 1675f275f3c37a3141f73434ec17ba6841f153c6a12edc20997f9cf5da462126cdc77d5ff7a625b0a3c9ef8e08480163c6b004ccd374d8e96f6a2a19df1fc775
-EBUILD apr-1.6.2.ebuild 4079 BLAKE2B 0760c6a464e2ba6006a815d335aeb37a8319b6513252d113c65713417cbad361a892d1da65d63eeff7341881724f5790273b326116927e1c70acac8aa054c0e0 SHA512 b0d0cd2ae97fb8d3622d891385f17a2b2098b55278563880d4062f0014ea1831478cbd9363c898431a3073d7340332c3406e55c08eb075752865b021b63d29c6
-EBUILD apr-1.6.3-r1.ebuild 4125 BLAKE2B 554bcdbfb44ade141ca48850d4c62bda067feb802b03f38d1a8b6d46a8f20fed1cf9e3498c54dee16e18bee1ad62df6687ef4839b1c6f5f92fea783a6d2b63a9 SHA512 8b53c6e0b587f63b75cd31099fdadeb4e410a1d825dd681ad0e3f9553a58c02dd1eb3dca47cacd580a925a46e9273c294d1e40f6a5b748d420b38f3e19e53fda
-EBUILD apr-1.6.3-r2.ebuild 4271 BLAKE2B 57587f147574e6898f5996bd8322561ef072975ce258ac4d6791a41a5a961b816164eba98a8d563185a8f3b193ab6314208aae3bec5cfabe17b5e5a149545574 SHA512 cd39d77617d53364bb0cd3a586760b983016f5c14fe0eb63be16ef95e0f4b690e2a022818965ec1fa9f8d12ba77843717746db8b7bec6e6a71ed8c638602c633
-EBUILD apr-1.6.3.ebuild 4079 BLAKE2B 0760c6a464e2ba6006a815d335aeb37a8319b6513252d113c65713417cbad361a892d1da65d63eeff7341881724f5790273b326116927e1c70acac8aa054c0e0 SHA512 b0d0cd2ae97fb8d3622d891385f17a2b2098b55278563880d4062f0014ea1831478cbd9363c898431a3073d7340332c3406e55c08eb075752865b021b63d29c6
+EBUILD apr-1.5.2.ebuild 4077 BLAKE2B f9bdb8503c2101780f101db394a12040118f8f91a6ebc7a3d08899eff715d4065291b07fb9b662edc586807305edfa64ed2b0983efbdb074cb8733a91acc4e09 SHA512 4d5b178bff085c61704037f87d00b28fd51b588928d870a61670e2b171891316ac29584b2afaac38d0237a301d156eb0ebc316010f1695e5b8a8f268a68b1b3d
+EBUILD apr-1.6.2.ebuild 4068 BLAKE2B e665cec8463d6e075380298918963cce92dadabb51f93273b0c898d7f00ae35ba1301d8f96cf78e0a2e25e0727b421f06cf1aa2e20a7c02954edb119bf9ecac9 SHA512 109a0f00e9a0a6435ae2b7482ffbe6013e7f00ea2ff247e47e0ba7f374a3e9ff67720f112c486c8ea4abdc3bbca4f7bf5143aab3069e6ddcf2ce5b286e19d4ff
+EBUILD apr-1.6.3-r1.ebuild 4114 BLAKE2B 42f93b5c1b11dca5a1273ffe319b481165275f55dccee9fdb77877e814fa7a48b478fa8e2cb8f77ea15290f102220b6d97989504af10d977e1d835d7973cc1eb SHA512 0dcdc9c9ffc2247add035f7ae5304a5b777c73dab39aba37b7fc7da1e12fb8781abe10b93e6d32e93bd418ad222ed0c1c822864ea215fdd874ddfa5ac8c3ec91
+EBUILD apr-1.6.3-r3.ebuild 4404 BLAKE2B f4abe4650467f7142ef6145bd42812f409e5d666ca10849d3f18e3cf431c18d8615e102d7e23af2d60b29a3373a69c69349c461d97677834a6e13e9818065b6e SHA512 dd2afd6aff0084375818cfe9ce5177ab50eaacbc26ad705c4c1ace722c9b9f5bc1850461e987bc925ebe1af61a62b443bf03a902537d6a53426886a8e61cab00
+EBUILD apr-1.6.3.ebuild 4068 BLAKE2B e665cec8463d6e075380298918963cce92dadabb51f93273b0c898d7f00ae35ba1301d8f96cf78e0a2e25e0727b421f06cf1aa2e20a7c02954edb119bf9ecac9 SHA512 109a0f00e9a0a6435ae2b7482ffbe6013e7f00ea2ff247e47e0ba7f374a3e9ff67720f112c486c8ea4abdc3bbca4f7bf5143aab3069e6ddcf2ce5b286e19d4ff
 MISC metadata.xml 433 BLAKE2B 5c4d90e1cdc1424b0be48c81e249e5c3fa6740998cc37c52a164c25238bc7c20ca6a2c4a4924ccd076aaaa74c7655d95d5526a3d110fc0a10b931d9c41de4060 SHA512 7a1b6a73160b108816332f90e4e540f555e748584925ac3c7bb303ce5b6328abf255fc3f1c2b0e13f3c5d763841e847e400e781764083e3e96bc3809871a0df6
diff --git a/dev-libs/apr/apr-1.5.2.ebuild b/dev-libs/apr/apr-1.5.2.ebuild
index 2c9101846cca..32175989515a 100644
--- a/dev-libs/apr/apr-1.5.2.ebuild
+++ b/dev-libs/apr/apr-1.5.2.ebuild
@@ -11,7 +11,7 @@ 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 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 selinux static-libs +urandom"
 
 CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )
diff --git a/dev-libs/apr/apr-1.6.2.ebuild b/dev-libs/apr/apr-1.6.2.ebuild
index 0c823dc89014..67376760d717 100644
--- a/dev-libs/apr/apr-1.6.2.ebuild
+++ b/dev-libs/apr/apr-1.6.2.ebuild
@@ -11,7 +11,7 @@ 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 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 selinux static-libs +urandom"
 
 CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )
diff --git a/dev-libs/apr/apr-1.6.3-r1.ebuild b/dev-libs/apr/apr-1.6.3-r1.ebuild
index ba7eb74e48bf..b158e12bf637 100644
--- a/dev-libs/apr/apr-1.6.3-r1.ebuild
+++ b/dev-libs/apr/apr-1.6.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1/${PV%.*}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 selinux static-libs +urandom"
 
 CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )
diff --git a/dev-libs/apr/apr-1.6.3-r2.ebuild b/dev-libs/apr/apr-1.6.3-r3.ebuild
index a874140ae17b..fd6717d9db75 100644
--- a/dev-libs/apr/apr-1.6.3-r2.ebuild
+++ b/dev-libs/apr/apr-1.6.3-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit autotools libtool ltprune multilib toolchain-funcs
+inherit autotools libtool multilib toolchain-funcs
 
 DESCRIPTION="Apache Portable Runtime Library"
 HOMEPAGE="https://apr.apache.org/"
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1/${PV%.*}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 selinux static-libs +urandom"
 
 CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )
@@ -30,6 +30,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.5.0-cross-types.patch
 	"${FILESDIR}"/${PN}-1.5.0-sysroot.patch #385775
 	"${FILESDIR}"/${PN}-1.6.3-fix-overflow-check-in-overflow_strfsize.patch
+	"${FILESDIR}"/${PN}-1.6.3-skip-known-failing-tests.patch
 )
 
 src_prepare() {
@@ -49,6 +50,7 @@ src_configure() {
 		--enable-posix-shm
 		--enable-threads
 		$(use_enable static-libs static)
+		--with-installbuilddir=/usr/share/${PN}/build
 	)
 
 	[[ ${CHOST} == *-mint* ]] && export ac_cv_func_poll=no
@@ -139,7 +141,9 @@ src_install() {
 	# Prallel install breaks since apr-1.5.1
 	#make -j1 DESTDIR="${D}" install || die
 
-	prune_libtool_files --all
+	if ! use static-libs; then
+		find "${ED%/}" -name '*.la' -delete || die
+	fi
 
 	if use doc; then
 		docinto html
diff --git a/dev-libs/apr/apr-1.6.3.ebuild b/dev-libs/apr/apr-1.6.3.ebuild
index 0c823dc89014..67376760d717 100644
--- a/dev-libs/apr/apr-1.6.3.ebuild
+++ b/dev-libs/apr/apr-1.6.3.ebuild
@@ -11,7 +11,7 @@ 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 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 selinux static-libs +urandom"
 
 CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )
diff --git a/dev-libs/apr/files/apr-1.6.3-skip-known-failing-tests.patch b/dev-libs/apr/files/apr-1.6.3-skip-known-failing-tests.patch
new file mode 100644
index 000000000000..79efb502a8d0
--- /dev/null
+++ b/dev-libs/apr/files/apr-1.6.3-skip-known-failing-tests.patch
@@ -0,0 +1,18 @@
+Skip testlfs test which only runs on non 64-bit systems and fails
+on Gentoo due to a sandbox issue. Bug #603244
+
+--- a/test/Makefile.in
++++ b/test/Makefile.in
+@@ -172,7 +172,11 @@ check: $(TESTALL_COMPONENTS) $(STDTEST_PORTABLE) $(STDTEST_NONPORTABLE)
+ 				fi; \
+ 			done; \
+ 	        else \
+-			./$$prog -v; \
++			if test "$$prog" = 'testall@EXEEXT@'; then \
++				./$$prog -v -x testlfs; \
++			else \
++				./$$prog -v; \
++			fi; \
+ 			status=$$?; \
+ 			if test $$status != 0; then \
+ 				teststatus=$$status; \