gentoo resync : 04.05.2018

3 files changed, 2 insertions, 85 deletions

diff --git a/media-plugins/kipi-plugins/Manifest b/media-plugins/kipi-plugins/Manifest
index f5e36e6dbfb0..90494e181a41 100644
--- a/media-plugins/kipi-plugins/Manifest
+++ b/media-plugins/kipi-plugins/Manifest
@@ -1,5 +1,3 @@
-DIST digikam-5.7.0.tar.xz 123315064 BLAKE2B 0879b25e674e39d204038ab629dec36757ae034e3dd7e9a0a3700f9703272c4a972a21c1db5a42c6c294247a1226b1cb9a8b980bb90cdcc12e0cd752459273ef SHA512 626c9854311c637b994325237f171adce3dba39159fb336dfe95f1de287e2d08a3aaddd611eea87e8018047d331aff252b555c382cfbe1d8e14413c51a3849f4
 DIST digikam-5.9.0.tar.xz 132931184 BLAKE2B cfbcbae8471c9c00bdf846d13bbc1ce3fbbd2ee4cc86500d011f9e15c1a21d7799638f94708794e8bc36a200df455667f9df8fcefdc38aaa00060630807d11cb SHA512 f6134a957dcd11343e34f0bc90f5560a28ed205c47d2ffd76a5418a4c63f76706045e9179c47f1448304b59081051b524f7a6847c3c1dcee4673047ce5d90e63
-EBUILD kipi-plugins-5.7.0.ebuild 2060 BLAKE2B 42eb5f2d8be5bd55538a894c6a60c0f6060996840f83d1ba9a21bde46b279c0f24d1cd28d61e4f60388e9e7f308e0dd5c4a9585fa3f917da39bfff93cbade8f1 SHA512 79996bbb38050d3bb324c9fa836b6f1ee9f2d725c849fe4b03386500efdb969f521233cbd81fa1d62e9fa7327ae90bb14d5f2d9520b370bc7bbf033ed7ba00b7
-EBUILD kipi-plugins-5.9.0.ebuild 2062 BLAKE2B ce4f1d310c1cda9b3b641894cb8d274e8a530b72afd65f98869a98f221bfcafde04c4371d03b97da4bb73db0bf8f3cef06c6833b8ea33a6a474b87d4fe505388 SHA512 543346fb46fb7f51b281ef3c68f61af7c6ee4bf290694ee29b2452c074ccbfe3f2908982b3bd37bd422f4aa8ddaee6a112cc164a00f188411225ea9f03a3fb8b
+EBUILD kipi-plugins-5.9.0.ebuild 2060 BLAKE2B c08b079e42b76323806452bea9afaa67a467b2a22f43e37359c07a472886de538388cc9fd4533cc4831c6ad4504c0c1d56c40f9b51eca4b3494816abd58bcf2d SHA512 a1d27d1d1ec8501d41519f4cab50cbd5fbacf69032e7fd5e8df1dc123cb3d4cc74797b824c57501d11d32ee6ba9942ba995d04274d8bc91c1c659a4f70f1a498
 MISC metadata.xml 687 BLAKE2B 77c5f391f0a6a78baa467283a0352ac6d79f8aad93e57fd6a57b6d61a04b7c45968f55d587b234edd2077bd94cffddcb039ea48b06cc83a255e0030384298ccf SHA512 1d3260f089af7889757e0960f74bd4c30ee7ec1c866d0eda82c09ae13be4cdbfd481e9da856d18f6c71008a58f8680275dd70e572449240062d216cf175079a9
diff --git a/media-plugins/kipi-plugins/kipi-plugins-5.7.0.ebuild b/media-plugins/kipi-plugins/kipi-plugins-5.7.0.ebuild
deleted file mode 100644
index 8335d0fe00e4..000000000000
--- a/media-plugins/kipi-plugins/kipi-plugins-5.7.0.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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 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.0.ebuild b/media-plugins/kipi-plugins/kipi-plugins-5.9.0.ebuild
index 5a19db42937a..245fd0ff11a4 100644
--- a/media-plugins/kipi-plugins/kipi-plugins-5.9.0.ebuild
+++ b/media-plugins/kipi-plugins/kipi-plugins-5.9.0.ebuild
@@ -13,7 +13,7 @@ LICENSE="GPL-2+"
 IUSE="flashexport mediawiki +remotestorage vkontakte"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	if [[ ${PV} =~ beta[0-9]$ ]]; then
 		SRC_BRANCH="unstable"
 	else