Sync live and non-live ebuilds.

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

3 files changed, 24 insertions, 21 deletions

diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog
index b36e5a910ffa..50077cb95b01 100644
--- a/x11-libs/cairo/ChangeLog
+++ b/x11-libs/cairo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/cairo
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.342 2013/07/22 01:19:31 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.343 2013/07/22 01:21:15 chithanh Exp $
+
+  22 Jul 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  cairo-9999.ebuild:
+  Sync live and non-live ebuilds.
 
 *cairo-1.12.14-r4 (22 Jul 2013)
 
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 1fb1bf053519..4b6aa0d108a4 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -22,6 +22,6 @@ EBUILD cairo-1.12.14-r2.ebuild 4072 SHA256 7751da8d2c9e49d7790aa2071868d340952c7
 EBUILD cairo-1.12.14-r3.ebuild 3726 SHA256 8bd7c91a3981fd50002384de4155adda883ec5a9cbb96f0052f08530724455d4 SHA512 25e3e30c5a94d7c04c610de720e14e03453e486551e939b26c7ff8fb9b0bc90d20c7572e117a4aa812935d57b2f9223cdf626bb5d041c2c12c65c95fc07611d2 WHIRLPOOL be65eb62f6f37176a520b33536f677aa347100f829778b8c3e7a8401e8f9c5eaabe4e3dc87bf1f7741e928a6656f361170efba5e250a34c9ec0ab622ddce9f9b
 EBUILD cairo-1.12.14-r4.ebuild 3782 SHA256 987b77076913177f1760c1d65d1b12b8aa62078446af771239b267f122d550e5 SHA512 55d3555c4112c64078f79db1845ce7f29c019026a6360e0554e3f2edf0cddd6a47188b858f20a5bbd4d76c1e8e3de0725062b892107fc5cb87ca902ba5dd15b6 WHIRLPOOL ac8b1c91dd0a0212aaf54e64eaa2988e52db367b51cb7a66e3935436e91c0a85d0bc7eb536ec0bc84dfa42584936e0d845f67627dadf92b1389a7ca0cb5e5477
 EBUILD cairo-1.12.8.ebuild 3904 SHA256 4fe87359c63f2097c219ef1e701016516316ed05fcbb8160be940d9d9e0b7bb6 SHA512 8da56cca2a1f5348168102b4880489f5f4c9de843a5a08a035ebe3a0dab509f18ccce81eb00befedb9915070ca65c95539c32c7df7905ae08685a4c702cce53b WHIRLPOOL f7b95a469bb32c3d98989e59160c7b7fa8565625c12fe8bc64da301492f98f3e4f16741a2f8aed4a3bf4f517ab445913af0de79ee4c60f5f7684c91c7bfafe31
-EBUILD cairo-9999.ebuild 3696 SHA256 65a16c82cfaabc00a591389aa357c96ce14c57770aa79669caf022dc07daef25 SHA512 3f8ca81574469ad5d9da7b4202c0876a05fefb4d506281c2d61356e324f67775775bea892e23b03f921488b77505d49ea15287751be565a3c76e673121ca9db1 WHIRLPOOL 6d74ec128475d3d696ccfdbcdd0cb4947dde17e940f101040238887c76b70e6ae14310921acec206ed5ac85be9a2c83770dd77b7a1c7bde2a17061351505fbb6
-MISC ChangeLog 50472 SHA256 3501be7b2a86283b169cc1163e9f900b26b61758c4aac51d48d29e48e989ed91 SHA512 d3d8f71be4692f0547e4b3c9e6b64f04c64d5829193c721e1a55b6b036687cbcf1c924d0b3f191dac0ee7266961436416d538e936923a5fe647c2f221164a112 WHIRLPOOL 1264f1d550e37902001d722b1d76e6cfb35682402b1416461acfd44d58b1b35da9cbccc4e6756ed402bb532e4ad32723b92d4836e86ddd86b6024c1fd75f3971
+EBUILD cairo-9999.ebuild 3777 SHA256 7426f02cc105becfe9c550dc045ea700c0f07a3ed83acdce1716932e8c94a981 SHA512 ed47d539939183c1a5a4d3403d7d206ca00855e12b753830dcc5db61348b85afea5af438e223d47c639f2842698dbe98c21d5952604e68f94a43a8f356eed9ba WHIRLPOOL 7f0219cc4735872ad6bdf0da75506d7da460343ff10600ef5a465d4ea33e7af619677602fb91bd9dd5490ca7d60d81780412617bc676d395de0646daa303eb21
+MISC ChangeLog 50597 SHA256 e44c0d27b6e7293bf5066ded040b327c4f0a98d4c21b9050ad8460b48a31bc6c SHA512 ded793840eaefa6ffde144210d3e0331f3a9e78c056d8c8f2c9bdd28c3b386fdc1ed1e3ef3a392da4aa58ea24e9686fd06fe6e22f3a0f0fae30d389ff294a64e WHIRLPOOL 438442dc393612bb6914eec78eb035c258b0db325446f2126488182b40e62559c76eaf63552429fa51945ba87201ea4097d47e336dabba3edb88531c26c350ae
 MISC metadata.xml 1120 SHA256 739fdd3c6c11e95820f728b2bae026e2370e84e3acdc86f36d958bc80f6b2744 SHA512 e50a851393522b2abbe04ded156c6c0eecf43cbb8ee4225df1a3e3a86b79c3fbb052f2893db63c6d7764308f2cca5d6a15fad83fae3275fb9778e91b05b1e0f1 WHIRLPOOL 7243b6f542f372a880aefca5c787a21b35947c9ecbcd9dd9e7f3f788104c82523793d423b2355e15f646114300ee62d149f47ed5ee444bc26edec526e2d545e6
diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild
index 218d0a4732e5..d8e75c49b5b8 100644
--- a/x11-libs/cairo/cairo-9999.ebuild
+++ b/x11-libs/cairo/cairo-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.32 2013/06/26 16:52:41 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild,v 1.33 2013/07/22 01:21:15 chithanh Exp $
 
 EAPI=5
 
@@ -20,7 +20,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 doc drm gallium +glib opengl openvg qt4 static-libs +svg xcb"
+IUSE="X aqua debug directfb doc drm gallium gles2 +glib legacy-drivers opengl openvg qt4 static-libs +svg valgrind xcb xlib-xcb"
 
 # Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it
 RESTRICT="test"
@@ -29,8 +29,9 @@ RDEPEND="media-libs/fontconfig
 	media-libs/freetype:2
 	media-libs/libpng:0=
 	sys-libs/zlib
-	>=x11-libs/pixman-0.22.0
+	>=x11-libs/pixman-0.28.0
 	directfb? ( dev-libs/DirectFB )
+	gles2? ( media-libs/mesa[gles2] )
 	glib? ( >=dev-libs/glib-2.28.6:2 )
 	opengl? ( || ( media-libs/mesa[egl] media-libs/opengl-apple ) )
 	openvg? ( media-libs/mesa[openvg] )
@@ -68,10 +69,17 @@ DEPEND="${RDEPEND}
 REQUIRED_USE="
 	drm? ( X )
 	gallium? ( drm )
+	gles2? ( !opengl )
+	openvg ( || ( gles2 opengl ) )
+	xlib-xcb? ( xcb )
 "
 
 src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.8.8-interix.patch
+	use legacy-drivers && epatch "${FILESDIR}"/${PN}-1.10.0-buggy_gradients.patch
 	epatch "${FILESDIR}"/${PN}-respect-fontconfig.patch
+	epatch "${FILESDIR}"/${PN}-1.12.12-disable-test-suite.patch
+	epatch "${FILESDIR}"/${PN}-1.12.14-libpng16.patch
 	epatch_user
 
 	# Slightly messed build system YAY
@@ -89,31 +97,23 @@ src_prepare() {
 src_configure() {
 	local myopts
 
-	# SuperH doesn't have native atomics yet
-	use sh && myopts+=" --disable-atomic"
-
 	[[ ${CHOST} == *-interix* ]] && append-flags -D_REENTRANT
-	# http://bugs.freedesktop.org/show_bug.cgi?id=15463
-	[[ ${CHOST} == *-solaris* ]] && append-flags -D_POSIX_PTHREAD_SEMANTICS
-
-	#gets rid of fbmmx.c inlining warnings
-	append-flags -finline-limit=1200
-
-	use X && myopts+=" --enable-tee=yes"
 
 	use elibc_FreeBSD && myopts+=" --disable-symbol-lookup"
 
-	# --disable-valgrind:
-	#   valgrind code is busted as per upstream
 	econf \
 		--disable-dependency-tracking \
 		$(use_with X x) \
+		$(use_enable X tee) \
 		$(use_enable X xlib) \
 		$(use_enable X xlib-xrender) \
 		$(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 doc gtk-doc) \
 		$(use_enable openvg vg) \
@@ -121,15 +121,14 @@ src_configure() {
 		$(use_enable qt4 qt) \
 		$(use_enable static-libs static) \
 		$(use_enable svg) \
+		$(use_enable valgrind) \
 		$(use_enable xcb) \
 		$(use_enable xcb xcb-shm) \
-		$(use_enable drm) \
-		$(use_enable gallium) \
+		$(use_enable xlib-xcb) \
 		--enable-ft \
 		--enable-pdf \
 		--enable-png \
 		--enable-ps \
-		--disable-valgrind \
 		${myopts}
 }