gentoo resync : 18.11.2019

3 files changed, 58 insertions, 54 deletions

diff --git a/kde-apps/spectacle/Manifest b/kde-apps/spectacle/Manifest
index 18322884acc3..9b044a4c444c 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.2.tar.xz 965432 BLAKE2B 7cf8802a973772a2140a27fee1f7bd552cb6f19dcd9cc74688c3faa2f12cc5e92561c1ce0f8802775b77d7b5c68842cf26ff5cf6c2c1be0430559041877b6695 SHA512 a03dbe13aa0e0cea07b6505ead130946233574863fc5994d42a971d8a9ae0a24be5e4dfab38640857d5bb89f33dc3736bad7e87a3a76aa83b450156e8db96723
+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.2.ebuild 1341 BLAKE2B 128e5035159b4e55e596f2e4ff02565c3ecce2b45573c9338b6fcc206453c33cbe66479ff3e5109782b7e71a5fb9b92bc88c80d2957603fa99660cd7afdd97e2 SHA512 30c923cf46605f6687114d6844569bdf6d92c1c72a915c275d9b66e8b7f312a71ff778e74693865c099c71394e4f6e5c1a83213bdbdc8e3f0c2ae5d475d79d5a
+EBUILD spectacle-19.08.3.ebuild 1519 BLAKE2B 00f89d9109d7ec6ec700433d6e7a28c742ef99bf96a3ea455e25682896f47e5007f2e6b0408dab791322ca41fd59f63184995c5cb56f041c7d228c6d97293a1e SHA512 496f83f56311631fd8ae8b332156f2ebaad06ffd0a98441bbf936ff9dd76f0f0cff9e29642d0f465cb64f45ba5ec114f97614fc3e779947a5fbfb88f4f12ab3c
 MISC metadata.xml 441 BLAKE2B 82a565ee86151104ad5c24329d7649230f817d78c9fc6a393ec028d4d92cb6e8c968deba9f3f344125da283a14eaf671a6105f548eee1051290530a2d33d9143 SHA512 674c31c3c5639f6ba218f5cc9342ec5a00b944212563db07dfd223c4897a3d1f315dc7a0735be7b30d75d3706e6355f3547cd17c9ab20e7387974ff1adfe5716
diff --git a/kde-apps/spectacle/spectacle-19.08.2.ebuild b/kde-apps/spectacle/spectacle-19.08.2.ebuild
deleted file mode 100644
index 4509c6106770..000000000000
--- a/kde-apps/spectacle/spectacle-19.08.2.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"
-KDE_TEST="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 kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwayland)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(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? ( $(add_kdeapps_dep kipi-plugins) )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package kipi KF5Kipi)
-		$(cmake-utils_use_find_package share KF5Purpose)
-	)
-	kde5_src_configure
-}
diff --git a/kde-apps/spectacle/spectacle-19.08.3.ebuild b/kde-apps/spectacle/spectacle-19.08.3.ebuild
new file mode 100644
index 000000000000..a2747989c551
--- /dev/null
+++ b/kde-apps/spectacle/spectacle-19.08.3.ebuild
@@ -0,0 +1,56 @@
+# 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.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Screenshot capture utility"
+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-utils_use_find_package kipi KF5Kipi)
+		$(cmake-utils_use_find_package share KF5Purpose)
+	)
+	ecm_src_configure
+}