Fix split Qt dependencies (bug #222703).

Package-Manager: portage-2.2_rc3/cvs/Linux 2.6.24-gentoo-r2-JeR i686

4 files changed, 20 insertions, 10 deletions

diff --git a/x11-libs/qwt/ChangeLog b/x11-libs/qwt/ChangeLog
index 5377e68daa05..af76dadf056a 100644
--- a/x11-libs/qwt/ChangeLog
+++ b/x11-libs/qwt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/qwt
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/ChangeLog,v 1.64 2008/07/28 21:48:46 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/ChangeLog,v 1.65 2008/07/30 15:20:26 jer Exp $
+
+  30 Jul 2008; Jeroen Roovers <jer@gentoo.org> qwt-5.0.2-r1.ebuild,
+  qwt-5.1.0.ebuild:
+  Fix split Qt dependencies (bug #222703).
 
   28 Jul 2008; Carsten Lohrke <carlo@gentoo.org> qwt-4.2.0-r2.ebuild,
   qwt-4.2.0-r3.ebuild, qwt-5.0.2-r1.ebuild, qwt-5.1.0.ebuild:
diff --git a/x11-libs/qwt/Manifest b/x11-libs/qwt/Manifest
index c76d1bc542a3..b4f32b87a39b 100644
--- a/x11-libs/qwt/Manifest
+++ b/x11-libs/qwt/Manifest
@@ -5,7 +5,7 @@ EBUILD qwt-4.2.0-r1.ebuild 1594 RMD160 b185852ffc7cc480c8ad27ba778c9e821ae546cc
 EBUILD qwt-4.2.0-r2.ebuild 1792 RMD160 1b86f500d12662f7a350597ea6059b395f56c5c4 SHA1 c1e48a18eb2f672a2c00f766cb2540811c62fa94 SHA256 0ca632e6a62d6a6628f4e3fd8437bd53367dad445cba4ce97ae0131555249847
 EBUILD qwt-4.2.0-r3.ebuild 1731 RMD160 c23f69e254d00c1b7d87eae4f13547e1fd14ea4e SHA1 24b59d50a6e9b18ab5db484c912a728f015d0cc6 SHA256 5cdcbf41136c96bfd1c31b2033d0d509afe8e357b4225cde603e3dd5134a6b33
 EBUILD qwt-4.2.0.ebuild 1541 RMD160 a23ba4d0f4b143d700b9367a60e9af34044f3016 SHA1 d918dfb43b0736cb6eeeb9c3e337d5b0a0342fcb SHA256 c5936a3ec2d8a862ebb40a0a982309bae59f524033f8ebd029feea2480b43237
-EBUILD qwt-5.0.2-r1.ebuild 1250 RMD160 79d632102d57393828d9c536b8e18e18a4cf7b65 SHA1 176cb8662c3c4ee50c8d1db760a890d53fc214b7 SHA256 c66dc63732fe0617dde3f0f0b5797c901af3727e4151a324763de89025a534c8
-EBUILD qwt-5.1.0.ebuild 1252 RMD160 83ab74a2d58dcccb6db67f475dcb3b0497f05a12 SHA1 d0238270daee84ea3f9aa9e06097b35dd81f6111 SHA256 f1803d667149468f356a4b171fec61449fd994f10f6d93d452ca5c4720212726
-MISC ChangeLog 8777 RMD160 eaf1953cf0d5478ab3a312bf92847cecf8391d0c SHA1 9e602c0f3d0b74a4f1105256d974f35f54e7e6b8 SHA256 d908ec6ecb7c093b3143fc47207a46875d60a97d6981a92af4ed8e263bdd7e0f
+EBUILD qwt-5.0.2-r1.ebuild 1309 RMD160 a4d1ea5077a74f12097d8aa66e82057fc72c9931 SHA1 a07eff94b3dfa00d59565744fef76aac7679e85e SHA256 c8c22bb11f497cc9d655eefb3d81aab4679a656569ea1bc420d569f473a6c49d
+EBUILD qwt-5.1.0.ebuild 1311 RMD160 919dce3047f6313c6dd0e7d91f752dd5b2902cf7 SHA1 2d816c88544cbfe1f2ca7638a6c53531f4d14400 SHA256 daa7a46409be146a1d11646d1876446c0a638ba3851a66ebaf3512160b3bab8b
+MISC ChangeLog 8907 RMD160 0bb2d74e3966a66ec5e3ab14159b903d5cedf263 SHA1 24b369121639f405a11a33398d4a8c913fa2a0a4 SHA256 8dedf6677bbba65c8bb349f93524bdc4b0c1ae340109df382e7ee00a7b9a89c6
 MISC metadata.xml 217 RMD160 e6d054499f7788f954fa7941c8083d3cb12be55a SHA1 97a424e615a1e5536b7666dbc716040de4208a0a SHA256 87a4f33db3485f493febd11c563b8f811b2eaeac8183a3e50183df6387eff4b9
diff --git a/x11-libs/qwt/qwt-5.0.2-r1.ebuild b/x11-libs/qwt/qwt-5.0.2-r1.ebuild
index d058902ee763..3e398c055339 100644
--- a/x11-libs/qwt/qwt-5.0.2-r1.ebuild
+++ b/x11-libs/qwt/qwt-5.0.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-5.0.2-r1.ebuild,v 1.13 2008/07/28 21:48:46 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-5.0.2-r1.ebuild,v 1.14 2008/07/30 15:20:26 jer Exp $
 
 EAPI=1
 
@@ -14,7 +14,10 @@ KEYWORDS="amd64 hppa ~ia64 ppc ppc64 sparc x86"
 SLOT="5"
 IUSE="doc svg"
 
-DEPEND="=x11-libs/qt-4.3*:4"
+DEPEND="|| (
+	( x11-libs/qt-gui:4
+	  svg? ( x11-libs/qt-svg:4 ) )
+	=x11-libs/qt-4.3*:4 )"
 
 src_compile () {
 	# Configuration file
diff --git a/x11-libs/qwt/qwt-5.1.0.ebuild b/x11-libs/qwt/qwt-5.1.0.ebuild
index a3aca17425cc..ff2054ae90f9 100644
--- a/x11-libs/qwt/qwt-5.1.0.ebuild
+++ b/x11-libs/qwt/qwt-5.1.0.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-5.1.0.ebuild,v 1.2 2008/07/28 21:48:46 carlo Exp $
-
-EAPI=1
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-5.1.0.ebuild,v 1.3 2008/07/30 15:20:26 jer Exp $
 
 inherit multilib qt4
 
+EAPI=1
+
 SRC_URI="mirror://sourceforge/qwt/${P}.tar.bz2"
 HOMEPAGE="http://qwt.sourceforge.net/"
 DESCRIPTION="2D plotting library for Qt4"
@@ -14,7 +14,10 @@ KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 SLOT="5"
 IUSE="doc svg"
 
-DEPEND="=x11-libs/qt-4.3*:4"
+DEPEND="|| (
+	( x11-libs/qt-gui:4
+	  svg? ( x11-libs/qt-svg:4 ) )
+	=x11-libs/qt-4.3*:4 )"
 
 src_compile () {
 	# Configuration file