Add patch to fix graphics corruption, bug #454468.

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

16 files changed, 49 insertions, 1227 deletions

diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog
index 9a8ebd53640c..021a8d0edac5 100644
--- a/x11-libs/cairo/ChangeLog
+++ b/x11-libs/cairo/ChangeLog
@@ -1,6 +1,20 @@
 # 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.324 2013/01/27 11:20:15 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.325 2013/01/31 13:35:51 chithanh Exp $
+
+*cairo-1.12.10-r2 (31 Jan 2013)
+
+  31 Jan 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +cairo-1.12.10-r2.ebuild, +files/cairo-1.12.10-xshm-corruption.patch,
+  -cairo-1.10.2-r2.ebuild, -cairo-1.12.10-r1.ebuild, -cairo-1.12.2-r2.ebuild,
+  -cairo-1.12.2-r3.ebuild, -cairo-1.12.2-r4.ebuild, -cairo-1.12.6.ebuild,
+  -cairo-1.8.10.ebuild, -files/cairo-1.12.2-fdr-nodl.patch,
+  -files/cairo-1.12.2-sphinx-nodl.patch,
+  -files/cairo-1.12.2-surfaceless-extension.patch,
+  -files/cairo-1.2.4-lcd-cleartype-like.diff,
+  -files/cairo-1.8.10-libpng14.patch, files/cairo-1.8.8-interix.patch,
+  metadata.xml:
+  Add patch to fix graphics corruption, bug #454468.
 
 *cairo-1.12.10-r1 (27 Jan 2013)
 
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index b471296b55bd..4c91330a3788 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -4,29 +4,15 @@ AUX cairo-1.10.2-interix.patch 1235 SHA256 d915d69e2eb96f6a4bef1de0c493ed9face7b
 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.2-fdr-nodl.patch 651 SHA256 34d94cf51dcf90384421b4f0ada6ae8cde09b0cf91b1c2f0b0ed56c477ee7cf4 SHA512 f8f0a088d5f9bdbf6925bf69a336ba7bdaea08fbe491bf4eaf705c1a16899a40913e6bdeb8884891c37409ae3dcf2a89ca48f6bba65451680b6672a449dadd05 WHIRLPOOL 05a357ca9ac4b9ed49351adf508454e410d1047598531f5cbb427bd30445d38084a52f2f6030de1d38a5209aed008d7f58f260398d2efe2df20e6b31e6cdc465
-AUX cairo-1.12.2-sphinx-nodl.patch 786 SHA256 5dd5eb09bb596c43e363ddbfc2a87a9b709834f42732628f4d0d99e931cc1f36 SHA512 7a4b65ba7d5502d1532ceeecb8032a23f48f732e2823be16dc68b8858dbbe5795aa9a05a0bda97f287f624871633abbad4271bdea34b966f438fd74b6bfe602e WHIRLPOOL 88cb48c6b893a77d3ad056404ecb6b53d05936dbd8d2c17f2795b3a7d81ad671aa5df57c52f0dfeb1c3be899bc2312a467006c776da79102f477bd718319c0c9
-AUX cairo-1.12.2-surfaceless-extension.patch 1517 SHA256 9d138608c609499d68f1f1c1e48a7f68c39ffffa78cac3cb197776e0e353d05f SHA512 b3bce0d67813ae412d824ed93a4d97202c57c61748307a969a3b9ab499e3acdff1ccfb4c95a4559fe6a2b98bc29682ec088195aab491087acd742de942f34619 WHIRLPOOL d4cadbef80f17edcccdcaaf5528d221f024c4505440741152bdde69be66fbe2deb1ce600385fd81133fe0bb6c88356b6e32799ae347f91ec160b0f1ea4e57fce
-AUX cairo-1.2.4-lcd-cleartype-like.diff 7244 SHA256 4926d20d2b6b5071a5bf9ee9a12a36fef69510ebebd717c1dab151fe650f173a SHA512 8f431963a0d952d44921087dc4f20ccf768f24e6fa892cd07b8f93f13778617dda7aa25a7624aa9d7477cbb8655353aa6499e6086131ea4a511593d0f91acee8 WHIRLPOOL 5f13bcc937451aeb72321c02340dca148568f725054b4e4ff4c01edb27c30b6b92ad415fdfcf12de3591c38cc529ae0369e8ca4a12dd2494fcebad2d4c39fa97
-AUX cairo-1.8.10-libpng14.patch 426 SHA256 b090f829d3b9fb69b83bfa094552335b8382988d60ce7e46558c4069b8bca532 SHA512 77f5558f0b740c09b5e2b8f603e0c10aca1289aea34eb9097e548bd8f9f67bdc72b7df01ae98a3f4398ddc1136a9b16cb31585fb8db22b32c8dbb75259f54fc5 WHIRLPOOL 29cc842601c1ac9b0f0455b34705301da22959f6c2cddff57b7468298d85babea5575d2796ca003d495df04a409a85cebd8dea1137311374cdc204f5c85f332a
+AUX cairo-1.12.10-xshm-corruption.patch 1039 SHA256 3bf1147514160a76dbd6282e1e1b834155710a34c0f8fae6fe979f91b0cab735 SHA512 e7c793a2468fc3173be9058a250feea8390b3090c81f59ba00c052885077d2ff65e08bbc0536b96e2c7fee136bb2307aa8e8193e54e6dd3fd47107529a65d5c7 WHIRLPOOL 3cc47b61920197c069063805b89c1e0ab8964996c4331eb018049a268ee08275ac0dbb58dce891b58b335808b8c4fb6be565bf95181e6d1bc7a9551e17b5def9
 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
-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 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-r1.ebuild 3960 SHA256 da895817d7c932eb92d9abf5f782a34a86e1bc589e88dacb81ede5c6aaf0d957 SHA512 90c201d3b5b719d19007504ff2da06ebb6c155dabc6f319ac75b2b047749215706b632956405bb20744512e6f181e78e6323cca04e65a3656c8a735a4df1a60e WHIRLPOOL 1cfc9c016df9c016de7a50c11ebf2a287c080f799f7c3e081354c2b7099bb98ec20cbb68c1fc2a3754fdc0e216f90b99e83c432670d86816b5d382004e62ef93
-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.10-r2.ebuild 4009 SHA256 9cbfe25fc7eb8b47853701a85d916ecb3aa95226ef0b5c04ae451c18f2c8c542 SHA512 fb14106314368b2cbfebcff7d59c98ba52895ae55554f70a00fe1aab8d956fe303b40241ac402f5e7a1c0bfd9a562e35644bf8fe17f6df27bd5b448f78f87139 WHIRLPOOL b48a9c635b5f47c9ca3eb3c49f45ccd91b822673bbf43c02b1877538197673b7e8aede1495e3feee8851cfeb050ee36ad0f2c0ada5c2df000373ba4704d66a05
 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 3906 SHA256 1f9936dc789060c8be89b49d2276bacadeebf5afe3b70291d680c8e302af98a5 SHA512 a38e0cd4663037216878f00537feb1f103876d8f3a623951cc50f98295db056595e1cbacc2c05c31f5c802c9dd4a66db72c2ad48e881092507d1065fa81970d2 WHIRLPOOL 2b1a5d1ce996c51b75689d492240892aff932e5b9ae095f837dc96d2450644a9afa5d3b454effd3cc525eeb5aa831f4b2eefd32679903da08be3a2678d3b9c44
-MISC ChangeLog 46803 SHA256 5c79531f751380110074e307d7fa664a467d491d368290b8e93cbe7734da358c SHA512 8791a7250683c9c24738b06695f10412f987d6a421c7834fa344f38f794beac9cdd7f26aa30644a7a2201ae37d2cc61fea1a2d161bcdf2acef137c3e2825a2bf WHIRLPOOL 998cac83b1609ccdee4f983ca9cf5668b199f889899cca368fe0b4899c9bba3780d5439ab841bbaf786c9482586b49248d2677119765d6559bf23ef82309798d
-MISC metadata.xml 1094 SHA256 ec9cc0ef816bd991c79a044235b3b447df4d0fac29964bcf0178c4a36b7f3cc6 SHA512 4cc4a4f3626e1b9895a96034c90b1c6fd1029ef44e94be0e0fe75707b3b5c060020d7d0a7910fe69315e3e571ba7027cd86199fb634281b43b9b927878a18e47 WHIRLPOOL 803fc2515bcb2d4321900cb833833c95670bc039a30c88d94fb855e304fd94786c4508c68288f91f0eeb9ebc1d33b5f8453524cbcf9a6695c3495cab34633cee
+MISC ChangeLog 47468 SHA256 18743ffa60870a54b8f9691369f6f89d94045fba56dc6e94fc42ec207a768954 SHA512 4ca78a700a63f0d734779415e37812761561879e16681a3c4e7f7b2fea96eaafdcdc9ca22340dcb29bc958a98e79646837d31d58b301032f0ec2eca636572ed2 WHIRLPOOL ee191079043c2cfc9af9dac68a8f4dd536654eb12a08aa58b1e78b9ee174dd69bbf0818187e1e83e6df3590a12c2d288faf624e2e292b91bd80269c871dc31aa
+MISC metadata.xml 798 SHA256 f9797b2bdea41285e7b75db0f303570d00928b6135f40f869584e77c4dcdfeb1 SHA512 6cf758886d5711ec28d0f4e37f8c5fd863827c69c43930a3bc5755f397838f8a209dcc7f4652cd4d61a126bceb5565a60675ed7d941f49d67ef8a6e2b2b496e1 WHIRLPOOL 40b5b64a9933fa7facc9842409e0f4b4612d74bc940ccf6ec701da649af54507f95abf35820fe3d629e1c0cd15185c881a528e8e4a738375756a74936cb6cb46
diff --git a/x11-libs/cairo/cairo-1.10.2-r2.ebuild b/x11-libs/cairo/cairo-1.10.2-r2.ebuild
deleted file mode 100644
index 5440fad5d0a6..000000000000
--- a/x11-libs/cairo/cairo-1.10.2-r2.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# 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.14 2012/11/28 10:27:31 ssuominen Exp $
-
-EAPI=3
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/cairo"
-[[ ${PV} == *9999 ]] && GIT_ECLASS="git"
-
-inherit eutils flag-o-matic autotools ${GIT_ECLASS}
-
-DESCRIPTION="A vector graphics library with cross-device output support"
-HOMEPAGE="http://cairographics.org/"
-[[ ${PV} == *9999 ]] || SRC_URI="http://cairographics.org/releases/${P}.tar.gz"
-
-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"
-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.18.4
-	directfb? ( dev-libs/DirectFB )
-	glib? ( dev-libs/glib:2 )
-	opengl? ( virtual/opengl )
-	openvg? ( media-libs/mesa[gallium] )
-	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? (
-			>=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
-		)
-	)"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.8.8-interix.patch
-	epatch "${FILESDIR}"/${PN}-1.10.0-buggy_gradients.patch
-	epatch "${FILESDIR}"/${P}-interix.patch
-	epatch "${FILESDIR}"/${P}-qt-surface.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
-
-	# tracing fails to compile, because Solaris' libelf doesn't do large files
-	[[ ${CHOST} == *-solaris* ]] && myopts+=" --disable-trace"
-
-	# 128-bits long arithemetic functions are missing
-	[[ ${CHOST} == powerpc*-*-darwin* ]] && filter-flags -mcpu=*
-
-	#gets rid of fbmmx.c inlining warnings
-	append-flags -finline-limit=1200
-
-	if use X; then
-		myopts+="
-			--enable-tee=yes
-			$(use_enable drm)
-		"
-
-		if use drm; then
-			myopts+="
-				$(use_enable gallium)
-				$(use_enable xcb xcb-drm)
-			"
-		else
-			use gallium && ewarn "Gallium use requires drm use enabled. So disabling for now."
-			myopts+="
-				--disable-gallium
-				--disable-xcb-drm
-			"
-		fi
-	else
-		use drm && ewarn "drm use requires X use enabled. So disabling for now."
-		myopts+="
-			--disable-drm
-			--disable-gallium
-			--disable-xcb-drm
-		"
-	fi
-
-	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) \
-		--enable-ft \
-		--enable-pdf \
-		--enable-png \
-		--enable-ps \
-		--disable-xlib-xcb \
-		${myopts}
-}
-
-src_install() {
-	# parallel make install fails
-	emake -j1 DESTDIR="${D}" install || die
-	find "${ED}" -name '*.la' -exec rm -f {} +
-	dodoc AUTHORS ChangeLog NEWS README || die
-}
diff --git a/x11-libs/cairo/cairo-1.12.10-r1.ebuild b/x11-libs/cairo/cairo-1.12.10-r2.ebuild
index 2f9d968091b7..cbf04af0af83 100644
--- a/x11-libs/cairo/cairo-1.12.10-r1.ebuild
+++ b/x11-libs/cairo/cairo-1.12.10-r2.ebuild
@@ -1,6 +1,6 @@
 # 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-r1.ebuild,v 1.1 2013/01/27 11:20:15 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.12.10-r2.ebuild,v 1.1 2013/01/31 13:35:51 chithanh Exp $
 
 EAPI=5
 
@@ -76,6 +76,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.10.2-qt-surface.patch
 	epatch "${FILESDIR}"/${PN}-respect-fontconfig.patch
 	epatch "${FILESDIR}"/${P}-xlib-corruption.patch
+	epatch "${FILESDIR}"/${P}-xshm-corruption.patch
 	epatch_user
 
 	# Slightly messed build system YAY
diff --git a/x11-libs/cairo/cairo-1.12.2-r2.ebuild b/x11-libs/cairo/cairo-1.12.2-r2.ebuild
deleted file mode 100644
index 724f1c83110c..000000000000
--- a/x11-libs/cairo/cairo-1.12.2-r2.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# 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.2-r2.ebuild,v 1.3 2012/11/28 10:27:31 ssuominen 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? (
-			>=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
-	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-1.12.2-r3.ebuild b/x11-libs/cairo/cairo-1.12.2-r3.ebuild
deleted file mode 100644
index 768a2233972e..000000000000
--- a/x11-libs/cairo/cairo-1.12.2-r3.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# 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.2-r3.ebuild,v 1.3 2012/11/28 10:27:31 ssuominen 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? (
-			>=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
-	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-1.12.2-r4.ebuild b/x11-libs/cairo/cairo-1.12.2-r4.ebuild
deleted file mode 100644
index b5d97d04e522..000000000000
--- a/x11-libs/cairo/cairo-1.12.2-r4.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# 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.2-r4.ebuild,v 1.4 2012/11/28 10:27:31 ssuominen 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? (
-			>=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
-	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 "${FILESDIR}"/${PN}-1.12.2-surfaceless-extension.patch
-	epatch "${FILESDIR}"/${PN}-1.12.2-fdr-nodl.patch
-	epatch "${FILESDIR}"/${PN}-1.12.2-sphinx-nodl.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-1.12.6.ebuild b/x11-libs/cairo/cairo-1.12.6.ebuild
deleted file mode 100644
index ea5a54a50cb7..000000000000
--- a/x11-libs/cairo/cairo-1.12.6.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# 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.3 2012/11/28 10:27:31 ssuominen 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 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/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-1.8.10.ebuild b/x11-libs/cairo/cairo-1.8.10.ebuild
deleted file mode 100644
index 004278b303d7..000000000000
--- a/x11-libs/cairo/cairo-1.8.10.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# 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.8.10.ebuild,v 1.13 2012/05/05 03:52:24 jdhore Exp $
-
-EAPI=2
-
-inherit eutils flag-o-matic autotools
-
-DESCRIPTION="A vector graphics library with cross-device output support"
-HOMEPAGE="http://cairographics.org/"
-SRC_URI="http://cairographics.org/releases/${P}.tar.gz
-	mirror://gentoo/${PN}-1.8-lcd_filter.patch.bz2"
-
-LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~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="aqua cleartype debug directfb doc lcdfilter opengl +svg X 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.1.9
-	sys-libs/zlib
-	>=media-libs/libpng-1.2.43-r2:0
-	>=x11-libs/pixman-0.12.0
-	directfb? ( >=dev-libs/DirectFB-0.9.24 )
-	svg? ( dev-libs/libxml2 )
-	X? ( 	>=x11-libs/libXrender-0.6
-		x11-libs/libXext
-		x11-libs/libX11
-		x11-libs/libXft )
-	xcb? (	>=x11-libs/libxcb-0.92
-		x11-libs/xcb-util )"
-#	test? (
-#	pdf test
-#	x11-libs/pango
-#	>=x11-libs/gtk+-2.0
-#	>=app-text/poppler-bindings-0.9.2[gtk]
-#	ps test
-#	app-text/ghostscript-gpl
-#	svg test
-#	>=x11-libs/gtk+-2.0
-#	>=gnome-base/librsvg-2.15.0
-
-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 )"
-
-src_prepare() {
-	if use lcdfilter; then
-		# LCD filter patch from Ubuntu, taken from:
-		# http://bazaar.launchpad.net/%7Eubuntu-branches/ubuntu/lucid/cairo/lucid/files/head%3A/debian/patches/
-		epatch "${WORKDIR}"/${PN}-1.8-lcd_filter.patch
-	elif use cleartype; then
-		# ClearType-like patches applied by ArchLinux
-		epatch "${FILESDIR}"/${PN}-1.2.4-lcd-cleartype-like.diff
-	fi
-
-	epatch "${FILESDIR}"/${PN}-1.8.8-interix.patch \
-		"${FILESDIR}"/${P}-libpng14.patch
-
-	# We need to run elibtoolize to ensure correct so versioning on FreeBSD
-	# upgraded to an eautoreconf for the above interix patch.
-	eautoreconf
-}
-
-src_configure() {
-	[[ ${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
-
-	econf $(use_enable X xlib) $(use_enable doc gtk-doc) \
-		$(use_enable directfb) $(use_enable xcb) \
-		$(use_enable svg) --disable-glitz $(use_enable X xlib-xrender) \
-		$(use_enable debug test-surfaces) --enable-pdf  --enable-png \
-		--enable-ft --enable-ps \
-		$(use_enable aqua quartz) $(use_enable aqua quartz-image) \
-		|| die "configure failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "Installation failed"
-	dodoc AUTHORS ChangeLog NEWS README
-}
-
-pkg_postinst() {
-	if use xcb; then
-		ewarn "You have enabled the Cairo XCB backend which is used only by"
-		ewarn "a select few apps. The Cairo XCB backend is presently"
-		ewarn "un-maintained and needs a lot of work to get it caught up"
-		ewarn "to the Xrender and Xlib backends, which are the backends used"
-		ewarn "by most applications. See:"
-		ewarn "http://lists.freedesktop.org/archives/xcb/2008-December/004139.html"
-	fi
-}
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
new file mode 100644
index 000000000000..92bf13496a4e
--- /dev/null
+++ b/x11-libs/cairo/files/cairo-1.12.10-xshm-corruption.patch
@@ -0,0 +1,28 @@
+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.2-fdr-nodl.patch b/x11-libs/cairo/files/cairo-1.12.2-fdr-nodl.patch
deleted file mode 100644
index b2ad8ed8b64c..000000000000
--- a/x11-libs/cairo/files/cairo-1.12.2-fdr-nodl.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 3d2712d56a22f2a86fb80da94c3e55be8d26a330
-Author: Alexis Ballier <aballier@gentoo.org>
-Date:   Fri Sep 21 08:22:54 2012 -0300
-
-    cairo-fdr: protect -ldl link with CAIRO_HAS_DL like in cairo-trace.
-    
-    Signed-off-by: Uli Schlachter <psychon@znc.in>
-
-diff --git a/util/cairo-fdr/Makefile.am b/util/cairo-fdr/Makefile.am
-index 5cd5798..34215a6 100644
---- a/util/cairo-fdr/Makefile.am
-+++ b/util/cairo-fdr/Makefile.am
-@@ -10,4 +10,6 @@ cairo_fdr_la_SOURCES = fdr.c
- cairo_fdr_la_CPPFLAGS = $(AM_CPPFLAGS)
- cairo_fdr_la_CFLAGS = $(CAIRO_CFLAGS)
- cairo_fdr_la_LDFLAGS = -module -no-undefined
-+if CAIRO_HAS_DL
- cairo_fdr_la_LIBADD = -ldl
-+endif
diff --git a/x11-libs/cairo/files/cairo-1.12.2-sphinx-nodl.patch b/x11-libs/cairo/files/cairo-1.12.2-sphinx-nodl.patch
deleted file mode 100644
index 5ca14cac0145..000000000000
--- a/x11-libs/cairo/files/cairo-1.12.2-sphinx-nodl.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-commit f78a9269228f2f48e8eb496e341ef990db39c6c3
-Author: Alexis Ballier <aballier@gentoo.org>
-Date:   Fri Sep 21 08:22:55 2012 -0300
-
-    cairo-sphinx: protect -ldl link with CAIRO_HAS_DL like in cairo-trace.
-    
-    Signed-off-by: Uli Schlachter <psychon@znc.in>
-
-diff --git a/util/cairo-sphinx/Makefile.am b/util/cairo-sphinx/Makefile.am
-index b25bd23..10bc10c 100644
---- a/util/cairo-sphinx/Makefile.am
-+++ b/util/cairo-sphinx/Makefile.am
-@@ -12,7 +12,9 @@ cairo_sphinx_la_SOURCES = fdr.c
- cairo_sphinx_la_CPPFLAGS = $(AM_CPPFLAGS)
- cairo_sphinx_la_CFLAGS = $(CAIRO_CFLAGS)
- cairo_sphinx_la_LDFLAGS = -module -no-undefined
-+if CAIRO_HAS_DL
- cairo_sphinx_la_LIBADD = -ldl
-+endif
- 
- cairo_sphinx_SOURCES = sphinx.c
- cairo_sphinx_CPPFLAGS = $(AM_CPPFLAGS) -DLIBDIR="\"$(cairolibdir)\""
diff --git a/x11-libs/cairo/files/cairo-1.12.2-surfaceless-extension.patch b/x11-libs/cairo/files/cairo-1.12.2-surfaceless-extension.patch
deleted file mode 100644
index 4222d8935ab2..000000000000
--- a/x11-libs/cairo/files/cairo-1.12.2-surfaceless-extension.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-commit f59b0914f4ddbff0d116c918343a6726d5f4317b
-Author: Chris Wilson <chris@chris-wilson.co.uk>
-Date:   Sat Aug 11 17:38:36 2012 +0100
-
-    egl: s/EGL_KHR_surfaceless_opengl/EGL_KHR_surfaceless_context/
-    
-    Mesa changed the name of the extension it invented, so check for the
-    real name and the old name before falling back to pbuffers which are not
-    supported by most EGL implementations.
-    
-    References: https://bugs.freedesktop.org/show_bug.cgi?id=53361
-    Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-
-diff --git a/src/cairo-egl-context.c b/src/cairo-egl-context.c
-index eb1ef29..b24bc80 100644
---- a/src/cairo-egl-context.c
-+++ b/src/cairo-egl-context.c
-@@ -122,8 +122,10 @@ _egl_make_current_surfaceless(cairo_egl_context_t *ctx)
-     const char *extensions;
- 
-     extensions = eglQueryString(ctx->display, EGL_EXTENSIONS);
--    if (!strstr(extensions, "EGL_KHR_surfaceless_opengl"))
-+    if (strstr(extensions, "EGL_KHR_surfaceless_context") == NULL &&
-+	strstr(extensions, "EGL_KHR_surfaceless_opengl") == NULL)
- 	return FALSE;
-+
-     if (!eglMakeCurrent(ctx->display,
- 			EGL_NO_SURFACE, EGL_NO_SURFACE, ctx->context))
- 	return FALSE;
-@@ -174,7 +176,6 @@ cairo_egl_device_create (EGLDisplay dpy, EGLContext egl)
- 	eglChooseConfig (dpy, config_attribs, &config, 1, &numConfigs);
- 
- 	ctx->dummy_surface = eglCreatePbufferSurface (dpy, config, attribs);
--
- 	if (ctx->dummy_surface == NULL) {
- 	    free (ctx);
- 	    return _cairo_gl_context_create_in_error (CAIRO_STATUS_NO_MEMORY);
diff --git a/x11-libs/cairo/files/cairo-1.2.4-lcd-cleartype-like.diff b/x11-libs/cairo/files/cairo-1.2.4-lcd-cleartype-like.diff
deleted file mode 100644
index 2f908b855387..000000000000
--- a/x11-libs/cairo/files/cairo-1.2.4-lcd-cleartype-like.diff
+++ /dev/null
@@ -1,275 +0,0 @@
-diff -rup libcairo-1.2.4.orig/src/cairo-ft-font.c libcairo-1.2.4/src/cairo-ft-font.c
---- libcairo-1.2.4.orig/src/cairo-ft-font.c	2006-08-22 21:40:02.802247352 +0800
-+++ libcairo-1.2.4/src/cairo-ft-font.c	2006-08-22 21:40:39.443677008 +0800
-@@ -53,6 +53,8 @@
- #include FT_SYNTHESIS_H
- #endif
- 
-+#define FIR_FILTER 1
-+
- #define DOUBLE_TO_26_6(d) ((FT_F26Dot6)((d) * 64.0))
- #define DOUBLE_FROM_26_6(t) ((double)(t) / 64.0)
- #define DOUBLE_TO_16_16(d) ((FT_Fixed)((d) * 65536.0))
-@@ -492,6 +494,8 @@ _cairo_ft_unscaled_font_destroy (void *a
-     }
- }
- 
-+static const int   fir_filter[5] = { 0x1C, 0x38, 0x55, 0x38, 0x1C };
-+
- static cairo_bool_t
- _has_unlocked_face (void *entry)
- {
-@@ -779,7 +783,220 @@ _get_bitmap_surface (FT_Bitmap		     *bi
- 	    }
- 	    format = CAIRO_FORMAT_A8;
- 	    break;
--	case CAIRO_ANTIALIAS_SUBPIXEL: {
-+	case CAIRO_ANTIALIAS_SUBPIXEL:
-+#ifdef FIR_FILTER
-+	{
-+	    unsigned char*  line;
-+	    unsigned char*  bufBitmap;
-+	    int		    pitch;
-+	    unsigned char   *data_rgba;
-+	    unsigned int    width_rgba, stride_rgba;
-+	    int		    vmul = 1;
-+	    int		    hmul = 1;
-+
-+	    switch (font_options->subpixel_order) {
-+	    case CAIRO_SUBPIXEL_ORDER_DEFAULT:
-+	    case CAIRO_SUBPIXEL_ORDER_RGB:
-+	    case CAIRO_SUBPIXEL_ORDER_BGR:
-+	    default:
-+		width /= 3;
-+		hmul = 3;
-+		break;
-+	    case CAIRO_SUBPIXEL_ORDER_VRGB:
-+	    case CAIRO_SUBPIXEL_ORDER_VBGR:
-+		vmul = 3;
-+		height /= 3;
-+		break;
-+	    }
-+	    /*
-+	     * Filter the glyph to soften the color fringes
-+	     */
-+	    width_rgba = width;
-+	    stride = bitmap->pitch;
-+	    stride_rgba = (width_rgba * 4 + 3) & ~3;
-+	    data_rgba = calloc (1, stride_rgba * height);
-+
-+	    /* perform in-place FIR filtering in either the horizontal or
-+	     * vertical direction. We're going to modify the RGB graymap,
-+	     * but that's ok, because we either own it, or its part of
-+	     * the FreeType glyph slot, which will not be used anymore.
-+	     */
-+	    pitch  = bitmap->pitch;
-+	    line   = (unsigned char*)bitmap->buffer;
-+	    if ( pitch < 0 )
-+		line -= pitch*(height-1);
-+
-+	    bufBitmap = line;
-+
-+	    switch (font_options->subpixel_order) {
-+	    case CAIRO_SUBPIXEL_ORDER_DEFAULT:
-+	    case CAIRO_SUBPIXEL_ORDER_RGB:
-+	    case CAIRO_SUBPIXEL_ORDER_BGR:
-+	    {
-+		int  h;
-+
-+		for ( h = height; h > 0; h--, line += pitch ) {
-+		    int             pix[6] = { 0, 0, 0, 0, 0, 0 };
-+		    unsigned char*  p      = line;
-+		    unsigned char*  limit  = line + width*3;
-+		    int             nn, val, val2;
-+
-+		    val = p[0];
-+		    for (nn = 0; nn < 3; nn++)
-+			pix[2 + nn] += val * fir_filter[nn];
-+
-+		    val = p[1];
-+		    for (nn = 0; nn < 4; nn++)
-+			pix[1 + nn] += val * fir_filter[nn];
-+
-+		    p += 2;
-+
-+		    for ( ; p  < limit; p++ ) {
-+			val = p[0];
-+			for (nn = 0; nn < 5; nn++)
-+			    pix[nn] += val * fir_filter[nn];
-+
-+			val2  = pix[0] / 256;
-+			val2 |= -(val2 >> 8);
-+			p[-2]  = (unsigned char)val2;
-+
-+			for (nn = 0; nn < 5; nn++)
-+			    pix[nn] = pix[nn + 1];
-+		    }
-+		    for (nn = 0; nn < 2; nn++ ) {
-+			val2  = pix[nn] / 256;
-+			val2 |= -(val2 >> 8);
-+			p[nn - 2] = (unsigned char)val2;
-+		    }
-+		}
-+	    }
-+	    break;
-+	    case CAIRO_SUBPIXEL_ORDER_VRGB:
-+	    case CAIRO_SUBPIXEL_ORDER_VBGR:
-+	    {
-+		int  w;
-+
-+		for (w = 0; w < width; w++ ) {
-+		    int  pix[6] = { 0, 0, 0, 0, 0, 0 };
-+		    unsigned char*  p     = bufBitmap + w;
-+		    unsigned char*  limit = bufBitmap + w + height*3*pitch;
-+		    int             nn, val, val2;
-+
-+		    val = p[0];
-+		    for (nn = 0; nn < 3; nn++)
-+			pix[2 + nn] += val*fir_filter[nn];
-+
-+		    val = p[pitch];
-+		    for (nn = 0; nn < 4; nn++ )
-+			pix[1 + nn] += val * fir_filter[nn];
-+
-+		    p += 2*pitch;
-+		    for ( ; p < limit; p += pitch ) {
-+			val = p[0];
-+			for (nn = 0; nn < 5; nn++ )
-+			    pix[nn] += val * fir_filter[nn];
-+
-+			val2  = pix[0] / 256;
-+			val2 |= -(val2 >> 8);
-+			p[-2 * pitch] = (unsigned char)val2;
-+
-+			for (nn = 0; nn < 5; nn++)
-+			    pix[nn] = pix[nn+1];
-+		    }
-+
-+		    for (nn = 0; nn < 2; nn++) {
-+			val2  = pix[nn] / 256;
-+			val2 |= -(val2 >> 8);
-+			p[(nn - 2) * pitch] = (unsigned char)val2;
-+		    }
-+		}
-+	    }
-+	    break;
-+	    default:  /* shouldn't happen */
-+		break;
-+	    }
-+
-+	    /* now copy the resulting graymap into an ARGB32 image */
-+	    {
-+		unsigned char*  in_line  = bufBitmap;
-+		unsigned char*  out_line = data_rgba;
-+		int             h        = height;
-+
-+		switch (font_options->subpixel_order) {
-+		case CAIRO_SUBPIXEL_ORDER_DEFAULT:
-+		case CAIRO_SUBPIXEL_ORDER_RGB:
-+		    for ( ; h > 0; h--, in_line += pitch, out_line += stride_rgba) {
-+			unsigned char*  in  = in_line;
-+			int*            out = (int*)out_line;
-+			int             w;
-+
-+			for (w = width; w > 0; w--, in += 3, out += 1) {
-+			    int  r = in[0];
-+			    int  g = in[1];
-+			    int  b = in[2];
-+
-+			    out[0] = (g << 24) | (r << 16) | (g << 8) | b;
-+			}
-+		    }
-+		    break;
-+		case CAIRO_SUBPIXEL_ORDER_BGR:
-+		    for ( ; h > 0; h--, in_line += pitch, out_line += stride_rgba) {
-+			unsigned char*  in  = in_line;
-+			int*            out = (int*)out_line;
-+			int             w;
-+
-+			for (w = width; w > 0; w--, in += 3, out += 1) {
-+			    int  r = in[2];
-+			    int  g = in[1];
-+			    int  b = in[0];
-+
-+			    out[0] = (g << 24) | (r << 16) | (g << 8) | b;
-+			}
-+		    }
-+		    break;
-+		case CAIRO_SUBPIXEL_ORDER_VRGB:
-+		    for ( ; h > 0; h--, in_line += pitch*3, out_line += stride_rgba) {
-+			unsigned char*  in  = in_line;
-+			int*            out = (int*)out_line;
-+			int             w;
-+
-+			for (w = width; w > 0; w--, in += 1, out += 1) {
-+			    int  r = in[0];
-+			    int  g = in[pitch];
-+			    int  b = in[pitch*2];
-+
-+			    out[0] = (g << 24) | (r << 16) | (g << 8) | b;
-+			}
-+		    }
-+		    break;
-+		case CAIRO_SUBPIXEL_ORDER_VBGR:
-+		    for ( ; h > 0; h--, in_line += pitch*3, out_line += stride_rgba) {
-+			unsigned char*  in  = in_line;
-+			int*            out = (int*)out_line;
-+			int             w;
-+
-+			for (w = width; w > 0; w--, in += 1, out += 1) {
-+			    int  r = in[2*pitch];
-+			    int  g = in[pitch];
-+			    int  b = in[0];
-+
-+			    out[0] = (g << 24) | (r << 16) | (g << 8) | b;
-+			}
-+		    }
-+		    break;
-+		}
-+	    }
-+
-+	    if (own_buffer)
-+		free (bitmap->buffer);
-+	    data = data_rgba;
-+	    stride = stride_rgba;
-+	    format = CAIRO_FORMAT_ARGB32;
-+	    subpixel = TRUE;
-+	    break;
-+	}
-+#else /* !FIR_FILTER */
-+	{
- 	    int		    x, y;
- 	    unsigned char   *in_line, *out_line, *in;
- 	    unsigned int    *out;
-@@ -871,6 +1088,7 @@ _get_bitmap_surface (FT_Bitmap		     *bi
- 	    subpixel = TRUE;
- 	    break;
- 	}
-+#endif /* !FIR_FILTER */
- 	}
- 	break;
-     case FT_PIXEL_MODE_GRAY2:
-@@ -986,12 +1204,22 @@ _render_glyph_outline (FT_Face          
- 		matrix.xx *= 3;
- 		hmul = 3;
- 		subpixel = TRUE;
-+#ifdef FIR_FILTER
-+		cbox.xMin -= 64;
-+		cbox.xMax += 64;
-+		width    += 2;
-+#endif
- 		break;
- 	    case CAIRO_SUBPIXEL_ORDER_VRGB:
- 	    case CAIRO_SUBPIXEL_ORDER_VBGR:
- 		matrix.yy *= 3;
- 		vmul = 3;
- 		subpixel = TRUE;
-+#ifdef FIR_FILTER
-+		cbox.yMin -= 64;
-+		cbox.yMax += 64;
-+		height    += 2;
-+#endif
- 		break;
- 	    }
- 	    FT_Outline_Transform (outline, &matrix);
-Only in libcairo-1.2.4/src: cairo-ft-font.c.orig
diff --git a/x11-libs/cairo/files/cairo-1.8.10-libpng14.patch b/x11-libs/cairo/files/cairo-1.8.10-libpng14.patch
deleted file mode 100644
index 18723675f8cb..000000000000
--- a/x11-libs/cairo/files/cairo-1.8.10-libpng14.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.ac
-+++ configure.ac
-@@ -161,7 +161,7 @@
-   AC_ARG_VAR([png_REQUIRES], [module name for libpng to search for using pkg-config])
-   if test "x$png_REQUIRES" = x; then
-     # libpng13 is GnuWin32's libpng-1.2.8 :-(
--    for l in libpng12 libpng13 libpng10 libpng; do
-+    for l in libpng14 libpng12 libpng13 libpng10 libpng; do
-       if $PKG_CONFIG --exists $l ; then
-         png_REQUIRES=$l
-         use_png=yes
diff --git a/x11-libs/cairo/metadata.xml b/x11-libs/cairo/metadata.xml
index 30bed9b241cc..b5a25ce7d0be 100644
--- a/x11-libs/cairo/metadata.xml
+++ b/x11-libs/cairo/metadata.xml
@@ -7,11 +7,6 @@
     <name>Ben de Groot</name>
   </maintainer>
   <use>
-    <flag name='cleartype'>Add ClearType-style behavior for sub-pixel hinting.
-      Patch taken from Arch Linux</flag>
-    <flag name='lcdfilter'>Add FreeType LCD filtering, ClearType-style behavior
-      for sub-pixel-hinting. Overrides cleartype USE flag. Patch taken from
-      Ubuntu</flag>
     <flag name='opengl' restrict="&gt;=x11-libs/cairo-1.10.0">
       Use Mesa backend for acceleration</flag>
     <flag name='drm'>Use Linux DRM for backend acceleration</flag>