gentoo resync : 26.11.2017

3 files changed, 65 insertions, 10 deletions

diff --git a/media-libs/lcms/Manifest b/media-libs/lcms/Manifest
index e0f8c720df53..7baaaa25fdd3 100644
--- a/media-libs/lcms/Manifest
+++ b/media-libs/lcms/Manifest
@@ -1,9 +1,8 @@
-AUX lcms-2.8-CVE-2016-10165.patch 772 SHA256 7930bcdbfd6b12230fc7736c538259663da6a80f94e02c0a6c5d24906435c5fc SHA512 f7c53161564bad8fdf7cadff8b5ddec38f9acfd3f21a9569a9da43135529a4e6d504e4e9a2d8674ccf2e0fac33ecda09020ddc7c422e825047c17389c7abbc17 WHIRLPOOL 1d75ead0d972fb63105bc5f64dafaca7f1e0664c99f9b3e688f415f41604f7c6802d7ff79c47d2d085fc299390b40b0110656519c4d9c333545084d4adac4008
-DIST lcms2-2.8.tar.gz 6687005 SHA256 66d02b229d2ea9474e62c2b6cd6720fde946155cd1d0d2bffdab829790a0fb22 SHA512 a9478885b4892c79314a2ef9ab560e6655ac8f2d17abae0805e8b871138bb190e21f0e5c805398449f9dad528dc50baaf9e3cce8b8158eb8ff74179be5733f8f WHIRLPOOL 57c6518fa758ee69da55faeb6810ede6463a3c6b2c70e0d2ccfa789fe09cd8192fdeda04aab9800c7af3b11fea25cb08db8b914a195b48f47f3270025ce8b9b3
-DIST lcms2-2.9.tar.gz 10953949 SHA256 d4ad6f8718f7f9dc8b2a3276c9f237aa3f5eccdcf98b86dedc4262d8a1e7f009 SHA512 d91e320a97ef9d64cce31585b7df7c85accb52a0c46a10ed0f45a0ba46cc2ad6687de5151e59ac62170ea878ab48595c1493125f4afb1872824afe1c3f3c459b WHIRLPOOL 1eac52a026386b7bf8aa3fac66b485c622bd8f659c1351d5dde4acfd1fd0d6a64489b43464e203a84062b7a88a39a4ea41149c6102710016127ab10d36bc3db5
-EBUILD lcms-2.8-r1.ebuild 1421 SHA256 97e7085de1873fc64d699bc3e79fbfd2684d9bc49df21e47f5c71e2b2429792a SHA512 d57cbe1fcf49f860ea0b29a5c0e2a8de9381bba3f45fc863e547c463e7b6f223b77b2c87b45d853a48d188bb324e39f6e46370b42850f5a24ed6dab50a7ef0bd WHIRLPOOL 38909c5dd7bd43cf53ecd013008950910a672763bf0f06a58803dea7ab6ee81a8ca0046823742e3180939dc67890614193504ac249b2b7ee714362026e647bf4
-EBUILD lcms-2.8-r2.ebuild 1278 SHA256 585de4f89ad686d026a4e8d27476ac0652f47633fbbb2ea1bbafe443b4c3ff3a SHA512 eb3245f0bec48411922562b688677a5f64e9187b5a05c578582966ef671efe1c263dff14d45b894d235885398559da875ff25cf87d27a56ed559128ed706a15c WHIRLPOOL 3e01ed5f1dcd0ee7c5b3322694b0c3e8ed704aef50fa79e89bf57df5a4be9feb1c78ab77f83478a8342c262f3915c89a8295007ee5c54722bb8e1bc99500f2b6
-EBUILD lcms-2.9.ebuild 1219 SHA256 6f40c99b9d18baec87f3c3c75600e98801f3cd8ed0d5a62e8cf61d628df88d6c SHA512 d4f1a6759f4e4d93bc27eeb23b852df408d778d1faafeb068cb8d53d093cfec48f46ae94d026d4cc8348a8f91149f8bfbb846de0b58780d6883a48e372a949e3 WHIRLPOOL 9a3671e43947f2dca2eaffd699254e05e315e0694695bd4ae832b25aebfa0a85eefc4e56a2a564c9414017aa06b9c2b9697f0034f7156b8058ab8b0c9867fb2c
-MISC ChangeLog 2713 SHA256 9494581fec240107f6ff405f1012e0c8752d763deacffb3755399ad58ccd5cf6 SHA512 a01e22d2f7d81bc24da9588fb822ef77bb3b0deaf040272ef8e7e995340c0c12303e9cfe715f93b666bee398e6bed28449a120a2418aa2c2a7c6616682eb2a68 WHIRLPOOL 450805688be07e3ffaffede192b810f0fe4937ab8643139ba21bbd64324886d5aa15f2c41096ef0234b65b405f929f6a8fffd8792d6aafe858415bdb913ed2fc
-MISC ChangeLog-2015 24486 SHA256 503b862894e9944e0d92a2acb686c434ae88d0ea194fac394c4b9cbb7cc558df SHA512 5fa2b476f3689e58f3cd8ae9249b84eb9e018a9e44308122beb8940f7808bd6065d26172bb7acd94878d7190777eeeaa284e05cd60d01b0d3f4f2f6d196d6b2a WHIRLPOOL f0104eab39e7e7664715859bbab130a4a13dcb356744a822f295f421434631bd8e6a32caffae506d431408743e00dd5b17a7089e5d5945b41e8be4f7a2871d91
-MISC metadata.xml 333 SHA256 973fc54521af3c0fc589fecbdbca3cce0f43f72d8bb3ccfe963ad127bd9e7284 SHA512 d8fb0a9e8fb4073583431d2a9668c01fa87230e1f27672a66955c21c842701109d6ad75c50f9f88334849be3809339a4562a745549d79fdf7aad9c7cd1b0485e WHIRLPOOL 7ec90a30e6f86f3a9770b51870d251fe1c91806153dab66fefa070eae38df50a82b040f85f54a3f2eaf9080bf449f9dac28232edc04bb089b2e98d56dc357b2e
+AUX lcms-2.8-CVE-2016-10165.patch 772 BLAKE2B 3f0f47fd8a12ca0a8171090cf6ccec0be79e1c748b322aed81c31429040f1a148a6b672e1893d962ec2c81c2091c9f7ac1af8675082983ff78e994c54418dcbe SHA512 f7c53161564bad8fdf7cadff8b5ddec38f9acfd3f21a9569a9da43135529a4e6d504e4e9a2d8674ccf2e0fac33ecda09020ddc7c422e825047c17389c7abbc17
+AUX lcms-2.9-BE-test.patch 1367 BLAKE2B 5888ef7f7466c8a76c0b9ba1c87383e274fcfc0570ccc45f2a04c3409421415e7b466b93d9f3acb358ec16481c15cf2d466d0b5d9986f37f48d6fddf0e0be616 SHA512 17d4e612f4aeb6e62ac918aa5438e6ada16f456e4c740b4a13f4560956ff8ee7b6223360420c41de1d7284524460ebb1ba89784782671e258df19fc5a768f1e1
+DIST lcms2-2.8.tar.gz 6687005 BLAKE2B fb187eeb5ffbd5bc9c836fa75c26111605c582281edcdf27c91175248b8b71c69017b9bcd632b5a51360173777c87dff58cab51d209c0e8dda9f329f0d2e3eaf SHA512 a9478885b4892c79314a2ef9ab560e6655ac8f2d17abae0805e8b871138bb190e21f0e5c805398449f9dad528dc50baaf9e3cce8b8158eb8ff74179be5733f8f
+DIST lcms2-2.9.tar.gz 10953949 BLAKE2B 6f22a0a8901562e8a84a82c077f31b0155bf81d2b5023211059fa157061e78ebe170bd4744f6d15ab76c96ff9dae521a7560e9665a230337d149e1f0c9018788 SHA512 d91e320a97ef9d64cce31585b7df7c85accb52a0c46a10ed0f45a0ba46cc2ad6687de5151e59ac62170ea878ab48595c1493125f4afb1872824afe1c3f3c459b
+EBUILD lcms-2.8-r1.ebuild 1421 BLAKE2B 71c0a348942e30f91bdafc433c889ebec7f429e8103cca8d11f9b7f3a0ced1130a4490ef1c4c9e8db8b70ef0898512b53809a49c00b07cc26ff92ab5ecec662d SHA512 d57cbe1fcf49f860ea0b29a5c0e2a8de9381bba3f45fc863e547c463e7b6f223b77b2c87b45d853a48d188bb324e39f6e46370b42850f5a24ed6dab50a7ef0bd
+EBUILD lcms-2.8-r2.ebuild 1278 BLAKE2B c80246b9fd43f4a9bcded6bf934bd359dde5cc4a4abcf3f5fdca6c80fd8b9d030e2120dac65d12454a6317fee49e99b8b082684b5ed66dca4bac4166f8068bd8 SHA512 eb3245f0bec48411922562b688677a5f64e9187b5a05c578582966ef671efe1c263dff14d45b894d235885398559da875ff25cf87d27a56ed559128ed706a15c
+EBUILD lcms-2.9.ebuild 1261 BLAKE2B ea3ec770139f070bee9475c54700d81c23caf38362a4dfad31a339543396f15664197541f2c1163e0facf281ff63eb86ca58e3a5cf1c4c605e5b946872bb94f6 SHA512 9238459631712211cc29dc4cd6e46a029043f6cae948bb04b4798a3678d3b4ff7869ea7514cc432d4aa9bb8d76abb941f8661ecca03d521fe205ae8a3bc2a3e6
+MISC metadata.xml 333 BLAKE2B f6b3984af87fe88ac29f5728eb0b45a5e96e99e3647969adf3de68f8754dc85a23c6bc4eff61132c78f168db7e19694d94c087dc81f7bac6009d253a8bb0daa6 SHA512 d8fb0a9e8fb4073583431d2a9668c01fa87230e1f27672a66955c21c842701109d6ad75c50f9f88334849be3809339a4562a745549d79fdf7aad9c7cd1b0485e
diff --git a/media-libs/lcms/files/lcms-2.9-BE-test.patch b/media-libs/lcms/files/lcms-2.9-BE-test.patch
new file mode 100644
index 000000000000..577c77cc2b84
--- /dev/null
+++ b/media-libs/lcms/files/lcms-2.9-BE-test.patch
@@ -0,0 +1,54 @@
+https://bugs.gentoo.org/638192
+
+From 8aca404f486429e2304bd6572c2a6fb89e43cf2d Mon Sep 17 00:00:00 2001
+From: Marti Maria <info@littlecms.com>
+Date: Mon, 20 Nov 2017 21:59:38 +0100
+Subject: [PATCH] fix for big endian MLU bug
+
+Thanks to Sergei Trofimovic for the fix
+---
+ AUTHORS        |  1 +
+ src/cmsnamed.c | 20 ++++++--------------
+ 2 files changed, 7 insertions(+), 14 deletions(-)
+
+diff --git a/src/cmsnamed.c b/src/cmsnamed.c
+index 95dc18b..773e4d2 100644
+--- a/src/cmsnamed.c
++++ b/src/cmsnamed.c
+@@ -183,27 +183,19 @@ cmsBool AddMLUBlock(cmsMLU* mlu, cmsUInt32Number size, const wchar_t *Block,
+ 
+ static
+ cmsUInt16Number strTo16(const char str[3])
+-{
++{   
+     const cmsUInt8Number* ptr8 = (const cmsUInt8Number*)str;
+-    cmsUInt16Number n = (cmsUInt16Number) (((cmsUInt16Number) ptr8[1] << 8) | ptr8[0]);
++    cmsUInt16Number n = (cmsUInt16Number)(((cmsUInt16Number)ptr8[0] << 8) | ptr8[1]);
+ 
+-    return _cmsAdjustEndianess16(n);
++    return n;
+ }
+ 
+ static
+ void strFrom16(char str[3], cmsUInt16Number n)
+ {
+-    // Assuming this would be aligned
+-    union {
+-
+-       cmsUInt16Number n;
+-       cmsUInt8Number str[2];
+-       
+-    } c;
+-
+-    c.n = _cmsAdjustEndianess16(n);  
+-
+-    str[0] = (char) c.str[0]; str[1] = (char) c.str[1]; str[2] = (char) 0;
++    str[0] = (char)(n >> 8);
++    str[1] = (char)n;
++    str[2] = (char)0;
+ 
+ }
+ 
+-- 
+2.15.0
+
diff --git a/media-libs/lcms/lcms-2.9.ebuild b/media-libs/lcms/lcms-2.9.ebuild
index c2d5d0099b06..1a170522d787 100644
--- a/media-libs/lcms/lcms-2.9.ebuild
+++ b/media-libs/lcms/lcms-2.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/lcms2-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc jpeg static-libs test +threads tiff"
 
 RDEPEND="
@@ -22,6 +22,8 @@ DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/lcms2-${PV}"
 
+PATCHES=("${FILESDIR}"/${P}-BE-test.patch)
+
 src_prepare() {
 	default
 	elibtoolize  # for Prefix/Solaris