Drop openvg, drm, and gallium USE flags, bug 504230.

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0x974CA72A

3 files changed, 25 insertions, 38 deletions

diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog
index ad18c60874c5..077667dbb5e1 100644
--- a/x11-libs/cairo/ChangeLog
+++ b/x11-libs/cairo/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/cairo
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.400 2015/02/21 18:58:50 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.401 2015/02/22 19:02:54 mattst88 Exp $
+
+  22 Feb 2015; Matt Turner <mattst88@gentoo.org> cairo-9999.ebuild:
+  Drop openvg, drm, and gallium USE flags, bug 504230.
 
   21 Feb 2015; Alexandre Rostovtsev <tetromino@gentoo.org> cairo-9999.ebuild:
   Also don't wrap cairo-features.h in live ebuild
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 3dc9159dd33b..abec37904804 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -23,25 +23,23 @@ EBUILD cairo-1.12.16-r4.ebuild 5967 SHA256 5e0b558e4eb8d89d6b05e76762874c3747ab8
 EBUILD cairo-1.12.16.ebuild 4115 SHA256 510a7314d31ee86b1cdc198cc2feae538b577582961b38c1bcab35e8e8da1a17 SHA512 a7964920b7dc9b8fcd3826207fa53046e41d67d3486a73f32cd4183ebf2d9ac500398a0d73604c9d234139344653d66ad8b24eb91e1d48d814c1fa70ba179c29 WHIRLPOOL 1df6b4bae51c564a862e763b0ffb6726ce9ab983bf7fe353e7bfb8f34d32cdd56a2c889efc55d70174061a0b3d8744ef9abb282870e6bae4d119b9331841a40d
 EBUILD cairo-1.12.18-r1.ebuild 5309 SHA256 7875a0cd8accbeeee339fb01d6ebed55966742e47c45446d8a3f141df0be5542 SHA512 5a3cb26a958050115787b37ae887633c56363fd5c02b34417713da68f9c76034f63001f395b15f8a7688c926841185d47b6943c7af1921ebe7d7896c55c07dca WHIRLPOOL 6626aef479edd76e43529ec3d528aca14b651d0b4f0682f8ba4fa17eafab24bbaf9a073b6ee3d4ba56d5a233e3b1e3cbbb1a1bb575487ed3b1741e75b7fbc683
 EBUILD cairo-1.14.0-r1.ebuild 5379 SHA256 f7bf0da497a5b006c6873fb6c959dd34716073d4215ff5b000ba77b3b3606860 SHA512 969d81c3ae2161003526630867857935a7dc0e94f3b53254df9533c7baf976d4180c58a94deff8ba508a9db6cd2437af34dd2756624bbd008ab4297e65a69050 WHIRLPOOL 218dd62b2e3e70ed791e372666629d4e223efa411b32980f76e563787afdc60e01d3278eb9f9abd1aa5ee903fd4ecd620a62dbefd93b65d5cc0654a0d25af50a
-EBUILD cairo-9999.ebuild 5307 SHA256 9c6c60554cead192288f404e853b9f44e14aaa06bc92d83b154156329034da5b SHA512 1099c96e3810a07c67db4561732458603c531c253798da54c46be0aca7d23a2fafc2ccdfd795c19d16cda85ac71380b6ca86465d8688e134044d34b41b086606 WHIRLPOOL da644da9712f69aebd5c60e0f434fcf04466cbe858a6d402245e4ebd83465ff56944eb4649529130b9456a41ca7106f03312b123932f54f0dd0a4829951c8791
-MISC ChangeLog 60455 SHA256 39acc2a4133800cb8bdae6a1b9fc576ef37ab31bcbb5b6c4bd147d6fcbf21b42 SHA512 5e9032b0dec0bd90e20e19cce5c4b6b8af4da0a080dd88d7541dc8d8e3c08742402841fee2b129f5b0919deb43cf674e50466b7444f2d9110c5eb2b147fb6255 WHIRLPOOL 3da72e25832ac07ea2bd6a075bc3c5350cf846b32e1492bafa8175375c63413ecd9b2f1e14241e430a6c0522895db9455e53dc8558b2b881a962bf3c09d76c84
+EBUILD cairo-9999.ebuild 4837 SHA256 e4c364c10f458f9547ffacf654715b1fe502f24b9865d55c5072b7d775541d6c SHA512 0b3a7219ff736bf0a2eb0938c185922a542df82962ec0a4128f2336fe0018be41af773ab01f99a23b27860c2a9cc853ba7f5204b18c3683c778f90960388b76d WHIRLPOOL 685b5df35495b60b5a18275d32f5a3e058c3cc8004475b2e9179ab638f0ec635416abdc893f3f5b8da9e98133cfec1d30b694d56c473f892858a897d469cba74
+MISC ChangeLog 60578 SHA256 81943922c041e615eadc53162a13909cc42c0a0b531508f1150e4d54ecb11b56 SHA512 54f50ebe7206bd94de3b77f62ca46dae77debfc9e234f3cfce18bc75e99ccee523b40638b8016afc918baded77736e0f2a4fe13ffca350574d55c121cf7d3e0d WHIRLPOOL 08d38e5a14925956a9a4d87ba3168e770e65294181a6e7452104fb66e1b93f36379520f122c42f41e6ae1152cb83ccf3bce6af5411a346eb311159912f7406f4
 MISC metadata.xml 1294 SHA256 988ed8eceb7738628f10a041a322482997d26a5fed1fd42eb86bd742a6e3602c SHA512 7d333210abf19ed97a1210d37d77a1cbe944220f16757a0c652c1a329d00cc387ebf2ca174db6dc7f79a892ab068c66d773c364da0321fcfeec0a05d84946bcf WHIRLPOOL b0d67117667918643b4d889b74207b995d8fa1c851786fc89bb81cecc5c46e89714533eb2f8cd005e1175ac8c79eb5d3912826e87cf1c34886103b5a4d7e06a2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCABmBQJU6NVxXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RTNCRkUzRDRBNkI2MEEwQkYwQzMyOEEx
-OEU1QjZGMkQ4RDVFQzhEAAoJEBjltvLY1eyNq2AP/16wZRzpAcWe/evH4akNTh9a
-QaG4cPzqpkdvNQ/wb7gfI8gFjYkmNxTTF6rKD/gCjYeb9wEY6d/powz5zxxZ24kG
-eomWV4HjUTPNZe4wYrZjR0o9YhP00nEMzMD76o1NEs3f7WVpq6ZZZm198M0mpq/V
-vNBkLrvBDLYxlO9VIfqTgS+eKUcZxjKEOOljjt7QW82pS3qjUgGOyXGfEKBp4LtP
-BomHhVp/r34/hIJ9mKtipV5vImiAObUsA0FqzQKxjh9fF78j9hXcCVCyF/Nw/b5m
-Ns5efo1QT3Oun5k1EEAhA7MsNLherlXNUQGpf1qcnnfEoKQoPZw9qGY1EZKolyCM
-dV6cgsf3u8lcc1uSrr9Woi1vwxQKBlwJUPRace3oxelFMgOYBMBQLaZADmjoFXcf
-pXcVZTm0MPJlmBzpb0/w67ZzbLQc7ZuXiO5xvrdqx7PDSF40jYAVb5K+4uORyONQ
-WPKKOn/p8v1r4yv/lHmsdK2bpUulE9OKLJy6X7DX1Kfla19FxF6v12Br5FCL13i2
-WnK5I9XJkK3D6F+lVAJo5XVb34kylBECnfSgtDnevXT+Cs3MxKHtiUx7VoYs/hU0
-+w8sFHnkEVfhpx+JyuSjr01OZgFS0/42WUBAFs5zQqAQlD+MSso8Hd4kwuH/vjIw
-leGueKb8jKoIdM9ryQlp
-=vGOs
+iQIcBAEBCAAGBQJU6iffAAoJEA/daC2XTKcqiuwP/ihOPKMrQ3UJqgcUtbZS7758
+qcscDF+U2achmWdFUzNM730qZvVNOKwS/EG64zZr10PqoUqtXt6vISVNouFISf+q
+O+rfrwVsQkFLKO482GPO9x2KqAEtTe7eF6/t04uOV7r7hhoLBm//1zBau6J+Iz1e
+vdtpOPGEnDnk34vtFl43wCP/hjtjTGplEwr8gtMxdyjZyOW2s0dc0LocC5woDf73
++EcR2HR03rA4rWAsLXGcLZOozSvlhejmpUn+RiK1WPAFan1z4tilyYrOO9LQtsfR
+9S/zC5FS7M8iijsOjV+LD1ca72UJ8bngNpSvHxCrTSlSbDteL78La9hNdEXsC3YD
+U2akQJ5HpPKvV2cVfkBtjGFqWYrhGAWHv++NJjlKkBIbLtI620y/zhLlSy4BYaFf
+k9B5yDYM41n6WPn/jp9UPBfe+CVq2uCwMYelOPHfYrAdQmIS7vYMnQNU6rJ7XcrJ
+vUyT7/tJnASggmj6PrJIYa1+82qN9nr2VteN2hBtb0LnzBjaO3XAin4F3sVRvjxc
+nY6e/gM9taa2aHHv8anliEo3G0nzGCgao+0muVIiy/oQsQmIgDuoFPOjfkf+ub5v
+iY1JyzTpB4qD12ZXfDo9eupKo/1Wow8RmxFIlVaBMPkVgn4+CIDlvKH/LHqU5fkR
+T43j45CQ0XJS0WIrpq2F
+=2SYB
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild
index f1b4a17d5584..21ea85652cad 100644
--- a/x11-libs/cairo/cairo-9999.ebuild
+++ b/x11-libs/cairo/cairo-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 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.56 2015/02/21 18:58:50 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild,v 1.57 2015/02/22 19:02:54 mattst88 Exp $
 
 EAPI=5
 
@@ -19,7 +19,7 @@ DESCRIPTION="A vector graphics library with cross-device output support"
 HOMEPAGE="http://cairographics.org/"
 LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
 SLOT="0"
-IUSE="X aqua debug directfb drm gallium gles2 +glib opengl openvg qt4 static-libs +svg valgrind xcb xlib-xcb"
+IUSE="X aqua debug directfb gles2 +glib opengl qt4 static-libs +svg valgrind xcb xlib-xcb"
 # gtk-doc regeneration doesn't seem to work with out-of-source builds
 #[[ ${PV} == *9999* ]] && IUSE="${IUSE} doc" # API docs are provided in tarball, no need to regenerate
 
@@ -36,16 +36,11 @@ RDEPEND=">=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}]
 	gles2? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] )
 	glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
 	opengl? ( || ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] media-libs/opengl-apple ) )
-	openvg? ( >=media-libs/mesa-9.1.6[openvg,${MULTILIB_USEDEP}] )
 	qt4? ( >=dev-qt/qtgui-4.8:4[${MULTILIB_USEDEP}] )
 	X? (
 		>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
 		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
 		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		drm? (
-			>=virtual/libudev-208:=[${MULTILIB_USEDEP}]
-			gallium? ( >=media-libs/mesa-9.1.6[gallium,${MULTILIB_USEDEP}] )
-		)
 	)
 	xcb? (
 		>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
@@ -59,10 +54,6 @@ DEPEND="${RDEPEND}
 	>=sys-devel/libtool-2
 	X? (
 		>=x11-proto/renderproto-0.11.1-r1[${MULTILIB_USEDEP}]
-		drm? (
-			>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
-			>=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
-		)
 	)"
 #[[ ${PV} == *9999* ]] && DEPEND="${DEPEND}
 #	doc? (
@@ -70,13 +61,8 @@ DEPEND="${RDEPEND}
 #		~app-text/docbook-xml-dtd-4.2
 #	)"
 
-# drm module requires X
-# for gallium we need to enable drm
 REQUIRED_USE="
-	drm? ( X )
-	gallium? ( drm )
 	gles2? ( !opengl )
-	openvg? ( || ( gles2 opengl ) )
 	xlib-xcb? ( xcb )
 "
 
@@ -135,12 +121,9 @@ multilib_src_configure() {
 		$(use_enable aqua quartz) \
 		$(use_enable aqua quartz-image) \
 		$(use_enable debug test-surfaces) \
-		$(use_enable drm) \
 		$(use_enable directfb) \
-		$(use_enable gallium) \
 		$(use_enable gles2 glesv2) \
 		$(use_enable glib gobject) \
-		$(use_enable openvg vg) \
 		$(use_enable opengl gl) \
 		$(use_enable qt4 qt) \
 		$(use_enable static-libs static) \
@@ -153,6 +136,9 @@ multilib_src_configure() {
 		--enable-pdf \
 		--enable-png \
 		--enable-ps \
+		--disable-drm \
+		--disable-gallium \
+		--disable-vg \
 		${myopts}
 }