[gentoo-commits] proj/kde:master commit in: kde-apps/kmix/

[Andreas Sturmlechner]

commit: dbdfe9dfc6e2b0a70a600315295808c13fd07725
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Feb 26 18:44:06 2024 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Feb 26 19:58:40 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=dbdfe9df

kde-apps/kmix: Re-add 24.02.0:5 KEYWORDS

Only Qt6 revdeps will need to undergo re-keywording.

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/kmix/kmix-24.02.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-apps/kmix/kmix-24.02.0.ebuild 
b/kde-apps/kmix/kmix-24.02.0.ebuild
index d2321d8375..6bdff80a52 100644
--- a/kde-apps/kmix/kmix-24.02.0.ebuild
+++ b/kde-apps/kmix/kmix-24.02.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kmix/;
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="alsa plasma pulseaudio"
 
 # kde-frameworks/kwindowsystem[X]: Unconditional use of KX11Extras

[gentoo-commits] proj/kde:master commit in: kde-apps/kmix/, kde-apps/kmix/files/

[Andreas Sturmlechner]

commit: 27c563e1bb67d0e98ccf07439152b92a79175b94
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Jun 17 10:07:51 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Jun 17 10:08:26 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=27c563e1

kde-apps/kmix: Disable autostart by default, amend postinst msg

Bug: https://bugs.gentoo.org/791889
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/kmix-23.04.2-autostart_disable.patch | 24 ++
 kde-apps/kmix/kmix-23.04.49..ebuild| 12 ---
 kde-apps/kmix/kmix-.ebuild | 12 ---
 3 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/kde-apps/kmix/files/kmix-23.04.2-autostart_disable.patch 
b/kde-apps/kmix/files/kmix-23.04.2-autostart_disable.patch
new file mode 100644
index 00..8d587f2317
--- /dev/null
+++ b/kde-apps/kmix/files/kmix-23.04.2-autostart_disable.patch
@@ -0,0 +1,24 @@
+diff -up kmix-21.04.0/core/settings.kcfg.autostart_disable 
kmix-21.04.0/core/settings.kcfg
+--- kmix-21.04.0/core/settings.kcfg.autostart_disable  2021-04-28 
16:34:04.623152452 -0500
 kmix-21.04.0/core/settings.kcfg2021-04-28 16:31:03.076698930 -0500
+@@ -57,7 +57,7 @@
+ 
+ 
+ 
+-  true
++  false
+ 
+ 
+ 
+diff -up kmix-21.04.0/desktop/kmix_autostart.desktop.autostart_disable 
kmix-21.04.0/desktop/kmix_autostart.desktop
+--- kmix-21.04.0/desktop/kmix_autostart.desktop.autostart_disable  
2021-04-28 16:34:18.456263203 -0500
 kmix-21.04.0/desktop/kmix_autostart.desktop2021-04-28 
16:32:58.722624829 -0500
+@@ -8,7 +8,7 @@ X-KDE-autostart-after=panel
+ X-KDE-autostart-after=pulseaudio
+ X-KDE-StartupNotify=false
+ X-DBUS-StartupType=Unique
+-X-KDE-autostart-condition=kmixrc:Global:AutoStart:true
++X-KDE-autostart-condition=kmixrc:Global:AutoStart:false
+ Icon=kmix
+ GenericName=Sound Mixer
+ GenericName[bg]=Звуков смесител

diff --git a/kde-apps/kmix/kmix-23.04.49..ebuild 
b/kde-apps/kmix/kmix-23.04.49..ebuild
index 7adfd7fcfa..533aa0cb01 100644
--- a/kde-apps/kmix/kmix-23.04.49..ebuild
+++ b/kde-apps/kmix/kmix-23.04.49..ebuild
@@ -44,6 +44,8 @@ RDEPEND="${DEPEND}
kde-plasma/kde-cli-tools:5
 "
 
+PATCHES=( "${FILESDIR}/${PN}-23.04.2-autostart_disable.patch" ) # TODO: 
upstream
+
 src_configure() {
local mycmakeargs=(
$(cmake_use_find_package alsa ALSA)
@@ -57,12 +59,16 @@ src_configure() {
 
 pkg_postinst() {
if use pulseaudio && has_version kde-plasma/plasma-pa; then
-   elog "In KDE Plasma, kde-plasma/plasma-pa is the default audio 
volume handler."
-   elog "Should you prefer this to be kde-apps/kmix instead, do 
the following:"
+   elog "In KDE Plasma, kde-plasma/plasma-pa is the default audio 
volume handler,"
+   elog "therefore, autostart by default was disabled for KMix."
+   elog
+   elog "Should you prefer to still use kde-apps/kmix instead, do 
the following:"
elog " - In system tray, right click on [Show hidden items]"
elog " - Select [Configure System Tray]"
elog " - In [Entries],  search for [Audio Volume] and set it to 
[Disabled]"
-   elog "KMix will be shown as [Volume Control]."
+   elog
fi
+   elog "KMix will be shown as [Volume Control] after manually starting it 
once"
+   elog "and will be autostarted after configuring such in KMix startup 
settings."
ecm_pkg_postinst
 }

diff --git a/kde-apps/kmix/kmix-.ebuild b/kde-apps/kmix/kmix-.ebuild
index 7adfd7fcfa..533aa0cb01 100644
--- a/kde-apps/kmix/kmix-.ebuild
+++ b/kde-apps/kmix/kmix-.ebuild
@@ -44,6 +44,8 @@ RDEPEND="${DEPEND}
kde-plasma/kde-cli-tools:5
 "
 
+PATCHES=( "${FILESDIR}/${PN}-23.04.2-autostart_disable.patch" ) # TODO: 
upstream
+
 src_configure() {
local mycmakeargs=(
$(cmake_use_find_package alsa ALSA)
@@ -57,12 +59,16 @@ src_configure() {
 
 pkg_postinst() {
if use pulseaudio && has_version kde-plasma/plasma-pa; then
-   elog "In KDE Plasma, kde-plasma/plasma-pa is the default audio 
volume handler."
-   elog "Should you prefer this to be kde-apps/kmix instead, do 
the following:"
+   elog "In KDE Plasma, kde-plasma/plasma-pa is the default audio 
volume handler,"
+   elog "therefore, autostart by default was disabled for KMix."
+   elog
+   elog "Should you prefer to still use kde-apps/kmix instead, do 
the following:"
elog " - In system tray, right click on [Show hidden items]"
elog " - Select [Configure System Tray]"
elog " - In [Entries],  search for [Audio Volume] and set it to 
[Disabled]"
-   elog "KMix will be shown as [Volume Control]."
+   elog
fi
+   elog 

[gentoo-commits] proj/kde:master commit in: kde-apps/kmix/

[Andreas Sturmlechner]

commit: 019c9ebff39edda42e6787655e031d98f926ea44
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Sep 30 18:10:02 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Jul 14 12:58:37 2022 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=019c9ebf

kde-apps/kmix: Switch IUSE pulseaudio to pull in media-libs/libpulse

media-libs/libpulse PDEPEND will ensure a sound server is available
at runtime.

Package-Manager: Portage-3.0.26, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/kmix/kmix-22.08.49..ebuild | 7 +--
 kde-apps/kmix/kmix-.ebuild  | 7 +--
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/kde-apps/kmix/kmix-22.08.49..ebuild 
b/kde-apps/kmix/kmix-22.08.49..ebuild
index 038b8b4c90..22008b8647 100644
--- a/kde-apps/kmix/kmix-22.08.49..ebuild
+++ b/kde-apps/kmix/kmix-22.08.49..ebuild
@@ -37,16 +37,11 @@ DEPEND="
plasma? ( >=kde-frameworks/plasma-${KFMIN}:5 )
pulseaudio? (
media-libs/libcanberra
-   >=media-sound/pulseaudio-0.9.12
+   media-libs/libpulse
)
 "
 RDEPEND="${DEPEND}
kde-plasma/kde-cli-tools:5
-   pulseaudio? ( || (
-   media-video/pipewire
-   media-sound/pulseaudio-daemon
-   media-sound/pulseaudio[daemon(+)]
-   ) )
 "
 
 src_configure() {

diff --git a/kde-apps/kmix/kmix-.ebuild b/kde-apps/kmix/kmix-.ebuild
index 038b8b4c90..22008b8647 100644
--- a/kde-apps/kmix/kmix-.ebuild
+++ b/kde-apps/kmix/kmix-.ebuild
@@ -37,16 +37,11 @@ DEPEND="
plasma? ( >=kde-frameworks/plasma-${KFMIN}:5 )
pulseaudio? (
media-libs/libcanberra
-   >=media-sound/pulseaudio-0.9.12
+   media-libs/libpulse
)
 "
 RDEPEND="${DEPEND}
kde-plasma/kde-cli-tools:5
-   pulseaudio? ( || (
-   media-video/pipewire
-   media-sound/pulseaudio-daemon
-   media-sound/pulseaudio[daemon(+)]
-   ) )
 "
 
 src_configure() {

[gentoo-commits] proj/kde:master commit in: kde-apps/kmix/

[Andreas Sturmlechner]

commit: 8af4f212be9407c125ce222c9d78f4bb24a2a5d1
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Sep 30 18:10:02 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Oct  3 13:00:14 2021 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=8af4f212

kde-apps/kmix: Support media-video/pipewire alternative to PA

Package-Manager: Portage-3.0.26, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/kmix/kmix-21.08.49..ebuild | 5 +
 kde-apps/kmix/kmix-.ebuild  | 5 +
 2 files changed, 10 insertions(+)

diff --git a/kde-apps/kmix/kmix-21.08.49..ebuild 
b/kde-apps/kmix/kmix-21.08.49..ebuild
index add144d6ed..abe8723875 100644
--- a/kde-apps/kmix/kmix-21.08.49..ebuild
+++ b/kde-apps/kmix/kmix-21.08.49..ebuild
@@ -42,6 +42,11 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
kde-plasma/kde-cli-tools:5
+   pulseaudio? ( || (
+   media-video/pipewire
+   media-sound/pulseaudio-daemon
+   media-sound/pulseaudio[daemon(+)]
+   ) )
 "
 
 src_configure() {

diff --git a/kde-apps/kmix/kmix-.ebuild b/kde-apps/kmix/kmix-.ebuild
index e30d8aedb7..097f347d63 100644
--- a/kde-apps/kmix/kmix-.ebuild
+++ b/kde-apps/kmix/kmix-.ebuild
@@ -42,6 +42,11 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
kde-plasma/kde-cli-tools:5
+   pulseaudio? ( || (
+   media-video/pipewire
+   media-sound/pulseaudio-daemon
+   media-sound/pulseaudio[daemon(+)]
+   ) )
 "
 
 src_configure() {

[gentoo-commits] proj/kde:master commit in: kde-apps/kmix/

[Andreas Sturmlechner]

commit: 0c0019b88969e7e75249e833343c0384b634a72c
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Oct  3 13:48:02 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Oct  3 13:48:02 2021 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=0c0019b8

kde-apps/kmix: Add postinst message in global IUSE=pulseaudio context

Closes: https://bugs.gentoo.org/791889
Package-Manager: Portage-3.0.26, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/kmix/kmix-21.08.49..ebuild | 12 
 kde-apps/kmix/kmix-.ebuild  | 12 
 2 files changed, 24 insertions(+)

diff --git a/kde-apps/kmix/kmix-21.08.49..ebuild 
b/kde-apps/kmix/kmix-21.08.49..ebuild
index abe8723875..f1ba0ac216 100644
--- a/kde-apps/kmix/kmix-21.08.49..ebuild
+++ b/kde-apps/kmix/kmix-21.08.49..ebuild
@@ -59,3 +59,15 @@ src_configure() {
 
ecm_src_configure
 }
+
+pkg_postinst() {
+   if use pulseaudio && has_version kde-plasma/plasma-pa; then
+   elog "In KDE Plasma, kde-plasma/plasma-pa is the default audio 
volume handler."
+   elog "Should you prefer this to be kde-apps/kmix instead, do 
the following:"
+   elog " - In system tray, right click on [Show hidden items]"
+   elog " - Select [Configure System Tray]"
+   elog " - In [Entries],  search for [Audio Volume] and set it to 
[Disabled]"
+   elog "KMix will be shown as [Volume Control]."
+   fi
+   ecm_pkg_postinst
+}

diff --git a/kde-apps/kmix/kmix-.ebuild b/kde-apps/kmix/kmix-.ebuild
index 097f347d63..0f298f8743 100644
--- a/kde-apps/kmix/kmix-.ebuild
+++ b/kde-apps/kmix/kmix-.ebuild
@@ -59,3 +59,15 @@ src_configure() {
 
ecm_src_configure
 }
+
+pkg_postinst() {
+   if use pulseaudio && has_version kde-plasma/plasma-pa; then
+   elog "In KDE Plasma, kde-plasma/plasma-pa is the default audio 
volume handler."
+   elog "Should you prefer this to be kde-apps/kmix instead, do 
the following:"
+   elog " - In system tray, right click on [Show hidden items]"
+   elog " - Select [Configure System Tray]"
+   elog " - In [Entries],  search for [Audio Volume] and set it to 
[Disabled]"
+   elog "KMix will be shown as [Volume Control]."
+   fi
+   ecm_pkg_postinst
+}

[gentoo-commits] proj/kde:master commit in: kde-apps/kmix/

[Andreas Sturmlechner]

commit: 8def583376596b1a20f629cddf61e7e20a018bc2
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Apr 15 18:30:15 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Apr 15 20:03:03 2021 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=8def5833

kde-apps/kmix: Update IUSE=plasma

Upstream commit 0e0218428e076f986118cfd58ad3eff931a4a10f

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/kmix/kmix-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-apps/kmix/kmix-.ebuild b/kde-apps/kmix/kmix-.ebuild
index 5a3ea2d5e6..4791302eed 100644
--- a/kde-apps/kmix/kmix-.ebuild
+++ b/kde-apps/kmix/kmix-.ebuild
@@ -47,7 +47,7 @@ RDEPEND="${DEPEND}
 src_configure() {
local mycmakeargs=(
$(cmake_use_find_package alsa ALSA)
-   $(cmake_use_find_package plasma KF5Plasma)
+   -DBUILD_DATAENGINE=$(usex plasma)
$(cmake_use_find_package pulseaudio Canberra)
$(cmake_use_find_package pulseaudio PulseAudio)
)

[gentoo-commits] proj/kde:master commit in: kde-apps/kmix/files/, kde-apps/kmix/

[Andreas Sturmlechner]

commit: e7c155d0cc31908fce5e0cf52cc7c7533f58034b
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Jul 15 13:22:31 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Jul 15 13:22:31 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=e7c155d0

kde-apps/kmix: Drop upstreamed patch

Upstream commit 8fec379c7a682419bdf53c6b939f42a8c8767338

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/kmix-19.12.3-no-more-kcm_phonon.patch| 71 --
 kde-apps/kmix/kmix-20.08.49..ebuild|  2 -
 kde-apps/kmix/kmix-.ebuild |  2 -
 3 files changed, 75 deletions(-)

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 a67b89f324..00
--- 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 
-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 , 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 @@
-  
-  
-  
--  
-  
-  Help
-   
--- 
-2.26.0
-

diff --git a/kde-apps/kmix/kmix-20.08.49..ebuild 
b/kde-apps/kmix/kmix-20.08.49..ebuild
index be65ac5ff4..3131d542dc 100644
--- a/kde-apps/kmix/kmix-20.08.49..ebuild
+++ b/kde-apps/kmix/kmix-20.08.49..ebuild
@@ -44,8 +44,6 @@ RDEPEND="${DEPEND}
kde-plasma/kde-cli-tools:5
 "
 
-PATCHES=( "${FILESDIR}/${PN}-19.12.3-no-more-kcm_phonon.patch" ) # bug 716092
-
 src_configure() {
local mycmakeargs=(
$(cmake_use_find_package alsa ALSA)

diff --git a/kde-apps/kmix/kmix-.ebuild b/kde-apps/kmix/kmix-.ebuild
index be65ac5ff4..3131d542dc 100644
--- a/kde-apps/kmix/kmix-.ebuild
+++ b/kde-apps/kmix/kmix-.ebuild
@@ -44,8 +44,6 @@ RDEPEND="${DEPEND}
kde-plasma/kde-cli-tools:5
 "
 
-PATCHES=( "${FILESDIR}/${PN}-19.12.3-no-more-kcm_phonon.patch" ) # bug 716092
-
 src_configure() {
local mycmakeargs=(
$(cmake_use_find_package alsa ALSA)

[gentoo-commits] proj/kde:master commit in: kde-apps/kmix/

[Andreas Sturmlechner]

commit: 2d1f529348c8b177ccc7c028f5b78f784ae513d0
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Apr  9 21:21:52 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Apr  9 21:21:52 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=2d1f5293

kde-apps/kmix: Better sorting

Package-Manager: Portage-2.3.98, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/kmix/kmix-20.04.49..ebuild | 8 
 kde-apps/kmix/kmix-.ebuild  | 8 
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/kde-apps/kmix/kmix-20.04.49..ebuild 
b/kde-apps/kmix/kmix-20.04.49..ebuild
index c8c24107b6..5ed427a4cd 100644
--- a/kde-apps/kmix/kmix-20.04.49..ebuild
+++ b/kde-apps/kmix/kmix-20.04.49..ebuild
@@ -19,6 +19,10 @@ KEYWORDS=""
 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,10 +34,6 @@ 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? (

diff --git a/kde-apps/kmix/kmix-.ebuild b/kde-apps/kmix/kmix-.ebuild
index 444a346baf..50f27e9865 100644
--- a/kde-apps/kmix/kmix-.ebuild
+++ b/kde-apps/kmix/kmix-.ebuild
@@ -19,6 +19,10 @@ KEYWORDS=""
 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,10 +34,6 @@ 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? (

[gentoo-commits] proj/kde:master commit in: kde-apps/kmix/, kde-apps/kmix/files/

[Andreas Sturmlechner]

commit: db2fc91577a3d7a10cf19ed0d6deb865f3f26199
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Apr  9 21:01:59 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Apr  9 21:01:59 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=db2fc915

kde-apps/kmix: Drop no longer available kcm_phonon 'Audio Setup'

Closes: https://bugs.gentoo.org/716092
Package-Manager: Portage-2.3.98, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/kmix-19.12.3-no-more-kcm_phonon.patch| 71 ++
 kde-apps/kmix/kmix-20.03.90.ebuild |  2 +
 kde-apps/kmix/kmix-20.04.49..ebuild|  2 +
 kde-apps/kmix/kmix-.ebuild |  2 +
 4 files changed, 77 insertions(+)

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
new file mode 100644
index 00..a67b89f324
--- /dev/null
+++ b/kde-apps/kmix/files/kmix-19.12.3-no-more-kcm_phonon.patch
@@ -0,0 +1,71 @@
+From b012e900cce1e432537b192bb146f0b07dbe055c Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+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 , 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 @@
+  
+  
+  
+-  
+  
+  Help
+   
+-- 
+2.26.0
+

diff --git a/kde-apps/kmix/kmix-20.03.90.ebuild 
b/kde-apps/kmix/kmix-20.03.90.ebuild
index 5bd1c40890..5d651540c5 100644
--- a/kde-apps/kmix/kmix-20.03.90.ebuild
+++ b/kde-apps/kmix/kmix-20.03.90.ebuild
@@ -46,6 +46,8 @@ 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)

diff --git a/kde-apps/kmix/kmix-20.04.49..ebuild 
b/kde-apps/kmix/kmix-20.04.49..ebuild
index e4049c3ae4..c8c24107b6 100644
--- a/kde-apps/kmix/kmix-20.04.49..ebuild
+++ b/kde-apps/kmix/kmix-20.04.49..ebuild
@@ -46,6 +46,8 @@ 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)

diff --git a/kde-apps/kmix/kmix-.ebuild b/kde-apps/kmix/kmix-.ebuild
index 84f5fa929c..444a346baf 100644
--- a/kde-apps/kmix/kmix-.ebuild
+++ b/kde-apps/kmix/kmix-.ebuild
@@ -46,6 +46,8 @@ 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)

[gentoo-commits] proj/kde:master commit in: kde-apps/kmix/

[Andreas Sturmlechner]

commit: 368ebf467bee9db70037631db3b0361e34c58fed
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Sep 11 07:50:40 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Sep 11 07:50:40 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=368ebf46

kde-apps/kmix: Drop unused DEPEND

Upstream commit 6b59a9a86568c4d2af1be7f32d1fcc23d48af2cd

Package-Manager: Portage-2.3.75, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/kmix/kmix-.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/kde-apps/kmix/kmix-.ebuild b/kde-apps/kmix/kmix-.ebuild
index 721a17f093..d53e31335a 100644
--- a/kde-apps/kmix/kmix-.ebuild
+++ b/kde-apps/kmix/kmix-.ebuild
@@ -7,7 +7,7 @@ KDE_HANDBOOK="forceoptional"
 KDE_TEST="false"
 inherit kde5
 
-DESCRIPTION="Plasma mixer gui"
+DESCRIPTION="Volume control gui based on KDE Frameworks"
 HOMEPAGE="https://kde.org/applications/multimedia/kmix/;
 KEYWORDS=""
 IUSE="alsa plasma pulseaudio"
@@ -19,7 +19,6 @@ DEPEND="
$(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)

[gentoo-commits] proj/kde:master commit in: kde-apps/kmix/

[Andreas Sturmlechner]

commit: 2e66ec2dbc91448f2b9526a52722539b8c6da858
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Jul 29 20:08:45 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Jul 29 20:08:45 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=2e66ec2d

kde-apps/kmix: Add USE plasma

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/kmix/kmix-.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/kde-apps/kmix/kmix-.ebuild b/kde-apps/kmix/kmix-.ebuild
index eb94ed6db1..721a17f093 100644
--- a/kde-apps/kmix/kmix-.ebuild
+++ b/kde-apps/kmix/kmix-.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 DESCRIPTION="Plasma mixer gui"
 HOMEPAGE="https://kde.org/applications/multimedia/kmix/;
 KEYWORDS=""
-IUSE="alsa pulseaudio"
+IUSE="alsa plasma pulseaudio"
 
 DEPEND="
$(add_frameworks_dep kconfig)
@@ -24,13 +24,13 @@ DEPEND="
$(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 )
+   plasma? ( $(add_frameworks_dep plasma) )
pulseaudio? (
dev-libs/glib:2
media-libs/libcanberra
@@ -44,6 +44,7 @@ RDEPEND="${DEPEND}
 src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package alsa ALSA)
+   $(cmake-utils_use_find_package plasma KF5Plasma)
$(cmake-utils_use_find_package pulseaudio Canberra)
$(cmake-utils_use_find_package pulseaudio PulseAudio)
)

[gentoo-commits] proj/kde:master commit in: kde-apps/kmix/

[Andreas Sturmlechner]

commit: cc7294d5a81a4cce4235a307efffe9a03a533edd
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Dec 23 18:49:12 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Dec 23 18:49:12 2018 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=cc7294d5

kde-apps/kmix: Add new DEPEND

Upstream commit bf1462c460dff53f003418ac8cf7dacd7b1c5091

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/kmix/kmix-.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/kde-apps/kmix/kmix-.ebuild b/kde-apps/kmix/kmix-.ebuild
index 9557de9272..2a0e06153f 100644
--- a/kde-apps/kmix/kmix-.ebuild
+++ b/kde-apps/kmix/kmix-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -25,6 +25,7 @@ DEPEND="
$(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)

[gentoo-commits] proj/kde:master commit in: kde-apps/kmix/

[Andreas Sturmlechner]

commit: 6405fc91b20b1261e055b0124ac74959cf5c85d6
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Oct  1 18:17:44 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Nov 12 15:22:59 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=6405fc91

kde-apps/kmix: Add kde4-l10n blocker

Package-Manager: Portage-2.3.10, Repoman-2.3.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/kmix/kmix-.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kde-apps/kmix/kmix-.ebuild b/kde-apps/kmix/kmix-.ebuild
index 951911a72b..8b9aa0fdd0 100644
--- a/kde-apps/kmix/kmix-.ebuild
+++ b/kde-apps/kmix/kmix-.ebuild
@@ -38,6 +38,7 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
$(add_plasma_dep kde-cli-tools)
+   !kde-apps/kde4-l10n
 "
 
 src_configure() {

[gentoo-commits] proj/kde:master commit in: kde-apps/kmix/

[Andreas Sturmlechner]

commit: 09225917069e25dcb0329f4f828c3a3e0a6ba71e
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Nov 11 15:58:12 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Nov 11 15:58:12 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=09225917

kde-apps/kmix: Drop unused DEPEND, fix cmake option

Upstream commits
bb8cfb529cda9a40107f6be7f54b03fcbf47cc2f
6c0c3d0e2bad67add80118f143b51b4111c81c4e

Package-Manager: Portage-2.3.13, Repoman-2.3.4

 kde-apps/kmix/kmix-.ebuild | 9 +++--
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/kde-apps/kmix/kmix-.ebuild b/kde-apps/kmix/kmix-.ebuild
index 58f0f66df6..951911a72b 100644
--- a/kde-apps/kmix/kmix-.ebuild
+++ b/kde-apps/kmix/kmix-.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.kde.org/applications/multimedia/kmix/;
 KEYWORDS=""
 IUSE="alsa pulseaudio"
 
-COMMON_DEPEND="
+DEPEND="
$(add_frameworks_dep kconfig)
$(add_frameworks_dep kconfigwidgets)
$(add_frameworks_dep kcoreaddons)
@@ -36,16 +36,13 @@ COMMON_DEPEND="
>=media-sound/pulseaudio-0.9.12
)
 "
-DEPEND="${COMMON_DEPEND}
-   $(add_frameworks_dep kdelibs4support)
-"
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
$(add_plasma_dep kde-cli-tools)
 "
 
 src_configure() {
local mycmakeargs=(
-   $(cmake-utils_use_find_package alsa Alsa)
+   $(cmake-utils_use_find_package alsa ALSA)
$(cmake-utils_use_find_package pulseaudio Canberra)
$(cmake-utils_use_find_package pulseaudio PulseAudio)
)

[gentoo-commits] proj/kde:master commit in: kde-apps/kmix/

[Andreas Sturmlechner]

commit: 289c0879fa1432abe99a79bb128c18d8aeb7df60
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Sep 19 20:51:45 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Sep 19 20:51:45 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=289c0879

kde-apps/kmix: Fix DEPENDs, set KDE_HANDBOOK=forceoptional

Package-Manager: Portage-2.3.8, Repoman-2.3.1

 kde-apps/kmix/kmix-.ebuild | 13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/kde-apps/kmix/kmix-.ebuild b/kde-apps/kmix/kmix-.ebuild
index 3e247f148b..58f0f66df6 100644
--- a/kde-apps/kmix/kmix-.ebuild
+++ b/kde-apps/kmix/kmix-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-KDE_HANDBOOK="false"
+KDE_HANDBOOK="forceoptional"
 KDE_TEST="false"
 inherit kde5
 
@@ -12,13 +12,11 @@ HOMEPAGE="https://www.kde.org/applications/multimedia/kmix/;
 KEYWORDS=""
 IUSE="alsa pulseaudio"
 
-DEPEND="
-   $(add_frameworks_dep kcompletion)
+COMMON_DEPEND="
$(add_frameworks_dep kconfig)
$(add_frameworks_dep kconfigwidgets)
$(add_frameworks_dep kcoreaddons)
$(add_frameworks_dep kdbusaddons)
-   $(add_frameworks_dep kdelibs4support)
$(add_frameworks_dep kglobalaccel)
$(add_frameworks_dep ki18n)
$(add_frameworks_dep kiconthemes)
@@ -33,17 +31,20 @@ DEPEND="
$(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}
+DEPEND="${COMMON_DEPEND}
+   $(add_frameworks_dep kdelibs4support)
+"
+RDEPEND="${COMMON_DEPEND}
$(add_plasma_dep kde-cli-tools)
 "
 
 src_configure() {
local mycmakeargs=(
-   -DKMIX_KF5_BUILD=ON
$(cmake-utils_use_find_package alsa Alsa)
$(cmake-utils_use_find_package pulseaudio Canberra)
$(cmake-utils_use_find_package pulseaudio PulseAudio)

[gentoo-commits] proj/kde:master commit in: kde-apps/kmix/

[Manuel Rüger]

commit: a377b5b117c6d2a7038bcdc1833d9815ecb17e95
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Fri Sep 18 18:32:44 2015 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Sat Sep 19 14:03:43 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=a377b5b1

kde-apps/kmix: Add kde-frameworks/plasma DEPEND

https://quickgit.kde.org/?p=kmix.git=commit=48284e173e732e53dff868a26994f3bf9effcac7

Package-Manager: portage-2.2.20.1

 kde-apps/kmix/kmix-.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kde-apps/kmix/kmix-.ebuild b/kde-apps/kmix/kmix-.ebuild
index 6b4f095..9823cba 100644
--- a/kde-apps/kmix/kmix-.ebuild
+++ b/kde-apps/kmix/kmix-.ebuild
@@ -27,6 +27,7 @@ DEPEND="
$(add_frameworks_dep kwidgetsaddons)
$(add_frameworks_dep kwindowsystem)
$(add_frameworks_dep kxmlgui)
+   $(add_frameworks_dep plasma)
dev-qt/qtdbus:5
dev-qt/qtgui:5
dev-qt/qtwidgets:5

[gentoo-commits] proj/kde:master commit in: kde-apps/kmix/files/, kde-apps/kmix/

[Michael Palimaka]

commit: c2a622684b83a3c2ee2e7da736096b51ab60f547
Author: Michael Palimaka kensington AT gentoo DOT org
AuthorDate: Tue Aug 25 16:25:46 2015 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Tue Aug 25 16:25:46 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=c2a62268

kde-apps/kmix: correct patch name.

Package-Manager: portage-2.2.20.1

 .../kmix/files/{kmix-15.04.1-deps.patch = kmix-15.08.0-deps.patch} | 0
 kde-apps/kmix/kmix-15.08.49..ebuild | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-apps/kmix/files/kmix-15.04.1-deps.patch 
b/kde-apps/kmix/files/kmix-15.08.0-deps.patch
similarity index 100%
rename from kde-apps/kmix/files/kmix-15.04.1-deps.patch
rename to kde-apps/kmix/files/kmix-15.08.0-deps.patch

diff --git a/kde-apps/kmix/kmix-15.08.49..ebuild 
b/kde-apps/kmix/kmix-15.08.49..ebuild
index 53a5a92..f65effc 100644
--- a/kde-apps/kmix/kmix-15.08.49..ebuild
+++ b/kde-apps/kmix/kmix-15.08.49..ebuild
@@ -42,8 +42,8 @@ RDEPEND=${DEPEND}
 
 
 PATCHES=(
-   ${FILESDIR}/${PN}-15.04.1-deps.patch
${FILESDIR}/${PN}-15.04.2-alsa-optional.patch
+   ${FILESDIR}/${PN}-15.08.0-deps.patch
 )
 
 src_configure() {

[gentoo-commits] proj/kde:master commit in: kde-apps/kmix/

[Michael Palimaka]

commit: d31ddbb2ddaa7b08887f3a4af460a9fc99dc0bab
Author: Michael Palimaka kensington AT gentoo DOT org
AuthorDate: Tue Aug 25 16:18:16 2015 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Tue Aug 25 16:18:41 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=d31ddbb2

kde-apps/kmix: remove unused local USE description.

Package-Manager: portage-2.2.20.1

 kde-apps/kmix/metadata.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/kde-apps/kmix/metadata.xml b/kde-apps/kmix/metadata.xml
index 8afb87d..a23f444 100644
--- a/kde-apps/kmix/metadata.xml
+++ b/kde-apps/kmix/metadata.xml
@@ -2,7 +2,4 @@
 !DOCTYPE pkgmetadata SYSTEM http://www.gentoo.org/dtd/metadata.dtd;
 pkgmetadata
herdkde/herd
-   use
-   flag name=canberraEnable sound event support using 
pkgmedia-libs/libcanberra/pkg/flag
-   /use
 /pkgmetadata

[gentoo-commits] proj/kde:master commit in: kde-apps/kmix/

[Michael Palimaka]

commit: b663b615f791647470b36a25652dc30967c9f036
Author: Michael Palimaka kensington AT gentoo DOT org
AuthorDate: Tue Aug 25 16:17:58 2015 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Tue Aug 25 16:18:41 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=b663b615

kde-apps/kmix: add missing dependency.

Package-Manager: portage-2.2.20.1

 kde-apps/kmix/kmix-15.08.49..ebuild | 4 +++-
 kde-apps/kmix/kmix-.ebuild  | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/kde-apps/kmix/kmix-15.08.49..ebuild 
b/kde-apps/kmix/kmix-15.08.49..ebuild
index 404294b..16957b9 100644
--- a/kde-apps/kmix/kmix-15.08.49..ebuild
+++ b/kde-apps/kmix/kmix-15.08.49..ebuild
@@ -37,7 +37,9 @@ DEPEND=
=media-sound/pulseaudio-0.9.12
)
 
-RDEPEND=${DEPEND}
+RDEPEND=${DEPEND}
+   $(add_plasma_dep kde-cli-tools)
+
 
 PATCHES=( ${FILESDIR}/${PN}-15.04.2-alsa-optional.patch )
 

diff --git a/kde-apps/kmix/kmix-.ebuild b/kde-apps/kmix/kmix-.ebuild
index 404294b..16957b9 100644
--- a/kde-apps/kmix/kmix-.ebuild
+++ b/kde-apps/kmix/kmix-.ebuild
@@ -37,7 +37,9 @@ DEPEND=
=media-sound/pulseaudio-0.9.12
)
 
-RDEPEND=${DEPEND}
+RDEPEND=${DEPEND}
+   $(add_plasma_dep kde-cli-tools)
+
 
 PATCHES=( ${FILESDIR}/${PN}-15.04.2-alsa-optional.patch )
 

[gentoo-commits] proj/kde:master commit in: kde-apps/kmix/, kde-apps/kmix/files/

[Michael Palimaka]

commit: fefdde28ef9243938974f2b830351379ebd931b3
Author: Michael Palimaka kensington AT gentoo DOT org
AuthorDate: Tue Aug 25 16:23:56 2015 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Tue Aug 25 16:23:56 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=fefdde28

kde-apps/kmix: backport patch from upstream to remove missing dependency.

Package-Manager: portage-2.2.20.1

 kde-apps/kmix/files/kmix-15.04.1-deps.patch | 25 +
 kde-apps/kmix/kmix-15.08.49..ebuild |  5 -
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/kde-apps/kmix/files/kmix-15.04.1-deps.patch 
b/kde-apps/kmix/files/kmix-15.04.1-deps.patch
new file mode 100644
index 000..5a02359
--- /dev/null
+++ b/kde-apps/kmix/files/kmix-15.04.1-deps.patch
@@ -0,0 +1,25 @@
+From ea58dd9a8cba08566ce6045341a5695d688abb45 Mon Sep 17 00:00:00 2001
+From: Michael Palimaka kensing...@gentoo.org
+Date: Thu, 20 Aug 2015 04:41:45 +1000
+Subject: [PATCH] Remove unused dependency.
+
+REVIEW:
+---
+ CMakeLists.txt | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 01afa4a..85886c0 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -43,7 +43,6 @@ if (KMIX_KF5_BUILD)
+   I18n
+   XmlGui
+   DBusAddons
+-  KCMUtils
+   KDELibs4Support)
+   find_package(KF5ConfigWidgets)
+   find_package(KF5IconThemes)
+-- 
+2.4.6
+

diff --git a/kde-apps/kmix/kmix-15.08.49..ebuild 
b/kde-apps/kmix/kmix-15.08.49..ebuild
index 16957b9..53a5a92 100644
--- a/kde-apps/kmix/kmix-15.08.49..ebuild
+++ b/kde-apps/kmix/kmix-15.08.49..ebuild
@@ -41,7 +41,10 @@ RDEPEND=${DEPEND}
$(add_plasma_dep kde-cli-tools)
 
 
-PATCHES=( ${FILESDIR}/${PN}-15.04.2-alsa-optional.patch )
+PATCHES=(
+   ${FILESDIR}/${PN}-15.04.1-deps.patch
+   ${FILESDIR}/${PN}-15.04.2-alsa-optional.patch
+)
 
 src_configure() {
local mycmakeargs=(

[gentoo-commits] proj/kde:master commit in: kde-apps/kmix/

[Michael Palimaka]

commit: f84d79d62d5c0f22582d7ca18dd1dea0284ba289
Author: Michael Palimaka kensington AT gentoo DOT org
AuthorDate: Tue Aug 25 18:12:19 2015 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Tue Aug 25 18:12:19 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=f84d79d6

kde-apps/kmix: patch merged upstream.

Upstream commit: 7e49d2979d7fd103b5e85ce8a8dbaaa3066fe36e

Package-Manager: portage-2.2.20.1

 kde-apps/kmix/kmix-.ebuild | 2 --
 1 file changed, 2 deletions(-)

diff --git a/kde-apps/kmix/kmix-.ebuild b/kde-apps/kmix/kmix-.ebuild
index 16957b9..a74d160 100644
--- a/kde-apps/kmix/kmix-.ebuild
+++ b/kde-apps/kmix/kmix-.ebuild
@@ -41,8 +41,6 @@ RDEPEND=${DEPEND}
$(add_plasma_dep kde-cli-tools)
 
 
-PATCHES=( ${FILESDIR}/${PN}-15.04.2-alsa-optional.patch )
-
 src_configure() {
local mycmakeargs=(
-DKMIX_KF5_BUILD=ON

[gentoo-commits] proj/kde:master commit in: kde-apps/kmix/

[Michael Palimaka]

commit: 5f8a7e168a21ee4aa732bcb46f3ed77c9d33da06
Author: Michael Palimaka kensington AT gentoo DOT org
AuthorDate: Wed Aug 19 19:06:06 2015 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Wed Aug 19 19:06:06 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=5f8a7e16

kde-apps/kmix: use correct CMake find module capitalisation.

Package-Manager: portage-2.2.20.1

 kde-apps/kmix/kmix-15.08.0.ebuild   | 2 +-
 kde-apps/kmix/kmix-15.08.49..ebuild | 2 +-
 kde-apps/kmix/kmix-.ebuild  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/kde-apps/kmix/kmix-15.08.0.ebuild 
b/kde-apps/kmix/kmix-15.08.0.ebuild
index a44f296..e759c93 100644
--- a/kde-apps/kmix/kmix-15.08.0.ebuild
+++ b/kde-apps/kmix/kmix-15.08.0.ebuild
@@ -44,7 +44,7 @@ PATCHES=( ${FILESDIR}/${PN}-15.04.2-alsa-optional.patch )
 src_configure() {
local mycmakeargs=(
-DKMIX_KF5_BUILD=ON
-   $(cmake-utils_use_find_package alsa)
+   $(cmake-utils_use_find_package alsa Alsa)
$(cmake-utils_use_find_package pulseaudio Canberra)
$(cmake-utils_use_find_package pulseaudio PulseAudio)
)

diff --git a/kde-apps/kmix/kmix-15.08.49..ebuild 
b/kde-apps/kmix/kmix-15.08.49..ebuild
index 81314ae..404294b 100644
--- a/kde-apps/kmix/kmix-15.08.49..ebuild
+++ b/kde-apps/kmix/kmix-15.08.49..ebuild
@@ -44,7 +44,7 @@ PATCHES=( ${FILESDIR}/${PN}-15.04.2-alsa-optional.patch )
 src_configure() {
local mycmakeargs=(
-DKMIX_KF5_BUILD=ON
-   $(cmake-utils_use_find_package alsa)
+   $(cmake-utils_use_find_package alsa Alsa)
$(cmake-utils_use_find_package pulseaudio Canberra)
$(cmake-utils_use_find_package pulseaudio PulseAudio)
)

diff --git a/kde-apps/kmix/kmix-.ebuild b/kde-apps/kmix/kmix-.ebuild
index 81314ae..404294b 100644
--- a/kde-apps/kmix/kmix-.ebuild
+++ b/kde-apps/kmix/kmix-.ebuild
@@ -44,7 +44,7 @@ PATCHES=( ${FILESDIR}/${PN}-15.04.2-alsa-optional.patch )
 src_configure() {
local mycmakeargs=(
-DKMIX_KF5_BUILD=ON
-   $(cmake-utils_use_find_package alsa)
+   $(cmake-utils_use_find_package alsa Alsa)
$(cmake-utils_use_find_package pulseaudio Canberra)
$(cmake-utils_use_find_package pulseaudio PulseAudio)
)

[gentoo-commits] proj/kde:master commit in: kde-apps/kmix/

[Michael Palimaka]

commit: 251df30c560bbe32f86df1aeeba51f0140f6994c
Author: Michael Palimaka kensington AT gentoo DOT org
AuthorDate: Wed Aug 19 18:35:39 2015 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Wed Aug 19 18:35:39 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=251df30c

kde-apps/kmix: add missing dependencies

Package-Manager: portage-2.2.20.1

 kde-apps/kmix/kmix-15.08.0.ebuild   | 2 ++
 kde-apps/kmix/kmix-15.08.49..ebuild | 2 ++
 kde-apps/kmix/kmix-.ebuild  | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/kde-apps/kmix/kmix-15.08.0.ebuild 
b/kde-apps/kmix/kmix-15.08.0.ebuild
index 30fe8f0..e9c658d 100644
--- a/kde-apps/kmix/kmix-15.08.0.ebuild
+++ b/kde-apps/kmix/kmix-15.08.0.ebuild
@@ -18,6 +18,7 @@ DEPEND=
$(add_frameworks_dep kconfig)
$(add_frameworks_dep kconfigwidgets)
$(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kdbusaddons)
$(add_frameworks_dep kdelibs4support)
$(add_frameworks_dep kglobalaccel)
$(add_frameworks_dep ki18n)
@@ -25,6 +26,7 @@ DEPEND=
$(add_frameworks_dep knotifications)
$(add_frameworks_dep kwidgetsaddons)
$(add_frameworks_dep kwindowsystem)
+   $(add_frameworks_dep kxmlgui)
dev-libs/glib:2
dev-qt/qtdbus:5
dev-qt/qtgui:5

diff --git a/kde-apps/kmix/kmix-15.08.49..ebuild 
b/kde-apps/kmix/kmix-15.08.49..ebuild
index f3953f9..6a34bb0 100644
--- a/kde-apps/kmix/kmix-15.08.49..ebuild
+++ b/kde-apps/kmix/kmix-15.08.49..ebuild
@@ -18,6 +18,7 @@ DEPEND=
$(add_frameworks_dep kconfig)
$(add_frameworks_dep kconfigwidgets)
$(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kdbusaddons)
$(add_frameworks_dep kdelibs4support)
$(add_frameworks_dep kglobalaccel)
$(add_frameworks_dep ki18n)
@@ -25,6 +26,7 @@ DEPEND=
$(add_frameworks_dep knotifications)
$(add_frameworks_dep kwidgetsaddons)
$(add_frameworks_dep kwindowsystem)
+   $(add_frameworks_dep kxmlgui)
dev-libs/glib:2
dev-qt/qtdbus:5
dev-qt/qtgui:5

diff --git a/kde-apps/kmix/kmix-.ebuild b/kde-apps/kmix/kmix-.ebuild
index f3953f9..6a34bb0 100644
--- a/kde-apps/kmix/kmix-.ebuild
+++ b/kde-apps/kmix/kmix-.ebuild
@@ -18,6 +18,7 @@ DEPEND=
$(add_frameworks_dep kconfig)
$(add_frameworks_dep kconfigwidgets)
$(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kdbusaddons)
$(add_frameworks_dep kdelibs4support)
$(add_frameworks_dep kglobalaccel)
$(add_frameworks_dep ki18n)
@@ -25,6 +26,7 @@ DEPEND=
$(add_frameworks_dep knotifications)
$(add_frameworks_dep kwidgetsaddons)
$(add_frameworks_dep kwindowsystem)
+   $(add_frameworks_dep kxmlgui)
dev-libs/glib:2
dev-qt/qtdbus:5
dev-qt/qtgui:5

[gentoo-commits] proj/kde:master commit in: kde-apps/kmix/

[Michael Palimaka]

commit: 9233bbab46ccc64326a138342d1185eac4ef8721
Author: Michael Palimaka kensington AT gentoo DOT org
AuthorDate: Wed Aug 19 19:02:49 2015 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Wed Aug 19 19:03:11 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=9233bbab

kde-apps/kmix: punt canberra USE flag.

It's only useful when pulseaudio is also enabled, and is hard-required for 
kde-plasma/plasma-desktop[pulseaudio].

Package-Manager: portage-2.2.20.1

 kde-apps/kmix/kmix-15.08.0.ebuild   | 10 ++
 kde-apps/kmix/kmix-15.08.49..ebuild | 10 ++
 kde-apps/kmix/kmix-.ebuild  | 10 ++
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/kde-apps/kmix/kmix-15.08.0.ebuild 
b/kde-apps/kmix/kmix-15.08.0.ebuild
index 2ced351..a44f296 100644
--- a/kde-apps/kmix/kmix-15.08.0.ebuild
+++ b/kde-apps/kmix/kmix-15.08.0.ebuild
@@ -11,7 +11,7 @@ inherit kde5
 DESCRIPTION=Plasma mixer gui
 HOMEPAGE=http://www.kde.org/applications/multimedia/kmix/;
 KEYWORDS=~amd64 ~x86
-IUSE=alsa canberra pulseaudio
+IUSE=alsa pulseaudio
 
 DEPEND=
$(add_frameworks_dep kcompletion)
@@ -32,8 +32,10 @@ DEPEND=
dev-qt/qtwidgets:5
dev-qt/qtxml:5
alsa? ( =media-libs/alsa-lib-1.0.14a )
-   canberra? ( media-libs/libcanberra )
-   pulseaudio? ( =media-sound/pulseaudio-0.9.12 )
+   pulseaudio? (
+   media-libs/libcanberra
+   =media-sound/pulseaudio-0.9.12
+   )
 
 RDEPEND=${DEPEND}
 
@@ -43,7 +45,7 @@ src_configure() {
local mycmakeargs=(
-DKMIX_KF5_BUILD=ON
$(cmake-utils_use_find_package alsa)
-   $(cmake-utils_use_find_package canberra)
+   $(cmake-utils_use_find_package pulseaudio Canberra)
$(cmake-utils_use_find_package pulseaudio PulseAudio)
)
 

diff --git a/kde-apps/kmix/kmix-15.08.49..ebuild 
b/kde-apps/kmix/kmix-15.08.49..ebuild
index 2adadf0..81314ae 100644
--- a/kde-apps/kmix/kmix-15.08.49..ebuild
+++ b/kde-apps/kmix/kmix-15.08.49..ebuild
@@ -11,7 +11,7 @@ inherit kde5
 DESCRIPTION=Plasma mixer gui
 HOMEPAGE=http://www.kde.org/applications/multimedia/kmix/;
 KEYWORDS=
-IUSE=alsa canberra pulseaudio
+IUSE=alsa pulseaudio
 
 DEPEND=
$(add_frameworks_dep kcompletion)
@@ -32,8 +32,10 @@ DEPEND=
dev-qt/qtwidgets:5
dev-qt/qtxml:5
alsa? ( =media-libs/alsa-lib-1.0.14a )
-   canberra? ( media-libs/libcanberra )
-   pulseaudio? ( =media-sound/pulseaudio-0.9.12 )
+   pulseaudio? (
+   media-libs/libcanberra
+   =media-sound/pulseaudio-0.9.12
+   )
 
 RDEPEND=${DEPEND}
 
@@ -43,7 +45,7 @@ src_configure() {
local mycmakeargs=(
-DKMIX_KF5_BUILD=ON
$(cmake-utils_use_find_package alsa)
-   $(cmake-utils_use_find_package canberra)
+   $(cmake-utils_use_find_package pulseaudio Canberra)
$(cmake-utils_use_find_package pulseaudio PulseAudio)
)
 

diff --git a/kde-apps/kmix/kmix-.ebuild b/kde-apps/kmix/kmix-.ebuild
index 2adadf0..81314ae 100644
--- a/kde-apps/kmix/kmix-.ebuild
+++ b/kde-apps/kmix/kmix-.ebuild
@@ -11,7 +11,7 @@ inherit kde5
 DESCRIPTION=Plasma mixer gui
 HOMEPAGE=http://www.kde.org/applications/multimedia/kmix/;
 KEYWORDS=
-IUSE=alsa canberra pulseaudio
+IUSE=alsa pulseaudio
 
 DEPEND=
$(add_frameworks_dep kcompletion)
@@ -32,8 +32,10 @@ DEPEND=
dev-qt/qtwidgets:5
dev-qt/qtxml:5
alsa? ( =media-libs/alsa-lib-1.0.14a )
-   canberra? ( media-libs/libcanberra )
-   pulseaudio? ( =media-sound/pulseaudio-0.9.12 )
+   pulseaudio? (
+   media-libs/libcanberra
+   =media-sound/pulseaudio-0.9.12
+   )
 
 RDEPEND=${DEPEND}
 
@@ -43,7 +45,7 @@ src_configure() {
local mycmakeargs=(
-DKMIX_KF5_BUILD=ON
$(cmake-utils_use_find_package alsa)
-   $(cmake-utils_use_find_package canberra)
+   $(cmake-utils_use_find_package pulseaudio Canberra)
$(cmake-utils_use_find_package pulseaudio PulseAudio)
)
 

[gentoo-commits] proj/kde:master commit in: kde-apps/kmix/

[Michael Palimaka]

commit: 54719fd97be19c44fef1bee4d1609273493eab46
Author: Michael Palimaka kensington AT gentoo DOT org
AuthorDate: Wed Aug 19 18:57:31 2015 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Wed Aug 19 18:57:31 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=54719fd9

kde-apps/kmix: remove dev-libs/glib dependency

It doesn't appear to actually be used, and is not hard-required by cmake.

Package-Manager: portage-2.2.20.1

 kde-apps/kmix/kmix-15.08.0.ebuild   | 1 -
 kde-apps/kmix/kmix-15.08.49..ebuild | 1 -
 kde-apps/kmix/kmix-.ebuild  | 1 -
 3 files changed, 3 deletions(-)

diff --git a/kde-apps/kmix/kmix-15.08.0.ebuild 
b/kde-apps/kmix/kmix-15.08.0.ebuild
index e9c658d..2ced351 100644
--- a/kde-apps/kmix/kmix-15.08.0.ebuild
+++ b/kde-apps/kmix/kmix-15.08.0.ebuild
@@ -27,7 +27,6 @@ DEPEND=
$(add_frameworks_dep kwidgetsaddons)
$(add_frameworks_dep kwindowsystem)
$(add_frameworks_dep kxmlgui)
-   dev-libs/glib:2
dev-qt/qtdbus:5
dev-qt/qtgui:5
dev-qt/qtwidgets:5

diff --git a/kde-apps/kmix/kmix-15.08.49..ebuild 
b/kde-apps/kmix/kmix-15.08.49..ebuild
index 6a34bb0..2adadf0 100644
--- a/kde-apps/kmix/kmix-15.08.49..ebuild
+++ b/kde-apps/kmix/kmix-15.08.49..ebuild
@@ -27,7 +27,6 @@ DEPEND=
$(add_frameworks_dep kwidgetsaddons)
$(add_frameworks_dep kwindowsystem)
$(add_frameworks_dep kxmlgui)
-   dev-libs/glib:2
dev-qt/qtdbus:5
dev-qt/qtgui:5
dev-qt/qtwidgets:5

diff --git a/kde-apps/kmix/kmix-.ebuild b/kde-apps/kmix/kmix-.ebuild
index 6a34bb0..2adadf0 100644
--- a/kde-apps/kmix/kmix-.ebuild
+++ b/kde-apps/kmix/kmix-.ebuild
@@ -27,7 +27,6 @@ DEPEND=
$(add_frameworks_dep kwidgetsaddons)
$(add_frameworks_dep kwindowsystem)
$(add_frameworks_dep kxmlgui)
-   dev-libs/glib:2
dev-qt/qtdbus:5
dev-qt/qtgui:5
dev-qt/qtwidgets:5

[gentoo-commits] proj/kde:master commit in: kde-apps/kmix/files/

[Michael Palimaka]

commit: 0c10998a97dd25fe6111b851139a6ffbae3e5253
Author: Michael Palimaka kensington AT gentoo DOT org
AuthorDate: Fri Jul 10 18:40:05 2015 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Fri Jul 10 18:40:32 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=0c10998a

[kde-apps/kmix] Restore missing patch.

Package-Manager: portage-2.2.20

 .../kmix/files/kmix-15.04.2-alsa-optional.patch| 26 ++
 1 file changed, 26 insertions(+)

diff --git a/kde-apps/kmix/files/kmix-15.04.2-alsa-optional.patch 
b/kde-apps/kmix/files/kmix-15.04.2-alsa-optional.patch
new file mode 100644
index 000..bbcb894
--- /dev/null
+++ b/kde-apps/kmix/files/kmix-15.04.2-alsa-optional.patch
@@ -0,0 +1,26 @@
+--- a/CMakeLists.txt   2015-06-04 23:19:26.543647639 +0200
 b/CMakeLists.txt   2015-06-04 23:22:08.863655630 +0200
+@@ -79,7 +79,10 @@
+ endif()
+ 
+ find_package(Alsa)
+-alsa_configure_file(${CMAKE_BINARY_DIR}/config-alsa.h)
++if(ALSA_FOUND)
++  alsa_configure_file(${CMAKE_BINARY_DIR}/config-alsa.h)
++  add_definitions(-DHAVE_LIBASOUND2)
++endif(ALSA_FOUND)
+ 
+ add_definitions (${QT_DEFINITIONS} ${QT_QTDBUS_DEFINITIONS} 
${KDE4_DEFINITIONS} )
+ add_definitions(-DKDE_DEFAULT_DEBUG_AREA=67100)
+--- a/backends/kmix-backends.cpp   2015-06-04 23:11:58.084625559 +0200
 b/backends/kmix-backends.cpp   2015-06-04 23:12:34.194627337 +0200
+@@ -23,7 +23,9 @@
+ /* This code is being #include'd from mixer.cpp */
+ 
+ #include config.h
++#ifdef HAVE_LIBASOUND2
+ #include config-alsa.h
++#endif
+ 
+ #include mixer_backend.h
+ #include core/mixer.h

[gentoo-commits] proj/kde:master commit in: kde-apps/kmix/files/, kde-apps/kmix/

[Michael Palimaka]

commit: 69e39a454cd906e28ae43d2cfa9cf4d416cb7d82
Author: Andreas Sturmlechner andreas.sturmlechner AT gmail DOT com
AuthorDate: Mon Jun  1 20:19:55 2015 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Fri Jun  5 15:31:53 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=69e39a45

[kde-apps/kmix] Only support kf5 in master

Package-Manager: portage-2.2.20

 .../kmix/files/kmix-15.04.2-alsa-optional.patch| 26 +++
 .../kmix/files/kmix-5.-alsa-optional.patch | 26 ---
 kde-apps/kmix/kmix-5..ebuild   | 50 --
 kde-apps/kmix/kmix-.ebuild | 36 
 4 files changed, 54 insertions(+), 84 deletions(-)

diff --git a/kde-apps/kmix/files/kmix-15.04.2-alsa-optional.patch 
b/kde-apps/kmix/files/kmix-15.04.2-alsa-optional.patch
new file mode 100644
index 000..bbcb894
--- /dev/null
+++ b/kde-apps/kmix/files/kmix-15.04.2-alsa-optional.patch
@@ -0,0 +1,26 @@
+--- a/CMakeLists.txt   2015-06-04 23:19:26.543647639 +0200
 b/CMakeLists.txt   2015-06-04 23:22:08.863655630 +0200
+@@ -79,7 +79,10 @@
+ endif()
+ 
+ find_package(Alsa)
+-alsa_configure_file(${CMAKE_BINARY_DIR}/config-alsa.h)
++if(ALSA_FOUND)
++  alsa_configure_file(${CMAKE_BINARY_DIR}/config-alsa.h)
++  add_definitions(-DHAVE_LIBASOUND2)
++endif(ALSA_FOUND)
+ 
+ add_definitions (${QT_DEFINITIONS} ${QT_QTDBUS_DEFINITIONS} 
${KDE4_DEFINITIONS} )
+ add_definitions(-DKDE_DEFAULT_DEBUG_AREA=67100)
+--- a/backends/kmix-backends.cpp   2015-06-04 23:11:58.084625559 +0200
 b/backends/kmix-backends.cpp   2015-06-04 23:12:34.194627337 +0200
+@@ -23,7 +23,9 @@
+ /* This code is being #include'd from mixer.cpp */
+ 
+ #include config.h
++#ifdef HAVE_LIBASOUND2
+ #include config-alsa.h
++#endif
+ 
+ #include mixer_backend.h
+ #include core/mixer.h

diff --git a/kde-apps/kmix/files/kmix-5.-alsa-optional.patch 
b/kde-apps/kmix/files/kmix-5.-alsa-optional.patch
deleted file mode 100644
index 92c258c..000
--- a/kde-apps/kmix/files/kmix-5.-alsa-optional.patch
+++ /dev/null
@@ -1,26 +0,0 @@
 a/CMakeLists.txt   2015-05-16 22:31:57.555962909 +0200
-+++ b/CMakeLists.txt   2015-05-16 22:19:13.393985683 +0200
-@@ -79,7 +79,9 @@
- endif()
- 
- find_package(Alsa)
--alsa_configure_file(${CMAKE_BINARY_DIR}/config-alsa.h)
-+if(Alsa_FOUND)
-+alsa_configure_file(${CMAKE_BINARY_DIR}/config-alsa.h)
-+endif()
- 
- add_definitions (${QT_DEFINITIONS} ${QT_QTDBUS_DEFINITIONS} 
${KDE4_DEFINITIONS} )
- add_definitions(-DKDE_DEFAULT_DEBUG_AREA=67100)
 a/backends/kmix-backends.cpp   2015-05-16 22:31:36.650963532 +0200
-+++ b/backends/kmix-backends.cpp   2015-05-16 22:22:57.761978996 +0200
-@@ -23,7 +23,10 @@
- /* This code is being #include'd from mixer.cpp */
- 
- #include config.h
-+
-+#if defined(HAVE_LIBASOUND2)
- #include config-alsa.h
-+#endif
- 
- #include mixer_backend.h
- #include core/mixer.h

diff --git a/kde-apps/kmix/kmix-5..ebuild b/kde-apps/kmix/kmix-5..ebuild
deleted file mode 100644
index 4158e29..000
--- a/kde-apps/kmix/kmix-5..ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit kde5
-
-DESCRIPTION=KDE mixer gui
-HOMEPAGE=http://www.kde.org/applications/multimedia/kmix/;
-KEYWORDS=
-IUSE=alsa canberra pulseaudio
-
-DEPEND=
-   $(add_frameworks_dep kcompletion)
-   $(add_frameworks_dep kconfig)
-   $(add_frameworks_dep kconfigwidgets)
-   $(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep kdelibs4support)
-   $(add_frameworks_dep kglobalaccel)
-   $(add_frameworks_dep ki18n)
-   $(add_frameworks_dep kiconthemes)
-   $(add_frameworks_dep knotifications)
-   $(add_frameworks_dep kwidgetsaddons)
-   $(add_frameworks_dep kwindowsystem)
-   dev-libs/glib:2
-   dev-qt/qtdbus:5
-   dev-qt/qtgui:5
-   dev-qt/qtwidgets:5
-   dev-qt/qtxml:5
-   alsa? ( =media-libs/alsa-lib-1.0.14a )
-   canberra? ( media-libs/libcanberra )
-   pulseaudio? ( =media-sound/pulseaudio-0.9.12 )
-
-RDEPEND=${DEPEND}
-   !kde-base/kmix:4
-
-
-PATCHES=( ${FILESDIR}/${PN}-5.-alsa-optional.patch )
-
-src_configure() {
-   local mycmakeargs=(
-   -DKMIX_KF5_BUILD=ON
-   $(cmake-utils_use_find_package alsa)
-   $(cmake-utils_use_find_package canberra)
-   $(cmake-utils_use_find_package pulseaudio PulseAudio)
-   )
-
-   kde5_src_configure
-}

diff --git a/kde-apps/kmix/kmix-.ebuild b/kde-apps/kmix/kmix-.ebuild
index f7a8cfa..346ad98 100644
--- a/kde-apps/kmix/kmix-.ebuild
+++ b/kde-apps/kmix/kmix-.ebuild
@@ -4,27 +4,47 @@
 
 EAPI=5
 
-KDE_HANDBOOK=optional
-inherit kde4-base
+KDE_HANDBOOK=false
+KDE_TEST=false
+inherit kde5
 
-DESCRIPTION=KDE mixer gui
+DESCRIPTION=Plasma mixer gui
 

[gentoo-commits] proj/kde:master commit in: kde-apps/kmix/

[Michael Palimaka]

commit: 7361cb5a3933425d3674dbc9a5a2f6169da9e8a8
Author: Andreas Sturmlechner andreas.sturmlechner AT gmail DOT com
AuthorDate: Thu Jun  4 17:59:34 2015 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Fri Jun  5 15:31:53 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=7361cb5a

[kde-apps/kmix] Use kf5 build option

Package-Manager: portage-2.2.20

 kde-apps/kmix/kmix-15.04.2-r1.ebuild| 50 +
 kde-apps/kmix/kmix-15.04.49..ebuild | 36 ++--
 2 files changed, 78 insertions(+), 8 deletions(-)

diff --git a/kde-apps/kmix/kmix-15.04.2-r1.ebuild 
b/kde-apps/kmix/kmix-15.04.2-r1.ebuild
new file mode 100644
index 000..b69e04a
--- /dev/null
+++ b/kde-apps/kmix/kmix-15.04.2-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+KDE_HANDBOOK=false
+KDE_TEST=false
+inherit kde5
+
+DESCRIPTION=Plasma mixer gui
+HOMEPAGE=http://www.kde.org/applications/multimedia/kmix/;
+KEYWORDS=~amd64 ~x86
+IUSE=alsa canberra pulseaudio
+
+DEPEND=
+   $(add_frameworks_dep kcompletion)
+   $(add_frameworks_dep kconfig)
+   $(add_frameworks_dep kconfigwidgets)
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kdelibs4support)
+   $(add_frameworks_dep kglobalaccel)
+   $(add_frameworks_dep ki18n)
+   $(add_frameworks_dep kiconthemes)
+   $(add_frameworks_dep knotifications)
+   $(add_frameworks_dep kwidgetsaddons)
+   $(add_frameworks_dep kwindowsystem)
+   dev-libs/glib:2
+   dev-qt/qtdbus:5
+   dev-qt/qtgui:5
+   dev-qt/qtwidgets:5
+   dev-qt/qtxml:5
+   alsa? ( =media-libs/alsa-lib-1.0.14a )
+   canberra? ( media-libs/libcanberra )
+   pulseaudio? ( =media-sound/pulseaudio-0.9.12 )
+
+RDEPEND=${DEPEND}
+
+PATCHES=( ${FILESDIR}/${PN}-15.04.2-alsa-optional.patch )
+
+src_configure() {
+   local mycmakeargs=(
+   -DKMIX_KF5_BUILD=ON
+   $(cmake-utils_use_find_package alsa)
+   $(cmake-utils_use_find_package canberra)
+   $(cmake-utils_use_find_package pulseaudio PulseAudio)
+   )
+
+   kde5_src_configure
+}

diff --git a/kde-apps/kmix/kmix-15.04.49..ebuild 
b/kde-apps/kmix/kmix-15.04.49..ebuild
index f7a8cfa..346ad98 100644
--- a/kde-apps/kmix/kmix-15.04.49..ebuild
+++ b/kde-apps/kmix/kmix-15.04.49..ebuild
@@ -4,27 +4,47 @@
 
 EAPI=5
 
-KDE_HANDBOOK=optional
-inherit kde4-base
+KDE_HANDBOOK=false
+KDE_TEST=false
+inherit kde5
 
-DESCRIPTION=KDE mixer gui
+DESCRIPTION=Plasma mixer gui
 HOMEPAGE=http://www.kde.org/applications/multimedia/kmix/;
 KEYWORDS=
-IUSE=alsa debug canberra pulseaudio
+IUSE=alsa canberra pulseaudio
 
 DEPEND=
+   $(add_frameworks_dep kcompletion)
+   $(add_frameworks_dep kconfig)
+   $(add_frameworks_dep kconfigwidgets)
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kdelibs4support)
+   $(add_frameworks_dep kglobalaccel)
+   $(add_frameworks_dep ki18n)
+   $(add_frameworks_dep kiconthemes)
+   $(add_frameworks_dep knotifications)
+   $(add_frameworks_dep kwidgetsaddons)
+   $(add_frameworks_dep kwindowsystem)
+   dev-libs/glib:2
+   dev-qt/qtdbus:5
+   dev-qt/qtgui:5
+   dev-qt/qtwidgets:5
+   dev-qt/qtxml:5
alsa? ( =media-libs/alsa-lib-1.0.14a )
canberra? ( media-libs/libcanberra )
pulseaudio? ( =media-sound/pulseaudio-0.9.12 )
 
 RDEPEND=${DEPEND}
 
+PATCHES=( ${FILESDIR}/${PN}-15.04.2-alsa-optional.patch )
+
 src_configure() {
local mycmakeargs=(
-   $(cmake-utils_use_with alsa)
-   $(cmake-utils_use_with canberra)
-   $(cmake-utils_use_with pulseaudio PulseAudio)
+   -DKMIX_KF5_BUILD=ON
+   $(cmake-utils_use_find_package alsa)
+   $(cmake-utils_use_find_package canberra)
+   $(cmake-utils_use_find_package pulseaudio PulseAudio)
)
 
-   kde4-base_src_configure
+   kde5_src_configure
 }

[gentoo-commits] proj/kde:master commit in: kde-apps/kmix/, kde-apps/kmix/files/

[Michael Palimaka]

commit: 1e8df41937b7b788290c29c6a59b94f809e6e93f
Author: Andreas Sturmlechner andreas.sturmlechner AT gmail DOT com
AuthorDate: Sat May 16 20:47:24 2015 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Sat May 23 15:57:03 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=1e8df419

[kde-apps/kmix] Fix build with USE=-alsa

Package-Manager: portage-2.2.19

 .../kmix/files/kmix-5.-alsa-optional.patch | 26 ++
 kde-apps/kmix/kmix-5..ebuild   |  2 ++
 2 files changed, 28 insertions(+)

diff --git a/kde-apps/kmix/files/kmix-5.-alsa-optional.patch 
b/kde-apps/kmix/files/kmix-5.-alsa-optional.patch
new file mode 100644
index 000..92c258c
--- /dev/null
+++ b/kde-apps/kmix/files/kmix-5.-alsa-optional.patch
@@ -0,0 +1,26 @@
+--- a/CMakeLists.txt   2015-05-16 22:31:57.555962909 +0200
 b/CMakeLists.txt   2015-05-16 22:19:13.393985683 +0200
+@@ -79,7 +79,9 @@
+ endif()
+ 
+ find_package(Alsa)
+-alsa_configure_file(${CMAKE_BINARY_DIR}/config-alsa.h)
++if(Alsa_FOUND)
++alsa_configure_file(${CMAKE_BINARY_DIR}/config-alsa.h)
++endif()
+ 
+ add_definitions (${QT_DEFINITIONS} ${QT_QTDBUS_DEFINITIONS} 
${KDE4_DEFINITIONS} )
+ add_definitions(-DKDE_DEFAULT_DEBUG_AREA=67100)
+--- a/backends/kmix-backends.cpp   2015-05-16 22:31:36.650963532 +0200
 b/backends/kmix-backends.cpp   2015-05-16 22:22:57.761978996 +0200
+@@ -23,7 +23,10 @@
+ /* This code is being #include'd from mixer.cpp */
+ 
+ #include config.h
++
++#if defined(HAVE_LIBASOUND2)
+ #include config-alsa.h
++#endif
+ 
+ #include mixer_backend.h
+ #include core/mixer.h

diff --git a/kde-apps/kmix/kmix-5..ebuild b/kde-apps/kmix/kmix-5..ebuild
index 15f3eaa..4158e29 100644
--- a/kde-apps/kmix/kmix-5..ebuild
+++ b/kde-apps/kmix/kmix-5..ebuild
@@ -36,6 +36,8 @@ RDEPEND=${DEPEND}
!kde-base/kmix:4
 
 
+PATCHES=( ${FILESDIR}/${PN}-5.-alsa-optional.patch )
+
 src_configure() {
local mycmakeargs=(
-DKMIX_KF5_BUILD=ON