4 files changed, 112 insertions, 12 deletions
diff --git a/kde-apps/kmix/Manifest b/kde-apps/kmix/Manifest
index 57240b96d34b..065b39a50bc1 100644
--- a/kde-apps/kmix/Manifest
+++ b/kde-apps/kmix/Manifest
@@ -1,6 +1,7 @@
 AUX kmix-23.04.2-autostart_disable.patch 1151 BLAKE2B 9f9609a39f66e97d7a6427fae6aaf14c0f65755b05ddfe55d05ad49f42463960d4e9a9f97eae9a38311174b376c8e182336ec4bed793f36a02cd2aa71bda3d42 SHA512 5d1ded259efc871d4b4d9b6fd43aff29970f9c04579cdd1419563a08761cb4fbb9d16642cb648d547aeec7c53b26976d49e30e2e0c8cae23b3bb2d7ba1fa6b9b
-DIST kmix-24.02.2.tar.xz 1210356 BLAKE2B c386d4cb9760870bfa5e3e5b31d493187a326c94b42082270f7076faef64cf306ffca4023270e770f41dbfa9b00fa15c716ccc8c294962260fb4103bb931e155 SHA512 9237a06f2bb77133e5b3f0dd2e6b05dc13ac84f1b8f27be5c6e3450d7036940067da0bfbd6e0083f2ae433cd85d8f55a8e9fc3dcef4895443c4c5a6a08722c93
-DIST kmix-24.04.90.tar.xz 1165088 BLAKE2B 0fd521c1b62c63223b584ba76503fdd38323618b794be159036a1a2799bf986d0399affa7576d40ed8b95f325189b16eec962fa5d14afd7f5836046a8153c355 SHA512 1225a8dcaeb0700320e54e60d8e12a1356949b022b550d0f2c67f858a8727af522612fc946b1cc24c4d68cf17f5b963fec0d9382944e2b40ec316e1ef04e226b
-EBUILD kmix-24.02.2.ebuild 2266 BLAKE2B 7252191ddaa4e251263455bb809b02c62eb50f3d64426a60fd3faa66a19c38f03190f2256006215684299c750710352117f09b542876e466e7a983b5d17a0182 SHA512 ec77c78fde7523a13bb30ef03364b095d1309f6942fa33e04232cef5159befbdd5187277f1c074900ae1797c64ceef3db2eef8796adb6fe992d4a3ade7200a8f
-EBUILD kmix-24.04.90.ebuild 2305 BLAKE2B 07a4642595f35e1269e8ab45d039ff6bd7adf67a76f9ebfae6686580ba9e16f15053d3e71b1653f94c075b3e5a95faf03641c9742888e02b6ba72dbe1a1f1545 SHA512 eb4c14bf26b148b67e1d3bf7819f4a4414bc9860e1f85400891ef1e6f17311a7150420a91d973ff088cc4312f3ad4cf69ee8fad7b89d3529cc69df456340af94
+AUX kmix-24.05.2-revert-kcm_pulseaudio-dep.patch 3237 BLAKE2B 5587e62301a0f4c9ee70ed227472ef12cbfd8a6fbaf9446c312131ed7cd51434c641b872ef8aba0ce71b0300a2040e93cbb19674003d684405e747218dc5cbb7 SHA512 f9bb9a81269ab42b89bd3599ee14df4cb5ef6f645aae6039e3f25107ce0eb57c53b74049d52613bb2a52e3552b23fc300b73e5d07dadbea4652af1bdc99cd8fe
+DIST kmix-24.05.2.tar.xz 1165196 BLAKE2B 512a56ee928546ee077e3302432faa65caf56f3e613f9a772733a5187800b3fc7c068a84c147897b1e53513d07601c59cf42e046d65d5dbe180e7255d168bc8c SHA512 126e0144034132e65cec59f774582ba10073bf2b96a97ca4e8fd75a9143b2fcf93659f869417095c75b90ec3347d3ff562ebd36eb3ea0fec8a0c303c8bdce6b9
+DIST kmix-24.08.1.tar.xz 1165324 BLAKE2B 2dd74673dfb252658896f1564b39bdc40d33c2961e5e4b7a3a293833281aef6bd53092b86bd1a8a8defb5ebc2fd88c840fffde85dd9e02ef37f215581e9e96ee SHA512 500b0bf8d2d59e1c80a7715ab045272b9118afe4fc766d5986448aef22ae612865c640852d5bc6a32dd66cbf02b3da7bc7994e28084e755aed9fa6a4ba83b53b
+EBUILD kmix-24.05.2-r1.ebuild 2327 BLAKE2B 360b944b97f114d34f8049cd72ffca9c8333e0cbd7674c0c17e706f9d9ee882bd919dc12445d6cc326bf1629fe735391489d0e9a37103b80acb22eb4c9ad1d68 SHA512 c3b2856e3175aef5a3d1557a991ddb8851d7f7bfb9d6fec8afe2ecfce65fd67f608c1f087fe3b8b593514d61859ecaef6cec072fc949debd16049cbf1aef92cd
+EBUILD kmix-24.08.1.ebuild 2339 BLAKE2B 36be0a46e2e3d0c3a72ac17352b37914849a35546505d576d8a17b2dc8739c48a5cdac381674e31abd23bbd2f4ad48e5ca2168245495c62602a5534afb3c68c3 SHA512 b6a4d78c9c579c6c3950a06c57fb54c861ff8c0be0e26370a416e28c98027bf4eafd4c30b35a5f97d71e02ed40321bcc7f2061aa8a8f3ee1c9d9b49bad460dc4
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kmix/files/kmix-24.05.2-revert-kcm_pulseaudio-dep.patch b/kde-apps/kmix/files/kmix-24.05.2-revert-kcm_pulseaudio-dep.patch
new file mode 100644
index 000000000000..23987a8261db
--- /dev/null
+++ b/kde-apps/kmix/files/kmix-24.05.2-revert-kcm_pulseaudio-dep.patch
@@ -0,0 +1,94 @@
+From 8d6837131706bd0f5dbd573726e7c01775f8256c Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Wed, 4 Sep 2024 08:03:09 +0200
+Subject: [PATCH] Revert "When we click on "Audio Setup", calls kcm_pulseaudio"
+
+This reverts commit a54f760987557036b90888a3efa7ad17346a00ed.
+---
+ apps/kmixwindow.cpp | 22 +---------------------
+ apps/kmixwindow.h   |  2 --
+ desktop/kmixui.rc   |  1 -
+ 3 files changed, 1 insertion(+), 24 deletions(-)
+
+diff --git a/apps/kmixwindow.cpp b/apps/kmixwindow.cpp
+index fa727f39..fb182f49 100644
+--- a/apps/kmixwindow.cpp
++++ b/apps/kmixwindow.cpp
+@@ -37,7 +37,6 @@
+ #include <klocalizedstring.h>
+ #include <kstandardaction.h>
+ #include <kxmlguifactory.h>
+-#include <KProcess>
+ 
+ // KMix
+ #include "kmix_debug.h"
+@@ -164,11 +163,7 @@ void KMixWindow::initActions()
+ 
+ 	KStandardAction::keyBindings(guiFactory(), &KXMLGUIFactory::showConfigureShortcutsDialog, 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);
+@@ -1174,21 +1169,6 @@ void KMixWindow::toggleMenuBar()
+ 	menuBar()->setVisible(_actionShowMenubar->isChecked());
+ }
+ 
+-void KMixWindow::slotKdeAudioSetupExec()
+-{
+-    forkExec(QStringList() << "kcmshell5" << "kcm_pulseaudio");
+-}
+-
+-void KMixWindow::forkExec(const QStringList& args)
+-{
+-   int pid = KProcess::startDetached(args);
+-   if (pid == 0)
+-   {
+-       KMessageBox::error(this, i18n("The helper application is either not installed or not working.\n\n%1",
+-                         args.join(QLatin1String(" "))));
+-   }
+-}
+-
+ void KMixWindow::slotConfigureCurrentView()
+ {
+ 	KMixerWidget *mw = qobject_cast<KMixerWidget *>(m_wsMixers->currentWidget());
+diff --git a/apps/kmixwindow.h b/apps/kmixwindow.h
+index 67560723..0bcb04ed 100644
+--- a/apps/kmixwindow.h
++++ b/apps/kmixwindow.h
+@@ -86,7 +86,6 @@ protected Q_SLOTS:
+ 
+ private:
+     KMixerWidget* findKMWforTab( const QString& tabId );
+-    void forkExec(const QStringList& args);
+     KToggleAction* _actionShowMenubar;
+ 
+    bool m_startVisible;
+@@ -117,7 +116,6 @@ private:
+     static QString getKmixctrlRcFilename(const QString &postfix);
+ 
+ private Q_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 5c53281a..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.46.0
+
diff --git a/kde-apps/kmix/kmix-24.02.2.ebuild b/kde-apps/kmix/kmix-24.05.2-r1.ebuild
index 6b84b2a33ad9..314dc674568a 100644
--- a/kde-apps/kmix/kmix-24.02.2.ebuild
+++ b/kde-apps/kmix/kmix-24.05.2-r1.ebuild
@@ -26,6 +26,7 @@ DEPEND="
 	>=kde-frameworks/kconfig-${KFMIN}:5
 	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
 	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
 	>=kde-frameworks/kdbusaddons-${KFMIN}:5
 	>=kde-frameworks/kglobalaccel-${KFMIN}:5
 	>=kde-frameworks/ki18n-${KFMIN}:5
@@ -41,11 +42,13 @@ DEPEND="
 		media-libs/libpulse
 	)
 "
-RDEPEND="${DEPEND}
-	kde-plasma/kde-cli-tools:*
-"
+RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${PN}-23.04.2-autostart_disable.patch" ) # TODO: upstream
+PATCHES=(
+	# TODO: upstream
+	"${FILESDIR}/${PN}-23.04.2-autostart_disable.patch"
+	"${FILESDIR}/${P}-revert-kcm_pulseaudio-dep.patch"
+)
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/kde-apps/kmix/kmix-24.04.90.ebuild b/kde-apps/kmix/kmix-24.08.1.ebuild
index c60c5416b0da..5153c51334f1 100644
--- a/kde-apps/kmix/kmix-24.04.90.ebuild
+++ b/kde-apps/kmix/kmix-24.08.1.ebuild
@@ -42,11 +42,13 @@ DEPEND="
 		media-libs/libpulse
 	)
 "
-RDEPEND="${DEPEND}
-	kde-plasma/kde-cli-tools:*
-"
+RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${PN}-23.04.2-autostart_disable.patch" ) # TODO: upstream
+PATCHES=(
+	# TODO: upstream
+	"${FILESDIR}/${PN}-23.04.2-autostart_disable.patch"
+	"${FILESDIR}/${PN}-24.05.2-revert-kcm_pulseaudio-dep.patch"
+)
 
 src_configure() {
 	local mycmakeargs=(