gentoo resync : 17.07.2021

3 files changed, 4 insertions, 63 deletions

diff --git a/kde-apps/kipi-plugins/Manifest b/kde-apps/kipi-plugins/Manifest
index 708cedfde22a..7bf51f23028c 100644
--- a/kde-apps/kipi-plugins/Manifest
+++ b/kde-apps/kipi-plugins/Manifest
@@ -1,7 +1,5 @@
 DIST kipi-plugins-20.12.3.tar.xz 1644852 BLAKE2B 5b2e298b34d12508910ff005f525cd457c2865a553f07089df33144eb8f3acf06bee9b761e388ac1474929bc4df558ef772981b1345e40fc3de6df90ac5e4be5 SHA512 8e5cf2ea81facc7ab5eed509be71b0dc57e93ce06237c805211493e345805f82b3aa3f8994d0def3b81dec97261409acb9bc51616b85eebf10a98c43369b4992
-DIST kipi-plugins-21.04.2.tar.xz 1654380 BLAKE2B 874bf8bdcf54d6daa6bec268f78e9c7da4aaa34f20577f4c61bb1dd25edeb64951b62ec9a28cc10a24714e99fcf722483fdd5a911cd989aa0e18d903d0278dad SHA512 08a96b974940d373a8aaff9a03afd47f53bdec6cdafb4fcf5dec1fa8a4658415f30acba19982122666c6873ce7f164b00bb473e093fe5151f74942291a6395be
 DIST kipi-plugins-21.04.3.tar.xz 1654288 BLAKE2B 32660d84e939f54ff95a9076d2d92fef2d2896139e37b52ab4cd6f78dfb7aa3ab786d20f17494c6d0aa7751cf96a3ba7c3af085ca2a72da5e547e41f404e228d SHA512 b845c94415409f21cbc95d6d4f16a8a628e8ae217c180148d8e0a259a8f15f00b7cffbb6bf75be8c35efe180049feac46f0a2549cc89a263f1037bbd0866f675
 EBUILD kipi-plugins-20.12.3.ebuild 1475 BLAKE2B 3042d038c11b4524cc55cae7634c9b385423a3662fdf8ea09502f6839ff64b0f200a1c19e65be3cec0e0d9a01b03115a0c71bd0f49da2bfe9871fef60a766eb5 SHA512 b9cc12a574d3499eba8bb6d634c69a21db27bda0238d1d5776c93179fd997e775947319de61aac578b0e51ff71e893ae96f5f8491ce32f04ee93c4e2fbee2f78
-EBUILD kipi-plugins-21.04.2.ebuild 1478 BLAKE2B f2c0098e2591e9407e2d26bcbd653b8accf62156b9a16101664fac96fdabb313464c390cdcfca90ce850568fa656ae2f7d79b56d8d109a8f25a0d43ddcff1342 SHA512 e3f3331fcb6d3b6c535a47e3a6fa11bc15c8be4841b87531b5fddb7fdb5ae3215b72c945c459bb8fe8a8042d179874cb26cc9e6d9c5ff44f4d9a76758884bdc6
-EBUILD kipi-plugins-21.04.3.ebuild 1478 BLAKE2B f2c0098e2591e9407e2d26bcbd653b8accf62156b9a16101664fac96fdabb313464c390cdcfca90ce850568fa656ae2f7d79b56d8d109a8f25a0d43ddcff1342 SHA512 e3f3331fcb6d3b6c535a47e3a6fa11bc15c8be4841b87531b5fddb7fdb5ae3215b72c945c459bb8fe8a8042d179874cb26cc9e6d9c5ff44f4d9a76758884bdc6
+EBUILD kipi-plugins-21.04.3-r1.ebuild 1349 BLAKE2B e07661b5bdd6422c2bf914e0de0148aa5f3b4af9321104784c106becb59e4d3378c56502eac1db49ba8498b9bafd229c743dc7631e8b789d924f6b2e50e378e2 SHA512 ac1573226acc6365045a4f4c53aae41a453f37996c1a0efb31868a7f491a77ce1fcf64fdb78f4dbca1a992e45c9515f0f762ee552f0481a1be17ad389c57ad57
 MISC metadata.xml 625 BLAKE2B cd63f210400e6238f574fbae4a33d2b299aa3c46c9264e21521255a3af9918805ba8905156629a676e3375009c873208a843a0d82f8a260689ef854321d55cdf SHA512 4f61eb0e78808875c77cbafd1c95fa7c8fde0e6b05b539308d5130f5ed5b7116ce54e1444e30c88ae3d295185442c99fa1f0db03b533aac15efeb06613b91f79
diff --git a/kde-apps/kipi-plugins/kipi-plugins-21.04.2.ebuild b/kde-apps/kipi-plugins/kipi-plugins-21.04.3-r1.ebuild
index eb847bcd97ec..1d4039b5fde9 100644
--- a/kde-apps/kipi-plugins/kipi-plugins-21.04.2.ebuild
+++ b/kde-apps/kipi-plugins/kipi-plugins-21.04.3-r1.ebuild
@@ -10,14 +10,13 @@ QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Plugins for the KDE Image Plugin Interface"
-HOMEPAGE="https://userbase.kde.org/KIPI https://invent.kde.org/graphics/kipi-plugins"
+HOMEPAGE="https://apps.kde.org/kipi_plugins/ https://userbase.kde.org/KIPI"
 
 LICENSE="GPL-2+"
 SLOT="5"
 KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="flashexport mediawiki +remotestorage"
+IUSE="mediawiki +remotestorage"
 
-BDEPEND="sys-devel/gettext"
 RDEPEND="
 	>=dev-qt/qtgui-${QTMIN}:5
 	>=dev-qt/qtnetwork-${QTMIN}:5
@@ -34,21 +33,19 @@ RDEPEND="
 	>=kde-frameworks/ki18n-${KFMIN}:5
 	>=kde-frameworks/kwindowsystem-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	flashexport? ( >=kde-frameworks/karchive-${KFMIN}:5 )
 	mediawiki? ( net-libs/libmediawiki:5 )
 	remotestorage? ( >=kde-frameworks/kio-${KFMIN}:5 )
 "
 DEPEND="${RDEPEND}
 	>=dev-qt/qtconcurrent-${QTMIN}:5
 "
+BDEPEND="sys-devel/gettext"
 
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_DISABLE_FIND_PACKAGE_KF5Vkontakte=ON
-		$(cmake_use_find_package flashexport KF5Archive)
 		$(cmake_use_find_package mediawiki KF5MediaWiki)
 		$(cmake_use_find_package remotestorage KF5KIO)
 	)
-
 	ecm_src_configure
 }
diff --git a/kde-apps/kipi-plugins/kipi-plugins-21.04.3.ebuild b/kde-apps/kipi-plugins/kipi-plugins-21.04.3.ebuild
deleted file mode 100644
index eb847bcd97ec..000000000000
--- a/kde-apps/kipi-plugins/kipi-plugins-21.04.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 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.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Plugins for the KDE Image Plugin Interface"
-HOMEPAGE="https://userbase.kde.org/KIPI https://invent.kde.org/graphics/kipi-plugins"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="flashexport mediawiki +remotestorage"
-
-BDEPEND="sys-devel/gettext"
-RDEPEND="
-	>=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
-	>=kde-apps/libkipi-${PVCUT}:5=
-	>=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
-	flashexport? ( >=kde-frameworks/karchive-${KFMIN}:5 )
-	mediawiki? ( net-libs/libmediawiki:5 )
-	remotestorage? ( >=kde-frameworks/kio-${KFMIN}:5 )
-"
-DEPEND="${RDEPEND}
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_KF5Vkontakte=ON
-		$(cmake_use_find_package flashexport KF5Archive)
-		$(cmake_use_find_package mediawiki KF5MediaWiki)
-		$(cmake_use_find_package remotestorage KF5KIO)
-	)
-
-	ecm_src_configure
-}