gentoo resync : 25.08.2020

3 files changed, 14 insertions, 18 deletions

diff --git a/kde-apps/kmix/Manifest b/kde-apps/kmix/Manifest
index ff0928425c3a..105167385958 100644
--- a/kde-apps/kmix/Manifest
+++ b/kde-apps/kmix/Manifest
@@ -1,6 +1,6 @@
 AUX kmix-19.12.3-no-more-kcm_phonon.patch 2511 BLAKE2B 553c4766bb25f04b6977a66c229d13c39caee17145af4f26919141fb7924d49bd88058410adfc3a02136071fc5150db1f089e2d5cd9e1f79ef402e6a2e9d4661 SHA512 f2b9dac29c93270a785c35441cfa46da1fe9daf96896210a6ee9fa3c5dbbb422645f396c4f73d943352fb8c49caddcf59fe60858d3e020211e70b8b6eaf67692
-DIST kmix-19.12.3.tar.xz 1007752 BLAKE2B afca6f55b7c4bf63514226e9c969e92a927c84e3d1812835ab280218fa860fb8b7e83f47290bbfca8bacd6d9f9a68a5fce83ad6d0cc45c06228d245486e7cf75 SHA512 bcf2cfabfd6832bab153c7c05ca3811dc6109629af524820f5ca0ffdc779d6dbbe1ddd4457ad289987bd97bcdebf59d55cd47d94e9af75c1cea89d62b233b5e2
-DIST kmix-20.04.2.tar.xz 1007080 BLAKE2B 1533751cd3d66bc786a791b45938ab80e5dbd51b4e6d95955dfbd63a64319fbb8759e341642fa16544524ac5ecd71d9312abc26fe7521a1f3a4bf31acd172b2e SHA512 b68fbb0c737182ca229623ffb58c427dbf0bf9a1ce26308007743b9b4ca4c8d4ba04405547af34281abd15444b000762e022447fb541de73b17ae3e5320abcb0
-EBUILD kmix-19.12.3-r1.ebuild 1590 BLAKE2B 3958afde5f3b3c8a1e417a81a0e89ffcc225200743ce8be5a7971afdaf3d0f229b392b0bb7de18c560c636e5d8ce0e76dab2094d0212c2b3a9d49b0e2723a24c SHA512 faa3ea3d3a046b78a2bacfedcd80ba47cbb2ea0600db9f1ac42b63e31f09da2885804dce60eb6b87b246457a8dbc672ce87129d325c68d446508fe790498a68a
-EBUILD kmix-20.04.2.ebuild 1602 BLAKE2B 3bd118923673b7e9d46cb31be75d73beb7958652dc3fd937b3119d10bd6d5cc446e6f8f48b3270795a2bedd795f5b042609568c5cf999b76b6248b23c8ca9ab5 SHA512 cff358786099d2593de34e6ecda53fbc8fcb1b06d57d195bd682b759ab7607d43833cb02318e731bf266108e5b3729326b3044c202e1ba4a7c552f98f08db9d0
+DIST kmix-20.04.3.tar.xz 1006804 BLAKE2B 0707be0dbb18ca6377b99a718b98fe4ddafaaabf129b319704d8da826b48a08a956c538eba83859adec3471c1267150d94889b602dc7b4b6550d717b45bf9fd7 SHA512 80387a63fb8a9155448ae0c78fbf214a471e148561609e20af61830fed5172f203585d7502ca2dc1ade404eb0e9259d81a84039ba99342a2e3bb9d5ed6ba3b78
+DIST kmix-20.08.0.tar.xz 1107012 BLAKE2B 227bcdd049c6e7b39704e3c60704d5294526f1aa486c14fac1ef28395c032ce23ba0bcf681ff1ab3cbf6b60a224e9607759d1e7d1de93cdeb5a359075c9df5ad SHA512 2ea7217d8ceb668a11121fdad8dfc48972c8ab699f8f2a8c7055bb58af99eb19e62ebe3e861e917c2ba4546cb029bb5e8efcede9b5fd24a9a83ebdaaa6db845b
+EBUILD kmix-20.04.3.ebuild 1599 BLAKE2B 5266c8cb9358c458e24d917f6621a4fbc4f028a3b32935748b26020fd6e73f11157cc3190ba71c19faa3151859e0e70370c2ac40a6abcd12d8a89fcc64a1bf21 SHA512 eaa24c99944006fc3ceb680472291dd4b25827d1a0c5e3e7c6b224ca2f646575a2baa93b912230972bb6682d792a3ad6d8efbf18aa1c986ae80058cc0a04631e
+EBUILD kmix-20.08.0.ebuild 1463 BLAKE2B c368a30f303f9d7f17f185b25376e1c55d2a17b50d85b3ab911b77065453c11884318b22f1b209eb427820443762336e27281f77be42ebf80d58c77a39e2ce8c SHA512 a25c90b9ba8ef71ff57595da7e5ea3ffccec75d0b8961eac4258299bb8877cb51d8c0767a5d19f41ca5dd42e3012ba24b58b55429e2ec435c70eef0e65f2a844
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmix/kmix-20.04.2.ebuild b/kde-apps/kmix/kmix-20.04.3.ebuild
index 650b2919511b..ba6d68aa2e4c 100644
--- a/kde-apps/kmix/kmix-20.04.2.ebuild
+++ b/kde-apps/kmix/kmix-20.04.3.ebuild
@@ -7,7 +7,7 @@ ECM_HANDBOOK="forceoptional"
 ECM_TEST="false"
 KFMIN=5.70.0
 PLASMA_MINIMAL=5.16.5
-QTMIN=5.14.1
+QTMIN=5.14.2
 inherit ecm kde.org
 
 DESCRIPTION="Volume control gui based on KDE Frameworks"
@@ -15,7 +15,7 @@ HOMEPAGE="https://kde.org/applications/multimedia/org.kde.kmix"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="alsa plasma pulseaudio"
 
 DEPEND="
diff --git a/kde-apps/kmix/kmix-19.12.3-r1.ebuild b/kde-apps/kmix/kmix-20.08.0.ebuild
index cd74d060ec30..96f8a5002e15 100644
--- a/kde-apps/kmix/kmix-19.12.3-r1.ebuild
+++ b/kde-apps/kmix/kmix-20.08.0.ebuild
@@ -5,9 +5,8 @@ EAPI=7
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="false"
-KFMIN=5.63.0
-PLASMA_MINIMAL=5.16.5
-QTMIN=5.12.3
+KFMIN=5.72.0
+QTMIN=5.14.2
 inherit ecm kde.org
 
 DESCRIPTION="Volume control gui based on KDE Frameworks"
@@ -15,10 +14,14 @@ HOMEPAGE="https://kde.org/applications/multimedia/org.kde.kmix"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="alsa plasma pulseaudio"
 
 DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
 	>=kde-frameworks/kconfig-${KFMIN}:5
 	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
 	>=kde-frameworks/kcoreaddons-${KFMIN}:5
@@ -30,24 +33,17 @@ DEPEND="
 	>=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
+	kde-plasma/kde-cli-tools:5
 "
 
-PATCHES=( "${FILESDIR}/${P}-no-more-kcm_phonon.patch" ) # bug 716092
-
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package alsa ALSA)