gentoo resync : 02.09.2020

3 files changed, 2 insertions, 61 deletions

diff --git a/kde-apps/yakuake/Manifest b/kde-apps/yakuake/Manifest
index 44ee9575d982..d7997e140aa8 100644
--- a/kde-apps/yakuake/Manifest
+++ b/kde-apps/yakuake/Manifest
@@ -1,7 +1,6 @@
 AUX yakuake-20.04.3-fix-fullscreen-mode-regression.patch 1256 BLAKE2B aba9e6e4be68bbf49050f5fd61ff28aed4e639dac28fbe2b2dd18ff62671984c388680215338c426175fbd59d6646d203d78cc76dc166c38a5df7f097a05ebb9 SHA512 8e5ac666093d6bf78467b78f750e317a5dd18f40cf5d9fc911a0a4e5fc34e0e92b692eaf6e61caf06c12c7e1b8be12fb8003fd60b757822b3ccd193c121f01a8
 DIST yakuake-20.04.3.tar.xz 374280 BLAKE2B aa53e81af0e77a74ac637d185108341b89ec82ff94dcbc3f3cb0a6a8916cb3b7bcd48bad4d127c073de7f6788a38ae7c8a8c4092aaa72ce9d405e7214ea7342a SHA512 a5b9b42b8fb47fe94c06cbdfc54683ae33ce9a84da3942efba1fee52e6103bd8ab60ef4bf46316793577813940250909fe74e722db77f57157e650612e592658
 DIST yakuake-20.08.0.tar.xz 380584 BLAKE2B 7685523c6b719f3c51cd12867a3b6089c823895033c8df6bb106256c846671575a9f60cd523fde6120851d064ada3be385c203b3e97e7c458fc5b0eab16cbfb9 SHA512 9f89bb7294e8c6fd022eeb6acc59e8766093b682108f42190b082ad3033e3a9832e8c2620e0948f1461d2d0a47fc585946e7c9b2e06e51e2666d6f391978fb48
-EBUILD yakuake-20.04.3-r1.ebuild 1649 BLAKE2B 5bbbecc21d8bf461f004a9b27b022f8909efd0155895b1642f4966fc096149949994579607e74f207433be08683bc651c970fb50047f1e33b4d94c4a0dfcd42d SHA512 503f8f3434f5717e2fa1eab9a64aa1c84941112a5106e331cd38752aaa0c5148a61f224fc166ccbdb8a9401c0ba05ff65a1328ad8050efe3cb46b3f9be5825f7
-EBUILD yakuake-20.04.3.ebuild 1565 BLAKE2B 5862fc864d4f3cc096c8df3e69664b95cd2d87705a5d24ae91589634fae7ef3f06631e05c866485dbc0cc9434f3c773b1f9a24dbc17ccf8ba5f83c8d43866e76 SHA512 a84c276f6d538c23bdcef719826a922ca8975b551dea4abfa8a09037dd11802308c37c50d70e9f3ab10ed008f2eebfbf75780c12ec62da9978f2be9ed607939a
+EBUILD yakuake-20.04.3-r1.ebuild 1647 BLAKE2B 5c62f1286f7345d41efb89ea1b73ee9e5d230bd85018851064bd4d279df63ea44b1d9c6124dfd68dbdd8e900acb30eb2a33d88d76c6fd656827a233b5010b582 SHA512 6e1bfc6048c7fa5fc6414b288c3222b94a6767f631b9a70649c5d47137473830c559eaa69b402299396ed887d0c9bee5eb077301e26be2b0f8cc50f77b638335
 EBUILD yakuake-20.08.0.ebuild 1568 BLAKE2B e339e69435f20f11922c82a3210a5ea30ce02338eb974f7c7aa30ef68e29ffdc94067543cd073ec2a1f9483192fc0cd0ba33a949665e63ae34d9ec32f996ff74 SHA512 828815417f89ed05b3f34bdf07ddbeeba2d5c94e14c236bdb344cd1d3e6b56ee6c41b82639bc68172e15210585db03928eb82ebf30342a10e00104791fa53c5d
 MISC metadata.xml 661 BLAKE2B c0ff7bbfa76614ec0d6ed52ca7af363bf4c441cc06343c613ba6100a68269915d71dea39329d02fc95384ce71331bb367d4cddfdc0c560ea2748843ea7c31c8a SHA512 a842fdcbb48892a13e74eacd0aca111cbba02bd4c43fb9544ed4e4a9c72d122a3190f0090e8b7f63cceba1d449fb7bf629954a9e60dd541e40908818478fcb13
diff --git a/kde-apps/yakuake/yakuake-20.04.3-r1.ebuild b/kde-apps/yakuake/yakuake-20.04.3-r1.ebuild
index 8f4fb0b6254f..1561b1597e60 100644
--- a/kde-apps/yakuake/yakuake-20.04.3-r1.ebuild
+++ b/kde-apps/yakuake/yakuake-20.04.3-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://kde.org/applications/system/org.kde.yakuake"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="5"
-KEYWORDS="~amd64 arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="absolute-position X"
 
 DEPEND="
diff --git a/kde-apps/yakuake/yakuake-20.04.3.ebuild b/kde-apps/yakuake/yakuake-20.04.3.ebuild
deleted file mode 100644
index 1501ddff9a6c..000000000000
--- a/kde-apps/yakuake/yakuake-20.04.3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.14.2
-inherit ecm kde.org
-
-DESCRIPTION="Quake-style terminal emulator based on konsole"
-HOMEPAGE="https://kde.org/applications/system/org.kde.yakuake"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="absolute-position X"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/konsole-${PVCUT}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	absolute-position? ( >=kde-frameworks/kwayland-${KFMIN}:5 )
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-	)
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package absolute-position KF5Wayland)
-		$(cmake_use_find_package X X11)
-	)
-
-	ecm_src_configure
-}