gentoo resync : 29.01.2021

3 files changed, 2 insertions, 69 deletions

diff --git a/kde-apps/spectacle/Manifest b/kde-apps/spectacle/Manifest
index beaac4733f73..456e8985633e 100644
--- a/kde-apps/spectacle/Manifest
+++ b/kde-apps/spectacle/Manifest
@@ -1,6 +1,5 @@
 DIST spectacle-20.08.3.tar.xz 1156220 BLAKE2B 3ebf54668fda63db6c1d938beedd287d7570749a6f9c6de89752d42abb7fe75687a6e3135a0fcd8f86b741a286518040627b2da0fc96ba029dfd1e1ede9a04ef SHA512 baae34ae4c7b3811e008ae8c1c2d6d6603fd39533279cc3ed79d4a38fa6cb3879ece30bc9ed1b1a5163691dcb2adea7e8cd3d655788f680feb94c38ad53610ac
 DIST spectacle-20.12.1.tar.xz 1163912 BLAKE2B 5ba6ff90e9f98a711eaf99b04f4bc6799a1bedf7c91c836657b51fb204cb7607ea219fc9c6b2c343b4c21ac980d42be3094e409833e81c0e1db4fa5f15cd169a SHA512 7df1907ed350d19d48e522c7a591e3d4464a60d18b9f88242713062ea9a68aa966221fd2e6c3548cf0cc325fa7a7e9ec0c3d9856edf95c2cdcf74b950f10ba60
 EBUILD spectacle-20.08.3.ebuild 1584 BLAKE2B 376e19a3c18b18179f6d3b20cea9c1826169aa6e81ff3739ba5cc25418cdec1990f2e85d68e5a0236dd03d1b2f813ee11e5edab097bc9a749e7778594a6cd87e SHA512 8eb0e28f8817101a1399d3e5e878a288a6b986bbe3b0e6939b2667f4fa8f17545cfed77814f1bba8b2e540b53243dd0ce78481a8160f575d851fb2d9867b9ab5
-EBUILD spectacle-20.12.1-r1.ebuild 1963 BLAKE2B 11612be512cdf9724b2a0667e3895aca86e5dfda6659e767691cafe506ea9479ab3e9fb99110d56f2f4a0beea19e14d5e773d6c9b16e2569f72de08782fb7e3f SHA512 34bdb2250583436f0fb9c8bc3703ba58c26aaf08216b820902b7083c9de78e624a8c06410520f19f05a598705650661cfbcd4b23574e2af5f21dfd5e74bb0db5
-EBUILD spectacle-20.12.1.ebuild 1713 BLAKE2B 39009bd94ddb6fe01e947be5c9d7b701794214b82d4034761918ade0f808b23bce8f43febc45f834ced80088be6d7385145d80bbe645f95bf16a73edc7c84b38 SHA512 c15a8e2238f9bb445c404e627aecacbf7d3106a4888dbe1cd547a70ebd01c6238994bbda443f79085495f0a9d274ae422468798d32d577f4293e1efd7561c8e3
+EBUILD spectacle-20.12.1-r1.ebuild 1970 BLAKE2B 8e34a6da506d489d5aa48770d2c920538e5ae560c4b5e2707dd64fa565a733c4a64ad1c4000fe4ff34e116e89f1ecf1011fdffea3db2efa5e09c03f0deaea77a SHA512 5379b550fab1d17f9da9bd86c868a57fad79a38b15bbee0a2d04538c1d7ac7975af30f91eb886fab2f7fc641ae7751112a990725717007d57ebc3b83112e5740
 MISC metadata.xml 558 BLAKE2B 304071c16927d1f17fb0b30c3bc71ac9cf707a9cb06816957a8382b3eaac9083d3456b142bc3e0dc745588f14641e461c20b13840258997c85b84bbdaa5659e8 SHA512 0cc62fa4faa18491636dd37eea421cfc880e8997101420e15a876e070c6c14369063f6785d1f0474b3d79fc42860455fe4ffcb90db9f7a61e0492500d19aaa44
diff --git a/kde-apps/spectacle/spectacle-20.12.1-r1.ebuild b/kde-apps/spectacle/spectacle-20.12.1-r1.ebuild
index 3fc21616ca70..274f36a9b8f7 100644
--- a/kde-apps/spectacle/spectacle-20.12.1-r1.ebuild
+++ b/kde-apps/spectacle/spectacle-20.12.1-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/en/spectacle"
 
 LICENSE="LGPL-2+ handbook? ( FDL-1.3 ) kipi? ( GPL-2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="+annotate kipi share"
 
 # TODO: Qt5Svg leaking from media-libs/kimageannotator
diff --git a/kde-apps/spectacle/spectacle-20.12.1.ebuild b/kde-apps/spectacle/spectacle-20.12.1.ebuild
deleted file mode 100644
index 55b8590a0d7d..000000000000
--- a/kde-apps/spectacle/spectacle-20.12.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 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.75.0
-QTMIN=5.15.1
-inherit ecm kde.org
-
-DESCRIPTION="Screenshot capture utility"
-HOMEPAGE="https://apps.kde.org/en/spectacle"
-
-LICENSE="LGPL-2+ handbook? ( FDL-1.3 ) kipi? ( GPL-2+ )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="kipi share"
-
-# TODO: mv guru.git -> gentoo.git
-# IUSE+=" annotate"
-# DEPEND+="
-# 	dev-qt/qtsvg-${QTMIN}:5
-# 	x11-libs/kimageannotator
-# "
-
-DEPEND="
-	>=dev-qt/qdbus-${QTMIN}: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
-	>=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
-	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_use_find_package kipi KF5Kipi)
-		$(cmake_use_find_package share KF5Purpose)
-	)
-	ecm_src_configure
-}