Also don't wrap cairo-features.h in live ebuild

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

diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog
index 7ac81e38d235d5835bb338fdfa0fc6c5d489608b..ad18c60874c59631ddeb9a17b384f921e7cae785 100644 (file)
--- a/x11-libs/cairo/ChangeLog
+++ b/x11-libs/cairo/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/cairo
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.399 2015/02/21 18:00:22 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.400 2015/02/21 18:58:50 tetromino Exp $
+
+  21 Feb 2015; Alexandre Rostovtsev <tetromino@gentoo.org> cairo-9999.ebuild:
+  Also don't wrap cairo-features.h in live ebuild
 
 *cairo-1.14.0-r1 (21 Feb 2015)
 *cairo-1.12.18-r1 (21 Feb 2015)

diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index c2961fa3f10154a46e172672ecdeb7d8ac76e9aa..3dc9159dd33bc0b3ad6ea3e054a92885d8569354 100644 (file)
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -23,25 +23,25 @@ EBUILD cairo-1.12.16-r4.ebuild 5967 SHA256 5e0b558e4eb8d89d6b05e76762874c3747ab8
 EBUILD cairo-1.12.16.ebuild 4115 SHA256 510a7314d31ee86b1cdc198cc2feae538b577582961b38c1bcab35e8e8da1a17 SHA512 a7964920b7dc9b8fcd3826207fa53046e41d67d3486a73f32cd4183ebf2d9ac500398a0d73604c9d234139344653d66ad8b24eb91e1d48d814c1fa70ba179c29 WHIRLPOOL 1df6b4bae51c564a862e763b0ffb6726ce9ab983bf7fe353e7bfb8f34d32cdd56a2c889efc55d70174061a0b3d8744ef9abb282870e6bae4d119b9331841a40d
 EBUILD cairo-1.12.18-r1.ebuild 5309 SHA256 7875a0cd8accbeeee339fb01d6ebed55966742e47c45446d8a3f141df0be5542 SHA512 5a3cb26a958050115787b37ae887633c56363fd5c02b34417713da68f9c76034f63001f395b15f8a7688c926841185d47b6943c7af1921ebe7d7896c55c07dca WHIRLPOOL 6626aef479edd76e43529ec3d528aca14b651d0b4f0682f8ba4fa17eafab24bbaf9a073b6ee3d4ba56d5a233e3b1e3cbbb1a1bb575487ed3b1741e75b7fbc683
 EBUILD cairo-1.14.0-r1.ebuild 5379 SHA256 f7bf0da497a5b006c6873fb6c959dd34716073d4215ff5b000ba77b3b3606860 SHA512 969d81c3ae2161003526630867857935a7dc0e94f3b53254df9533c7baf976d4180c58a94deff8ba508a9db6cd2437af34dd2756624bbd008ab4297e65a69050 WHIRLPOOL 218dd62b2e3e70ed791e372666629d4e223efa411b32980f76e563787afdc60e01d3278eb9f9abd1aa5ee903fd4ecd620a62dbefd93b65d5cc0654a0d25af50a
-EBUILD cairo-9999.ebuild 5344 SHA256 26cba4d7ac2c69ea78498dda27557704c427e819b376dd5d49146bd64a2a1c79 SHA512 56e1dfd616a3a5d87734505af0fe1adfc7823e5985cc10211246fc528a2d30172c55d31fb1ca5dd8980d415cb8b96ba3ca6fedf93f3f1bebc004e41870b386dc WHIRLPOOL 895c7384ab7c1041cc3e53f21edaa5fa03d43861cda92932b48420fc946e7941c1e2860637d6b9ce5528e54414e83a57abf3def710123e74ef60e330ca9f634b
-MISC ChangeLog 60323 SHA256 736f750be6190d501585a85b8b14d00c75feadab41c2377be74e3d2d71607fdf SHA512 8cb8f24475e5b18322f055d2771a7c9527b96dfb3c3be91ce7c64a2a75fa1e7ccae301bde678fffcd491dd6153d376bc532a4237dda28e1b3ead744f7731f10d WHIRLPOOL f2e1f791d5a72be36dcec79451e0b79ac5790537762f40644d73bd70b7ba0aac55624e95c9d681e9e62c87dd50a25eabe85c973d2d72148d153d580bdd333bfd
+EBUILD cairo-9999.ebuild 5307 SHA256 9c6c60554cead192288f404e853b9f44e14aaa06bc92d83b154156329034da5b SHA512 1099c96e3810a07c67db4561732458603c531c253798da54c46be0aca7d23a2fafc2ccdfd795c19d16cda85ac71380b6ca86465d8688e134044d34b41b086606 WHIRLPOOL da644da9712f69aebd5c60e0f434fcf04466cbe858a6d402245e4ebd83465ff56944eb4649529130b9456a41ca7106f03312b123932f54f0dd0a4829951c8791
+MISC ChangeLog 60455 SHA256 39acc2a4133800cb8bdae6a1b9fc576ef37ab31bcbb5b6c4bd147d6fcbf21b42 SHA512 5e9032b0dec0bd90e20e19cce5c4b6b8af4da0a080dd88d7541dc8d8e3c08742402841fee2b129f5b0919deb43cf674e50466b7444f2d9110c5eb2b147fb6255 WHIRLPOOL 3da72e25832ac07ea2bd6a075bc3c5350cf846b32e1492bafa8175375c63413ecd9b2f1e14241e430a6c0522895db9455e53dc8558b2b881a962bf3c09d76c84
 MISC metadata.xml 1294 SHA256 988ed8eceb7738628f10a041a322482997d26a5fed1fd42eb86bd742a6e3602c SHA512 7d333210abf19ed97a1210d37d77a1cbe944220f16757a0c652c1a329d00cc387ebf2ca174db6dc7f79a892ab068c66d773c364da0321fcfeec0a05d84946bcf WHIRLPOOL b0d67117667918643b4d889b74207b995d8fa1c851786fc89bb81cecc5c46e89714533eb2f8cd005e1175ac8c79eb5d3912826e87cf1c34886103b5a4d7e06a2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJU6Me5XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOjFoQAJBGasc7vg/9xu2iidWKV46v
-uL918CC0OpU4IcGptKoD3nVRaRkrhPTI2x73UaIWBKaqrGppr520MWmCDwECT5u5
-YLnp3/pFEmgEPjLyAhKZGIDEJsg9m/RNbNv4qB2XM8fnZJIFkhHgiaz/SmbumtLn
-kWUHZhbo6Z34d7BHk/XAlEFV2aJU8vHhsuz3ZnMUB0frXXWh9x5D8AElwBVAM907
-yVHidE5oi0Q4eCrNYPVPycKllePlLoeuR4p77JF2pFKn6CgptTQGzRaJdMVQ80CP
-rHNqtTfS4g+hZdB26ovGKv/25Tq3j95bpD0/tbzGKBkYHpAUMHGI1Coq2SIvFQWG
-5IDFZ9LOSIQhQXDGIRb0wQ4U4itx6YGFH02QmW+U7yZhAc5bXRzhOZ/pnJ/Mvhbe
-9cYVzQy045Ycf6Zp1dakiWjgdwI/SYOfbmaGKy6CAvq635HZ+g0mkPLY8hn1TFJf
-xRW/W8zA0HAzGhoZgg5y6KC/b0RgGfDPzEQb9diIOk06ZFVTGSsJ0kDhRHDKBMay
-PAefrqsv95OZx2R7NIYd+Dm6MPHMLKl2X90cx9EQJAX0DaENZ7FB7Q/+NaYU7V6o
-lw4nkhLYkV3kEZYQXdBxUfnw/S7f/C692CUsVQLagmniGHlN9EPfLSvGDD28dBql
-uDO6gMfuG+Kvf8HkM9sn
-=zSLP
+iQJ8BAEBCABmBQJU6NVxXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RTNCRkUzRDRBNkI2MEEwQkYwQzMyOEEx
+OEU1QjZGMkQ4RDVFQzhEAAoJEBjltvLY1eyNq2AP/16wZRzpAcWe/evH4akNTh9a
+QaG4cPzqpkdvNQ/wb7gfI8gFjYkmNxTTF6rKD/gCjYeb9wEY6d/powz5zxxZ24kG
+eomWV4HjUTPNZe4wYrZjR0o9YhP00nEMzMD76o1NEs3f7WVpq6ZZZm198M0mpq/V
+vNBkLrvBDLYxlO9VIfqTgS+eKUcZxjKEOOljjt7QW82pS3qjUgGOyXGfEKBp4LtP
+BomHhVp/r34/hIJ9mKtipV5vImiAObUsA0FqzQKxjh9fF78j9hXcCVCyF/Nw/b5m
+Ns5efo1QT3Oun5k1EEAhA7MsNLherlXNUQGpf1qcnnfEoKQoPZw9qGY1EZKolyCM
+dV6cgsf3u8lcc1uSrr9Woi1vwxQKBlwJUPRace3oxelFMgOYBMBQLaZADmjoFXcf
+pXcVZTm0MPJlmBzpb0/w67ZzbLQc7ZuXiO5xvrdqx7PDSF40jYAVb5K+4uORyONQ
+WPKKOn/p8v1r4yv/lHmsdK2bpUulE9OKLJy6X7DX1Kfla19FxF6v12Br5FCL13i2
+WnK5I9XJkK3D6F+lVAJo5XVb34kylBECnfSgtDnevXT+Cs3MxKHtiUx7VoYs/hU0
++w8sFHnkEVfhpx+JyuSjr01OZgFS0/42WUBAFs5zQqAQlD+MSso8Hd4kwuH/vjIw
+leGueKb8jKoIdM9ryQlp
+=vGOs
 -----END PGP SIGNATURE-----

diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild
index f268684661090342739c957326d4afccb56a9b18..f1b4a17d558485a57f24cf1b1de0667e6291d594 100644 (file)
--- a/x11-libs/cairo/cairo-9999.ebuild
+++ b/x11-libs/cairo/cairo-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild,v 1.55 2015/02/18 08:44:20 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild,v 1.56 2015/02/21 18:58:50 tetromino Exp $
 
 EAPI=5
 
@@ -81,7 +81,6 @@ REQUIRED_USE="
 "
 
 MULTILIB_WRAPPED_HEADERS=(
-       /usr/include/cairo/cairo-features.h
        /usr/include/cairo/cairo-directfb.h
 )