Stable for amd64, wrt bug #540676

Package-Manager: portage-2.2.14/cvs/Linux x86_64
RepoMan-Options: --include-arches="amd64"
Manifest-Sign-Key: 0x7194459F

3 files changed, 21 insertions, 18 deletions

diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog
index 3e6c21d7e162..260961fb354c 100644
--- a/x11-libs/cairo/ChangeLog
+++ b/x11-libs/cairo/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/cairo
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.402 2015/02/23 05:44:06 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.403 2015/02/24 09:34:14 ago Exp $
+
+  24 Feb 2015; Agostino Sarubbo <ago@gentoo.org> cairo-1.12.18-r1.ebuild:
+  Stable for amd64, wrt bug #540676
 
   23 Feb 2015; Matt Turner <mattst88@gentoo.org> cairo-9999.ebuild:
   Drop the qt4 USE flag, like the previous commit.
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 84d1dd0de433..7eb82d01355b 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -21,25 +21,25 @@ DIST cairo-1.14.0.tar.xz 36584076 SHA256 2cf5f81432e77ea4359af9dcd0f4faf37d01593
 EBUILD cairo-1.10.2-r3.ebuild 4382 SHA256 1656fb57c943b71b588ca8427320067fdf91ae83331e8c4dead61a2461c83c18 SHA512 8392faa29b007706de4c2b6d61e3507bfcbccc07689239c7eb98e8b19547d4c656b18f507188e1d150a63f18782d864ecd4c5d70abff7c22033a4be5e775d9bf WHIRLPOOL 515c656ea979ed756b38f42db19b839f679c52a9f349a84430aaf31467634f66355d8a2d41a578d39e2ea6179c4baec94b73eefdba5905b8c291269070a00fb7
 EBUILD cairo-1.12.16-r4.ebuild 5967 SHA256 5e0b558e4eb8d89d6b05e76762874c3747ab82e63e6e3258de908bef1836e5f4 SHA512 70870aac91452f40c1cbb380d3b2d5ff228d563d11882b12498a3a95482a06639d232e6a6ceac2326ffb8139a87f3a8a9feeeeab17bf678346c9ded06eaa6418 WHIRLPOOL 2c564483c6ba1a1cfe4c193f8c863078a45035c7c1581d4f8d43cf68a0b04ad9c4c45740299e0ad6b36f9074662942fabf9566d7e1ae08258790841fe6e0f074
 EBUILD cairo-1.12.16.ebuild 4115 SHA256 510a7314d31ee86b1cdc198cc2feae538b577582961b38c1bcab35e8e8da1a17 SHA512 a7964920b7dc9b8fcd3826207fa53046e41d67d3486a73f32cd4183ebf2d9ac500398a0d73604c9d234139344653d66ad8b24eb91e1d48d814c1fa70ba179c29 WHIRLPOOL 1df6b4bae51c564a862e763b0ffb6726ce9ab983bf7fe353e7bfb8f34d32cdd56a2c889efc55d70174061a0b3d8744ef9abb282870e6bae4d119b9331841a40d
-EBUILD cairo-1.12.18-r1.ebuild 5309 SHA256 7875a0cd8accbeeee339fb01d6ebed55966742e47c45446d8a3f141df0be5542 SHA512 5a3cb26a958050115787b37ae887633c56363fd5c02b34417713da68f9c76034f63001f395b15f8a7688c926841185d47b6943c7af1921ebe7d7896c55c07dca WHIRLPOOL 6626aef479edd76e43529ec3d528aca14b651d0b4f0682f8ba4fa17eafab24bbaf9a073b6ee3d4ba56d5a233e3b1e3cbbb1a1bb575487ed3b1741e75b7fbc683
+EBUILD cairo-1.12.18-r1.ebuild 5305 SHA256 4cd4a6827168885fa2b9ce94ee8b8c8fda137b1eadc92870d6a37e7bb7dd7894 SHA512 cd8e685c8f455345c1dbd3c52acb9ec71bce13d8a1d18d79e25e33ea39b506ca158e08deb755c6f2d44c72ced577c910344b1ada27fc6921ab13760115e65a2a WHIRLPOOL 18ad6e24528748b1c6f69b728397445ff0908e71aae84bd91c1e81517886302a79a63e13bbc810bc9a1606af0259f3114efd7e9c6d037b22c10b2280c3fb3696
 EBUILD cairo-1.14.0-r1.ebuild 5379 SHA256 f7bf0da497a5b006c6873fb6c959dd34716073d4215ff5b000ba77b3b3606860 SHA512 969d81c3ae2161003526630867857935a7dc0e94f3b53254df9533c7baf976d4180c58a94deff8ba508a9db6cd2437af34dd2756624bbd008ab4297e65a69050 WHIRLPOOL 218dd62b2e3e70ed791e372666629d4e223efa411b32980f76e563787afdc60e01d3278eb9f9abd1aa5ee903fd4ecd620a62dbefd93b65d5cc0654a0d25af50a
 EBUILD cairo-9999.ebuild 4775 SHA256 4de8533788128e7794f4a46ec34f3d0e978379d2a06790ebc78074c345f81693 SHA512 42ba24bb51ba1c8b088a860d07d1326901d1d1ef9509ae275c03eba08266508574c96e56c02d95d619a80fc6a8506bcb1931a80c0cce29356d028e70a2f17188 WHIRLPOOL eea6de53be6cdcc841c4deae13c74e55b1c792df9586e933cab979efc85407247c40b1267391108cf0015414a6ae73bc83eebce98e27ecc8673c1979a8c8cfc2
-MISC ChangeLog 60698 SHA256 37b09f5d496465244cf84c43e4916bb5ba03f9148f4a0482139b31b90dd657e9 SHA512 dfdea1989f84a4d03773bb3f921a27eab7a178176fa49727dd0bcf14069e19e46372e6d8bb06b86feec069c1707ee8c954c1d527e9398b4621f0939405b2745a WHIRLPOOL fdb0d3deaaf8706a54b0cf880c3145379bef89ab0c0ba7c9f9776521b6a46e03c2c991d0660197fb5c5c8d33d86b4602551944a07d5960106716613391e32192
+MISC ChangeLog 60804 SHA256 2162c948bc48e188f0f401e5a0201adf479ab97944c55b01ff9687b515982779 SHA512 f31e4db1239b2aa804776f6e20e587787658a860ad8b8b323dfef614cfbb2fb007d0bae6e0ece6a8f705872eff176050321a4cacbee18870a7e83c60c624db2b WHIRLPOOL 38c136ccc2960655090b133bc99305549d57de28b23bd95877bbe3924f9f7d50eaad91dbc6d22f29734c0339850e9ea00fc46a56f5cefee034945e1a0ea8af5d
 MISC metadata.xml 1294 SHA256 988ed8eceb7738628f10a041a322482997d26a5fed1fd42eb86bd742a6e3602c SHA512 7d333210abf19ed97a1210d37d77a1cbe944220f16757a0c652c1a329d00cc387ebf2ca174db6dc7f79a892ab068c66d773c364da0321fcfeec0a05d84946bcf WHIRLPOOL b0d67117667918643b4d889b74207b995d8fa1c851786fc89bb81cecc5c46e89714533eb2f8cd005e1175ac8c79eb5d3912826e87cf1c34886103b5a4d7e06a2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJU6r4oAAoJEA/daC2XTKcqBVoQAKCciAxj+4pMzNzepfTC43+e
-QpD0Zoop5JHCAqn2k+kPVg7iJQgd+Ah4qESgGlBovkYY6Co0/J1WgJ5FjED4J7Ln
-xshe54mCobiUbAOSQfNjeXdxnznZOQq5wbO0d2iA4nNgSNPn4lSAVFg6KuRIIXdY
-rXcNVi/JUaaZnA06e4Jf3q6je+eogyYqw4iIyktSzGF0HrWXyRQrhcYDqx0XJfrT
-q8viOfAYf7vZVuqkcYYu06HTLHj9gsqPU5s6r+hjh4tP13jaGz3hrZrfbDAeXAXG
-uivXo0HfjSePScxE71ujU3iRMVOogp+pke8+zSX0Ox+qwU/cvSDHlIbC3TNd3mD2
-318QQ/T/m4rWSQ41pLglqc3yeoXqhtoym4nDBafhDDsQZ3eGz/NVY98SQCAn6PRG
-yPDr319jZXzwEUQbiM0thsc0S8mQq9M4gbdIfFVv++TlE7c9uUWVaDNGTJxvPJJT
-yBZmkkmFDNLdpmj+Wa1zFGfdI4T+CySrNJD6Do3mHaAgpUMXC3jEnlVNxN5P1WdJ
-Uws1xyQECJa0RF4fETavSCO8Nb9XPG8UeVH15rvsg73ShZ8YpCI8qcan1IOKj41T
-7Su1gFWWy9+CarVi0mc9i1AYY3OSxgkfeNFon9A3u+3Yeuy6Qv3pBmuhWLk2NOtW
-Z77fjf4hH0JWbtujxIpA
-=Chva
+iQIcBAEBCAAGBQJU7EWXAAoJELp701BxlEWf0K4P/3JuMpDDzyfLcQEUl7Qm7Kkf
+EhQzYbQvDPVc+eqB/IFlGKlde0+7tk6M4aiRjP5CT2RhBq5nEHy8twJem0hvYlZO
+p/RM8HFr2cpHrOcYAX4my+9Qbyq1pXJ+zBbVF9dAxR6M8nsrY8KN6uXEuvbSMFKc
+tLIGhHOUgHdcdNBW+Dvj5vpLmnOijm7p/Zb3wA682FRSvOFr/8i9R9KISYsDdkU/
+//z9n0GMFANwkX0g2AWChMHgOXK11rGMoyJVTuJ9bnyn0DnDfGT+vsYrMJCnTB99
+w2+18WGtb2VR9AskbiGqYKSeSXnh0B3pC6VKhO6SjHneXexHHk6xeI8FeiqPYM1J
+oEIDbU4zDTQsPZe1NyikSXkqiiunVkZzoUigXEWY2CmSSNKxpxyRTAhV1J+Gendo
+BL1xLUSBSCtM53VpKdd9PLEdKlUPizfUzZ1GdItQelf8EQbIhVpGi1R/5YYNZlHl
++NjbTGklL92jjmaicyUyZhMJaTssDfP5ZqlKyqIUzIgJ7pXe2YaxPRVI75NhJ8DG
+lKRNtQ88+YnP4PlueHUAtovrXsDOgbgsRZe48CrUV7/G78VzO6lIiSmGXTcuvvAS
+r30An0XEMY04CvlLh1TzwGfZJgbN2ANbrr7d226XrSO0BzeMQYfe+o1n30w6VNNI
+sWrEyT244LDB4D/qoUkz
+=UgOW
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/cairo/cairo-1.12.18-r1.ebuild b/x11-libs/cairo/cairo-1.12.18-r1.ebuild
index 3ac29bd37539..58c4f525ae4a 100644
--- a/x11-libs/cairo/cairo-1.12.18-r1.ebuild
+++ b/x11-libs/cairo/cairo-1.12.18-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.12.18-r1.ebuild,v 1.1 2015/02/21 18:00:22 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.12.18-r1.ebuild,v 1.2 2015/02/24 09:34:14 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://cairographics.org/releases/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~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"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~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"