gentoo resync : 21.05.2019

3 files changed, 2 insertions, 85 deletions

diff --git a/media-plugins/kipi-plugins/Manifest b/media-plugins/kipi-plugins/Manifest
index 15355f031fb0..4581243d1d61 100644
--- a/media-plugins/kipi-plugins/Manifest
+++ b/media-plugins/kipi-plugins/Manifest
@@ -1,5 +1,3 @@
-DIST digikam-5.9.0.tar.xz 132931184 BLAKE2B cfbcbae8471c9c00bdf846d13bbc1ce3fbbd2ee4cc86500d011f9e15c1a21d7799638f94708794e8bc36a200df455667f9df8fcefdc38aaa00060630807d11cb SHA512 f6134a957dcd11343e34f0bc90f5560a28ed205c47d2ffd76a5418a4c63f76706045e9179c47f1448304b59081051b524f7a6847c3c1dcee4673047ce5d90e63
 DIST kipi-plugins-5.9.1.tar.xz 1468084 BLAKE2B 92ae30ae4c3fa2af173b32b294a610c1670754be5e40d395aec939e192ada42b274572de3dd449e74f26f1680abe07cd3ba48f67d25b75541317e9dc7ac3b494 SHA512 7536602edc85464aa651f5134f1dc085141632775907603d738f3915c718df359adb155013571ab836f91a1fb597418a1437e677b98c086bce5ea884133cca51
-EBUILD kipi-plugins-5.9.0.ebuild 2064 BLAKE2B e4f2001bdead9f014a543a1b198f5bae46bd5e968201f53d028021f74a24301f3f5fdad9ac2a74d670d15946cb95d6b43637620d35e0da00245a909fe287fcea SHA512 b33a3a2244f9a9fdc9aee333b910345ed91e8dd6e0651d461f16d921126beadfb7774b75e819653adf01585561ec5b9e85b28862839e455eeafaec7ee72aa186
-EBUILD kipi-plugins-5.9.1.ebuild 1472 BLAKE2B dfa41d1794a49f6725f4ab938e10e4d4d1ce2576615659aefe11a339c009ac36b6256a835b1c4ac3ae960017df478c65e628aa732d9b6efe95ae036b9fc36005 SHA512 cbbcdcc24c3aa2c326fda3ad2cec2997d3599239f3414ef6ca0efe908a516e02a669a2e79f004ea28f12f9932307c8549133ec0247b8daf0010c237b63044d06
+EBUILD kipi-plugins-5.9.1.ebuild 1471 BLAKE2B 555ffc87f6cf62db12f2075f408014bc401f127bce26fdfd2bfd663d2b797b25a147add31c084593e9e4714a0f567cb1a4251e5d378915ea39ec8d98907f5be3 SHA512 e11a151c2df8370bc39f532625da1670af080c55e68ddc8466be55669abe1a9b579c4af4b4fd924d66c93709af569325fc58b60428efa96d53180f34d3c3cfae
 MISC metadata.xml 687 BLAKE2B 77c5f391f0a6a78baa467283a0352ac6d79f8aad93e57fd6a57b6d61a04b7c45968f55d587b234edd2077bd94cffddcb039ea48b06cc83a255e0030384298ccf SHA512 1d3260f089af7889757e0960f74bd4c30ee7ec1c866d0eda82c09ae13be4cdbfd481e9da856d18f6c71008a58f8680275dd70e572449240062d216cf175079a9
diff --git a/media-plugins/kipi-plugins/kipi-plugins-5.9.0.ebuild b/media-plugins/kipi-plugins/kipi-plugins-5.9.0.ebuild
deleted file mode 100644
index a4f546183106..000000000000
--- a/media-plugins/kipi-plugins/kipi-plugins-5.9.0.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Plugins for the KDE Image Plugin Interface"
-HOMEPAGE="https://www.digikam.org/"
-
-LICENSE="GPL-2+"
-IUSE="flashexport mediawiki +remotestorage vkontakte"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	KEYWORDS="amd64 ~arm64 x86"
-	if [[ ${PV} =~ beta[0-9]$ ]]; then
-		SRC_BRANCH="unstable"
-	else
-		SRC_BRANCH="stable"
-	fi
-
-	MY_PV="${PV/_/-}"
-	MY_P="digikam-${MY_PV}"
-	SRC_URI="mirror://kde/${SRC_BRANCH}/digikam/${MY_P}.tar.xz"
-	S="${WORKDIR}/${MY_P}/extra/${PN}"
-fi
-
-COMMON_DEPEND="
-	$(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="${COMMON_DEPEND}
-	$(add_qt_dep qtconcurrent)
-	sys-devel/gettext
-"
-RDEPEND="${COMMON_DEPEND}
-	!media-plugins/kipi-plugins:4
-"
-
-src_prepare() {
-	if [[ ${KDE_BUILD_TYPE} = release ]]; then
-		if [[ ${SRC_BRANCH} = stable ]]; then
-			# prepare the translations
-			mv "${WORKDIR}/${MY_P}/po" po || die
-			find po -name "*.po" -and -not -name "kipiplugin*.po" -delete || die
-			echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt || die
-			echo "add_subdirectory( po )" >> CMakeLists.txt || die
-		fi
-	fi
-
-	kde5_src_prepare
-}
-
-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
-}
diff --git a/media-plugins/kipi-plugins/kipi-plugins-5.9.1.ebuild b/media-plugins/kipi-plugins/kipi-plugins-5.9.1.ebuild
index 610b6300b5b0..11fe9c31b7b3 100644
--- a/media-plugins/kipi-plugins/kipi-plugins-5.9.1.ebuild
+++ b/media-plugins/kipi-plugins/kipi-plugins-5.9.1.ebuild
@@ -10,7 +10,7 @@ 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"
+	KEYWORDS="amd64 ~arm64 x86"
 	SRC_URI="mirror://kde/stable/kipi-plugins/${P}.tar.xz"
 fi