gentoo Easter resync : 12.04.2020

3 files changed, 3 insertions, 44 deletions

diff --git a/kde-apps/kldap/Manifest b/kde-apps/kldap/Manifest
index 26fce9b9c61c..06ba8f9f11cf 100644
--- a/kde-apps/kldap/Manifest
+++ b/kde-apps/kldap/Manifest
@@ -1,5 +1,3 @@
-DIST kldap-19.08.3.tar.xz 155372 BLAKE2B df9dd8216da743db09e9e059067a91c4776e26847f1413f281708fdb04372aed7186e7a0b2d1d2bf04a5cca657cfee290c7fa14470c7d1b64244284fafb65213 SHA512 c2e21c0b3755228aea5b2612cb495565aa2161e3502b1d72b5063eb2ee15b4ea1ee820b8183b2820607bc1b0e2eaf33a6983eaa025c2224e557f10dd17fc9d37
-DIST kldap-19.12.2.tar.xz 155096 BLAKE2B 128237e86e963d2fe34251e6e66f8390849ab5e10f9be8a8bc6a1d18ad1896ab3a4b6b77cc6bdcf4f60f5d2d62834c6873c9f6f2d8899c9221203c5ddf24351b SHA512 324e33c2438f14e34e3fcff9a87504f6ba407f5dfede6d9106b40cdc158f063e94135cf37fe00d7311002d8e200a34c8e3084240a6c4e0e27d4651d97d57c29a
-EBUILD kldap-19.08.3.ebuild 832 BLAKE2B 011fe5616b28a97ec7c22adf46c09f565ef2eb6877d4069b390c3da2995a18ce1ab35b6475f7f369bed700da03379dff6f37a2fbe1ffc3be59e53f786d55abf2 SHA512 70608e7e010ecf7cc083c7170fee0b424d22408a92ade5c395597634aa773c2a8933a2f315de0bf7759c12b1336565228f0bdd753da1ec45dc92a385ed105cde
-EBUILD kldap-19.12.2.ebuild 872 BLAKE2B a27bd0cd4303dc1de02586ea8aaec6054f5239fea9d0532f88c37ed29ccd8ab0da7130e314109cd45c366bbe6b0d1045d3989fecc87e4d40497c1e01b480d94f SHA512 ffbdc277d05348bcd1bc0d90bc8ea8afca6b6c359df7cc9a9c3319e18a997301e53c27fef0c8e730f7e5de9784e70009649b4adb33bdf2564fd48a6baf0abc7a
+DIST kldap-19.12.3.tar.xz 155404 BLAKE2B 978e693f19f0ff0258d963d758d18ea865d76b552a7f6fb10afeaec409f558fbc5f459447c491f226891351cf254cb081091dbd8ee4644dd1a70013fa024af86 SHA512 5c0446d31c34d018910f50d0edc947400798a33af3a41b77989dd80f8657b13f71472aa3a2eafd5d51c703f7e72a76a6279bb9c93b1cdc4fc7dc8c676ef17435
+EBUILD kldap-19.12.3.ebuild 869 BLAKE2B 92fb66ab403a5693b2102e36bb2d982f38924e925b39d8a8af82f513bf7af12b0890945841300ba6fb701f353e5ed26b34850cbc21e1f7eee25a2a62da569e75 SHA512 3ea9d1668651b2e72f929a70ac20370312951bc239b37d87181c03f28b9020ebf99138910878a1ff9586a7c288d708f906c1c9cfd3a6a5e77b0c6a13b3d262c7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kldap/kldap-19.08.3.ebuild b/kde-apps/kldap/kldap-19.08.3.ebuild
deleted file mode 100644
index cd944e370194..000000000000
--- a/kde-apps/kldap/kldap-19.08.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="true"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Library for interacting with LDAP servers"
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	dev-libs/cyrus-sasl
-	net-nds/openldap
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
-
-src_prepare() {
-	ecm_src_prepare
-
-	if ! use handbook ; then
-		sed -e "/add_subdirectory(doc)/I s/^/#DONOTCOMPILE /" \
-			-i kioslave/CMakeLists.txt || die "failed to comment add_subdirectory(doc)"
-	fi
-}
diff --git a/kde-apps/kldap/kldap-19.12.2.ebuild b/kde-apps/kldap/kldap-19.12.3.ebuild
index efc25563b986..5454de9cf07f 100644
--- a/kde-apps/kldap/kldap-19.12.2.ebuild
+++ b/kde-apps/kldap/kldap-19.12.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://api.kde.org/kdepim/kldap/html/index.html"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="