gentoo resync : 15.12.2019

4 files changed, 59 insertions, 59 deletions

diff --git a/kde-apps/kipi-plugins/Manifest b/kde-apps/kipi-plugins/Manifest
index a798568b23a8..4ca02c348e40 100644
--- a/kde-apps/kipi-plugins/Manifest
+++ b/kde-apps/kipi-plugins/Manifest
@@ -1,5 +1,5 @@
 DIST kipi-plugins-19.08.3.tar.xz 1629776 BLAKE2B 36ca49c935c4f9bc8aa574e447afc59189a5193102265192ff1b8aab8380f6542a7f9f4cc896146c087b7cffac942bab1bcc1b50ed0e3c3d7378bd2a62bcac79 SHA512 58901a4c0ba40da99aa2d06381cffd61bacfec5ea040abab73044ab38241460b71421629390c93818c74bfee7f195ed29c423462a057f2b1b990e40edeae5c0a
-DIST kipi-plugins-5.9.1.tar.xz 1468084 BLAKE2B 92ae30ae4c3fa2af173b32b294a610c1670754be5e40d395aec939e192ada42b274572de3dd449e74f26f1680abe07cd3ba48f67d25b75541317e9dc7ac3b494 SHA512 7536602edc85464aa651f5134f1dc085141632775907603d738f3915c718df359adb155013571ab836f91a1fb597418a1437e677b98c086bce5ea884133cca51
-EBUILD kipi-plugins-19.08.3.ebuild 1544 BLAKE2B 46371288c75907353bc9b6cf5a2d837686d3a7936e1a0da93e25d2aebb206a66f93854a4ba626c9e172989ad5cb7c5fb6791fe1ecaf5674bde2b3d83ad09307a SHA512 623de5d3ba5d2252839531827287fdcc741ecdd9a3bd5950eecfbcac420dc077cd79b7baa41fd684ddc83a1a659dccc7e44b8710730eea0b79878f67ec658042
-EBUILD kipi-plugins-5.9.1.ebuild 1470 BLAKE2B b291a907b418ac93d8b1fe4a5e9f0e8b1c24209a02bb9938e2e7613a3cf7d07f160ea6ffbddc1693a2b6564db8e3e3cae0f8f9d78df2ff65a2fbb08fb915b3e2 SHA512 d1e97faea87418e28a653d64691de5d03560fe3de3df1a4c7ee0e996c7db81048c82905ba3f54aca4c52ae0abad98d19d4d7f854ce4e6f6aae1113dc50a9989b
+DIST kipi-plugins-19.12.0.tar.xz 1631208 BLAKE2B 2aa74098262c72af4069a0826a7d11c0ef0e6a40f2e2416699ce16cb6da848cca897197c7f916a49dc835d3372f316b6780e0eb9c6d6c1a13a91871d40f61e2c SHA512 84db7485deda06ff7326eaa5c2a949b7733ea350c47f4e98566b85dce4ebd16a23ebf88d66790dc7f1d4851f11bb13e7b140505a8b9d11c807300af74123cf1f
+EBUILD kipi-plugins-19.08.3.ebuild 1541 BLAKE2B b965ab025e3e20a11ad951d55aa808dd3741216c9bb190bd6fd9133db4ca42526d9b3cc99e2431b04212ec58b9e06624f8e0f1a5d89a3b08934c21518b78f567 SHA512 727339fb795b3a6dfa0e5b8ef24b6cad95e142b03779db6e8067462d5e0cb89b13f64d1f91ebf23905c2bfea6ce18166d02873f072611848c934ec5f24bea735
+EBUILD kipi-plugins-19.12.0.ebuild 1520 BLAKE2B e05f7d13314c23b328ef68bf60ebefe488b3fdf63f55fc84ffd8ce52cf66c86cb8d9b46d2321366253896c598ed2f04a88a39416b0e521af25104fe7e8a104e6 SHA512 3e66e786803e88caf64e272aafb75dab0d8e10a08c2ec277a5cb42563b4ddb3b9072797c520a9a10cdfeaa6fce375a9af71dacd116349270cb1503b1edc62292
 MISC metadata.xml 687 BLAKE2B 77c5f391f0a6a78baa467283a0352ac6d79f8aad93e57fd6a57b6d61a04b7c45968f55d587b234edd2077bd94cffddcb039ea48b06cc83a255e0030384298ccf SHA512 1d3260f089af7889757e0960f74bd4c30ee7ec1c866d0eda82c09ae13be4cdbfd481e9da856d18f6c71008a58f8680275dd70e572449240062d216cf175079a9
diff --git a/kde-apps/kipi-plugins/kipi-plugins-19.08.3.ebuild b/kde-apps/kipi-plugins/kipi-plugins-19.08.3.ebuild
index 9ab937a7a9ee..42f68be24379 100644
--- a/kde-apps/kipi-plugins/kipi-plugins-19.08.3.ebuild
+++ b/kde-apps/kipi-plugins/kipi-plugins-19.08.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://userbase.kde.org/KIPI https://cgit.kde.org/kipi-plugins.git/"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="flashexport mediawiki +remotestorage vkontakte"
 
 BDEPEND="sys-devel/gettext"
diff --git a/kde-apps/kipi-plugins/kipi-plugins-19.12.0.ebuild b/kde-apps/kipi-plugins/kipi-plugins-19.12.0.ebuild
new file mode 100644
index 000000000000..35fffb4c82f3
--- /dev/null
+++ b/kde-apps/kipi-plugins/kipi-plugins-19.12.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Plugins for the KDE Image Plugin Interface"
+HOMEPAGE="https://userbase.kde.org/KIPI https://cgit.kde.org/kipi-plugins.git/"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="flashexport mediawiki +remotestorage vkontakte"
+
+BDEPEND="sys-devel/gettext"
+RDEPEND="
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-apps/libkipi-${PVCUT}:5=
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=dev-qt/qtxmlpatterns-${QTMIN}:5
+	flashexport? ( >=kde-frameworks/karchive-${KFMIN}:5 )
+	mediawiki? ( net-libs/libmediawiki:5 )
+	remotestorage? ( >=kde-frameworks/kio-${KFMIN}:5 )
+	vkontakte? ( net-libs/libkvkontakte:5 )
+"
+DEPEND="${RDEPEND}
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package flashexport KF5Archive)
+		$(cmake_use_find_package mediawiki KF5MediaWiki)
+		$(cmake_use_find_package remotestorage KF5KIO)
+		$(cmake_use_find_package vkontakte KF5Vkontakte)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-apps/kipi-plugins/kipi-plugins-5.9.1.ebuild b/kde-apps/kipi-plugins/kipi-plugins-5.9.1.ebuild
deleted file mode 100644
index 3a6717c63219..000000000000
--- a/kde-apps/kipi-plugins/kipi-plugins-5.9.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Plugins for the KDE Image Plugin Interface"
-HOMEPAGE="https://userbase.kde.org/KIPI https://cgit.kde.org/kipi-plugins.git/"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	KEYWORDS="amd64 arm64 x86"
-	SRC_URI="mirror://kde/stable/kipi-plugins/${P}.tar.xz"
-fi
-
-LICENSE="GPL-2+"
-IUSE="flashexport mediawiki +remotestorage vkontakte"
-
-BDEPEND="sys-devel/gettext"
-RDEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkipi '' '' '5=')
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	$(add_qt_dep qtxmlpatterns)
-	flashexport? ( $(add_frameworks_dep karchive) )
-	mediawiki? ( net-libs/libmediawiki:5 )
-	remotestorage? ( $(add_frameworks_dep kio) )
-	vkontakte? ( net-libs/libkvkontakte:5 )
-"
-DEPEND="${RDEPEND}
-	$(add_qt_dep qtconcurrent)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package flashexport KF5Archive)
-		$(cmake-utils_use_find_package mediawiki KF5MediaWiki)
-		-DENABLE_KIO=$(usex remotestorage)
-		$(cmake-utils_use_find_package vkontakte KF5Vkontakte)
-	)
-
-	kde5_src_configure
-}