Version bump, bug #401377. Adjust openvg dependency.

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

4 files changed, 150 insertions, 6 deletions

diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog
index f67162ac8fa4..3534efd8601b 100644
--- a/x11-libs/cairo/ChangeLog
+++ b/x11-libs/cairo/ChangeLog
@@ -1,6 +1,12 @@
 # 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.285 2012/01/29 15:53:24 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.286 2012/03/24 23:15:52 chithanh Exp $
+
+*cairo-1.12.0 (24 Mar 2012)
+
+  24 Mar 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +cairo-1.12.0.ebuild, cairo-9999.ebuild:
+  Version bump, bug #401377. Adjust openvg dependency.
 
 *cairo-1.10.2-r2 (29 Jan 2012)
 
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index a9a1589218ca..49a23cabc41e 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -5,11 +5,13 @@ AUX cairo-1.2.4-lcd-cleartype-like.diff 7244 RMD160 e50d5bf17cbead688a8b808a78fe
 AUX cairo-1.8.10-libpng14.patch 426 RMD160 f97e4f2d1e65e2c6a90c5fddbce66caeb4337bba SHA1 bb029f710432af7b24175aa941fc7cd3187ef767 SHA256 b090f829d3b9fb69b83bfa094552335b8382988d60ce7e46558c4069b8bca532
 AUX cairo-1.8.8-interix.patch 619 RMD160 9bb28c5a88aa1f2776d32ac7020aef4ba93872b5 SHA1 857a4d2be0118a6d2d0d80388b5963a5f768341d SHA256 505be82a1a0b7f963cb49ff85ecf1fa1389a4e43621df76b91fc1529616b2299
 DIST cairo-1.10.2.tar.gz 23558405 RMD160 8c8de00120398fe2b3a60a08ff59a464b2eebf47 SHA1 ccce5ae03f99c505db97c286a0c9a90a926d3c6e SHA256 32018c7998358eebc2ad578ff8d8559d34fc80252095f110a572ed23d989fc41
+DIST cairo-1.12.0.tar.gz 63084508 RMD160 043641375a4e41dd303fc9c496f0a3c352c5fd84 SHA1 63e0d1372a7919956b6d959709dfdf35d3cecc02 SHA256 af65b766dff11bcf3cba1f92d92a1bc28f78dc2944908a5930a026af06510099
 DIST cairo-1.8-lcd_filter.patch.bz2 7067 RMD160 5c2ee470022788df88425da24cebea3baed69298 SHA1 9202c14967a633a9e57dd203695896d0197fea8b SHA256 6965d46df45d8382d122170a0f1dfaeb25bd68adc998b42f62397123e5795d1d
 DIST cairo-1.8.10.tar.gz 7102657 RMD160 9538baf30f812b950beeb93893f46d1223fb44ce SHA1 fd5e8ca82ff0e8542ea4c51612cad387f2a49df3 SHA256 572bada15596ec8708392db1af8b93a1af75ca47690348154e2841f3a6f08439
 EBUILD cairo-1.10.2-r1.ebuild 4143 RMD160 a133b34322130bcc37bf24dcc47d4d0f2ee53586 SHA1 df64a3fe568a9c799927af4c47846bf4e833461c SHA256 0d23e478717f6221da9ede8781815e6d4c95520ecf514d2aba62c076b4238278
 EBUILD cairo-1.10.2-r2.ebuild 4197 RMD160 3fd25943fc8b1405ff243d00e532c22da79bf267 SHA1 9ce860a71fd906ce07f8b0fb7c378055dc8acb06 SHA256 64959f442d5a8578d86dc1ab3a981cca2e61bbdf44c7d8424cdc08d64cada514
+EBUILD cairo-1.12.0.ebuild 3633 RMD160 5a1cf1fa63432f5fb4200ef374b7d8feb507da99 SHA1 491d8411143088466ffa775f4887aad587112980 SHA256 6470790059b3f0725582461b44dd4bcd6d9fb295808c9b6eb4c9dbf14b9086c1
 EBUILD cairo-1.8.10.ebuild 3451 RMD160 c9205d9e45a024a67c3a7acb247a4f6feb21f4e2 SHA1 84ca8d3e011c476dc899e7f850d6885277643d15 SHA256 0fd58c9f5c9255f94864d9b137d6b4d940281d088a2f4f498a6b1495daca438c
-EBUILD cairo-9999.ebuild 3631 RMD160 ac3d210f7bd2ec6f74762bfd76ae5a0adad5474e SHA1 46ca6078237a8e1396d3ec15665b0b42554224db SHA256 f5ab90012d7fd824c4e22b9487f42e5711b8f07f074f8c0f0a260d5c14f14d2f
-MISC ChangeLog 40171 RMD160 896ee9748775453f90d856de533af0d7f143e00c SHA1 9b76d51e5baaee4aa4ca1ad4538a78bbc51413b5 SHA256 1bb3ecd93c86b03b9936e0a4ccb172fbd9462533195c7a0ffd624d8f102b95e7
+EBUILD cairo-9999.ebuild 3632 RMD160 32c778d80a83aa6ee95bbcadf2b4c0112cc05ac1 SHA1 2b74bbd9552e1f04df62579b3248a3c84515533b SHA256 204233a0fea3e83a6f34a00b1b711a5f9ce9af82dcb63840e465ed2c7670c77c
+MISC ChangeLog 40371 RMD160 393e0728ddb9033b2f30e1b6c0f30e4768323c14 SHA1 6ec0cd1a60dda44a4870da781c5cb08d7decc64e SHA256 0c3b9ff0d3b4d4871baba56b5f3e17fa4369ec87959dc309ce8bf5968599b723
 MISC metadata.xml 906 RMD160 0d5e3683121af2714405b458c8e8ab9ebffabbc0 SHA1 1825ccbb326c9d4f322e2f85de6430b95f90973f SHA256 1bb2bb12ba48c4dd28c601ff9bbee63faff51d44ebee86a32268cd7f6dac3776
diff --git a/x11-libs/cairo/cairo-1.12.0.ebuild b/x11-libs/cairo/cairo-1.12.0.ebuild
new file mode 100644
index 000000000000..994f99626292
--- /dev/null
+++ b/x11-libs/cairo/cairo-1.12.0.ebuild
@@ -0,0 +1,136 @@
+# 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.0.ebuild,v 1.1 2012/03/24 23:15:52 chithanh Exp $
+
+EAPI=4
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/cairo"
+[[ ${PV} == *9999 ]] && GIT_ECLASS="git-2"
+
+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 ~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.28.6:2 )
+	opengl? ( virtual/opengl )
+	openvg? ( media-libs/mesa[openvg] )
+	qt4? ( >=x11-libs/qt-gui-4.4:4 )
+	svg? ( dev-libs/libxml2 )
+	X? (
+		>=x11-libs/libXrender-0.6
+		x11-libs/libXext
+		x11-libs/libX11
+		x11-libs/libXft
+		drm? (
+			>=sys-fs/udev-136
+			gallium? ( media-libs/mesa[gallium] )
+		)
+	)
+	xcb? (
+		x11-libs/libxcb
+		x11-libs/xcb-util
+	)"
+DEPEND="${RDEPEND}
+	dev-util/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
+
+	# 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"
+
+	# --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 9edef51bc27b..d84890d29e01 100644
--- a/x11-libs/cairo/cairo-9999.ebuild
+++ b/x11-libs/cairo/cairo-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.15 2011/08/14 06:48:39 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild,v 1.16 2012/03/24 23:15:52 chithanh Exp $
 
 EAPI=4
 
@@ -29,7 +29,7 @@ RDEPEND="media-libs/fontconfig
 	directfb? ( dev-libs/DirectFB )
 	glib? ( >=dev-libs/glib-2.28.6:2 )
 	opengl? ( virtual/opengl )
-	openvg? ( media-libs/mesa[gallium] )
+	openvg? ( media-libs/mesa[openvg] )
 	qt4? ( >=x11-libs/qt-gui-4.4:4 )
 	svg? ( dev-libs/libxml2 )
 	X? (