diff options
| author |   Bo Ørsted Andresen <zlin@gentoo.org> | 2008-01-21 15:03:53 +0000 |
|---|---|---|
| committer | Bo Ørsted Andresen <zlin@gentoo.org> | 2008-01-21 15:03:53 +0000 |
| commit | d4085e010855662af60b87806795777caccf9deb (patch) | |
| tree | a18bc991798b6e564e1badbc4f87542bbfbff8d6 /media-sound | |
| parent | Stable for HPPA (bug #199740). (diff) | |
| download | gentoo-2-d4085e010855662af60b87806795777caccf9deb.tar.gz gentoo-2-d4085e010855662af60b87806795777caccf9deb.tar.bz2 gentoo-2-d4085e010855662af60b87806795777caccf9deb.zip | |
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.
(Portage version: 2.1.4)
Diffstat (limited to 'media-sound')
| -rw-r--r-- | media-sound/kwave/ChangeLog | 8 | ||||
| -rw-r--r-- | media-sound/kwave/kwave-0.7.9.ebuild | 15 |
2 files changed, 12 insertions, 11 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/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." |