Version bump, bug #437424. Reduce differences between release and live ebuild.

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

4 files changed, 157 insertions, 17 deletions

diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog
index 8e10fe788a1c..6c01f36a4e7c 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.308 2012/10/14 15:39:24 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.309 2012/10/31 23:12:19 chithanh Exp $
+
+*cairo-1.12.6 (31 Oct 2012)
+
+  31 Oct 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +cairo-1.12.6.ebuild, cairo-9999.ebuild:
+  Version bump, bug #437424. Reduce differences between release and live ebuild.
 
   14 Oct 2012; Alexis Ballier <aballier@gentoo.org> cairo-1.12.2-r4.ebuild,
   +files/cairo-1.12.2-fdr-nodl.patch, +files/cairo-1.12.2-sphinx-nodl.patch:
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index b55999f9312c..3d27ee2bab98 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
@@ -15,6 +12,7 @@ AUX cairo-1.8.8-interix.patch 619 SHA256 505be82a1a0b7f963cb49ff85ecf1fa1389a4e4
 AUX cairo-respect-fontconfig.patch 538 SHA256 1732f21adfe5ab291d987b7537b13470266253f599901a4707d27fd2b3d66734 SHA512 4d4d473f956b56f11b31f513de06751dcc77342e0f04ecf37064a74b8217f9d3536c0a8a41b09e580f34576ff2d06815b4cbc2bc091c201f947965509677415e WHIRLPOOL c7d8f364a787b095054507a6dceafe08e8112322853e261303adc07b79a9070be63200dbd4ff465943e2303126bcd7eec51b0f6c53f1d4e9a49fd363acbccde2
 DIST cairo-1.10.2.tar.gz 23558405 SHA256 32018c7998358eebc2ad578ff8d8559d34fc80252095f110a572ed23d989fc41 SHA512 8be4b9ce002f039014d747cc2b48c6a6dfac78df74ebc5ad711a8f36572b819b2c6da3cc4732d0ca93e9052b4b3bb42a146f5e7e346b75dde695d44477b19c9a WHIRLPOOL 8ee0e6f2f520a8e5e046a311926f07a49dd7b730b66b49684ce0ea296b9b5822a80a194b8eff56c73d92da850faa15fed925a1df41b3ea28e3841530548d4ef5
 DIST cairo-1.12.2.tar.xz 42051584 SHA256 b786bc4a70542bcb09f2d9d13e5e6a0c86408cbf6d1edde5f0de807eecf93f96 SHA512 149e55e206175220448c520624980ba0081a3e2336202f6c5d5ba9098a51c01f6d89843c3c3f0d5bed3473a5ff49dee6530e2cacec93a94c9d78767cb881f847 WHIRLPOOL 89c773c1b82909a02332731a4e16e401ec20779205189503c08a1bf25946733c2b02415555f520ab3ca64202fb7e0ef3a5fbea39676436aafeb42d977a6e3897
+DIST cairo-1.12.6.tar.xz 42103264 SHA256 64b0cb89ef45972427f65bc5974e1c2e060bececdea1785fc9b7b6c7f1f42ae1 SHA512 f3dc493103433f71c362ac45b26b69946f24cd8333d5a62a630cea94e0f7fdcf0703e63562ddaa11178485caed4c4f2e29f4773d64415a04d12e0b83a549cbd3 WHIRLPOOL 8d92b96047602b837c7b0151c9f198be537208a6dfae4aaa4d09d4298c74c92f93d7074a683adbdbbaccd906f73665e138527aa2f1fb780f52361395da91881a
 DIST cairo-1.8-lcd_filter.patch.bz2 7067 SHA256 6965d46df45d8382d122170a0f1dfaeb25bd68adc998b42f62397123e5795d1d SHA512 e410d8c6b5917988b15019fce7a3131af00506f9f6d14d1449f7ca2b422e7c18f3382375e94cd64e67edac0372135a1b1d8aa7604bfd4f8443cb66f7f426b2d6 WHIRLPOOL 7b51f573b1ae55cd13afc351884f29dc48428c56902be1716a42145a521fd3d170183c239d790372bc02d1ecb77a17a5ded6b54e5ad0941b4c3f9bca870cabf4
 DIST cairo-1.8.10.tar.gz 7102657 SHA256 572bada15596ec8708392db1af8b93a1af75ca47690348154e2841f3a6f08439 SHA512 1c844f35a8102a8221ec2837ee7e1c72402b91af3f30465b4b2b0e210a62eed40def5839bd8e8dd6733b478ddc95cf6a5ad1c1d0b5e011c55de212f3a171ab40 WHIRLPOOL 8c728d808241dad3908493d0be71b7ae768778db46e2cce7b5d8cf6dfa94ce9387f63562e4ce005973a17b1ec898ba90d05659100a426b29f70658e5f34e23c6
 EBUILD cairo-1.10.2-r2.ebuild 4269 SHA256 f563b262de85b4666c67e7fddf46ceb81404d7d8752514700b29504b01ae6cb9 SHA512 01c96a748740629f1d8d68db07d7aeef7dbd87b7bc3b5877cb4cb07e813c3f0ace7e949bbd19d83f795540a1caebb8fe01b795bc414b610ba3e6caf1d42f55ad WHIRLPOOL d35d7a07f50b66c8bcf9ebcd02fccec4212278e1f39cc59891914945b2b668ebc4220c0fe814a5488c7e84dc3fa21c1c2429653cc2fe871a350892d4d256d09e
@@ -22,14 +20,8 @@ EBUILD cairo-1.10.2-r3.ebuild 4394 SHA256 b311e00a61be445cd8ce7477d1b142bd024869
 EBUILD cairo-1.12.2-r2.ebuild 3796 SHA256 896f6add61125b67ee7c300e6ec6367c583a49e16fbef16d46dcfe94b07dc770 SHA512 6461986cd3abd7634ae8d1086fd55605ed9675e7820e743a70792efcd0b4f197a50a6045495b69cfcbdce0ce2eede6430800f4dca0b0400e655e6c98f880bb6f WHIRLPOOL 48cc54a224e66c98a71d7cb4b8a50d43cde56bd9666d3f2bebc6dab12ff973c8ad716d430bde3ba07cad21d731d8293cb591b894a3ab98d123e953f40a5293e6
 EBUILD cairo-1.12.2-r3.ebuild 3853 SHA256 36b148a172d38d0a266564452869b2e4a5e3d4b94d525a07d80323a05e9d4d4e SHA512 6429ffbe0878bd4f083d78517cc0872736d58d789f21642b55b22e046d1fa279aa8860deff3db56f051fc52bf257fb58c61d46803b1ef35d89a2af44d8cf3a48 WHIRLPOOL 7f8b531eb754e06c8e07412e2309c5cae7836cb626c9b5a275c4cfc2b682ba6b7009dc6b2494a2f517623e80b8761d00aad529154b2672d7023095a216b34f93
 EBUILD cairo-1.12.2-r4.ebuild 4019 SHA256 9f6ece685726163f1b8961775ed21f3c9a7f1e6bdf2913c596fe30cb7d3d889b SHA512 e5e053ca1422e8775adea3518a3856319f8eead2ed4333352f87e5e6874841b45af77d9ab774ab6710ba1ffe84c1a9d08182a461697c5660bdf4fd65417e8905 WHIRLPOOL 8aca240b37274dd94ba30bf7d36a127814428e1cf40ef8d8ba2706eb5e7c49cfe948477e1e8b7e871697177a7435959128e30a8416e6d4fbe8fc2972a7da1f1e
+EBUILD cairo-1.12.6.ebuild 3850 SHA256 700858d7c14d136577f95b3c953720c4e427ebef28e0270967d89e95679a17d5 SHA512 d5a9564ac4e86a370457ce4dc818ba6a84f011fec851f247e2ae409fbc7f0ba215df96fc4f7b2b8e35d44eaf269cb1b37b36011b270de8b1eb75ca92ab0bc1e9 WHIRLPOOL bd70b3bcef70e5ca3840da6c6bfa15ee001d117a30afb4e24035e8912284f4b91a56b4e03bda858d39b69751dc48a4b866c67cc63a6a486799a02cbfc1dde7aa
 EBUILD cairo-1.8.10.ebuild 3440 SHA256 41ef25a612af32eb6e7654e3f669f0f4030942bd84eb2db4da38278cb564794f SHA512 fecfac9a9766877355eae58566fc162e6b927f81ffd34e946904de0ea60fb207c55e1f9f4b4735fc09d59e914fd096861ecaf3859a88a57f2dd53bff8c8cfb86 WHIRLPOOL 1d3e24e04238260d090c3de9d8dc60b21d93fba9363ac94633c5220e0169aeebf02eb0f7152690ae276c928bea0ba4783a3ebf2809882362c6a5bd53aeef37fa
-EBUILD cairo-9999.ebuild 3819 SHA256 bd190ef64586c10f31f20c43145c2788f0a0c5be38ecbfcb07cb073ec9b35e59 SHA512 6a19042e46ba7fd2e47ab576f6849283953b3b0491b9644ade330c35f627c6db90d21211fef6d1ac64a624972f6879921c1003158729f61e65377b396184b970 WHIRLPOOL 1b1b7e552832b545437311342a39b827cecd5c78397b25261e02a937b30885f62a2f1375fa513db993bf0dad8193e84f586168d07612b79f57f2088da9b2334b
-MISC ChangeLog 44321 SHA256 705bb2f8e74e1959c5064c6b03588b2b6aae55d2e328819cd5ef74bbe8fa980e SHA512 021e013c08bbd017517626ecf3340c59d93c139f201693da6f116d3c1831195f4246e9ba5739360dca70618e146c4eed244aa300d22b525adc2dba0aa8d50fee WHIRLPOOL ca0eb87ed5f1d4d86400189c23764c31991bae07008b041faf4eeb317dfe4b2cf57ab57731e106dd00afb024b9311913602a58bb8eb85917288e81c8d1f97084
+EBUILD cairo-9999.ebuild 3868 SHA256 595d2cee7a04673743106ca457ec3081706a4aef65d00091f29028eda2c55a40 SHA512 ff41a73e238b9b237002d2a0b75b91940101ba18bc3a5b3a0ceaaa9df821094757cc74eddf3aadc1bb99b3c72a18a0de92c5c366968f9acc76ca3b8e1ad21c52 WHIRLPOOL faf60a7cf2581551c91ed487deea661dfa0ca03a0c6ba0b8e2a2d0155fafcf8b6078ae9fdd944a32502a9e15316a8c0c9d8e098e896d19ca15b8ecc93a4f9c29
+MISC ChangeLog 44544 SHA256 8b1fc1264c76110465bd9d910bd69652e974fbff46da9ac1f943be94e483566e SHA512 abbc6a5c9aaf1330041b8bfc9d51fefed422b949a6b21e458a3b2cb86f0f294d192e130fdbf3bf0c6736a624e744b58620a017ba0fb8e6197cd3be2c36ec1c72 WHIRLPOOL 3209f667f8e578bb6304d1ca3daa4acbf204e8761f1f90d9455de3bec582f7130fab9fe6f822a9bc797ebe787ada40f3ad10fdec430d98dd1aafb8a9b56d36ec
 MISC metadata.xml 958 SHA256 34cc9c511683c03054b582ff5ce62e1a75a79cc472d83ff37f20e4d0d352064c SHA512 c541701c99a94d60f5dd22f27160ede89781411641c5772ba94fd24566b95ffc56bf90d06586d8038b4c1445f896cc295a7a03f27bc2e0e6fc9f489be678ef23 WHIRLPOOL c96181f0119d73c0084fd659d6aa3a9dd2d8ac3194d35efd23bf46e8e9f3d7aa00b11130c736f2578cfe20695fd41254dad03002db28ec6337ba57ada4aee2b3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEYEAREIAAYFAlB63K0ACgkQvFcC4BYPU0pkUACfWZ8rC978YMqAaGuCnyU+KDiY
-zNAAoKnyv+HOrLo/Xl4E0jjUa79XNyhf
-=r2IY
------END PGP SIGNATURE-----
diff --git a/x11-libs/cairo/cairo-1.12.6.ebuild b/x11-libs/cairo/cairo-1.12.6.ebuild
new file mode 100644
index 000000000000..2ff3fb4f7e34
--- /dev/null
+++ b/x11-libs/cairo/cairo-1.12.6.ebuild
@@ -0,0 +1,143 @@
+# 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.6.ebuild,v 1.1 2012/10/31 23:12:19 chithanh 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.22.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? ( >=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.0-buggy_gradients.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 bdcada9342eb..e6305f7e4900 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.22 2012/09/12 05:37:43 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild,v 1.23 2012/10/31 23:12:19 chithanh Exp $
 
 EAPI=4
 
@@ -32,15 +32,13 @@ RDEPEND="media-libs/fontconfig
 	>=x11-libs/pixman-0.22.0
 	directfb? ( dev-libs/DirectFB )
 	glib? ( >=dev-libs/glib-2.28.6:2 )
-	opengl? ( virtual/opengl )
+	opengl? ( || ( media-libs/mesa[egl] media-libs/opengl-apple ) )
 	openvg? ( media-libs/mesa[openvg] )
 	qt4? ( >=x11-libs/qt-gui-4.8: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] )
@@ -74,6 +72,7 @@ REQUIRED_USE="
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.8.8-interix.patch
+	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_user