gentoo resync : 14.05.2020

4 files changed, 4 insertions, 63 deletions

diff --git a/kde-apps/kmix/Manifest b/kde-apps/kmix/Manifest
index c36c5f779999..802d3b99a8a4 100644
--- a/kde-apps/kmix/Manifest
+++ b/kde-apps/kmix/Manifest
@@ -1,7 +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.0.tar.xz 1006908 BLAKE2B 63fc9c9c1f44d61b149d9d1f62e4434c54829e4fac631333cb381a1f9bdd3a730e0c14fb3d789145002b2915a2dab71fe928068d6ca36985030e2befbd2bd6f8 SHA512 9c4575bd808841fb784e882d0037d172a02b27078fb1d59fe76d7c78848579d47cb5a82ebd5ef300337b1e9b71eb2f1add9e3a15889bdb43122ea23f859bf91f
-EBUILD kmix-19.12.3-r1.ebuild 1593 BLAKE2B 03902653ec7609abe76b833fefa0aa4b7a6a430f4c43b8bf9ffd126fc2d92f2bf1f608a2198d7ca15824da4cb2402b4e79657c040e4f0c340a22212eae1cbb91 SHA512 319bd6890f9b2ff07df15d8eb15d9672dd29056a27ef670755ba5fd24f9fa3c883a0559b59a001bf9d4c49ff94e842b42460a27ebae4d016c32713408dbf3f19
-EBUILD kmix-19.12.3.ebuild 1520 BLAKE2B 173837953fb6c7e54ce42e99efad421826dbc31dcb5b5288815bad9a44970fcfba9c901df4c2b16b507c8a358c7f5090c54cd422d1d21f163502ed178a4ca7b6 SHA512 31d6de7fc36404550631c404b301b280636cc9a901e2eaf3615e9a7fe022aafa9ba748bb780399f0a145247973e710660effc53ce2681e2cce766c3f8308cfbe
-EBUILD kmix-20.04.0.ebuild 1590 BLAKE2B 692a15f69310a6521b72cbc9e6d0294babc69d110d4155b9e1acf8258133d9ceda217037d007962877f9af8262d6ff30dc0b809e61341bd559465ea7a8b633c4 SHA512 2f2711bc2f2cee2cbc9e1fbe912c67c4e3ad982f885f437c930db52fdb44eccc50c5ec42eaebe400b80d38e0151a221add461ff2c74e51b8f915cd362835ca75
+EBUILD kmix-19.12.3-r1.ebuild 1590 BLAKE2B 3958afde5f3b3c8a1e417a81a0e89ffcc225200743ce8be5a7971afdaf3d0f229b392b0bb7de18c560c636e5d8ce0e76dab2094d0212c2b3a9d49b0e2723a24c SHA512 faa3ea3d3a046b78a2bacfedcd80ba47cbb2ea0600db9f1ac42b63e31f09da2885804dce60eb6b87b246457a8dbc672ce87129d325c68d446508fe790498a68a
+EBUILD kmix-20.04.0.ebuild 1602 BLAKE2B 9eaca4d6a8ee2f70e54e9524a4ef3051e2729d0ae40c055a104e6df8521e985b0d8914858991d939a99d3bc3974ae5c608bba70338e9b70d1ff7361e91d53b28 SHA512 e91deba1d4d1d4013bdefbc9a7a475ecfe1fa6f033901c188b4da56758dd2eefc5a41b84dfd5366db13a3082a71f5c4a626ea8a00c4ed5e4fd22e63e58f76901
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmix/kmix-19.12.3-r1.ebuild b/kde-apps/kmix/kmix-19.12.3-r1.ebuild
index 20da88330cc2..cd74d060ec30 100644
--- a/kde-apps/kmix/kmix-19.12.3-r1.ebuild
+++ b/kde-apps/kmix/kmix-19.12.3-r1.ebuild
@@ -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.ebuild b/kde-apps/kmix/kmix-19.12.3.ebuild
deleted file mode 100644
index ade41f9d37b5..000000000000
--- a/kde-apps/kmix/kmix-19.12.3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 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 ~ppc64 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
-}
diff --git a/kde-apps/kmix/kmix-20.04.0.ebuild b/kde-apps/kmix/kmix-20.04.0.ebuild
index 5c7a560791d0..8c89ccc4378c 100644
--- a/kde-apps/kmix/kmix-20.04.0.ebuild
+++ b/kde-apps/kmix/kmix-20.04.0.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://kde.org/applications/multimedia/org.kde.kmix"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="alsa plasma pulseaudio"
 
 DEPEND="