Stop applying Interix patch. ChangeLog claims incorrectly that patch was upstreamed...

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x974CA72A

diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog
index f447afeaa95e00a360332871694dd721e485c13f..4dfdda76016dea1a5c25f1454d2a6f323825b69f 100644 (file)
--- a/x11-libs/cairo/ChangeLog
+++ b/x11-libs/cairo/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/cairo
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.389 2014/12/09 21:27:32 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.390 2014/12/09 21:30:56 mattst88 Exp $
+
+  09 Dec 2014; Matt Turner <mattst88@gentoo.org> cairo-1.12.18.ebuild,
+  cairo-9999.ebuild:
+  Stop applying Interix patch. ChangeLog claims incorrectly that patch was
+  upstreamed. No documentation or bug references, and patch references libpng12.
 
   09 Dec 2014; Matt Turner <mattst88@gentoo.org>
   +files/cairo-1.12.18-disable-test-suite.patch, cairo-1.12.18.ebuild,

diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index e98e615cbcd4bfbb2a4e477852258cd4e09391b1..947d1b9baa80fa3eeb2e6230aa1ef5d43a4acc92 100644 (file)
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -27,24 +27,24 @@ EBUILD cairo-1.12.16-r2.ebuild 5491 SHA256 67a756c661a62d5fc1c81638dd95b80a8774d
 EBUILD cairo-1.12.16-r3.ebuild 6319 SHA256 744195ffd3e0b6642952020b90420a540573c1c8f47bffb9cfd9f77a7edccbcb SHA512 6acd16eb8cde5e2840481fa483e713904eb55e06e5c4871eaa6870dbd462a326d699add667f3027926ce5fba8747422e86b420a41bee074f8ea5bd62fdc0acb2 WHIRLPOOL 018160c7ff32778ca4da60124c2b2c892e37d0d10ec0ca58e932b93f2f1c0c21b2a04f96adb0db52defda8ad13b1ddf75804eaa642732748bcdba4b824adb530
 EBUILD cairo-1.12.16-r4.ebuild 6282 SHA256 0f62952b384a75909bd2c1431e1f36f724920cacfe7a69f8bf8ede87756add33 SHA512 a05b2071def409e2b86520173439ce08865b0b10208e414a4af4046f7e9bb195161b3f4bb1372278f2973a82d9bc1384ae9c697ed3ecc820e74f07dd67f9e872 WHIRLPOOL 37da1d8d043ca5271045648d1a7657cb22a2b64c0839239e8f16e40825916eee4255b22e4fe477696a5ee335cf58d5e260acf65aa7165a2f9d8bf0cd2cc9679f
 EBUILD cairo-1.12.16.ebuild 4115 SHA256 510a7314d31ee86b1cdc198cc2feae538b577582961b38c1bcab35e8e8da1a17 SHA512 a7964920b7dc9b8fcd3826207fa53046e41d67d3486a73f32cd4183ebf2d9ac500398a0d73604c9d234139344653d66ad8b24eb91e1d48d814c1fa70ba179c29 WHIRLPOOL 1df6b4bae51c564a862e763b0ffb6726ce9ab983bf7fe353e7bfb8f34d32cdd56a2c889efc55d70174061a0b3d8744ef9abb282870e6bae4d119b9331841a40d
-EBUILD cairo-1.12.18.ebuild 5525 SHA256 5cf6ce2670c7c6bd848d957acbc1d820076fc87fc6e9e42478c142f7ff7cf2e4 SHA512 092d49984ff010414676840e612c89d690cbdde6a68b7ad63ff04a372e99454e742f8f8f68543b6f9ce6ce56ae9ddd5c7f3a8e734697979e633bac498cfca89b WHIRLPOOL 867a11220479418720ef431fcb3d33d4b450eccc01eef036e0a704fe095d3cdb535151786464704e4adecbecc75325c8fc50867b58ff6debe3aa8d153e5a900d
-EBUILD cairo-9999.ebuild 5523 SHA256 ed1f0e63e83ced6ba38634f32235ca4f0d5a9eb96f87f30cae209d4fcbc5c277 SHA512 fca84eed20c663586a712b27e60bea198c5cf451bb733868e76751e4526b25272f3a5259491870a640c41319bf90c5e6eb84d0ad3a84bef46de8f1de333be070 WHIRLPOOL f8ab9d5a6b69b98aaef74a1003bccb09b7acc376b0451e3623d788b22139dee398efa66aab6b9e060edcdb3d0df0106cdeb46636e95ed231e50e8b7111ebad3e
-MISC ChangeLog 58290 SHA256 8d99718c540243e65d82a857da587018a79064b425343af5d345115dba789fe7 SHA512 46e5e21fbcd223630c4528fd03baa9db2922fbb1d8d3b6339863f0516a807b537b4401e78beedde2069fe94ba2d1f6379176b4a80628119141324a45ba5c0f25 WHIRLPOOL c6aa978c9f7db76fbf80e54317fd85e468d404a3833d16128013f2f97733867d3b68fd1b91386491f6f20aeeb70d98ac111f63f59624e530e3bf0f87c20f327b
+EBUILD cairo-1.12.18.ebuild 5477 SHA256 16fb0325a8c7a6ad0368df3e93fe1fc0ee5ca814d819ae5788cfb9d74df33877 SHA512 7952f51c3ea5eca87ebec8c7ba99c51c79546aff3af4c2fcd67ce49f8fc9f7372900462e6f3941f84850e55366d337c87abd75b308d675177bacf65355cffb86 WHIRLPOOL 5cf54a3c7b63f67c4a157c1bd54ebf799582c18d1da84cc96636bce929a9f05a81dd8c18fe0173a54ea9846a61548a0b74364ccb61573d89ac8b2467446d4c6c
+EBUILD cairo-9999.ebuild 5475 SHA256 856cd3cb027e3dd39a48e738d9c1c21458b8665a0e483f5d83cb5cdd75623e71 SHA512 00cffb12c6e21c21a26884dfb3d0b047b227516623db32a6f271c5d5f9ab3fca5aba20080c34618a6aca608f4d63e3d26546546e0dc3c3b301a19b3820191144 WHIRLPOOL a0bcc03206a9c32107b014902b4f6938d5ad959a8bb48a6a0061616c47d727ab88bb85eb6a43af091facca9893b55ef056eb2c810dad9c790d4e6f20c137761d
+MISC ChangeLog 58539 SHA256 f21bb7e65ee8b60d7be134239ec1b5763d657dda90130557b5d597a46c99d6a6 SHA512 f77f4d175edc03fc91828eb6e9e45a622c034bd2bf7f3ea5d4ce898f4587747d5c097409b7af691baca86b67ce658277dd0bce8845319320e01f73e50f12201b WHIRLPOOL 2eeed7aa905a2e60f169e11fe1b91774b328dd63b598b56912dc0ca92bc94a2f4c45f45932a9e572dbd72e84b686b23abb73de80ebd1e82a0d6ad68c0d3782e6
 MISC metadata.xml 1512 SHA256 e608340ec4a70a7ed36558825b916661bc659e8e8b588a89c2b94f57fb62822e SHA512 616bfa3ee0b43f91d9104f19e756e97a2e68edc65b2eb293864d15a099068e3f5359f0edaf91fff5a2470b82d303d37e4227a7df65b3f3601362f1268501f94f WHIRLPOOL 8e279a5124dd7073add02094a5363046d47e435b4e274a765cb936d33599cf13e16758fe3f57ef316a8137dd574681a99d4b5bf8074554606d7d36afadaa3f91
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUh2lFAAoJEA/daC2XTKcqlIcP/2CzHq7ZU8fSnWJS8LdVx6wq
-cg/nhaDaAYQYCK0IKpHa+oVKYL0uX4WIsKpQr/vFo1B7Pm9431/yR0Y7y70wjx+2
-Z95tOVmma27hK/4W9pb4qHppI10eN26VCCHP9KdyvaRSv3nzLY2ngd3tkEtNOi8t
-j4lLb74KJgnAiZ8KdPXt86IVOkiODLojSI6rF8ggVDCqSxY9NggrCC+jurRrvTRj
-Bt3bFORrxT4durpYhT+AoTWhdrUQkWWV/61c3Nf1CDtpmUPcZ3wmU6AmsToAuc3m
-7mst7aQqwF9mXLA+S+/7sw0m3vbHCu15NuMRJonIgYcjVFpr1yY8fm2BE6yz19ZD
-umj3fX0al8hH6oX95BZoUdmOTlqAiLK5rZ76sL6nPtv8Nm12rO3yPoAilvzQl0jA
-IwEqLOcNaqQCIVEZBrtSMFa3lCj/6PIYNWyCe4igxlI1llwoZjnvUHWdXdC4bm6T
-2Kw+ceq3wQ9cJFF42IDyjM2cyxvMg5BGhwsZ0/1WoTgklb84hrJ20jUzAs02MKpL
-e7t2z0+x+fwptj4/V7FwUVvHFI85hIoWhyKDmuSr1OqWklKHrDnR5TB3rUPyVXNx
-JZICPOVpqXYLkDcjSFv/wJj7YvXLNgbNgj0wybPY8KVYtBxfa6AUsY0CJkiltyNW
-McGOy8JNcJrp7MZK8pkg
-=gqeg
+iQIcBAEBCAAGBQJUh2oSAAoJEA/daC2XTKcqLcIP/RReB9mzeC7Rp2qzOXlmt0jY
+BpaZkt4qhWnXqXeRj4PfxM6h4zAhMFC0WQgdzCAFYMvvckQmtZQygJPaCqB3xR5o
+c3bxv12k0tl2T2PslyV2InTczXj6PGEJMmbhGt23HYuCK5VtNQofyCN7lNM0Xy3y
+UxVRoTCeHAvMjZifTqlgcOovxfR6LMa/t3Wu8b5oS1EfZ2Ztu+hboV7EUK0M9Tpa
+lTdUrR09ycTlyYbAdWMse1wwbPBEQycIKlWnlbC4L9WIWeU8tVep4PVJUemqLpgq
+tiBJskZyP9GJuKrfR6n+oPEkxEx1tsGH4mWx1WC9gGBYvbC3W1yDCtsC4eiV6q3x
+8MHSYHCYhW4y3Al4i4v3IEe6mlWTNdApk6lMtYiBUIBgV38YHnyXnjGAj+nBRLu0
+Ac/KabQJoBnr2ZQ7hOGC9Ds/UeSW6C7YinXVn3N+y+Ji+5PrROnJINcg9jJjjFq2
+/Ndx2NykvUC7iUGfhTYvMvdDMZQ0EcAvHIXELIPnSXHK5FrwFHipwXKoQYrwZ1rx
+XyYUuriF462jEGFn6Hswd+OKPY0BNirsm3pSOzq2q1z+44REmneMdsi/zK1obGkP
+eExEvkm7ZbUga8ZZoa3p930ZmE/2aHFaxSYN8JfNni95K4u/ul6TTktKOeIEoBQH
+3jcLaovgmCQq6z0BQLlD
+=1Bmf
 -----END PGP SIGNATURE-----

diff --git a/x11-libs/cairo/cairo-1.12.18.ebuild b/x11-libs/cairo/cairo-1.12.18.ebuild
index dde64e8a6f1f55c1038bd19339417dd096bb0b9b..977bc44a8a5046619e08cd4dbfb10c9542d44a16 100644 (file)
--- a/x11-libs/cairo/cairo-1.12.18.ebuild
+++ b/x11-libs/cairo/cairo-1.12.18.ebuild
@@ -1,6 +1,6 @@
 # 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.18.ebuild,v 1.2 2014/12/09 21:27:32 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.12.18.ebuild,v 1.3 2014/12/09 21:30:56 mattst88 Exp $
 
 EAPI=5
 
@@ -86,7 +86,6 @@ MULTILIB_WRAPPED_HEADERS=(
 )
 
 src_prepare() {
-       epatch "${FILESDIR}"/${PN}-1.8.8-interix.patch
        epatch "${FILESDIR}"/${PN}-1.12.18-disable-test-suite.patch
        epatch "${FILESDIR}"/${PN}-respect-fontconfig.patch
 

diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild
index 94fbefa8d694775ae929669ff0be44835ba9622a..9232215edc2ca0edfa5d2594213b6c389540dcbc 100644 (file)
--- a/x11-libs/cairo/cairo-9999.ebuild
+++ b/x11-libs/cairo/cairo-9999.ebuild
@@ -1,6 +1,6 @@
 # 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-9999.ebuild,v 1.52 2014/12/09 21:27:32 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild,v 1.53 2014/12/09 21:30:56 mattst88 Exp $
 
 EAPI=5
 
@@ -86,7 +86,6 @@ MULTILIB_WRAPPED_HEADERS=(
 )
 
 src_prepare() {
-       epatch "${FILESDIR}"/${PN}-1.8.8-interix.patch
        epatch "${FILESDIR}"/${PN}-1.12.18-disable-test-suite.patch
        epatch "${FILESDIR}"/${PN}-respect-fontconfig.patch