media-sound/kwave: Adjust DEPENDs

Package-Manager: portage-2.2.27

4 files changed, 74 insertions, 14 deletions

diff --git a/media-sound/kwave/files/kwave-0.9.1-deps.patch b/media-sound/kwave/files/kwave-0.9.1-deps.patch
new file mode 100644
index 0000000000..789896261e
--- /dev/null
+++ b/media-sound/kwave/files/kwave-0.9.1-deps.patch
@@ -0,0 +1,36 @@
+commit e8d391eb7c3d2f4835705990d1ffaaa9084c31bb
+Author: Thomas Eschenbacher <Thomas.Eschenbacher@gmx.de>
+Date:   Mon Feb 29 06:01:02 2016 +0100
+
+    removed unneeded build and runtime dependencies
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e669aff..eeaa6c4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -211,13 +211,9 @@ FIND_PACKAGE(KF5 REQUIRED COMPONENTS
+     Crash
+     DBusAddons
+     DocTools
+-    GuiAddons
+     I18n
+     IconThemes
+-    Init
+     KIO
+-    Notifications
+-    Service
+     TextWidgets
+     XmlGui
+     WidgetsAddons
+diff --git a/kwave/CMakeLists.txt b/kwave/CMakeLists.txt
+index 8b2f6a3..4c72325 100644
+--- a/kwave/CMakeLists.txt
++++ b/kwave/CMakeLists.txt
+@@ -92,7 +92,6 @@ TARGET_LINK_LIBRARIES(kwave_core
+     KF5::I18n
+     KF5::IconThemes
+     KF5::KIOFileWidgets
+-    KF5::Service
+     KF5::XmlGui
+ )
+ 
diff --git a/media-sound/kwave/files/kwave-0.9.1-qtmedia.patch b/media-sound/kwave/files/kwave-0.9.1-qtmedia.patch
new file mode 100644
index 0000000000..86948b403e
--- /dev/null
+++ b/media-sound/kwave/files/kwave-0.9.1-qtmedia.patch
@@ -0,0 +1,25 @@
+commit 6fc0b2732f836e5511a5164dc3f78e79c2d3ee4d
+Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date:   Tue Mar 8 22:55:40 2016 +0100
+
+    Make Qt Multimedia optional
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index eeaa6c4..c8f23f7 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -180,13 +180,13 @@ SET(CMAKE_AUTOMOC_RELAXED_MODE FALSE)
+ FIND_PACKAGE(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS
+     Concurrent
+     Core
+-    Multimedia
+     Widgets
+ )
+ 
+ # Qt Multimedia support
+ OPTION(WITH_QT_AUDIO "enable playback via Qt Multimedia [default=on]" ON)
+ IF (WITH_QT_AUDIO)
++    FIND_PACKAGE(Qt5Multimedia ${QT_MIN_VERSION} CONFIG REQUIRED)
+     SET(HAVE_QT_AUDIO_SUPPORT on)
+ ENDIF (WITH_QT_AUDIO)
+ 
diff --git a/media-sound/kwave/kwave-0.9.1.ebuild b/media-sound/kwave/kwave-0.9.1-r1.ebuild
index c62b83bffc..51fbdb1d0e 100644
--- a/media-sound/kwave/kwave-0.9.1.ebuild
+++ b/media-sound/kwave/kwave-0.9.1-r1.ebuild
@@ -7,7 +7,7 @@ EAPI=6
 KDE_HANDBOOK="forceoptional"
 inherit kde5
 
-DESCRIPTION="A sound editor that can edit many types of audio files"
+DESCRIPTION="A sound editor built on KDE Frameworks 5 that can edit many types of audio files"
 HOMEPAGE="http://kwave.sourceforge.net/"
 if [[ ${KDE_BUILD_TYPE} != live ]]; then
 	SRC_URI="mirror://sourceforge/${PN}/${P}-1.tar.bz2"
@@ -28,17 +28,12 @@ COMMON_DEPEND="
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kcrash)
 	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kguiaddons)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kinit)
 	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kservice)
 	$(add_frameworks_dep ktextwidgets)
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtconcurrent)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
 	media-libs/audiofile:=
@@ -64,13 +59,20 @@ COMMON_DEPEND="
 "
 DEPEND="${COMMON_DEPEND}
 	$(add_kdeapps_dep poxml)
+	$(add_qt_dep qtconcurrent)
 	|| ( media-gfx/imagemagick[png,svg] media-gfx/graphicsmagick[imagemagick,png,svg] )
+	sys-devel/gettext
 "
 RDEPEND="${COMMON_DEPEND}
 	!media-sound/kwave:4
 "
 
-DOCS=( AUTHORS CHANGES README TODO )
+DOCS=( AUTHORS CHANGES LICENSES README TODO )
+
+PATCHES=(
+	"${FILESDIR}/${P}-deps.patch"
+	"${FILESDIR}/${P}-qtmedia.patch"
+)
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/media-sound/kwave/kwave-9999.ebuild b/media-sound/kwave/kwave-9999.ebuild
index 8ad3c6671a..0221c34a99 100644
--- a/media-sound/kwave/kwave-9999.ebuild
+++ b/media-sound/kwave/kwave-9999.ebuild
@@ -7,7 +7,7 @@ EAPI=6
 KDE_HANDBOOK="forceoptional"
 inherit kde5
 
-DESCRIPTION="A sound editor that can edit many types of audio files"
+DESCRIPTION="A sound editor built on KDE Frameworks 5 that can edit many types of audio files"
 HOMEPAGE="http://kwave.sourceforge.net/"
 if [[ ${KDE_BUILD_TYPE} != live ]]; then
 	SRC_URI="mirror://sourceforge/${PN}/${P}-1.tar.bz2"
@@ -28,17 +28,12 @@ COMMON_DEPEND="
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kcrash)
 	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kguiaddons)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kinit)
 	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kservice)
 	$(add_frameworks_dep ktextwidgets)
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtconcurrent)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
 	media-libs/audiofile:=
@@ -64,13 +59,15 @@ COMMON_DEPEND="
 "
 DEPEND="${COMMON_DEPEND}
 	$(add_kdeapps_dep poxml)
+	$(add_qt_dep qtconcurrent)
 	|| ( media-gfx/imagemagick[png,svg] media-gfx/graphicsmagick[imagemagick,png,svg] )
+	sys-devel/gettext
 "
 RDEPEND="${COMMON_DEPEND}
 	!media-sound/kwave:4
 "
 
-DOCS=( AUTHORS CHANGES README TODO )
+DOCS=( AUTHORS CHANGES LICENSES README TODO )
 
 src_configure() {
 	local mycmakeargs=(