Drop the qt4 USE flag, like the previous commit.

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

diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog
index 077667dbb5e1b297b4cb7db4fecf0c8de00825c4..3e6c21d7e162fcb1c788e61c29e4ad4f1d1342b7 100644 (file)
--- 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.401 2015/02/22 19:02:54 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.402 2015/02/23 05:44:06 mattst88 Exp $
+
+  23 Feb 2015; Matt Turner <mattst88@gentoo.org> cairo-9999.ebuild:
+  Drop the qt4 USE flag, like the previous commit.
 
   22 Feb 2015; Matt Turner <mattst88@gentoo.org> cairo-9999.ebuild:
   Drop openvg, drm, and gallium USE flags, bug 504230.

diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index abec379048047718a8f007ad76e55ff3436ea0f1..84d1dd0de433409aaaf35a147433aee351c0e4df 100644 (file)
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -23,23 +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 4837 SHA256 e4c364c10f458f9547ffacf654715b1fe502f24b9865d55c5072b7d775541d6c SHA512 0b3a7219ff736bf0a2eb0938c185922a542df82962ec0a4128f2336fe0018be41af773ab01f99a23b27860c2a9cc853ba7f5204b18c3683c778f90960388b76d WHIRLPOOL 685b5df35495b60b5a18275d32f5a3e058c3cc8004475b2e9179ab638f0ec635416abdc893f3f5b8da9e98133cfec1d30b694d56c473f892858a897d469cba74
-MISC ChangeLog 60578 SHA256 81943922c041e615eadc53162a13909cc42c0a0b531508f1150e4d54ecb11b56 SHA512 54f50ebe7206bd94de3b77f62ca46dae77debfc9e234f3cfce18bc75e99ccee523b40638b8016afc918baded77736e0f2a4fe13ffca350574d55c121cf7d3e0d WHIRLPOOL 08d38e5a14925956a9a4d87ba3168e770e65294181a6e7452104fb66e1b93f36379520f122c42f41e6ae1152cb83ccf3bce6af5411a346eb311159912f7406f4
+EBUILD cairo-9999.ebuild 4775 SHA256 4de8533788128e7794f4a46ec34f3d0e978379d2a06790ebc78074c345f81693 SHA512 42ba24bb51ba1c8b088a860d07d1326901d1d1ef9509ae275c03eba08266508574c96e56c02d95d619a80fc6a8506bcb1931a80c0cce29356d028e70a2f17188 WHIRLPOOL eea6de53be6cdcc841c4deae13c74e55b1c792df9586e933cab979efc85407247c40b1267391108cf0015414a6ae73bc83eebce98e27ecc8673c1979a8c8cfc2
+MISC ChangeLog 60698 SHA256 37b09f5d496465244cf84c43e4916bb5ba03f9148f4a0482139b31b90dd657e9 SHA512 dfdea1989f84a4d03773bb3f921a27eab7a178176fa49727dd0bcf14069e19e46372e6d8bb06b86feec069c1707ee8c954c1d527e9398b4621f0939405b2745a WHIRLPOOL fdb0d3deaaf8706a54b0cf880c3145379bef89ab0c0ba7c9f9776521b6a46e03c2c991d0660197fb5c5c8d33d86b4602551944a07d5960106716613391e32192
 MISC metadata.xml 1294 SHA256 988ed8eceb7738628f10a041a322482997d26a5fed1fd42eb86bd742a6e3602c SHA512 7d333210abf19ed97a1210d37d77a1cbe944220f16757a0c652c1a329d00cc387ebf2ca174db6dc7f79a892ab068c66d773c364da0321fcfeec0a05d84946bcf WHIRLPOOL b0d67117667918643b4d889b74207b995d8fa1c851786fc89bb81cecc5c46e89714533eb2f8cd005e1175ac8c79eb5d3912826e87cf1c34886103b5a4d7e06a2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-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
+iQIcBAEBCAAGBQJU6r4oAAoJEA/daC2XTKcqBVoQAKCciAxj+4pMzNzepfTC43+e
+QpD0Zoop5JHCAqn2k+kPVg7iJQgd+Ah4qESgGlBovkYY6Co0/J1WgJ5FjED4J7Ln
+xshe54mCobiUbAOSQfNjeXdxnznZOQq5wbO0d2iA4nNgSNPn4lSAVFg6KuRIIXdY
+rXcNVi/JUaaZnA06e4Jf3q6je+eogyYqw4iIyktSzGF0HrWXyRQrhcYDqx0XJfrT
+q8viOfAYf7vZVuqkcYYu06HTLHj9gsqPU5s6r+hjh4tP13jaGz3hrZrfbDAeXAXG
+uivXo0HfjSePScxE71ujU3iRMVOogp+pke8+zSX0Ox+qwU/cvSDHlIbC3TNd3mD2
+318QQ/T/m4rWSQ41pLglqc3yeoXqhtoym4nDBafhDDsQZ3eGz/NVY98SQCAn6PRG
+yPDr319jZXzwEUQbiM0thsc0S8mQq9M4gbdIfFVv++TlE7c9uUWVaDNGTJxvPJJT
+yBZmkkmFDNLdpmj+Wa1zFGfdI4T+CySrNJD6Do3mHaAgpUMXC3jEnlVNxN5P1WdJ
+Uws1xyQECJa0RF4fETavSCO8Nb9XPG8UeVH15rvsg73ShZ8YpCI8qcan1IOKj41T
+7Su1gFWWy9+CarVi0mc9i1AYY3OSxgkfeNFon9A3u+3Yeuy6Qv3pBmuhWLk2NOtW
+Z77fjf4hH0JWbtujxIpA
+=Chva
 -----END PGP SIGNATURE-----

diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild
index 21ea85652cad63d16e561024f00a46aa890104f8..d26c7086f9d04ab137d3aef4f2b73d9c15b652d5 100644 (file)
--- 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.57 2015/02/22 19:02:54 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild,v 1.58 2015/02/23 05:44:06 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 gles2 +glib opengl qt4 static-libs +svg valgrind xcb xlib-xcb"
+IUSE="X aqua debug directfb gles2 +glib opengl 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,7 +36,6 @@ 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 ) )
-       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}]
@@ -125,7 +124,6 @@ multilib_src_configure() {
                $(use_enable gles2 glesv2) \
                $(use_enable glib gobject) \
                $(use_enable opengl gl) \
-               $(use_enable qt4 qt) \
                $(use_enable static-libs static) \
                $(use_enable svg) \
                $(use_enable valgrind) \
@@ -138,6 +136,7 @@ multilib_src_configure() {
                --enable-ps \
                --disable-drm \
                --disable-gallium \
+               --disable-qt4 \
                --disable-vg \
                ${myopts}
 }