Fix bugs #369593, #410213, #416507

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

7 files changed, 414 insertions, 4 deletions

diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog
index b1bae4b7ba0f..e8ed01f0a7e1 100644
--- a/x11-libs/cairo/ChangeLog
+++ b/x11-libs/cairo/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-libs/cairo
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.302 2012/07/24 14:12:30 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.303 2012/07/25 08:44:33 yngwin Exp $
+
+*cairo-1.10.2-r3 (25 Jul 2012)
+*cairo-1.12.2-r2 (25 Jul 2012)
+
+  25 Jul 2012; Ben de Groot <yngwin@gentoo.org> +cairo-1.10.2-r3.ebuild,
+  +cairo-1.12.2-r2.ebuild, +files/cairo-1.10.2-export-symbols.patch,
+  +files/cairo-1.10.2-ubuntu.patch, cairo-9999.ebuild:
+  Fix bugs #369593, #410213, #416507
 
   24 Jul 2012; Ben de Groot <yngwin@gentoo.org> cairo-1.10.2-r2.ebuild,
   cairo-1.12.2-r1.ebuild:
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index f57aa7c9b2f8..07ae75309a3e 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -1,6 +1,8 @@
 AUX cairo-1.10.0-buggy_gradients.patch 581 SHA256 3b622bb250b996ea5f5adc5c899af343e0efba5c477fa0e51fdbb720a8dd1b18 SHA512 c602992dd962586f9de09d2a838f828901845a02ba7afa1bc0cb434393aa05e98f02dc2342299b0b09f7cfbabb0295a22874023b68e1312982df2b71e3030442 WHIRLPOOL 55c72b55b1d378653204e1c8e0db463d12254ffa7a52e5c4b86eca9b67607bdcbb545b1589fa9a6df781d230d17264c67a018cece4030aac90eda7c68c41f5ea
+AUX cairo-1.10.2-export-symbols.patch 2072 SHA256 31df610ff96a9d04b51e9636c8566bbe35112e5e012f585199bf883ee0924b3c SHA512 c74e670a4d2e372f37fe5b9e9c3b238bbd4eaae7ed98dc5e80efebfad243d777e0f09fd376761b082c2997848b08a88043c38f077408a4cfa7aacd941b54624f WHIRLPOOL 885e16165878e5c3817ff6ae07f2cf275a70721ebe903e51d9b9eb25f4790c5c9bb432516935427911e9417440f4a054dfb13da1d74f47ad998d88a44a271c92
 AUX cairo-1.10.2-interix.patch 1235 SHA256 d915d69e2eb96f6a4bef1de0c493ed9face7b5d6a79194ab9f2a7f3d85b799ea SHA512 fbc524c2f359b489dc337a2aa70fbfc21e4cea0e306d144f45f520875471a66b65cd7687730461bff16c47792a30d81ed2be48895e2809cc24996a2dc26c560e WHIRLPOOL d25a09cb9c53b553690e865385be90cd696ed6135734d4d2f3814bd30e386c5f0bff05e7cd4f34c737dd2db2e35f590023b4dd7a00e767abdad9acf60775d684
 AUX cairo-1.10.2-qt-surface.patch 2687 SHA256 fb96199ec7a4cf8527726be8d0333ed883183b56960832218eca1c9ef2e05dbd SHA512 1263f129f96ecf0277ba436cac0229b6245bed273594b2199d6b0f36711e323c966c43d9264e4cc8b69a299c8e9c1ec4af09ae2284bf5ca59a72486b31439c48 WHIRLPOOL 1ec6c56a6e1de3c838fb2dfa541e062e3f63630910a5609fe211bab8c8bbdb1968af021954020b4da208ba43cde18795e6114fccdd13ee0de2e0edd285d7996a
+AUX cairo-1.10.2-ubuntu.patch 1777 SHA256 150d5b9f7f842d574a6e10e579bc8f27ca7b2055af8e0dd455aa0832bc3f4dae SHA512 8d9144fe809c4135f0dbd271d580620da769e2f946386e345783cf2379db458ed5ef964785b66d70b4e44a007c85a9209c85366144ad057d3ac5b60ee80383bc WHIRLPOOL c0754ccdeacc91ee2d222a945d8787ae3379a2881c36d8f0f6c545262baeb8f9fc866dba657f5d706c0b658efd5834c06725c2b942473b8755af10662f8ec088
 AUX cairo-1.2.4-lcd-cleartype-like.diff 7244 SHA256 4926d20d2b6b5071a5bf9ee9a12a36fef69510ebebd717c1dab151fe650f173a SHA512 8f431963a0d952d44921087dc4f20ccf768f24e6fa892cd07b8f93f13778617dda7aa25a7624aa9d7477cbb8655353aa6499e6086131ea4a511593d0f91acee8 WHIRLPOOL 5f13bcc937451aeb72321c02340dca148568f725054b4e4ff4c01edb27c30b6b92ad415fdfcf12de3591c38cc529ae0369e8ca4a12dd2494fcebad2d4c39fa97
 AUX cairo-1.8.10-libpng14.patch 426 SHA256 b090f829d3b9fb69b83bfa094552335b8382988d60ce7e46558c4069b8bca532 SHA512 77f5558f0b740c09b5e2b8f603e0c10aca1289aea34eb9097e548bd8f9f67bdc72b7df01ae98a3f4398ddc1136a9b16cb31585fb8db22b32c8dbb75259f54fc5 WHIRLPOOL 29cc842601c1ac9b0f0455b34705301da22959f6c2cddff57b7468298d85babea5575d2796ca003d495df04a409a85cebd8dea1137311374cdc204f5c85f332a
 AUX cairo-1.8.8-interix.patch 619 SHA256 505be82a1a0b7f963cb49ff85ecf1fa1389a4e43621df76b91fc1529616b2299 SHA512 651b73124ee5b65e2735deefde36727122e9c513da134441be923fb875aedfd3dbd81de8652e3919f3fa04d1de13dee6ec28e4fcd687aaec427d3b0dd94ac703 WHIRLPOOL a1803cbd8f32a8e926a8af932e099c5275920e3e09f7a53ee49898823e81ee7a2533a4db8d2125f200fa409d98fb8e2cbdeb01f00f64b7ba64ba8dffb8487bc3
@@ -10,8 +12,10 @@ DIST cairo-1.12.2.tar.xz 42051584 SHA256 b786bc4a70542bcb09f2d9d13e5e6a0c86408cb
 DIST cairo-1.8-lcd_filter.patch.bz2 7067 SHA256 6965d46df45d8382d122170a0f1dfaeb25bd68adc998b42f62397123e5795d1d
 DIST cairo-1.8.10.tar.gz 7102657 SHA256 572bada15596ec8708392db1af8b93a1af75ca47690348154e2841f3a6f08439
 EBUILD cairo-1.10.2-r2.ebuild 4269 SHA256 f563b262de85b4666c67e7fddf46ceb81404d7d8752514700b29504b01ae6cb9 SHA512 01c96a748740629f1d8d68db07d7aeef7dbd87b7bc3b5877cb4cb07e813c3f0ace7e949bbd19d83f795540a1caebb8fe01b795bc414b610ba3e6caf1d42f55ad WHIRLPOOL d35d7a07f50b66c8bcf9ebcd02fccec4212278e1f39cc59891914945b2b668ebc4220c0fe814a5488c7e84dc3fa21c1c2429653cc2fe871a350892d4d256d09e
+EBUILD cairo-1.10.2-r3.ebuild 4394 SHA256 b311e00a61be445cd8ce7477d1b142bd0248697cba9c2c3c500137189f068b41 SHA512 ed1c5f02fc830eeec26427bc01c46e1f1e63f153c2d223f6303ac921b1371d0bba601f5b081e03ec0d28de8ea227d53069a52356aa9d18fa4111a07e71cae3b8 WHIRLPOOL 3d9816cdc1c2e8c92d547448f3b6083e8e66aba8f42c1e85f06ba59a822543c700306f25ff091069eb93ff9817430b32356c5fe12b12b390ba32d9b052c5bbdd
 EBUILD cairo-1.12.2-r1.ebuild 3821 SHA256 7c4e0eb7ea2396ad673fad6a18cbd7fb309d1847536dd98b800ad911daa48bbf SHA512 019e2284a676b439975add36cd098e6b1dd9006827e425c5e5e3c68aeea4060afdef0b53dadbd1d42e2e43affdbc4796d65ddb11373774cb531a121222e1aa42 WHIRLPOOL 44b355a777bedd8b487b3c1f002791d4d21a124215f9a29d793f6f6427c0d9fa07e4d25177df4133b2ae2cdca596ceab0136c3161120fc99f53f173c2901a824
+EBUILD cairo-1.12.2-r2.ebuild 3794 SHA256 99cbfcfee84961942439642b61eeb213df6782d13dc583640d4cacc39df9ee30 SHA512 2dde521a5a5c20b8a657a690cd2bf52370d57147a6725b51a3aafdec86df623a81cc2737baa8cbc775b24e2f24607c0f0150aced5732a3f9bd133b027c8cee09 WHIRLPOOL b6c2e9bd425c276bfe7d15a393fbf0b1a26ca819c94916bec7e9ec630e0b9e492939d83dc618cd569ef804318faf020d6536060c2393a7fe55183335625fd82b
 EBUILD cairo-1.8.10.ebuild 3440 SHA256 41ef25a612af32eb6e7654e3f669f0f4030942bd84eb2db4da38278cb564794f SHA512 fecfac9a9766877355eae58566fc162e6b927f81ffd34e946904de0ea60fb207c55e1f9f4b4735fc09d59e914fd096861ecaf3859a88a57f2dd53bff8c8cfb86 WHIRLPOOL 1d3e24e04238260d090c3de9d8dc60b21d93fba9363ac94633c5220e0169aeebf02eb0f7152690ae276c928bea0ba4783a3ebf2809882362c6a5bd53aeef37fa
-EBUILD cairo-9999.ebuild 3699 SHA256 81ab1ca237dd1870ec18b637af658d7f2715bfd49fae9ba5b98cab4f4102de60 SHA512 2e9a13d950e8dbf837a0a209661f9c3497ce75d54d17750c200c77f86e10acf6a48dd9aac3d47f8ba7feb7fbe66d51eafdc618fbc0cc11944c9c00c09539aa3c WHIRLPOOL 8a1187a88f3d78fca2964a26bb6c2fc766f28e4727524991245e5c10a9725ebd5ca67194c32fc5372963c5b932ab2bc2af42876de8f1d0a222097372fe66189a
-MISC ChangeLog 43162 SHA256 195507cb67a8b593514df9956b35c018ae831c6ade6379d88eaca8165fe0df2c SHA512 5d79f2d11829f14ffdd4eee857f60231f58ef881cb7337a39120abc67ddd8d35c61172936e1aff003abde72fea8f0bbea26f1bd42b984fa1d107741b6865749e WHIRLPOOL 37ea3cc6283fb83b9918c5ce04b7b328eaccb447724e39e0ca7c5627abe0fe79d5a33ff9adecf0bb0486937d79d1fcc5b197c7f1eac2a4f5c3591d2a440a5cb6
+EBUILD cairo-9999.ebuild 3817 SHA256 d9048b6251f2749a71a804d9a54cd985dc22aa175efc859eeec1c6dbe6a17f1c SHA512 fad64130fd5dec7b8c6bc92681b8432ac66f90eb162e96ba4bf91aac2da0abd18ca4ae050b36876ad244694362fde49c4ac7b70d501626979386468740921906 WHIRLPOOL b2aa186b014782aa973859f7a611b98f83f92db67d5ec8896cada468b5b43110db34f9c653747e3bb08ec7bdac6e502341fd85e7c16466b1fd3ea4647ecbcc1e
+MISC ChangeLog 43460 SHA256 9e46f36e51c887808893f70a73fe885aa990c856a26cd41adb9834ee5c542ede SHA512 d726ff439745ab486a84817a760b1e84d8ce887999b0173d36336057aa5c76e0cec04f2ec5e5911e5d032bc3e8ba846546362278e9512198e11745ce0dc7ba63 WHIRLPOOL 6c331fb5493ffeba2d2c0aea6b4693eb710712c0d9eacf208708408b000af38b4c1f6d842920f3df19f604d693eb84f5b9fe5ad0be2b69a6b02e06b663ef4cdc
 MISC metadata.xml 958 SHA256 34cc9c511683c03054b582ff5ce62e1a75a79cc472d83ff37f20e4d0d352064c SHA512 c541701c99a94d60f5dd22f27160ede89781411641c5772ba94fd24566b95ffc56bf90d06586d8038b4c1445f896cc295a7a03f27bc2e0e6fc9f489be678ef23 WHIRLPOOL c96181f0119d73c0084fd659d6aa3a9dd2d8ac3194d35efd23bf46e8e9f3d7aa00b11130c736f2578cfe20695fd41254dad03002db28ec6337ba57ada4aee2b3
diff --git a/x11-libs/cairo/cairo-1.10.2-r3.ebuild b/x11-libs/cairo/cairo-1.10.2-r3.ebuild
new file mode 100644
index 000000000000..ac52926f3a15
--- /dev/null
+++ b/x11-libs/cairo/cairo-1.10.2-r3.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.10.2-r3.ebuild,v 1.1 2012/07/25 08:44:33 yngwin Exp $
+
+EAPI=3
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/cairo"
+[[ ${PV} == *9999 ]] && GIT_ECLASS="git"
+
+inherit eutils flag-o-matic autotools ${GIT_ECLASS}
+
+DESCRIPTION="A vector graphics library with cross-device output support"
+HOMEPAGE="http://cairographics.org/"
+[[ ${PV} == *9999 ]] || 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 ~amd64-fbsd ~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="X aqua debug directfb doc drm gallium +glib opengl openvg qt4 static-libs +svg xcb"
+
+# Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it
+RESTRICT="test"
+
+RDEPEND="media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/libpng:0
+	sys-libs/zlib
+	>=x11-libs/pixman-0.18.4
+	directfb? ( dev-libs/DirectFB )
+	glib? ( dev-libs/glib:2 )
+	opengl? ( || ( media-libs/mesa[egl] media-libs/opengl-apple ) )
+	openvg? ( media-libs/mesa[gallium] )
+	qt4? ( >=x11-libs/qt-gui-4.8:4 )
+	X? (
+		>=x11-libs/libXrender-0.6
+		x11-libs/libX11
+		drm? (
+			>=sys-fs/udev-136
+			gallium? ( media-libs/mesa[gallium] )
+		)
+	)
+	xcb? (
+		x11-libs/libxcb
+		x11-libs/xcb-util
+	)"
+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
+		drm? (
+			x11-proto/xproto
+			>=x11-proto/xextproto-7.1
+		)
+	)"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.8.8-interix.patch
+	epatch "${FILESDIR}"/${PN}-1.10.0-buggy_gradients.patch
+	epatch "${FILESDIR}"/${P}-interix.patch
+	epatch "${FILESDIR}"/${P}-qt-surface.patch
+	epatch "${FILESDIR}"/${P}-export-symbols.patch
+	epatch "${FILESDIR}"/${P}-ubuntu.patch
+	epatch "${FILESDIR}"/${PN}-respect-fontconfig.patch
+	epatch_user
+
+	# Slightly messed build system YAY
+	if [[ ${PV} == *9999* ]]; then
+		touch boilerplate/Makefile.am.features
+		touch src/Makefile.am.features
+		touch ChangeLog
+	fi
+
+	# We need to run elibtoolize to ensure correct so versioning on FreeBSD
+	# upgraded to an eautoreconf for the above interix patch.
+	eautoreconf
+}
+
+src_configure() {
+	local myopts
+
+	# SuperH doesn't have native atomics yet
+	use sh && myopts+=" --disable-atomic"
+
+	[[ ${CHOST} == *-interix* ]] && append-flags -D_REENTRANT
+
+	# tracing fails to compile, because Solaris' libelf doesn't do large files
+	[[ ${CHOST} == *-solaris* ]] && myopts+=" --disable-trace"
+
+	# 128-bits long arithemetic functions are missing
+	[[ ${CHOST} == powerpc*-*-darwin* ]] && filter-flags -mcpu=*
+
+	#gets rid of fbmmx.c inlining warnings
+	append-flags -finline-limit=1200
+
+	if use X; then
+		myopts+="
+			--enable-tee=yes
+			$(use_enable drm)
+		"
+
+		if use drm; then
+			myopts+="
+				$(use_enable gallium)
+				$(use_enable xcb xcb-drm)
+			"
+		else
+			use gallium && ewarn "Gallium use requires drm use enabled. So disabling for now."
+			myopts+="
+				--disable-gallium
+				--disable-xcb-drm
+			"
+		fi
+	else
+		use drm && ewarn "drm use requires X use enabled. So disabling for now."
+		myopts+="
+			--disable-drm
+			--disable-gallium
+			--disable-xcb-drm
+		"
+	fi
+
+	use elibc_FreeBSD && myopts+=" --disable-symbol-lookup"
+
+	# --disable-xcb-lib:
+	#	do not override good xlib backed by hardforcing rendering over xcb
+	econf \
+		--disable-dependency-tracking \
+		$(use_with X x) \
+		$(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 directfb) \
+		$(use_enable glib gobject) \
+		$(use_enable doc gtk-doc) \
+		$(use_enable openvg vg) \
+		$(use_enable opengl gl) \
+		$(use_enable qt4 qt) \
+		$(use_enable static-libs static) \
+		$(use_enable svg) \
+		$(use_enable xcb) \
+		$(use_enable xcb xcb-shm) \
+		--enable-ft \
+		--enable-pdf \
+		--enable-png \
+		--enable-ps \
+		--disable-xlib-xcb \
+		${myopts}
+}
+
+src_install() {
+	# parallel make install fails
+	emake -j1 DESTDIR="${D}" install || die
+	find "${ED}" -name '*.la' -exec rm -f {} +
+	dodoc AUTHORS ChangeLog NEWS README || die
+}
diff --git a/x11-libs/cairo/cairo-1.12.2-r2.ebuild b/x11-libs/cairo/cairo-1.12.2-r2.ebuild
new file mode 100644
index 000000000000..caa7a64f8cd7
--- /dev/null
+++ b/x11-libs/cairo/cairo-1.12.2-r2.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.12.2-r2.ebuild,v 1.1 2012/07/25 08:44:33 yngwin Exp $
+
+EAPI=4
+
+inherit eutils flag-o-matic autotools
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-2
+	EGIT_REPO_URI="git://anongit.freedesktop.org/git/cairo"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="http://cairographics.org/releases/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+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"
+
+# Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it
+RESTRICT="test"
+
+RDEPEND="media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/libpng:0
+	sys-libs/zlib
+	>=x11-libs/pixman-0.18.4
+	directfb? ( dev-libs/DirectFB )
+	glib? ( >=dev-libs/glib-2.28.6:2 )
+	opengl? ( || ( media-libs/mesa[egl] media-libs/opengl-apple ) )
+	openvg? ( media-libs/mesa[openvg] )
+	qt4? ( >=x11-libs/qt-gui-4.8:4 )
+	X? (
+		>=x11-libs/libXrender-0.6
+		x11-libs/libX11
+		drm? (
+			>=sys-fs/udev-136
+			gallium? ( media-libs/mesa[gallium] )
+		)
+	)
+	xcb? (
+		x11-libs/libxcb
+		x11-libs/xcb-util
+	)"
+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
+		drm? (
+			x11-proto/xproto
+			>=x11-proto/xextproto-7.1
+		)
+	)"
+
+# drm module requires X
+# for gallium we need to enable drm
+REQUIRED_USE="
+	drm? ( X )
+	gallium? ( drm )
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.8.8-interix.patch
+	epatch "${FILESDIR}"/${PN}-1.10.2-qt-surface.patch
+	epatch "${FILESDIR}"/${PN}-respect-fontconfig.patch
+	epatch_user
+
+	# Slightly messed build system YAY
+	if [[ ${PV} == *9999* ]]; then
+		touch boilerplate/Makefile.am.features
+		touch src/Makefile.am.features
+		touch ChangeLog
+	fi
+
+	# We need to run elibtoolize to ensure correct so versioning on FreeBSD
+	# upgraded to an eautoreconf for the above interix patch.
+	eautoreconf
+}
+
+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-xcb-lib:
+	#	do not override good xlib backed by hardforcing rendering over xcb
+	econf \
+		--disable-dependency-tracking \
+		$(use_with X x) \
+		$(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 directfb) \
+		$(use_enable glib gobject) \
+		$(use_enable doc gtk-doc) \
+		$(use_enable openvg vg) \
+		$(use_enable opengl gl) \
+		$(use_enable qt4 qt) \
+		$(use_enable static-libs static) \
+		$(use_enable svg) \
+		$(use_enable xcb) \
+		$(use_enable xcb xcb-shm) \
+		$(use_enable drm) \
+		$(use_enable gallium) \
+		--enable-ft \
+		--enable-pdf \
+		--enable-png \
+		--enable-ps \
+		--disable-xlib-xcb \
+		${myopts}
+}
+
+src_install() {
+	# parallel make install fails
+	emake -j1 DESTDIR="${D}" install
+	find "${ED}" -name '*.la' -exec rm -f {} +
+	dodoc AUTHORS ChangeLog NEWS README
+}
diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild
index 697f2c0d95e4..68f51fd9d5db 100644
--- a/x11-libs/cairo/cairo-9999.ebuild
+++ b/x11-libs/cairo/cairo-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.20 2012/07/14 20:01:53 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild,v 1.21 2012/07/25 08:44:33 yngwin Exp $
 
 EAPI=4
 
@@ -74,6 +74,9 @@ REQUIRED_USE="
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.8.8-interix.patch
+	epatch "${FILESDIR}"/${PN}-1.10.2-qt-surface.patch
+	epatch "${FILESDIR}"/${PN}-respect-fontconfig.patch
+	epatch_user
 
 	# Slightly messed build system YAY
 	if [[ ${PV} == *9999* ]]; then
diff --git a/x11-libs/cairo/files/cairo-1.10.2-export-symbols.patch b/x11-libs/cairo/files/cairo-1.10.2-export-symbols.patch
new file mode 100644
index 000000000000..5f1c2d484ebf
--- /dev/null
+++ b/x11-libs/cairo/files/cairo-1.10.2-export-symbols.patch
@@ -0,0 +1,38 @@
+Index: cairo/src/Makefile.am
+===================================================================
+--- cairo.orig/src/Makefile.am	2011-02-08 10:11:46.879538772 +0100
++++ cairo/src/Makefile.am	2011-02-08 10:12:36.381915666 +0100
+@@ -46,7 +46,7 @@
+ 	$(enabled_cairo_private) \
+ 	$(enabled_cairo_sources) \
+ 	$(NULL)
+-libcairo_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(CAIRO_LIBTOOL_VERSION_INFO) -no-undefined $(export_symbols)
++libcairo_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(CAIRO_LIBTOOL_VERSION_INFO) -no-undefined $(export_symbols) -export-symbols-regex \^cairo_.*
+ libcairo_la_LIBADD = $(CAIRO_LIBS) \
+ 	$(cairo_cxx_lib)
+ libcairo_la_DEPENDENCIES = $(cairo_def_dependency) $(cairo_cxx_lib)
+diff --git a/util/cairo-gobject/Makefile.am b/util/cairo-gobject/Makefile.am
+index 22c1a27..5a15950 100644
+--- a/util/cairo-gobject/Makefile.am
++++ b/util/cairo-gobject/Makefile.am
+@@ -10,6 +10,6 @@ libcairo_gobject_la_SOURCES = \
+ 	$(NULL)
+ 
+ libcairo_gobject_la_CFLAGS = $(CAIRO_CFLAGS) $(GOBJECT_CFLAGS)
+-libcairo_gobject_la_LDFLAGS = -version-info $(CAIRO_LIBTOOL_VERSION_INFO) -no-undefined $(export_symbols)
++libcairo_gobject_la_LDFLAGS = -version-info $(CAIRO_LIBTOOL_VERSION_INFO) -no-undefined $(export_symbols) -export-symbols-regex \^cairo_.*
+ libcairo_gobject_la_LIBADD = $(top_builddir)/src/libcairo.la $(CAIRO_LIBS) $(GOBJECT_LIBS)
+ 
+diff --git a/util/cairo-script/Makefile.am b/util/cairo-script/Makefile.am
+index d7e4427..8d4181b 100644
+--- a/util/cairo-script/Makefile.am
++++ b/util/cairo-script/Makefile.am
+@@ -18,7 +18,7 @@ libcairo_script_interpreter_la_SOURCES = \
+ 	cairo-script-stack.c \
+ 	$(NULL)
+ libcairo_script_interpreter_la_CFLAGS = $(CAIRO_CFLAGS)
+-libcairo_script_interpreter_la_LDFLAGS = -version-info $(CAIRO_LIBTOOL_VERSION_INFO) -no-undefined $(export_symbols)
++libcairo_script_interpreter_la_LDFLAGS = -version-info $(CAIRO_LIBTOOL_VERSION_INFO) -no-undefined $(export_symbols) -export-symbols-regex \^cairo_.*
+ libcairo_script_interpreter_la_LIBADD = $(top_builddir)/src/libcairo.la $(CAIRO_LIBS) -lz
+ 
+ csi_replay_SOURCES = csi-replay.c
diff --git a/x11-libs/cairo/files/cairo-1.10.2-ubuntu.patch b/x11-libs/cairo/files/cairo-1.10.2-ubuntu.patch
new file mode 100644
index 000000000000..751bbd47ea4e
--- /dev/null
+++ b/x11-libs/cairo/files/cairo-1.10.2-ubuntu.patch
@@ -0,0 +1,53 @@
+--- cairo.orig/build/configure.ac.features	2010-12-28 14:41:21.487225155 +0100
++++ cairo/build/configure.ac.features	2010-12-28 14:42:06.166239606 +0100
+@@ -407,6 +407,7 @@
+ 	echo "The following features and utilities:"
+ 	echo "  cairo-trace:                $use_trace"
+ 	echo "  cairo-script-interpreter:   $use_interpreter"
++	echo "  cairo-perf-utils:           $use_perf_utils"
+ 	echo ""
+ 	echo "And the following internal features:"
+ 	echo "  pthread:       $use_pthread"
+--- cairo.orig/configure.ac	2010-12-28 14:43:02.291226995 +0100
++++ cairo/configure.ac	2010-12-28 14:43:18.191141863 +0100
+@@ -10,6 +10,7 @@
+ AC_CONFIG_SRCDIR(src/cairo.h)
+ AC_CONFIG_HEADERS(config.h)
+ AM_INIT_AUTOMAKE([1.9.6 gnu -Wall no-define])
++AM_MAINTAINER_MODE
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+ AC_LIBTOOL_WIN32_DLL dnl Must be called before AC_PROG_LIBTOOL
+ AC_PROG_LIBTOOL dnl ([1.4]) Don't remove!
+@@ -796,6 +796,11 @@
+ PKG_CHECK_MODULES(gtk, "gtk+-2.0",have_gtk=yes, have_gtk=no)
+ AM_CONDITIONAL(HAVE_GTK, test "x$have_gtk" = "xyes")
+ 
++dnl ===========================================================================
++
++CAIRO_ENABLE(perf_utils, cairo-perf-utils, no, [use_perf_utils=yes])
++
++
+ AC_CONFIG_FILES([
+ Makefile
+ boilerplate/Makefile
+--- cairo.orig/perf/Makefile.am	2010-06-18 13:47:11.000000000 +0200
++++ cairo/perf/Makefile.am	2010-12-28 14:42:06.162226875 +0100
+@@ -10,6 +10,18 @@
+ 
+ AM_LDFLAGS = $(CAIRO_LDFLAGS)
+ 
++if CAIRO_HAS_PERF_UTILS
++bin_PROGRAMS = cairo-perf-micro \
++	cairo-perf-trace \
++	cairo-perf-diff-files \
++	cairo-perf-print \
++	cairo-perf-chart \
++	cairo-perf-compare-backends
++if HAVE_GTK
++bin_PROGRAMS += cairo-perf-graph-files
++endif
++endif
++
+ EXTRA_PROGRAMS += cairo-perf-micro \
+ 		  cairo-perf-trace \
+ 		  cairo-perf-diff-files \