allow split qt4 deps

Package-Manager: portage-2.1.5_rc5

4 files changed, 23 insertions, 14 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/Manifest b/media-sound/traverso/Manifest
index 926ccc05885b..40cec3594f4a 100644
--- a/media-sound/traverso/Manifest
+++ b/media-sound/traverso/Manifest
@@ -5,14 +5,14 @@ AUX traverso-0.42.0-gcc43.patch 978 RMD160 77a177b37d181e79f6eec33d48669276392c6
 AUX traverso-0.42.0-nojack.patch 478 RMD160 7adccdca6f50aeed844e548565d81d16bd83c991 SHA1 7c5d65bb3e3649684e1d0cb6ff7b019b7443ee08 SHA256 ed3870c7107b6e0d2186ff63807db15e77afd3c404320df48b195b456a2d4c0f
 AUX traverso-0.42.0-strictaliasing.patch 589 RMD160 0ef04844908ff193912245c307c2d3599f077e20 SHA1 e67161bc7b92ca616f5f22b141334e3d7d437815 SHA256 ebf8ff9b48249c173a449833921528451ab13f9106bced7c30fad0fd7c925237
 DIST traverso-0.42.0.tar.gz 874836 RMD160 83adf7686da7e192a253677c904f5786e39fafe9 SHA1 7ad1c4555f93b380e44ce2941cbc88babc5f1064 SHA256 b91d1f536dcd3eb5f48a881c2b3da957e02f4f96a5573f6ca2d173347ed74be8
-EBUILD traverso-0.42.0.ebuild 1974 RMD160 c4d9b1f0f7a000322796c3e693f86261ed08a9d2 SHA1 86dd7195fab101448785322bb15639bead081415 SHA256 0041a34f0007a3922112031c8fac0cf901296daf668d507b8b69d1ad78bdd84e
-EBUILD traverso-9999.ebuild 1949 RMD160 4036f6abe31f7918a0f25148123dc9f80814f762 SHA1 6fbd9ad069291e4b3bf945643e16408c4655f7f5 SHA256 52ab39a8e3279f1a431bedbfa2827532a0ab4021e73455441673df58587a031d
-MISC ChangeLog 2999 RMD160 d4bfeeaf79ea47a50f7133f414fec13063d1c107 SHA1 d2df32ae523bd8cb5c9bc2caa30248d8e350b89a SHA256 aaf8d81b43dae8b726016c9a175827cad067e49f5a82904b6d365c558a88d853
+EBUILD traverso-0.42.0.ebuild 2093 RMD160 18a9664b48cc282aa90200a14ac473dae0cd0ee7 SHA1 dbd9a14a0ddcdc77dc2c4653be4a8abcdc1352df SHA256 dd82463647797c9bf961639779c3202339a616de79ad0de292cb65cf2b0edd68
+EBUILD traverso-9999.ebuild 2067 RMD160 72236432a53785b9da4059cdf87c89af1d10e4eb SHA1 69a7ab5bde05c08c2505ca6943d68f51b4e83e53 SHA256 1c3781c6f122b671502d82df53f30f5a4a18f3f5fcefaca2ff12d5aaafd40724
+MISC ChangeLog 3123 RMD160 c117bf98a9943ffb5d8918c1b35a0eeda014816b SHA1 b21cbb979d15afecf180ffff5e3d8ffce7c040ba SHA256 b7a6c17a8ac8cbba5438faab9f58f1072f31f2da57116cad5bb540f1808641fc
 MISC metadata.xml 482 RMD160 85dabe14d3dd570865bbc41511054c4700674aba SHA1 0f464cbaec8d3f50685faeaf31d62bb4a13808a2 SHA256 79ac631b510a2d0cc554e1c1cba25bdc0009f48e1383dc48242697239083df3c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkgLgIIACgkQvFcC4BYPU0o+cQCeKDK9cpPh9+0H7iwNh0b5UPft
-D18AoK0cZ5X0YOdDDRTpoibxc4xNmXp0
-=hJed
+iEYEARECAAYFAkgLhF8ACgkQvFcC4BYPU0qn8ACfeJuWT/dlNzSKmmSgMOy8lUR0
+JfEAn1UIlEw5BDhkO9Kto9wQJ0JWmtvf
+=9epU
 -----END PGP SIGNATURE-----
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