4 files changed, 57 insertions, 49 deletions
diff --git a/kde-plasma/oxygen/Manifest b/kde-plasma/oxygen/Manifest
index 5694c65d4cd6..b43918a50da4 100644
--- a/kde-plasma/oxygen/Manifest
+++ b/kde-plasma/oxygen/Manifest
@@ -1,5 +1,5 @@
-DIST oxygen-5.16.5.tar.xz 4466432 BLAKE2B 99ffbf358ebe687402d2ad08b01f0043c4c2510762a4eed9556d97727000d9a6144c712775c206cc4b98f4c247ed6d4fa96aceda0af6e82c2e75b69250ce8490 SHA512 6ed14b6fc454e22e837525efa7298245d62cd7c86a0f8b608960141f8820722fa9996214848309cb89d4212d9a8ad1384ce82e7917b62114aea8d65247b68951
 DIST oxygen-5.17.4.tar.xz 4465640 BLAKE2B f8d5e0bb416c6ecde41f83ad14dcc964bdbff292b29d81d4ff39cadcc9845f047c09fd1985caae015fe34df12be9bc20808a1737494ea6cf8399d4f67997028c SHA512 3e1a93cad36bab1ec10591207d168d22caa7e53689a30468d302327b5e3907cec83ee4e5979c97588ec47973ed1391a06e864499ac2a879d233ac7dfc2e117f6
-EBUILD oxygen-5.16.5.ebuild 1073 BLAKE2B faad900e7ec0be9d415095aecfd9c11fe83453779ef573e1fefe590dd2a6785e4702e8c5d7df833496f687ed3ff0a25d154eb48708114e5999630b2109ab44f0 SHA512 27d0986cd09174ab2aa82754e63d77bfac2ef61f86f66a9755e70fc52178f304d40e4612d322864d25c96921ffebfa9303421b14bbb4871a66076121f5337d6f
-EBUILD oxygen-5.17.4.ebuild 1353 BLAKE2B 2203f2e865b3221d1ac6a20c44055c8db86d38a9d0c08e39fb83ef3fb463cba1f3f283e1d9f7cd1da77b52f5e2e92643757ac72e5c9daa7ba80a2eab636eb133 SHA512 a312520253292f978d9d18bb90de9c2033b6387355297cb1f8d92635cc2f24d5874885af1351cdaba9df4251c8f76efe62f954e8f970a606651137f5a2562ba2
+DIST oxygen-5.17.5.tar.xz 4470600 BLAKE2B 7dfcc26a05c479c30e10223a5af063fd5580fee375d62e3261cf79cfb41fffc63af299af0690b48a2417f4562f1526f84cdd1debf53193085062f719b944d1bc SHA512 59a49c3718d7332640ff5f8ffee6afe665dfedb8504728d80a7672859429739a7926296b462e457f2fac5b98a892d51b32202db8f0ea75dcea61138449f79ab3
+EBUILD oxygen-5.17.4.ebuild 1350 BLAKE2B 375260098fdf5e3ab6001f1ee2fef6c1b0567fd681107a2db8dbbc74321cbaa5497dc7d65a0f93ca7fabff668bd1e261fb5b2694f618a7c9eb6b30a8ab59140d SHA512 9e2752b4625af081edc707b082a6fb14711d0aa5ef94ba721cce9e78dc5ff55e37a747b2b8cdd54516f0dfe8899981e693f11d15f6b3507b58e1ee6dfe5353bb
+EBUILD oxygen-5.17.5.ebuild 1353 BLAKE2B 57e0ccbebffa1430e16b61870680a1ddea377d29783fb73619347289da624aa0c707ddfc12d92679d325315b8e79026a28778b6b90154e7608b805c6769ac272 SHA512 5a12b03d35eeeed1e9915d4921f598f53948e3f3213354ea0e3edbbb79979e53728232cb37b9c4ee9b019a2d340666e7eac093967c35ac40c0d57f3ce6a0ee87
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/oxygen/oxygen-5.16.5.ebuild b/kde-plasma/oxygen/oxygen-5.16.5.ebuild
deleted file mode 100644
index 203ea9251d30..000000000000
--- a/kde-plasma/oxygen/oxygen-5.16.5.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kde5
-
-DESCRIPTION="Oxygen visual style for the Plasma desktop"
-HOMEPAGE="https://cgit.kde.org/oxygen.git"
-KEYWORDS="amd64 ~arm arm64 x86"
-IUSE="wayland"
-
-RDEPEND="
-	$(add_frameworks_dep frameworkintegration)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_plasma_dep kdecoration)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	x11-libs/libxcb
-	wayland? ( $(add_frameworks_dep kwayland) )
-"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep kservice)
-"
-PDEPEND="
-	$(add_plasma_dep kde-cli-tools)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package wayland KF5Wayland)
-	)
-	kde5_src_configure
-}
diff --git a/kde-plasma/oxygen/oxygen-5.17.4.ebuild b/kde-plasma/oxygen/oxygen-5.17.4.ebuild
index 9191bcf82348..637b1bedbac0 100644
--- a/kde-plasma/oxygen/oxygen-5.17.4.ebuild
+++ b/kde-plasma/oxygen/oxygen-5.17.4.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Oxygen visual style for the Plasma desktop"
 HOMEPAGE="https://cgit.kde.org/oxygen.git"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="wayland"
 
 COMMON_DEPEND="
diff --git a/kde-plasma/oxygen/oxygen-5.17.5.ebuild b/kde-plasma/oxygen/oxygen-5.17.5.ebuild
new file mode 100644
index 000000000000..abe6a62a685d
--- /dev/null
+++ b/kde-plasma/oxygen/oxygen-5.17.5.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Oxygen visual style for the Plasma desktop"
+HOMEPAGE="https://cgit.kde.org/oxygen.git"
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="wayland"
+
+COMMON_DEPEND="
+	>=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
+	>=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
+	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
+}