After talking with yngwin, make x11 team primary maintainer, add myself as maintainer for multilib problems. Punt useless doc flag. Add 1.12.16-r2 for wrapped header.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

5 files changed, 71 insertions, 35 deletions

diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog
index 2c09d4c7893d..bc260b4fc329 100644
--- a/x11-libs/cairo/ChangeLog
+++ b/x11-libs/cairo/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-libs/cairo
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.370 2014/04/20 08:31:23 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.371 2014/04/20 17:55:37 tetromino Exp $
+
+*cairo-1.12.16-r2 (20 Apr 2014)
+
+  20 Apr 2014; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -cairo-1.12.16-r1.ebuild, +cairo-1.12.16-r2.ebuild, cairo-9999.ebuild,
+  metadata.xml:
+  After talking with yngwin, make x11 team primary maintainer, add myself as
+  maintainer for multilib problems. Punt useless doc flag. Add 1.12.16-r2 for
+  wrapped header.
 
   20 Apr 2014; Agostino Sarubbo <ago@gentoo.org> cairo-1.12.16.ebuild:
   Stable for amd64, wrt bug #500368
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index fcb308f6d51c..4e72a94f333d 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -17,25 +17,19 @@ DIST cairo-1.12.14.tar.xz 42132464 SHA256 96d0d1e3f9b74d2ca3469ff187c5e5f25649b1
 DIST cairo-1.12.16.tar.xz 35889824 SHA256 2505959eb3f1de3e1841023b61585bfd35684b9733c7b6a3643f4f4cbde6d846 SHA512 35389305ba0906e2e1beab92966650fc7d7f8f41231e355ea2bf8693a333946f0693c125d1c50681e12b7f2aff85ae1fdcf957f3d83bc7eaacd52569884c6b2f WHIRLPOOL 00c5e237ac67c2287f90f204456178dcd123126c42669fa63e3dc04fbf9b46d867c554b8f2ecaf803a2553c388661fda5efc4803d6c1f30d7d8fc75fff06cde0
 EBUILD cairo-1.10.2-r3.ebuild 4384 SHA256 94a459c7041fbc68bea702c37dee51b97923d161a12d2038a816d9efc4d847e3 SHA512 f51f7a7144fc7f43d10a91113bc677476b67602b06ea25b5e8125ae3b0fea2f435373a5b81ad7bcf19890cf9205906ee939a6c6678aca6f2fde78f62d12afb88 WHIRLPOOL 6946367a0e00f3d18494d2bc7c2393fe56c125dd102d254542c06f3f77c6536adae2a79dc4e31e8046006a889f7eb501ca7b93e36c8657edafe9a3680201e3b1
 EBUILD cairo-1.12.14-r4.ebuild 4232 SHA256 f83317c97cd971a6f2fa4901072dc7636463147731224dae79a883b2c3f44e03 SHA512 412b4a5faf0a6b4afdda3693352c38d922e764ff3dd75db1df5ebfd44647f213b4010f21586fbe2296dd382a152bb98dd4353a97b5f19d87c94aa2144bd058d0 WHIRLPOOL f47d638f92bb6647951ac21eebca5c3e576f2906ee35fc2d70242bbd91d35748c672ce3b7274723819eeaef1a2ba35e41078e14ca9aa980b56149373df052871
-EBUILD cairo-1.12.16-r1.ebuild 4976 SHA256 3897e58dde720b7944a6bb12e153f1c91feaab4e05436537dd1974a1bd6bcb40 SHA512 2a50b037289a9bee84bb1b7ff074545e1baa2e98a9b9fbffd18b583a9c96c66993d3319924a876ebc86960deb483562cf93bf77b0c0768b5bce311b1c3ce58b9 WHIRLPOOL 412195b0a1194baab8e0d4434fbc9babf67554f156d7e96e744d73312fc3dcddc39248d5b0e88d76139f084b12cc48f8a070c00e6a7ba69da31fbe4d06fdcf99
+EBUILD cairo-1.12.16-r2.ebuild 5356 SHA256 d0ce57f36f76385d07926b5094cad9d87f7c07d087e6a5ff2521225775ad1adb SHA512 3d93e13224c8d9f0b476e55a9e38f3d755ca8a37f874f1f2cf3cfccea51cd727ced84291152110ebb5abfbe171b531c7edab4241dd7883beafc9d621770e73ee WHIRLPOOL 250ecb2eea317be64e85e6254fa49a1440ad8aaad5f1fda97184d01cde5151d3d6d6bf173de5c55f2e00574e862b8f4066d509156b6e166f3b66a9e0c0ea9be3
 EBUILD cairo-1.12.16.ebuild 4156 SHA256 2467f8b13e26d0287226a2d6866fb48abfb4f8c44e6395155e6d62387d7d5a04 SHA512 edf6c4ce8dab8d226fb8fbba851edb38e53bbfe70b775c050f2a91f02a2c4c17fffae1491319c6e43066e05b9918b0565d66af9067851eba497388c312c724c8 WHIRLPOOL 3d2d8ddfa28adce55f0e177f5c6c18b455a95f335a6b817a48b8efef67186910d9306092ef703ac37a2105fea0c15af5b6faebb074f68ec354ac327e69736412
-EBUILD cairo-9999.ebuild 4739 SHA256 edb4fc450ca0284e5cea212b88b0ec60a2d27f145915b7aec9fdafb52c3a6b41 SHA512 3972592ce5bd4c704d00c37f6ead4267b5513de7b3b0245207b5957037578f4ce4e79f8d657c188588cf150682c3a7dea43348f6b123e79f67e9ce48d13a0a8e WHIRLPOOL 0aed3a3a6c99071a8e7b50bd07eebbbe7aba31675efbe8705597cb29fc0819143ea4431f6ae0c882099f3fb50b8a09d5da96c77f09fe1641d4c3d85d732bc6f1
-MISC ChangeLog 53945 SHA256 4148c7e1448895e06e95aa31bea8d3539c885815df5c81da9547b05ca3d3a5c0 SHA512 a237696afcaf38cd4e29038375aa2521a70686c3b6f7f14d49e35b36fbcb804a9cd0026b3f311d1ec22b7419a3dc95a8710b83db5758b02e3c198730fff3622e WHIRLPOOL 7ca65cc821bbfa16af2040a9dadbd20c58d628338b980aaa9c3121c7408bad9d3776af8fe11a50414420cec47d480934ca20b08cc6148708fb6b3d313172d995
-MISC metadata.xml 1120 SHA256 31293cbaa2aaea9ba9e6e1540b20f6e33506b3d961771bb7554be0e6eef28d7a SHA512 c7f719c398060751c7c78f175ec87a9c56872f6cc5764f1ae2248e554dd017d84880f861cd3e481697e2d368151f317240f9aed38b52f110a5dfe5de236ed10a WHIRLPOOL b1ba1fc5aa725ac69d0c62bbeab511601378d73be6b2134b3cb469261b36402552fa004e5f871d9c1d055e40d183a8ad46d9768b1f9e4dad3c344f8f00003210
+EBUILD cairo-9999.ebuild 5351 SHA256 20c8f211051b649bcffb2b3b39826a8d8e53014f610fce3853a9fe5a7a5551a9 SHA512 c41c5c738d27c9f78b638ee64b6957354b8bc424eff5b90c1e081248bc8b164fcd4123be09df5a5effb81679ca4a55f6bd4843e00a1a13bb0d6873576e8e115f WHIRLPOOL 5368da359e6ea12b2587ca3e456a964acde5ce774f548e676d9c36c890b127ac097246fd6a084309e2e3e2a70a792f9d9bae4781346249a8a928e6346684b5cd
+MISC ChangeLog 54306 SHA256 53d3d2c88197498677d43bf9aaa41ad4da62fd4b164048aeccd0f93390314583 SHA512 8858004a5ad2e43b0fc0e89001544d6cce8ddf6f0401979c1bdab2f65471856de545ad9d2d474203c98e1a4ce4bb6292df691f02a48f9fe1bc55a802f4188064 WHIRLPOOL d6b68417f4365b4b820f973c9e304a4f55a10fda6e179df0c0970c65e1378de0f342b79b0f8ad611800c0e53772ca52b17897429c854fe03878329c3c67c0479
+MISC metadata.xml 1338 SHA256 5455cce6045a00a5dfb043a09ddb0022d4bb7945980c5dd10766073fdbdf7bd6 SHA512 9b94bf199c3684a236c08a4519b140dd3b32c47776ecbd1d515906a49014d7a42effb58e1cc21d025d277c034e3f3ddc0810bd7c7e17c2c94c566cbfe5db6899 WHIRLPOOL 54669f5abec55dbe057e8f367d0b290a5e78de64cadb84c929f6111b3404a9e9380538112955661745ea2413f3769c96a0aed15fbc9385165292e9f2beb6d682
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTU4XcAAoJELp701BxlEWflacP/0Nwy5jz82Oc22Z5PvA1GFAO
-Y8qVg3KfTou1EVYlZxl24U3CfFyAin+jqJ/6CXbSWkQ5R4OqUd2jTn2yhtzj5OJD
-Y/6O+RlvxNsunXyHDw4S79pSVq6dBw0HsdsOEutfAGNe7qcDj52JAWQsMCneNE4A
-mHbYTJHu0wPJ2vOCXLvgUu9QQWz84w/tQN6sSzW7FOZYYXEDDnSW9usBEaHXoJqB
-U0Wf0n4GhEqAiwLc3kB7f/9+oyMfyTJ6CMyod0hM8UP/nYs9QTrcj8d31ApKrO8n
-sCbwROp/cipTZqCa+is7RwZFIxHvNe2iFUUf9HkEnUWVkIDz4k7l0bZshtf3UvtE
-MaXqi/BB2o1A669OCJHKmjqyqlBWeDrAsquVUMth4zlcZ880S6dX8X1rsNz0JjqY
-PTjgjiuPnchGi//HJmFToeoij4rvRQ1IX4RtdjZu1fJFz7TCOhzKg/r3ZXyhhSB6
-yazdCNQlm5BV2Nt+ycWNsN8+e4OrFBBsNQrzwsrqugtpLHbA6WpSfjlq1Gl8o+hx
-isw7VUSYNFh2g4y06fHnZIRYW/6VS1OLZQSDWWPC48CQ2Us8Fn0932n6w4yiPfCw
-loin1ElL0PDqujrBL1CodqyDtA3+MKG7mym9wXjV/Sdr3V9StQXsBb5DFXdJfa+E
-pTO7XZMzQek1VV+SJEb8
-=ncab
+iQEcBAEBCAAGBQJTVAnpAAoJEJ0WA1zPCt1hTPYIAKCBfxhMcZxgLhpaI9Xu56ye
+Ouyqkz84Jk7KsJwfA33K4NSNs1Csccna9vc83SoQ2TBkgQq4yL+8TH0tvImc3Oht
++TXKNUZoiyJyKS6+W/mM4mSYSwux56bqMUlLSTH3g2O9AyLMFB/jrBNN+KGok2vn
+6TKoyemnyQnpUFFjYdG4YgO5EEWyi2fLggWkBkHVFr6Fp2RCPBAqDpHa6mevzcAf
+XaCsrQYzKhcZDbIsSLux5EEhVns/5v0lSwf6f37Nf/NQzy5bzw4p/pfdRV3dgxo8
+U5LIkl4KjFciPDaxwFmiRH14OFJd82EvMfZAkZiYFhEuy7mHIxEtHid/epBRTCg=
+=SU5v
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/cairo/cairo-1.12.16-r1.ebuild b/x11-libs/cairo/cairo-1.12.16-r2.ebuild
index f0a8736d5c74..c706dd40f46a 100644
--- a/x11-libs/cairo/cairo-1.12.16-r1.ebuild
+++ b/x11-libs/cairo/cairo-1.12.16-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.12.16-r1.ebuild,v 1.3 2014/03/09 09:19:24 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.12.16-r2.ebuild,v 1.1 2014/04/20 17:55:37 tetromino Exp $
 
 EAPI=5
 
@@ -20,7 +20,9 @@ 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 gles2 +glib legacy-drivers opengl openvg qt4 static-libs +svg valgrind xcb xlib-xcb"
+IUSE="X aqua debug directfb drm gallium gles2 +glib legacy-drivers opengl openvg 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
 
 # Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it
 RESTRICT="test"
@@ -36,7 +38,7 @@ RDEPEND="dev-libs/lzo[${MULTILIB_USEDEP}]
 	glib? ( >=dev-libs/glib-2.28.6:2[${MULTILIB_USEDEP}] )
 	opengl? ( || ( media-libs/mesa[egl,${MULTILIB_USEDEP}] media-libs/opengl-apple ) )
 	openvg? ( media-libs/mesa[openvg,${MULTILIB_USEDEP}] )
-	qt4? ( >=dev-qt/qtgui-4.8:4[${MULTILIB_USEDEP}] )
+	qt4? ( >=dev-qt/qtgui-4.8:4 )
 	X? (
 		>=x11-libs/libXrender-0.6[${MULTILIB_USEDEP}]
 		x11-libs/libXext[${MULTILIB_USEDEP}]
@@ -56,10 +58,6 @@ RDEPEND="dev-libs/lzo[${MULTILIB_USEDEP}]
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	>=sys-devel/libtool-2
-	doc? (
-		>=dev-util/gtk-doc-1.6
-		~app-text/docbook-xml-dtd-4.2
-	)
 	X? (
 		x11-proto/renderproto[${MULTILIB_USEDEP}]
 		drm? (
@@ -67,6 +65,11 @@ DEPEND="${RDEPEND}
 			>=x11-proto/xextproto-7.1[${MULTILIB_USEDEP}]
 		)
 	)"
+#[[ ${PV} == *9999* ]] && DEPEND="${DEPEND}
+#	doc? (
+#		>=dev-util/gtk-doc-1.6
+#		~app-text/docbook-xml-dtd-4.2
+#	)"
 
 # drm module requires X
 # for gallium we need to enable drm
@@ -114,6 +117,13 @@ multilib_src_configure() {
 		myopts+=" --disable-directfb"
 	fi
 
+	# TODO: remove this (and add USE-dep) when qtgui is converted, bug #498010
+	if ! multilib_build_binaries; then
+		myopts+=" --disable-qt"
+	fi
+
+	# [[ ${PV} == *9999* ]] && myopts+=" $(use_enable doc gtk-doc)"
+
 	ECONF_SOURCE="${S}" \
 	econf \
 		--disable-dependency-tracking \
@@ -129,7 +139,6 @@ multilib_src_configure() {
 		$(use_enable gallium) \
 		$(use_enable gles2 glesv2) \
 		$(use_enable glib gobject) \
-		$(use_enable doc gtk-doc) \
 		$(use_enable openvg vg) \
 		$(use_enable opengl gl) \
 		$(use_enable qt4 qt) \
diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild
index 0b85d2ca74c2..a2775f0fa89d 100644
--- a/x11-libs/cairo/cairo-9999.ebuild
+++ b/x11-libs/cairo/cairo-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.37 2014/02/28 20:42:55 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild,v 1.38 2014/04/20 17:55:37 tetromino Exp $
 
 EAPI=5
 
@@ -20,7 +20,9 @@ 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 gles2 +glib legacy-drivers opengl openvg qt4 static-libs +svg valgrind xcb xlib-xcb"
+IUSE="X aqua debug directfb drm gallium gles2 +glib legacy-drivers opengl openvg 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
 
 # Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it
 RESTRICT="test"
@@ -30,13 +32,13 @@ RDEPEND="dev-libs/lzo[${MULTILIB_USEDEP}]
 	media-libs/freetype:2[${MULTILIB_USEDEP}]
 	media-libs/libpng:0=[${MULTILIB_USEDEP}]
 	sys-libs/zlib[${MULTILIB_USEDEP}]
-	>=x11-libs/pixman-0.28.0[${MULTILIB_USEDEP}]
+	>=x11-libs/pixman-0.30.0[${MULTILIB_USEDEP}]
 	directfb? ( dev-libs/DirectFB )
 	gles2? ( media-libs/mesa[gles2,${MULTILIB_USEDEP}] )
 	glib? ( >=dev-libs/glib-2.28.6:2[${MULTILIB_USEDEP}] )
 	opengl? ( || ( media-libs/mesa[egl,${MULTILIB_USEDEP}] media-libs/opengl-apple ) )
 	openvg? ( media-libs/mesa[openvg,${MULTILIB_USEDEP}] )
-	qt4? ( >=dev-qt/qtgui-4.8:4[${MULTILIB_USEDEP}] )
+	qt4? ( >=dev-qt/qtgui-4.8:4 )
 	X? (
 		>=x11-libs/libXrender-0.6[${MULTILIB_USEDEP}]
 		x11-libs/libXext[${MULTILIB_USEDEP}]
@@ -48,14 +50,14 @@ RDEPEND="dev-libs/lzo[${MULTILIB_USEDEP}]
 	)
 	xcb? (
 		x11-libs/libxcb[${MULTILIB_USEDEP}]
+	)
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-gtklibs-20131008-r1
+		!app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
 	)"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	>=sys-devel/libtool-2
-	doc? (
-		>=dev-util/gtk-doc-1.6
-		~app-text/docbook-xml-dtd-4.2
-	)
 	X? (
 		x11-proto/renderproto[${MULTILIB_USEDEP}]
 		drm? (
@@ -63,6 +65,11 @@ DEPEND="${RDEPEND}
 			>=x11-proto/xextproto-7.1[${MULTILIB_USEDEP}]
 		)
 	)"
+#[[ ${PV} == *9999* ]] && DEPEND="${DEPEND}
+#	doc? (
+#		>=dev-util/gtk-doc-1.6
+#		~app-text/docbook-xml-dtd-4.2
+#	)"
 
 # drm module requires X
 # for gallium we need to enable drm
@@ -74,6 +81,11 @@ REQUIRED_USE="
 	xlib-xcb? ( xcb )
 "
 
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/cairo/cairo-features.h
+	/usr/include/cairo/cairo-directfb.h
+)
+
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.8.8-interix.patch
 	use legacy-drivers && epatch "${FILESDIR}"/${PN}-1.10.0-buggy_gradients.patch
@@ -105,6 +117,13 @@ multilib_src_configure() {
 		myopts+=" --disable-directfb"
 	fi
 
+	# TODO: remove this (and add USE-dep) when qtgui is converted, bug #498010
+	if ! multilib_build_binaries; then
+		myopts+=" --disable-qt"
+	fi
+
+	# [[ ${PV} == *9999* ]] && myopts+=" $(use_enable doc gtk-doc)"
+
 	ECONF_SOURCE="${S}" \
 	econf \
 		--disable-dependency-tracking \
@@ -120,7 +139,6 @@ multilib_src_configure() {
 		$(use_enable gallium) \
 		$(use_enable gles2 glesv2) \
 		$(use_enable glib gobject) \
-		$(use_enable doc gtk-doc) \
 		$(use_enable openvg vg) \
 		$(use_enable opengl gl) \
 		$(use_enable qt4 qt) \
diff --git a/x11-libs/cairo/metadata.xml b/x11-libs/cairo/metadata.xml
index 595897093b4a..12421b389acd 100644
--- a/x11-libs/cairo/metadata.xml
+++ b/x11-libs/cairo/metadata.xml
@@ -5,6 +5,12 @@
   <maintainer>
     <email>yngwin@gentoo.org</email>
     <name>Ben de Groot</name>
+	<description>Secondary maintainer (x11 team is primary)</description>
+  </maintainer>
+  <maintainer>
+	<email>tetromino@gentoo.org</email>
+	<name>Alexandre Rostovtsev</name>
+	<description>Multilib issues</description>
   </maintainer>
   <use>
     <flag name="opengl" restrict="&gt;=x11-libs/cairo-1.10.0">