Fix qt USE flag to be qt4 and fix qt depends. fixes bug #336633

Package-Manager: portage-2.1.9.2/cvs/Linux x86_64

4 files changed, 16 insertions, 12 deletions

diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog
index 94aa17e3d95c..229bc7a14f8e 100644
--- a/x11-libs/cairo/ChangeLog
+++ b/x11-libs/cairo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/cairo
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.257 2010/09/09 10:41:03 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.258 2010/09/09 19:37:28 cardoe Exp $
+
+  09 Sep 2010; Doug Goldstein <cardoe@gentoo.org> cairo-1.10.0-r1.ebuild,
+  cairo-9999.ebuild:
+  Fix qt USE flag to be qt4 and fix qt depends. fixes bug #336633
 
   09 Sep 2010; Tomáš Chvátal <scarabeus@gentoo.org>
   cairo-1.10.0-r1.ebuild, cairo-9999.ebuild:
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 27e61c49170c..1a7adace9f5a 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -6,10 +6,10 @@ DIST cairo-1.10.0.tar.gz 24022822 RMD160 fa65d4f3926308857d13f3ed0c100f89f075dc0
 DIST cairo-1.8-lcd_filter.patch.bz2 7067 RMD160 5c2ee470022788df88425da24cebea3baed69298 SHA1 9202c14967a633a9e57dd203695896d0197fea8b SHA256 6965d46df45d8382d122170a0f1dfaeb25bd68adc998b42f62397123e5795d1d
 DIST cairo-1.8.10.tar.gz 7102657 RMD160 9538baf30f812b950beeb93893f46d1223fb44ce SHA1 fd5e8ca82ff0e8542ea4c51612cad387f2a49df3 SHA256 572bada15596ec8708392db1af8b93a1af75ca47690348154e2841f3a6f08439
 DIST cairo-1.8.8.tar.gz 6646082 RMD160 78af536ebaaffc608114b626b22fc9a20cff3750 SHA1 e4b8b219427d1ca3dc95f5f44914dce1ae0c3766 SHA256 3c51d3de5dc4596e01a6675acd3c86c2c99c00f02e8fad5493758a29fe451c90
-EBUILD cairo-1.10.0-r1.ebuild 3768 RMD160 9f7fd53e138b87b0408bfe7037de3f4c79ad735e SHA1 1768a975891c30d17f69cf1c351fc268b02cac35 SHA256 f31a231681a0e047852d1b612cb79d87f5486cc8e4c50d12815eca999c5cdebf
+EBUILD cairo-1.10.0-r1.ebuild 3779 RMD160 9081d0f735f929ab601643a6b23a40e79ca34b23 SHA1 708243e958ea8c03bf1e15d10a54d07c44303c20 SHA256 7fad7be4f8e78e59f8424cec023312bafcd059f85a7660d9c06c3ad2a219fe84
 EBUILD cairo-1.8.10.ebuild 3586 RMD160 2b7d00410f705027e45aeba848d72a15c728a727 SHA1 fd90d5e499e57fecf6ae5a68754e49810204d128 SHA256 a122307a37eba3abff7fb58676255800918b7d89404ad1bf67d4d89c974f6fbd
 EBUILD cairo-1.8.8-r1.ebuild 3579 RMD160 a0bbaa9a2748d30bc408ad06b55d20ffdb3bb1be SHA1 ec55a981033137daf85a1c78ba16b3bdef23b7e4 SHA256 859054fa4543bc0d6fd0069f227c270cd7c505dafee3e20e85d25857ccbbf2aa
 EBUILD cairo-1.8.8.ebuild 3268 RMD160 93e9229cfa92173c2941f22a59960b52f3841cbc SHA1 f505952d4df79f73f95e90c0415c1bd58f51df10 SHA256 c50936f777d7a29b223ed4f80e192e11759c6a0f35779e2eaaa18aa9bbf89bbc
-EBUILD cairo-9999.ebuild 3763 RMD160 3f42f0ae4aafa08289675e63518967d02efe0439 SHA1 4fbe028f2addb92f47b9ba127cd1e1397c71d743 SHA256 07095e47f996a81815eafb2ee1e233341f2d267caffaf115d53fffc0d27a3964
-MISC ChangeLog 35935 RMD160 e6b463cc9f5b4f9cfe1ec229506b18d54de0d0fe SHA1 97da68eae73004101d6a81407dbc84060c38b3ee SHA256 afe9a1ca92a8973d1ab07e5d52d48d282b7b11837a535dbd5b5cb2ea02a6f14e
+EBUILD cairo-9999.ebuild 3774 RMD160 71e914b204c111ffc3b318714678d4c0f827c242 SHA1 ffcee912331485391734389e52f21243d8667401 SHA256 b3a82b1a97b9a199a3167a3c81ff36a8793493fafa3e77d40104368518ff1bc2
+MISC ChangeLog 36094 RMD160 5be6d026b9ddc6e8791ee6bb94a478dcc39da729 SHA1 3d35b117e2a255c84a0cc4aab9e6ed3031b098b0 SHA256 f7eee2b9616aa3d2f4d7fbbbe35168f0b9551c3934d69e18992726b8e206dbf3
 MISC metadata.xml 1270 RMD160 c8e4ed6405aaccf4b19838a957742d9f28b24a92 SHA1 c1462b7e9810ef6f6b031875d7b6224ee1e2f0e8 SHA256 2041be22138e19a3a6a652d3bf02dd1cc54e916ce3e9e91257eb34f1ea9ef8da
diff --git a/x11-libs/cairo/cairo-1.10.0-r1.ebuild b/x11-libs/cairo/cairo-1.10.0-r1.ebuild
index 3a11cdb8f652..d1a298f02169 100644
--- a/x11-libs/cairo/cairo-1.10.0-r1.ebuild
+++ b/x11-libs/cairo/cairo-1.10.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.10.0-r1.ebuild,v 1.3 2010/09/09 10:41:03 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.10.0-r1.ebuild,v 1.4 2010/09/09 19:37:28 cardoe Exp $
 
 EAPI=3
 
@@ -16,7 +16,7 @@ HOMEPAGE="http://cairographics.org/"
 LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="X aqua debug directfb doc drm gallium opengl openvg qt static-libs +svg xcb"
+IUSE="X aqua debug directfb doc drm gallium opengl openvg qt4 static-libs +svg xcb"
 
 # Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it
 RESTRICT="test"
@@ -28,7 +28,7 @@ RDEPEND="media-libs/fontconfig
 	>=x11-libs/pixman-0.18.4
 	directfb? ( dev-libs/DirectFB )
 	opengl? ( virtual/opengl )
-	qt? ( x11-libs/qt-gui )
+	qt4? ( >=x11-libs/qt-gui-4.4:4 )
 	svg? ( dev-libs/libxml2 )
 	X? (
 		>=x11-libs/libXrender-0.6
@@ -124,7 +124,7 @@ src_configure() {
 		$(use_enable doc gtk-doc) \
 		$(use_enable openvg vg) \
 		$(use_enable opengl gl) \
-		$(use_enable qt) \
+		$(use_enable qt4 qt) \
 		$(use_enable static-libs static) \
 		$(use_enable svg) \
 		$(use_enable xcb) \
diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild
index c5189a27bc20..9831924742ed 100644
--- a/x11-libs/cairo/cairo-9999.ebuild
+++ b/x11-libs/cairo/cairo-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild,v 1.5 2010/09/09 10:41:03 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild,v 1.6 2010/09/09 19:37:28 cardoe Exp $
 
 EAPI=3
 
@@ -16,7 +16,7 @@ HOMEPAGE="http://cairographics.org/"
 LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="X aqua debug directfb doc drm gallium opengl openvg qt static-libs +svg xcb"
+IUSE="X aqua debug directfb doc drm gallium opengl openvg qt4 static-libs +svg xcb"
 
 # Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it
 RESTRICT="test"
@@ -28,7 +28,7 @@ RDEPEND="media-libs/fontconfig
 	>=x11-libs/pixman-0.18.4
 	directfb? ( dev-libs/DirectFB )
 	opengl? ( virtual/opengl )
-	qt? ( x11-libs/qt-gui )
+	qt4? ( >=x11-libs/qt-gui-4.4:4 )
 	svg? ( dev-libs/libxml2 )
 	X? (
 		>=x11-libs/libXrender-0.6
@@ -124,7 +124,7 @@ src_configure() {
 		$(use_enable doc gtk-doc) \
 		$(use_enable openvg vg) \
 		$(use_enable opengl gl) \
-		$(use_enable qt) \
+		$(use_enable qt4 qt) \
 		$(use_enable static-libs static) \
 		$(use_enable svg) \
 		$(use_enable xcb) \