gentoo resync : 22.05.2021

3 files changed, 2 insertions, 33 deletions

diff --git a/kde-apps/kldap/Manifest b/kde-apps/kldap/Manifest
index 3c6ea11ccf25..6a624af3cd43 100644
--- a/kde-apps/kldap/Manifest
+++ b/kde-apps/kldap/Manifest
@@ -1,6 +1,5 @@
-AUX kldap-21.04.0-kdoctools_install.patch 850 BLAKE2B 3cd595a826659e5eb96e1794dbf84607d35d2c39972ad1a5b3df973efc86deecf945daeaa2f6460e7b75eac8266d5040634f1dbea8c29b0df7828110f9181430 SHA512 045fe0f2d310cba230c0129e40fd767b8077ee3595a33b35f2e4961795fb254f19457bd66b58161d65a73e949c0321085a977bfe5e81504981d3867093ca2cd1
 DIST kldap-20.12.3.tar.xz 164652 BLAKE2B 35c8f03a96616b125f7df264ad060753ae306b2503c350a90efe37884ae661f786b3e5a98078eec1fa9169872ea688faebb3b6847bc992499e5c57181e63491c SHA512 d1220afdd157de224fd65306f1b77f80c1adbe195307bea51c6de5234e9a94122b2c24d38e050ad5dd1a9597b5f7f0f65ea5de73a38c4a309d5692691ed09d54
-DIST kldap-21.04.0.tar.xz 170760 BLAKE2B a20a04e162c4076a29d817697175475c854efaf6b065d7641d7429f0ebd14e5f63b5a702067bb535548ecd6c46cdd19187641194260c30b92af7b49c06d8f1cb SHA512 abd8a3d0a801369871e9aec642c3e8607325cb297c697852d4e728e1a81588655f864208e50326aa38aea07b19a4cbff0013dbe8e2c73d07824686267f983daf
+DIST kldap-21.04.1.tar.xz 170728 BLAKE2B d39ceee0b2116ef93edf0171ef3b1b15377829abc73b0f457404d5957203ab76ea3e7808c8bf3931420b2531dd8403da3286f4d3f2a7b402ce8ca20e4c8ed521 SHA512 4e28c6075712d4d1e07550335fb3dbfd74a16414889811f9032177c829721ea0c8d30a8686a2ae3ae07cf78e259ce2ed1a7702da636782aa744010ec044438b5
 EBUILD kldap-20.12.3.ebuild 663 BLAKE2B 388c2498b74bf8094d3ddfd4c77c6d2aa74100666869d6d1a88a7c79a421f090039d1290a3d737163bde4563ae51967e851dff1ef6d556b4633db6e7d4ddc758 SHA512 16cd24268b8c058a4eb1c9899d19ec60492b03f5e5f195d0efb97337488b57da340d426c7dea38a9effef7c59bb2e51fe68b7aa67355c6eb6ed3274e63420984
-EBUILD kldap-21.04.0.ebuild 708 BLAKE2B df8db29224ec8c661091ffabf16c937995390105335b56dd82166e6ab8918b8a86bd96892663dc428379d15aa971a1bef80404759ac948d7ae7898bdac3ac5e7 SHA512 73969b2b6501e99961a6115533d6a454a132401b5eb7b0876fdbbc25741e3ad1ec4b6397d913c3411d0a3b19a3cd9e70bc2df579e19230aefc694d2b8fbbdb69
+EBUILD kldap-21.04.1.ebuild 652 BLAKE2B 6f6d34813c3da5edf3393154afda644830023fed4f1712f27e2db94673b53724f0dbed7c1df1e30ae60d5cb16ec99cb47c55e11ac19caff7798c710329705555 SHA512 23bae1ce2d1568036847e2b52b8db8ce4e9bedde5e2eab0d02124a486aa6264f297e25a247a4c1dfdfdfec1aa3bd9856dadd41a0883e702a2e42c413c5628db1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kldap/files/kldap-21.04.0-kdoctools_install.patch b/kde-apps/kldap/files/kldap-21.04.0-kdoctools_install.patch
deleted file mode 100644
index 164e49c170c5..000000000000
--- a/kde-apps/kldap/files/kldap-21.04.0-kdoctools_install.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From d4b3b521cc398d85340075d99a2bf6964f13b544 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sat, 24 Apr 2021 11:38:58 +0200
-Subject: [PATCH] Hide kdoctools_install() behind KF5DocTools_FOUND conditional
-
-The dependency is optional in this package so the macro call must be too.
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2e2512f..3d6c86a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -120,5 +120,7 @@ ecm_qt_install_logging_categories(
- 
- kde_configure_git_pre_commit_hook(CHECKS CLANG_FORMAT)
- ki18n_install(po)
--kdoctools_install(po)
-+if(KF5DocTools_FOUND)
-+    kdoctools_install(po)
-+endif()
- feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
--- 
-2.31.1
-
diff --git a/kde-apps/kldap/kldap-21.04.0.ebuild b/kde-apps/kldap/kldap-21.04.1.ebuild
index d78ebde564e9..d144da6de3f9 100644
--- a/kde-apps/kldap/kldap-21.04.0.ebuild
+++ b/kde-apps/kldap/kldap-21.04.1.ebuild
@@ -28,5 +28,3 @@ DEPEND="
 	net-nds/openldap
 "
 RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-kdoctools_install.patch" )