EAPI3, use add_kdebase_dep, sort deps, get rid of the phonon useflag, it is a kdelibs dep either way

Package-Manager: portage-2.2.0_alpha19/cvs/Linux x86_64

3 files changed, 24 insertions, 17 deletions

diff --git a/media-sound/kwave/ChangeLog b/media-sound/kwave/ChangeLog
index a0bb06fa6769..02f86dd71f66 100644
--- a/media-sound/kwave/ChangeLog
+++ b/media-sound/kwave/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/kwave
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/kwave/ChangeLog,v 1.18 2009/12/26 13:45:29 ssuominen Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kwave/ChangeLog,v 1.19 2011/02/02 04:52:24 tampakrap Exp $
+
+  02 Feb 2011; Theo Chatzimichos <tampakrap@gentoo.org> kwave-0.8.5.ebuild,
+  metadata.xml:
+  EAPI3, use add_kdebase_dep, sort deps, get rid of the phonon useflag, it is a
+  kdelibs dep either way
 
 *kwave-0.8.5 (26 Dec 2009)
 
diff --git a/media-sound/kwave/kwave-0.8.5.ebuild b/media-sound/kwave/kwave-0.8.5.ebuild
index 7f45e9732fc3..52619cc56ea3 100644
--- a/media-sound/kwave/kwave-0.8.5.ebuild
+++ b/media-sound/kwave/kwave-0.8.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/kwave/kwave-0.8.5.ebuild,v 1.1 2009/12/26 13:45:29 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kwave/kwave-0.8.5.ebuild,v 1.2 2011/02/02 04:52:24 tampakrap Exp $
 
-EAPI=2
+EAPI=3
 KDE_LINGUAS="cs de fr"
 inherit kde4-base
 
@@ -13,24 +13,29 @@ SRC_URI="mirror://sourceforge/kwave/${P}-1.tar.bz2"
 LICENSE="BSD FDL-1.2 GPL-2 LGPL-2"
 SLOT="4"
 KEYWORDS="~amd64 ~x86"
-IUSE="alsa debug flac +handbook mad oss phonon pulseaudio vorbis"
+IUSE="alsa debug flac +handbook mad oss pulseaudio vorbis"
 
-RDEPEND="media-libs/audiofile
+RDEPEND="
+	media-libs/audiofile
 	>=sci-libs/fftw-3
 	media-libs/libsamplerate
 	alsa? ( media-libs/alsa-lib )
 	flac? ( media-libs/flac )
-	mad? ( media-libs/id3lib
-		media-libs/libmad )
-	phonon? ( media-sound/phonon )
+	mad? (
+		media-libs/id3lib
+		media-libs/libmad
+	)
 	pulseaudio? ( media-sound/pulseaudio )
-	vorbis? ( media-libs/libogg
-		media-libs/libvorbis )"
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+"
 DEPEND="${RDEPEND}
-	>=kde-base/kdesdk-misc-${KDE_MINIMAL}
+	$(add_kdebase_dep kdesdk-misc)
 	media-gfx/imagemagick"
 
-DOCS="AUTHORS CHANGES README TODO"
+DOCS=( AUTHORS CHANGES README TODO )
 
 src_configure() {
 	mycmakeargs="${mycmakeargs}
diff --git a/media-sound/kwave/metadata.xml b/media-sound/kwave/metadata.xml
index 1ab1bf93df78..cde64e63f400 100644
--- a/media-sound/kwave/metadata.xml
+++ b/media-sound/kwave/metadata.xml
@@ -2,8 +2,5 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>kde</herd>
-  <use>
-    <flag name="phonon">Enable media-sound/phonon support</flag>
-  </use>
   <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>
 </pkgmetadata>