Fix dependencies for kwave so KDE 4.x cannot be pulled in instead of KDE 3.5.x. Don't have both optional and hard dependencies on arts.

Package-Manager: portage-2.1.4

3 files changed, 23 insertions, 22 deletions

diff --git a/media-sound/kwave/ChangeLog b/media-sound/kwave/ChangeLog
index 6623d061f93d..2b846a3bc63a 100644
--- a/media-sound/kwave/ChangeLog
+++ b/media-sound/kwave/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/kwave
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/kwave/ChangeLog,v 1.3 2007/11/18 21:56:26 aballier Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kwave/ChangeLog,v 1.4 2008/01/21 15:03:53 zlin Exp $
+
+  21 Jan 2008; Bo Ørsted Andresen <bo.andresen@zlin.dk> kwave-0.7.9.ebuild:
+  Fix dependencies so KDE 4.x cannot be pulled in instead of KDE 3.5.x. Don't
+  have both optional and hard dependencies on arts.
 
   18 Nov 2007; Alexis Ballier <aballier@gentoo.org> kwave-0.7.9.ebuild:
   add a check for flac cxx use flag, FLAC++ is needed here
diff --git a/media-sound/kwave/Manifest b/media-sound/kwave/Manifest
index 100d57f46c13..143468f809dd 100644
--- a/media-sound/kwave/Manifest
+++ b/media-sound/kwave/Manifest
@@ -10,14 +10,14 @@ MD5 e640f4fd5438dddc31e7fde3466b3fec files/kwave-0.7.9_flac-v1.1.3_and_v1.1.4-su
 RMD160 0e80108c96f87b499e9f10e3616d1a850f7b0784 files/kwave-0.7.9_flac-v1.1.3_and_v1.1.4-support.diff 5727
 SHA256 47e450dde406c54fc46ea125431c8df34fbd59d3b684e1e9fe63d9ed16f61042 files/kwave-0.7.9_flac-v1.1.3_and_v1.1.4-support.diff 5727
 DIST kwave-0.7.9.tar.gz 3108173 RMD160 23e3176f2e2fbe57a048e99dfa3eea67c0be462d SHA1 32ccd6596912f9f0e6b9b1ca6a39ef50f23ed31c SHA256 c0a71d861190f45e06997dfaecbd598d1310f05ae99d4c4d6573fb9834cd8c14
-EBUILD kwave-0.7.9.ebuild 1498 RMD160 6fcdb94692f0657712ba2b3375ecaf509378dcef SHA1 79d3f3a15a410d5a6e1316a0aa84356b39318d8f SHA256 1c14084612c5741d7c24f5f3ae8894f30742de54873c7c4bfa5cd5c0f32765f8
-MD5 0c8f8506f88f428a71284ade7f3059e4 kwave-0.7.9.ebuild 1498
-RMD160 6fcdb94692f0657712ba2b3375ecaf509378dcef kwave-0.7.9.ebuild 1498
-SHA256 1c14084612c5741d7c24f5f3ae8894f30742de54873c7c4bfa5cd5c0f32765f8 kwave-0.7.9.ebuild 1498
-MISC ChangeLog 912 RMD160 e1edf83a0541d3afc9c01c25243794f538f03a90 SHA1 c7a10f8eb92b6f186a681e1b3fee74922dd28d52 SHA256 d4bd8116a2412a861a46b7e1d5851038e7d2b2a49ff1600c3aae00bc079a5275
-MD5 5825145a417e315c167808d7724e6d94 ChangeLog 912
-RMD160 e1edf83a0541d3afc9c01c25243794f538f03a90 ChangeLog 912
-SHA256 d4bd8116a2412a861a46b7e1d5851038e7d2b2a49ff1600c3aae00bc079a5275 ChangeLog 912
+EBUILD kwave-0.7.9.ebuild 1390 RMD160 35a58f4f50125fcd3a6aab6a4cf16763b98923d6 SHA1 ebf92f38793c46dab2c77297f3e6d0c1fa10af04 SHA256 48781f68c69e42bc20934fd78311c2e214752bd98a69f85c0116f938b9832363
+MD5 d9201f52f6fd361239664eeb955d3d0f kwave-0.7.9.ebuild 1390
+RMD160 35a58f4f50125fcd3a6aab6a4cf16763b98923d6 kwave-0.7.9.ebuild 1390
+SHA256 48781f68c69e42bc20934fd78311c2e214752bd98a69f85c0116f938b9832363 kwave-0.7.9.ebuild 1390
+MISC ChangeLog 1116 RMD160 585a5473dc837872ad3e484613f17d22b7093260 SHA1 d1364198a1c7a539b4cb87a2b535d3ef39c5f54a SHA256 8453e522c0714654fbbbb7e934c1f4fd17d9558358dae717281b27ae3ff111cd
+MD5 d02117a2eb20227469aafe3e09d5f588 ChangeLog 1116
+RMD160 585a5473dc837872ad3e484613f17d22b7093260 ChangeLog 1116
+SHA256 8453e522c0714654fbbbb7e934c1f4fd17d9558358dae717281b27ae3ff111cd ChangeLog 1116
 MISC metadata.xml 517 RMD160 0f693008ebbd4520bfeeb3292ae37570da04eaaf SHA1 c8b99c21604452a4eb80b0f57707931b5a22a3a7 SHA256 460292b9dd1af2739b377d06f424cdc3138ef169427fd5c7d7800ac8e885cd11
 MD5 32f7b1210f0abfc5be01c4e15c4d6432 metadata.xml 517
 RMD160 0f693008ebbd4520bfeeb3292ae37570da04eaaf metadata.xml 517
@@ -28,7 +28,7 @@ SHA256 2883449ba165d5fc223868150387396d3c0b6333c5a4b035ffdb7bdbcb2bf4c8 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHQLUsvFcC4BYPU0oRAvtpAJ9zpwtmATLwytAdhR9l1WkcR1uMRgCeJtDv
-ytchimj4ZM8Hkg2y11ccU0U=
-=sv5j
+iD8DBQFHlLRffxJ68Jl1NeERAuhCAJwL2PYE2v93LMGAWZD+WZrY8UQYxgCfWFVM
+GP5wN/kch571Uxmw9icYx5s=
+=lAzU
 -----END PGP SIGNATURE-----
diff --git a/media-sound/kwave/kwave-0.7.9.ebuild b/media-sound/kwave/kwave-0.7.9.ebuild
index 62437ffdeebf..9c3881e20bc1 100644
--- a/media-sound/kwave/kwave-0.7.9.ebuild
+++ b/media-sound/kwave/kwave-0.7.9.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/kwave/kwave-0.7.9.ebuild,v 1.4 2007/11/18 21:56:26 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kwave/kwave-0.7.9.ebuild,v 1.5 2008/01/21 15:03:53 zlin Exp $
 
+ARTS_REQUIRED=yes
 inherit kde flag-o-matic
 
 DESCRIPTION="Kwave is a sound editor for KDE."
@@ -23,19 +24,15 @@ RDEPEND="media-libs/alsa-lib
 	sci-libs/gsl"
 
 DEPEND="${RDEPEND}
-	kde-base/arts
-	|| ( kde-base/kdemultimedia-arts kde-base/kdemultimedia )
-	|| ( kde-base/kdesdk-misc kde-base/kdesdk )
+	|| ( kde-base/kdemultimedia-arts =kde-base/kdemultimedia-3.5* )
+	|| ( =kde-base/kdesdk-misc-3.5* =kde-base/kdesdk-3.5* )
 	app-text/recode
 	media-gfx/imagemagick"
 
 need-kde 3.4
 
 pkg_setup() {
-	if ! built_with_use kde-base/kdelibs arts ; then
-		eerror "KWave needs aRts, please rebuild kdelibs with arts use flag enabled."
-		die
-	fi
+	kde_pkg_setup
 
 	if ! built_with_use --missing true media-libs/flac cxx; then
 		eerror "To build ${PN} you need the C++ bindings for flac."