gentoo resync : 28.04.2021

4 files changed, 2 insertions, 76 deletions

diff --git a/net-libs/kdsoap-ws-discovery-client/Manifest b/net-libs/kdsoap-ws-discovery-client/Manifest
index d87500c9f35b..d04bf60075c5 100644
--- a/net-libs/kdsoap-ws-discovery-client/Manifest
+++ b/net-libs/kdsoap-ws-discovery-client/Manifest
@@ -1,7 +1,4 @@
-AUX kdsoap-ws-discovery-client-0.2_pre20200317-deps.patch 346 BLAKE2B 5b195b70196269ee1f09c7b92823d9b59303c7bb485c68f4352242eed1e1086159ad9f47c1963db9e1ed8fc1d03e31a6e480bb47abbeff4167638c1e46a62864 SHA512 cf0ba64983da5c8b18e4103bce0dd1afb2cd5292d3f37a52a29c93a5d19895c13ea244ad27433cc54be8ce419f3a67a1941e21e25a232a4230a0c9b56f020ace
 AUX kdsoap-ws-discovery-client-0.2_pre20200317-no-install-docs.patch 467 BLAKE2B 1b972ba3ae3a6831d49c1c2986fae4ff75fa051964b1c39399b413d724c7c93fef6bc9e740a7e0f10860b64e228f1f18ad1f4836e887aec67d0b2addf7205892 SHA512 2370c1571dcee014b258f388a8a6401a331afc4a2ca0e3491e112ad686bc822cb780b155a1f74e4a8dbe315a65207cc22e088f2471ba621b645cc8e043829903
-DIST kdsoap-ws-discovery-client-0.2_pre20200317.tar.gz 37395 BLAKE2B 03bee2d6f87a3fb407e0cff7e84f9bd83814d742f714630b8c469b26a139062472ad39a0f743caac6f5de4ae2c8a55c42b56ee14c6afcd3a0a874c3f0d9978c5 SHA512 f99092e06e4d7496d6fe79e4cf78265c072476159da958c2a0ee7b852be00b16c89582a8c69c5cbe4160a6419435ee2d8bc71bce40ea9753eaf458c34df6f86b
 DIST kdsoap-ws-discovery-client-0.2_pre20200927.tar.gz 37493 BLAKE2B c0dff21554bc56c4055c74a166a85186d67b0378f7bfbfcd3582ae7b992aaa71cefb6b794258fa07b37fcdd1d42ac2bf9fbfd7cd8142f8f77b1ba9791d683dae SHA512 86f8c4eee3fd484253ee91190092a9ae0dbd3d0c536ec25a6e3ec35be45d4a3d320cffbfc0ed2024d447788b43c9df88ca81181157720ce8942c9034d4eea49f
-EBUILD kdsoap-ws-discovery-client-0.2_pre20200317.ebuild 1348 BLAKE2B d153c9bfc270d825027ba02792bd55db19eb3b1cdc6b66acb84adbf2dadaa9be64c8950afe7e3632ff7972c0ddd8f2d7caace84c6f9aea75a7fa975120e96b73 SHA512 ad6e189b4204c724183f7c79c9d7bcfe20114ebd7d992912971f1d1abb720cbca6d98a97aeddd83417eb37b46bb3dbde08c140a15ce46768813a290b206e93d9
-EBUILD kdsoap-ws-discovery-client-0.2_pre20200927.ebuild 1329 BLAKE2B 49d21299e9dcb78e65ac416f9e473cc2315d9996a5bbeb1e5eb6f06b4ae6d51742e85523160b02bc9c2d6bf17b1353c40e2b3f7f214063a51abd7ab3f8164b64 SHA512 fd7dd84020e14f268b2963083725bb6e1a8e20cf0a6fb0a7759620cf5f8606f411462c348e9d77504874ca5a1867b5d79baa6e8348a5222edb10a93ca54255b0
+EBUILD kdsoap-ws-discovery-client-0.2_pre20200927.ebuild 1326 BLAKE2B f9dad0bfdddae899c6531e9c848c887aee958bf7d18d682d7cf5f6e6a48e80cb127e8f39e55649d1f7ff909138fcc745c1287a5d5f45dba193b1d7611efb325d SHA512 107697e4e7cb26ad1f36935eb38d70005d9ae80362f2d7be6235309b53291a508a2fef28273322f7f3a32f4a50e6f8d5a3e1a1133878897a92cb3bae3f21e5f1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/kdsoap-ws-discovery-client/files/kdsoap-ws-discovery-client-0.2_pre20200317-deps.patch b/net-libs/kdsoap-ws-discovery-client/files/kdsoap-ws-discovery-client-0.2_pre20200317-deps.patch
deleted file mode 100644
index f8f6c08c5f1c..000000000000
--- a/net-libs/kdsoap-ws-discovery-client/files/kdsoap-ws-discovery-client-0.2_pre20200317-deps.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/KDSoapWSDiscoveryClientConfig.cmake.in	2020-03-02 23:38:05.253097303 +0100
-+++ b/KDSoapWSDiscoveryClientConfig.cmake.in	2020-03-02 23:39:03.346641208 +0100
-@@ -5,5 +5,6 @@
- @PACKAGE_INIT@
- 
- find_dependency(Qt5Core @REQUIRED_QT_VERSION@)
-+find_dependency(KDSoap)
- 
- include("${CMAKE_CURRENT_LIST_DIR}/KDSoapWSDiscoveryClientTargets.cmake")
diff --git a/net-libs/kdsoap-ws-discovery-client/kdsoap-ws-discovery-client-0.2_pre20200317.ebuild b/net-libs/kdsoap-ws-discovery-client/kdsoap-ws-discovery-client-0.2_pre20200317.ebuild
deleted file mode 100644
index d9179fc30fc6..000000000000
--- a/net-libs/kdsoap-ws-discovery-client/kdsoap-ws-discovery-client-0.2_pre20200317.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_QTHELP="false"
-ECM_TEST="forceoptional"
-inherit ecm
-
-if [[ ${PV} != *9999* ]]; then
-	COMMIT=14287e92e80a77aa4c0adee2871e6b87c9c3055e
-	SRC_URI="https://gitlab.com/caspermeijn/${PN}/repository/${COMMIT}/archive.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-	S="${WORKDIR}/${PN}-${COMMIT}-${COMMIT}"
-else
-	EGIT_REPO_URI="https://gitlab.com/caspermeijn/${PN}.git"
-	inherit git-r3
-fi
-
-DESCRIPTION="WS-Discovery client library based on KDSoap"
-HOMEPAGE="https://gitlab.com/caspermeijn/kdsoap-ws-discovery-client
-https://caspermeijn.gitlab.io/kdsoap-ws-discovery-client"
-
-LICENSE="CC0-1.0 GPL-3+"
-SLOT="0"
-IUSE="doc"
-
-BDEPEND="
-	doc? ( app-doc/doxygen[dot] )
-"
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtnetwork:5
-	>=net-libs/kdsoap-1.9.0"
-DEPEND="${RDEPEND}
-	test? ( dev-qt/qtxml:5 )
-"
-
-RESTRICT+=" test"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-no-install-docs.patch
-	"${FILESDIR}"/${P}-deps.patch
-)
-
-src_prepare() {
-	ecm_src_prepare
-	use test || ecm_punt_bogus_dep Qt5 Xml
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package doc Doxygen)
-		-DBUILD_QCH=OFF # does not use ecm_add_qch from ECMAddQch
-	)
-	ecm_src_configure
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( "${BUILD_DIR}"/docs/html/. )
-	ecm_src_install
-}
diff --git a/net-libs/kdsoap-ws-discovery-client/kdsoap-ws-discovery-client-0.2_pre20200927.ebuild b/net-libs/kdsoap-ws-discovery-client/kdsoap-ws-discovery-client-0.2_pre20200927.ebuild
index 74f1eb852d13..da7b75210e76 100644
--- a/net-libs/kdsoap-ws-discovery-client/kdsoap-ws-discovery-client-0.2_pre20200927.ebuild
+++ b/net-libs/kdsoap-ws-discovery-client/kdsoap-ws-discovery-client-0.2_pre20200927.ebuild
@@ -10,7 +10,7 @@ inherit ecm
 if [[ ${PV} != *9999* ]]; then
 	COMMIT=dcefb65c88e76f1f9eda8b0318006e93d15a0e1e
 	SRC_URI="https://gitlab.com/caspermeijn/${PN}/repository/${COMMIT}/archive.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 	S="${WORKDIR}/${PN}-${COMMIT}-${COMMIT}"
 else
 	EGIT_REPO_URI="https://gitlab.com/caspermeijn/${PN}.git"