gentoo resync : 18.11.2019

3 files changed, 55 insertions, 50 deletions

diff --git a/kde-plasma/oxygen/Manifest b/kde-plasma/oxygen/Manifest
index dcc9223b3419..67e4f9407295 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.2.tar.xz 4465224 BLAKE2B ccf8af1b232af8e9f8fc51764a55f9ce71608dd9897bed39a798829b9afca8347b363a0e31f96cd3c101fe9b4f63252099e4f92c1c135f7da4947ad4262738c9 SHA512 dde70ee1e99e8ce0be9734a7165616c219b8550bb5700004661bebdcd1f9a886215046b90a19fc52a86d4abec351c13f47c96bbfbb11dd437a8279e3eef4e14a
+DIST oxygen-5.17.3.tar.xz 4466848 BLAKE2B 17e3cf98b29f88cb9053691ce9bdbb3922cb3251f9e374ca6f1afa2c9dec54b30d0952ccd53b6c0a090a6a0c80f26aa9bb8b3b560b8fd05989bfe1fe135c3e07 SHA512 bfb98035fdd541b9d35438774d722de6852d0ea3423c3b4f22ab1533f60824e062419e8fa339f434f921abd1166b3820e3d22bbdbd38e820947faba5129b7610
 EBUILD oxygen-5.16.5.ebuild 1073 BLAKE2B faad900e7ec0be9d415095aecfd9c11fe83453779ef573e1fefe590dd2a6785e4702e8c5d7df833496f687ed3ff0a25d154eb48708114e5999630b2109ab44f0 SHA512 27d0986cd09174ab2aa82754e63d77bfac2ef61f86f66a9755e70fc52178f304d40e4612d322864d25c96921ffebfa9303421b14bbb4871a66076121f5337d6f
-EBUILD oxygen-5.17.2.ebuild 1153 BLAKE2B cbd7c7c3550f96ece6c9a028393ca4c8e049ecf41fb67386bdf24d0661823b9fca46e740e645dcf997f49a352d53c4a19e4792f75d3fab9a6a06d8bca8d029ec SHA512 6ddb458316adcee639ad7bd811bccb6e4ae82d5ab8353c1978244264ab74ffd6930561f52e08f54d6a8a8363021d3ecf6f85d76ec2e01b29ae2c8463835da938
+EBUILD oxygen-5.17.3.ebuild 1359 BLAKE2B b311247c6855e74b75fbde02085a9057d5cf974a7a8610249997fa65150a5258c5d7a402e60b0b5692c904fbc3c7b41bec9abbfac75aaec550929dc1a3655a41 SHA512 61098e4d78a025a8a563c2b99c027691f303761968c13937c5753bc7170999887ae5f53571e7b85c99a824a0a15a6a44c8cbf61458ae12cab2414cf508da480e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/oxygen/oxygen-5.17.2.ebuild b/kde-plasma/oxygen/oxygen-5.17.2.ebuild
deleted file mode 100644
index be7ec3f5e9c0..000000000000
--- a/kde-plasma/oxygen/oxygen-5.17.2.ebuild
+++ /dev/null
@@ -1,48 +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"
-
-COMMON_DEPEND="
-	$(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="${COMMON_DEPEND}
-	$(add_frameworks_dep kservice)
-"
-RDEPEND="${COMMON_DEPEND}
-	!<kde-plasma/plasma-desktop-5.16.80
-"
-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.3.ebuild b/kde-plasma/oxygen/oxygen-5.17.3.ebuild
new file mode 100644
index 000000000000..0a841ef1bd7a
--- /dev/null
+++ b/kde-plasma/oxygen/oxygen-5.17.3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2019 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-utils_use_find_package wayland KF5Wayland)
+	)
+	ecm_src_configure
+}