gentoo resync : 15.12.2019

4 files changed, 62 insertions, 56 deletions

diff --git a/kde-apps/spectacle/Manifest b/kde-apps/spectacle/Manifest
index 9b044a4c444c..2298374c5be9 100644
--- a/kde-apps/spectacle/Manifest
+++ b/kde-apps/spectacle/Manifest
@@ -1,5 +1,5 @@
-DIST spectacle-19.04.3.tar.xz 958272 BLAKE2B 1bf11d7281b4fe4c22dca25752f037f5134966775f162e2e06865a1ea6fbd74a5b33bf17f75e51e48bf762dfecc8e830be071d08f0cc7c580cf85c58f5cb18ee SHA512 e26b73e8523d65956f6e744ffeb15ed1f63fec2cf2f1352ff5ab0f9c208d30efeb43665592a215dcfc65e0cae201675f5a14a86c23e516b3fcb30902ef71143e
 DIST spectacle-19.08.3.tar.xz 966512 BLAKE2B e200150e886e5d0aeba39608b2e62b718cc30bf9443fc59b4cfa425ccf716c1d0e0fd3c81ad447b154ad50392708e8067d945587752a21ed72ce26039cbcbedd SHA512 36a023b1c32c71ff60ba3613800abf16b877f8069937b7feca9d57faab9fdd8fb9db259bec33f96caded688b85e81ad89a6725fa9fb65369f97ad2133273668f
-EBUILD spectacle-19.04.3.ebuild 1342 BLAKE2B b28979b8c97d4cc1b21adc8f536ce391cc9a348d367f9cb10ccf85eb783dbb62dd870b150e45866a9d93455704faf91471b4df2fe92d05dc685ef02fe911a239 SHA512 e98168becd28342f5711d321730af871cbacc15f7ea17b2e31cc59fb29d582f8d8c3bfd505f8c5471f227cbb0aff4b764b566f02f58d095a3db5e78956996d1e
-EBUILD spectacle-19.08.3.ebuild 1519 BLAKE2B 00f89d9109d7ec6ec700433d6e7a28c742ef99bf96a3ea455e25682896f47e5007f2e6b0408dab791322ca41fd59f63184995c5cb56f041c7d228c6d97293a1e SHA512 496f83f56311631fd8ae8b332156f2ebaad06ffd0a98441bbf936ff9dd76f0f0cff9e29642d0f465cb64f45ba5ec114f97614fc3e779947a5fbfb88f4f12ab3c
+DIST spectacle-19.12.0.tar.xz 651208 BLAKE2B 6b8569e7234cc7bce5d26d5f84cee586be569e0627f4e116c420d5aaec48f6014110a653a85484d3b5761bf1ffc976d6aaf6cff0e46aca6d000e85ed047bb38f SHA512 b1ae329943876d4f634d3112304ab4f21a6fa24526ad15d19e2a058506c41a40c872c62ce58ed988c416334d08219c4d93fc57adcb8292ad32cc260b9ffee6c7
+EBUILD spectacle-19.08.3.ebuild 1516 BLAKE2B 23d0bb56942a79a7a3c24007a3c8bcee2008b848da48db84850c078f358607c53b6b2b835fccbbf832a6e287447a913b8893f200d7dca89336473f325d53b0ab SHA512 4289573fb9db85f4061afd7bf49689a2ecc62fe2bb01b07792ba436830e68bd80566513368a8c53311d70953def824af68dafc251f720c2d018fc2a6da63bbd2
+EBUILD spectacle-19.12.0.ebuild 1576 BLAKE2B f7dc118e2eaace191480a715ca5845e12864f1cd17f9f9e69eac728fc501330f883222e8aad54870a5d22734130ec47026ff13cbf5910988c040a888719dc6f9 SHA512 9415285d90ccae580f1d8ebe7dbf5385c54bad09b31b8a54d355c2341e85ad89d9ff7e5ae238fb2e16897275ee03a109486a67f1751457d333f50b7f44099277
 MISC metadata.xml 441 BLAKE2B 82a565ee86151104ad5c24329d7649230f817d78c9fc6a393ec028d4d92cb6e8c968deba9f3f344125da283a14eaf671a6105f548eee1051290530a2d33d9143 SHA512 674c31c3c5639f6ba218f5cc9342ec5a00b944212563db07dfd223c4897a3d1f315dc7a0735be7b30d75d3706e6355f3547cd17c9ab20e7387974ff1adfe5716
diff --git a/kde-apps/spectacle/spectacle-19.04.3.ebuild b/kde-apps/spectacle/spectacle-19.04.3.ebuild
deleted file mode 100644
index d3cd140b5782..000000000000
--- a/kde-apps/spectacle/spectacle-19.04.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Screenshot capture utility"
-LICENSE="LGPL-2+ handbook? ( FDL-1.3 ) kipi? ( GPL-2+ )"
-KEYWORDS="amd64 arm64 x86"
-IUSE="kipi share"
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	x11-libs/libxcb
-	x11-libs/xcb-util
-	x11-libs/xcb-util-cursor
-	x11-libs/xcb-util-image
-	kipi? ( $(add_kdeapps_dep libkipi '' '' '5=') )
-	share? ( $(add_frameworks_dep purpose) )
-"
-RDEPEND="${DEPEND}
-	kipi? ( kde-apps/kipi-plugins:5 )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package kipi KF5Kipi)
-		$(cmake-utils_use_find_package share KDEExperimentalPurpose)
-	)
-	kde5_src_configure
-}
diff --git a/kde-apps/spectacle/spectacle-19.08.3.ebuild b/kde-apps/spectacle/spectacle-19.08.3.ebuild
index a2747989c551..4124e27822eb 100644
--- a/kde-apps/spectacle/spectacle-19.08.3.ebuild
+++ b/kde-apps/spectacle/spectacle-19.08.3.ebuild
@@ -13,7 +13,7 @@ inherit ecm kde.org
 DESCRIPTION="Screenshot capture utility"
 LICENSE="LGPL-2+ handbook? ( FDL-1.3 ) kipi? ( GPL-2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="kipi share"
 
 DEPEND="
diff --git a/kde-apps/spectacle/spectacle-19.12.0.ebuild b/kde-apps/spectacle/spectacle-19.12.0.ebuild
new file mode 100644
index 000000000000..d625a8158edb
--- /dev/null
+++ b/kde-apps/spectacle/spectacle-19.12.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 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.63.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Screenshot capture utility"
+HOMEPAGE="https://kde.org/applications/utilities/org.kde.spectacle"
+
+LICENSE="LGPL-2+ handbook? ( FDL-1.3 ) kipi? ( GPL-2+ )"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="kipi share"
+
+DEPEND="
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kglobalaccel-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwayland-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	x11-libs/libxcb
+	x11-libs/xcb-util
+	x11-libs/xcb-util-cursor
+	x11-libs/xcb-util-image
+	kipi? ( >=kde-apps/libkipi-${PVCUT}:5= )
+	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
+"
+RDEPEND="${DEPEND}
+	kipi? ( >=kde-apps/kipi-plugins-${PVCUT}:5 )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package kipi KF5Kipi)
+		$(cmake_use_find_package share KF5Purpose)
+	)
+	ecm_src_configure
+}