gentoo resync : 15.12.2019

4 files changed, 62 insertions, 56 deletions

diff --git a/kde-apps/kmix/Manifest b/kde-apps/kmix/Manifest
index 9e0ec5e7bd34..61c2df2f6368 100644
--- a/kde-apps/kmix/Manifest
+++ b/kde-apps/kmix/Manifest
@@ -1,5 +1,5 @@
-DIST kmix-19.04.3.tar.xz 1006048 BLAKE2B 028418d7f63c3e87fa23c1afc463210644d54da62624dcad676fa54eca5faa831984300d13e6edb791f235608e708e5675cfb468a06f979264f3238d2092bc93 SHA512 3f432d999c8db2866d490123f349db3d2450e956400ddcecb4aa7e50aff63947c8e607f579feb0b3ee76965a59b2fbd7cd9f9eba913c3f55adaed46cd83744f5
 DIST kmix-19.08.3.tar.xz 1005308 BLAKE2B 0012bba9b539d612452153c200a62adc3275d8a206b053b9b82f886d0568bf2be0a7a3642473d0145c37101ce00b864184e95a4fbf81c4add5645bcc3f860652 SHA512 d2fb9e02c9981974c3df5438fb3e7544d64a51c7fff6ca5565dbb7bd06beda6bef2268fc5f343cf7acdfc8eb7d0f21d10f85feb7222adaaef1305d587e31cad0
-EBUILD kmix-19.04.3.ebuild 1264 BLAKE2B ae29d62ff131910b427f71adeb026f5765fb6974d626cf98f780f517d5efd58acd422e37b54b275a1681cea0a8a90f914cdd804dff69c0111166d12f5afeb96c SHA512 b9f4eda44b0270a9e85b678914cc84442c480b3263659161ffcd2f82da4cc30ee0402cd54c1d4c370196cd3e56ba5f3f59015c7d01deae005f5eac4e3284ffa2
-EBUILD kmix-19.08.3.ebuild 1477 BLAKE2B 94dafe5f6300c17bcda00fe2903c5fc3f690fba046ec8df611f2481a6cf06f791b5bfa62ba7be0ca28a3b97dd76b2972020998f3a79488188f1c9d7fe2e396d2 SHA512 60edf234ed82f9510feca0325aab2d01eec7700b90173cc24eec53df7ef9caab6b1dc88c5462b232a7028f9a49859e516151a87c978f3e3f83284182baec8a49
+DIST kmix-19.12.0.tar.xz 1007416 BLAKE2B c009bd78dd2c92cc566ba2fcc76cdd19582956f6c6234e393fb7ae12d4b4e3a0aa85a7a34383c85714f7f058f444a3475b63b727315ed2dbbf84f1db3150149f SHA512 67f62094618491b634f1bc032bba367f8736b80fa46c0bd5a0c2690e8e8206ffa376e9f6b5110d02c734b70e00ef1e5fda5f1c3d1ca74c1cf51fbee1e15cda12
+EBUILD kmix-19.08.3.ebuild 1474 BLAKE2B f4174ee2393c7fac42f66e3b58420d7adf4b01c5deec098e2bec18a97bc6ab3322e472b606e3a237df0a5019872905e0f6f7c849a9b27d61be7049f8bc19b1cb SHA512 735617a02f07186bca56b129bff9f6fad1b5d16b558031c7676de5dc3712a8ced689211a7055748240a8d4aad9dde4f158b654e2207e424ca5192ea66865eab8
+EBUILD kmix-19.12.0.ebuild 1516 BLAKE2B b3b1c039f7f58e82e42d4452b0b198731326f3ec03816ec118281aa1ca5e3d532d15f94dc040536f033d6bcd81e7bb56a32d0eb7e62683c98447e05b53d05660 SHA512 6b500a825ec18b9b49e084d0acd8b7432671ba583e995df67d3c7af1f59c18b4d467f5d3bd5e37ca50395cb7f72ca24b353b99a4c4540e70485672afbfc12c8d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmix/kmix-19.04.3.ebuild b/kde-apps/kmix/kmix-19.04.3.ebuild
deleted file mode 100644
index e0b3f07adbbe..000000000000
--- a/kde-apps/kmix/kmix-19.04.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="false"
-inherit kde5
-
-DESCRIPTION="Plasma mixer gui"
-HOMEPAGE="https://kde.org/applications/multimedia/kmix/"
-KEYWORDS="amd64 arm64 x86"
-IUSE="alsa pulseaudio"
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep plasma)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	alsa? ( >=media-libs/alsa-lib-1.0.14a )
-	pulseaudio? (
-		dev-libs/glib:2
-		media-libs/libcanberra
-		>=media-sound/pulseaudio-0.9.12
-	)
-"
-RDEPEND="${DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package alsa ALSA)
-		$(cmake-utils_use_find_package pulseaudio Canberra)
-		$(cmake-utils_use_find_package pulseaudio PulseAudio)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kmix/kmix-19.08.3.ebuild b/kde-apps/kmix/kmix-19.08.3.ebuild
index d98dd3412644..ac41d89c361f 100644
--- a/kde-apps/kmix/kmix-19.08.3.ebuild
+++ b/kde-apps/kmix/kmix-19.08.3.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Plasma mixer gui"
 HOMEPAGE="https://kde.org/applications/multimedia/kmix/"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="alsa pulseaudio"
 
 DEPEND="
diff --git a/kde-apps/kmix/kmix-19.12.0.ebuild b/kde-apps/kmix/kmix-19.12.0.ebuild
new file mode 100644
index 000000000000..ce308c8bf77f
--- /dev/null
+++ b/kde-apps/kmix/kmix-19.12.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="false"
+KFMIN=5.63.0
+PLASMA_MINIMAL=5.16.5
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Volume control gui based on KDE Frameworks"
+HOMEPAGE="https://kde.org/applications/multimedia/org.kde.kmix"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="alsa plasma pulseaudio"
+
+DEPEND="
+	>=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/knotifications-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	alsa? ( >=media-libs/alsa-lib-1.0.14a )
+	plasma? ( >=kde-frameworks/plasma-${KFMIN}:5 )
+	pulseaudio? (
+		dev-libs/glib:2
+		media-libs/libcanberra
+		>=media-sound/pulseaudio-0.9.12
+	)
+"
+RDEPEND="${DEPEND}
+	>=kde-plasma/kde-cli-tools-${PLASMA_MINIMAL}:5
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package alsa ALSA)
+		$(cmake_use_find_package plasma KF5Plasma)
+		$(cmake_use_find_package pulseaudio Canberra)
+		$(cmake_use_find_package pulseaudio PulseAudio)
+	)
+
+	ecm_src_configure
+}