Make libsamplerate mandatory and phonon optional. Require imagemagick/graphicsmagick to be built with SVG. Add document containing detailed licensing

information. Update metadata. Thanks to Thomas <Thomas.Eschenbacher@gmx.de> in bug #420719.

(Portage version: 2.1.11.1/cvs/Linux x86_64)

3 files changed, 29 insertions, 13 deletions

diff --git a/media-sound/kwave/ChangeLog b/media-sound/kwave/ChangeLog
index ec628703c836..621151a789ed 100644
--- a/media-sound/kwave/ChangeLog
+++ b/media-sound/kwave/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-sound/kwave
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/kwave/ChangeLog,v 1.25 2012/05/22 15:26:32 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kwave/ChangeLog,v 1.26 2012/06/25 18:36:38 kensington Exp $
+
+*kwave-0.8.8-r1 (25 Jun 2012)
+
+  25 Jun 2012; Michael Palimaka <kensington@gentoo.org> +kwave-0.8.8-r1.ebuild,
+  -kwave-0.8.8.ebuild, metadata.xml:
+  Make libsamplerate mandatory and phonon optional. Require
+  imagemagick/graphicsmagick to be built with SVG. Add document containing
+  detailed licensing  information. Update metadata. Thanks to Thomas
+  <Thomas.Eschenbacher@gmx.de> in bug #420719.
 
   22 May 2012; Michael Palimaka <kensington@gentoo.org> kwave-0.8.8.ebuild:
   Remove stray comment, thanks to johu for noticing that.
@@ -116,4 +125,3 @@
   +kwave-0.7.9.ebuild:
   Initial ebuild, based on Thomas Eschenbacher's (upstream). Thanks, Thomas!
   Fixes bug 96345.
-
diff --git a/media-sound/kwave/kwave-0.8.8.ebuild b/media-sound/kwave/kwave-0.8.8-r1.ebuild
index a7dd7d9dc8ac..55974e400307 100644
--- a/media-sound/kwave/kwave-0.8.8.ebuild
+++ b/media-sound/kwave/kwave-0.8.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/kwave/kwave-0.8.8.ebuild,v 1.2 2012/05/22 15:26:32 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kwave/kwave-0.8.8-r1.ebuild,v 1.1 2012/06/25 18:36:38 kensington Exp $
 
 EAPI=4
 
@@ -10,23 +10,25 @@ inherit kde4-base
 
 DESCRIPTION="A sound editor for KDE that can edit many types of audio files"
 HOMEPAGE="http://kwave.sourceforge.net/"
-SRC_URI="mirror://sourceforge/kwave/${P}-1.tar.bz2"
+SRC_URI="mirror://sourceforge/${PN}/${P}-1.tar.bz2"
 
-LICENSE="BSD FDL-1.2 GPL-2 LGPL-2"
+LICENSE="BSD GPL-2 LGPL-2
+	handbook? ( FDL-1.2 )"
 SLOT="4"
 KEYWORDS="~amd64 ~x86"
-IUSE="alsa debug flac libsamplerate mad oss pulseaudio vorbis"
+IUSE="alsa debug flac handbook mad oss phonon pulseaudio vorbis"
 
 RDEPEND="
 	media-libs/audiofile
 	>=sci-libs/fftw-3
+	media-libs/libsamplerate
 	alsa? ( media-libs/alsa-lib )
 	flac? ( media-libs/flac )
-	libsamplerate? ( media-libs/libsamplerate )
 	mad? (
 		media-libs/id3lib
 		media-libs/libmad
 	)
+	phonon? ( media-libs/phonon )
 	pulseaudio? ( media-sound/pulseaudio )
 	vorbis? (
 		media-libs/libogg
@@ -35,10 +37,10 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	$(add_kdebase_dep kdesdk-misc extras)
-	|| ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[imagemagick,png] )
+	|| ( media-gfx/imagemagick[png,svg] media-gfx/graphicsmagick[imagemagick,png,svg] )
 "
 
-DOCS=( AUTHORS CHANGES README TODO )
+DOCS=( AUTHORS CHANGES LICENSES README TODO )
 
 src_prepare() {
 	sed -e 's/ -Wl,--add-needed//' -i plugins/CMakeLists.txt \
@@ -49,13 +51,12 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs=(
 		-DWITH_SAMPLERATE=ON
-		-DWITH_PHONON=ON
 		$(cmake-utils_use_with alsa)
 		$(cmake-utils_use_with flac)
-		$(cmake-utils_use_with libsamplerate SAMPLERATE)
 		$(cmake-utils_use_with mad MP3)
 		$(cmake-utils_use_with vorbis OGG)
 		$(cmake-utils_use_with oss)
+		$(cmake-utils_use_with phonon)
 		$(cmake-utils_use_with pulseaudio)
 		$(cmake-utils_use debug)
 	)
diff --git a/media-sound/kwave/metadata.xml b/media-sound/kwave/metadata.xml
index cde64e63f400..85477937989b 100644
--- a/media-sound/kwave/metadata.xml
+++ b/media-sound/kwave/metadata.xml
@@ -1,6 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>kde</herd>
-  <longdescription>With Kwave you can edit many sorts of wav-files including multi-channel files. You are able to alter and play back each channel on its own. Kwave also includes many plugins (most are still under development) to transform the wave-file in several ways and presents a graphical view with a complete zoom- and scroll capability.</longdescription>
+	<herd>kde</herd>
+	<longdescription>With Kwave you can edit many sorts of wav-files including multi-channel files. You are able to alter and play back each channel on its own. Kwave also includes many plugins (most are still under development) to transform the wave-file in several ways and presents a graphical view with a complete zoom- and scroll capability.</longdescription>
+	<use>
+		<flag name="phonon">Enable playback via Phonon</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">kwave</remote-id>
+		<bugs-to>http://sourceforge.net/tracker/?group_id=6478</bugs-to>
+	</upstream>
 </pkgmetadata>