diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2008-04-20 17:58:41 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2008-04-20 17:58:41 +0000 |
| commit | ec6a34183bb338f5d6c1ed0e6cdb2ed771a5ec40 (patch) | |
| tree | 4e10f622e05d53a8b52bc4d4937e6f2b259f65d0 /media-sound/traverso | |
| parent | Bump to 1.4.15 (diff) | |
| download | gentoo-2-ec6a34183bb338f5d6c1ed0e6cdb2ed771a5ec40.tar.gz gentoo-2-ec6a34183bb338f5d6c1ed0e6cdb2ed771a5ec40.tar.bz2 gentoo-2-ec6a34183bb338f5d6c1ed0e6cdb2ed771a5ec40.zip | |
allow split qt4 deps
(Portage version: 2.1.5_rc5)
Diffstat (limited to 'media-sound/traverso')
| -rw-r--r-- | media-sound/traverso/ChangeLog | 6 | ||||
| -rw-r--r-- | media-sound/traverso/traverso-0.42.0.ebuild | 9 | ||||
| -rw-r--r-- | media-sound/traverso/traverso-9999.ebuild | 10 |
3 files changed, 17 insertions, 8 deletions
diff --git a/media-sound/traverso/ChangeLog b/media-sound/traverso/ChangeLog index 19aa0b98353f..d48d90c462d3 100644 --- a/media-sound/traverso/ChangeLog +++ b/media-sound/traverso/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-sound/traverso # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/traverso/ChangeLog,v 1.19 2008/04/20 17:42:12 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/traverso/ChangeLog,v 1.20 2008/04/20 17:58:41 aballier Exp $ + + 20 Apr 2008; Alexis Ballier <aballier@gentoo.org> traverso-0.42.0.ebuild, + traverso-9999.ebuild: + allow split qt4 deps 20 Apr 2008; Alexis Ballier <aballier@gentoo.org> traverso-0.42.0.ebuild, traverso-9999.ebuild: diff --git a/media-sound/traverso/traverso-0.42.0.ebuild b/media-sound/traverso/traverso-0.42.0.ebuild index 7c98421b3024..494c02579cbf 100644 --- a/media-sound/traverso/traverso-0.42.0.ebuild +++ b/media-sound/traverso/traverso-0.42.0.ebuild @@ -1,6 +1,8 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/traverso/traverso-0.42.0.ebuild,v 1.4 2008/04/20 17:42:12 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/traverso/traverso-0.42.0.ebuild,v 1.5 2008/04/20 17:58:41 aballier Exp $ + +EAPI=1 inherit eutils qt4 cmake-utils @@ -13,7 +15,8 @@ SLOT="0" LICENSE="GPL-2" KEYWORDS="~amd64 ~x86" -RDEPEND="$(qt4_min_version 4.3.1) +RDEPEND="|| ( ( x11-libs/qt-core x11-libs/qt-gui opengl? ( x11-libs/qt-opengl ) ) + >=x11-libs/qt-4.3.1:4 ) alsa? ( >=media-libs/alsa-lib-1.0.0 ) jack? ( >=media-sound/jack-audio-connection-kit-0.100 ) >=dev-libs/glib-2.8 @@ -30,7 +33,7 @@ DEPEND="${RDEPEND} dev-util/pkgconfig" pkg_setup() { - if use opengl && ! built_with_use =x11-libs/qt-4* opengl; then + if use opengl && ! has_version x11-libs/qt-opengl && ! built_with_use =x11-libs/qt-4* opengl; then eerror "You need to build qt4 with opengl support to have it in ${PN}" die "Enabling opengl for traverso requires qt4 to be built with opengl support" fi diff --git a/media-sound/traverso/traverso-9999.ebuild b/media-sound/traverso/traverso-9999.ebuild index 72207615c96f..54a89d335492 100644 --- a/media-sound/traverso/traverso-9999.ebuild +++ b/media-sound/traverso/traverso-9999.ebuild @@ -1,6 +1,8 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/traverso/traverso-9999.ebuild,v 1.3 2008/04/20 17:42:12 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/traverso/traverso-9999.ebuild,v 1.4 2008/04/20 17:58:41 aballier Exp $ + +EAPI=1 inherit eutils qt4 cmake-utils cvs @@ -13,7 +15,8 @@ SLOT="0" LICENSE="GPL-2" KEYWORDS="" -RDEPEND="$(qt4_min_version 4.3.1) +RDEPEND="|| ( ( x11-libs/qt-core x11-libs/qt-gui opengl? ( x11-libs/qt-opengl ) ) + >=x11-libs/qt-4.3.1:4 ) alsa? ( >=media-libs/alsa-lib-1.0.0 ) jack? ( >=media-sound/jack-audio-connection-kit-0.100 ) >=dev-libs/glib-2.8 @@ -30,7 +33,7 @@ DEPEND="${RDEPEND} dev-util/pkgconfig" pkg_setup() { - if use opengl && ! built_with_use =x11-libs/qt-4* opengl; then + if use opengl && ! has_version x11-libs/qt-opengl && ! built_with_use =x11-libs/qt-4* opengl; then eerror "You need to build qt4 with opengl support to have it in ${PN}" die "Enabling opengl for traverso requires qt4 to be built with opengl support" fi @@ -52,7 +55,6 @@ src_compile() { cmake-utils_src_compile } - src_install() { cmake-utils_src_install dodoc AUTHORS ChangeLog README resources/help.text |