Remove USE="glitz" wrt #330397.

(Portage version: 2.2.0_alpha26/cvs/Linux x86_64)

3 files changed, 9 insertions, 16 deletions

diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog
index a59c06153574..35b40e659557 100644
--- a/x11-libs/cairo/ChangeLog
+++ b/x11-libs/cairo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/cairo
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.275 2011/03/05 17:52:48 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.276 2011/03/07 17:22:33 ssuominen Exp $
+
+  07 Mar 2011; Samuli Suominen <ssuominen@gentoo.org> cairo-1.8.10.ebuild,
+  metadata.xml:
+  Remove USE="glitz" wrt #330397.
 
   05 Mar 2011; Kacper Kowalik <xarthisius@gentoo.org> cairo-1.10.2-r1.ebuild:
   ppc64 stable wrt #354237
diff --git a/x11-libs/cairo/cairo-1.8.10.ebuild b/x11-libs/cairo/cairo-1.8.10.ebuild
index 20feee7123d0..4b4f9f11a5ed 100644
--- a/x11-libs/cairo/cairo-1.8.10.ebuild
+++ b/x11-libs/cairo/cairo-1.8.10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.8.10.ebuild,v 1.9 2010/09/13 13:19:51 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.8.10.ebuild,v 1.10 2011/03/07 17:22:33 ssuominen Exp $
 
 EAPI=2
 
@@ -14,7 +14,7 @@ SRC_URI="http://cairographics.org/releases/${P}.tar.gz
 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="aqua cleartype debug directfb doc glitz lcdfilter opengl +svg X xcb"
+IUSE="aqua cleartype debug directfb doc lcdfilter opengl +svg X xcb"
 
 # Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it
 RESTRICT="test"
@@ -25,7 +25,6 @@ RDEPEND="media-libs/fontconfig
 	>=media-libs/libpng-1.2.43-r2:0
 	>=x11-libs/pixman-0.12.0
 	directfb? ( >=dev-libs/DirectFB-0.9.24 )
-	glitz? ( >=media-libs/glitz-0.5.1 )
 	svg? ( dev-libs/libxml2 )
 	X? ( 	>=x11-libs/libXrender-0.6
 		x11-libs/libXext
@@ -77,13 +76,9 @@ src_configure() {
 	#gets rid of fbmmx.c inlining warnings
 	append-flags -finline-limit=1200
 
-	if use glitz && use opengl; then
-		export glitz_LIBS=$(pkg-config --libs glitz-glx)
-	fi
-
 	econf $(use_enable X xlib) $(use_enable doc gtk-doc) \
 		$(use_enable directfb) $(use_enable xcb) \
-		$(use_enable svg) $(use_enable glitz) $(use_enable X xlib-xrender) \
+		$(use_enable svg) --disable-glitz $(use_enable X xlib-xrender) \
 		$(use_enable debug test-surfaces) --enable-pdf  --enable-png \
 		--enable-ft --enable-ps \
 		$(use_enable aqua quartz) $(use_enable aqua quartz-image) \
diff --git a/x11-libs/cairo/metadata.xml b/x11-libs/cairo/metadata.xml
index 563302b5aa80..f792e7458164 100644
--- a/x11-libs/cairo/metadata.xml
+++ b/x11-libs/cairo/metadata.xml
@@ -13,18 +13,12 @@
 <use>
 	<flag name='cleartype'>Add ClearType-style behavior for sub-pixel hinting.
 		Patch taken from Arch Linux</flag>
-	<flag name='glitz'>Build with glitz support, which replaces some software
-		render operations with Mesa OpenGL operations</flag>
 	<flag name='lcdfilter'>Add FreeType LCD filtering, ClearType-style behavior
 		for sub-pixel-hinting. Overrides cleartype USE flag. Patch taken from
 		Ubuntu</flag>
 	<flag name='opengl' restrict="&gt;=x11-libs/cairo-1.10.0">
 		Use Mesa backend for acceleration
 	</flag>
-	<flag name='opengl' restrict="&lt;=x11-libs/cairo-1.10.0">
-		When used along with USE=glitz, enables glitz-glx usage.
-		Requires hardware OpenGL support
-	</flag>
 	<flag name='drm'>Use Linux DRM for backend acceleration</flag>
 	<flag name='gallium'>Use Mesa's Gallium backend for acceleration</flag>
 	<flag name='openvg'>Use OpenVG for backend acceleration</flag>