Readd patch to avoid building the test suite. Was silently dropped in the 1.12.16...

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 f22cfb59486ecb1909b1a78bf73e798f5d0b0a14..f447afeaa95e00a360332871694dd721e485c13f 100644 (file)
--- a/x11-libs/cairo/ChangeLog
+++ b/x11-libs/cairo/ChangeLog
@@ -1,6 +1,12 @@
 # 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.388 2014/12/08 19:24:49 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.389 2014/12/09 21:27:32 mattst88 Exp $
+
+  09 Dec 2014; Matt Turner <mattst88@gentoo.org>
+  +files/cairo-1.12.18-disable-test-suite.patch, cairo-1.12.18.ebuild,
+  cairo-9999.ebuild:
+  Readd patch to avoid building the test suite. Was silently dropped in the
+  1.12.16 bump.
 
 *cairo-1.12.18 (08 Dec 2014)
 

diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 2f750f3fbfaa74824c301edbf54838c88c9ffafe..e98e615cbcd4bfbb2a4e477852258cd4e09391b1 100644 (file)
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -14,6 +14,7 @@ AUX cairo-1.12.16-all-clipped-1.patch 1407 SHA256 9bee55cbb316e30f80df9299027731
 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 372 SHA256 f2811d76df4c8c6fbe991165d410622c53f144898d3ad248920421d5ab6ab9e8 SHA512 47cac9d24f45f95956368852a0ab48e6623c3e00bceffdcd126e2911b7026dbdc2754acc3666ed496ecebfcf40fc041f17808cef7beed39de5247363855cfe55 WHIRLPOOL b5fb36c829289224664d45b0f3c1b2ba038bbe6d64beb158ca63cf7e08b145df1038cd5014c4e4906d747e7cd2bf43addd86e72fe13b41abc1271fc3e689e549
 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
@@ -26,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 5464 SHA256 f1b97bc294bd8968aa6c267d10281289c331d3431d44ca0a8dbe6876330cfb74 SHA512 348fa3e375d5abe3e33c96f09b93a01f85f21ad33582764e1167423d93d9bb0a2c13aadb8c5c644ec6015e5c688135205b8b3d9d7e1cf6b0bdf6495ea4d67d6c WHIRLPOOL 8af04631aa30762fe7fe946f90f29a6b4d47bf5aa6568fc0011dab175acc40d7305fbbb0ef874eafeaea2951ce58f8cc94737814eec5b358994f20303b853025
-EBUILD cairo-9999.ebuild 5462 SHA256 681b98d612b0b1ff38232d7c3e52163c1a49fadea7fd16e4fdbec667d5263f54 SHA512 6378111ef1ba487f604da81aa3cb59aca05ab1ede95d2d112540faa35e2e98b52207907d46c45f5bbe5e66ce1fffc27e5742b06d3d10e1740fff29b53e2ec52d WHIRLPOOL 24d4bff085a2f94f4579cfb6364f3a4a4fedbcc55c975c4d41ce7b33974a707cd942f9f93e584d952edd919fd8259d53401d4ff6135320a3ab05f81627cad3cc
-MISC ChangeLog 58056 SHA256 eec4307465737018bc35129ab9dca950d9662185196d8a6a18d4de10efac9fb7 SHA512 ba84826bd3a297513535e98dbfc0c1ebfed2b6fe7d7e2e313ce6efe439b03fcba3c7ddcdad7354c970cedc5673bf066e0ac5de0cf7691c2c2d2307a127ca0d85 WHIRLPOOL 3d0310e38cdc82485d8c264034f4effde9bca463e11fc5aada0cb7a8b1b796b503f780a634485ed9273dcf055a62343a665c03b8e3a542812846ebadb9319d7b
+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
 MISC metadata.xml 1512 SHA256 e608340ec4a70a7ed36558825b916661bc659e8e8b588a89c2b94f57fb62822e SHA512 616bfa3ee0b43f91d9104f19e756e97a2e68edc65b2eb293864d15a099068e3f5359f0edaf91fff5a2470b82d303d37e4227a7df65b3f3601362f1268501f94f WHIRLPOOL 8e279a5124dd7073add02094a5363046d47e435b4e274a765cb936d33599cf13e16758fe3f57ef316a8137dd574681a99d4b5bf8074554606d7d36afadaa3f91
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUhfsSAAoJEA/daC2XTKcqJg0QAL/lF5QSrnIJ8YczqVNmb5CN
-LwKtsZZe6w/e+tfD+JfMSQXmT3C5uVuHpyQCXQNYq5gksXYnrylP0jRIr8LkhFZy
-HAeJE0cflQKBf9rK+FDMH+wgLjWFjiz3cL0ZOdHnrZV2I3BueUMzkw4s7fCZvIen
-x9Sow2GH3i/JA1FMAmj5sf0YA6O3SHqgPUP7glhsmf8QHcltfmKy35KqKHOtZ5q/
-J32sSb+zi4gws0Y0nntL1MP+i2NYRWJdWjeH+pSUvAtMwJnlgFqHV6RiKUkoF17T
-3bmTXyWdERpF28TGyabDopEWF/jupBWiqPavBvu1CSTqdZ+RawYCmhWEGcnlw4W0
-xxiVFYvAlbyUrWthF50nwbUBv+5e8M3e3EKy1NVvHm6nqdyurdL+b9FTMlzvQVpN
-g/ASVtycSdF52p/dWWuGW8in57Pv/krUmnbggHbEfB9vPvbfH5lQ2GSy2T+bFsxQ
-7+6yEacP29QaabQ3jr1HjFz2V4oYEP5pkJku5TdqYN9tonVVtd68q7YS7kzuUFip
-IlJaXUxbNSAA9QlC2AtBU0lMZ3POaxYCPra+Xy++r5HzCfB7GYloGKSg0BbQ1TQ2
-djDkhhDx0Fw70gNjrCEbeBfUBwJMSG+tWCv0jMmZ6bx1+hMAnM5SlkEkRUhWDq1s
-e/n7rLAW7yejnhw5G7xF
-=HtDm
+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
 -----END PGP SIGNATURE-----

diff --git a/x11-libs/cairo/cairo-1.12.18.ebuild b/x11-libs/cairo/cairo-1.12.18.ebuild
index 705bc379ff5fad33503383680497f6323154d845..dde64e8a6f1f55c1038bd19339417dd096bb0b9b 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.1 2014/12/08 19:24:49 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.12.18.ebuild,v 1.2 2014/12/09 21:27:32 mattst88 Exp $
 
 EAPI=5
 
@@ -87,6 +87,7 @@ 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
 
        # tests and perf tools require X, bug #483574

diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild
index 6dbba5aa26f59995cff9efc6ac4c40a6c5886857..94fbefa8d694775ae929669ff0be44835ba9622a 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.51 2014/12/08 19:19:48 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild,v 1.52 2014/12/09 21:27:32 mattst88 Exp $
 
 EAPI=5
 
@@ -87,6 +87,7 @@ 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
 
        # tests and perf tools require X, bug #483574

diff --git a/x11-libs/cairo/files/cairo-1.12.18-disable-test-suite.patch b/x11-libs/cairo/files/cairo-1.12.18-disable-test-suite.patch
new file mode 100644 (file)
index 0000000..9af5f45
--- /dev/null
+++ b/x11-libs/cairo/files/cairo-1.12.18-disable-test-suite.patch
@@ -0,0 +1,13 @@
+diff --git a/test/Makefile.am b/test/Makefile.am
+index 950629b..db8cc90 100644
+--- a/test/Makefile.am
++++ b/test/Makefile.am
+@@ -75,7 +75,7 @@ endif
+ endif
+ test_sources += $(test)
+ 
+-noinst_PROGRAMS = cairo-test-suite$(EXEEXT) # always build
++check_PROGRAMS = cairo-test-suite$(EXEEXT) # always build
+ noinst_SCRIPTS = check-refs.sh
+ 
+ TESTS += cairo-test-suite$(EXEEXT)