gentoo resync : 25.11.2020

4 files changed, 6 insertions, 140 deletions

diff --git a/kde-apps/kmix/Manifest b/kde-apps/kmix/Manifest
index 28adbe1a79a1..2ec3009aaba3 100644
--- a/kde-apps/kmix/Manifest
+++ b/kde-apps/kmix/Manifest
@@ -1,6 +1,3 @@
-AUX kmix-19.12.3-no-more-kcm_phonon.patch 2511 BLAKE2B 553c4766bb25f04b6977a66c229d13c39caee17145af4f26919141fb7924d49bd88058410adfc3a02136071fc5150db1f089e2d5cd9e1f79ef402e6a2e9d4661 SHA512 f2b9dac29c93270a785c35441cfa46da1fe9daf96896210a6ee9fa3c5dbbb422645f396c4f73d943352fb8c49caddcf59fe60858d3e020211e70b8b6eaf67692
-DIST kmix-20.04.3.tar.xz 1006804 BLAKE2B 0707be0dbb18ca6377b99a718b98fe4ddafaaabf129b319704d8da826b48a08a956c538eba83859adec3471c1267150d94889b602dc7b4b6550d717b45bf9fd7 SHA512 80387a63fb8a9155448ae0c78fbf214a471e148561609e20af61830fed5172f203585d7502ca2dc1ade404eb0e9259d81a84039ba99342a2e3bb9d5ed6ba3b78
-DIST kmix-20.08.1.tar.xz 1107064 BLAKE2B f02364671c7fcbf966331801763192c2b01e238b99c9c8d27be2489a04d98970ee2c42d867b24acbc82c55dbc4a726f47a8a08683451d06a830aeccc2a8f6d3d SHA512 7a5de71d7b9e0b1965c82ac9775ba518d3362d33ea0ef16c3302f1f48b54532a9806431fcc76d603402ac74109d382d2e4ef271d8561c3a315f67ae8f331cd9a
-EBUILD kmix-20.04.3.ebuild 1599 BLAKE2B 5266c8cb9358c458e24d917f6621a4fbc4f028a3b32935748b26020fd6e73f11157cc3190ba71c19faa3151859e0e70370c2ac40a6abcd12d8a89fcc64a1bf21 SHA512 eaa24c99944006fc3ceb680472291dd4b25827d1a0c5e3e7c6b224ca2f646575a2baa93b912230972bb6682d792a3ad6d8efbf18aa1c986ae80058cc0a04631e
-EBUILD kmix-20.08.1.ebuild 1463 BLAKE2B c368a30f303f9d7f17f185b25376e1c55d2a17b50d85b3ab911b77065453c11884318b22f1b209eb427820443762336e27281f77be42ebf80d58c77a39e2ce8c SHA512 a25c90b9ba8ef71ff57595da7e5ea3ffccec75d0b8961eac4258299bb8877cb51d8c0767a5d19f41ca5dd42e3012ba24b58b55429e2ec435c70eef0e65f2a844
+DIST kmix-20.08.3.tar.xz 1107672 BLAKE2B 3cc1f4b555a29aa2ec042824ca7b6db22adf886f352d67b923a6cb82f95f0526875c15e94c7bfa6714083a25fe33df68709e1b788b4886f0b046049652759a87 SHA512 76fa76c85060430d924bd322d6dffe9ad61b8036560c2382e6327c005a0ab70c05459c4ec6591f3456da3a84c09cb930ae3f145beb80c4c9f4a37f8514791c78
+EBUILD kmix-20.08.3.ebuild 1436 BLAKE2B a08c3712a74dd9b47570a9575aa7c2912a5dc7d66ef64b6e1cc17823971c014d0284836358ff1461af781f6768119733afdf5f134a86dfcec9e92a0db91ff216 SHA512 c8334a2bdea3450348fd1d1e5cb9f5c832d35d3308b0305c9f7e5193dcb28b8800bebd2c7fd56da5500dc0cb70d42bac8c9573ca9af847479b8577737f4ebfd0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmix/files/kmix-19.12.3-no-more-kcm_phonon.patch b/kde-apps/kmix/files/kmix-19.12.3-no-more-kcm_phonon.patch
deleted file mode 100644
index a67b89f324e0..000000000000
--- a/kde-apps/kmix/files/kmix-19.12.3-no-more-kcm_phonon.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From b012e900cce1e432537b192bb146f0b07dbe055c Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Thu, 9 Apr 2020 22:37:28 +0200
-Subject: [PATCH] Drop no longer available kcm_phonon 'Audio Setup' from
- Settings menu/systray
-
----
- apps/kmix.cpp     | 10 +++-------
- apps/kmix.h       |  1 -
- desktop/kmixui.rc |  1 -
- 3 files changed, 3 insertions(+), 9 deletions(-)
-
-diff --git a/apps/kmix.cpp b/apps/kmix.cpp
-index 5b83d007..dd39a3d7 100644
---- a/apps/kmix.cpp
-+++ b/apps/kmix.cpp
-@@ -177,11 +177,7 @@ void KMixWindow::initActions()
- 	//actionCollection()->addAction(QStringLiteral( a->objectName()), a );
- 	KStandardAction::preferences(this, SLOT(showSettings()), actionCollection());
- 	KStandardAction::keyBindings(guiFactory(), SLOT(configureShortcuts()), actionCollection());
--	QAction* action = actionCollection()->addAction(QStringLiteral("launch_kdesoundsetup"));
--	action->setText(i18n("Audio Setup..."));
--	connect(action, SIGNAL(triggered(bool)), SLOT(slotKdeAudioSetupExec()));
--
--	action = actionCollection()->addAction(QStringLiteral("hide_kmixwindow"));
-+	QAction* action = actionCollection()->addAction(QStringLiteral("hide_kmixwindow"));
- 	action->setText(i18n("Hide Mixer Window"));
- 	connect(action, SIGNAL(triggered(bool)), SLOT(hideOrClose()));
- 	actionCollection()->setDefaultShortcut(action, Qt::Key_Escape);
-@@ -1209,12 +1205,12 @@ void KMixWindow::toggleMenuBar()
- {
- 	menuBar()->setVisible(_actionShowMenubar->isChecked());
- }
--
-+/*
- void KMixWindow::slotKdeAudioSetupExec()
- {
-     forkExec(QStringList() << "kcmshell5" << "kcm_phonon");
- }
--
-+*/
- void KMixWindow::forkExec(const QStringList& args)
- {
- 	int pid = KProcess::startDetached(args);
-diff --git a/apps/kmix.h b/apps/kmix.h
-index b18ec38b..575f654a 100644
---- a/apps/kmix.h
-+++ b/apps/kmix.h
-@@ -138,7 +138,6 @@ private:
- 	void updateTabsClosable();
- 
-   private slots:
--   void slotKdeAudioSetupExec();
-    void slotConfigureCurrentView();
- 
-    void plugged(const char *driverName, const QString &udi, int dev);
-diff --git a/desktop/kmixui.rc b/desktop/kmixui.rc
-index ffb220f6..27ca3351 100644
---- a/desktop/kmixui.rc
-+++ b/desktop/kmixui.rc
-@@ -16,7 +16,6 @@
-  <Menu name="settings">
-      <Action name="toggle_channels_currentview" append="save_merge"/>
-      <Action name="select_master" append="save_merge"/>
--     <Action name="launch_kdesoundsetup" append="save_merge"/>     
-  </Menu>
-  <Menu name="help" append="about_merge"><text>&amp;Help</text>
-   <Action name="hwinfo"/>
--- 
-2.26.0
-
diff --git a/kde-apps/kmix/kmix-20.04.3.ebuild b/kde-apps/kmix/kmix-20.04.3.ebuild
deleted file mode 100644
index ba6d68aa2e4c..000000000000
--- a/kde-apps/kmix/kmix-20.04.3.ebuild
+++ /dev/null
@@ -1,60 +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.70.0
-PLASMA_MINIMAL=5.16.5
-QTMIN=5.14.2
-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="
-	>=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
-	>=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
-	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
-"
-
-PATCHES=( "${FILESDIR}/${PN}-19.12.3-no-more-kcm_phonon.patch" ) # bug 716092
-
-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.08.1.ebuild b/kde-apps/kmix/kmix-20.08.3.ebuild
index 96f8a5002e15..e3f38c7cc0c5 100644
--- a/kde-apps/kmix/kmix-20.08.1.ebuild
+++ b/kde-apps/kmix/kmix-20.08.3.ebuild
@@ -5,16 +5,16 @@ EAPI=7
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="false"
-KFMIN=5.72.0
-QTMIN=5.14.2
+KFMIN=5.74.0
+QTMIN=5.15.1
 inherit ecm kde.org
 
 DESCRIPTION="Volume control gui based on KDE Frameworks"
-HOMEPAGE="https://kde.org/applications/multimedia/org.kde.kmix"
+HOMEPAGE="https://apps.kde.org/en/kmix"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="alsa plasma pulseaudio"
 
 DEPEND="