gentoo resync 04.02.2018

3 files changed, 46 insertions, 44 deletions

diff --git a/net-libs/qxmpp/Manifest b/net-libs/qxmpp/Manifest
index 988510f7854d..77435326501c 100644
--- a/net-libs/qxmpp/Manifest
+++ b/net-libs/qxmpp/Manifest
@@ -1,6 +1,6 @@
 DIST qxmpp-0.8.0.tar.gz 1115730 BLAKE2B 57ca5d5a9f2ce625e78572ef52210defbcdab8da69cd785f14f41e155c4239213b4d70855cb18b9c3389c679469a194e2425ff3ad0084fd31aaab871b65c45ec SHA512 b4e3afa9a4ffdc03d2baf9660986d0cf4de5c2c7d1518ad83cd9b252ff7822da66d9356eab49ce9bd642884a41ec3b72f8d4e2cda964a9276d525d4895c6165f
 DIST qxmpp-0.9.3.tar.gz 300764 BLAKE2B a98d9bd9ab9c84ce6ac90722cd1f1b1609d345daa0b4e690e44b845408753b006261b293898bf419bea011005558584de24090ac1c8809845ec6f8a5c8bb05b1 SHA512 c6ada4398468b9ce84955ab3a1ca155afe3098dfe39dc952c3675be1a1e3a4f118f8b1e251567bc124faa645d2654252d3e32d94e21aae79547056a10a2d6a71
 EBUILD qxmpp-0.8.0.ebuild 1544 BLAKE2B 9d0672f5ecfee702623c5d0adeb22aa9cdaaf70c45c24006e05721e6779fa29126a99acc1c05555b04b24b7c1a6366e385ed08d0f6e1456dd4902e91aba70d53 SHA512 6d6c09eae7acb85bdc6f8f03a0962c71f02fb4f669aff259aff601d00c8b3be17670ba44ec72cd08a488d065c882c6538eda7bcb7bd6021a12dcf8e0581d925f
-EBUILD qxmpp-0.9.3-r1.ebuild 1831 BLAKE2B f6106a674a8cc99c5cf98704b235fadde290d8d9fc82cb4178b87fcfa7cabecb29fb8f475ce4985e7471ce3e2f680daa19e0dd8248dbe6d25f34f410be5b88bf SHA512 7d96a9e6e247d2e8c6ea1d1c8edf552fee0530b7e328357f02d2082e66b53d6dfc9826657449351eca1007aff85666f695008e61b5c1c379284e68c6a5932e58
-EBUILD qxmpp-9999.ebuild 1784 BLAKE2B ba5eaaec2434eb1cd27da015f449cb5bb25f2afc2dd9e1894ca883fe6e4eb405a493122dc7cc2bb6a5f91695b8d22310560a37d295cb4845acff4b8a7e3b468e SHA512 40e0c2b35ed81dd304df95feb634164ab69012641504df03e3dd9dfeba76437644e3d9125d33535a31e7e80ec39db6ca5efdbaa49f885e405bf9b650dc79a576
+EBUILD qxmpp-0.9.3-r1.ebuild 1811 BLAKE2B 871c93e3d047f22c0fdc34a2f8959ce6a23318ea3da8a06de2d24a585f4a18d39353277479460f24f71d89a1052c99be6f2de7047d85182d8d81d1c7398ca2b0 SHA512 722a51edb36ef19736e0d6ccc77c1435d1384d1b961ca86f22ea31d30da9eb5e3a16380d29e7014982b50dc59605352adc8391725799202d60480756412c3350
+EBUILD qxmpp-9999.ebuild 1764 BLAKE2B 95e41847555283e64dc393f9f5c5e67ea5b834472f097fbc7d7cda91b1b83b83952a68bbd13f77288ce7f402a2fc2fb67dad189293c41980d954f421b24ced11 SHA512 3f3ea1f1e22b136a79ff4c8b43ae978dff96b2c6652a1a80a91f534053707182649176728e928cf6c8e6be0f8639d4433b4979c9e4acc9a61edc88af49d20531
 MISC metadata.xml 794 BLAKE2B 039cc3d356927e6f18091e93f9c39a5bd07ee255eb71d588e417bfc9d446c2d00121a316f0c86e68296631c428358bdecab8877226ffd982f82ef8d001391402 SHA512 0486690da78f6876a4dc81eec34dbcfdb63df109ed9135c9fce5fe8355f3adb216e7766def8d87870a9ece522f57b295ed48aa7cca36f7bb2a64eef7f77bb74d
diff --git a/net-libs/qxmpp/qxmpp-0.9.3-r1.ebuild b/net-libs/qxmpp/qxmpp-0.9.3-r1.ebuild
index 688a4490a702..a8bd6e94ae7d 100644
--- a/net-libs/qxmpp/qxmpp-0.9.3-r1.ebuild
+++ b/net-libs/qxmpp/qxmpp-0.9.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,34 +27,35 @@ DEPEND="${RDEPEND}
 	test? ( dev-qt/qttest:5 )
 "
 
-src_prepare(){
+src_prepare() {
+	default
+
 	if ! use doc; then
-		sed -i \
-			-e '/SUBDIRS/s/doc//' \
+		sed -e '/SUBDIRS/s/doc//' \
 			-e '/INSTALLS/d' \
-			qxmpp.pro || die "sed for removing docs failed"
+			-i qxmpp.pro || die "failed to remove docs"
 	fi
 	if ! use test; then
-		sed -i -e '/SUBDIRS/s/tests//' \
-			qxmpp.pro || die "sed for removing tests failed"
+		sed -e '/SUBDIRS/s/tests//' \
+			-i qxmpp.pro || die "failed to remove tests"
+	else
+		# requires network connection, bug #623708
+		sed -e "/qxmppiceconnection/d" \
+			-i tests/tests.pro || die "failed to drop single test"
 	fi
 	# There is no point in building examples. Also, they require dev-qt/qtgui
-	sed -i -e '/SUBDIRS/s/examples//' \
-			qxmpp.pro || die "sed for removing examples failed"
-	default_src_prepare
+	sed -e '/SUBDIRS/s/examples//' \
+		-i qxmpp.pro || die "sed for removing examples failed"
 }
 
-src_configure(){
-	local conf_speex
-	local conf_theora
-	local conf_vpx
-
-	use opus && conf_opus="QXMPP_USE_OPUS=1"
-	use speex && conf_speex="QXMPP_USE_SPEEX=1"
-	use theora && conf_theora="QXMPP_USE_THEORA=1"
-	use vpx && conf_vpx="QXMPP_USE_VPX=1"
-
-	eqmake5 "${S}"/qxmpp.pro "PREFIX=${EPREFIX}/usr" "LIBDIR=$(get_libdir)" "${conf_opus}" "${conf_speex}" "${conf_theora}" "${conf_vpx}"
+src_configure() {
+	eqmake5 "${S}"/qxmpp.pro \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="$(get_libdir)" \
+		QXMPP_USE_OPUS=$(usex opus 1 0) \
+		QXMPP_USE_SPEEX=$(usex speex 1 0) \
+		QXMPP_USE_THEORA=$(usex theora 1 0) \
+		QXMPP_USE_VPX=$(usex vpx 1 0)
 }
 
 src_install() {
diff --git a/net-libs/qxmpp/qxmpp-9999.ebuild b/net-libs/qxmpp/qxmpp-9999.ebuild
index 21806f48a186..fc67feb3c99a 100644
--- a/net-libs/qxmpp/qxmpp-9999.ebuild
+++ b/net-libs/qxmpp/qxmpp-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -28,34 +28,35 @@ DEPEND="${RDEPEND}
 	test? ( dev-qt/qttest:5 )
 "
 
-src_prepare(){
+src_prepare() {
+	default
+
 	if ! use doc; then
-		sed -i \
-			-e '/SUBDIRS/s/doc//' \
+		sed -e '/SUBDIRS/s/doc//' \
 			-e '/INSTALLS/d' \
-			qxmpp.pro || die "sed for removing docs failed"
+			-i qxmpp.pro || die "failed to remove docs"
 	fi
 	if ! use test; then
-		sed -i -e '/SUBDIRS/s/tests//' \
-			qxmpp.pro || die "sed for removing tests failed"
+		sed -e '/SUBDIRS/s/tests//' \
+			-i qxmpp.pro || die "failed to remove tests"
+	else
+		# requires network connection, bug #623708
+		sed -e "/qxmppiceconnection/d" \
+			-i tests/tests.pro || die "failed to drop single test"
 	fi
 	# There is no point in building examples. Also, they require dev-qt/qtgui
-	sed -i -e '/SUBDIRS/s/examples//' \
-			qxmpp.pro || die "sed for removing examples failed"
-	default_src_prepare
+	sed -e '/SUBDIRS/s/examples//' \
+		-i qxmpp.pro || die "sed for removing examples failed"
 }
 
-src_configure(){
-	local conf_speex
-	local conf_theora
-	local conf_vpx
-
-	use opus && conf_opus="QXMPP_USE_OPUS=1"
-	use speex && conf_speex="QXMPP_USE_SPEEX=1"
-	use theora && conf_theora="QXMPP_USE_THEORA=1"
-	use vpx && conf_vpx="QXMPP_USE_VPX=1"
-
-	eqmake5 "${S}"/qxmpp.pro "PREFIX=${EPREFIX}/usr" "LIBDIR=$(get_libdir)" "${conf_opus}" "${conf_speex}" "${conf_theora}" "${conf_vpx}"
+src_configure() {
+	eqmake5 "${S}"/qxmpp.pro \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="$(get_libdir)" \
+		QXMPP_USE_OPUS=$(usex opus 1 0) \
+		QXMPP_USE_SPEEX=$(usex speex 1 0) \
+		QXMPP_USE_THEORA=$(usex theora 1 0) \
+		QXMPP_USE_VPX=$(usex vpx 1 0)
 }
 
 src_install() {