gentoo resync : 13.06.2020

3 files changed, 2 insertions, 78 deletions

diff --git a/net-libs/qxmpp/Manifest b/net-libs/qxmpp/Manifest
index 1be5dbbe503f..4e50439c6267 100644
--- a/net-libs/qxmpp/Manifest
+++ b/net-libs/qxmpp/Manifest
@@ -1,6 +1,4 @@
-DIST qxmpp-0.9.3.tar.gz 300764 BLAKE2B a98d9bd9ab9c84ce6ac90722cd1f1b1609d345daa0b4e690e44b845408753b006261b293898bf419bea011005558584de24090ac1c8809845ec6f8a5c8bb05b1 SHA512 c6ada4398468b9ce84955ab3a1ca155afe3098dfe39dc952c3675be1a1e3a4f118f8b1e251567bc124faa645d2654252d3e32d94e21aae79547056a10a2d6a71
 DIST qxmpp-1.2.0.tar.gz 310801 BLAKE2B a3d1c708fe33e6ecd226e867fc030c6cddb5009c90db46544a0081e1198f69b609239304f56aec00c7b399e7f74fa9bed82eb38db3439e092719a7a68b440a14 SHA512 9b9541dd2ffc689877969bdd1063e7ab21761e5feb7bf911acba3b0a0d953199b8bc08a1ad8c2031b0e135af7a127cbbc108bb3e8dbf1b7712ab8dc8f4cbd371
-EBUILD qxmpp-0.9.3-r2.ebuild 1839 BLAKE2B 59c6021302117272c43f63ff6f372f4248224c58b50c1376b8ebe4e44242f351462ecb9b8feb3455e47e2b230f8692063b3608270c0723c45146b38f1098d280 SHA512 1c2aa58ce0dc71faf748032fa82bfdfed962a8d8bcad1fa36db786d4e82b0b191779ff1c84ea1a3509198afb5f5ab3df1c6d20bdfa3c4b3b1d1e1172e3f8eede
-EBUILD qxmpp-1.2.0.ebuild 1305 BLAKE2B 46506d14b2e5a1f1fd297272fd56163f70e5a2fe3bb8e637a82dda32247ca5aa0157c40ac95a5ee8dbb5c90510b7a8f0e2c9127a4a8c0ecb498994ed09a20e14 SHA512 bf3df082bfbfb9add07cbc8e6e7e53cea9f66e5f57cf8b21e8bc7327477a8162421f09e3eedc0277a38e4472662d497ad9076f8dcd4153c76a2b00f2a7fe776b
+EBUILD qxmpp-1.2.0.ebuild 1304 BLAKE2B b09eb5906fd02de48d40125dd6dfd33f4b7ca2f3b8e08fa9f9612051bc56e779a226a2b2b61dba3199a719cc81397886891c8df0fa6c77fc5c3c8396b8795d70 SHA512 ffe1fd8357e4fade7a76fda1131db43cc86a43c51378c9dd82b56906bed9e3dd3444d8458efea489efb373fe2d54a584a247983b0753d0ae7c7fba9145e53ac4
 EBUILD qxmpp-9999.ebuild 1271 BLAKE2B a5446fa77dc46c67ba1d0dce9dcaf06cc839b9b34bf4ad8824fee44c65141eccad0f07991055102e1b21c0fd4d62166633fde5d0d3a90744044e0b1daee7aa29 SHA512 cc44511dcc23f008226b1088a504b06e00e77684c013dd8a5a2217dfcabe9d54f30e14b34355fd6d1833fb1320d20eca0b814e12d0d25165304ad3779b54ed76
 MISC metadata.xml 710 BLAKE2B c162e3ff5798eaac98ead84af9bd40273b056e88b7061a00c9e52010d3f250998e3aad86aee59f2cb92bd3b4108ef365b1bd238750886292c882efe96f94643f SHA512 fd8ffbbd483fc453197c278622d316d59b1ee947b0ad4cbb9fa25760a84644b56f3582933363f2b55d7806521bc98bb0ccf6021d346fc98dc84887652f1f1426
diff --git a/net-libs/qxmpp/qxmpp-0.9.3-r2.ebuild b/net-libs/qxmpp/qxmpp-0.9.3-r2.ebuild
deleted file mode 100644
index 9a67cc314b2c..000000000000
--- a/net-libs/qxmpp/qxmpp-0.9.3-r2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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"
-RESTRICT="!test? ( test )"
-
-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-1.2.0.ebuild b/net-libs/qxmpp/qxmpp-1.2.0.ebuild
index 05ba6ca7a0b0..ee138b7ec58f 100644
--- a/net-libs/qxmpp/qxmpp-1.2.0.ebuild
+++ b/net-libs/qxmpp/qxmpp-1.2.0.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"
+KEYWORDS="amd64 x86"
 IUSE="debug doc opus +speex test theora vpx"
 RESTRICT="!test? ( test )"