Stable on amd64 x86 and ppc wrt bug#414309. (force due weird deps on qt).

Package-Manager: portage-2.2.0_alpha101/cvs/Linux x86_64
RepoMan-Options: --force

3 files changed, 23 insertions, 20 deletions

diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog
index cf578ee720d1..677eff6dadf4 100644
--- a/x11-libs/cairo/ChangeLog
+++ b/x11-libs/cairo/ChangeLog
@@ -1,6 +1,9 @@
 # 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.289 2012/05/02 22:11:29 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.290 2012/05/04 17:54:21 scarabeus Exp $
+
+  04 May 2012; Tomáš Chvátal <scarabeus@gentoo.org> cairo-1.10.2-r2.ebuild:
+  Stable on amd64 x86 and ppc wrt bug#414309.
 
   02 May 2012; Davide Pesavento <pesa@gentoo.org> cairo-1.10.2-r1.ebuild,
   cairo-1.10.2-r2.ebuild, cairo-1.12.0.ebuild, cairo-1.12.2.ebuild,
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 22e7fe9162e0..df4071c189fa 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX cairo-1.10.0-buggy_gradients.patch 581 RMD160 077fb7a18c2840c0d637d2161ca9d244cb69608b SHA1 45f4b6a834cb9f1c153f092fba18416d257d71c7 SHA256 3b622bb250b996ea5f5adc5c899af343e0efba5c477fa0e51fdbb720a8dd1b18
 AUX cairo-1.10.2-interix.patch 1235 RMD160 83803df650e8381649b11bd3c81dd0c6ee5f8e53 SHA1 d6b731fc8aa0c9461e62a9afc1431782d3af433b SHA256 d915d69e2eb96f6a4bef1de0c493ed9face7b5d6a79194ab9f2a7f3d85b799ea
@@ -13,27 +13,27 @@ DIST cairo-1.12.2.tar.xz 42051584 RMD160 0174a5110f5f4c9ff15da984e0602dfd04643a6
 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 4142 RMD160 ed3ed985b9377671520d7c38b05182a3de00681d SHA1 dc6fea5c71f535784f6100eca6e277e0525b0b8f SHA256 fe6ca953116846d074c6b1dd1edc4db6bdcfdd7701e3e109ecdfbd6ff8c13f94
-EBUILD cairo-1.10.2-r2.ebuild 4208 RMD160 202773f6389cebdc11998b6540430f8a614c56a5 SHA1 2f29c2aecb17fd7bfd2004ae3a59ea55567048fe SHA256 884e5c3f96b1c6561d9516338bc96535c5baac5b02abf19dfbdf929f1ec97cb9
+EBUILD cairo-1.10.2-r2.ebuild 4209 RMD160 0111710ff50892f0e97400c7e9988007226c52d0 SHA1 742bbd8660d78c8a8e3777a95870cc123241409d SHA256 deb6f65a335870da0f407c760e39fd763e5b2e72458b299b2f3c8cbf680c3640
 EBUILD cairo-1.12.0.ebuild 3641 RMD160 419900e9d5d285f72472a1e5261cd1ef415c5756 SHA1 d8afc33ad2bdc779f3ac0a6442046d61aa48a91e SHA256 7f070333ff7f817b78c86824d1897e3cf1a4035317c09821d9b679016d24cc25
 EBUILD cairo-1.12.2.ebuild 3641 RMD160 6fc49957e4687d67c7602ba57bda217888e3f2a7 SHA1 1e2fb28829742f0352ca51cdc928af0817d01f81 SHA256 34777973665fdcf284d1c54030cbf04c83ecb115167a56f6fa5d462388d62e9a
 EBUILD cairo-1.8.10.ebuild 3451 RMD160 c9205d9e45a024a67c3a7acb247a4f6feb21f4e2 SHA1 84ca8d3e011c476dc899e7f850d6885277643d15 SHA256 0fd58c9f5c9255f94864d9b137d6b4d940281d088a2f4f498a6b1495daca438c
 EBUILD cairo-9999.ebuild 3640 RMD160 3cab7f91182b6cd3653ad44d10b4844c4ed25e40 SHA1 67746b2a98021ea3def595d26d642baf857d78b6 SHA256 ddb862c7359da1c305984abd4fd304c6ec0efc34095009798cda678559f3ed48
-MISC ChangeLog 40862 RMD160 1fcde433f20a5ab7e3d023342d7992f001f49098 SHA1 4f5d8d700ddeb960e4c87ad0155b8c4871f3b4af SHA256 c00af61c2ce5c4cd3181532aa2f94fa9240ba8740167179e3e781f39fc542b9c
+MISC ChangeLog 40993 RMD160 dc4240c2ea29ca629632bd44e2d6fb60960abd0f SHA1 e68bb5d47fc194810fd0448bd4f62dab471b69e1 SHA256 fb54886b4a03d46b9ad2066dbd50d239cbf47d8349acaf062b595cc064f61af8
 MISC metadata.xml 906 RMD160 0d5e3683121af2714405b458c8e8ab9ebffabbc0 SHA1 1825ccbb326c9d4f322e2f85de6430b95f90973f SHA256 1bb2bb12ba48c4dd28c601ff9bbee63faff51d44ebee86a32268cd7f6dac3776
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPobEZAAoJENXLsxwXqFxyHpoP/0NopeQc5HqAUoeoIvRboGk5
-II7UhBErPdBnZNTutSqZF0U2sfiHtbelQWD/BIowrrxoocQM9wvvrTmpMSAuHw+z
-5Nh6RmHlUGKHtGd711Y4ciwsjOlQY817teCy5DLtvrgFEeSaxRSCMKDrdfuOS5/a
-kXnJqORGXqMZ/VLJvBIAu3vvcb4QlILaLrLeER8Nt/AWm1itVI/S0KOQFms4GiFy
-VXFnNMin2zLDyFKoGsBRnfYR5I1J+FleRvnRtCf+ROhVgP8AKrKO44eGRbrjdUku
-9ZPZu42mydxSErES9IC2RRKvZ18csEEwLGD3H0Nt5hrPwwOMaBEthbFNR/RuN2ww
-cLXtOHxxt/IoO0vWEUtU51QuTI6fqvy1kNo4D78eN3LUhMNWqFdWSEF8Ip+b1HJh
-8QStXgY43ht4GAjSGsZzokyJOSNp7HFLYnnt81nJk4JXyb9vdFaTkgUZV/YzbqJw
-aO3z+4Zyr/03qqodtqjp83N1DB7y8io3sbJgampDSxVmjcQoL4qx/2MB2wxo+xL8
-vJ+owOyJ/YwjLNx/LnYa1Cn6Gqxa5a90oNH2jy85nLQtI8l3i7os63LHmiNxQQ8A
-MDqZyTACxpRoBEpLcGRSP3uRNzdalTXz2sKfpMvBk5Pr6nOOJBNSUwgK2ywdMBmj
-H5CQ/P1x1B5hFSpHUdgl
-=XxHL
+iQIcBAEBAgAGBQJPpBfTAAoJEOSiRoyO7jvoC+gP/R7Oeufu7UBVag+QR3UnXaJA
+RK4He5Sj4Atu4soP6XT9VaEozvkOYgcX2bogTJCyElemptixahvFYTiBc0XYfIH0
+ipFPv5fEXE2A47G6W4NSxSKdAPqQC8qzw2zcDCM8jIz2bzF857xp39XdKCh/1ScI
+OCNoAIc9TJYi2iASjpvLaFCQvMp3FCgbmafe4epChVCL+49f0yYtmUJI2cLEfnwy
+QhDlPnhRt+gX8gHl7TOWv8LwT+1tnAYiZ/2qzVSmx1Ksh7S+Sp8pRk0pUHsOuQFG
+Ruf/BiiwCdwszcjP3YKS+qRd92FVdMBXWip03ka6odGgMunjdS/nvU7qyQJD7Uro
+3Vc8wB9AqXZgvO/EEKtRR13XKkAhVypCym1GfadSLoixN/diOvw+pHCuVIa3Oj1S
+P/qQRX3vTFg6gWBdjVClfSOSUsrJ/4pMvwXsIog+H67kB0hQUC8a9sPZuhQSvq+I
+N9yMgjAPBXB8wzXj6EqaE+sUmxpAWfx70oHV/2oHMfwLtaLuAnBz6vNPR4JTP69q
+RhANfcgUl85/YZjEhzLUDBKHGR7kr6OUtdlDbpcQWlJYuhNKu5n+kvKVYWwkezES
+4JGJ1cjEYGB48fHkN5JscbvERS4kZvmh4S4Dy6Ke97hnuXvKFro88sVS3AizuthN
+VnmX5d6bZa50HvpJNgxX
+=LowB
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/cairo/cairo-1.10.2-r2.ebuild b/x11-libs/cairo/cairo-1.10.2-r2.ebuild
index ba9f106bf4dc..6c6e87de71d8 100644
--- a/x11-libs/cairo/cairo-1.10.2-r2.ebuild
+++ b/x11-libs/cairo/cairo-1.10.2-r2.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-1.10.2-r2.ebuild,v 1.3 2012/05/02 22:11:29 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.10.2-r2.ebuild,v 1.4 2012/05/04 17:54:21 scarabeus Exp $
 
 EAPI=3
 
@@ -15,7 +15,7 @@ HOMEPAGE="http://cairographics.org/"
 
 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"
+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