x11-libs/cairo: Disable automagic dependency on valgrind

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

4 files changed, 163 insertions, 26 deletions

diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog
index 745103bc1323..767202f21faf 100644
--- a/x11-libs/cairo/ChangeLog
+++ b/x11-libs/cairo/ChangeLog
@@ -1,6 +1,12 @@
 # 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.328 2013/03/02 23:43:43 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.329 2013/03/11 22:46:15 remi Exp $
+
+*cairo-1.12.12-r1 (11 Mar 2013)
+
+  11 Mar 2013; Rémi Cardona <remi@gentoo.org> +cairo-1.12.12-r1.ebuild,
+  cairo-9999.ebuild:
+  Disable automagic dependency on valgrind.
 
   02 Mar 2013; Markos Chandras <hwoarang@gentoo.org> cairo-1.10.2-r3.ebuild,
   cairo-1.12.10-r2.ebuild, cairo-1.12.12.ebuild, cairo-1.12.8.ebuild,
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index a25cdc5ff2f6..83ed93374482 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 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
@@ -17,27 +14,10 @@ DIST cairo-1.12.12.tar.xz 42139096 SHA256 14f693759ecc87472355ae8f0c34731a8578b4
 DIST cairo-1.12.8.tar.xz 42113752 SHA256 8fbb6fc66117ab4100bad830cb4479497e53c6f3facb98bf05c8d298554ebdd9 SHA512 f6f6079ccae8353fa43a2af66b655516b33d6d94329c968795b727d049ac94a5e000b148d9318a294576df1d992e48eb17c2d37301461bd15d8c2e2fb042f41f WHIRLPOOL 9502505327000e5241e46256da6b92d7a6204a03baebecf963a92ca7bbf88cba7e998fa114a9f2003ee7a602bcd65f79a0967f9cc486d06d61d160a5748b52cd
 EBUILD cairo-1.10.2-r3.ebuild 4384 SHA256 94a459c7041fbc68bea702c37dee51b97923d161a12d2038a816d9efc4d847e3 SHA512 f51f7a7144fc7f43d10a91113bc677476b67602b06ea25b5e8125ae3b0fea2f435373a5b81ad7bcf19890cf9205906ee939a6c6678aca6f2fde78f62d12afb88 WHIRLPOOL 6946367a0e00f3d18494d2bc7c2393fe56c125dd102d254542c06f3f77c6536adae2a79dc4e31e8046006a889f7eb501ca7b93e36c8657edafe9a3680201e3b1
 EBUILD cairo-1.12.10-r2.ebuild 4006 SHA256 fc0d110d2e96939945e8da9dec9a1b5b45248c77c942604aefbbb753639aadac SHA512 71236c90519dcc7ad58b9ef0a4b9c13fe292f0274ab2fb17dab3e3f8711235057209639e5b81fd0d424823f5f4220ec08afa8194bed14954113e7cc905d34a10 WHIRLPOOL 333a67b3866b4802561710cbeb2a40e8bfa0552e02234b0f733ed3210d3bfdee9d2d3d376c4ad09627c67c12b6f26c0b1ad2849e31ee2f4dd74e8fbc193a7bec
+EBUILD cairo-1.12.12-r1.ebuild 4058 SHA256 5a01b2307a08d553987e84184e386711e6cdc0055fc24a17fce0f2c47333fec5 SHA512 fc6f0eb6ef47a65d53564d0bb36279f6044e75d6d10fa2db7e034afb9c458a60e8fb5b532222a4e6fecf1cac2b9f7fd7894817f73f6c100224e78c292a0a8632 WHIRLPOOL 227a44eac8a07228d7ea2d8103919411ae0c20d0761f75689508cbc041add9257da1942961637a28d51498912f4e4686dd899f34a700d82410774b8f13d34556
 EBUILD cairo-1.12.12.ebuild 3968 SHA256 900d0913347d1bf88ddc8078f2ced7b846bb966a995bedc3f31e1d59a1056783 SHA512 d2662fd117cf8c2880067f59d5692821a8913bbe821b30b17eb89f5e1628dc4fb92ee44ab489290e1611561bd86d466fa0561db11f2832c53b6a7900c0821fce WHIRLPOOL 9011c278a1f721e30fa8c0de99899b813e2cec2897c3c189591b9472f455ae925be1590b14780240947adccdd1f68c6d3d2973233823d1d6ce0459c8ff8e99ae
 EBUILD cairo-1.12.8.ebuild 3904 SHA256 4fe87359c63f2097c219ef1e701016516316ed05fcbb8160be940d9d9e0b7bb6 SHA512 8da56cca2a1f5348168102b4880489f5f4c9de843a5a08a035ebe3a0dab509f18ccce81eb00befedb9915070ca65c95539c32c7df7905ae08685a4c702cce53b WHIRLPOOL f7b95a469bb32c3d98989e59160c7b7fa8565625c12fe8bc64da301492f98f3e4f16741a2f8aed4a3bf4f517ab445913af0de79ee4c60f5f7684c91c7bfafe31
-EBUILD cairo-9999.ebuild 3914 SHA256 af783895ad5e8a55b1253591f1c872c40d0b75cd050d734382730d626b5df21a SHA512 782c5aa36c435d77bae90538fb5afc9fb88233951fc23f787dfb2d85c1ade3697e484cf5bcfe13426527b015cf82db7ef07200dd85f15857a8b87afa485b9b71 WHIRLPOOL 62aa1d6f5f6fd45081533f96c17c1c59bda6711df533046332248ad49f5148299abd9619a4d3487e4ca7f7f58aa92b27fe169448c60ef334254ab936362e721e
-MISC ChangeLog 48088 SHA256 3a86487f17d575a0372eec3aa37248d659fa3eb7d34ccb801979076fa2df424d SHA512 d62f2f193af39454bddebd86bb70ac48bde8e57d54586b74ba7cdd9b82f46e269ee7c68b6da2d950562e62bc8173e883101e7e482bfdc2108561ec728253a9de WHIRLPOOL 8a2ef67ce1a2c186c78d21e3acc58d16c5793f9ccfc22c9ab0e3b41f6fb61421d382fddc569ed467436b649b52f5828deb48bd38e47cfba80eb8bf1b67c5583d
+EBUILD cairo-9999.ebuild 4001 SHA256 e44d022edd09f8fe72398aafcf41dc907b49a65ef35dab56d436a4b064a31519 SHA512 ccadacbe0e051ac46ec1c9095838a1a6f3c689199eedc47656828541f5ca99feaf14cfeec39134b0c1faae4853c62937b36f12884caa0bb7fae79597b78dccec WHIRLPOOL 929b18e218b68970712feb785105608b6c6ed4e7d9898997746eada437f4927b70a1fe3ce773e293ac7d70566e7a79391c07afacfafb8a136970e2c8a47d7410
+MISC ChangeLog 48256 SHA256 120162b2538c8b1e92a9f1526812cfe4b749b09def60725f6e5c901758fda8ab SHA512 68203beed7960053f82a779ab3151c5906d30fd5116f617380cd720f2a5de9261b09c551ac6dad8f4790d386c051cc8c00b73b3d58990cb0a82770df2d4a0b3b WHIRLPOOL 56111516b72406a69c3f8db2ca877c90a59230ab5bb4229fb0d1f7965d49162037450beb96ed157044b0501acdd8e66d7e9f75700006671daaec3ef9cd9407d2
+MISC cairo-9999.ebuild.orig 3914 SHA256 af783895ad5e8a55b1253591f1c872c40d0b75cd050d734382730d626b5df21a SHA512 782c5aa36c435d77bae90538fb5afc9fb88233951fc23f787dfb2d85c1ade3697e484cf5bcfe13426527b015cf82db7ef07200dd85f15857a8b87afa485b9b71 WHIRLPOOL 62aa1d6f5f6fd45081533f96c17c1c59bda6711df533046332248ad49f5148299abd9619a4d3487e4ca7f7f58aa92b27fe169448c60ef334254ab936362e721e
 MISC metadata.xml 798 SHA256 f9797b2bdea41285e7b75db0f303570d00928b6135f40f869584e77c4dcdfeb1 SHA512 6cf758886d5711ec28d0f4e37f8c5fd863827c69c43930a3bc5755f397838f8a209dcc7f4652cd4d61a126bceb5565a60675ed7d941f49d67ef8a6e2b2b496e1 WHIRLPOOL 40b5b64a9933fa7facc9842409e0f4b4612d74bc940ccf6ec701da649af54507f95abf35820fe3d629e1c0cd15185c881a528e8e4a738375756a74936cb6cb46
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQJ8BAEBCABmBQJRMo6uXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88lRYP/2SiNYJNmdQDCdn9mk/qkZLr
-55UeCfX4gsZjjVZuz3I9CQczRsg0ivMiYJ/EPkJt8+QL6RssQtDJrMHvdETUsLMz
-6w03MMg09q+Q6WYfuQo+s2IPz2tHR69yjAfyGULSR4JWm1k1be4+nldp7jOIdvf3
-L6yxRQMNki7/MQbnX+eDFT+qb3qXS4JVnFpdxABbPK697YSNO7X0fYVnJxk3UjIL
-4/+YlF+R3cKb6OfVX+iRd8Gep0xSfJRjXCNoXnIitd+fOY3wO4JtuGnDSkl7tWX8
-PeY3Y24F3tQCyNfKE97njVp/y2R5Jo8sCQJSK+Ns8ATDw3QkGIvSXQPVvN5gkXjm
-R+lsn6uB60A7UOZSpGwTtDd2VuCylFH5GUiClcswGd7f0rYCE4szPYZ+SrVlHFoq
-T1ooEffo1QJAZ2dalbJEUr91JI1T4Hfn7UlakRVKVUPMuPHS4e0m+03jpbTeYGSJ
-gwCiOUxkP4K69MKc+JlHgsiBufrb9eyJwDIOg8qHwpnYGhdXOqbiReSGWZwS8E5y
-3cBthzhq6jLaUh2coDGAGv6Hb1MwE8QTPtyYrLROY4/M5OuuUJWr7nJfMeOGCFUT
-NPJkHjUFc/aMspz4+drwwDSlfShYEF0hlnyDAhGXviZN3SdhTiavEsHQj2Er4tuu
-F11F0j1bqeWIWpIg5hQa
-=RjmQ
------END PGP SIGNATURE-----
diff --git a/x11-libs/cairo/cairo-1.12.12-r1.ebuild b/x11-libs/cairo/cairo-1.12.12-r1.ebuild
new file mode 100644
index 000000000000..e1d5eee099c7
--- /dev/null
+++ b/x11-libs/cairo/cairo-1.12.12-r1.ebuild
@@ -0,0 +1,148 @@
+# 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-1.12.12-r1.ebuild,v 1.1 2013/03/11 22:46:15 remi Exp $
+
+EAPI=5
+
+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 ~arm-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 legacy-drivers 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.28.0
+	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? ( >=dev-qt/qtgui-4.8:4 )
+	X? (
+		>=x11-libs/libXrender-0.6
+		x11-libs/libXext
+		x11-libs/libX11
+		drm? (
+			>=virtual/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
+	use legacy-drivers && epatch "${FILESDIR}"/${PN}-1.10.0-buggy_gradients.patch
+	epatch "${FILESDIR}"/${PN}-1.10.2-qt-surface.patch
+	epatch "${FILESDIR}"/${PN}-respect-fontconfig.patch
+	epatch "${FILESDIR}"/${P}-disable-test-suite.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
+	# --disable-valgrind:
+	#   valgrind code is busted as per upstream
+	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 \
+		--disable-valgrind \
+		${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 ead1a874775a..a1bf6f007929 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.28 2013/03/02 23:43:43 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild,v 1.29 2013/03/11 22:46:15 remi Exp $
 
 EAPI=5
 
@@ -108,6 +108,8 @@ src_configure() {
 
 	# --disable-xcb-lib:
 	#	do not override good xlib backed by hardforcing rendering over xcb
+	# --disable-valgrind:
+	#   valgrind code is busted as per upstream
 	econf \
 		--disable-dependency-tracking \
 		$(use_with X x) \
@@ -133,6 +135,7 @@ src_configure() {
 		--enable-png \
 		--enable-ps \
 		--disable-xlib-xcb \
+		--disable-valgrind \
 		${myopts}
 }