gentoo resync : 28.04.2021

3 files changed, 2 insertions, 57 deletions

diff --git a/net-libs/kdsoap/Manifest b/net-libs/kdsoap/Manifest
index 53ac5d0caf22..97fe6219251b 100644
--- a/net-libs/kdsoap/Manifest
+++ b/net-libs/kdsoap/Manifest
@@ -1,6 +1,3 @@
 DIST kdsoap-1.10.0.tar.gz 1399777 BLAKE2B d04393e34536eca43edb612339cfc40ff024849b74231d472f9936d86172d299f973e4140ae2bde363dca441e26016126db5f0782807c3d5598543ec4afcd737 SHA512 c0e0108f74e5d4075a71369f428862b7f3eb6a7b1968eea7a7b01f4536d999468a7af8013be722c02b303a0580e7cd649fe78c1588f837405ede4bb753fb56b7
-DIST kdsoap-1.9.50_pre20200317-libkode-dfe0d565cb58cfb25da77853d9694097aa8e5882.tar.gz 50653 BLAKE2B a14145adcb1a9551c9fc70246bebe034db605e8d4056744856ff67a575ed192b90439a25b7ba6916d66b9830d7ffec1da82f2e12425b6e58801ebbe289cc09b7 SHA512 efe539888d25a527d43a83a6e3c38d75eec92bab3f09766890870f3fe6516cbd8349b049b42399c8764b28550291130b705350ae9d4d9947b839c03174b9b984
-DIST kdsoap-1.9.50_pre20200317.tar.gz 919821 BLAKE2B 8028e98a1d79800e9f8bbddcb50e0b3ebb2d71b2f87d4f2920c6689b8536d712f76fb9ff48dd16b3d68871e46d9b1d36198aadab3d1d645f2dc397beef3d596e SHA512 f00c960d442c6a2977d321441ddd0924b42422e2a4e974a7fabb2d896fdb7310813750154f7548758ccb01a5d312d9af74a8d34746e09d07aff7925ebb6c3b4c
-EBUILD kdsoap-1.10.0.ebuild 900 BLAKE2B 8249c721a8efc5ca434259b81fd9dd5532e91842db2f05d66cedbafe11d5b64e93404fa5f1366e0dd14d14aad88e64715271ca069d26996a8b953ca9e99971d1 SHA512 4ec1bffc795e2878660e2a41702fa151c15ce63cbfd8f7f3db8155e3e3916a69ece0b5b85013c4db65ae0227e591ee35030a2623e1dcb89fa06d5e66211efa49
-EBUILD kdsoap-1.9.50_pre20200317.ebuild 1344 BLAKE2B f008cd03c3dd55f3901c7ad46bf837a6834b9a6d05bd663ebe5df1301eb258df052bb40b5d0bd58e29904e927391e73e88b6e9287edca13935382d3432b781c9 SHA512 fd37d66bfaa349125503603cd3695814d425da60b0bd2b52d1744451b62ec5834fa28e821541942a37b95e0a1488ee2b21999154b8d20c759e4c9dc742dffd9b
+EBUILD kdsoap-1.10.0.ebuild 897 BLAKE2B 3128bc6ce0e740d5929a1150df92734eb1052cb0e4cc93a3c84913ef4916d870e9bee77f7990eaf5731b857b40627ba31e30d03b2de788a14a319e9c06340069 SHA512 e4d0a437b63e3ea3212258324d8b7954c5faf95a910636ea319025fb1eedff2fdaed606b6459dc9ae3975841bf4561cc61694b5f829e1f8d14d50da394a4db14
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/kdsoap/kdsoap-1.10.0.ebuild b/net-libs/kdsoap/kdsoap-1.10.0.ebuild
index d16d3493eda0..93e3d7693fa7 100644
--- a/net-libs/kdsoap/kdsoap-1.10.0.ebuild
+++ b/net-libs/kdsoap/kdsoap-1.10.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="https://github.com/KDAB/KDSoap/releases/download/${P}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 else
 	EGIT_REPO_URI="https://github.com/KDAB/KDSoap.git"
 	EGIT_SUBMODULES=( kdwsdl2cpp/libkode -autogen )
diff --git a/net-libs/kdsoap/kdsoap-1.9.50_pre20200317.ebuild b/net-libs/kdsoap/kdsoap-1.9.50_pre20200317.ebuild
deleted file mode 100644
index 789535021078..000000000000
--- a/net-libs/kdsoap/kdsoap-1.9.50_pre20200317.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} != *9999* ]]; then
-	KDSOAP_COMMIT=8fde0425e38bf58922b6054768b4a7e5f349500b
-	LIBKODE_COMMIT=dfe0d565cb58cfb25da77853d9694097aa8e5882
-	SRC_URI="https://github.com/KDAB/KDSoap/archive/${KDSOAP_COMMIT}.tar.gz -> ${P}.tar.gz
-		https://github.com/cornelius/libkode/archive/${LIBKODE_COMMIT}.tar.gz -> ${P}-libkode-${LIBKODE_COMMIT}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-	S="${WORKDIR}/KDSoap-${KDSOAP_COMMIT}"
-else
-	EGIT_REPO_URI="https://github.com/KDAB/KDSoap.git"
-	EGIT_SUBMODULES=( kdwsdl2cpp/libkode -autogen )
-	inherit git-r3
-fi
-inherit cmake
-
-DESCRIPTION="Qt-based client-side and server-side SOAP component"
-HOMEPAGE="https://www.kdab.com/development-resources/qt-tools/kd-soap/"
-
-LICENSE="GPL-3 AGPL-3"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtxml:5
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-"
-
-src_prepare() {
-	rmdir kdwsdl2cpp/libkode || die
-	mv "${WORKDIR}"/libkode-${LIBKODE_COMMIT} "${S}"/kdwsdl2cpp/libkode || die
-
-	cmake_src_prepare
-
-	sed -e "/^find_package.*Qt5/s/Widgets //" \
-		-e "/install.*INSTALL_DOC_DIR/d" \
-		-i CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DKDSoap_EXAMPLES=OFF # Qt4-based and no install targets
-	)
-	cmake_src_configure
-}