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.

Package-Manager: portage-2.1.11.1/cvs/Linux x86_64

4 files changed, 39 insertions, 23 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/Manifest b/media-sound/kwave/Manifest
index a801f36908ff..13516e592bbc 100644
--- a/media-sound/kwave/Manifest
+++ b/media-sound/kwave/Manifest
@@ -4,17 +4,17 @@ Hash: SHA1
 DIST kwave-0.8.7-1.tar.bz2 2867049 RMD160 a97f6e8c3e321e18706840a177a8190e077e04d9 SHA1 3a4a784aafa1ca9c61460cdd57bd11bdc98ec896 SHA256 3874af895ed80986505613df013e08704cce56ef773296907eab39e09498aec7
 DIST kwave-0.8.8-1.tar.bz2 2915758 RMD160 0cee4616117ca120a8a6c74683e597f56743dd65 SHA1 26b1a2a4a3b15e639592a7a8e009363f5b5d54a9 SHA256 4e7a6ed9bfd08b41a310d9a74a0d1c567c2b1e3921e99b63c9df62dc85fe15d5
 EBUILD kwave-0.8.7.ebuild 1334 RMD160 dfdc0022f678764e84cf6b6dc3f42be41babe07e SHA1 eb7b3970ad410af3f3c3eeb5ed92a873504e15de SHA256 05b639e98e5c3b2d3cdde4928d11a303f2aa728e32bdb975568b7c3cd5c0fd96
-EBUILD kwave-0.8.8.ebuild 1593 RMD160 591b747d29f3260447175a00f12b5c4ca501a23e SHA1 24809a96acd3874c4add32b89ff29463ccaff8af SHA256 d44f853ca407acccdad97f59f00998f29f43bf450d742837244c3804a2763fb2
-MISC ChangeLog 4563 RMD160 6d477bbba191ac53bdbee5d9cf3cc957a396bd95 SHA1 7788ae4b7b5ffe16cd66b6a18b5186258748adeb SHA256 c0db3b8155c4dc092c5253e6c0d4bdb88e9c7777ca10270b06f02c38bd0c049f
-MISC metadata.xml 521 RMD160 9d33fece426f8ae7cc9b73ce9453eabfc41eb35c SHA1 8d3f1536c4b6cc82bed328e6d714fca8b9072cfc SHA256 81070daf140e53eb1261998d7c13c8b1de6f436e7700b042a414ff0897d4aa89
+EBUILD kwave-0.8.8-r1.ebuild 1605 RMD160 575728ee0de0ecc48cc0288e7fa0ccef7ec65e5d SHA1 26c60c915ee138609c3ab5e9c195438247c9870d SHA256 1206639224f62cf8b8287df861844ef8ad875e3af3836235d52bda9711ad8057
+MISC ChangeLog 4962 RMD160 a4cf50fca64057908d7a9c7c0bafd2b80f7c6cad SHA1 d5dbea79063e101153e52e9e65ce47d764b306b9 SHA256 cc73a98dfa8c8d47d33ed77787d52222b77ad3d17d269a57fa309ac4ed094907
+MISC metadata.xml 732 RMD160 1abd6a0bd4031ea4877afbf94fb0f0716f1ec9b9 SHA1 225a829a3c2897c368d93f8c7d94f7540f6f3b83 SHA256 26a9449c72facbd0b4290cc5e070c643d2a570a0f8f93852feaf969e69c14079
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPu7AbAAoJEMbwO6tnXQ0sAnwIAJdNwx1lW53VliDo189Pjl+L
-HodP07KdOAAa/FjrJUnD+U6l4Q+9UIXL8dCsc+Rg4SvZzeYCt5D5GXEaRTWyy/xC
-g9xgjoFYCkK4LyuHnFYFgDPHrAz+zshIsovpttSVxnxznJMM9eZ3NIkrtm30zuY0
-ttxIgDDp5yko1OZf6Ls4jxKFrsMPW+++Gxcwxv4gpTzeTqxZ/72Ob6Q2TwUtWYZn
-DAGashyPgobjorek/o4nPUlZ/saNYeeoEhnUMpZ3nJGetevviV200Ef+yMoOBCW7
-AxmqeB/3hwpClkFyN0a+X127HuPpGa8awRJ63ugOyot5stXU93y2icTdjVTSRxw=
-=Oilk
+iQEcBAEBAgAGBQJP6K+/AAoJEMbwO6tnXQ0sDisH/jaBMHKPm4LGP6C0GysnOJzd
+rZKt/z/OTu2JldHS+vVgKvZWWIqqMOuth8oXHvBulFclRqRBBJ6cUkGDMTExc+hZ
+ynm0YZtiEaUJd6k4xoVflsdgqP6NDCHQQmO7sNjTd7efDQNSsOswRW5TC9MWDXox
+E/BtVMkuPoRSF2QfRw2spyzA/9G7EuVKu+LPqqRCBK1WWqF8lSmvCxMwIXxhbsWj
+/bJZVzbH5vLBfSykIh9yPnF6vzdE5l1j6Bx7G8r+rn+fdPgUZmo0gG/raD3NaHW4
+HtTXe8Dp5giXs5B6wIuaNNVGvSagM4lyHN8HVaYzg40uB6Ni4+r5r+yuN8alZgk=
+=Rgkt
 -----END PGP SIGNATURE-----
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>