Version bump. Sync release and live ebuilds.

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64

4 files changed, 158 insertions, 16 deletions

diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog
index 4cdcc59f900d..1fcd580a8f47 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.322 2013/01/04 17:57:36 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.323 2013/01/23 17:18:15 chithanh Exp $
+
+*cairo-1.12.10 (23 Jan 2013)
+
+  23 Jan 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +cairo-1.12.10.ebuild, cairo-9999.ebuild:
+  Version bump. Sync release and live ebuilds.
 
   04 Jan 2013; Jeroen Roovers <jer@gentoo.org> cairo-1.10.2-r3.ebuild:
   Stable for HPPA (bug #440872).
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index ac1f6c2824a7..8de2ddc93cd1 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
@@ -14,6 +11,7 @@ AUX cairo-1.8.10-libpng14.patch 426 SHA256 b090f829d3b9fb69b83bfa094552335b83829
 AUX cairo-1.8.8-interix.patch 619 SHA256 505be82a1a0b7f963cb49ff85ecf1fa1389a4e43621df76b91fc1529616b2299 SHA512 651b73124ee5b65e2735deefde36727122e9c513da134441be923fb875aedfd3dbd81de8652e3919f3fa04d1de13dee6ec28e4fcd687aaec427d3b0dd94ac703 WHIRLPOOL a1803cbd8f32a8e926a8af932e099c5275920e3e09f7a53ee49898823e81ee7a2533a4db8d2125f200fa409d98fb8e2cbdeb01f00f64b7ba64ba8dffb8487bc3
 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.10.tar.xz 42135592 SHA256 f1581aef210f6caa9cf42875fb66ab3b47a32db9436bdfa9913b9bbd5034b03b SHA512 e56bd3973039bc0dd48fb9e89b17a58e8061fce2628403e2c1256209cf66ef1b50af1c9a28c4a75806066416475515b75f76de845e2e6735fb273e6ddda3a160 WHIRLPOOL dbce51bbe1732076b770cc6928caac007eb0e69bcb392ac9c82d17a203defcbb732d7bf8d8b020c3d04937d4a5df757600f1bedc51ea3d88cd41f6c44aeedf0b
 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.12.8.tar.xz 42113752 SHA256 8fbb6fc66117ab4100bad830cb4479497e53c6f3facb98bf05c8d298554ebdd9 SHA512 f6f6079ccae8353fa43a2af66b655516b33d6d94329c968795b727d049ac94a5e000b148d9318a294576df1d992e48eb17c2d37301461bd15d8c2e2fb042f41f WHIRLPOOL 9502505327000e5241e46256da6b92d7a6204a03baebecf963a92ca7bbf88cba7e998fa114a9f2003ee7a602bcd65f79a0967f9cc486d06d61d160a5748b52cd
@@ -21,19 +19,13 @@ DIST cairo-1.8-lcd_filter.patch.bz2 7067 SHA256 6965d46df45d8382d122170a0f1dfaeb
 DIST cairo-1.8.10.tar.gz 7102657 SHA256 572bada15596ec8708392db1af8b93a1af75ca47690348154e2841f3a6f08439 SHA512 1c844f35a8102a8221ec2837ee7e1c72402b91af3f30465b4b2b0e210a62eed40def5839bd8e8dd6733b478ddc95cf6a5ad1c1d0b5e011c55de212f3a171ab40 WHIRLPOOL 8c728d808241dad3908493d0be71b7ae768778db46e2cce7b5d8cf6dfa94ce9387f63562e4ce005973a17b1ec898ba90d05659100a426b29f70658e5f34e23c6
 EBUILD cairo-1.10.2-r2.ebuild 4273 SHA256 e49cddb480b72dae328fd79895006f00a25ebb35ef035226bfb70ae318e66d70 SHA512 8e87f8efcf391dbcc8b7fc77347c3f511f5c59eb30337beeec5b94388efd52da4330a0af183e6ec193e1f2243075df9328a3928298ee7839bf4c5d138c6acebe WHIRLPOOL e9b58e4b3eb0593a4123a59f817ace4b319eb8c182a9a5da46c2f269e796f838b54001f3a292ad351714336388586f2141d05cdba80dc85e0d1ebfee9a7ee449
 EBUILD cairo-1.10.2-r3.ebuild 4382 SHA256 e069351b5037c0fa3db37341262d6634f6f23cb904a3b11bcf26c45f1159fbb0 SHA512 cab7f136fed557234d41fa2fed601cf8e8b6e8979b9f41edfd0c6bf96b88393c6ea8a5f4a136eed8feb2ca3e65715bdf02d9d515ec2775f75d22aec0e1927e73 WHIRLPOOL a00202a2c1fb4f892f3d71bb8a0db19695728de4b13fd0d50adaec6852dd957ace1a2b916674cfe9bb0b7da1bbde5145222165ef81794dc3a0abdabe2b0c2f95
+EBUILD cairo-1.12.10.ebuild 3908 SHA256 b1931d9a5bb79f7dfeb78d7e6f018ff9b6356cd68feae7fd2598045316439196 SHA512 80e8d46738dfb8ae21c03df11e226d9663554a5ea0e73fecfb3e414898696f1c9640ce2b06f7a5c667501af25b94d4266790ef78c8cd9a4bce0566625f90ac88 WHIRLPOOL 94c12efcf9a225403972ea68c7e470c4205fa91b690998cb1cb31f9a7f0fd39606bc69baca37d4bd4147a27ed106edf72651392ea61165b6adb93ef1afb7c763
 EBUILD cairo-1.12.2-r2.ebuild 3798 SHA256 855f4f1b85d4fa22b6c7d6293cf22f1b526d312b19577878f0b814dea0979b87 SHA512 4b39d97a79cf2131fa84b756d7a6354eb9a1993352d9d7033f9a0e8a2b493879c1c19fa21b91465af57280987038ef248bc760ad275b0665b37ac746fc1febd5 WHIRLPOOL 664f6eb645e61158f1a1ef181fafed5fdca1b25d74d414d82e96a27c9392396de663a0bec3714a376036ba116c1778c9dcbe19613d49ae5b8e1798c245c165f0
 EBUILD cairo-1.12.2-r3.ebuild 3855 SHA256 ef21b15e4375852d281c1d97d6318c7e2ddc50a0e4a2f65d78ae12ec15bf554e SHA512 dab96dc3d3f67b4308a02803a93bcc622df65dc24f7cce28b3c46f3792852ad28adb8834e1d8c7d92405011869ad1b95318c8c873d0359adb94a8e4e07e3fc07 WHIRLPOOL b3fbfcc35ce1903724f9324bcb038e4a58a5352ea6e06b8e07b30e12bcbd9b1a77701c231cbe24c75846bce31568e5468a91b166d7fa8fdb38ae4652e5837906
 EBUILD cairo-1.12.2-r4.ebuild 4021 SHA256 f7025885952367dc14864ab220fd3a7931e6e90652b9b261d47a5c7ad1c1172f SHA512 8b0f631c2b0d8bb125dda06fbcdb6b5a152285d03d2d95343fcf8b822cc8226f15016882a18e4a39053363b82dc1b4e5abfc24c05483ba2ec6aeabfb26f5cf61 WHIRLPOOL d3f92fe791be9112b2ecd4e1edcbc1b270b078d5f6f6d605a840a2bb0b58ff4ba7502ceaaf1323c1087ede92ef3ce1558abc7aa10a67126ec9a471d58b610eec
 EBUILD cairo-1.12.6.ebuild 3889 SHA256 9793072d76400a400103d0f9da26200d15b4eeab59b112750106090cc41380be SHA512 0ecc59fdb30be0c81e699355b28fddaa9b806a6bacb00890ecd3fa29f717527030abd259570d0d31d351487c51a8513aa1717357e17dbcd94b8242ca162f1b4f WHIRLPOOL 7f05d6effb47d5010a26588126c051d1f0882fcc1e7fe913bc878378553a940406b8dbde2ca402522e01405437ca130e98d11c0379698ce35cab9d4fc3c6547b
 EBUILD cairo-1.12.8.ebuild 3908 SHA256 d34cc97dd99a0533f6c2bf515ac4f1bf0a86e169ee0423a84730dff1102193d6 SHA512 97813298e294fb2d0d62c1ab875f0f234247b131ca81816db01bf91da5b8c5fc95b0945f94e08bef2f2f10dbcf6ed242775674bd3f04c5a959de911da8290585 WHIRLPOOL 59b4a86dd3a80b329e431ced9f96442338609dfc2332a25cc48dd533239936bf2115a562951b31d8f78aa05ba095f535af4f80120cee283893d3319466ebcae3
 EBUILD cairo-1.8.10.ebuild 3440 SHA256 41ef25a612af32eb6e7654e3f669f0f4030942bd84eb2db4da38278cb564794f SHA512 fecfac9a9766877355eae58566fc162e6b927f81ffd34e946904de0ea60fb207c55e1f9f4b4735fc09d59e914fd096861ecaf3859a88a57f2dd53bff8c8cfb86 WHIRLPOOL 1d3e24e04238260d090c3de9d8dc60b21d93fba9363ac94633c5220e0169aeebf02eb0f7152690ae276c928bea0ba4783a3ebf2809882362c6a5bd53aeef37fa
-EBUILD cairo-9999.ebuild 3907 SHA256 db6b8385993793850fb5d303413220d2f9b4be82472e1dd24b8b27c7f7ab259e SHA512 1543447d51d4166b65b9476f7050a72b2897ee64c254706177a79001fcbc1f6fb28bfb93c089d2139155ccb847d8c15162f7b501d821b18941c52612b4776a4d WHIRLPOOL aeb2e677351596ec96b6fb5e3a1869294e12bbdc36969fe15a464103bb7d689784848075bff52d43d6aefd11bf5d4407277103ac07f5e06b46728207f4d24dde
-MISC ChangeLog 46355 SHA256 4006cf4ee02e5bfbe5cf4a4d5e4a7eead94b4a53386ea618d7d4898f0f2355a5 SHA512 e7fec05c2c75779a99572f33855fa65f7793e3e3ca74ea65a6ae9250a602559b3c82f648d61767ae173d28eb6f76787433cae678d1defb0c698e065b26b836a9 WHIRLPOOL d3eb56f14b6c594204cd200337ca10851cba520020f308081519cd090297de0fb0fd837afd1a8e1b84e829404f3f57d701ac5d1ad897a4649e7d3a2c25f14cab
+EBUILD cairo-9999.ebuild 3906 SHA256 1f9936dc789060c8be89b49d2276bacadeebf5afe3b70291d680c8e302af98a5 SHA512 a38e0cd4663037216878f00537feb1f103876d8f3a623951cc50f98295db056595e1cbacc2c05c31f5c802c9dd4a66db72c2ad48e881092507d1065fa81970d2 WHIRLPOOL 2b1a5d1ce996c51b75689d492240892aff932e5b9ae095f837dc96d2450644a9afa5d3b454effd3cc525eeb5aa831f4b2eefd32679903da08be3a2678d3b9c44
+MISC ChangeLog 46551 SHA256 2f2bccaf55902a011f72ccfaa79c4a7a51ee0e4cd42939eb902d99c86ec59c1f SHA512 dbc354604fd43b8cd6861375b79c8be390694bc08a2798ecb3444ca2056a4ce5aa766c93e6e6a6b70747d37e5c8a131def36d39ba2e39ab6c0cccabefb12a9f3 WHIRLPOOL fe372bb6954b62b3c55e02c230bc27112cd0d1e4a92360291135c4f7add23f84f70aff81cbd79e89ef62219a839dd808f8ad0d8f6603f70d4c545bc3fb2cb016
 MISC metadata.xml 1094 SHA256 ec9cc0ef816bd991c79a044235b3b447df4d0fac29964bcf0178c4a36b7f3cc6 SHA512 4cc4a4f3626e1b9895a96034c90b1c6fd1029ef44e94be0e0fe75707b3b5c060020d7d0a7910fe69315e3e571ba7027cd86199fb634281b43b9b927878a18e47 WHIRLPOOL 803fc2515bcb2d4321900cb833833c95670bc039a30c88d94fb855e304fd94786c4508c68288f91f0eeb9ebc1d33b5f8453524cbcf9a6695c3495cab34633cee
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEYEAREIAAYFAlDnGBIACgkQVWmRsqeSphOnrQCcDbtr9L95GP4267XNPrLlWZ+O
-1WwAn1yb2cBwIftsqK0WCAoh8mEHnuMa
-=F2hC
------END PGP SIGNATURE-----
diff --git a/x11-libs/cairo/cairo-1.12.10.ebuild b/x11-libs/cairo/cairo-1.12.10.ebuild
new file mode 100644
index 000000000000..5367178d747b
--- /dev/null
+++ b/x11-libs/cairo/cairo-1.12.10.ebuild
@@ -0,0 +1,144 @@
+# 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.10.ebuild,v 1.1 2013/01/23 17:18:15 chithanh 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 ~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.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/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_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 d00c9942bd58..febe4211f53b 100644
--- a/x11-libs/cairo/cairo-9999.ebuild
+++ b/x11-libs/cairo/cairo-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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.25 2012/11/28 10:27:31 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild,v 1.26 2013/01/23 17:18:15 chithanh Exp $
 
-EAPI=4
+EAPI=5
 
 inherit eutils flag-o-matic autotools