gentoo resync : 11.02.2018

4 files changed, 82 insertions, 8 deletions

diff --git a/net-libs/qxmpp/Manifest b/net-libs/qxmpp/Manifest
index 77435326501c..f2672806aac7 100644
--- a/net-libs/qxmpp/Manifest
+++ b/net-libs/qxmpp/Manifest
@@ -1,6 +1,7 @@
 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 1811 BLAKE2B 871c93e3d047f22c0fdc34a2f8959ce6a23318ea3da8a06de2d24a585f4a18d39353277479460f24f71d89a1052c99be6f2de7047d85182d8d81d1c7398ca2b0 SHA512 722a51edb36ef19736e0d6ccc77c1435d1384d1b961ca86f22ea31d30da9eb5e3a16380d29e7014982b50dc59605352adc8391725799202d60480756412c3350
-EBUILD qxmpp-9999.ebuild 1764 BLAKE2B 95e41847555283e64dc393f9f5c5e67ea5b834472f097fbc7d7cda91b1b83b83952a68bbd13f77288ce7f402a2fc2fb67dad189293c41980d954f421b24ced11 SHA512 3f3ea1f1e22b136a79ff4c8b43ae978dff96b2c6652a1a80a91f534053707182649176728e928cf6c8e6be0f8639d4433b4979c9e4acc9a61edc88af49d20531
+EBUILD qxmpp-0.9.3-r1.ebuild 1810 BLAKE2B ba6cdb9018c63d63371bf62a41bfc391a1c692637f15e8c9c308c400632206ce56ce0bcbf291a77da41cca82b104ac85b46aa8c59d6e6f5a2c3a49ad7bf410d6 SHA512 9ca034a48fe78c2ec2051703cc94ada28b191b0c62ea5d171926ced915013996f380be6ee4de37ebde2b8f34866762e3c871b2211d8d0b76e56a25ededea0f84
+EBUILD qxmpp-0.9.3-r2.ebuild 1817 BLAKE2B 2940ff875beccf601d933c25bac8c3ef9f6f1749e22ee5acad30363e8a6332f11fc7c16dc222b89e457f6ed7f07c4a58a487cc3af6acb5ae4d27ef4adff2dc2c SHA512 b31e554f049fa4ed46ea17bfa453d1c9ab11287bef69aa5996ff1220b6542792e1a684bcf6d9e0747d4369139d4c15b3afdccf25fe959edf29d9152fc8e771be
+EBUILD qxmpp-9999.ebuild 1770 BLAKE2B 8d0527aae9d208fd4272fbcde1dd3594a20a061233fc397cf602908aa938b687889888be6c9c0633376bdb35ad17b62e54e80542d5d7f71f7bcabfcfc9c756be SHA512 82826b15736b6f8b05ffe41dce048ca56ee321d6b2ea2bf9ed58908260091ce1f963d5ab3a4c3e1d7496991d926088bfe1030245d10eb7abf4cd0da6358fed8a
 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 a8bd6e94ae7d..39351093613e 100644
--- a/net-libs/qxmpp/qxmpp-0.9.3-r1.ebuild
+++ b/net-libs/qxmpp/qxmpp-0.9.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}-project/${PN}/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 x86 ~amd64-linux"
 IUSE="debug doc opus +speex test theora vpx"
 
 RDEPEND="
diff --git a/net-libs/qxmpp/qxmpp-0.9.3-r2.ebuild b/net-libs/qxmpp/qxmpp-0.9.3-r2.ebuild
new file mode 100644
index 000000000000..6559c0669396
--- /dev/null
+++ b/net-libs/qxmpp/qxmpp-0.9.3-r2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit qmake-utils
+
+DESCRIPTION="A cross-platform C++ XMPP client library based on the Qt framework"
+HOMEPAGE="https://github.com/qxmpp-project/qxmpp/"
+SRC_URI="https://github.com/${PN}-project/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE="debug doc opus +speex test theora vpx"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtxml:5
+	opus? ( media-libs/opus )
+	speex? ( media-libs/speex )
+	theora? ( media-libs/libtheora )
+	vpx? ( media-libs/libvpx:= )
+"
+DEPEND="${RDEPEND}
+	test? ( dev-qt/qttest:5 )
+"
+
+src_prepare() {
+	default
+
+	if ! use doc; then
+		sed -e '/SUBDIRS/s/doc//' \
+			-e '/INSTALLS/d' \
+			-i qxmpp.pro || die "failed to remove docs"
+	fi
+	if ! use test; then
+		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 -e '/SUBDIRS/s/examples//' \
+		-i qxmpp.pro || die "sed for removing examples failed"
+}
+
+src_configure() {
+	eqmake5 "${S}"/qxmpp.pro \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="$(get_libdir)" \
+		QXMPP_USE_OPUS=$(usex opus 1 '') \
+		QXMPP_USE_SPEEX=$(usex speex 1 '') \
+		QXMPP_USE_THEORA=$(usex theora 1 '') \
+		QXMPP_USE_VPX=$(usex vpx 1 '')
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	einstalldocs
+	if use doc; then
+		# Use proper path for documentation
+		mv "${ED}"/usr/share/doc/${PN} "${ED}"/usr/share/doc/${PF} || die "doc mv failed"
+	fi
+}
+
+src_test() {
+	MAKEOPTS="-j1" # random tests fail otherwise
+	default_src_test
+}
diff --git a/net-libs/qxmpp/qxmpp-9999.ebuild b/net-libs/qxmpp/qxmpp-9999.ebuild
index fc67feb3c99a..6bc4e3d83103 100644
--- a/net-libs/qxmpp/qxmpp-9999.ebuild
+++ b/net-libs/qxmpp/qxmpp-9999.ebuild
@@ -22,7 +22,7 @@ RDEPEND="
 	opus? ( media-libs/opus )
 	speex? ( media-libs/speex )
 	theora? ( media-libs/libtheora )
-	vpx? ( media-libs/libvpx )
+	vpx? ( media-libs/libvpx:= )
 "
 DEPEND="${RDEPEND}
 	test? ( dev-qt/qttest:5 )
@@ -53,10 +53,10 @@ 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)
+		QXMPP_USE_OPUS=$(usex opus 1 '') \
+		QXMPP_USE_SPEEX=$(usex speex 1 '') \
+		QXMPP_USE_THEORA=$(usex theora 1 '') \
+		QXMPP_USE_VPX=$(usex vpx 1 '')
 }
 
 src_install() {