Version bump, now with high-dpi support, better downscaling, and support for jbig2 in pdf (bug #531668, thanks to Manuel Rüger). Punt old.

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0x18E5B6F2D8D5EC8D

11 files changed, 203 insertions, 556 deletions

diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog
index efb69e9adf5c..6c5f38ab447e 100644
--- a/x11-libs/cairo/ChangeLog
+++ b/x11-libs/cairo/ChangeLog
@@ -1,6 +1,18 @@
 # 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.397 2015/01/31 14:12:14 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.398 2015/02/18 08:44:20 tetromino Exp $
+
+*cairo-1.14.0 (18 Feb 2015)
+
+  18 Feb 2015; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -cairo-1.12.14-r4.ebuild, -cairo-1.12.16-r2.ebuild, -cairo-1.12.16-r3.ebuild,
+  +cairo-1.14.0.ebuild, -files/cairo-1.12.10-xlib-corruption.patch,
+  -files/cairo-1.12.10-xshm-corruption.patch,
+  -files/cairo-1.12.12-disable-test-suite.patch,
+  -files/cairo-1.12.14-libpng16.patch,
+  +files/cairo-1.14.0-align-64bit-types.patch:
+  Version bump, now with high-dpi support, better downscaling, and support for
+  jbig2 in pdf (bug #531668, thanks to Manuel Rüger). Punt old.
 
   31 Jan 2015; Agostino Sarubbo <ago@gentoo.org> cairo-1.12.16-r4.ebuild:
   Stable for amd64, wrt bug #525300
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 7653c6a49cbe..3ccec790339d 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -6,45 +6,42 @@ AUX cairo-1.10.2-export-symbols.patch 2072 SHA256 31df610ff96a9d04b51e9636c8566b
 AUX cairo-1.10.2-interix.patch 1235 SHA256 d915d69e2eb96f6a4bef1de0c493ed9face7b5d6a79194ab9f2a7f3d85b799ea SHA512 fbc524c2f359b489dc337a2aa70fbfc21e4cea0e306d144f45f520875471a66b65cd7687730461bff16c47792a30d81ed2be48895e2809cc24996a2dc26c560e WHIRLPOOL d25a09cb9c53b553690e865385be90cd696ed6135734d4d2f3814bd30e386c5f0bff05e7cd4f34c737dd2db2e35f590023b4dd7a00e767abdad9acf60775d684
 AUX cairo-1.10.2-qt-surface.patch 2687 SHA256 fb96199ec7a4cf8527726be8d0333ed883183b56960832218eca1c9ef2e05dbd SHA512 1263f129f96ecf0277ba436cac0229b6245bed273594b2199d6b0f36711e323c966c43d9264e4cc8b69a299c8e9c1ec4af09ae2284bf5ca59a72486b31439c48 WHIRLPOOL 1ec6c56a6e1de3c838fb2dfa541e062e3f63630910a5609fe211bab8c8bbdb1968af021954020b4da208ba43cde18795e6114fccdd13ee0de2e0edd285d7996a
 AUX cairo-1.10.2-ubuntu.patch 1777 SHA256 150d5b9f7f842d574a6e10e579bc8f27ca7b2055af8e0dd455aa0832bc3f4dae SHA512 8d9144fe809c4135f0dbd271d580620da769e2f946386e345783cf2379db458ed5ef964785b66d70b4e44a007c85a9209c85366144ad057d3ac5b60ee80383bc WHIRLPOOL c0754ccdeacc91ee2d222a945d8787ae3379a2881c36d8f0f6c545262baeb8f9fc866dba657f5d706c0b658efd5834c06725c2b942473b8755af10662f8ec088
-AUX cairo-1.12.10-xlib-corruption.patch 3199 SHA256 917c8d49ef881982e124a8e3b22bd4a2160ec3372c3518cf6c45287e10a434b3 SHA512 e7d6ec9729bcc3e755fdf7214d662728686ddecaee10a43ec50fa3bea010db156e063ba9f817ffdbf46ee85bfd4097a927b101b525505dd15eaec79ed622b479 WHIRLPOOL 3783515ab7e0b7700e77b56f699645060531a328b14975259250745a6f180bc36d9d2ac4feb494608a0a073e2729f5cb4662dafe25582ea3617e653497b2fc72
-AUX cairo-1.12.10-xshm-corruption.patch 1039 SHA256 3bf1147514160a76dbd6282e1e1b834155710a34c0f8fae6fe979f91b0cab735 SHA512 e7c793a2468fc3173be9058a250feea8390b3090c81f59ba00c052885077d2ff65e08bbc0536b96e2c7fee136bb2307aa8e8193e54e6dd3fd47107529a65d5c7 WHIRLPOOL 3cc47b61920197c069063805b89c1e0ab8964996c4331eb018049a268ee08275ac0dbb58dce891b58b335808b8c4fb6be565bf95181e6d1bc7a9551e17b5def9
-AUX cairo-1.12.12-disable-test-suite.patch 461 SHA256 da474e8982b1177ee6f8df70ce0867ee4e451a1ff6a94dce53ca2d62a936cd95 SHA512 1985a369fd6d707e816d9bb22aed89039b09fee105c84ffa4c63232dba15e87f12888d6ac735c766c075851e64e53c052df8af1eef08a75d6b908a5244ae2303 WHIRLPOOL c4ad092277b83d110094400af19f98b569297359be32b3e9a07a6e46acd43bcbdc3721838e833180809d647a2c7b941c9be1e8a00a437c3de3602dd8935610b2
-AUX cairo-1.12.14-libpng16.patch 1525 SHA256 f1af9d30e658b795062a42be3ef0bd0e215a69d7f8d3d295910a2459cf7aa21a SHA512 94483ddc3dc6ad4ff6e37c902e845d38375485077fbb682b512ead0b62abbe6708ad4e708bf84abb877c993b938c3412d581b42248ad3e2b77eda03c98437808 WHIRLPOOL fb5721a399059fbc1ea324192b5cd0ce63c9604f8cd3df9ecb51a239b9479450a2cba3786594a5ffec111212daeb72d6a5f14dcff9d081757a97b5344edbd6c0
 AUX cairo-1.12.16-all-clipped-1.patch 1407 SHA256 9bee55cbb316e30f80df929902773190c50a3146754dcd10a712eb904689f904 SHA512 61cc6e02949ac78839bfb515f8c9100617b2179877cee9b72949bfaf4fe71db4cc41a22833c69966cd4eb49111cb6f8cfcd6d0a19f1f5e055b4bfc152baa4db6 WHIRLPOOL c9b5287417e66c9ed13fa6cf55d67aaddfbf0a31827a14c2b86fddb123a010dc3a3b950532a2ccadaaa4b1c935159a57a8b129c9768a80113ed1bc92dbf3ac34
 AUX cairo-1.12.16-all-clipped-2.patch 959 SHA256 f44543a285c36a6433319d3ac95e7a3931e91ffd4ba284a29205b71ad77d4008 SHA512 ae236744df2779523789080a6557eb58e614e6579bfa7df470b4e6f7663b306f06806680c3f907172eb42de42a838f1b168bfd4c453bf3a798b8c04bcfab6d23 WHIRLPOOL e15ef92aa68e2581e999e6f07798d76c90f6f6bdae231c4ca28bc4b70e9d684a0777d85397283ab543f17c0a9599f6fffe219c7a6cd1dd5cb8fbd2a94456128d
 AUX cairo-1.12.16-all-clipped-3.patch 982 SHA256 4fed4974b303e16a67a295683a591fd594706b930d829488b6a87b12c8a17994 SHA512 32ebbaa05fff024bd8493aef350935b2fec098482ac90283b524c4e2ccd6b9f60e1053b7585f5f679b45eb463726c0b4291d840b51bc36e8477d92576ef33c7f WHIRLPOOL e564da5f1aa12990c4470b49f8cf72126530b7189897194c1d2ca6e7c50ddf8ba21c7ef5b037f1ecc53d46c747345f28f0d770bbf882aaef6c03f8c6305d3ba0
 AUX cairo-1.12.16-lto-optional.patch 794 SHA256 7f7c7e7c13c6920019ae8663f3b6d829a250967ddedc13d69614bfe89bf8e327 SHA512 cadbfff501075201800eec9b712f9f7859b2ff1e6fa4f7d0ea09b3c06e43f49b4d2d7c665ad91d90c95e71036875790ce2a5e3b24f11da160e93c4b0ed140c5e WHIRLPOOL 8fca5e0c7e120e306f56e2e21438053b688d5363b14569e0e3d8212469a4a17eb21dd9fb910467930b81d0773cac345a348176a61eca788ad388f59755d9e462
 AUX cairo-1.12.18-disable-test-suite.patch 390 SHA256 3ec119ac2380f8565cebbcea4f745e89eeb78686e76e6b15345a76f05812c254 SHA512 097c1a32e007fb6852a0df1ad7f7eab6d00a422247055edf140d3f2b819122b16a9c09e21b9a601766a7facda1961262e68b078944877cab0b3b234eff149783 WHIRLPOOL 5d28d10da94b4d5ea6d90f7eddacf382cfb7307fd312d8029b633cbf5b0cdcaba54148bed100aeab20920974a5bac74fee2b03a7e7893c79360d4ec7f20c13b7
+AUX cairo-1.14.0-align-64bit-types.patch 6017 SHA256 9be8ae26ebc6b16f6693156f86d47939223f9a9fd3d4a2aea355a4719a7b6238 SHA512 3ef4af3453a4813f115c565035df3c8e929e85a024c5cf0dc4e04a59dc11a896446b7595e16c874a647904b7b722ec76da3faa3438e4eb153a10123deef7d8c7 WHIRLPOOL 8bee2e77b6967cc3e318a81d25dd6f9e390dff56f0807c5a38102331fb5c95ddf854a40651d9791ac5d0ec32e35c35c55b4188bd7b55c123f705f4bb0ed62b29
 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.14.tar.xz 42132464 SHA256 96d0d1e3f9b74d2ca3469ff187c5e5f25649b1ad35cf06f4f3a83847dff4ac13 SHA512 c676973ab98e018291aeced53bcda9b192202f1a7d65c845798decfaee015f40600f4db32c8977ba4a3e6ff8dc10478f6fd06e83be7e6cca610be8aafd125ee0 WHIRLPOOL 36fbe32711de3b6ae213e819c456e22fa0d629f3a6d99cdad8d2c77a810f9a758191c0d10e6933bf57e60b3b5573e9bceb0b0955512d2e2c981e98eac6907709
 DIST cairo-1.12.16.tar.xz 35889824 SHA256 2505959eb3f1de3e1841023b61585bfd35684b9733c7b6a3643f4f4cbde6d846 SHA512 35389305ba0906e2e1beab92966650fc7d7f8f41231e355ea2bf8693a333946f0693c125d1c50681e12b7f2aff85ae1fdcf957f3d83bc7eaacd52569884c6b2f WHIRLPOOL 00c5e237ac67c2287f90f204456178dcd123126c42669fa63e3dc04fbf9b46d867c554b8f2ecaf803a2553c388661fda5efc4803d6c1f30d7d8fc75fff06cde0
 DIST cairo-1.12.18.tar.xz 38276736 SHA256 dc59f0b7ac945ce4e138a03c227a29260915a8b05a4226c1f6f1be586ba7f5b6 SHA512 238b426ee010a0b0a8d55e61043f95a87438f73f900b3b293dea61b8e7ff3cc84e0aa0b779b2a1d43d2d153490bd053cbbc9ec69ceb9b3f482797638260fbef2 WHIRLPOOL e4408a3f6185f1d7e0f1c95f4beb266c48722ba075329621c1a6a6f2ad3114c334ceb6b242d661d7d3e7e7a3b3fcd013c5806c17b637bfa7a59895cc70fc66cf
+DIST cairo-1.14.0.tar.xz 36584076 SHA256 2cf5f81432e77ea4359af9dcd0f4faf37d015934501391c311bfd2d19a0134b7 SHA512 46900fac809763d610062d92fad6a65440d63f957907ebccc82cd90222bb8fea9782293b7825bdf9d86c396dd7f3879043a4c69dd80b519efa5488357c34ab58 WHIRLPOOL 8ac5e8be6f56f1636529ac61506db123ee343b051d99463b1644abf56b5e7eeb16197eab08c6d29faf4d99c8c0ba7d43902def99e33af1e20882bf44c5825309
 EBUILD cairo-1.10.2-r3.ebuild 4382 SHA256 1656fb57c943b71b588ca8427320067fdf91ae83331e8c4dead61a2461c83c18 SHA512 8392faa29b007706de4c2b6d61e3507bfcbccc07689239c7eb98e8b19547d4c656b18f507188e1d150a63f18782d864ecd4c5d70abff7c22033a4be5e775d9bf WHIRLPOOL 515c656ea979ed756b38f42db19b839f679c52a9f349a84430aaf31467634f66355d8a2d41a578d39e2ea6179c4baec94b73eefdba5905b8c291269070a00fb7
-EBUILD cairo-1.12.14-r4.ebuild 4232 SHA256 a9500a5fa9b6d903037ee11953945799c5031f8c568e03c3cf5464159223620c SHA512 b5804488072756fc86fcd4c35d536b9bad30456319df6f0fec9cf8061ae8a76cebe79c2d002f22e26300ae8a71b7057f847a8b1951307bb46a863dfaa60694db WHIRLPOOL 64dcd45bd8e7e4cc5f8956e31724f32596cc840cad495c7b79ab224f91259c6ec0708b819166b85fd01d06387e43522d3e8660cfc4c95c9af8344adc4460663c
-EBUILD cairo-1.12.16-r2.ebuild 5491 SHA256 67a756c661a62d5fc1c81638dd95b80a8774d39d8c26e73fa12f5b850de1a785 SHA512 bbd0d9a8a2486607a1edc6576f40a92503ebdc86223a5c31b5f5a319d88735fce18a643f4801ff40713a3a9b1b803f67b5974ca70d542973772085ce70a6cd5b WHIRLPOOL d7228036b8924d765c2b9637688cbe97b9abe9b56c44e96c1bdbac09a183dc60a836eba30f39a1fc13a12dd0b05f3fb5d1af9387aa716e5178dc68a0e58b442e
-EBUILD cairo-1.12.16-r3.ebuild 6010 SHA256 969f19a64a47e4e812c472c52588c1a574a37e5855ece60a041a593ca78f9294 SHA512 2fd9e6925b7cf0ee1ccf2e2b25a6fec30698b40ca4ca96f2524a511a7c89d239d0ccec8bbfcb22d15ea2526682f3d3a4d8891e5b229c067d25478cdafdb0b7a8 WHIRLPOOL e3f6810bad330d8601ce03a5aaff024f36cf76d20da29e50eea567eff4b13176abe692a28761babb8396d98d36c1d18434c9fc7eb0b716e074c6e46a954fc280
 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.ebuild 5345 SHA256 5e533cf8c9fbdcf0d0f0332dce8745eceec3d1b21548715e9d661aea9986675e SHA512 7cae826aa5968f6c28aada62929dd06a78b179877dad7dbff4779dc04a01c6942abcaf9081634b5988dfbadc78f6a951c7ec5d7092243890fed3efeedfeacd22 WHIRLPOOL 24a02da763a50c1f1d1bda1f1fa0fac7f9b8e2981a49ba45a3e53e8baf9d52c69fc32f297b05fec50a4631df42d4f7bf60b404cc0351c2ccbd3e3384f9df1dfb
-EBUILD cairo-9999.ebuild 5343 SHA256 87169f9c915e502c88f35a5ad27b2b11427dfcf9ceed65080b8a2776d7605e07 SHA512 fba2d79bbf0ca5c5dbda679749f84f0ac15393ed0a722879c9efc8b56324d56ad9fe9bcf5373bad976b0156869b5a1d6b17172517cea038d22b820c69b3e5c26 WHIRLPOOL 0a06ab612b60a6e37ed89d3117ca0db450c113e7f820caae4e1609c3d0d522884096d5bdf04f8612c43266498378f426b4de2cc75660834258360e53bd0b3a86
-MISC ChangeLog 59466 SHA256 6039e3ca962f60f84d527ff87826c4cf653f9384a5f576049a84ce58a95cb561 SHA512 dccbcaa0b012c90377313e367c13ae754d36d2c0a19f71d40c47c25d6edb02c3d6b2218af21b89b3fc65ea4542ef4403426deec9e16f41adeeca6f5a3541bb19 WHIRLPOOL 03d39e5fc17c42cfe50e48589cb58ff57b3e5dca3af45452fba5912d6a5f593f1dd0f1e577f18449aa325dba227172419e19891e9e981b3496d5a6ba37ebe608
+EBUILD cairo-1.14.0.ebuild 5416 SHA256 8468c3e1a2af7dc9e6953ce708575f2b361be9ccb38502fdd33393d5fc407337 SHA512 235d645321e3c30e185da33c19e39d5f16dab389b52378713201da3f0cd88acddf3f44e95c3fe03a397b34c96657341b0d7de84bcbf1c7b15fff843a780cc961 WHIRLPOOL e18c86cc4d43f018e8c1ba77234dd2682adaa74f0714fcdb3051f76165bae6b8baf70045d4a4f176b5d4fd7404bade66ec1b522207375f33501722e82747ab46
+EBUILD cairo-9999.ebuild 5344 SHA256 26cba4d7ac2c69ea78498dda27557704c427e819b376dd5d49146bd64a2a1c79 SHA512 56e1dfd616a3a5d87734505af0fe1adfc7823e5985cc10211246fc528a2d30172c55d31fb1ca5dd8980d415cb8b96ba3ca6fedf93f3f1bebc004e41870b386dc WHIRLPOOL 895c7384ab7c1041cc3e53f21edaa5fa03d43861cda92932b48420fc946e7941c1e2860637d6b9ce5528e54414e83a57abf3def710123e74ef60e330ca9f634b
+MISC ChangeLog 60034 SHA256 8fd8fca200d5338d37e5649c4153ca8648425bd3c41d7096abbce8fe11594381 SHA512 e7ff919d39158ca52b654c11d436f31c2dc3ef0c57560a1164d21161a72e79017916e1cae5c5fc387c8b9a3dea9781c3a99f4c5bb52f227a64fe45f8039a6775 WHIRLPOOL f96ccf153488327f79cc24f5ac72b969cb239b8fd950e94cf23da269af14281323d29f3ea24cea11681e1b2aa4eeb0107b25109162acedc388818fc371491663
 MISC metadata.xml 1294 SHA256 988ed8eceb7738628f10a041a322482997d26a5fed1fd42eb86bd742a6e3602c SHA512 7d333210abf19ed97a1210d37d77a1cbe944220f16757a0c652c1a329d00cc387ebf2ca174db6dc7f79a892ab068c66d773c364da0321fcfeec0a05d84946bcf WHIRLPOOL b0d67117667918643b4d889b74207b995d8fa1c851786fc89bb81cecc5c46e89714533eb2f8cd005e1175ac8c79eb5d3912826e87cf1c34886103b5a4d7e06a2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJUzOK/AAoJELp701BxlEWfE1sQAKiytqGltxnDQoopH9qzkYPW
-93+iRIMMAlk99/T87fwLLzEe0QQU72jr0FJl0jTyZSAZXeDFcEAb+5I+HxyYUUWx
-djz1JJmR+sYSGBCYoqagoWr3LNgf6CUiA6qDyLoZK2ZhSIvhcrZCRP159vMyzrys
-ZkvGF1In0Sr1k8y1bTV1PAWgZp1AnfUWo/spVxR4YB7H42blfAAfEZCJ1HymD1GJ
-pBMQbe8ncBP6Lcfgfi9TOMKSCEimE9z+ratJXNmn+xBBtbYCwloWsowDmPkgPtxC
-smpBhZdMNiAbBYfFlieSkocxoEato8wDtn1IuWiJIgbROZalrN9Sf6xf6xgA6dCm
-w7NeI0Tx913RFxUiWcxmIclGy252NYjEPAWMru7N1nDjL+RpCyZIt5qhBkorqb6X
-+7ku+ATOjTT8RO9gOvbMjedF3RrNjoINbRjrnumX5BJaf2x4txE7hhBg77u+fK3B
-duvyXeLlqUjmr+bjCufAFa1b4wgiPtG0hrdHfmOX8nuj4ZOFOHwHvaghZbJbSyHC
-uoqmLnmcuYedfLQJkTNB8MjX2N4U0fnVBR8DQAMGtgfWq1X12tSliA7UrjO06v6g
-fcEodOndOIMJq/HX47+0wzmm4/+AcQhxrJXbSj7Uh0o0Lb2JgB30DiubXki8VBAV
-eSQ7X9DlmezWbx3rFXf8
-=2Rht
+iQJ8BAEBCABmBQJU5FDtXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RTNCRkUzRDRBNkI2MEEwQkYwQzMyOEEx
+OEU1QjZGMkQ4RDVFQzhEAAoJEBjltvLY1eyNoREQANhMNKV3n2xh1kqdFBLPloAl
+gFcbebDHImgtUtIJM9q+xu6gFtuy2y4yONL9F9z4Qn/xmEQ7qVH2gSK4vFfihLfG
+hdllwmSF6HV6oWc4pRupWYds5f0kd2pu7HnaL55V/0pMwcRySs9Rnk7tMis5+IB4
+b8cXOTAYYdSBX5NMOy0HZsF8kLu2GAd9H8Ry5pjqhHeBoNm5i7oIV0/aVobjKfuY
+IDMJ3r/2G7q9ucVfL3OoQOfcLR9OIcXrEwSX16QR5/gXFGKzJSd2NbGGNyfx7kdQ
+wrGM3jdgoYYUrPBx5g2VHII1fMb4BsBS7caq43/kJI8PZwcjcQF4WCcQxtIqRnap
+SzWP56eGuyIiCDo8zYAYdwfzrdkwFOyhHpQgo0qpntatDKPKr+Sy24SqwmM4qCAe
+pcHoNAPxO75pSPOM8sU0Xc6J7BN4KWbaEkwrSjJ8v7rxPl5z/TGhZK4+JdPuH/1c
+Ybhlxxu4c3h8Nszmb0XiXraEiNTJXNlcfJD/cfqXw7gc+yuR0dUq5mF7R/Ud3Wt6
+c+ae4t6stXC6rWX5/e4hS7IbBV0o6JZzgf43BPJoEcbD8EIW6XuuMmt1ekvsKAtK
+K2UaFnDxCOXH+9kGvil7cNQQoMHxQDFSQA8V1D99oXImIwPbTWcdznT8+oyyMY0V
+C4GN+FxvmDDlU+OYyLbk
+=d6+i
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/cairo/cairo-1.12.14-r4.ebuild b/x11-libs/cairo/cairo-1.12.14-r4.ebuild
deleted file mode 100644
index d9dd3c951ef3..000000000000
--- a/x11-libs/cairo/cairo-1.12.14-r4.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.12.14-r4.ebuild,v 1.14 2014/07/26 08:57:55 ssuominen 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 ~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"
-HOMEPAGE="http://cairographics.org/"
-LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
-SLOT="0"
-IUSE="X aqua debug directfb doc drm gallium gles2 +glib legacy-drivers opengl openvg qt4 static-libs +svg valgrind xcb xlib-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="dev-libs/lzo
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/libpng:0=
-	sys-libs/zlib
-	>=x11-libs/pixman-0.28.0
-	directfb? ( dev-libs/DirectFB )
-	gles2? ( media-libs/mesa[gles2] )
-	glib? ( >=dev-libs/glib-2.28.6:2 )
-	opengl? ( || ( media-libs/mesa[egl] media-libs/opengl-apple ) )
-	openvg? ( media-libs/mesa[openvg] )
-	qt4? ( >=dev-qt/qtgui-4.8:4 )
-	X? (
-		>=x11-libs/libXrender-0.6
-		x11-libs/libXext
-		x11-libs/libX11
-		drm? (
-			virtual/libudev
-			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 )
-	gles2? ( !opengl )
-	openvg? ( || ( gles2 opengl ) )
-	xlib-xcb? ( xcb )
-"
-
-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}-respect-fontconfig.patch
-	epatch "${FILESDIR}"/${PN}-1.12.12-disable-test-suite.patch
-	epatch "${FILESDIR}"/${PN}-1.12.14-libpng16.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
-
-	[[ ${CHOST} == *-interix* ]] && append-flags -D_REENTRANT
-
-	use elibc_FreeBSD && myopts+=" --disable-symbol-lookup"
-
-	econf \
-		--disable-dependency-tracking \
-		$(use_with X x) \
-		$(use_enable X tee) \
-		$(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 drm) \
-		$(use_enable directfb) \
-		$(use_enable gallium) \
-		$(use_enable gles2 glesv2) \
-		$(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 valgrind) \
-		$(use_enable xcb) \
-		$(use_enable xcb xcb-shm) \
-		$(use_enable xlib-xcb) \
-		--enable-ft \
-		--enable-pdf \
-		--enable-png \
-		--enable-ps \
-		${myopts}
-}
-
-src_install() {
-	# parallel make install fails
-	emake -j1 DESTDIR="${D}" install
-	find "${ED}" -name '*.la' -exec rm -f {} +
-	dodoc AUTHORS ChangeLog NEWS README
-}
-
-pkg_postinst() {
-	if use !xlib-xcb; then
-		if has_version net-misc/nxserver-freenx \
-				|| has_version net-misc/x2goserver; then
-			ewarn "cairo-1.12 is known to cause GTK+ errors with NX servers."
-			ewarn "Enable USE=\"xlib-xcb\" if you notice incorrect behavior in GTK+"
-			ewarn "applications that are running inside NX sessions. For details, see"
-			ewarn "https://bugs.gentoo.org/441878 or https://bugs.freedesktop.org/59173"
-		fi
-	fi
-}
diff --git a/x11-libs/cairo/cairo-1.12.16-r3.ebuild b/x11-libs/cairo/cairo-1.12.16-r3.ebuild
deleted file mode 100644
index 8e641d48103e..000000000000
--- a/x11-libs/cairo/cairo-1.12.16-r3.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.12.16-r3.ebuild,v 1.8 2014/12/23 21:27:09 mgorny Exp $
-
-EAPI=5
-
-inherit eutils flag-o-matic autotools multilib-minimal
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-2
-	EGIT_REPO_URI="git://anongit.freedesktop.org/git/cairo"
-	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"
-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 drm gallium gles2 +glib legacy-drivers opengl openvg qt4 static-libs +svg valgrind xcb xlib-xcb"
-# gtk-doc regeneration doesn't seem to work with out-of-source builds
-#[[ ${PV} == *9999* ]] && IUSE="${IUSE} doc" # API docs are provided in tarball, no need to regenerate
-
-# Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it
-RESTRICT="test"
-
-RDEPEND=">=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}]
-	>=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
-	>=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}]
-	>=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/pixman-0.32.4[${MULTILIB_USEDEP}]
-	directfb? ( dev-libs/DirectFB )
-	gles2? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] )
-	glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
-	opengl? ( || ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] media-libs/opengl-apple ) )
-	openvg? ( >=media-libs/mesa-9.1.6[openvg,${MULTILIB_USEDEP}] )
-	qt4? ( >=dev-qt/qtgui-4.8:4[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		drm? (
-			>=virtual/libudev-208:=[${MULTILIB_USEDEP}]
-			gallium? ( >=media-libs/mesa-9.1.6[gallium,${MULTILIB_USEDEP}] )
-		)
-	)
-	xcb? (
-		>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
-	)
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-gtklibs-20131008-r1
-		!app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=sys-devel/libtool-2
-	X? (
-		>=x11-proto/renderproto-0.11.1-r1[${MULTILIB_USEDEP}]
-		drm? (
-			>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
-			>=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
-		)
-	)"
-#[[ ${PV} == *9999* ]] && DEPEND="${DEPEND}
-#	doc? (
-#		>=dev-util/gtk-doc-1.6
-#		~app-text/docbook-xml-dtd-4.2
-#	)"
-
-# drm module requires X
-# for gallium we need to enable drm
-REQUIRED_USE="
-	drm? ( X )
-	gallium? ( drm )
-	gles2? ( !opengl )
-	openvg? ( || ( gles2 opengl ) )
-	xlib-xcb? ( xcb )
-"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/cairo/cairo-features.h
-	/usr/include/cairo/cairo-directfb.h
-)
-
-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}-respect-fontconfig.patch
-
-	# all-clipped handling from 1.13
-	epatch "${FILESDIR}"/${PN}-1.12.16-all-clipped-{1,2}.patch
-	# bug #507478, https://bugs.freedesktop.org/show_bug.cgi?id=77931
-	epatch "${FILESDIR}"/${PN}-1.12.16-all-clipped-3.patch
-
-	# allow the automagically injected -flto flag to be not injected
-	epatch "${FILESDIR}"/${PN}-1.12.16-lto-optional.patch
-
-	# tests and perf tools require X, bug #483574
-	if ! use X; then
-		sed -e '/^SUBDIRS/ s#boilerplate test perf# #' -i Makefile.am || die
-	fi
-
-	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
-}
-
-multilib_src_configure() {
-	local myopts
-
-	[[ ${CHOST} == *-interix* ]] && append-flags -D_REENTRANT
-
-	use elibc_FreeBSD && myopts+=" --disable-symbol-lookup"
-
-	# TODO: remove this (and add USE-dep) when DirectFB is converted,
-	# bug #484248 -- but beware of the circular dep.
-	if ! multilib_is_native_abi; then
-		myopts+=" --disable-directfb"
-	fi
-
-	# TODO: remove this (and add USE-dep) when qtgui is converted, bug #498010
-	if ! multilib_is_native_abi; then
-		myopts+=" --disable-qt"
-	fi
-
-	# [[ ${PV} == *9999* ]] && myopts+=" $(use_enable doc gtk-doc)"
-
-	ECONF_SOURCE="${S}" \
-	econf \
-		--disable-dependency-tracking \
-		$(use_with X x) \
-		$(use_enable X tee) \
-		$(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 drm) \
-		$(use_enable directfb) \
-		$(use_enable gallium) \
-		$(use_enable gles2 glesv2) \
-		$(use_enable glib gobject) \
-		$(use_enable openvg vg) \
-		$(use_enable opengl gl) \
-		$(use_enable qt4 qt) \
-		$(use_enable static-libs static) \
-		$(use_enable svg) \
-		$(use_enable valgrind) \
-		$(use_enable xcb) \
-		$(use_enable xcb xcb-shm) \
-		$(use_enable xlib-xcb) \
-		--enable-ft \
-		--enable-pdf \
-		--enable-png \
-		--enable-ps \
-		--disable-lto \
-		${myopts}
-}
-
-multilib_src_install() {
-	# parallel make install fails
-	emake -j1 DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	prune_libtool_files --all
-	einstalldocs
-}
-
-pkg_postinst() {
-	if use !xlib-xcb; then
-		if has_version net-misc/nxserver-freenx \
-				|| has_version net-misc/x2goserver; then
-			ewarn "cairo-1.12 is known to cause GTK+ errors with NX servers."
-			ewarn "Enable USE=\"xlib-xcb\" if you notice incorrect behavior in GTK+"
-			ewarn "applications that are running inside NX sessions. For details, see"
-			ewarn "https://bugs.gentoo.org/441878 or https://bugs.freedesktop.org/59173"
-		fi
-	fi
-}
diff --git a/x11-libs/cairo/cairo-1.12.16-r2.ebuild b/x11-libs/cairo/cairo-1.14.0.ebuild
index 3bf5ca3f232f..7199f4fe58a4 100644
--- a/x11-libs/cairo/cairo-1.12.16-r2.ebuild
+++ b/x11-libs/cairo/cairo-1.14.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# 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.16-r2.ebuild,v 1.8 2014/07/26 08:57:55 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.14.0.ebuild,v 1.1 2015/02/18 08:44:20 tetromino Exp $
 
 EAPI=5
 
@@ -19,7 +19,7 @@ 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 drm gallium gles2 +glib legacy-drivers opengl openvg qt4 static-libs +svg valgrind xcb xlib-xcb"
+IUSE="X aqua debug directfb drm gallium gles2 +glib opengl openvg qt4 static-libs +svg valgrind xcb xlib-xcb"
 # gtk-doc regeneration doesn't seem to work with out-of-source builds
 #[[ ${PV} == *9999* ]] && IUSE="${IUSE} doc" # API docs are provided in tarball, no need to regenerate
 
@@ -37,13 +37,13 @@ RDEPEND=">=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}]
 	glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
 	opengl? ( || ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] media-libs/opengl-apple ) )
 	openvg? ( >=media-libs/mesa-9.1.6[openvg,${MULTILIB_USEDEP}] )
-	qt4? ( >=dev-qt/qtgui-4.8:4 )
+	qt4? ( >=dev-qt/qtgui-4.8:4[${MULTILIB_USEDEP}] )
 	X? (
 		>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
 		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
 		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
 		drm? (
-			>=virtual/libudev-208[${MULTILIB_USEDEP}]
+			>=virtual/libudev-208:=[${MULTILIB_USEDEP}]
 			gallium? ( >=media-libs/mesa-9.1.6[gallium,${MULTILIB_USEDEP}] )
 		)
 	)
@@ -86,9 +86,17 @@ MULTILIB_WRAPPED_HEADERS=(
 )
 
 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.12.18-disable-test-suite.patch
 	epatch "${FILESDIR}"/${PN}-respect-fontconfig.patch
+
+	# fixed in 1.14.1
+	epatch "${FILESDIR}"/${P}-align-64bit-types.patch
+
+	# tests and perf tools require X, bug #483574
+	if ! use X; then
+		sed -e '/^SUBDIRS/ s#boilerplate test perf# #' -i Makefile.am || die
+	fi
+
 	epatch_user
 
 	# Slightly messed build system YAY
@@ -98,8 +106,6 @@ src_prepare() {
 		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
 }
 
@@ -154,11 +160,6 @@ multilib_src_configure() {
 		${myopts}
 }
 
-multilib_src_install() {
-	# parallel make install fails
-	emake -j1 DESTDIR="${D}" install
-}
-
 multilib_src_install_all() {
 	prune_libtool_files --all
 	einstalldocs
diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild
index 336b0b1e3991..f26868466109 100644
--- a/x11-libs/cairo/cairo-9999.ebuild
+++ b/x11-libs/cairo/cairo-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# 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-9999.ebuild,v 1.54 2014/12/09 21:35:55 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild,v 1.55 2015/02/18 08:44:20 tetromino Exp $
 
 EAPI=5
 
diff --git a/x11-libs/cairo/files/cairo-1.12.10-xlib-corruption.patch b/x11-libs/cairo/files/cairo-1.12.10-xlib-corruption.patch
deleted file mode 100644
index 84bab57e4d16..000000000000
--- a/x11-libs/cairo/files/cairo-1.12.10-xlib-corruption.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From fa4f48cccb6c7f4e1afb2ff4b98b906b7d8d4afc Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Wed, 23 Jan 2013 15:04:26 +0000
-Subject: xlib: Do not upload the whole image just because we want an entire row
-
-Fixes regression exposed by
-
-commit a73e7ff0186176bc82cd3ae1432c054c1fd3aebd
-Author: Chris Wilson <chris@chris-wilson.co.uk>
-Date:   Sun Jan 6 11:29:27 2013 +0000
-
-    xlib: Simplify source creation by use of map-to-image
-
-but ultimately from
-
-commit 74941f822015cc50cd8477d0cf97f1a70dbff60b
-Author: Chris Wilson <chris@chris-wilson.co.uk>
-Date:   Wed Jan 2 22:27:55 2013 +0000
-
-    xlib: Use SHM transport for ordinary image uploads
-
-Reported-by: Gökçen Eraslan <gokcen.eraslan@gmail.com>
-Reported-by: Guillaume Ayoub <guillaume.ayoub@kozea.fr>
-Reported-by: Emmanuel Benisty <benisty.e@gmail.com>
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=59635
-Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
----
-diff --git a/src/cairo-xlib-source.c b/src/cairo-xlib-source.c
-index 24290f7..ca55278 100644
---- a/src/cairo-xlib-source.c
-+++ b/src/cairo-xlib-source.c
-@@ -1035,7 +1035,13 @@ surface_source (cairo_xlib_surface_t *dst,
- 
- 	status = _cairo_surface_unmap_image (&xsrc->base, image);
- 	if (unlikely (status)) {
--	    cairo_surface_destroy (src);
-+	    cairo_surface_destroy (&xsrc->base);
-+	    return _cairo_surface_create_in_error (status);
-+	}
-+
-+	status = _cairo_xlib_surface_put_shm (xsrc);
-+	if (unlikely (status)) {
-+	    cairo_surface_destroy (&xsrc->base);
- 	    return _cairo_surface_create_in_error (status);
- 	}
-     }
-diff --git a/src/cairo-xlib-surface.c b/src/cairo-xlib-surface.c
-index dbc677e..ee69b66 100644
---- a/src/cairo-xlib-surface.c
-+++ b/src/cairo-xlib-surface.c
-@@ -1139,26 +1139,24 @@ _cairo_xlib_surface_draw_image (cairo_xlib_surface_t   *surface,
- 		max_request_size = XMaxRequestSize (display->display);
- 	    if (max_request_size > 8192)
- 		max_request_size = 8192;
--	    if (image->stride * image->height > max_request_size) {
-+	    if (width * height * 4 > max_request_size) {
- 		shm_image = _cairo_xlib_surface_create_shm__image (surface,
- 								   image->pixman_format,
--								   image->width,
--								   image->height);
-+								   width, height);
- 		if (shm_image && shm_image->status == CAIRO_STATUS_SUCCESS) {
- 		    cairo_image_surface_t *clone = (cairo_image_surface_t *) shm_image;
--		    if (clone->stride == image->stride) {
--			memcpy (clone->data, image->data, clone->stride * clone->height);
--		    } else {
--			pixman_image_composite32 (PIXMAN_OP_SRC,
--						  image->pixman_image, NULL, clone->pixman_image,
--						  0, 0,
--						  0, 0,
--						  0, 0,
--						  image->width, image->height);
--		    }
-+		    pixman_image_composite32 (PIXMAN_OP_SRC,
-+					      image->pixman_image, NULL, clone->pixman_image,
-+					      src_x, src_y,
-+					      0, 0,
-+					      0, 0,
-+					      width, height);
- 		    ximage.obdata = _cairo_xlib_shm_surface_get_obdata (shm_image);
- 		    ximage.data = (char *)clone->data;
- 		    ximage.bytes_per_line = clone->stride;
-+		    ximage.width = width;
-+		    ximage.height = height;
-+		    src_x = src_y = 0;
- 		}
- 	    }
- 	} else
---
-cgit v0.9.0.2-2-gbebe
diff --git a/x11-libs/cairo/files/cairo-1.12.10-xshm-corruption.patch b/x11-libs/cairo/files/cairo-1.12.10-xshm-corruption.patch
deleted file mode 100644
index 92bf13496a4e..000000000000
--- a/x11-libs/cairo/files/cairo-1.12.10-xshm-corruption.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From c006b886d28a772d7a62cec52ab7e0c8196c36f6 Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Tue, 29 Jan 2013 03:01:31 +0000
-Subject: xlib/shm: Force synchronisation for scratch SHM image buffers
-
-The scratch image buffers are used for uploads to the xserver and so we
-must be careful not to overwrite active SHM segments. Unfortunately we
-told the core SHM allocator that we would sync before using the images,
-which was a lie.
-
-Reported-by: Michael Natterer <mitch@gimp.org>
-Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
----
-diff --git a/src/cairo-xlib-surface-shm.c b/src/cairo-xlib-surface-shm.c
-index 43cecdf..32c7033 100644
---- a/src/cairo-xlib-surface-shm.c
-+++ b/src/cairo-xlib-surface-shm.c
-@@ -1155,7 +1155,7 @@ _cairo_xlib_surface_create_shm__image (cairo_xlib_surface_t *surface,
- 	return NULL;
- 
-     return &_cairo_xlib_shm_surface_create (surface, format, width, height,
--					    TRUE, 0)->image.base;
-+					    FALSE, 0)->image.base;
- }
- 
- cairo_surface_t *
---
-cgit v0.9.0.2-2-gbebe
diff --git a/x11-libs/cairo/files/cairo-1.12.12-disable-test-suite.patch b/x11-libs/cairo/files/cairo-1.12.12-disable-test-suite.patch
deleted file mode 100644
index 37033d7f1617..000000000000
--- a/x11-libs/cairo/files/cairo-1.12.12-disable-test-suite.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN cairo-1.12.10.orig/test/Makefile.am cairo-1.12.10/test/Makefile.am
---- cairo-1.12.10.orig/test/Makefile.am	2013-01-27 14:56:03.345178612 -0800
-+++ cairo-1.12.10/test/Makefile.am	2013-01-27 14:56:15.371177856 -0800
-@@ -71,8 +71,6 @@
- endif
- test_sources += $(test)
- 
--noinst_PROGRAMS = cairo-test-suite$(EXEEXT) # always build
--
- TESTS += cairo-test-suite$(EXEEXT)
- 
- cairo-test-constructors.c: Makefile $(test_sources) make-cairo-test-constructors.sh
diff --git a/x11-libs/cairo/files/cairo-1.12.14-libpng16.patch b/x11-libs/cairo/files/cairo-1.12.14-libpng16.patch
deleted file mode 100644
index c16317811982..000000000000
--- a/x11-libs/cairo/files/cairo-1.12.14-libpng16.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 2dd2c826a5b367d32cf2d48ed69754795990c5db Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Tue, 16 Apr 2013 09:58:56 +0000
-Subject: png: Avoid marking the surface as in error after a png warning
-
-It turns out that libpng will continue to load an image after throwing a
-warning, and that libpng16 now throws warnings for images that libpng15
-and earlier loaded without error. As we were happily loading those
-images into cairo surfaces before, we are therefore being overzealous
-in throwing an error now - so just squelch the warning.
-
-Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
----
-diff --git a/src/cairo-png.c b/src/cairo-png.c
-index e74a4a8..068617d 100644
---- a/src/cairo-png.c
-+++ b/src/cairo-png.c
-@@ -149,13 +149,13 @@ static void
- png_simple_warning_callback (png_structp png,
- 	                     png_const_charp error_msg)
- {
--    cairo_status_t *error = png_get_error_ptr (png);
--
--    /* default to the most likely error */
--    if (*error == CAIRO_STATUS_SUCCESS)
--	*error = _cairo_error (CAIRO_STATUS_NO_MEMORY);
--
--    /* png does not expect to abort and will try to tidy up after a warning */
-+    /* png does not expect to abort and will try to tidy up and continue
-+     * loading the image after a warning. So we also want to return the
-+     * (incorrect?) surface.
-+     *
-+     * We use our own warning callback to squelch any attempts by libpng
-+     * to write to stderr as we may not be in control of that output.
-+     */
- }
- 
- 
---
-cgit v0.9.0.2-2-gbebe
diff --git a/x11-libs/cairo/files/cairo-1.14.0-align-64bit-types.patch b/x11-libs/cairo/files/cairo-1.14.0-align-64bit-types.patch
new file mode 100644
index 000000000000..82fd50092aa0
--- /dev/null
+++ b/x11-libs/cairo/files/cairo-1.14.0-align-64bit-types.patch
@@ -0,0 +1,152 @@
+From fe1b2b92075f1a5849900cdbfa4089b10946c689 Mon Sep 17 00:00:00 2001
+From: Uli Schlachter <psychon@znc.in>
+Date: Fri, 5 Dec 2014 14:43:26 +0100
+Subject: [PATCH] tor-scan-converter: Correctly align 64bit types
+
+On 32bit SPARC the scan converter was causing a SIGBUS due to an unaligned
+memory access while accessing an int64_t. This memory accessing was to struct
+quorem's rem member.
+
+This crash occurred because the tor-scan-converter contains its own
+implementation of a memory pool. This implementation only guarantees an
+alignment of sizeof(void *), which is less than what a 64 bit type requires on
+32bit platforms. This 4 byte alignment is guaranteed, because struct _pool_chunk
+(which is the struct that is used for managing free space) contains elements of
+that size and so the size of that struct is a multiple of this size as well.
+
+This problem was introduced with commit 03c3d4b7c15.
+
+To fix this problem, this commit introduces a int64_t member to struct
+_pool_chunk that marks the beginning of the free data space. Thanks to this, the
+compiler ensures proper alignment and sizeof(struct _pool_chunk) becomes a
+multiple of 8.
+
+However, previously the end of the struct marked the beginning of the data and
+sizeof() was used for correctly calculating offsets to the data section. So,
+just adding such a member would work, but would also waste some memory. To avoid
+this, this commit also changes the rest of the pool implementation to
+accommodate.
+
+Reported-by: Nicolas Setton <setton@adacore.com>
+Signed-off-by: Uli Schlachter <psychon@znc.in>
+Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
+---
+ src/cairo-tor-scan-converter.c | 38 +++++++++++++++++++++++---------------
+ 1 file changed, 23 insertions(+), 15 deletions(-)
+
+diff --git a/src/cairo-tor-scan-converter.c b/src/cairo-tor-scan-converter.c
+index 4adcafb..bd90266 100644
+--- a/src/cairo-tor-scan-converter.c
++++ b/src/cairo-tor-scan-converter.c
+@@ -277,9 +277,14 @@ struct _pool_chunk {
+      * chunk in the pool header. */
+     struct _pool_chunk *prev_chunk;
+ 
+-    /* Actual data starts here.	 Well aligned for pointers. */
++    /* Actual data starts here. Well aligned even for 64 bit types. */
++    int64_t data;
+ };
+ 
++/* The int64_t data member of _pool_chunk just exists to enforce alignment,
++ * it shouldn't be included in the allocated size for the struct. */
++#define SIZEOF_POOL_CHUNK (sizeof(struct _pool_chunk) - sizeof(int64_t))
++
+ /* A memory pool.  This is supposed to be embedded on the stack or
+  * within some other structure.	 It may optionally be followed by an
+  * embedded array from which requests are fulfilled until
+@@ -299,8 +304,11 @@ struct pool {
+ 
+     /* Header for the sentinel chunk.  Directly following the pool
+      * struct should be some space for embedded elements from which
+-     * the sentinel chunk allocates from. */
+-    struct _pool_chunk sentinel[1];
++     * the sentinel chunk allocates from. This is expressed as a char
++     * array so that the 'int64_t data' member of _pool_chunk isn't
++     * included. This way embedding struct pool in other structs works
++     * without wasting space. */
++    char sentinel[SIZEOF_POOL_CHUNK];
+ };
+ 
+ /* A polygon edge. */
+@@ -475,7 +483,7 @@ _pool_chunk_create(struct pool *pool, size_t size)
+ {
+     struct _pool_chunk *p;
+ 
+-    p = malloc(size + sizeof(struct _pool_chunk));
++    p = malloc(SIZEOF_POOL_CHUNK + size);
+     if (unlikely (NULL == p))
+ 	longjmp (*pool->jmp, _cairo_error (CAIRO_STATUS_NO_MEMORY));
+ 
+@@ -489,10 +497,10 @@ pool_init(struct pool *pool,
+ 	  size_t embedded_capacity)
+ {
+     pool->jmp = jmp;
+-    pool->current = pool->sentinel;
++    pool->current = (void*) pool->sentinel;
+     pool->first_free = NULL;
+     pool->default_capacity = default_capacity;
+-    _pool_chunk_init(pool->sentinel, NULL, embedded_capacity);
++    _pool_chunk_init(pool->current, NULL, embedded_capacity);
+ }
+ 
+ static void
+@@ -502,7 +510,7 @@ pool_fini(struct pool *pool)
+     do {
+ 	while (NULL != p) {
+ 	    struct _pool_chunk *prev = p->prev_chunk;
+-	    if (p != pool->sentinel)
++	    if (p != (void *) pool->sentinel)
+ 		free(p);
+ 	    p = prev;
+ 	}
+@@ -542,14 +550,14 @@ _pool_alloc_from_new_chunk(
+ 	chunk = _pool_chunk_create (pool, capacity);
+     pool->current = chunk;
+ 
+-    obj = ((unsigned char*)chunk + sizeof(*chunk) + chunk->size);
++    obj = ((unsigned char*)&chunk->data + chunk->size);
+     chunk->size += size;
+     return obj;
+ }
+ 
+ /* Allocate size bytes from the pool.  The first allocated address
+- * returned from a pool is aligned to sizeof(void*).  Subsequent
+- * addresses will maintain alignment as long as multiples of void* are
++ * returned from a pool is aligned to 8 bytes.  Subsequent
++ * addresses will maintain alignment as long as multiples of 8 are
+  * allocated.  Returns the address of a new memory area or %NULL on
+  * allocation failures.	 The pool retains ownership of the returned
+  * memory. */
+@@ -559,7 +567,7 @@ pool_alloc (struct pool *pool, size_t size)
+     struct _pool_chunk *chunk = pool->current;
+ 
+     if (size <= chunk->capacity - chunk->size) {
+-	void *obj = ((unsigned char*)chunk + sizeof(*chunk) + chunk->size);
++	void *obj = ((unsigned char*)&chunk->data + chunk->size);
+ 	chunk->size += size;
+ 	return obj;
+     } else {
+@@ -573,16 +581,16 @@ pool_reset (struct pool *pool)
+ {
+     /* Transfer all used chunks to the chunk free list. */
+     struct _pool_chunk *chunk = pool->current;
+-    if (chunk != pool->sentinel) {
+-	while (chunk->prev_chunk != pool->sentinel) {
++    if (chunk != (void *) pool->sentinel) {
++	while (chunk->prev_chunk != (void *) pool->sentinel) {
+ 	    chunk = chunk->prev_chunk;
+ 	}
+ 	chunk->prev_chunk = pool->first_free;
+ 	pool->first_free = pool->current;
+     }
+     /* Reset the sentinel as the current chunk. */
+-    pool->current = pool->sentinel;
+-    pool->sentinel->size = 0;
++    pool->current = (void *) pool->sentinel;
++    pool->current->size = 0;
+ }
+ 
+ /* Rewinds the cell list's cursor to the beginning.  After rewinding
+-- 
+2.3.0
+