gentoo resync : 22.12.2021

3 files changed, 82 insertions, 35 deletions

diff --git a/kde-apps/kalarm/Manifest b/kde-apps/kalarm/Manifest
index 54cbc8938f88..36e7e2eb3847 100644
--- a/kde-apps/kalarm/Manifest
+++ b/kde-apps/kalarm/Manifest
@@ -1,4 +1,5 @@
-AUX kalarm-21.08.3-x11-optional.patch 1112 BLAKE2B 8cb7f6794c89a7eabe29bcecf78ef00eb9e6a82039309494d7117125f67f2c6f37c2f395d71c7700f487f03a3bb745bff1eca19a3663e79c89542efca24a54d0 SHA512 8e8cdf5325ea45e759a13e5891250b9106715e029113c16bb8319fca7caca92e063fc94e9ae1cab89a680350605a649375db8305fae21d818b5082fea77b5c42
 DIST kalarm-21.08.3.tar.xz 2158988 BLAKE2B 45e544bc518a0640760a0af329983ab6b052fcc0cbba43beff5963018cdd4992053aec6fac506784fe826b626591218eb24bb654402e7a00ae009b5234b54d83 SHA512 690c89006598e8e87e1fd4b0f9b5d183280efa3f5f2d1fcda01607498b03ffad75a60e49ef4435f8fd66357231446c187a77d9976a6c04d98519f8ca3747a1b7
+DIST kalarm-21.12.0.tar.xz 2159796 BLAKE2B c891ccd4645ca8633ff94c5734bc8371054c34416d16991a5a61540a3ab309fd84a7b11393ca00ec964b7ebf275b563fb1981b433e8ae55629346e6a28d2a4f8 SHA512 c302b921808e47dd29f65b4bc82c4f49a3c998efaf4d3483d577ddd826f96ff82f08159c0e027f0a3a1b42e18d5936679c78b7eadd6eade57b9937ca79dbc8a1
 EBUILD kalarm-21.08.3-r1.ebuild 2290 BLAKE2B 0a31d1b55e5a5ea91638462e84754312c3d7f4dd59182540dcfd16070c2592c3f9efc171ae1f15f5e82c2a7dcef020cf7abb6b912130af247c7261c4e071a097 SHA512 12529edf2f111366f3624b958a97404524ef6809f2ef91bcb273053a10b4f44baf3fb93b75b77964ab08749c47d575d23adfc0e7fee284aad06204696e6f056e
+EBUILD kalarm-21.12.0.ebuild 2346 BLAKE2B 376976003d6afd428b39fb442d9be704a15f222221470c87c8acb8dd53a4bd539fc6aba1f8c9229cf3d8a42bd60248dfab9e9413b5e23c16fe3eef2e26f732da SHA512 06b10047311a7a8c601761d76ea6bb16f61af0a4132ca6b5271391a3a27428c7a2015ace12fb09b371a695c29d3c236c45f6a590cd4a5757711cfa0ab2f38a11
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kalarm/files/kalarm-21.08.3-x11-optional.patch b/kde-apps/kalarm/files/kalarm-21.08.3-x11-optional.patch
deleted file mode 100644
index 0b92c6fe5803..000000000000
--- a/kde-apps/kalarm/files/kalarm-21.08.3-x11-optional.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 1e5edd84cea5cac4dea2c488cea47766c1a33745 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Thu, 25 Nov 2021 18:33:30 +0100
-Subject: [PATCH] Add WITH_X11 switch
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fa699213..f928bf8b 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -58,6 +58,7 @@ find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED DBus Gui Network Widgets
- set(CALENDARUTILS_LIB_VERSION "5.19.40")
- 
- option(FILE_RESOURCES "Use file system resources instead of Akonadi resources." TRUE)
-+option(WITH_X11 "Build with X11 support" TRUE)
- 
- # Find KF5 packages
- find_package(KF5Auth ${KF5_MIN_VERSION} CONFIG REQUIRED)
-@@ -106,7 +107,7 @@ find_package(KF5PimTextEdit ${KPIMTEXTEDIT_LIB_VERSION} CONFIG REQUIRED)
- 
- configure_file(kalarm-version-string.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/kalarm-version-string.h @ONLY)
- 
--if (NOT APPLE)
-+if (NOT APPLE AND WITH_X11)
-     find_package(X11)
- endif()
- if (X11_FOUND)
--- 
-2.33.1
-
diff --git a/kde-apps/kalarm/kalarm-21.12.0.ebuild b/kde-apps/kalarm/kalarm-21.12.0.ebuild
new file mode 100644
index 000000000000..a228c704f7fe
--- /dev/null
+++ b/kde-apps/kalarm/kalarm-21.12.0.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.88.0
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="Application to manage alarms and other timer based alerts for the desktop"
+HOMEPAGE="https://apps.kde.org/kalarm/ https://userbase.kde.org/KAlarm"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="X"
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-apps/akonadi-${PVCUT}:5
+	>=kde-apps/akonadi-contacts-${PVCUT}:5
+	>=kde-apps/akonadi-mime-${PVCUT}:5
+	>=kde-apps/kalarmcal-${PVCUT}:5
+	>=kde-apps/kcalutils-${PVCUT}:5
+	>=kde-apps/kidentitymanagement-${PVCUT}:5
+	>=kde-apps/kmailtransport-${PVCUT}:5
+	>=kde-apps/kmime-${PVCUT}:5
+	>=kde-apps/kontactinterface-${PVCUT}:5
+	>=kde-apps/kpimtextedit-${PVCUT}:5
+	>=kde-apps/pimcommon-${PVCUT}:5
+	>=kde-frameworks/kauth-${KFMIN}:5
+	>=kde-frameworks/kcalendarcore-${KFMIN}: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/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kglobalaccel-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/kholidays-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kidletime-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/knotifyconfig-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=media-libs/phonon-4.11.0
+	X? (
+		>=dev-qt/qtx11extras-${QTMIN}:5
+		x11-libs/libX11
+	)
+"
+RDEPEND="${DEPEND}
+	>=kde-apps/kdepim-runtime-${PVCUT}:5
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package X Qt5X11Extras)
+		$(cmake_use_find_package X X11)
+	)
+
+	ecm_src_configure
+}