gentoo resync : 05.12.2021

4 files changed, 66 insertions, 80 deletions

diff --git a/kde-apps/kaddressbook/Manifest b/kde-apps/kaddressbook/Manifest
index 1d0696e3482f..7bae9daaf1bd 100644
--- a/kde-apps/kaddressbook/Manifest
+++ b/kde-apps/kaddressbook/Manifest
@@ -1,5 +1,4 @@
-DIST kaddressbook-21.04.3.tar.xz 3329648 BLAKE2B 44b489a613efcedd9e0cbd4c23f3a1b69a5b5e144ecdb9cb485015a441cb18945965a4cb6ad15ca4bc195ef0359b08f97304cd130cfd388440aa4eca801e67d0 SHA512 8325642b057df2489bde527be71691ce54668e13a3e815727c77051f6e7d1b76e7a4195b6f363c78d7fe6bd4f67af61364810b2fe4cfae62988d383f86fc7a5d
+AUX kaddressbook-21.08.3-unused-deps.patch 2408 BLAKE2B ccb912a26284137ac8831457b31454f620349b2f791abeb5711a5ba856493baa03ddc8a581a5766d0776afdc41a726d26c17db89d8d05d21432ba46ab6751168 SHA512 bac692fb1fc376161077fb2e24f6e0a5e4bcf0cdb49fd8023f81239410259e6fedfd8a02f9f210a1cd6f98ca3ecc08f75da3185f95c89c15c4610eddb5edce45
 DIST kaddressbook-21.08.3.tar.xz 3347684 BLAKE2B 7d6ecfe4ed729c77c1df8345131eb2dd4245e13166b1ae6f839a28da18362d50071ece7fe6400c60eb32691121f5020ad3b4b1fa00e1119c568b51623624c7f3 SHA512 e8052322cb24ca55575e4cea3c2b6d452392d33fe3e21981e6b9fd56d3a717e835250db99d5b845d4cad71978ea74c3bf335c100bbaad02db56e43e8d1de3570
-EBUILD kaddressbook-21.04.3.ebuild 2008 BLAKE2B a4209084dcbbfdf1c44b065caeae824cb23bef61a4f6e3a2b26001f2ecb97c4ca20957402574e541276e1d6cbee4978cfe9b4caa962fd12343f83dadc6bd9959 SHA512 78d43d9532126787598dc2ea7e53984e8ff88dfe4049ba045db5d98bbbe2abfcfef7c941f7b0dc2a46285d9744af64a536b9a8eebfc470b49d982af2c4eadba6
-EBUILD kaddressbook-21.08.3.ebuild 2006 BLAKE2B dcc9e490495b069ec5b1d8f8250d0dcb671c871b4b746fd3b27e0bd1d05a25809ad46f2274bd9808dcf66384f737e1065676e7f689f1451a5144e37d56442bc4 SHA512 d9bd730c798973391cebc6729e9c52f4e5961fa8cd4c6fbb1f88bf2b2cec49eb66b4608145408c7683aa6d0266e6eb66701c1ac6c9a422bc3b60ff8204a60a48
+EBUILD kaddressbook-21.08.3-r1.ebuild 1987 BLAKE2B 5a3b8ba660e7ca72138639c51585089486c842cdcd935632199dd880fd58f631241eca716a6c1cb9e8eead69ecb2c45cb173f01b3f4b5d9a7435870d83ecc6ba SHA512 6d147fe58d8b2fb1752855baf959ec194eca24479f3ed5bee62275ef7f0357305ef1a730afe4c3ee4d74466e66f666a15f5870aab37449e3ba4fb21ac171ec8b
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kaddressbook/files/kaddressbook-21.08.3-unused-deps.patch b/kde-apps/kaddressbook/files/kaddressbook-21.08.3-unused-deps.patch
new file mode 100644
index 000000000000..0f13513546b7
--- /dev/null
+++ b/kde-apps/kaddressbook/files/kaddressbook-21.08.3-unused-deps.patch
@@ -0,0 +1,61 @@
+From eb9dad153f199c925ac60c0a33eca6ff0c1f9f44 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Sandro=20Knau=C3=9F?= <sknauss@kde.org>
+Date: Fri, 8 Oct 2021 17:56:50 +0000
+Subject: [PATCH] Remove unneeded dependencies
+
+---
+ CMakeLists.txt     | 8 --------
+ src/CMakeLists.txt | 4 ----
+ 3 files changed, 13 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c5e3e336..aef0ccd9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -53,7 +53,6 @@ find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test DBus PrintS
+ set(LIBKDEPIM_LIB_VERSION "5.18.3")
+ set(LIBGRANTLEETHEME_LIB_VERSION "5.18.3")
+ set(PIMCOMMON_LIB_VERSION "5.18.3")
+-set(LIBKLEO_LIB_VERSION "5.18.3")
+ set(AKONADI_SEARCH_VERSION "5.18.3")
+ set(AKONADI_CONTACT_VERSION "5.18.3")
+ 
+@@ -62,7 +61,6 @@ find_package(KF5DBusAddons ${KF5_MIN_VERSION} CONFIG REQUIRED)
+ find_package(KF5CoreAddons ${KF5_MIN_VERSION} CONFIG REQUIRED)
+ find_package(KF5KCMUtils ${KF5_MIN_VERSION} CONFIG REQUIRED)
+ find_package(KF5Crash ${KF5_MIN_VERSION} REQUIRED)
+-find_package(KF5Libkleo ${LIBKLEO_LIB_VERSION} CONFIG REQUIRED)
+ 
+ find_package(KF5DocTools ${KF5_MIN_VERSION})
+ set_package_properties(KF5DocTools PROPERTIES DESCRIPTION
+@@ -79,12 +77,6 @@ find_package(KF5AkonadiSearch ${AKONADI_SEARCH_VERSION} CONFIG REQUIRED)
+ find_package(KF5AkonadiContact ${AKONADI_CONTACT_VERSION} CONFIG REQUIRED)
+ find_package(KF5GrantleeTheme ${LIBGRANTLEETHEME_LIB_VERSION} CONFIG REQUIRED)
+ 
+-set(GPGMEPP_LIB_VERSION "1.11.1")
+-find_package(Gpgmepp ${GPGMEPP_LIB_VERSION} CONFIG REQUIRED)
+-
+-set(QGPGME_LIB_VERSION "1.11.1")
+-find_package(QGpgme ${QGPGME_LIB_VERSION} CONFIG REQUIRED)
+-
+ include_directories(${kaddressbook_SOURCE_DIR} ${kaddressbook_BINARY_DIR})
+ 
+ find_package(KF5Prison ${KF5_MIN_VERSION} CONFIG REQUIRED)
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 3e756aab..ac2f5774 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -98,10 +98,6 @@ if (TARGET KUserFeedbackWidgets)
+     target_link_libraries(kaddressbookprivate PRIVATE  KUserFeedbackWidgets)
+ endif()
+ 
+-if(QGpgme_FOUND)
+-    target_link_libraries(kaddressbookprivate PRIVATE QGpgme)
+-endif()
+-
+ target_include_directories(kaddressbookprivate PUBLIC "$<BUILD_INTERFACE:${kaddressbook_SOURCE_DIR};${kaddressbook_BINARY_DIR}>")
+ 
+ set_target_properties(kaddressbookprivate PROPERTIES VERSION ${KDEPIM_LIB_VERSION} SOVERSION ${KDEPIM_LIB_SOVERSION})
+-- 
+GitLab
+
diff --git a/kde-apps/kaddressbook/kaddressbook-21.04.3.ebuild b/kde-apps/kaddressbook/kaddressbook-21.04.3.ebuild
deleted file mode 100644
index 1f699f259a50..000000000000
--- a/kde-apps/kaddressbook/kaddressbook-21.04.3.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org optfeature
-
-DESCRIPTION="Address book application based on KDE Frameworks"
-HOMEPAGE="https://apps.kde.org/kaddressbook/"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="telemetry"
-
-DEPEND="
-	>=app-crypt/gpgme-1.11.1[cxx,qt5]
-	dev-libs/grantlee:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-search-${PVCUT}:5
-	>=kde-apps/grantleetheme-${PVCUT}:5
-	>=kde-apps/kontactinterface-${PVCUT}:5
-	>=kde-apps/libgravatar-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/libkleo-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/prison-${KFMIN}:5
-	telemetry? ( dev-libs/kuserfeedback:5 )
-"
-RDEPEND="${DEPEND}
-	>=kde-apps/kdepim-runtime-${PVCUT}:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package telemetry KUserFeedback)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		optfeature "Postal addresses" kde-apps/kdepim-addons:${SLOT}
-	fi
-	ecm_pkg_postinst
-}
diff --git a/kde-apps/kaddressbook/kaddressbook-21.08.3.ebuild b/kde-apps/kaddressbook/kaddressbook-21.08.3-r1.ebuild
index 2b1f4b0def20..95e20ab6da37 100644
--- a/kde-apps/kaddressbook/kaddressbook-21.08.3.ebuild
+++ b/kde-apps/kaddressbook/kaddressbook-21.08.3-r1.ebuild
@@ -16,11 +16,10 @@ HOMEPAGE="https://apps.kde.org/kaddressbook/"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="telemetry"
 
 DEPEND="
-	>=app-crypt/gpgme-1.11.1[cxx,qt5]
 	dev-libs/grantlee:5
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5
@@ -33,7 +32,6 @@ DEPEND="
 	>=kde-apps/kontactinterface-${PVCUT}:5
 	>=kde-apps/libgravatar-${PVCUT}:5
 	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/libkleo-${PVCUT}:5
 	>=kde-apps/pimcommon-${PVCUT}:5
 	>=kde-frameworks/kcmutils-${KFMIN}:5
 	>=kde-frameworks/kcodecs-${KFMIN}:5
@@ -58,6 +56,8 @@ RDEPEND="${DEPEND}
 	>=kde-apps/kdepim-runtime-${PVCUT}:5
 "
 
+PATCHES=( "${FILESDIR}/${P}-unused-deps.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package telemetry KUserFeedback)