gentoo resync : 18.03.2018

3 files changed, 21 insertions, 22 deletions

diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index 712af27d2118..6df52fcb7bde 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -2,10 +2,10 @@ AUX apache-tools-2.2.20-Makefile.patch 1573 BLAKE2B 56de28f38934b73740d68f6429f3
 AUX apache-tools-2.4.7-Makefile.patch 1695 BLAKE2B 8fac145613ac9f587e49bc6932c5712b7d7cad0d91422e11701edd24152e1d33907cbf31e3bef709555253759cea72199d4537df5d20d3ce9ca5dc898ba26779 SHA512 f597ce5503e590ed5b2621c04dcf0a571a73b70f144df7fe4e5fb7329a4f1558a5eb16913fe3d7c58ac1030f46cd2b1882e08d0f62106fbf8d40a8677c6b9448
 DIST httpd-2.2.34.tar.bz2 5779739 BLAKE2B 8cdd41fb5d1880da4a1cfef252b4682f613b938594057ea4c9665d3881a50b298fb7339c1ceb3dafc215aa927048f99d500f2d29c125016d5766954be9b632b4 SHA512 e6dac5865a48533c025fe17523ee74d68c3a23f9512c9441b78a140e33cfb6835573eb049b0ad424eb5c5ca78a1915778c54e8a409da95fbdd3890cb99e08240
 DIST httpd-2.4.27.tar.bz2 6527394 BLAKE2B 50a650eb2edd121dac860ff555273290010d7e85bf4d5fbe3683f82e1928dde99ebfabc42186436f5052a66555a73d8b797b114c76c123faa31b9f51575d0bbb SHA512 7e7e8070715b74cb6890096a74e194f4c6a49c14bda685b1ad832e84312f1ac4316ea03a430e679502bfd8e1853aefa544ee002a20d0f7e994b9a590c74bc42c
-DIST httpd-2.4.28.tar.bz2 6553163 BLAKE2B 27ccb0bda7fae6977a7e44ec220fc6ad8c027bbe14449bb5b7a560a4707c71da7cfd09923b66da9ead1d424c5062cc4a168cb53c6088ac4ff378d1b3617b3186 SHA512 8de8e32b87e6de220e492e74db9df0882fae11c3b9732f3d3316da048c04767ac4429c0433c36f87d8705263e3376f97a7e1f66a9d7a518632a67b6fe617590a
 DIST httpd-2.4.29.tar.bz2 6567926 BLAKE2B 01a83212941abad548f73fc144f9731ff51e0ed8f975e76cb994247601f7c2f89a3f862e011638afb77988eda0ef2b543634fb6bc45b583e9bdba2c30e565731 SHA512 840982fd3d21463bc5c1747f211dfacf3abdf634d149e49bb49fd2e5deda140de602dbdf31e1bbe5337a48f718ab2261c408e83a8dd39a9291ee7b6b7a85639a
+DIST httpd-2.4.32.tar.bz2 6932708 BLAKE2B 89c1aa1dec3ddb6194552aa927c5eb7f3c8d7108b5cf90c8c62fa61652212d7f77bd98c44003f2f3b1a33423dafd186b8d8f633d44651d4ab23c61e79be79562 SHA512 36718a7bcc5cd8186874fe2a83c2feb429f703147b2191b0acfe8b18bc432c40b4bf31136e743fc7fab4c35ad87c6fbd3699252f2bc58a713791460adef9cdd0
 EBUILD apache-tools-2.2.34.ebuild 1977 BLAKE2B 792d6ea010621c815a13fa89db289cdb7d2f02cd4aecca6d032e21c2bd64af7c35a66ebe3b8102eb441d12a4b6b2ca6197e16f8479d72c82606b088b97dfc24a SHA512 4a71266da0e171579c5d9da9ed681ed5600d2d94ffb15761bbd7f28b60332158959156a65b27ac295869f647f624fe598bdf2e74aa3c7f8b16fef7cbb2dc9a52
 EBUILD apache-tools-2.4.27.ebuild 2653 BLAKE2B 00b1b5e96e7eab66981fc339faf6db5e40d05af2d819c92a5faff3ad2f60c566d0235cbf60ded1d5daa79cec7815534b96b53b8e8f00333d1a814058752dd011 SHA512 e23b494555f6685f482fcecc59b5e81147780bf399de740b91bc19de9197a3d6f9d32a701472ba6551a3039214adc2e0bfd4436e0b82edb388f26d4dc88bd110
-EBUILD apache-tools-2.4.28.ebuild 2662 BLAKE2B 3325d9c0db98729d7c4d40b36ea9ecd7f15c62e0a311dc669b568b446df138766b68bbd0de0b1e76244d8f756556b4e4044c80312f6c06ae8ac5f35c66d559c5 SHA512 a23613fc1a875850df29a905f5b9f21e34ce34101779fc1e40883d1ba3c9825b9a4f60b21219fc1d330d397081cb3fccd03f14a39d6e1dd50cba907854eaa5a0
-EBUILD apache-tools-2.4.29.ebuild 2662 BLAKE2B 3325d9c0db98729d7c4d40b36ea9ecd7f15c62e0a311dc669b568b446df138766b68bbd0de0b1e76244d8f756556b4e4044c80312f6c06ae8ac5f35c66d559c5 SHA512 a23613fc1a875850df29a905f5b9f21e34ce34101779fc1e40883d1ba3c9825b9a4f60b21219fc1d330d397081cb3fccd03f14a39d6e1dd50cba907854eaa5a0
+EBUILD apache-tools-2.4.29.ebuild 2659 BLAKE2B 48107dd85d893143a68689a416ee7715ad646e6b6a4ae3f32dfc9d46e882d1fe9989ba094e7770aa71001d177dd2c551317cfa1764f114f43581b29c6418a063 SHA512 7e36abf3a069585e3fa02d0e0948e28a711c66b247debf13156e74fda65d72854a49d1e84116f4ab8138f70f1303767458f46df9dbc5eaa30a9b4abfb0047c64
+EBUILD apache-tools-2.4.32.ebuild 2584 BLAKE2B 753da88acf51594057d803cdf7d30c47cea49bc9dde0bc95101b7188f13b59db91b3b7db84422f828efb8871fd95926c58ef9902823fb8d63ee18df12bf37bbc SHA512 d3c4a5bf85c81901e18bd7649d9ee368a478a2bd4b55ad2ce4820db68a576a26ea0aedcfd98dad0d2c6c3a63bb5f177d2a40a68ca5e1cef6bac7c830b41ed258
 MISC metadata.xml 466 BLAKE2B 06dbc2df528810dc0aa7335271c987c6310ceb7d8b0db3dc74c6727c27d280e499ddd9ee75580dba63e0f33e24ce63ecfa40059a46ebdec80005769608cae82c SHA512 2820a1f104fbdc752196f600def1e0c56eed6025fa3e66b297077be7a6eb735a2009f1a57cc320e2cf0c2d6cebf9db8c338cf2c6cc9c746766ab99a0b49c63fe
diff --git a/app-admin/apache-tools/apache-tools-2.4.29.ebuild b/app-admin/apache-tools/apache-tools-2.4.29.ebuild
index 0100117927c1..aa14e94600cf 100644
--- a/app-admin/apache-tools/apache-tools-2.4.29.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.29.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
 IUSE="libressl ssl"
 RESTRICT="test"
 
diff --git a/app-admin/apache-tools/apache-tools-2.4.28.ebuild b/app-admin/apache-tools/apache-tools-2.4.32.ebuild
index 0100117927c1..83ac607083ab 100644
--- a/app-admin/apache-tools/apache-tools-2.4.28.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.32.ebuild
@@ -14,8 +14,8 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spa
 IUSE="libressl ssl"
 RESTRICT="test"
 
-RDEPEND=">=dev-libs/apr-1.5.0:1
-	dev-libs/apr-util:1
+RDEPEND=">=dev-libs/apr-1.5.0:1=
+	dev-libs/apr-util:1=
 	dev-libs/expat
 	dev-libs/libpcre
 	kernel_linux? ( sys-apps/util-linux )
@@ -58,22 +58,21 @@ src_configure() {
 
 	tc-export PKG_CONFIG
 
-	# Instead of filtering --as-needed (bug #128505), append --no-as-needed
-	#append-ldflags $(no-as-needed)
-
+	local myeconfargs=(
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules
+		--sbindir="${EPREFIX}"/usr/sbin
+		--with-perl="${EPREFIX}"/usr/bin/perl
+		--with-expat="${EPREFIX}"/usr
+		--with-z="${EPREFIX}"/usr
+		--with-apr="${SYSROOT}${EPREFIX}"/usr
+		--with-apr-util="${SYSROOT}${EPREFIX}"/usr
+		--with-pcre="${T}"/pcre-config
+		$(use_enable ssl)
+		$(usex ssl '--with-ssl="${EPREFIX}"/usr' '')
+	)
 	# econf overwrites the stuff from config.layout.
 	ac_cv_path_PKGCONFIG=${PKG_CONFIG} \
-	econf \
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules \
-		--sbindir="${EPREFIX}"/usr/sbin \
-		--with-perl="${EPREFIX}"/usr/bin/perl \
-		--with-expat="${EPREFIX}"/usr \
-		--with-z="${EPREFIX}"/usr \
-		--with-apr="${SYSROOT}${EPREFIX}"/usr \
-		--with-apr-util="${SYSROOT}${EPREFIX}"/usr \
-		--with-pcre="${T}"/pcre-config \
-		$(use_enable ssl) \
-		$(usex ssl '--with-ssl="${EPREFIX}"/usr' '')
+	econf "${myeconfargs[@]}"
 	sed -i \
 		-e '/^LTFLAGS/s:--silent::' \
 		build/rules.mk build/config_vars.mk || die
@@ -91,7 +90,7 @@ src_install() {
 
 	# Providing compatiblity symlinks for #177697 (which we'll stop to install
 	# at some point).
-	pushd "${ED}"/usr/sbin >/dev/null || die
+	pushd "${ED%/}"/usr/sbin >/dev/null || die
 	local i
 	for i in *; do
 		dosym ${i} /usr/sbin/${i}2
@@ -99,7 +98,7 @@ src_install() {
 	popd >/dev/null || die
 
 	# Provide a symlink for ab-ssl
-	if use ssl; then
+	if use ssl ; then
 		dosym ab /usr/bin/ab-ssl
 		dosym ab /usr/bin/ab2-ssl
 	fi