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

["Michael Palimaka" <kensington@gentoo.org>]

commit:     7361cb5a3933425d3674dbc9a5a2f6169da9e8a8
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Thu Jun  4 17:59:34 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Jun  5 15:31:53 2015 +0000
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.9999.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 0000000..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.9999.ebuild b/kde-apps/kmix/kmix-15.04.49.9999.ebuild
index f7a8cfa..346ad98 100644
--- a/kde-apps/kmix/kmix-15.04.49.9999.ebuild
+++ b/kde-apps/kmix/kmix-15.04.49.9999.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
 }