gentoo resync : 16.09.2021

4 files changed, 4 insertions, 60 deletions

diff --git a/kde-plasma/oxygen/Manifest b/kde-plasma/oxygen/Manifest
index a7f134b12e1d..ee8eeea2976f 100644
--- a/kde-plasma/oxygen/Manifest
+++ b/kde-plasma/oxygen/Manifest
@@ -1,5 +1,3 @@
-DIST oxygen-5.21.5.tar.xz 4476864 BLAKE2B bdf9d15a44c18d4cb0f18647c3960ef927bd64b7fc2c61963781ec4f690486032c7167c6995d78b9a2918571a9f55f0d3ce5a8e9848eac4acb46acb9eb9c8e77 SHA512 f8ab4989376eedecc5402dd788b15abf1a748863c510bebd306110423904790a9d3df3a246b8ed87273c4bd0425813a9b0a51181dca08b4c2ed27dcade6c950a
 DIST oxygen-5.22.5.tar.xz 4471020 BLAKE2B 3462d89fc6d151d9a746290374c174066eed0e95404b8a6fd4c1810b185ed3d74ef78e76c583750dafb2d29cc7fcb9ddfd6415db061fcad6040984e0145fd1f5 SHA512 5002d0260a5bf93ac98d9262330f4db8484c0a6ecbd217783321bf916ef4a8f27e5c94d301e6da95cf8f276ab210e14765439f8ff6be44220e8f526d7bb24fe1
-EBUILD oxygen-5.21.5.ebuild 1363 BLAKE2B 700541554aad8371b525ac98bdd4f33e6bc78200e82279f120e0197561183f0298a1f33e4c398cb7988ec4a009d267bf08f4a907ae135db8f77d1a919ee5c11b SHA512 cc7e82878da2895030e9ff06651c7a1a71f021fb7e661e1de8b294e30c2a31145e72444fec9f6e66db597e00825fa71cba1730fad381ecf6ed8b6e21906687b5
-EBUILD oxygen-5.22.5.ebuild 1373 BLAKE2B c47722ffcc99a616a2134dd674fa2ad534a25d17690a02ddbda736724f46f2b890e8ae8091e526f64680ce342ad534df2c6cd05bfc9530773faf11eeec7bfb8c SHA512 891fb543f4f3660daf18d36cd362b85cb5bc8eed459e694f7ce4ed7a14fb62ee3a81d919e136bc2dcc13f5060cb90d140095cb8d68cc4d61f0daf01782ab72d2
-MISC metadata.xml 317 BLAKE2B fe6f2d2665436ac520b360fcd1278ef117d274ce4956e1e3e5d8f249fe599b24fa505c80200f8f408cef58034d99fb7df0104cc06fb5e173948617c0cb580270 SHA512 386bdabf344736baac2223bac211d0c08c86c78323ae20be5e8103469576b42ce61336f921f39a7a76693eea22a0ac0bccf0e03b4b3431e003f191be34768369
+EBUILD oxygen-5.22.5.ebuild 1370 BLAKE2B 657951f674910aec6346e3e42f09709e65adeb4e947c5a0e755a0eca3fb50148177db7812a7d6506b3eaf904fe71d00b773a2b8057ed3c81d8f0a1a50c2a41e3 SHA512 59a49e5933c8c1a3622163ca2295083efd38c89348fa4503ee78d8db005dad28ffd49c16d8a9a4aebcbd8f3f87c62832ebbe0df57362679e0a9d51b647e630f9
+MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/oxygen/metadata.xml b/kde-plasma/oxygen/metadata.xml
index 3b4441f9bf47..d925f2439758 100644
--- a/kde-plasma/oxygen/metadata.xml
+++ b/kde-plasma/oxygen/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>kde@gentoo.org</email>
diff --git a/kde-plasma/oxygen/oxygen-5.21.5.ebuild b/kde-plasma/oxygen/oxygen-5.21.5.ebuild
deleted file mode 100644
index 6782ff35b4af..000000000000
--- a/kde-plasma/oxygen/oxygen-5.21.5.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
-
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Oxygen visual style for the Plasma desktop"
-HOMEPAGE="https://invent.kde.org/plasma/oxygen"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="wayland"
-
-COMMON_DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=kde-frameworks/frameworkintegration-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-plasma/kdecoration-${PVCUT}:5
-	x11-libs/libxcb
-	wayland? ( >=kde-frameworks/kwayland-${KFMIN}:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=kde-frameworks/kservice-${KFMIN}:5
-"
-RDEPEND="${COMMON_DEPEND}
-	!<kde-plasma/plasma-desktop-5.16.80
-"
-PDEPEND="
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package wayland KF5Wayland)
-	)
-	ecm_src_configure
-}
diff --git a/kde-plasma/oxygen/oxygen-5.22.5.ebuild b/kde-plasma/oxygen/oxygen-5.22.5.ebuild
index e06df308561a..a43338ba6540 100644
--- a/kde-plasma/oxygen/oxygen-5.22.5.ebuild
+++ b/kde-plasma/oxygen/oxygen-5.22.5.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/plasma/oxygen"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE="wayland"
 
 COMMON_DEPEND="