summaryrefslogtreecommitdiff
path: root/media-libs
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-01-26 15:48:02 +0000
committerV3n3RiX <venerix@redcorelinux.org>2018-01-26 15:48:02 +0000
commit38b7258d086dd5e263c3bbe3880c8c956676bc71 (patch)
tree6fce284d5bfddaf597a490ac66069d16c6a485db /media-libs
parent0ebf740b9c9bc7c10ac41bea315ecc6c01c79166 (diff)
gentoo resync : 25.01.2018
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/Manifest.gzbin66633 -> 66836 bytes
-rw-r--r--media-libs/babl/Manifest2
-rw-r--r--media-libs/babl/babl-0.1.38.ebuild2
-rw-r--r--media-libs/fontconfig/Manifest8
-rw-r--r--media-libs/fontconfig/fontconfig-2.11.1-r2.ebuild4
-rw-r--r--media-libs/fontconfig/fontconfig-2.12.4.ebuild4
-rw-r--r--media-libs/fontconfig/fontconfig-2.12.6.ebuild4
-rw-r--r--media-libs/fontconfig/fontconfig-2.12.91.ebuild4
-rw-r--r--media-libs/freetype/Manifest8
-rw-r--r--media-libs/freetype/freetype-2.8.1.ebuild4
-rw-r--r--media-libs/freetype/freetype-2.8.ebuild4
-rw-r--r--media-libs/freetype/freetype-2.9.ebuild2
-rw-r--r--media-libs/freetype/freetype-9999.ebuild4
-rw-r--r--media-libs/gd/Manifest4
-rw-r--r--media-libs/gd/gd-2.2.4.ebuild4
-rw-r--r--media-libs/gd/gd-2.2.5.ebuild4
-rw-r--r--media-libs/gegl/Manifest2
-rw-r--r--media-libs/gegl/gegl-0.3.26.ebuild2
-rw-r--r--media-libs/jasper/Manifest4
-rw-r--r--media-libs/jasper/jasper-2.0.12.ebuild4
-rw-r--r--media-libs/jasper/jasper-9999.ebuild6
-rw-r--r--media-libs/jbigkit/Manifest2
-rw-r--r--media-libs/jbigkit/jbigkit-2.1.ebuild4
-rw-r--r--media-libs/jpeg/Manifest8
-rw-r--r--media-libs/jpeg/jpeg-8d-r1.ebuild4
-rw-r--r--media-libs/jpeg/jpeg-8d-r2.ebuild4
-rw-r--r--media-libs/jpeg/jpeg-9a.ebuild4
-rw-r--r--media-libs/jpeg/jpeg-9b.ebuild4
-rw-r--r--media-libs/lcms/Manifest6
-rw-r--r--media-libs/lcms/lcms-2.8-r1.ebuild4
-rw-r--r--media-libs/lcms/lcms-2.8-r2.ebuild4
-rw-r--r--media-libs/lcms/lcms-2.9.ebuild4
-rw-r--r--media-libs/libffado/Manifest7
-rw-r--r--media-libs/libffado/files/libffado-2.3.0-gcc6.patch26
-rw-r--r--media-libs/libffado/files/libffado-2.3.0-include-signal.patch29
-rw-r--r--media-libs/libffado/files/libffado-2.3.0-modelname-strip.patch45
-rw-r--r--media-libs/libffado/libffado-2.3.0.ebuild107
-rw-r--r--media-libs/libffado/metadata.xml1
-rw-r--r--media-libs/libgphoto2/Manifest2
-rw-r--r--media-libs/libgphoto2/libgphoto2-2.5.16.ebuild211
-rw-r--r--media-libs/libharu/Manifest5
-rw-r--r--media-libs/libharu/files/libharu-2.3.0-1-Included-necessary-char-widths-in-generated-PDF.patch248
-rw-r--r--media-libs/libharu/files/libharu-2.3.0-2-Avoid-issue-with-libtiff-duplicate-symbols.patch89
-rw-r--r--media-libs/libharu/files/libharu-2.3.0-3-cmake-fixes.patch177
-rw-r--r--media-libs/libharu/files/libharu-2.3.0-4-Add-support-for-free-form-triangle-Shading-objects.patch530
-rw-r--r--media-libs/libharu/libharu-2.3.0-r2.ebuild37
-rw-r--r--media-libs/libpng/Manifest14
-rw-r--r--media-libs/libpng/libpng-1.2.57.ebuild4
-rw-r--r--media-libs/libpng/libpng-1.5.28.ebuild4
-rw-r--r--media-libs/libpng/libpng-1.6.27.ebuild4
-rw-r--r--media-libs/libpng/libpng-1.6.29.ebuild4
-rw-r--r--media-libs/libpng/libpng-1.6.31.ebuild4
-rw-r--r--media-libs/libpng/libpng-1.6.32.ebuild4
-rw-r--r--media-libs/libpng/libpng-1.6.34.ebuild4
-rw-r--r--media-libs/libraw/Manifest8
-rw-r--r--media-libs/libraw/libraw-0.18.7.ebuild (renamed from media-libs/libraw/libraw-0.18.5.ebuild)8
-rw-r--r--media-libs/mesa/Manifest2
-rw-r--r--media-libs/mesa/mesa-18.0.0_rc2.ebuild582
-rw-r--r--media-libs/mlt/Manifest2
-rw-r--r--media-libs/mlt/mlt-6.4.1-r6.ebuild (renamed from media-libs/mlt/mlt-6.4.1-r5.ebuild)4
-rw-r--r--media-libs/munt-mt32emu/Manifest4
-rw-r--r--media-libs/munt-mt32emu/files/docs.patch27
-rw-r--r--media-libs/munt-mt32emu/metadata.xml15
-rw-r--r--media-libs/munt-mt32emu/munt-mt32emu-2.3.0.ebuild28
-rw-r--r--media-libs/openal/Manifest2
-rw-r--r--media-libs/openal/openal-1.18.2-r1.ebuild2
-rw-r--r--media-libs/openimageio/Manifest13
-rw-r--r--media-libs/openimageio/files/openimageio-1.3.5-openexr-2.x.patch36
-rw-r--r--media-libs/openimageio/metadata.xml1
-rw-r--r--media-libs/openimageio/openimageio-1.3.5.ebuild112
-rw-r--r--media-libs/openimageio/openimageio-1.6.13.ebuild10
-rw-r--r--media-libs/openimageio/openimageio-1.6.18.ebuild14
-rw-r--r--media-libs/openimageio/openimageio-1.7.17.ebuild19
-rw-r--r--media-libs/openimageio/openimageio-1.8.7.ebuild112
-rw-r--r--media-libs/openjpeg/Manifest12
-rw-r--r--media-libs/openjpeg/openjpeg-1.5.2-r1.ebuild4
-rw-r--r--media-libs/openjpeg/openjpeg-1.5.2.ebuild4
-rw-r--r--media-libs/openjpeg/openjpeg-2.1.1_p20160922.ebuild4
-rw-r--r--media-libs/openjpeg/openjpeg-2.1.2.ebuild4
-rw-r--r--media-libs/openjpeg/openjpeg-2.2.0.ebuild4
-rw-r--r--media-libs/openjpeg/openjpeg-2.3.0.ebuild4
-rw-r--r--media-libs/tiff/Manifest6
-rw-r--r--media-libs/tiff/tiff-3.9.7-r1.ebuild4
-rw-r--r--media-libs/tiff/tiff-4.0.8.ebuild4
-rw-r--r--media-libs/tiff/tiff-4.0.9.ebuild4
85 files changed, 2214 insertions, 525 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 5b3b5910878f..7e5f40db7d04 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
Binary files differ
diff --git a/media-libs/babl/Manifest b/media-libs/babl/Manifest
index ec747bacb1ac..5bd81aee1693 100644
--- a/media-libs/babl/Manifest
+++ b/media-libs/babl/Manifest
@@ -14,7 +14,7 @@ EBUILD babl-0.1.22.ebuild 1470 BLAKE2B ed22d82d070011f4ea7b74287354d7a24fa3d678c
EBUILD babl-0.1.24.ebuild 1470 BLAKE2B d57126777551602316904cf91ee2fef8fcc0816aa507e465cf53848145f981d7ca2437d6f70e8f5b789381d6c32fbe9229aa2df72aeb32a59d54300c08134d5a SHA512 136b249c012baec7e26867d8d226182f8f97606d5140c3157c9f5d85d9f91e14aea9ec86e527e112a1b1ad3e56d461b2272c9bfadd2f2f6f8aac8a561aea6d7c
EBUILD babl-0.1.26.ebuild 1470 BLAKE2B d57126777551602316904cf91ee2fef8fcc0816aa507e465cf53848145f981d7ca2437d6f70e8f5b789381d6c32fbe9229aa2df72aeb32a59d54300c08134d5a SHA512 136b249c012baec7e26867d8d226182f8f97606d5140c3157c9f5d85d9f91e14aea9ec86e527e112a1b1ad3e56d461b2272c9bfadd2f2f6f8aac8a561aea6d7c
EBUILD babl-0.1.30.ebuild 1470 BLAKE2B d57126777551602316904cf91ee2fef8fcc0816aa507e465cf53848145f981d7ca2437d6f70e8f5b789381d6c32fbe9229aa2df72aeb32a59d54300c08134d5a SHA512 136b249c012baec7e26867d8d226182f8f97606d5140c3157c9f5d85d9f91e14aea9ec86e527e112a1b1ad3e56d461b2272c9bfadd2f2f6f8aac8a561aea6d7c
-EBUILD babl-0.1.38.ebuild 1467 BLAKE2B 647da34623564f7f80f61f3ac3244f5e1a860582d7744a89a833c27e2797b9869de278a25e5361e8d91bddbe043b6286db7a62c5c72a30c3791db741eb64ebf5 SHA512 0a4db61b341670504cdf81a4436f84aa9a13064ac64456f48f46c7bd1bb9576e6b704e3d0d7af0cf2378bb22a147fa02a94e616f964c0f5bd3f1c2e3a5bee3c3
+EBUILD babl-0.1.38.ebuild 1466 BLAKE2B a01e99ec7894b18875a76ef70759d4852a2f7abe1f3300802d1d82ea414d0834691844fc81fd53edd62aefaf37e4ab27568a16bcf0e42ccb2936f03b4afa8c5c SHA512 2943ba0d28a786db5cf2819d3060d802b678f686acab74f7e114559d06d334428635765ad2d32781737db3fcb4e3d5d7897478b6def3b452b3711e896b8ef4e5
EBUILD babl-0.1.40.ebuild 1470 BLAKE2B 5c68d9ebae837139231a5a71ca7ef196344de0e791877050bb387599fd22c9c2f0ced492abf54a6196225fd8c9e0108aed5c0d5e794872be7a378acaebda4219 SHA512 fba1b10b076435a843562fe0920e757925f13b84b58d8e9901af0d11c2927fd69b817ef9907d68ad7d60de45f7139f8f4818b1b25022ecab2054dab5dcef1b56
EBUILD babl-9999.ebuild 1470 BLAKE2B d57126777551602316904cf91ee2fef8fcc0816aa507e465cf53848145f981d7ca2437d6f70e8f5b789381d6c32fbe9229aa2df72aeb32a59d54300c08134d5a SHA512 136b249c012baec7e26867d8d226182f8f97606d5140c3157c9f5d85d9f91e14aea9ec86e527e112a1b1ad3e56d461b2272c9bfadd2f2f6f8aac8a561aea6d7c
MISC metadata.xml 307 BLAKE2B 95a78257a39aec8fdf8c1c1c1fa0a6f2d911f6c7f22021021f3d1457d7beffad0a47b0f0131926e988340fccc4ca8ef49d086940e0e17acb89d4f3c6845b79f4 SHA512 a86588c27e62fec9d8474d9ba5edd9d235a6ffd1251d5ba729593ba7bdffdb272020567a7db2d596f17bba9c2a39a75eed9ac5eee5e0ba73af081a05fcb1af9e
diff --git a/media-libs/babl/babl-0.1.38.ebuild b/media-libs/babl/babl-0.1.38.ebuild
index 56e3e620a12b..4640717f4fa7 100644
--- a/media-libs/babl/babl-0.1.38.ebuild
+++ b/media-libs/babl/babl-0.1.38.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
SRC_URI=""
else
SRC_URI="http://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
- KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+ KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A dynamic, any to any, pixel format conversion library"
diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index 7b10e69413c6..290ab1e83663 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -7,8 +7,8 @@ DIST fontconfig-2.11.1.tar.bz2 1516095 BLAKE2B 4f78c606d198c4d721dd7fe61181f4433
DIST fontconfig-2.12.4.tar.bz2 1613580 BLAKE2B 9d6b0d5d7bc61cd3dbab2ad769df3aa33c1b38d6c55e02e18aee875a1bef4162a5bba0b9bf8f09c0f94d63c64c3f6bf6f3c5d993f210f74076f861c696f5262c SHA512 f336e9220afe738e0bf7186d87a5eb09842342ad99ca2102c69820a1f0b232e15c61ef72ae3f5d56503f5be32557d09180a80e05690e85b4eb13ed88f5cece81
DIST fontconfig-2.12.6.tar.bz2 1624683 BLAKE2B 48432f3d3cc90240ec19dffb6714e7f780eb6b401693b40e2efa2bb593bc89c42b03c99fce8f2ceb7c108da254dc248d91a790849d22feaa50a725338b80fd1f SHA512 2a1d3e62cae2bfcae2e67e9cb75ab6534a35bda4215f1ad4b8bf757e77e7d9d609c016562f5288fd10046a0e94655a807f6dd044d7868ed81a146c4275c4dd06
DIST fontconfig-2.12.91.tar.bz2 1678752 BLAKE2B bb34ec8559a372696e72629aaac517c24ee5a9503ba6f8c20fdda22f5e2eac49b94323c18e6d90cbcba72fd00b0ad8a88c12c9954b55c90f78e7888129773abc SHA512 755a288e798c6c93acde8307905bef63fcc0cf85d69855334042897e1c26ed089626b1e42d2cfe3de657c623b19dec469b483a75d64502954cc8641290f23301
-EBUILD fontconfig-2.11.1-r2.ebuild 4782 BLAKE2B 4bcd94fed5731033e8723f723b60bb459d126352e3c08dfcfde9b115e3f97dc6264dbd3b8d388903b3a7b7c6b37ddb397c33db3e54fdfecf2c1c9bcb7d10f663 SHA512 9062067b0c39210ce14f4ad02ca6c603db6d5ec766e2d250fcf617ad3f6f360e684ae148eaf12c0dbbb334d62f021081c9b1b59220a4f3afd77f0b84a3a13f33
-EBUILD fontconfig-2.12.4.ebuild 4942 BLAKE2B 4a9a8de85fccc6334116363078fd2638af1a9d989afe77930b51d1c8345541c1fd1d40411dd46a1d1b2db962cc1e4c5212f9c39b12d19ee8091c57ebdfaaf6e4 SHA512 ad239f720f3e2d7b41dd2bfd4a59e4a9fac956729caf96877d00e4a451b489c3b553cdab09b7e6555da3fa72760249962bc983c583a6f36620e10fff39ec18b9
-EBUILD fontconfig-2.12.6.ebuild 5020 BLAKE2B 8cf7acfca96c7ed94e598fe4fd41ce574907444de05b1b51dbce5d217acd22b2ccfe2974890aea6b2431f63911638e2a3a1454942437ad50baf17d26542072f3 SHA512 20223c6d58392074ef8658564005fd958b0bb67a6845b63e229290d6b5f9df5a907633c146ad5dd992ef4d0753d3e377209c42e47a9e638d281c3f1e98c58443
-EBUILD fontconfig-2.12.91.ebuild 5021 BLAKE2B 3fe1149281104d8ad95cf2cad63946810aeb10f09cfd38c8b4a7b5a2505f8b8c26c058f4a21c936d759f0e33aaedbaa63b0fe60d4e804ea368676bccc496d0c7 SHA512 b18ed264bf25a44d06ac0d37ec7fc5c78788d90856133018fe8cdad88e2f1a387d552ddfcbc837420826f6baafaf197b9e8b8c97b584aeb0436bed5193daaeca
+EBUILD fontconfig-2.11.1-r2.ebuild 4770 BLAKE2B f1cc240f9fd3631a484c33cc078c505d4b4af5e8c60baa63b9bb1112bf355e82774372ee26e85b13863c043d64e583d1c26af75fd0948f24b9f8eb6fb88a79ef SHA512 597cbd513b3407a49c40bca4ab879777f761d1ac3bf3091efdf504ce854dfc672d1721e16acc9bf8fce557ffe7f911105ae1dedcbf2ab082848b331e60ccef81
+EBUILD fontconfig-2.12.4.ebuild 4930 BLAKE2B 40ea1f8710e43736d7da02b1a30df092818cc5ac8d513ec2f09958d0ed6cad7a1446b143279779643229e473b1fadc206387820c8b31755974b5f1d76594ed95 SHA512 46110903d927e176a8346527503431ca66b4a1b08aa3a441e0621ea9c7eec5429b21191c18156c8782013cc0e8dfe7a0ba55acd1d6c9dd92ddee23fe3562d11d
+EBUILD fontconfig-2.12.6.ebuild 5008 BLAKE2B 681b60673d02536732261e444b8f00b8178f43a6408dc2990644152b2d3d9971f2d7cca9c88ce7b5fe1aa356cca6c1f47b6a2425af0668aba1d0bdfbda0b3c08 SHA512 2aef38239990fa98e967696681f68fed5644ff3acb43d14810ee61505907de091491ea53a7b311ca2c28452eac60a1227b3196f15d0d58aa14c86b618980ee1b
+EBUILD fontconfig-2.12.91.ebuild 5009 BLAKE2B 316c388b65625ae9be41c8a79f48dfcd94cfeabf3fa962edd5aa2ed32d3e9489fc420b2dfdb17b061b64536a90651b6698e23957758a31d55ff82e01315f4682 SHA512 c2b552485c90827698bc12a2b32fff0703262d65360e8cabee78dce071b6fca9cbdf8360d2814ceee760d0195fa0ba252442dd7176f8856cd5e77bc0adb274f9
MISC metadata.xml 729 BLAKE2B 31b153dd3c6706c13959ad9f2c90a627ea4adc18531c4cf60f9459f040ee915286a303936e53b49cc07e1bfaf800c80f38cbd62105aec88c0329e251a4dd3f47 SHA512 1564dd34d88ce11248bfd5ea6b508eafbc30a4e6ff47f3b9076fbc9f900cf8fe4722a2095512bf7bb659e83fc690d4dbc6b82746a8a38e862577dd09ce7b4a7b
diff --git a/media-libs/fontconfig/fontconfig-2.11.1-r2.ebuild b/media-libs/fontconfig/fontconfig-2.11.1-r2.ebuild
index 4c25251a5b50..4c6d46f88446 100644
--- a/media-libs/fontconfig/fontconfig-2.11.1-r2.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.11.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="http://fontconfig.org/release/${P}.tar.bz2"
LICENSE="MIT"
SLOT="1.0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="doc static-libs"
# Purposefully dropped the xml USE flag and libxml2 support. Expat is the
diff --git a/media-libs/fontconfig/fontconfig-2.12.4.ebuild b/media-libs/fontconfig/fontconfig-2.12.4.ebuild
index 545c0af59142..145a584a1438 100644
--- a/media-libs/fontconfig/fontconfig-2.12.4.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.12.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://fontconfig.org/release/${P}.tar.bz2"
LICENSE="MIT"
SLOT="1.0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="doc static-libs"
# Purposefully dropped the xml USE flag and libxml2 support. Expat is the
diff --git a/media-libs/fontconfig/fontconfig-2.12.6.ebuild b/media-libs/fontconfig/fontconfig-2.12.6.ebuild
index 6cfcc3f9fb4a..65dbef6a92cd 100644
--- a/media-libs/fontconfig/fontconfig-2.12.6.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.12.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://fontconfig.org/release/${P}.tar.bz2"
LICENSE="MIT"
SLOT="1.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="doc static-libs"
# Purposefully dropped the xml USE flag and libxml2 support. Expat is the
diff --git a/media-libs/fontconfig/fontconfig-2.12.91.ebuild b/media-libs/fontconfig/fontconfig-2.12.91.ebuild
index 7bbb78c79d99..59f25375fa73 100644
--- a/media-libs/fontconfig/fontconfig-2.12.91.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.12.91.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://fontconfig.org/release/${P}.tar.bz2"
LICENSE="MIT"
SLOT="1.0"
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="doc static-libs"
# Purposefully dropped the xml USE flag and libxml2 support. Expat is the
diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest
index 257d08f0fed1..59a80552c28c 100644
--- a/media-libs/freetype/Manifest
+++ b/media-libs/freetype/Manifest
@@ -9,8 +9,8 @@ DIST freetype-doc-2.9.tar.bz2 2128135 BLAKE2B a192237e9f2cd0b14cf081ba09d58d6e42
DIST ft2demos-2.8.1.tar.bz2 228934 BLAKE2B a8ff102ec9e526791a83bed42eb5fc289b96f030ebcdbe5bdb4508676d81074ff16120664adeaf95e9d04004e2aba5c86a2b3f5410133344d1ebaf5d4c33cb46 SHA512 f3a3216448df7b9bebb875a69587f31d0548f4b7e1b1bd70b0f06b3c4a43b3f5ca99ac2fcfecb32909b16b32a466fff24d1a6407e5fd6c2145fd64d2a156429a
DIST ft2demos-2.8.tar.bz2 225274 BLAKE2B b8b02b8b03b84709b7d274d1c8dff323051051ceb3f77762f2fad51ec7a21d34cdbc35a6e828d1755b374d05801d11b0f9968361a34efbb6a6239769b8cd730a SHA512 dffdf6a493e8145c6513be34b57734a9a99c61f758a0e1ea691ef4284cee4c274ad7c3a8120a8ec425d86e33a70cd879d9db258e9c67b6a4db79c3243d4c9fb3
DIST ft2demos-2.9.tar.bz2 230926 BLAKE2B 8c8e02101243468d52953aeeee7ad985a5aa3fabc82c19a3404ce301348fd32e5f89aa56798613658d5d29a8c3a6c7d4a70eae038ef6095005f8c10354b3f288 SHA512 3dfaf97619d585d6e4db20002c69f9c46cb8991c4faf86d9d92884a80001235ef01010148156cb4879d7869e6121fc27ef03c13288af011df26fe85c3fb7e6a1
-EBUILD freetype-2.8.1.ebuild 5398 BLAKE2B 91adb027e0b1b5903f9ad9d7b456c26df97cded09b5453a9e5f5eb8f71c8ab544424c609d6f969fea99b69019314544d0844074ae4ebcb66ab72e397419dc199 SHA512 b16b15ab519acd02fe9b462ce29987cecb0d3fca081870070c122487c8eeaacb407d13eb345f023718489a04f86c88e7b9b419e6ee2ebcf019bbf21ab77427d7
-EBUILD freetype-2.8.ebuild 5388 BLAKE2B fa9239b515b22566cc2e9f528b7d26e0bad35ae2eda09f68d8104c8f428676053585807caf630afc0e4ebae5f0e548a66967cecb98b1a486f2dfd3c8d28aab89 SHA512 0196c0c055f3a2fd70355569fe2933bbcbcdc4d14656ae5b3a13a487e8048d5ef9ab1365068b2ebc3082c7af92fb3e2f1300f934a320a4c8b03b6156917f777c
-EBUILD freetype-2.9.ebuild 5400 BLAKE2B ca537087b61cef11d2ba6b2e6d377f89029be4517ed0ef6de87e677a669400cd16560559b113f86b25f93b6c0a53c9ed258abfa2840a38a3245207a6acc2f2ac SHA512 43df5ac9eb3b13fc43052bfc7c88ad713a2cdb3fefa97e05ad2934cedcfe16d16d8e15fb8d03287949add0230649fddcf1866d06f1689e381e9abd1849c3638a
-EBUILD freetype-9999.ebuild 6525 BLAKE2B 3416510d17f7e0fb315d597e1b8dec20ada49197ebce1e924c96c5ef8e9a6c34e4b7c95ab0c8a7079a5297d0e688c080f27432518f431a2a92dea95bf05c8b8a SHA512 cd7d5c6780544a3b060eef38f93724001ac4a3aa56ceac5bacd3f2f92f8ebcf0374a33e0f3d0759b63ea061110ac2d2cbdf714f83e9f1948b2413ceb3370a238
+EBUILD freetype-2.8.1.ebuild 5386 BLAKE2B 5b2323e0c1c80e5cb5a1db7cad597b5da397fd454445da8dc5d19fb773106fa2e323a9d9d60ae2e292b4b268f04b36d50c9d05adabb4d01108217ea2c25b13cd SHA512 102ffb4d667cdd320c8e5ef36859e1eb63c50d29bf99167f206bc1b55b6187fb553a58a948743f371137350139da87791edd051e33258cf8da07da905c56c91b
+EBUILD freetype-2.8.ebuild 5376 BLAKE2B e01d966b219ff6ac04d88bdc501d609c3faf6972f9a47bd51c1fa63eb3f77901c86c0f81740d5fb71654add836a7537bd6f033d6a9ca795ad1e42c0282095de6 SHA512 a0d5065fe134b306d64baa120cac70a180aa26704c44b659f877f4cbdd759fcc6888b59d6467c4078254108eac0748f4ce23f4c3e9f8cddcadd2d3fa5fd59fe9
+EBUILD freetype-2.9.ebuild 5388 BLAKE2B ca791fa59917de24b0a6aefac933eb0d2467a3d531d816b4103962067cf008aea46fa2cca3ec15382cc8f890c1d8ab92ed35e6f01b4b7d0ee4bb1690d56992e8 SHA512 e2c1dcced3db7105de2d903ed9cf7bbbe83b1b11d1c4ed65d1ae26b1be0a7b03fd955ed6f3c690c2e0846429cef3bd45043bacf29c8d8aa615a11b7880ae45c2
+EBUILD freetype-9999.ebuild 6513 BLAKE2B d9a64b08ca6b6734ce0416abbe4b9ed940c8d541c296e35b6f8d12e3a890a37000925f6620f90a54691d4afa8b381009dd68d71ff35a4f2313ed11ec589c5b68 SHA512 8da249b6bc7308fed83976afcf52e00a4b62804049fdd0672ac8502d23a1d201a9ac06a84370e6b1b4d3b5d8433fc034d5b49b47c331029f61ba8bbd24546b66
MISC metadata.xml 1595 BLAKE2B 3c0ee074405a5f567d22df9d68682504bf0e3479bb5165fc5b1c1f186b021315ecd3afcd619b30ed52db2766f7c1163f35dca5af1c94c3f0ccef49390fa0df92 SHA512 245c4d591054ce711d74be3d2d7390f08ccc4275a05c034350b2aef5fc8718bbe96967b67c8abe71b34d794fe9e1ceac36a0313d4b270c81ebafd4baf2c6e3d0
diff --git a/media-libs/freetype/freetype-2.8.1.ebuild b/media-libs/freetype/freetype-2.8.1.ebuild
index 7592ac935258..1f53aa7d0e65 100644
--- a/media-libs/freetype/freetype-2.8.1.ebuild
+++ b/media-libs/freetype/freetype-2.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.bz2
LICENSE="|| ( FTL GPL-2+ )"
SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="X +adobe-cff bindist bzip2 +cleartype_hinting debug doc fontforge harfbuzz
infinality png static-libs utils"
RESTRICT="!bindist? ( bindist )" # bug 541408
diff --git a/media-libs/freetype/freetype-2.8.ebuild b/media-libs/freetype/freetype-2.8.ebuild
index f5f6757ec8f4..a317f65197ad 100644
--- a/media-libs/freetype/freetype-2.8.ebuild
+++ b/media-libs/freetype/freetype-2.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.bz2
LICENSE="|| ( FTL GPL-2+ )"
SLOT="2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="X +adobe-cff bindist bzip2 +cleartype_hinting debug doc fontforge harfbuzz
infinality png static-libs utils"
RESTRICT="!bindist? ( bindist )" # bug 541408
diff --git a/media-libs/freetype/freetype-2.9.ebuild b/media-libs/freetype/freetype-2.9.ebuild
index 7c6cfcd26bf4..c2f155c27ad8 100644
--- a/media-libs/freetype/freetype-2.9.ebuild
+++ b/media-libs/freetype/freetype-2.9.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.bz2
LICENSE="|| ( FTL GPL-2+ )"
SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="X +adobe-cff bindist bzip2 +cleartype_hinting debug doc fontforge harfbuzz
infinality png static-libs utils"
RESTRICT="!bindist? ( bindist )" # bug 541408
diff --git a/media-libs/freetype/freetype-9999.ebuild b/media-libs/freetype/freetype-9999.ebuild
index ab1fec804cfc..e2c6dbcb9232 100644
--- a/media-libs/freetype/freetype-9999.ebuild
+++ b/media-libs/freetype/freetype-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -22,7 +22,7 @@ if [[ "${PV}" != 9999 ]] ; then
mirror://nongnu/freetype/ft2demos-${PV}.tar.bz2 )
doc? ( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.bz2
mirror://nongnu/freetype/${PN}-doc-${PV}.tar.bz2 )"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE+="doc"
fi
diff --git a/media-libs/gd/Manifest b/media-libs/gd/Manifest
index f88f0ef3fed5..7a677b593d4a 100644
--- a/media-libs/gd/Manifest
+++ b/media-libs/gd/Manifest
@@ -1,5 +1,5 @@
DIST libgd-2.2.4.tar.xz 2478528 BLAKE2B bec49fd50465549d13a403e6f2d487ef83633842ff313a44f45ea9bf50c66e70186f314da5a943cc4199185b992f8178334bfb14fb039fe51cdb296e80648cdc SHA512 07903f322c4f6ab392508b0f60c38ca133699111ea92995dc6cd9379210d598bcb24a46c19657884d9e252f8663d0ee8c89c600e3a382a5ae598198c190f39b5
DIST libgd-2.2.5.tar.xz 2594092 BLAKE2B 222a7e012fbf9924ac391ee96c7cd3dec96afd78c6d43dfb680b33e7143e7df87fe6be75bbfe8fb93e916302d7daf08271214c84da28712e93a36465566cb2bd SHA512 e4598e17a277a75e02255402182cab139cb3f2cffcd68ec05cc10bbeaf6bc7aa39162c3445cd4a7efc1a26b72b9152bbedb187351e3ed099ea51767319997a6b
-EBUILD gd-2.2.4.ebuild 2084 BLAKE2B 5900122dc6e6213e502f5fd34993d04e27c78ca3d2a5e7660f9ac3b17c48d8de0920aa253135363e1a4a8efbadf5b26c1d34695d735f0ee1f7d78f214a794bc6 SHA512 aac99cf6d28eda87185f48387607635dd9a4edebcd7b17cdeb403ed5360356d51fbcea1836d93eda72c1edbc1509161139481246034835a6e82e737f33eb0f12
-EBUILD gd-2.2.5.ebuild 2059 BLAKE2B 8e354b11becdda2afeff752d2e1c6510ab4fabd4768a806bf6ee85f066cdae08b31c46fac645b6993e64dd595cdae69d4376c48f935b53288a7cf892402db646 SHA512 5b144d82cdb20dd6c3c9c7adc3c386b10637feddfd38c203a4e0206967a1086707ae6b643d824d0900ea9248e5a7811781ab9490138d58cebd0099e28cf1db20
+EBUILD gd-2.2.4.ebuild 2072 BLAKE2B 1acf2722c761a805ce0fa14a6301d04c7fb00bc4cfd2e9b21d8b92d7521154382cfcd56c7a0be3daadfe8420f38457038228bd88a8b4fba257eba720d5a6bd11 SHA512 016b8b4c88a5f50b931e903b1dab5f029da8892269eb3e2e16623936c0764b0ae0360a73b6ddc0cec5ed2587784bdf621e54a2d830a4efa866b14d551623fa54
+EBUILD gd-2.2.5.ebuild 2047 BLAKE2B 0fdb102aa3cb92ef7a7691c462d155e29601e6b85123898c255187306ea61026cd7c416bdf97ac38816ed61d295c3b4efc230d7ba7d750d9bc0d28007c8c5c97 SHA512 0826e1e8908bda3c31d432f3470a7984b58861f7448fcf7690d87ec2ec2fa4887e8f74f685531d587b3358cb796fd0763891182ba7492d88845b84ce8f2f8c74
MISC metadata.xml 1507 BLAKE2B 34dbcbc70165ebe74ea14e6394e2691bda7523e4c848b13a512de8f0707c194a7da3de41a8fe483d7a8b2aa1af8f0d164ea210605ae76480dbf22b976b53d2f5 SHA512 0ac3c1ca25c190333e7f97dbb05e197e62e76abeaa045966fa3024dbeb22d541d78794df08d450e887591909a25dfb6a4fef861ed62f7f055b129e17b1329919
diff --git a/media-libs/gd/gd-2.2.4.ebuild b/media-libs/gd/gd-2.2.4.ebuild
index 7cdcb905a456..64fb1ae3054d 100644
--- a/media-libs/gd/gd-2.2.4.ebuild
+++ b/media-libs/gd/gd-2.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libgd/libgd/releases/download/${P}/lib${P}.tar.xz"
LICENSE="gd IJG HPND BSD"
SLOT="2/3"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="fontconfig jpeg png static-libs tiff truetype webp xpm zlib"
# fontconfig has prefixed font paths, details see bug #518970
diff --git a/media-libs/gd/gd-2.2.5.ebuild b/media-libs/gd/gd-2.2.5.ebuild
index 3db0e012734d..dd27316e7a25 100644
--- a/media-libs/gd/gd-2.2.5.ebuild
+++ b/media-libs/gd/gd-2.2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libgd/libgd/releases/download/${P}/lib${P}.tar.xz"
LICENSE="gd IJG HPND BSD"
SLOT="2/3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="fontconfig jpeg png static-libs tiff truetype webp xpm zlib"
# fontconfig has prefixed font paths, details see bug #518970
diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest
index a6e6df3c46f7..bfddaa45f55b 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -21,7 +21,7 @@ EBUILD gegl-0.3.0-r1.ebuild 5372 BLAKE2B 843c8bb6c10947cc0378be51d6b269ae866840f
EBUILD gegl-0.3.0.ebuild 5290 BLAKE2B eb698fbe621dead0979582fa83a47c0cdab26a556194778375045b25b6774dc72375b9fe19dfda8b6ce64ad024a5ee69cb26aea51fd3693f3e80b13a78d812a6 SHA512 eae35de6ca10d0fee700ce98bcf4fe8ba4af0ec43325fb097f67d2934bc951cc356f9e07ad0b81f07e8d715ba3fba9c50babc27ba6b2670c2e23056d6108e41b
EBUILD gegl-0.3.20.ebuild 5182 BLAKE2B 97e2103ba355c528511106181c826feffeb7a2956521212d4973167ea088e39e90ff8d01af17f2e46becbfbebbe8b72a0847a5a20ec5b466c9e1721023ef9bc1 SHA512 ce8f8bb01a6469f1a5cefc6bc2b127f6ba38e8492496bae712b811ce7227c2c6102d2ab84e0da2c25dbb8a4b48ced1b00e0fb173b54d3e325d2445249841c13e
EBUILD gegl-0.3.24.ebuild 5227 BLAKE2B fa9df9507e86249d5ea604dd879b86aa8fcd323401ed2f34b1f172ebf82df88ac9618457c11da08f821de1bb013c5b85f660da7ed52f6e1069e45765ce27267a SHA512 ff2b34a6fda2bd47c38203010140988bdf6b7565638b3edb8a71a8c4e26318c028cc121ee99ab4d974c077ea2d7242498f6e98dcb38e57a9d10f0d68b250142d
-EBUILD gegl-0.3.26.ebuild 5224 BLAKE2B f82174df3e6b9ebccf7b15ca4cfbc1af02dbfc71665ebf8b558b57a5b3b34a56a95b13ca2beaf62d35a0c3f0ad0d7b0cad2d493de9fbabd7cac983ea32dcb138 SHA512 f7853ceb410245b35a0625e2e8b83400fc1af7cee486d08249da5619345d18145287b62fa903afad2b0cb92b58982451e1f43cdc03e025f0645546efd97b3759
+EBUILD gegl-0.3.26.ebuild 5223 BLAKE2B 6e2f01a4f1f44325043539de3b16860a9b460d7aba6cc65c8bb0cba93c2e8c14510c4f5869a4d25d3f0bd2ce1f74efff0b8dec7d2fb521b52ca5967c08c37b8a SHA512 552259cc6d96f0d2c1d2a7c283cec207c2a9597fb144e35c1bc0ce0100baa3d183f03614b8891e2df2ea2a4423b03ff69f8c70c04af098f5087a098976319e33
EBUILD gegl-0.3.8-r1.ebuild 5299 BLAKE2B 413dfe970b595bef38e51dd2e749b10b014952ff00d609587c23f61135864e4640e2ccefc7d2faba02cfa8769c00d46cdd48bf5b9197ff79be89a6f34d86fbe9 SHA512 9a53f0b3633c4374c696a6be3d69226ae6e2116eb5d7f3c1a5362353e840e6507aa189aeae89c178b2b8ba896fdbfb1a929d3e478060a0fd906e27db65a48501
EBUILD gegl-0.3.8.ebuild 5219 BLAKE2B 093e9816058f439e3b18308256d8c00acdb7dd2fc3a6595df03a04f26ab4b13830160783a0c745a544a277ffa7b2e9290332d89bd93685cfe94157462a88ba9a SHA512 66deb4d2c45850c9ac870d741419c16bf84a20c14cd936f90aebf626f6d9a45471aa65d3f632c617c78d9717206b0418424614b9edc3e8643ec1f61c93c3ac42
EBUILD gegl-9999.ebuild 4921 BLAKE2B c5e2f1513eb418db2b725759bee29b5c97cd3be89b020d7b86eac4edf56b295d93b3dfbc8b7d2766411b3dcd4fb3c618ed44e9ed5a27ed38b844e530465b6acf SHA512 c6acfcfa7e2c50aa64b1ad31dda9c52d530a886e4ef477f06c56d32eab809215bc018ccf0180175abd81745b4432b8f9563e51ec6e1df72cf0a6125c95635478
diff --git a/media-libs/gegl/gegl-0.3.26.ebuild b/media-libs/gegl/gegl-0.3.26.ebuild
index ae53b1e4361a..53a4e638e092 100644
--- a/media-libs/gegl/gegl-0.3.26.ebuild
+++ b/media-libs/gegl/gegl-0.3.26.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
SRC_URI=""
else
SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
- KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+ KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A graph based image processing framework"
diff --git a/media-libs/jasper/Manifest b/media-libs/jasper/Manifest
index 6836c6191e1d..70921f8a4f9f 100644
--- a/media-libs/jasper/Manifest
+++ b/media-libs/jasper/Manifest
@@ -1,4 +1,4 @@
DIST jasper-2.0.12.tar.gz 1311323 BLAKE2B bc9922bfc4765ea4630f9a504c9e5a1c0992f78c2ef68cd077ba0c8a36332debd5db9fc5c639accc7eaa0eda64e478c1e615da9f2eaf363446635dd94a253fa0 SHA512 a308983511119d85e6580772f5164c188e2e170500fa4b98c8831aa63aa87cb661b88952b278e390497571f9ebf9286855a8aa946037692309ba5f41cffe265a
-EBUILD jasper-2.0.12.ebuild 1819 BLAKE2B 5fa4637f2b91eab7ca0d0dde196fccb00bedc25b7c2f418c1c1f04ec603a6ad25ebad76e980df0e5cbedbd91818c468c919ff492bcec577917b298136ffc6159 SHA512 ab4f51bf7574f4fefffce4113c9f7ff293b9349579c3be135b6b50c043705ed0c3b5ee57ed9243e8cee7ac354ba9a6c69d2e0795484d9d74a17a6b45cd7158a6
-EBUILD jasper-9999.ebuild 1834 BLAKE2B 6df082a7c816f527e9c8e9cffb797615acb64bbddcf39c29a2e26bb014be27e1376be9e672efdcc037e4ce2b7877b430451e4ef348bff95f9228d1c62a6d0dae SHA512 448b80064da111aa3b344493d5741053ad7d5f710e917fc106556fa7246b223cc860a6cb7c40c938a073517cbd8134f8354d941581dbd23c13288e820caf93a5
+EBUILD jasper-2.0.12.ebuild 1807 BLAKE2B 724d504c046501904f8da136be0042665b453f02320574ec807f069b1b6f246b3ec11d53908ab03681f456d10888f35dabcf6c9e771975837336799d773974e9 SHA512 7fd349ca1e0f5f8c3bbded01685dbc8dd699811f98f3d781e32ef42e94c4c3c2c08af9b6b1ef8988e6c4b4b84a4f0c11d647bdb4aca1239b38000efe90fc84e1
+EBUILD jasper-9999.ebuild 1814 BLAKE2B ff6b0d726b1988d0b1fbbf8e737808839f29fbd253c18d9a0c1b2b451b8ff8e7966672d45f04963c5c104dbcf3f2b9656d2c3ecc939b871a4210fd061c1126ab SHA512 3d137d1caac04177169b847a5fc1b8ae3148f8dc215fcfb51881d7a793c6d889ac818f03bf670b97999a461ec4810eb6ec19d1a34a58aa915e4aedb15a00e5f2
MISC metadata.xml 342 BLAKE2B 4260ac1403a844c48b72bd62c04073de06da73cecca8bbab9fdd7de36b4a462feabee08d933b0098c451691b17aa3ff7d7e3eb25052461381a37198b12225c55 SHA512 a01344f985dc6b7a24ca568fe859f2a593b55df39ba7b711c4db62eb7df5389007cb6c8dd1ab399f70bf8cb221a22681a9eab279ce8ab1ea6b198fa65f1b8a20
diff --git a/media-libs/jasper/jasper-2.0.12.ebuild b/media-libs/jasper/jasper-2.0.12.ebuild
index 6e89a5e716af..e6fab3f30a0f 100644
--- a/media-libs/jasper/jasper-2.0.12.ebuild
+++ b/media-libs/jasper/jasper-2.0.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
else
inherit vcs-snapshot
SRC_URI="https://github.com/mdadams/${PN}/archive/version-${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+ KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
fi
# We limit memory usage to 128 MiB by default, specified in bytes
diff --git a/media-libs/jasper/jasper-9999.ebuild b/media-libs/jasper/jasper-9999.ebuild
index d0e060bfd024..2c5f27694b7e 100644
--- a/media-libs/jasper/jasper-9999.ebuild
+++ b/media-libs/jasper/jasper-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -14,9 +14,7 @@ if [[ ${PV} == *9999* ]]; then
else
inherit vcs-snapshot
SRC_URI="https://github.com/mdadams/${PN}/archive/version-${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 \
- ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux \
- ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
fi
# We limit memory usage to 128 MiB by default, specified in bytes
diff --git a/media-libs/jbigkit/Manifest b/media-libs/jbigkit/Manifest
index 494f639f4f5b..5d9365cdb157 100644
--- a/media-libs/jbigkit/Manifest
+++ b/media-libs/jbigkit/Manifest
@@ -1,4 +1,4 @@
AUX jbigkit-2.1-build.patch 8817 BLAKE2B 5eb1137c933cf4079378dce30b9996bc698a3a8852f35131f9d138cd171c146cfd3b8267abafea3e6bd3a30a2029a7b73b149d5d8c560354ac8ae24bc2cc6c7c SHA512 d8f7c94676452cd36641240e6120972cdb7d03f62dcfdc3920ebc5971fe39c623a50cc7f5020c9458eaebadbb40ff1f2d8bfab2c0de7f9a138e7f0d88be86a07
DIST jbigkit-2.1.tar.gz 438710 BLAKE2B 7bd82f0e10a2d3794739ee85b77c5407d58753a00e014e937735f9af3043347de88a6e567609bc26de488887a6d61b0a162387fb72732b9be7e550e3f9b9539e SHA512 c4127480470ef90db1ef3bd2caa444df10b50ed8df0bc9997db7612cb48b49278baf44965028f1807a21028eb965d677e015466306b44683c4ec75a23e1922cf
-EBUILD jbigkit-2.1.ebuild 1431 BLAKE2B cc2f9479888e210835eb43078a0550766755355b0f67be962d0889a2a3a906f083b7a6fee45cb57f4a81497e4cc124f261ddf08fc4dca6ad4aec9534f40b93c3 SHA512 7c6d2042283a6227774a2a3388d886d2769be7d09a6b27d174643a19b0030c48a55f5ffa3efea1cbc6e81f39afa2bba446205ab8e01f8b8773a41b6ec6ce3cf0
+EBUILD jbigkit-2.1.ebuild 1419 BLAKE2B 723f0e516c64a480f56d51a4117eab84fd1f993d9c965eace0b7ac02811719147f995242982c518d3b9a1e4e59a8e64bdef341f04c24ac6eb0020d63b18656ce SHA512 fb6d7402e2c0ac6f62329be0fca425b14769cb3aff2daafd3617797f2ce014552bc348d85b617310ccf664a146d270e82cb2f7315ebce443ef1c666d8015262e
MISC metadata.xml 465 BLAKE2B fdf534bd45566d595255f6196cf5d8290a9aa2d7a716f61b90f2f3384610789dd3af84965b80f49b8eb7dc129f2c50052927ad5cc62a12092b6d7db32da2a977 SHA512 a328f6b53c517072f28a88360a31de1ecd5188516ac2a46338c9b6bb1fb92c3727a9823f22e075577bf02a9e937038e87b70932de511174c965b4e991ccc6769
diff --git a/media-libs/jbigkit/jbigkit-2.1.ebuild b/media-libs/jbigkit/jbigkit-2.1.ebuild
index 8354528a4c42..a27b04bd8d9a 100644
--- a/media-libs/jbigkit/jbigkit-2.1.ebuild
+++ b/media-libs/jbigkit/jbigkit-2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="http://www.cl.cam.ac.uk/~mgk25/download/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0/2.1" # Since we install libjbig.so and libjbig85.so without version, use ${PV} like 2.1
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="static-libs"
DOCS="ANNOUNCE CHANGES TODO libjbig/*.txt pbmtools/*.txt"
diff --git a/media-libs/jpeg/Manifest b/media-libs/jpeg/Manifest
index 3257e6aca627..bfac9fad1766 100644
--- a/media-libs/jpeg/Manifest
+++ b/media-libs/jpeg/Manifest
@@ -7,8 +7,8 @@ DIST jpegsrc.v9a.tar.gz 1000034 BLAKE2B 24fffc050d30af27c52ace25f716858e882f88e6
DIST jpegsrc.v9b.tar.gz 1022609 BLAKE2B 334b7d3df800ed2c3e1b5ee2fea40a350c0b4024f5a368efb488b9f782b3d006a691fc53574fa6ad4ff944b69c93478d2d7759635196277774f360511ecff3f9 SHA512 74ea5af3545657d4ac03f8f7933913112cc2d982f0e379d0e5647f1acac21931468e53806297c30ebe180c7bcf84919a0ac20a4195afb03db03060d57904ef6c
DIST libjpeg8_8d-1.debian.tar.gz 13676 BLAKE2B ac6fab3e52f91c9ece95ed809fc972afc92c55754a59358f7dacb056917b1878f6f9be85a20ccb34eb13489a9963a00659fe25c27e8b18b44961c6ba5f3214cd SHA512 7def4f13524f0af3b9adf35a370027a18f43b9a635f56a17d5bb7883370db8b18b8a12737d0f0cb4b0287ccf8fb474eb5f754de6b398ffe7d522c54e5bf68040
EBUILD jpeg-6b-r12.ebuild 1253 BLAKE2B a9bfd0f21ae1f3f1b96b9effce1f731620f1b0da53138ac897c8cc67c2c5ac1d868a093cbc5624c58d7226813269457987a0dc01a9d6eb13d5c464ab87d37965 SHA512 cb3ec5945863b4bab44d32dbb14aaced20e3960ab64cfaf220cec225685d57ca617e01502364887d9f6925b60950bfd8f7e8dbe89e29d931aeb44ac918fa055b
-EBUILD jpeg-8d-r1.ebuild 2081 BLAKE2B 49d6c956996c0361e5f6cf5c98dd475899b2863bc4cb10a927637f6b31bde65a4f686daaebc07dac196d0443da9f9a6fc88646fd8100f7a4590e99c5628e09ef SHA512 95fbd07ae0c48084b9fb4f91aae37c504324f6f464865fca1d11897729a512b2e7006bd4a072824cedd14651419229b6511b86ce7935de23456584f8b1dfc142
-EBUILD jpeg-8d-r2.ebuild 1544 BLAKE2B c08d954cb61dfc3dbb0a43fa0654917cda3a3b18a531d67aa667bbdad746a2f7ff0d96ebc7357d1a012e5fa9ae7e7ff494705d4b712678efd4aeb1f86ba39ebe SHA512 a4a4188f60f5eb6bf51a7cd729cf17c8dfafd27bd4beab13163ffdb8d60c09ba6bc25128c3e72bd75d2acb3d21f1e0364491d4a0af83468df15b91d1005b4430
-EBUILD jpeg-9a.ebuild 2047 BLAKE2B 5782d178f547738015be5fa25168b7ba7878452ba95edb3b287a5ed4ad02aae3d93b06af19d9a5921937eaff460ab5a86c54b78b5ed47761471ddd0e4f3dcc66 SHA512 61a35aaba06ebe974823fe5cb5a6510b97831856f8fa53db731602a71b77fd513024541d4124f0ad8d0a0725e9ea2b71f775f2d98bd7e647a55411de92eea268
-EBUILD jpeg-9b.ebuild 2047 BLAKE2B 5782d178f547738015be5fa25168b7ba7878452ba95edb3b287a5ed4ad02aae3d93b06af19d9a5921937eaff460ab5a86c54b78b5ed47761471ddd0e4f3dcc66 SHA512 61a35aaba06ebe974823fe5cb5a6510b97831856f8fa53db731602a71b77fd513024541d4124f0ad8d0a0725e9ea2b71f775f2d98bd7e647a55411de92eea268
+EBUILD jpeg-8d-r1.ebuild 2069 BLAKE2B 83224207c0bd3fb14947a3c7bc506fcd5c9d20f9c17fcbc89cdccadaf40318cd3f6e0f2da72fb21faa206640d76538a185f6a3a29d1bd662b877de083c049f31 SHA512 dea7fd89d094be0cb90e9b99d3f0e9353bca3045a2ca8a110b6eafdbdc27fd2fe5a01c3911697f065e474c1d7b58cdcd39a82552281200b8ed3870a914f549fe
+EBUILD jpeg-8d-r2.ebuild 1532 BLAKE2B 7cb616d69fbad57a538c50f08ecce6a4c76c455724b280d51bbff2dc6707329e8db15e040a1c7ca2bf607dabd1690045cc7ad5cacd66185b01da3abda9386e04 SHA512 66faaee06b6243bfaf5ac512ebc14042b6b41a5c24de53ea376f0fb8b8959ec135bf7789dba6935d96e367059e8d04abb8198a229a47892f4c7df0f94ed677b7
+EBUILD jpeg-9a.ebuild 2035 BLAKE2B 959e8dfd3c8f73a7e8420c03d56f9d1c5b7b84fb92b0c2967b410378ad593d4e4190bdf726ff290654b7dce29b14c530bd2108a3137d4124c0f45f9db9cfecd2 SHA512 9382789c9d079b01d7a9105f75c742d466de0b5726b06a84e36a10c37ea21ec753e2ae1eab03a2f2660e7876eb054bbda20a7aa9688900b54a78e4a510e9607b
+EBUILD jpeg-9b.ebuild 2035 BLAKE2B 959e8dfd3c8f73a7e8420c03d56f9d1c5b7b84fb92b0c2967b410378ad593d4e4190bdf726ff290654b7dce29b14c530bd2108a3137d4124c0f45f9db9cfecd2 SHA512 9382789c9d079b01d7a9105f75c742d466de0b5726b06a84e36a10c37ea21ec753e2ae1eab03a2f2660e7876eb054bbda20a7aa9688900b54a78e4a510e9607b
MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
diff --git a/media-libs/jpeg/jpeg-8d-r1.ebuild b/media-libs/jpeg/jpeg-8d-r1.ebuild
index 07c725027733..6c3a792a6132 100644
--- a/media-libs/jpeg/jpeg-8d-r1.ebuild
+++ b/media-libs/jpeg/jpeg-8d-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="http://www.ijg.org/files/${PN}src.v${PV}.tar.gz
LICENSE="IJG"
SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="static-libs"
RDEPEND="!media-libs/libjpeg-turbo:0
diff --git a/media-libs/jpeg/jpeg-8d-r2.ebuild b/media-libs/jpeg/jpeg-8d-r2.ebuild
index 3db4d866048a..445113902da4 100644
--- a/media-libs/jpeg/jpeg-8d-r2.ebuild
+++ b/media-libs/jpeg/jpeg-8d-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="http://www.ijg.org/files/${PN}src.v${PV}.tar.gz"
LICENSE="IJG"
SLOT="8"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="!=media-libs/jpeg-8*:0
diff --git a/media-libs/jpeg/jpeg-9a.ebuild b/media-libs/jpeg/jpeg-9a.ebuild
index b03c0a95b9fb..098a4530dd5e 100644
--- a/media-libs/jpeg/jpeg-9a.ebuild
+++ b/media-libs/jpeg/jpeg-9a.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="http://www.ijg.org/files/${PN}src.v${PV}.tar.gz
LICENSE="IJG"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="static-libs"
RDEPEND="!media-libs/libjpeg-turbo:0
diff --git a/media-libs/jpeg/jpeg-9b.ebuild b/media-libs/jpeg/jpeg-9b.ebuild
index b03c0a95b9fb..098a4530dd5e 100644
--- a/media-libs/jpeg/jpeg-9b.ebuild
+++ b/media-libs/jpeg/jpeg-9b.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="http://www.ijg.org/files/${PN}src.v${PV}.tar.gz
LICENSE="IJG"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="static-libs"
RDEPEND="!media-libs/libjpeg-turbo:0
diff --git a/media-libs/lcms/Manifest b/media-libs/lcms/Manifest
index 7a6fa76f91ef..3a1a214cdd4d 100644
--- a/media-libs/lcms/Manifest
+++ b/media-libs/lcms/Manifest
@@ -2,7 +2,7 @@ AUX lcms-2.8-CVE-2016-10165.patch 772 BLAKE2B 3f0f47fd8a12ca0a8171090cf6ccec0be7
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 1260 BLAKE2B cd19d63519995caff4973cf3d89e11eab65866897368078dfc0e0222e08e9f5f228bfef08d9398f5ec69ebb25c1ee948f97f0f6880f3e2e20357ad1fe5693c2e SHA512 4c90a4ef2684f95f14c49499d434e6ddae37ccf5672478a2184e96fe55c504fa55a116daecea87e80da3326f511b7762d68b87b9ea950026cabceaf19a2e9860
+EBUILD lcms-2.8-r1.ebuild 1409 BLAKE2B c899180d962e69b7b42cd1cb1e18d543e2f85c2ce4c808663ddcd812ae3565a8a75cff800ea4739bc68a9b66b23a8a55ae96e6b7033d620abe40de4dfafca0a9 SHA512 bbda4f4ba381a4c689bc6b7eff42772807c48c5e310a2ab26ccb85cdfa409a262be8d6e724a3032c03099a152c2ba1caeb83927c2109df03c953f58a6cad3364
+EBUILD lcms-2.8-r2.ebuild 1266 BLAKE2B 952439d7206db82cb2116a8bf8eb58e1bc690613131c714d8ebbe6f5293d8edf06f1fa6cb5dfb67c2e0cde947d6d0b10a69c0ab3a9b327c3938d2791f76bea4d SHA512 594167911967ab6a7a388f930cf043a0eda9f544847ed1521a6c8d5be44d4ff6e3af5c42d3109d448b4f94233bfdd71368858eafa7ecd637daa4a45936284273
+EBUILD lcms-2.9.ebuild 1248 BLAKE2B c1ad40c0281d75cddb536e4002716116ba147d28a49289656718e7e013ba289421166c3f7366f3ed41d08b97dbfa35373dc8d14301888c121765d0cf04670ddd SHA512 2bc97baa5e99dafa5d30f09853abc66522ac73b3acaa796759a523e08a08d426dc0a0a002aa51954bc2c505f3ebddbbfccca4f66c228b4b1d78a545a2af44ac3
MISC metadata.xml 333 BLAKE2B f6b3984af87fe88ac29f5728eb0b45a5e96e99e3647969adf3de68f8754dc85a23c6bc4eff61132c78f168db7e19694d94c087dc81f7bac6009d253a8bb0daa6 SHA512 d8fb0a9e8fb4073583431d2a9668c01fa87230e1f27672a66955c21c842701109d6ad75c50f9f88334849be3809339a4562a745549d79fdf7aad9c7cd1b0485e
diff --git a/media-libs/lcms/lcms-2.8-r1.ebuild b/media-libs/lcms/lcms-2.8-r1.ebuild
index 9fe8c7f668db..02f88a95ee16 100644
--- a/media-libs/lcms/lcms-2.8-r1.ebuild
+++ b/media-libs/lcms/lcms-2.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -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 ~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 +threads test tiff zlib"
RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
diff --git a/media-libs/lcms/lcms-2.8-r2.ebuild b/media-libs/lcms/lcms-2.8-r2.ebuild
index 32ce3dfa7b81..34c5ec63739e 100644
--- a/media-libs/lcms/lcms-2.8-r2.ebuild
+++ b/media-libs/lcms/lcms-2.8-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -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 ~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="
diff --git a/media-libs/lcms/lcms-2.9.ebuild b/media-libs/lcms/lcms-2.9.ebuild
index 4cb53d0da271..e10e8aaceef9 100644
--- a/media-libs/lcms/lcms-2.9.ebuild
+++ b/media-libs/lcms/lcms-2.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -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 ~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="
diff --git a/media-libs/libffado/Manifest b/media-libs/libffado/Manifest
index bf853fb272e6..cf779ad5a061 100644
--- a/media-libs/libffado/Manifest
+++ b/media-libs/libffado/Manifest
@@ -1,13 +1,8 @@
-AUX libffado-2.3.0-gcc6.patch 1311 BLAKE2B 76148cf44af3130199e8709aae5f7a276a4ed93acfb06735219bc3e4b1bc0d1d37cff57cd20f216e50ec8c1109e33439ecec666a3272809e940b54d61342d027 SHA512 a700c46af0313511bba311fe95634dc0090507256a9ff60a30d10b221fe267d1190af4710b1c4747f8bfa057b0af96e6bab78f6ec4ecef08fb48425092751cd7
-AUX libffado-2.3.0-include-signal.patch 1246 BLAKE2B ac37bf4da0600c0ee518ace257b0de2aaad5a815e3cbedf51490c06ad90acdd893ee2fc40b4b318411c59515654db5276f40e5b0fbe877b5d2985a9e56b0c42e SHA512 c256a59a77160141e082fa6cf358ae0454779e15c01a9ceaf1df8ecd101afc74246654f9c088a67c5453434430bdd390ab2712c617737b2a93fa54edcf685177
-AUX libffado-2.3.0-modelname-strip.patch 2128 BLAKE2B 29c52d8d30136e0a040fe1801a15f4149affbb7de721f8614416a407952714426036f77c2b6451d7bf1f69adbe003258098d2dceda52a7f8d9da0604cdf78a26 SHA512 1ebbe47bdd4d15d6527c4a8c2dfa02861c8a8ce287e1cd44e80356b52007c6e55bc9f267436467f1600c0efbd261da227b947b3648c6a8efcedf8997356153ac
AUX libffado-2.4.0-additional-py3-fixes.patch 3657 BLAKE2B 8bb214f90fac168c682119d8758efd67812da784770684e7ff47c1d64146da79346d61dfe5b17c0d5e23700f04605d073147a1dd335f0a1da72faf68418a5cd7 SHA512 feb6cd85ee487182b56f003ddee1fc7a1aa3aa07d6d1f3ccbd2ab3735e5d756e836062789a71248d6a16f7377d9d76645c0a17ab76a8d9178b1154cd67783be8
AUX libffado-2.4.0-crossbar-router-fix.patch 496 BLAKE2B 7a2b88344c319eb5c1da7a4430600843e57eccc6b96d833b7dfc17ca8f63fb22ff50d959ad06c4c8d06036a96412064ce5630f4a26b53fa0b5eb2e392d8ada66 SHA512 5f31f7db57cf54c05dc00bb00f5f0a5e1771dfd2cd716d9bc56788c24313d14d26fb0ffc7865acb5b55504592929a6b271f657e25971eee37c4aa0a7cc03c382
AUX libffado-2.4.0-py3-pyqt5-fixes.patch 9119 BLAKE2B e1b4ead17535e573bfced949652fec2418b0236b4ab3146f45f6931b0d80f5c1af86f17247e931baf07d9efd3c3726e0d9a0cc42783fd9053464073bdc233577 SHA512 26f34e318040e3fb9066424538d4ad7dd41e49e93c5f89161cd460bce862d3e2a25e0a2ffb6c28beb1f91fdd00a146f7d33930242e52e5148a7d1a0fb0e1ff28
AUX libffado-2.4.0-pyqt5-dbus-detection.patch 1503 BLAKE2B 448eb997454a72f9d55722462dbe696d293b271002acf205c73e5fb59690ab7ae622830e09ab05def50d73d3fa1bc62076ead695a7d79335b75a00d3a4f1ce73 SHA512 29a44a73786256e8aec380e4e68df9f6de3ceb1d7bf1d4f1565585418ab4167ac2d16b85958cc1acfa60906b384445bd82866d05d3c3f3bdc517ae424d83e559
AUX libffado-2.4.0-rme-bigendian-fix.patch 1618 BLAKE2B db8969797d9f8bdf4aac9a1e8474ad7d84428ede18788746b885ed037dcc71798a348bc86335dd72083a3937ad00170f6bbe412666f3109395642186b0fb4e2c SHA512 0ecb20c21858df87f53c0033109a4b736e1a38dc8a2b0ed00660cd3b80f74ce7b4cb87438ac5a37e11f0d4650166b3519e163f442d27a7822a24f4485626d776
-DIST libffado-2.3.0.tgz 1239253 BLAKE2B cb470a590df8018975f40f56cde50468a2b51c9504b719b70ce5941406829f25452a96b8ac897aba1ed6c8d4cafa712e7872430e7bb2ebec0822f7b4720084c5 SHA512 24a8853281a17b04623e41dc590f7a9b8f4aebe4dfaece2e3b8fe28457a6ff011586e817712b4913d1fca660b701dddc70576c12d8c56470cf991eb17b4297c4
DIST libffado-2.4.0.tgz 1228916 BLAKE2B 21a3a2a96377f698e7c1a43912c761624aabe5401f0e147fee4fa203c4534166494de8867320b4b6bc3ff200b65c77bb62ab2c4e98948ed0ee74e6171d162deb SHA512 7df37584925cc908cc284dba344609928d39e006f71ae4ede62e4531b2628271ebd0db00407418e943fb569b5b8b919a76c90aaeed03005cefbd3c1c16ee1627
-EBUILD libffado-2.3.0.ebuild 2684 BLAKE2B 223f4ecd0acedf93aa83a1f0a47fa3f23a731313cca1ea5663b1c4fee515a594df0d04dad429e16c2240e60249b5a0aa151890e57d550462f050bd0ee0c028c6 SHA512 68469a77cf5bba5cc880c35b1d07d0bcb36f41901eebe92e8e127b4cbcd08671d393e29723743d568b5122e878b7f097e512eca6b3a05971fbd0b7b06b9617d4
EBUILD libffado-2.4.0.ebuild 3194 BLAKE2B 57fc39ce908391aa991a5dc87d90cc9d709320c65c32eec065fb236a8cc3b5cf6b713b3e97bba0d4de1f96bf9dffb7922b8b8b33d6c31fe3608cba9a00a0b82f SHA512 54574ea4a2baa8a18d4dff29972c96cf94401af1e76afb52271358a0d353e51e4aa589bf590534eaf289998c72e3ee36983a55b77cb3b9969fe480a570c290f3
-MISC metadata.xml 625 BLAKE2B ba2bee4e1ba0c8bc9e8a4bda63c8a184fa4992683ec24bec54424049fbc1b66a8332f25eb6c7841df0198a3a973408fbfe82f0ee306d49f1809d82c12ec3b0c0 SHA512 ac725c6eabcc3cd7fa5ac9f20d936e5a1c494d2a2ed6e504bf27cc750cd328600a8dbcd0adeb27d2bd760ce2b577f9860b1041a899fbfde6b67c4b6a681658eb
+MISC metadata.xml 566 BLAKE2B 66bf590980ba18079dfc4127aad3de692e4544f93518fec98e8c337c129df35fac11ff1c8b2c5c3b606855da6020f7abf311b14a4b8b607b08ed1662ae5adc3a SHA512 f1d19db6ac852100cae4d73b8608a892bae5d4907b35601c4c751a35555111de450edf1f0373c2f81cd68e947c76e9c36c7e2b76a8c9d3aa64345fa9b9227b34
diff --git a/media-libs/libffado/files/libffado-2.3.0-gcc6.patch b/media-libs/libffado/files/libffado-2.3.0-gcc6.patch
deleted file mode 100644
index 2a73ee1cf8cc..000000000000
--- a/media-libs/libffado/files/libffado-2.3.0-gcc6.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-------------------------------------------------------------------------
-r2629 | jwoithe | 2016-10-09 13:00:28 +0900 (Sun, 09 Oct 2016) | 1 line
-
-TimestampedBuffer.cpp: move the include of math.h to the top of the file which is where most people would expect it to be. The patch comes from a Fedora RPM source package via Simon Lewis, who suggested that without it gcc6 had trouble with the file (the nature of the problem is not known by the FFADO project at this time). Earlier versions of gcc (for example, 4.8.2) had no trouble compiling this file without any math.h include, so the issue that some have seen with gcc6 must be due to math.h being removed from some other system-level include file at some point.
-------------------------------------------------------------------------
-Index: src/libutil/TimestampedBuffer.cpp
-===================================================================
---- a/src/libutil/TimestampedBuffer.cpp (revision 2628)
-+++ b/src/libutil/TimestampedBuffer.cpp (revision 2629)
-@@ -32,6 +32,7 @@
-
- #include <cstdlib>
- #include <cstring>
-+#include <math.h>
-
- #define DLL_PI (3.141592653589793238)
- #define DLL_SQRT2 (1.414213562373095049)
-@@ -179,8 +180,6 @@
- m_wrap_at=w;
- return true;
- }
--#include <math.h>
--
- /**
- * \brief return the effective rate
- *
diff --git a/media-libs/libffado/files/libffado-2.3.0-include-signal.patch b/media-libs/libffado/files/libffado-2.3.0-include-signal.patch
deleted file mode 100644
index 4eabf12eef05..000000000000
--- a/media-libs/libffado/files/libffado-2.3.0-include-signal.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-------------------------------------------------------------------------
-r2706 | jwoithe | 2017-08-08 08:39:56 +0900 (Tue, 08 Aug 2017) | 11 lines
-
-PosixMessageQueue: ensure visibility of SIGEV_THREAD declaration.
-
-Orcan Ogetbil reported on the ffado-devel list that during the recent Fedora
-rebuild effort FFADO 2.3.0 failed to compile because SIGEV_THREAD was
-undeclared. Jano Svitok made the plausible suggestion that signal.h needs
-to be included explicitly under newer glibc versions. This trivial patch
-implements this. As of this commit it has not been verified that the
-problem is fixed with this addition. However, there's no harm done by the
-change in general and conceptionally the change is consistent with the
-source file's content given the use of signal-related functionality.
-
-
-Index: src/libutil/PosixMessageQueue.cpp
-===================================================================
---- a/src/libutil/PosixMessageQueue.cpp (revision 2705)
-+++ b/src/libutil/PosixMessageQueue.cpp (revision 2706)
-@@ -30,6 +30,7 @@
- #include <errno.h>
- #include <string.h>
- #include <poll.h>
-+#include <signal.h>
-
- #define MQ_INVALID_ID ((mqd_t) -1)
- // one second
-
-------------------------------------------------------------------------
diff --git a/media-libs/libffado/files/libffado-2.3.0-modelname-strip.patch b/media-libs/libffado/files/libffado-2.3.0-modelname-strip.patch
deleted file mode 100644
index 8f28b6ac0f75..000000000000
--- a/media-libs/libffado/files/libffado-2.3.0-modelname-strip.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-------------------------------------------------------------------------
-r2677 | jwoithe | 2017-03-22 07:43:24 +0900 (Wed, 22 Mar 2017) | 1 line
-
-configrom: there is no obvious reason why a space should be added to the end of the vendor and model strings returned from the interface. Retain the explicit null termination of these strings to cover for the case where an interface may not return any null bytes. Also fix indentation associated with the null termination code. The issue with the trailing space was noticed and reported by Nils Philippsen: its presence broke a test in the saffire_dice mixer python code.
-------------------------------------------------------------------------
-Index: src/libieee1394/configrom.cpp
-===================================================================
---- a/src/libieee1394/configrom.cpp (revision 2676)
-+++ b/src/libieee1394/configrom.cpp (revision 2677)
-@@ -176,13 +176,11 @@
- ( void* )CSR1212_TEXTUAL_DESCRIPTOR_LEAF_DATA( m_vendorNameKv ),
- len );
-
-- while ((buf + len - 1) == '\0') {
-- len--;
-+ while (*(buf + len - 1) == '\0') {
-+ len--;
- }
-- // \todo XXX seems a bit strage to do this but the nodemgr.c code does
-- // it. try to figure out why this is needed (or not)
-- buf[len++] = ' ';
-- buf[len] = '\0';
-+ // Ensure vendor string is null terminated
-+ buf[len] = '\0';
-
-
- debugOutput( DEBUG_LEVEL_VERBOSE, "Vendor name: '%s'\n", buf );
-@@ -195,13 +193,11 @@
- memcpy( buf,
- ( void* )CSR1212_TEXTUAL_DESCRIPTOR_LEAF_DATA( m_modelNameKv ),
- len );
-- while ((buf + len - 1) == '\0') {
-- len--;
-+ while (*(buf + len - 1) == '\0') {
-+ len--;
- }
-- // \todo XXX for edirol fa-66 it seems somehow broken. see above
-- // todo as well.
-- buf[len++] = ' ';
-- buf[len] = '\0';
-+ // Ensure model name string is null terminated
-+ buf[len] = '\0';
-
- debugOutput( DEBUG_LEVEL_VERBOSE, "Model name: '%s'\n", buf);
- m_modelName = buf;
diff --git a/media-libs/libffado/libffado-2.3.0.ebuild b/media-libs/libffado/libffado-2.3.0.ebuild
deleted file mode 100644
index b5d17e932632..000000000000
--- a/media-libs/libffado/libffado-2.3.0.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-single-r1 scons-utils toolchain-funcs udev multilib-minimal
-
-DESCRIPTION="Driver for IEEE1394 (Firewire) audio interfaces"
-HOMEPAGE="http://www.ffado.org"
-
-if [ "${PV}" = "9999" ]; then
- inherit subversion
- ESVN_REPO_URI="http://subversion.ffado.org/ffado/trunk/${PN}"
- KEYWORDS="~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-else
- SRC_URI="http://www.ffado.org/files/${P}.tgz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-LICENSE="GPL-2 GPL-3"
-SLOT="0"
-IUSE="debug qt4 test-programs"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="dev-cpp/libxmlpp:2.6[${MULTILIB_USEDEP}]
- dev-libs/dbus-c++
- dev-libs/libconfig[cxx,${MULTILIB_USEDEP}]
- media-libs/alsa-lib
- media-libs/libiec61883[${MULTILIB_USEDEP}]
- !<media-sound/jack-audio-connection-kit-0.122.0:0
- !<media-sound/jack-audio-connection-kit-1.9.9:2
- sys-apps/dbus
- sys-libs/libraw1394[${MULTILIB_USEDEP}]
- sys-libs/libavc1394[${MULTILIB_USEDEP}]
- ${PYTHON_DEPS}
- qt4? (
- dev-python/PyQt4[dbus,${PYTHON_USEDEP}]
- dev-python/dbus-python[${PYTHON_USEDEP}]
- x11-misc/xdg-utils
- )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}/libffado-2.3.0-modelname-strip.patch"
- "${FILESDIR}/libffado-2.3.0-gcc6.patch"
- "${FILESDIR}/libffado-2.3.0-include-signal.patch"
-)
-
-myescons() {
- local myesconsargs=(
- PREFIX="${EPREFIX}/usr"
- LIBDIR="${EPREFIX}/usr/$(get_libdir)"
- MANDIR="${EPREFIX}/usr/share/man"
- UDEVDIR="$(get_udevdir)/rules.d"
- CUSTOM_ENV=true
- DETECT_USERSPACE_ENV=false
- DEBUG=$(usex debug)
- # ENABLE_OPTIMIZATIONS detects cpu type and sets flags accordingly
- # -fomit-frame-pointer is added also which can cripple debugging.
- # we set flags from portage instead
- ENABLE_OPTIMIZATIONS=false
- # This only works for JACK1>=0.122.0 or JACK2>=1.9.9, so we block
- # lower versions.
- ENABLE_SETBUFFERSIZE_API_VER=force
- )
- if multilib_is_native_abi; then
- myesconsargs+=(
- BUILD_MIXER=$(usex qt4 true false)
- BUILD_TESTS=$(usex test-programs)
- )
- else
- myesconsargs+=(
- BUILD_MIXER=false
- BUILD_TESTS=false
- )
- fi
- escons "${myesconsargs[@]}" "${@}"
-}
-
-src_prepare() {
- default
- multilib_copy_sources
-}
-
-multilib_src_compile() {
- tc-export CC CXX
- myescons
-}
-
-multilib_src_install() {
- myescons DESTDIR="${D}" WILL_DEAL_WITH_XDG_MYSELF="True" install
-}
-
-multilib_src_install_all() {
- einstalldocs
-
- python_fix_shebang "${D}"
- python_optimize "${D}"
-
- if use qt4; then
- newicon "support/xdg/hi64-apps-ffado.png" "ffado.png"
- newmenu "support/xdg/ffado.org-ffadomixer.desktop" "ffado-mixer.desktop"
- fi
-}
diff --git a/media-libs/libffado/metadata.xml b/media-libs/libffado/metadata.xml
index 52a13df73d66..eda35ae2cc67 100644
--- a/media-libs/libffado/metadata.xml
+++ b/media-libs/libffado/metadata.xml
@@ -14,7 +14,6 @@
<name>Gentoo ProAudio Project</name>
</maintainer>
<use>
- <flag name="qt4">Install qt4-based mixer frontend</flag>
<flag name="test-programs">Install standalone test programs</flag>
</use>
</pkgmetadata>
diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest
index ee637eb89abd..fa6254bf95f2 100644
--- a/media-libs/libgphoto2/Manifest
+++ b/media-libs/libgphoto2/Manifest
@@ -1,3 +1,5 @@
DIST libgphoto2-2.5.14.tar.bz2 6992238 BLAKE2B 6173ada55f032ae2b630db5324c87ad9bebb3fda485fe9bc89a042d192a136a73596a92b1df3c762ffd7168cf91ca12f1fa2998e154152eb19cfd9b780ee2b2d SHA512 6dd75700e2b2afdf87f7eab4c62fbbe2c42f9154d644edfae25e3d5fbe5ed0894be832cc1367933fc6c113a1cc379d1956fecf108d6ee240935b9d7e2f614688
+DIST libgphoto2-2.5.16.tar.bz2 7006551 BLAKE2B 79082e691d4d9061cc35c35cabd7d0d16407764df43f8abbc7ff80f7a2b734da78a2a74a17ec2e014d9050c75235c700f3de90b61ca9fb0d68fdcc7dde64269e SHA512 7863192c2959ffc8d771eca294adc54090192e3207cf8d3a9bf143e50034c3f1248e7fe41cad75f758ab2ad09c9258d50967b921adf3223d7c74370faa110a9e
EBUILD libgphoto2-2.5.14.ebuild 6273 BLAKE2B 50694401872006701c09767b28b49e8b8aec364ee4a7256e689fc8fbd48fa7190a5a142cddcc1ea602db407a0bf9ee3b4bf098420aeb5bddd410f8bf73d7b16a SHA512 d198382821c1c7e8a59f27de930a901991a645837d038e57d47c9037a2bede022cde0123ae3a18362a0f0c69dcd52fc0098bf0fc8025165f64bf1ba58372086e
+EBUILD libgphoto2-2.5.16.ebuild 6282 BLAKE2B c92b40817a860ed763d4b6c5fca2fd7dd20194810e190c900b5ac87ea1d08d140b9c146deb4fbe3b12a3cb8727dc1ee3e5d72364b9fc858b44fa42c821cb6be2 SHA512 77d221d999edaeb59a291be1085c60eafce8de9fa3586d287be9664778c66d5341134ab774eec8a7857dac3071d1deba5f20a8c8c06c9271f15bd4afb6889dd8
MISC metadata.xml 520 BLAKE2B 113ca8821b8ba1d594d64f86facadebf238372742380ce99c6f3172712873d1ebb3d0bf32eb072d7af1771f6099f5bde84114d6e45468a0d33503fbbe393a19b SHA512 905b25e683f85a23323e1205c0492e3b955e11f9d93a9c9c360108ecdd3608fa2f9f4c2572444c0a4be0df3f5e350dd13ca4ebb5ca523c0fd70fed3f40e39ed0
diff --git a/media-libs/libgphoto2/libgphoto2-2.5.16.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.16.ebuild
new file mode 100644
index 000000000000..c4110354846e
--- /dev/null
+++ b/media-libs/libgphoto2/libgphoto2-2.5.16.ebuild
@@ -0,0 +1,211 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# TODO
+# 1. Track upstream bug --disable-docs does not work.
+# https://sourceforge.net/tracker/index.php?func=detail&aid=1643870&group_id=8874&atid=108874
+
+EAPI=6
+inherit eutils multilib multilib-minimal udev user
+
+DESCRIPTION="Library that implements support for numerous digital cameras"
+HOMEPAGE="http://www.gphoto.org/"
+SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+
+# FIXME: should we also bump for libgphoto2_port.so soname version?
+SLOT="0/6" # libgphoto2.so soname version
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="doc examples exif gd jpeg nls serial"
+
+# By default, drivers for all supported cameras will be compiled.
+# If you want to only compile for specific camera(s), set CAMERAS
+# environment to a space-separated list (no commas) of drivers that
+# you want to build.
+IUSE_CAMERAS="
+ adc65 agfa_cl20 aox ax203
+ barbie
+ canon casio_qv clicksmart310
+ digigr8 digita dimagev dimera3500 directory
+ enigma13
+ fuji
+ gsmart300
+ hp215
+ iclick
+ jamcam jd11 jl2005a jl2005c
+ kodak_dc120 kodak_dc210 kodak_dc240 kodak_dc3200 kodak_ez200 konica konica_qm150
+ largan lg_gsm
+ mars mustek
+ panasonic_coolshot panasonic_l859 panasonic_dc1000 panasonic_dc1580 pccam300 pccam600 pentax polaroid_pdc320 polaroid_pdc640 polaroid_pdc700 ptp2
+ ricoh ricoh_g3
+ samsung sierra sipix_blink2 sipix_web2 smal sonix sony_dscf1 sony_dscf55 soundvision spca50x sq905 st2205 stv0674 stv0680 sx330z
+ toshiba_pdrm11 topfield tp6801
+"
+
+for camera in ${IUSE_CAMERAS}; do
+ IUSE="${IUSE} +cameras_${camera}"
+done
+
+# libgphoto2 actually links to libltdl
+RDEPEND="
+ >=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
+ dev-libs/libltdl:0[${MULTILIB_USEDEP}]
+ >=virtual/libusb-1-r1:1[${MULTILIB_USEDEP}]
+ cameras_ax203? ( >=media-libs/gd-2.0.35-r4:=[${MULTILIB_USEDEP}] )
+ cameras_st2205? ( >=media-libs/gd-2.0.35-r4:=[${MULTILIB_USEDEP}] )
+ exif? ( >=media-libs/libexif-0.6.21-r1:=[${MULTILIB_USEDEP}] )
+ gd? ( >=media-libs/gd-2.0.35-r4:=[jpeg=,${MULTILIB_USEDEP}] )
+ jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
+ serial? ( >=dev-libs/lockdev-1.0.3.1.2-r2[${MULTILIB_USEDEP}] )
+ !<sys-fs/udev-201
+"
+DEPEND="${RDEPEND}
+ dev-util/gtk-doc-am
+ sys-devel/flex
+ >=sys-devel/gettext-0.14.1
+ >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+ doc? ( app-doc/doxygen )
+"
+
+MULTILIB_CHOST_TOOLS=(
+ /usr/bin/gphoto2-port-config
+ /usr/bin/gphoto2-config
+)
+
+pkg_pretend() {
+ if ! echo "${USE}" | grep "cameras_" > /dev/null 2>&1; then
+ einfo "No camera drivers will be built since you did not specify any."
+ fi
+}
+
+pkg_setup() {
+ enewgroup plugdev
+}
+
+src_prepare() {
+ default
+
+ # Handle examples ourselves
+ sed 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
+ || die "examples sed failed"
+
+ sed -e 's/sleep 2//' -i configure || die
+}
+
+multilib_src_configure() {
+ local myconf
+ use doc || myconf=( ac_cv_path_DOXYGEN=false )
+
+ # Upstream doesn't default to --enable-option-checking due having another
+ # configure in libgphoto2_port/ that also needs to be checked on every bump
+ #
+ # Serial port uses either lockdev or ttylock, but we don't have ttylock
+ # --with-doc-dir needed to prevent duplicate docs installation, bug #586842
+ ECONF_SOURCE=${S} \
+ econf \
+ --with-doc-dir="${EPREFIX}"/usr/share/doc/${PF} \
+ --disable-docs \
+ --disable-gp2ddb \
+ $(use_enable nls) \
+ $(use_with exif libexif auto) \
+ $(use_with gd) \
+ $(use_with jpeg) \
+ $(use_enable serial) \
+ $(use_enable serial lockdev) \
+ --with-libusb=no \
+ --with-libusb-1.0=auto \
+ --disable-ttylock \
+ --with-camlibs=${cameras} \
+ --with-hotplug-doc-dir="${EPREFIX}"/usr/share/doc/${PF}/hotplug \
+ --with-rpmbuild=$(type -P true) \
+ udevscriptdir="$(get_udevdir)" \
+ "${myconf[@]}"
+}
+
+src_configure() {
+ local cameras
+ local cam
+ local cam_warn=no
+ for cam in ${IUSE_CAMERAS} ; do
+ if use "cameras_${cam}"; then
+ cameras="${cameras},${cam}"
+ else
+ cam_warn=yes
+ fi
+ done
+
+ if [ "${cam_warn}" = "yes" ]; then
+ [ -z "${cameras}" ] || cameras="${cameras:1}"
+ einfo "Enabled camera drivers: ${cameras:-none}"
+ einfo "Upstream will not support you if you do not compile all camera drivers first"
+ else
+ cameras="all"
+ einfo "Enabled camera drivers: all"
+ fi
+
+ multilib-minimal_src_configure
+}
+
+multilib_src_compile() {
+ default
+
+ if multilib_is_native_abi && use doc; then
+ doxygen doc/Doxyfile || die "Documentation generation failed"
+ fi
+}
+
+multilib_src_install_all() {
+ prune_libtool_files --modules
+
+ einstalldocs
+ dodoc TESTERS MAINTAINERS HACKING
+
+ if use examples; then
+ insinto /usr/share/doc/${PF}/examples
+ doins examples/README examples/*.c examples/*.h
+ fi
+
+ # FIXME: fixup autoconf bug #????
+ if ! use doc && [ -d "${ED}/usr/share/doc/${PF}/apidocs.html" ]; then
+ rm -fr "${ED}/usr/share/doc/${PF}/apidocs.html"
+ fi
+ # end fixup
+
+ local udev_rules cam_list
+ udev_rules="$(get_udevdir)/rules.d/70-libgphoto2.rules"
+ cam_list="/usr/$(get_libdir)/libgphoto2/print-camera-list"
+
+ if [ -x "${ED}"${cam_list} ]; then
+ # Let print-camera-list find libgphoto2.so
+ export LD_LIBRARY_PATH="${ED}/usr/$(get_libdir)"
+ # Let libgphoto2 find its camera-modules
+ export CAMLIBS="${ED}/usr/$(get_libdir)/libgphoto2/${PV}"
+
+ einfo "Generating UDEV-rules ..."
+ mkdir -p "${ED}"/${udev_rules%/*}
+ echo -e "# do not edit this file, it will be overwritten on update\n#" \
+ > "${ED}"/${udev_rules}
+ "${ED}"${cam_list} udev-rules version 201 group plugdev >> "${ED}"/${udev_rules} \
+ || die "failed to create udev-rules"
+ else
+ eerror "Unable to find print-camera-list"
+ eerror "and therefore unable to generate hotplug usermap."
+ eerror "You will have to manually generate it by running:"
+ eerror " ${cam_list} udev-rules version 201 group plugdev > ${udev_rules}"
+ fi
+
+}
+
+pkg_postinst() {
+ if ! has_version "sys-auth/consolekit[acl]" && ! has_version "sys-apps/systemd[acl]" && ! has_version "sys-auth/elogind[acl]" ; then
+ elog "Don't forget to add yourself to the plugdev group "
+ elog "if you want to be able to access your camera."
+ fi
+
+ local old_udev_rules="${EROOT}"etc/udev/rules.d/99-libgphoto2.rules
+ if [[ -f ${old_udev_rules} ]]; then
+ rm -f "${old_udev_rules}"
+ fi
+}
diff --git a/media-libs/libharu/Manifest b/media-libs/libharu/Manifest
index 868f8b1d7c4a..a00dcb1b513a 100644
--- a/media-libs/libharu/Manifest
+++ b/media-libs/libharu/Manifest
@@ -1,4 +1,9 @@
+AUX libharu-2.3.0-1-Included-necessary-char-widths-in-generated-PDF.patch 8278 BLAKE2B fe7ededc5a3d82abf89c6e4923f7c4e7d2020753098921710822f315436dc17577c0a530de9d06587f69cfa7a832fa5e6b43cec0e57f9c0c3f0ca676030fb773 SHA512 8a739951cba5264b11f575fa3e366d0968a6c6f412d0f467be914a5c666f16e6f60f9535a06c96ce50c11f8c99979e19c09d0b2522b1aef1a54be109b7a8f61a
+AUX libharu-2.3.0-2-Avoid-issue-with-libtiff-duplicate-symbols.patch 2867 BLAKE2B aa68693458cf1f8c6677a7014e66feba95145f41099d555d07b05d914a117d8fce9dfc9a07ae0418bfe68f4ec4b6e66f3286009ec33dc80aea8866d9d175a7cd SHA512 05e7abd46ab817edd68fd1f5baac6a95155c1410651e92aea1067b8d80fc1e3cfa1c142527ab5bc578b4703361a992d6c5865beede5297f95260c59215e3d900
+AUX libharu-2.3.0-3-cmake-fixes.patch 6376 BLAKE2B ec14be6aeda6e0e43a40bc2f1d41fcec4b601161cdcf1bdeff3e585bd78d6924aae322ffa5fe48f4fe221b1750b672ec7a80ba0a985368da4e5b00122b7d6617 SHA512 186d36b0b943c811e9fc34d448f58177914d2146a3df5cf8b12fe8c9fe7525046a7e53361052d308164cb99d4ec9a28341e4fe3b6cc69d6cb2c0ea03a49b0355
+AUX libharu-2.3.0-4-Add-support-for-free-form-triangle-Shading-objects.patch 15988 BLAKE2B 6cbd9826317e6d1de126dfdcdd3508bfb6351c34cd58fda8f09fe44efead890d78c67f33750223cb2291312b2299ecf16f7b91e4e20a3024bb6007da96753f86 SHA512 94d1377e529d1d96941a90ac82276748f5bf7f0e248a6770d938394151e453aaa082c0d256c0de28f737e7e995bc0ee60a4eb5562aa450af1dfcc1733b403466
AUX libharu-2.3.0-dont-force-strip.patch 504 BLAKE2B 5450783ed2ae778d2d522a4e7157f681c12765e6493955a363187bc4032387580f121e427ad26c596a1b6da53d83bf857525a710ad3499188b8a6b7985de9067 SHA512 df72ea19a1c8da3f06c9fff5b5a9d7307baf0144b59b5f4342769027c947ef5ded4e1f5ed3e3310dae27d7f5ec0ab37d585b9dc16ef83e38b7edda4ff13fc950
DIST libharu-2.3.0.tar.gz 1396413 BLAKE2B 7f0c819f17740f12f9bf6c7a7c749eb8c6ada326d98985daeac4d3250733cfc8e085b540e0969cb1b4c3b1055f4d1e148a2ed010d9371685fd265b62a879be9c SHA512 ebcabf1e8488e21185a231e97b4c16f9de742ae0ac2ebc7535b72b6b8e2045c2619bc6a94a820f7f923b0dfeceb217408f4e4c613ef3602104373cdf000d3f41
EBUILD libharu-2.3.0-r1.ebuild 845 BLAKE2B fea8329a56331571253f0679e725a5ae0590ad3d7f403d3a1b5cb2831ae59f4d118d1780bef81f6ec02633d696d15029d77dc382a45840eb7d3024ee29c15f8a SHA512 a0a3efba5722bb80fc98de2726c12306382f555f19422b9c34ccdd23b9777bbf08893df15fe2aed6603a092d289c5c0bd887f6b960f4f9c82e4bba533a342820
+EBUILD libharu-2.3.0-r2.ebuild 951 BLAKE2B 2ba22cb4df1badf78d6fb25bcd6ddda4739826f0960d4ab0cefd782a498009cc3125e9f3cc4515265f82033de62e16537c42c20183d36addfaa7d5c5cc592e8f SHA512 f667d92469b308e8f790c48cab5708f521d261fdbd9c4e9cfb6611c406654ea329f5a5c600f58995be12a9afbfb7a229d82dceef4851ae3b75be81050699df0a
MISC metadata.xml 1001 BLAKE2B 885dfdacbde50227739f7f1e4a0b23febf988628cecc2bf67995408e978673022633d14407bdf95c29c7a1c8cce11f3c0133dba529e25a1a6df2e5cdacbd27b0 SHA512 baab0fbcff40fe0cf1ac6df68416335bf01f08a0b26d8441d76cfb0e1a6b3227aa8ed54d3f080c0ba5cbcf372f7a99c0c45c9ea215e7210c5e77805a30140d4f
diff --git a/media-libs/libharu/files/libharu-2.3.0-1-Included-necessary-char-widths-in-generated-PDF.patch b/media-libs/libharu/files/libharu-2.3.0-1-Included-necessary-char-widths-in-generated-PDF.patch
new file mode 100644
index 000000000000..83ce9ca93e9f
--- /dev/null
+++ b/media-libs/libharu/files/libharu-2.3.0-1-Included-necessary-char-widths-in-generated-PDF.patch
@@ -0,0 +1,248 @@
+From 16c09856508abbf059ed94b9234b28143025318b Mon Sep 17 00:00:00 2001
+From: Jonathan Scruggs <j.scruggs@gmail.com>
+Date: Wed, 24 Jan 2018 10:09:02 +0000
+Subject: [PATCH 1/4] Included necessary char widths in generated PDF
+
+* /W and /CIDToGIDMap can be created in the before_write_fn
+
+* Only add width for actually used glyphs to the /W array
+
+* Try reducing the size of the /CIDToGIDMap.
+
+Only care about actually used glyphs, so that
+a) the length of the array can be reduced,
+b) unused entries can be easily compressed as they are
+ zeroed out.
+---
+ src/hpdf_font_cid.c | 139 ++++++++++++++++++++++++++++------------------------
+ 1 file changed, 75 insertions(+), 64 deletions(-)
+
+diff --git a/src/hpdf_font_cid.c b/src/hpdf_font_cid.c
+index d1c1a82..5ab3b28 100644
+--- a/src/hpdf_font_cid.c
++++ b/src/hpdf_font_cid.c
+@@ -346,19 +346,14 @@ CIDFontType2_New (HPDF_Font parent, HPDF_Xref xref)
+ HPDF_STATUS ret = HPDF_OK;
+ HPDF_FontAttr attr = (HPDF_FontAttr)parent->attr;
+ HPDF_FontDef fontdef = attr->fontdef;
+- HPDF_TTFontDefAttr fontdef_attr = (HPDF_TTFontDefAttr)fontdef->attr;
+ HPDF_Encoder encoder = attr->encoder;
+ HPDF_CMapEncoderAttr encoder_attr =
+ (HPDF_CMapEncoderAttr)encoder->attr;
+
+ HPDF_Font font;
+ HPDF_Array array;
+- HPDF_UINT i;
+- HPDF_UNICODE tmp_map[65536];
+ HPDF_Dict cid_system_info;
+
+- HPDF_UINT16 max = 0;
+-
+ HPDF_PTRACE ((" HPDF_CIDFontType2_New\n"));
+
+ font = HPDF_Dict_New (parent->mmgr);
+@@ -388,11 +383,55 @@ CIDFontType2_New (HPDF_Font parent, HPDF_Xref xref)
+ ret += HPDF_Array_AddNumber (array, (HPDF_INT32)(fontdef->font_bbox.bottom -
+ fontdef->font_bbox.top));
+
+- HPDF_MemSet (tmp_map, 0, sizeof(HPDF_UNICODE) * 65536);
++ /* create CIDSystemInfo dictionary */
++ cid_system_info = HPDF_Dict_New (parent->mmgr);
++ if (!cid_system_info)
++ return NULL;
++
++ if (HPDF_Dict_Add (font, "CIDSystemInfo", cid_system_info) != HPDF_OK)
++ return NULL;
++
++ ret += HPDF_Dict_Add (cid_system_info, "Registry",
++ HPDF_String_New (parent->mmgr, encoder_attr->registry, NULL));
++ ret += HPDF_Dict_Add (cid_system_info, "Ordering",
++ HPDF_String_New (parent->mmgr, encoder_attr->ordering, NULL));
++ ret += HPDF_Dict_AddNumber (cid_system_info, "Supplement",
++ encoder_attr->suppliment);
+
+ if (ret != HPDF_OK)
+ return NULL;
+
++ return font;
++}
++
++
++static HPDF_STATUS
++CIDFontType2_BeforeWrite_Func (HPDF_Dict obj)
++{
++ HPDF_FontAttr font_attr = (HPDF_FontAttr)obj->attr;
++ HPDF_FontDef def = font_attr->fontdef;
++ HPDF_TTFontDefAttr def_attr = (HPDF_TTFontDefAttr)def->attr;
++ HPDF_STATUS ret = 0;
++
++ HPDF_Font font;
++ HPDF_Encoder encoder = font_attr->encoder;
++ HPDF_CMapEncoderAttr encoder_attr =
++ (HPDF_CMapEncoderAttr)encoder->attr;
++
++ HPDF_Array array;
++ HPDF_UINT i;
++ HPDF_UNICODE tmp_map[65536];
++ HPDF_UINT16 max = 0;
++
++
++ HPDF_PTRACE ((" CIDFontType2_BeforeWrite_Func\n"));
++
++ font = font_attr->descendant_font;
++ HPDF_MemSet (tmp_map, 0, sizeof(HPDF_UNICODE) * 65536);
++
++ if (ret != HPDF_OK)
++ return ret;
++
+ for (i = 0; i < 256; i++) {
+ HPDF_UINT j;
+
+@@ -401,66 +440,70 @@ CIDFontType2_New (HPDF_Font parent, HPDF_Xref xref)
+ HPDF_UINT16 cid = encoder_attr->cid_map[i][j];
+ if (cid != 0) {
+ HPDF_UNICODE unicode = encoder_attr->unicode_map[i][j];
+- HPDF_UINT16 gid = HPDF_TTFontDef_GetGlyphid (fontdef,
++ HPDF_UINT16 gid = HPDF_TTFontDef_GetGlyphid (def,
+ unicode);
+- tmp_map[cid] = gid;
+- if (max < cid)
+- max = cid;
++ if (def_attr->glyph_tbl.flgs[gid]) {
++ tmp_map[cid] = gid;
++ if (max < cid)
++ max = cid;
++ }
+ }
+ } else {
+ HPDF_UNICODE unicode = (i << 8) | j;
+- HPDF_UINT16 gid = HPDF_TTFontDef_GetGlyphid (fontdef,
++ HPDF_UINT16 gid = HPDF_TTFontDef_GetGlyphid (def,
+ unicode);
+- tmp_map[unicode] = gid;
+- if (max < unicode)
+- max = unicode;
++ if (def_attr->glyph_tbl.flgs[gid]) {
++ tmp_map[unicode] = gid;
++ if (max < unicode)
++ max = unicode;
++ }
+ }
+ }
+ }
+
+ if (max > 0) {
+- HPDF_INT16 dw = fontdef->missing_width;
++ HPDF_INT16 dw = def->missing_width;
+ HPDF_UNICODE *ptmp_map = tmp_map;
+ HPDF_Array tmp_array = NULL;
+
+ /* add 'W' element */
+ array = HPDF_Array_New (font->mmgr);
+ if (!array)
+- return NULL;
++ return HPDF_FAILD_TO_ALLOC_MEM;
+
+ if (HPDF_Dict_Add (font, "W", array) != HPDF_OK)
+- return NULL;
++ return HPDF_FAILD_TO_ALLOC_MEM;
+
+ for (i = 0; i < max; i++, ptmp_map++) {
+- HPDF_INT w = HPDF_TTFontDef_GetGidWidth (fontdef, *ptmp_map);
++ HPDF_INT w = HPDF_TTFontDef_GetGidWidth (def, *ptmp_map);
+
+- if (w != dw) {
++ if (def_attr->glyph_tbl.flgs[*ptmp_map] && w != dw) {
+ if (!tmp_array) {
+ if (HPDF_Array_AddNumber (array, i) != HPDF_OK)
+- return NULL;
++ return HPDF_FAILD_TO_ALLOC_MEM;
+
+ tmp_array = HPDF_Array_New (font->mmgr);
+ if (!tmp_array)
+- return NULL;
++ return HPDF_FAILD_TO_ALLOC_MEM;
+
+ if (HPDF_Array_Add (array, tmp_array) != HPDF_OK)
+- return NULL;
++ return HPDF_FAILD_TO_ALLOC_MEM;
+ }
+
+ if ((ret = HPDF_Array_AddNumber (tmp_array, w)) != HPDF_OK)
+- return NULL;
++ return HPDF_FAILD_TO_ALLOC_MEM;
+ } else
+ tmp_array = NULL;
+ }
+
+ /* create "CIDToGIDMap" data */
+- if (fontdef_attr->embedding) {
+- attr->map_stream = HPDF_DictStream_New (font->mmgr, xref);
+- if (!attr->map_stream)
+- return NULL;
++ if (def_attr->embedding) {
++ font_attr->map_stream = HPDF_DictStream_New (font->mmgr, font_attr->xref);
++ if (!font_attr->map_stream)
++ return HPDF_FAILD_TO_ALLOC_MEM;
+
+- if (HPDF_Dict_Add (font, "CIDToGIDMap", attr->map_stream) != HPDF_OK)
+- return NULL;
++ if (HPDF_Dict_Add (font, "CIDToGIDMap", font_attr->map_stream) != HPDF_OK)
++ return HPDF_FAILD_TO_ALLOC_MEM;
+
+ for (i = 0; i < max; i++) {
+ HPDF_BYTE u[2];
+@@ -472,47 +515,15 @@ CIDFontType2_New (HPDF_Font parent, HPDF_Xref xref)
+ HPDF_MemCpy ((HPDF_BYTE *)(tmp_map + i), u, 2);
+ }
+
+- if ((ret = HPDF_Stream_Write (attr->map_stream->stream,
++ if ((ret = HPDF_Stream_Write (font_attr->map_stream->stream,
+ (HPDF_BYTE *)tmp_map, max * 2)) != HPDF_OK)
+- return NULL;
++ return HPDF_FAILD_TO_ALLOC_MEM;
+ }
+ } else {
+ HPDF_SetError (font->error, HPDF_INVALID_FONTDEF_DATA, 0);
+- return 0;
++ return HPDF_INVALID_FONTDEF_DATA;
+ }
+
+- /* create CIDSystemInfo dictionary */
+- cid_system_info = HPDF_Dict_New (parent->mmgr);
+- if (!cid_system_info)
+- return NULL;
+-
+- if (HPDF_Dict_Add (font, "CIDSystemInfo", cid_system_info) != HPDF_OK)
+- return NULL;
+-
+- ret += HPDF_Dict_Add (cid_system_info, "Registry",
+- HPDF_String_New (parent->mmgr, encoder_attr->registry, NULL));
+- ret += HPDF_Dict_Add (cid_system_info, "Ordering",
+- HPDF_String_New (parent->mmgr, encoder_attr->ordering, NULL));
+- ret += HPDF_Dict_AddNumber (cid_system_info, "Supplement",
+- encoder_attr->suppliment);
+-
+- if (ret != HPDF_OK)
+- return NULL;
+-
+- return font;
+-}
+-
+-
+-static HPDF_STATUS
+-CIDFontType2_BeforeWrite_Func (HPDF_Dict obj)
+-{
+- HPDF_FontAttr font_attr = (HPDF_FontAttr)obj->attr;
+- HPDF_FontDef def = font_attr->fontdef;
+- HPDF_TTFontDefAttr def_attr = (HPDF_TTFontDefAttr)def->attr;
+- HPDF_STATUS ret = 0;
+-
+- HPDF_PTRACE ((" CIDFontType2_BeforeWrite_Func\n"));
+-
+ if (font_attr->map_stream)
+ font_attr->map_stream->filter = obj->filter;
+
+--
+2.16.0
+
diff --git a/media-libs/libharu/files/libharu-2.3.0-2-Avoid-issue-with-libtiff-duplicate-symbols.patch b/media-libs/libharu/files/libharu-2.3.0-2-Avoid-issue-with-libtiff-duplicate-symbols.patch
new file mode 100644
index 000000000000..78a56f6eb33c
--- /dev/null
+++ b/media-libs/libharu/files/libharu-2.3.0-2-Avoid-issue-with-libtiff-duplicate-symbols.patch
@@ -0,0 +1,89 @@
+From c1ecbf1bd286e26572fc0fd7a49d06774d6436f7 Mon Sep 17 00:00:00 2001
+From: Bruno Virlet <bruno.virlet@gmail.com>
+Date: Thu, 30 Nov 2017 12:19:37 +0100
+Subject: [PATCH 2/4] Avoid issue with libtiff duplicate symbols
+
+To achieve this, I move the G3CODES #define to pdf_conf.h so that anyone
+who builds the project has more control.
+---
+ include/hpdf_conf.h | 3 ++-
+ src/hpdf_image_ccitt.c | 9 ++++-----
+ src/t4.h | 6 ++++--
+ 3 files changed, 10 insertions(+), 8 deletions(-)
+
+diff --git a/include/hpdf_conf.h b/include/hpdf_conf.h
+index d25b464..27d1dff 100644
+--- a/include/hpdf_conf.h
++++ b/include/hpdf_conf.h
+@@ -78,8 +78,9 @@
+
+ /* alignment size of memory-pool-object
+ */
+-#define HPDF_ALIGN_SIZ sizeof int;
++#define HPDF_ALINMENT_SIZ sizeof(int)
+
++#define G3CODES
+
+ #endif /* _HPDF_CONF_H */
+
+diff --git a/src/hpdf_image_ccitt.c b/src/hpdf_image_ccitt.c
+index 8672763..939b0b5 100644
+--- a/src/hpdf_image_ccitt.c
++++ b/src/hpdf_image_ccitt.c
+@@ -21,7 +21,6 @@
+ #include <memory.h>
+ #include <assert.h>
+
+-#define G3CODES
+ #include "t4.h"
+
+ typedef unsigned int uint32;
+@@ -578,11 +577,11 @@ HPDF_Fax3Encode2DRow(struct _HPDF_CCITT_Data *pData, unsigned char* bp, unsigned
+ a2 = finddiff2(bp, a1, bits, PIXEL(bp,a1));
+ putcode(pData, &horizcode);
+ if (a0+a1 == 0 || PIXEL(bp, a0) == 0) {
+- putspan(pData, a1-a0, TIFFFaxWhiteCodes);
+- putspan(pData, a2-a1, TIFFFaxBlackCodes);
++ putspan(pData, a1-a0, HPDF_TIFFFaxWhiteCodes);
++ putspan(pData, a2-a1, HPDF_TIFFFaxBlackCodes);
+ } else {
+- putspan(pData, a1-a0, TIFFFaxBlackCodes);
+- putspan(pData, a2-a1, TIFFFaxWhiteCodes);
++ putspan(pData, a1-a0, HPDF_TIFFFaxBlackCodes);
++ putspan(pData, a2-a1, HPDF_TIFFFaxWhiteCodes);
+ }
+ a0 = a2;
+ } else { /* vertical mode */
+diff --git a/src/t4.h b/src/t4.h
+index f306e15..c4c8c0d 100644
+--- a/src/t4.h
++++ b/src/t4.h
+@@ -55,7 +55,7 @@ typedef struct tableentry {
+ * during state generation (see mkg3states.c).
+ */
+ #ifdef G3CODES
+-const tableentry TIFFFaxWhiteCodes[] = {
++const tableentry HPDF_TIFFFaxWhiteCodes[] = {
+ { 8, 0x35, 0 }, /* 0011 0101 */
+ { 6, 0x7, 1 }, /* 0001 11 */
+ { 4, 0x7, 2 }, /* 0111 */
+@@ -167,7 +167,7 @@ const tableentry TIFFFaxWhiteCodes[] = {
+ { 12, 0x0, G3CODE_INVALID }, /* 0000 0000 0000 */
+ };
+
+-const tableentry TIFFFaxBlackCodes[] = {
++const tableentry HPDF_TIFFFaxBlackCodes[] = {
+ { 10, 0x37, 0 }, /* 0000 1101 11 */
+ { 3, 0x2, 1 }, /* 010 */
+ { 2, 0x3, 2 }, /* 11 */
+@@ -281,5 +281,7 @@ const tableentry TIFFFaxBlackCodes[] = {
+ #else
+ extern const tableentry TIFFFaxWhiteCodes[];
+ extern const tableentry TIFFFaxBlackCodes[];
++const tableentry *HPDF_TIFFFaxWhiteCodes = TIFFFaxWhiteCodes;
++const tableentry *HPDF_TIFFFaxBlackCodes = TIFFFaxBlackCodes;
+ #endif
+ #endif /* _T4_ */
+--
+2.16.0
+
diff --git a/media-libs/libharu/files/libharu-2.3.0-3-cmake-fixes.patch b/media-libs/libharu/files/libharu-2.3.0-3-cmake-fixes.patch
new file mode 100644
index 000000000000..385dfc228257
--- /dev/null
+++ b/media-libs/libharu/files/libharu-2.3.0-3-cmake-fixes.patch
@@ -0,0 +1,177 @@
+From 751d8a334d0f3fbce9c74352004e9d3899ec8b38 Mon Sep 17 00:00:00 2001
+From: Jonathan Scruggs <j.scruggs@gmail.com>
+Date: Wed, 24 Jan 2018 11:08:16 +0000
+Subject: [PATCH 3/4] cmake fixes
+
+---
+ CMakeLists.txt | 31 +++++++++++++++++--------------
+ cmake/modules/haru.cmake | 2 +-
+ src/CMakeLists.txt | 19 ++++++++++++-------
+ src/hpdf_image_png.c | 2 +-
+ 4 files changed, 31 insertions(+), 23 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 354ca75..4227f03 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -25,7 +25,7 @@ endif(MSVC)
+
+ # information about libharu
+ set(LIBHPDF_MAJOR 2)
+-set(LIBHPDF_MINOR 2)
++set(LIBHPDF_MINOR 3)
+ set(LIBHPDF_PATCH 0)
+ set(LIBHPDF_VERSION ${LIBHPDF_MAJOR}.${LIBHPDF_MINOR}.${LIBHPDF_PATCH})
+ set(LIBHPDF_DESCRIPTION "libHaru is a free, cross platform, open source library for generating PDF files.")
+@@ -53,12 +53,17 @@ option(LIBHPDF_STATIC "Build static lib" YES)
+ option(LIBHPDF_EXAMPLES "Build libharu examples" NO)
+ option(DEVPAK "Create DevPackage" NO)
+
++if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
++ set(CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS} -undefined dynamic_lookup")
++endif()
++
+ # Enable exceptions on linux if required
+ # (eg if you are using libharu in a C++ environment,
+ # and you want your error-callback to throw an exception,
+ # you will need to enable this for the exception to be
+ # able to throw through the libharu callstack).
+ if (CMAKE_COMPILER_IS_GNUCC OR ("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang"))
++ set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pthread")
+ option (LIBHPDF_ENABLE_EXCEPTIONS "Enable exceptions" NO)
+ if (LIBHPDF_ENABLE_EXCEPTIONS)
+ set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fexceptions")
+@@ -81,6 +86,7 @@ endif(BUILD_SHARED_LIBS)
+ # =======================================================================
+ # look for headers and libraries
+ # =======================================================================
++include(GNUInstallDirs)
+ include(haru)
+ include(summary)
+
+@@ -110,7 +116,7 @@ endif(PNG_FOUND)
+ if(MSVC_VERSION GREATER 1399)
+ add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE)
+ endif(MSVC_VERSION GREATER 1399)
+-include_directories(${CMAKE_SOURCE_DIR}/include)
++include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
+
+
+ # these are options
+@@ -149,16 +155,16 @@ endif (NOT ZLIB_FOUND)
+
+ # create hpdf_config.h
+ configure_file(
+- ${CMAKE_SOURCE_DIR}/include/hpdf_config.h.cmake
+- ${CMAKE_BINARY_DIR}/include/hpdf_config.h
++ ${CMAKE_CURRENT_SOURCE_DIR}/include/hpdf_config.h.cmake
++ ${CMAKE_CURRENT_BINARY_DIR}/include/hpdf_config.h
+ )
+-include_directories(${CMAKE_BINARY_DIR}/include)
++include_directories(${CMAKE_CURRENT_BINARY_DIR}/include)
+
+ # create DevPackage file
+ if(DEVPAK)
+ configure_file(
+- ${CMAKE_SOURCE_DIR}/libharu.DevPackage.cmake
+- ${CMAKE_BINARY_DIR}/libharu.DevPackage
++ ${CMAKE_CURRENT_SOURCE_DIR}/libharu.DevPackage.cmake
++ ${CMAKE_CURRENT_BINARY_DIR}/libharu.DevPackage
+ )
+ endif(DEVPAK)
+ # =======================================================================
+@@ -203,19 +209,16 @@ set(
+ include/hpdf_pdfa.h
+ include/hpdf_3dmeasure.h
+ include/hpdf_exdata.h
+- ${CMAKE_BINARY_DIR}/include/hpdf_config.h
++ ${CMAKE_CURRENT_BINARY_DIR}/include/hpdf_config.h
+ )
+
+ # install header files
+-install(FILES ${haru_HDRS} DESTINATION include)
++install(FILES ${haru_HDRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+
+ # install various files
+-install(FILES README CHANGES INSTALL DESTINATION .)
+-if(NOT DEVPAK)
+- install(DIRECTORY if DESTINATION .)
+-endif(NOT DEVPAK)
++install(FILES README CHANGES INSTALL DESTINATION ${CMAKE_INSTALL_DOCDIR})
+ if(DEVPAK)
+- install(FILES ${CMAKE_BINARY_DIR}/libharu.DevPackage DESTINATION .)
++ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libharu.DevPackage DESTINATION ${CMAKE_INSTALL_BINDIR})
+ endif(DEVPAK)
+
+ # =======================================================================
+diff --git a/cmake/modules/haru.cmake b/cmake/modules/haru.cmake
+index 95647b9..f0b08b5 100644
+--- a/cmake/modules/haru.cmake
++++ b/cmake/modules/haru.cmake
+@@ -28,7 +28,7 @@ check_include_files(unistd.h LIBHPDF_HAVE_UNISTD_H)
+ # On windows systems the math library is not separated so do not specify
+ # it unless you are on a non-windows system.
+ if(NOT WIN32)
+- find_library(MATH_LIB NAMES m PATHS /usr/local/lib /usr/lib)
++ find_library(MATH_LIB NAMES m PATHS ${CMAKE_INSTALL_FULL_LIBDIR})
+ if(NOT MATH_LIB)
+ message(FATAL_ERROR "Cannot find required math library")
+ endif(NOT MATH_LIB)
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 9d2a604..6f93d18 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -72,16 +72,21 @@ set(
+ # =======================================================================
+ if(LIBHPDF_STATIC)
+ add_library(${LIBHPDF_NAME_STATIC} STATIC ${LIBHPDF_SRCS})
++
++ if( CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" )
++ set_target_properties(${LIBHPDF_NAME_STATIC} PROPERTIES COMPILE_FLAGS "-fPIC")
++ endif( CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" )
++
+ target_link_libraries(${LIBHPDF_NAME_STATIC} ${ADDITIONAL_LIBRARIES})
+ install(
+ TARGETS ${LIBHPDF_NAME_STATIC}
+- ARCHIVE DESTINATION lib
+- LIBRARY DESTINATION lib
+- RUNTIME DESTINATION bin
++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+ )
+ if(WIN32 AND NOT CYGWIN)
+ foreach(addlib ${ADDITIONAL_LIBRARIES})
+- install(FILES ${addlib} DESTINATION lib)
++ install(FILES ${addlib} DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ endforeach(addlib)
+ endif(WIN32 AND NOT CYGWIN)
+ endif(LIBHPDF_STATIC)
+@@ -93,8 +98,8 @@ if(LIBHPDF_SHARED)
+ endif(WIN32 AND NOT CYGWIN)
+ install(
+ TARGETS ${LIBHPDF_NAME}
+- ARCHIVE DESTINATION lib
+- LIBRARY DESTINATION lib
+- RUNTIME DESTINATION bin
++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+ )
+ endif(LIBHPDF_SHARED)
+diff --git a/src/hpdf_image_png.c b/src/hpdf_image_png.c
+index 3a35f5c..4304ced 100644
+--- a/src/hpdf_image_png.c
++++ b/src/hpdf_image_png.c
+@@ -20,7 +20,7 @@
+ #include "hpdf_image.h"
+
+ #ifndef LIBHPDF_HAVE_NOPNGLIB
+-#include <png.h>
++#include "png.h"
+ #include <string.h>
+
+ static void
+--
+2.16.0
+
diff --git a/media-libs/libharu/files/libharu-2.3.0-4-Add-support-for-free-form-triangle-Shading-objects.patch b/media-libs/libharu/files/libharu-2.3.0-4-Add-support-for-free-form-triangle-Shading-objects.patch
new file mode 100644
index 000000000000..5248c4fcac16
--- /dev/null
+++ b/media-libs/libharu/files/libharu-2.3.0-4-Add-support-for-free-form-triangle-Shading-objects.patch
@@ -0,0 +1,530 @@
+From 54c145867ad04c20cc71878fab662f6eb720621e Mon Sep 17 00:00:00 2001
+From: "David C. Lonie" <david.lonie@kitware.com>
+Date: Wed, 10 May 2017 11:07:28 -0400
+Subject: [PATCH 4/4] Add support for free-form triangle Shading objects.
+
+---
+ include/hpdf.h | 24 ++++-
+ include/hpdf_error.h | 3 +
+ include/hpdf_objects.h | 2 +
+ include/hpdf_pages.h | 5 +
+ include/hpdf_types.h | 14 +++
+ src/CMakeLists.txt | 1 +
+ src/hpdf_page_operator.c | 31 +++++++
+ src/hpdf_pages.c | 55 ++++++++++-
+ src/hpdf_shading.c | 231 +++++++++++++++++++++++++++++++++++++++++++++++
+ 9 files changed, 362 insertions(+), 4 deletions(-)
+ create mode 100644 src/hpdf_shading.c
+
+diff --git a/include/hpdf.h b/include/hpdf.h
+index e369f67..40e3c41 100644
+--- a/include/hpdf.h
++++ b/include/hpdf.h
+@@ -77,6 +77,7 @@ typedef HPDF_HANDLE HPDF_Dict;
+ typedef HPDF_HANDLE HPDF_EmbeddedFile;
+ typedef HPDF_HANDLE HPDF_OutputIntent;
+ typedef HPDF_HANDLE HPDF_Xref;
++typedef HPDF_HANDLE HPDF_Shading;
+
+ #else
+
+@@ -1171,6 +1172,11 @@ HPDF_EXPORT(HPDF_STATUS)
+ HPDF_Page_SetExtGState (HPDF_Page page,
+ HPDF_ExtGState ext_gstate);
+
++/* sh */
++HPDF_EXPORT(HPDF_STATUS)
++HPDF_Page_SetShading (HPDF_Page page,
++ HPDF_Shading shading);
++
+
+ /*--- Special graphic state operator --------------------------------------*/
+
+@@ -1450,7 +1456,23 @@ HPDF_Page_SetCMYKStroke (HPDF_Page page,
+
+ /*--- Shading patterns ---------------------------------------------------*/
+
+-/* sh --not implemented yet */
++/* Notes for docs:
++ * - ShadingType must be HPDF_SHADING_FREE_FORM_TRIANGLE_MESH (the only
++ * defined option...)
++ * - colorSpace must be HPDF_CS_DEVICE_RGB for now.
++ */
++HPDF_EXPORT(HPDF_Shading)
++HPDF_Shading_New (HPDF_Doc pdf,
++ HPDF_ShadingType type,
++ HPDF_ColorSpace colorSpace,
++ HPDF_REAL xMin, HPDF_REAL xMax,
++ HPDF_REAL yMin, HPDF_REAL yMax);
++
++HPDF_EXPORT(HPDF_STATUS)
++HPDF_Shading_AddVertexRGB(HPDF_Shading shading,
++ HPDF_Shading_FreeFormTriangleMeshEdgeFlag edgeFlag,
++ HPDF_REAL x, HPDF_REAL y,
++ HPDF_UINT8 r, HPDF_UINT8 g, HPDF_UINT8 b);
+
+ /*--- In-line images -----------------------------------------------------*/
+
+diff --git a/include/hpdf_error.h b/include/hpdf_error.h
+index b04e2cd..ef4fa61 100644
+--- a/include/hpdf_error.h
++++ b/include/hpdf_error.h
+@@ -145,6 +145,9 @@ extern "C" {
+ #define HPDF_INVALID_U3D_DATA 0x1083
+ #define HPDF_NAME_CANNOT_GET_NAMES 0x1084
+ #define HPDF_INVALID_ICC_COMPONENT_NUM 0x1085
++/* 0x1086 */
++/* 0x1087 */
++#define HPDF_INVALID_SHADING_TYPE 0x1088
+
+ /*---------------------------------------------------------------------------*/
+
+diff --git a/include/hpdf_objects.h b/include/hpdf_objects.h
+index 525adda..b16de02 100644
+--- a/include/hpdf_objects.h
++++ b/include/hpdf_objects.h
+@@ -61,6 +61,7 @@ extern "C" {
+ #define HPDF_OSUBCLASS_EXT_GSTATE_R 0x0B00 /* read only object */
+ #define HPDF_OSUBCLASS_NAMEDICT 0x0C00
+ #define HPDF_OSUBCLASS_NAMETREE 0x0D00
++#define HPDF_OSUBCLASS_SHADING 0x0E00
+
+
+
+@@ -595,6 +596,7 @@ typedef HPDF_Array HPDF_Destination;
+ typedef HPDF_Dict HPDF_U3D;
+ typedef HPDF_Dict HPDF_OutputIntent;
+ typedef HPDF_Dict HPDF_JavaScript;
++typedef HPDF_Dict HPDF_Shading;
+
+ #ifdef __cplusplus
+ }
+diff --git a/include/hpdf_pages.h b/include/hpdf_pages.h
+index 44b816c..60b1d84 100644
+--- a/include/hpdf_pages.h
++++ b/include/hpdf_pages.h
+@@ -55,6 +55,7 @@ typedef struct _HPDF_PageAttr_Rec {
+ HPDF_Dict fonts;
+ HPDF_Dict xobjects;
+ HPDF_Dict ext_gstates;
++ HPDF_Dict shadings;
+ HPDF_GState gstate;
+ HPDF_Point str_pos;
+ HPDF_Point cur_pos;
+@@ -101,6 +102,10 @@ const char*
+ HPDF_Page_GetExtGStateName (HPDF_Page page,
+ HPDF_ExtGState gstate);
+
++const char*
++HPDF_Page_GetShadingName (HPDF_Page page,
++ HPDF_Shading shading);
++
+
+ HPDF_Box
+ HPDF_Page_GetMediaBox (HPDF_Page page);
+diff --git a/include/hpdf_types.h b/include/hpdf_types.h
+index 8b3e0a8..a2e2157 100644
+--- a/include/hpdf_types.h
++++ b/include/hpdf_types.h
+@@ -557,6 +557,20 @@ typedef enum _HPDF_NameDictKey {
+ HPDF_NAME_EOF
+ } HPDF_NameDictKey;
+
++/*----------------------------------------------------------------------------*/
++
++typedef enum _HPDF_ShadingType {
++ HPDF_SHADING_FREE_FORM_TRIANGLE_MESH = 4 /* TODO the rest */
++} HPDF_ShadingType;
++
++typedef enum _HPDF_Shading_FreeFormTriangleMeshEdgeFlag {
++ HPDF_FREE_FORM_TRI_MESH_EDGEFLAG_NO_CONNECTION = 0,
++ HPDF_FREE_FORM_TRI_MESH_EDGEFLAG_BC,
++ HPDF_FREE_FORM_TRI_MESH_EDGEFLAG_AC
++} HPDF_Shading_FreeFormTriangleMeshEdgeFlag;
++
++/*----------------------------------------------------------------------------*/
++
+ #ifdef __cplusplus
+ }
+ #endif /* __cplusplus */
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 6f93d18..d428b78 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -56,6 +56,7 @@ set(
+ hpdf_page_operator.c
+ hpdf_pages.c
+ hpdf_real.c
++ hpdf_shading.c
+ hpdf_streams.c
+ hpdf_string.c
+ hpdf_u3d.c
+diff --git a/src/hpdf_page_operator.c b/src/hpdf_page_operator.c
+index 23f5920..dda1078 100644
+--- a/src/hpdf_page_operator.c
++++ b/src/hpdf_page_operator.c
+@@ -312,6 +312,37 @@ HPDF_Page_SetExtGState (HPDF_Page page,
+ return ret;
+ }
+
++/* sh */
++HPDF_EXPORT(HPDF_STATUS)
++HPDF_Page_SetShading (HPDF_Page page,
++ HPDF_Shading shading)
++{
++ HPDF_STATUS ret = HPDF_Page_CheckState (page, HPDF_GMODE_PAGE_DESCRIPTION);
++ HPDF_PageAttr attr;
++ const char *local_name;
++
++ HPDF_PTRACE ((" HPDF_Page_SetShading\n"));
++
++ if (ret != HPDF_OK)
++ return ret;
++
++ if (page->mmgr != shading->mmgr)
++ return HPDF_RaiseError (page->error, HPDF_INVALID_OBJECT, 0);
++
++ attr = (HPDF_PageAttr)page->attr;
++ local_name = HPDF_Page_GetShadingName (page, shading);
++
++ if (!local_name)
++ return HPDF_CheckError (page->error);
++
++ if (HPDF_Stream_WriteEscapeName (attr->stream, local_name) != HPDF_OK)
++ return HPDF_CheckError (page->error);
++
++ if (HPDF_Stream_WriteStr (attr->stream, " sh\012") != HPDF_OK)
++ return HPDF_CheckError (page->error);
++
++ return ret;
++}
+
+ /*--- Special graphic state operator --------------------------------------*/
+
+diff --git a/src/hpdf_pages.c b/src/hpdf_pages.c
+index fcc9b5c..c0a7c4f 100644
+--- a/src/hpdf_pages.c
++++ b/src/hpdf_pages.c
+@@ -514,7 +514,7 @@ HPDF_Page_GetLocalFontName (HPDF_Page page,
+ /* search font-object from font-resource */
+ key = HPDF_Dict_GetKeyByObj (attr->fonts, font);
+ if (!key) {
+- /* if the font is not resisterd in font-resource, register font to
++ /* if the font is not registered in font-resource, register font to
+ * font-resource.
+ */
+ char fontName[HPDF_LIMIT_MAX_NAME_LEN + 1];
+@@ -603,7 +603,7 @@ HPDF_Page_GetXObjectName (HPDF_Page page,
+ /* search xobject-object from xobject-resource */
+ key = HPDF_Dict_GetKeyByObj (attr->xobjects, xobj);
+ if (!key) {
+- /* if the xobject is not resisterd in xobject-resource, register
++ /* if the xobject is not registered in xobject-resource, register
+ * xobject to xobject-resource.
+ */
+ char xobj_name[HPDF_LIMIT_MAX_NAME_LEN + 1];
+@@ -654,7 +654,7 @@ HPDF_Page_GetExtGStateName (HPDF_Page page,
+ /* search ext_gstate-object from ext_gstate-resource */
+ key = HPDF_Dict_GetKeyByObj (attr->ext_gstates, state);
+ if (!key) {
+- /* if the ext-gstate is not resisterd in ext-gstate resource, register
++ /* if the ext-gstate is not registered in ext-gstate resource, register
+ * to ext-gstate resource.
+ */
+ char ext_gstate_name[HPDF_LIMIT_MAX_NAME_LEN + 1];
+@@ -673,6 +673,55 @@ HPDF_Page_GetExtGStateName (HPDF_Page page,
+ return key;
+ }
+
++const char*
++HPDF_Page_GetShadingName (HPDF_Page page,
++ HPDF_Shading shading)
++{
++ HPDF_PageAttr attr = (HPDF_PageAttr )page->attr;
++ const char *key;
++
++ HPDF_PTRACE((" HPDF_Page_GetShadingName\n"));
++
++ if (!attr->shadings) {
++ HPDF_Dict resources;
++ HPDF_Dict shadings;
++
++ resources = HPDF_Page_GetInheritableItem (page, "Resources",
++ HPDF_OCLASS_DICT);
++ if (!resources)
++ return NULL;
++
++ shadings = HPDF_Dict_New (page->mmgr);
++ if (!shadings)
++ return NULL;
++
++ if (HPDF_Dict_Add (resources, "Shading", shadings) != HPDF_OK)
++ return NULL;
++
++ attr->shadings = shadings;
++ }
++
++ /* search shading-object from shading-resource */
++ key = HPDF_Dict_GetKeyByObj (attr->shadings, shading);
++ if (!key) {
++ /* if the shading is not registered in shadings resource, register
++ * to shadings resource.
++ */
++ char shading_str[HPDF_LIMIT_MAX_NAME_LEN + 1];
++ char *ptr;
++ char *end_ptr = shading_str + HPDF_LIMIT_MAX_NAME_LEN;
++
++ ptr = (char *)HPDF_StrCpy (shading_str, "Sh", end_ptr);
++ HPDF_IToA (ptr, attr->shadings->list->count, end_ptr);
++
++ if (HPDF_Dict_Add (attr->shadings, shading_str, shading) != HPDF_OK)
++ return NULL;
++
++ key = HPDF_Dict_GetKeyByObj (attr->shadings, shading);
++ }
++
++ return key;
++}
+
+ static HPDF_STATUS
+ AddAnnotation (HPDF_Page page,
+diff --git a/src/hpdf_shading.c b/src/hpdf_shading.c
+new file mode 100644
+index 0000000..53204c0
+--- /dev/null
++++ b/src/hpdf_shading.c
+@@ -0,0 +1,231 @@
++/*
++ * << Haru Free PDF Library >> -- hpdf_shading.c
++ *
++ * URL: http://libharu.org
++ *
++ * Copyright (c) 1999-2006 Takeshi Kanno <takeshi_kanno@est.hi-ho.ne.jp>
++ * Copyright (c) 2007-2009 Antony Dovgal <tony@daylessday.org>
++ * Copyright (c) 2017 Kitware <kitware@kitware.com>
++ *
++ * Permission to use, copy, modify, distribute and sell this software
++ * and its documentation for any purpose is hereby granted without fee,
++ * provided that the above copyright notice appear in all copies and
++ * that both that copyright notice and this permission notice appear
++ * in supporting documentation.
++ * It is provided "as is" without express or implied warranty.
++ *
++ */
++
++#include "hpdf.h"
++#include "hpdf_utils.h"
++
++#include "assert.h"
++
++typedef struct _RGBVertex
++{
++ HPDF_UINT8 EdgeFlag;
++ HPDF_UINT32 X;
++ HPDF_UINT32 Y;
++ HPDF_UINT8 RGB[3];
++} RGBVertex;
++
++static const char *COL_CMYK = "DeviceCMYK";
++static const char *COL_RGB = "DeviceRGB";
++static const char *COL_GRAY = "DeviceGray";
++
++/* bbox is filled with xMin, xMax, yMin, yMax */
++static HPDF_BOOL _GetDecodeArrayVertexValues(HPDF_Shading shading,
++ HPDF_REAL *bbox)
++{
++ HPDF_Array decodeArray;
++ HPDF_Real r;
++ int i;
++
++ if (!shading) {
++ return HPDF_FALSE;
++ }
++
++ decodeArray = (HPDF_Array)(HPDF_Dict_GetItem(shading, "Decode",
++ HPDF_OCLASS_ARRAY));
++ if (!decodeArray) {
++ return HPDF_FALSE;
++ }
++
++ for (i = 0; i < 4; ++i)
++ {
++ r = HPDF_Array_GetItem(decodeArray, i, HPDF_OCLASS_REAL);
++ if (!r) {
++ return HPDF_FALSE;
++ }
++
++ bbox[i] = r->value;
++ }
++
++ return HPDF_TRUE;
++}
++
++static void UINT32Swap (HPDF_UINT32 *value)
++{
++ HPDF_BYTE b[4];
++
++ HPDF_MemCpy (b, (HPDF_BYTE *)value, 4);
++ *value = (HPDF_UINT32)((HPDF_UINT32)b[0] << 24 |
++ (HPDF_UINT32)b[1] << 16 |
++ (HPDF_UINT32)b[2] << 8 |
++ (HPDF_UINT32)b[3]);
++}
++
++/* Encode a position coordinate for writing */
++static HPDF_UINT32 _EncodeValue(HPDF_REAL x, HPDF_REAL xMin, HPDF_REAL xMax)
++{
++ HPDF_DOUBLE norm = (x - xMin) / (xMax - xMin);
++ HPDF_DOUBLE max = (HPDF_DOUBLE)(0xFFFFFFFF);
++ HPDF_UINT32 enc = (HPDF_UINT32)(norm * max);
++ UINT32Swap(&enc);
++ return enc;
++}
++
++HPDF_EXPORT(HPDF_Shading)
++HPDF_Shading_New (HPDF_Doc pdf,
++ HPDF_ShadingType type,
++ HPDF_ColorSpace colorSpace,
++ HPDF_REAL xMin, HPDF_REAL xMax,
++ HPDF_REAL yMin, HPDF_REAL yMax)
++{
++ HPDF_Shading shading;
++ HPDF_Array decodeArray;
++ HPDF_STATUS ret = HPDF_OK;
++ int i;
++
++ HPDF_PTRACE((" HPDF_Shading_New\n"));
++
++ if (!HPDF_HasDoc(pdf)) {
++ return NULL;
++ }
++
++ /* Validate shading type: */
++ switch (type)
++ {
++ case HPDF_SHADING_FREE_FORM_TRIANGLE_MESH:
++ break;
++
++ default:
++ HPDF_SetError (pdf->mmgr->error, HPDF_INVALID_SHADING_TYPE, 0);
++ return NULL;
++ }
++
++ decodeArray = HPDF_Array_New(pdf->mmgr);
++ if (!decodeArray) {
++ return NULL;
++ }
++
++ /* X-range */
++ ret += HPDF_Array_AddReal(decodeArray, xMin);
++ ret += HPDF_Array_AddReal(decodeArray, xMax);
++
++ /* Y-range */
++ ret += HPDF_Array_AddReal(decodeArray, yMin);
++ ret += HPDF_Array_AddReal(decodeArray, yMax);
++
++ const char *colName = NULL;
++ switch (colorSpace) {
++ case HPDF_CS_DEVICE_RGB:
++ colName = COL_RGB;
++ for (i = 0; i < 3; ++i) {
++ ret += HPDF_Array_AddReal(decodeArray, 0.0);
++ ret += HPDF_Array_AddReal(decodeArray, 1.0);
++ }
++ break;
++
++ default:
++ HPDF_SetError(pdf->mmgr->error, HPDF_INVALID_COLOR_SPACE, 0);
++ return NULL;
++ }
++
++ if (ret != HPDF_OK) {
++ return NULL;
++ }
++
++ shading = HPDF_DictStream_New(pdf->mmgr, pdf->xref);
++ if (!shading) {
++ return NULL;
++ }
++
++ shading->header.obj_class |= HPDF_OSUBCLASS_SHADING;
++ ret += HPDF_Dict_AddNumber(shading, "ShadingType", type);
++ ret += HPDF_Dict_AddName(shading, "ColorSpace", colName);
++
++ switch (type)
++ {
++ case HPDF_SHADING_FREE_FORM_TRIANGLE_MESH:
++ ret += HPDF_Dict_AddNumber(shading, "BitsPerCoordinate", 32);
++ ret += HPDF_Dict_AddNumber(shading, "BitsPerComponent", 8);
++ ret += HPDF_Dict_AddNumber(shading, "BitsPerFlag", 8);
++ ret += HPDF_Dict_Add(shading, "Decode", decodeArray);
++ break;
++
++ default:
++ HPDF_SetError (pdf->mmgr->error, HPDF_INVALID_SHADING_TYPE, 0);
++ return NULL;
++ }
++
++ if (ret != HPDF_OK) {
++ return NULL;
++ }
++
++ return shading;
++}
++
++HPDF_EXPORT(HPDF_STATUS)
++HPDF_Shading_AddVertexRGB(HPDF_Shading shading,
++ HPDF_Shading_FreeFormTriangleMeshEdgeFlag edgeFlag,
++ HPDF_REAL x, HPDF_REAL y,
++ HPDF_UINT8 r, HPDF_UINT8 g, HPDF_UINT8 b)
++{
++ HPDF_STATUS ret = HPDF_OK;
++ RGBVertex vert;
++ float bbox[4];
++
++ HPDF_PTRACE((" HPDF_Shading_AddVertexRGB\n"));
++
++ if (!shading) {
++ return HPDF_INVALID_OBJECT;
++ }
++
++ if (_GetDecodeArrayVertexValues(shading, bbox) != HPDF_TRUE) {
++ return HPDF_SetError(shading->error, HPDF_INVALID_OBJECT, 0);
++ }
++
++ vert.EdgeFlag = (HPDF_UINT8)edgeFlag;
++ vert.X = _EncodeValue(x, bbox[0], bbox[1]);
++ vert.Y = _EncodeValue(y, bbox[2], bbox[3]);
++ vert.RGB[0] = r;
++ vert.RGB[1] = g;
++ vert.RGB[2] = b;
++
++ ret = HPDF_Stream_Write(shading->stream,
++ (HPDF_BYTE*)(&vert.EdgeFlag), sizeof(vert.EdgeFlag));
++ if (ret != HPDF_OK)
++ {
++ return ret;
++ }
++
++ ret = HPDF_Stream_Write(shading->stream,
++ (HPDF_BYTE*)(&vert.X), sizeof(vert.X));
++ if (ret != HPDF_OK)
++ {
++ return ret;
++ }
++
++ ret = HPDF_Stream_Write(shading->stream,
++ (HPDF_BYTE*)(&vert.Y), sizeof(vert.Y));
++ if (ret != HPDF_OK)
++ {
++ return ret;
++ }
++
++ ret = HPDF_Stream_Write(shading->stream,
++ (HPDF_BYTE*)(&vert.RGB), sizeof(vert.RGB));
++
++ return ret;
++}
+--
+2.16.0
+
diff --git a/media-libs/libharu/libharu-2.3.0-r2.ebuild b/media-libs/libharu/libharu-2.3.0-r2.ebuild
new file mode 100644
index 000000000000..37c65b826878
--- /dev/null
+++ b/media-libs/libharu/libharu-2.3.0-r2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-multilib
+
+MYP=RELEASE_${PV//./_}
+
+DESCRIPTION="C/C++ library for PDF generation"
+HOMEPAGE="http://www.libharu.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${MYP}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="
+ media-libs/libpng:0=[${MULTILIB_USEDEP}]
+ sys-libs/zlib:=[${MULTILIB_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-${MYP}"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-1-Included-necessary-char-widths-in-generated-PDF.patch
+ "${FILESDIR}"/${P}-2-Avoid-issue-with-libtiff-duplicate-symbols.patch
+ "${FILESDIR}"/${P}-3-cmake-fixes.patch
+ "${FILESDIR}"/${P}-4-Add-support-for-free-form-triangle-Shading-objects.patch
+)
+
+mycmakeargs=(
+ -DLIBHPDF_EXAMPLES=NO # Doesn't work
+ -DLIBHPDF_STATIC=NO
+ -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
+)
diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest
index bff0dda0fbb7..78c7b4fe46be 100644
--- a/media-libs/libpng/Manifest
+++ b/media-libs/libpng/Manifest
@@ -11,11 +11,11 @@ DIST libpng-1.6.32-apng.patch.gz 10382 BLAKE2B 572f2f9e4fdff185de2c86781370bf880
DIST libpng-1.6.32.tar.xz 997136 BLAKE2B 5013e8740ac7b263de4bce4abb536def085de18aaa36561aba3af1adb2a54fb7cf39f291b2e92ad6dfc5bcae76436eb264c16b0997063a7ef319c03a7a5270e8 SHA512 24cf4d38dc08d1db7721fc580d8bf6cee9a105afcea32f1245b7bb3727c8a8645ad733a24534782ef5dfb0d4315a5fd6b0eee9e7f0704e0c635350f80c19a708
DIST libpng-1.6.34-apng.patch.gz 10411 BLAKE2B 4f6a5f7c2dcdc47e88a4687063958b18ae29c6f5168a339aa1f47abd8859126ea6d658ebc6645a8163b4127a5c0237f4b858fd0979781147fdd5fd23c0bb1098 SHA512 d4088399d2e9a2e2e40d5bd5dfb478dbd11c7065600287734aee7b3bf13a9574d17d3890e705c82705275fd0c11848155fbf960acd2e8eb890a7656b4140340c
DIST libpng-1.6.34.tar.xz 997968 BLAKE2B 4cd0c46d11097cdeb0e419f1363cb9632ceaf56729a2d11e78361292568dce5c33f8fd24c56a5c5a007f419b8bc14fdaecff6db05ac2acea51b2374a1f57b848 SHA512 89407c5abc1623faaa3992fc1e4a62def671d9a7401108dfceee895d5f16fe7030090bea89b34a36d377d8e6a5d40046886991f663ce075d1a2d31bf9eaf3c51
-EBUILD libpng-1.2.57.ebuild 1015 BLAKE2B b8d3fd1371e04ee091ece4c23f67b492b05d064eaee7b1b3945216daeac6e7b0e37c2de23760c5e7659afe2b056570c058db3b01ae2cf86482af750a2204b78b SHA512 ae0fa8d9595a3439ffa8427b971124bb0c44b13199d23943cf5b50d1aa95b707b560950cd40e4d0fbb150c148d3598cf4d3b0e78d09c70c4e9cc1907ea1f8bfa
-EBUILD libpng-1.5.28.ebuild 1790 BLAKE2B 223c1ba2280d1e64f376d3bf820856fc483c8c4f4a311e1ecd3ba2695090a471460225ae4a5c1bb20fbab122eb3600f125216ef04841d00d0433d08bd56c5830 SHA512 100016d33a3cb1b94e101b006f4cb21f0afc056fce229302836d88b894d43f713a878ba75e619dbb40250511cc235be68d386eaaca31f5c7f9b672bb87dde5ce
-EBUILD libpng-1.6.27.ebuild 1396 BLAKE2B 91c3c52fb21643dcba38fc0be67b4527f14862759e4541c04a44eef038b530e51ea86790e4c028b42b9d9754394ec1a36cc6a1b3b81181a1278f9500032aebf4 SHA512 aa1633c553d0364c34b3e131bad3d58d46f3cab29a8bf5397c6ddb965147ad88085ae332ccff475f4b2b5fa2807e5d07f60c9f05bda6c28a8386ff0b59b577b5
-EBUILD libpng-1.6.29.ebuild 1473 BLAKE2B 6c429d2962ed78f777cda32d52a22a94dc71c05b611025c806595f0992cf3bf546f66c4acdb94657eba288b919eb459e16aa3e5a89cd4c1754175741af62d54b SHA512 d6e74f799b3ccc27112153bec490d6a6ed37014e89232fd78643b7d25436c545bfffd2603db15716e0d9f5050d8913444bb4ec348ec2bf6bf169fa9f1680ebbc
-EBUILD libpng-1.6.31.ebuild 1521 BLAKE2B e540ff54bb52a0725a3e99b8be65f7fb76011521f86d2fc9d36f3f5764b7457fdefda977b93895c80c76b3092e49f1daee54a504ddb9021498de1af52c86e599 SHA512 88e570b4c23a0246e4edf6285b2ec458f10b85933f3771fd699418dc2239524f0d03bbe45013c918c2be22098af053251a17d8eea2bbb71f98514c87898234d0
-EBUILD libpng-1.6.32.ebuild 1521 BLAKE2B e540ff54bb52a0725a3e99b8be65f7fb76011521f86d2fc9d36f3f5764b7457fdefda977b93895c80c76b3092e49f1daee54a504ddb9021498de1af52c86e599 SHA512 88e570b4c23a0246e4edf6285b2ec458f10b85933f3771fd699418dc2239524f0d03bbe45013c918c2be22098af053251a17d8eea2bbb71f98514c87898234d0
-EBUILD libpng-1.6.34.ebuild 1521 BLAKE2B e540ff54bb52a0725a3e99b8be65f7fb76011521f86d2fc9d36f3f5764b7457fdefda977b93895c80c76b3092e49f1daee54a504ddb9021498de1af52c86e599 SHA512 88e570b4c23a0246e4edf6285b2ec458f10b85933f3771fd699418dc2239524f0d03bbe45013c918c2be22098af053251a17d8eea2bbb71f98514c87898234d0
+EBUILD libpng-1.2.57.ebuild 1003 BLAKE2B dc6e1f723471ced6448d0458213a9d88995efd397003de2952c4f393fa64a84990a61737b5abd81cdccea800e2efd1fa675dbe9020d1e1cb747f2db99b296b40 SHA512 3ef798d4f394e35d833a3b1ee66521186cfcaa00770141a64347e7592972f620a10321f9cfe32d8eff8e0c2b2c3c91b3b690e8ed51b5aa493410d2f253e1ca08
+EBUILD libpng-1.5.28.ebuild 1778 BLAKE2B 544221137ad9594e82f7204f09631804984015ad3db7c8eb7123bbdca95c80a55206b212e51a54521e699bf95c1bc08ec8e5704d73e58e691b0af9c8f96341cf SHA512 67fef4c1a3bd619de59515c6409b566ab8d595ef1b777bc48646fcff8acbb315719462961275b078d9a7bf70200e523b081dc2669c5338b0d7de26fb4596d190
+EBUILD libpng-1.6.27.ebuild 1384 BLAKE2B 4e061b59938050d4eb0cda041f5a80e9d152f0704bdc1b9f98c9728d3f5568c1babcf7698f9eabae3376789a47cf6a20bef617ca38d3909349f2f9848ded609f SHA512 eded8c75fc7f472e588837b498693883312bb45a9c591bf3578ebfbc082b3ee44d9b1ed31bfb10abe565f1a6353ba8d5ff540ae886e31685dd6e754d6d4afc11
+EBUILD libpng-1.6.29.ebuild 1461 BLAKE2B ce6d523c26a91654346ffe52f57f12bd725448a94b9875c7d2fbe4a54ff049769bdfafb3f7c8e1591f0f478dbdd7dd78063b59cf8325e3f6793b61e205f397e4 SHA512 b052477b925c86814b42ae23f5086d76e25f3f5c7b31972fb41b41784c9169dffbe02f672e4e1af14b19cd17f9d0858cdb60e0744d64bad89a7c109b5d6c35ba
+EBUILD libpng-1.6.31.ebuild 1509 BLAKE2B 49ab1b188b11188e6c9a6b3b51f35ba0b4a221c8bba69a2182a5bb2f42c76c14654041fe4edf42dde0cbc0e86f5544084859b079a40464a49c09d295a40c2947 SHA512 f55ca8f187c874361b0287b99cb4010386c023efe7ea1b63b304b88abef3b7931a89eda0234907d9f66ccefa777c79075048a41c509cd85a2783808d7348b4ed
+EBUILD libpng-1.6.32.ebuild 1509 BLAKE2B 49ab1b188b11188e6c9a6b3b51f35ba0b4a221c8bba69a2182a5bb2f42c76c14654041fe4edf42dde0cbc0e86f5544084859b079a40464a49c09d295a40c2947 SHA512 f55ca8f187c874361b0287b99cb4010386c023efe7ea1b63b304b88abef3b7931a89eda0234907d9f66ccefa777c79075048a41c509cd85a2783808d7348b4ed
+EBUILD libpng-1.6.34.ebuild 1509 BLAKE2B 49ab1b188b11188e6c9a6b3b51f35ba0b4a221c8bba69a2182a5bb2f42c76c14654041fe4edf42dde0cbc0e86f5544084859b079a40464a49c09d295a40c2947 SHA512 f55ca8f187c874361b0287b99cb4010386c023efe7ea1b63b304b88abef3b7931a89eda0234907d9f66ccefa777c79075048a41c509cd85a2783808d7348b4ed
MISC metadata.xml 843 BLAKE2B e8736137db2c0e06193b3bbc9d933b1b8e2b8609d050a93a5369a8de81acf02af1d7ff6eb3c1e1967d7dbd6fec38373e389011d290cda1577203075f2f679167 SHA512 43cd4bd8981c828f2de943bb5ee90958f6a4f555d824be1325a7663219b0386ebaeb99406697affa8086b5b50f3d185e01ed12ace030557aa66a8e7b9af006b3
diff --git a/media-libs/libpng/libpng-1.2.57.ebuild b/media-libs/libpng/libpng-1.2.57.ebuild
index aa7c7dd5ff59..e94ff6442c3e 100644
--- a/media-libs/libpng/libpng-1.2.57.ebuild
+++ b/media-libs/libpng/libpng-1.2.57.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
LICENSE="libpng"
SLOT="1.2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
diff --git a/media-libs/libpng/libpng-1.5.28.ebuild b/media-libs/libpng/libpng-1.5.28.ebuild
index ba8c989b848a..4845cc7dca5f 100644
--- a/media-libs/libpng/libpng-1.5.28.ebuild
+++ b/media-libs/libpng/libpng-1.5.28.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
LICENSE="libpng"
SLOT="1.5"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="apng neon"
RDEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
diff --git a/media-libs/libpng/libpng-1.6.27.ebuild b/media-libs/libpng/libpng-1.6.27.ebuild
index 47a6cefb1cd0..608fa8163258 100644
--- a/media-libs/libpng/libpng-1.6.27.ebuild
+++ b/media-libs/libpng/libpng-1.6.27.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
LICENSE="libpng"
SLOT="0/16"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="apng neon static-libs"
RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
diff --git a/media-libs/libpng/libpng-1.6.29.ebuild b/media-libs/libpng/libpng-1.6.29.ebuild
index aaaac3d6a141..7d532ea92a75 100644
--- a/media-libs/libpng/libpng-1.6.29.ebuild
+++ b/media-libs/libpng/libpng-1.6.29.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
LICENSE="libpng"
SLOT="0/16"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="apng cpu_flags_x86_sse neon static-libs"
RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
diff --git a/media-libs/libpng/libpng-1.6.31.ebuild b/media-libs/libpng/libpng-1.6.31.ebuild
index 055b9b2c16ad..056acfd714aa 100644
--- a/media-libs/libpng/libpng-1.6.31.ebuild
+++ b/media-libs/libpng/libpng-1.6.31.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
LICENSE="libpng"
SLOT="0/16"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="apng cpu_flags_x86_sse neon static-libs"
RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
diff --git a/media-libs/libpng/libpng-1.6.32.ebuild b/media-libs/libpng/libpng-1.6.32.ebuild
index 055b9b2c16ad..056acfd714aa 100644
--- a/media-libs/libpng/libpng-1.6.32.ebuild
+++ b/media-libs/libpng/libpng-1.6.32.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
LICENSE="libpng"
SLOT="0/16"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="apng cpu_flags_x86_sse neon static-libs"
RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
diff --git a/media-libs/libpng/libpng-1.6.34.ebuild b/media-libs/libpng/libpng-1.6.34.ebuild
index 055b9b2c16ad..056acfd714aa 100644
--- a/media-libs/libpng/libpng-1.6.34.ebuild
+++ b/media-libs/libpng/libpng-1.6.34.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
LICENSE="libpng"
SLOT="0/16"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="apng cpu_flags_x86_sse neon static-libs"
RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
diff --git a/media-libs/libraw/Manifest b/media-libs/libraw/Manifest
index a6cc724bcb79..3ad85dcba4ff 100644
--- a/media-libs/libraw/Manifest
+++ b/media-libs/libraw/Manifest
@@ -1,13 +1,13 @@
DIST LibRaw-0.18.4.tar.gz 1281104 BLAKE2B dc6c2b594f0897eea509d3122bd7f41bccd89182a5e294b331544ad626631f18637660e1de7ea1c8b5e1c0b59678189d06f9fd12e27016e2ea3ec736cabfbbe4 SHA512 e71db23a70f0cda745ae862f4cb6a0c51c968e4c7399f28e86de8beb894526fa76cd337c1406e2eaee3f287f15e8912d1a0f7217493c6444a491ca3329f63776
-DIST LibRaw-0.18.5.tar.gz 1280046 BLAKE2B 167267922a1a8d16e3b13dbf4c8cda3bfa31a9e5d98eb9fc3929eb61df4cf6491a49772d1fd8a18da525709481afa34c7b85c996d02445012ddcadb90bbc0675 SHA512 751a1c54507b7408d0d36c3f1fb0e31928f5ae540fae42eb2b57d8fcebcd44134dc452a4f3838dd31dbc8fb3978a6cac6129429a3350f8be5dc44146309aff81
DIST LibRaw-0.18.6.tar.gz 1282212 BLAKE2B db53d22a38535f0b96fd02aa52969206d4003579706a4c2b8ed00c6df0785e062ea92fd9613bfe5e94efc65bb69fefb8661d2afc4b57341800a4176ba264bc83 SHA512 ce916a85dcc8ad50a631e9f0e4532d4cc300624b5c78d233531317f33cdf74363cdbcab1fbef3207e89b77bac5be370ef8ff1b806dbb9ae2c4cc0ec607b53e55
+DIST LibRaw-0.18.7.tar.gz 1280935 BLAKE2B 6bc35b05ecca81cb1a8d0e054c2b74eb8f2f4e58e4f6085a1c4886bf96180a547452d4164c6d0f74fa49e6c1b06ee6663b4b9b94aadbaee4c7de890e4e11959e SHA512 5d906e69427d4f9edff8b3bc24eb85896e037dd98578cf07c668b96f6abd82bc8dd9f937ecbca6472d334c4cf8d8cbc8b07c2c84aba748e22ec55cecc6a4ed78
DIST LibRaw-demosaic-pack-GPL2-0.18.4.tar.gz 33129 BLAKE2B 724501ae52bf83006dd1e7730f750c65f4a58ca385227a7c9d5c8ab2926ef2fb74a798bd09b78e6f9c1c5cdd39de712ec05a49412087f3b889f3ff76dbb0fbe8 SHA512 05bef76530f9237e1d1bfe08014f30de328b68319f88d126aaffa8baf3b89615d160bac36a6ad2cc38cab0faeb8c4bf86714dd568e7f01cfd1ee2513ac175a5d
-DIST LibRaw-demosaic-pack-GPL2-0.18.5.tar.gz 30449 BLAKE2B 6881852b59bc728eee6f31d5b355ee7583390adcc62446d0f4c9df6efe45b0384e192e9ce8e48815c960af89890a9ee4c3f5a2f0e0f1086bc943c8425b7e5930 SHA512 1599695394717558e61844e32d76bf653741592d81691c9f55bfb72c8c5d485bce4eab3fc0eefd37640254c431bd78706fe04ca547e42566dda789f0b6559af5
DIST LibRaw-demosaic-pack-GPL2-0.18.6.tar.gz 32638 BLAKE2B 070a09732a018c3c759fd6417ff9f8b97ba6cf4bafc2efcb24c9d0809fe53565ff74b60c46f640e76a3a95486fc70a08f6059fb311e4f3b3337048665caef38d SHA512 2a4f317c2594825a7a7ad62eb5592ad3d512026dc49b87123ae4f5a05731912fcf4f3e22169acbc1decf6b79aec34a7250d892b686fe824f8bb2c5afa759c7ae
+DIST LibRaw-demosaic-pack-GPL2-0.18.7.tar.gz 30659 BLAKE2B 11bb00034838470c9b5762761acde6d6c49c0dfe7e342cc1a6e4f0744b718ba6c5dfb027c5144a0858214c91faf9b726e5c008758cc5c2f9464b7feb4db9eda9 SHA512 1a967eb06807bc5ce2177d4e13d394e8f4afe15e5ef07d9a49c1a2172f0961cd122a3bfa84fa66a203766d50735adacbffd48ba8deead8a202c3c2a1e4a97ffa
DIST LibRaw-demosaic-pack-GPL3-0.18.4.tar.gz 38622 BLAKE2B 268085234335619487f52bf22739c28f077c24d02990e7a56a0a3e5b9a654227762adb366b0be5b3b0a9a1fe2553a798b4d5b120699c93cae16415f4aaf4ea4a SHA512 158d951d0e1c35f1ebdde8849f0b51e23332c8b5b13a4b0ab0677a3d4a1682afd6e7c5dec4194072b4588699bf49a023591fa1b05d2a8f4c54cd1a44e65e3ad9
-DIST LibRaw-demosaic-pack-GPL3-0.18.5.tar.gz 38899 BLAKE2B 8ad0e18c0f33d4cd485668cb126ca18677271f4b141c64e0adfe918b3a04e4dbf2b4a11eb810ca6b93e850babf755ed4df1f2d85c9ca8cfbfe78ca3b5a14ac63 SHA512 c00193b64673e093c33a9d1316448eea4eb7e2b274d5d3bd39cef02b7269e56ce72f9b47831039e00b2feb8344b5266f9c03b5f11212d520809674db253cb028
DIST LibRaw-demosaic-pack-GPL3-0.18.6.tar.gz 39247 BLAKE2B 73319b2c33c24b570036725585c15bffe9bffb1252a8cf64cd3628dab22cf17e12e7fc87efb5c5ae8581dfcd59d0f9bd7dc41817a2ceb1dd2b1e2b09e76423ce SHA512 53ad72654f407dbb3b591f2d1ff12de1cb273de5339d598e76260ee2e2c4095d70d3b0f30536cbb7eb06d802bcf6cc76e6b870837a3e4dc640f4a14da020a704
+DIST LibRaw-demosaic-pack-GPL3-0.18.7.tar.gz 39229 BLAKE2B d76134c4b53a1285c31e290c088bdde9646ca94a7ecaf4997af5e2da4410ec70671d0e597c1748072266c241b7021b16344a8d8507ebc938ce03ab1f061630a6 SHA512 347a39d8326e4614b83c2721baa09414738416d405d7db516d155a867902dd85cf51d156705d1fd0bc933802cd3a01cfb1c9da43f4cdff15b7a7253674b91c4a
EBUILD libraw-0.18.4.ebuild 1709 BLAKE2B e9f8aa141cc9a75922d8cd242194f18c6c4aee4869d005a39a45aea15134607274309e03c785c03ca542f2fccad46ed296849143f057b7a72f4741e34fb0df22 SHA512 bc71024b25099e5d8f1d159da3c0c547e66daccc8154d925f5b261c72db5e2cb3fb840974a7c84888d9190254388da892d0746ab77ad58392d9f5eba471dc14f
-EBUILD libraw-0.18.5.ebuild 1718 BLAKE2B d5a7c80018a5848d097ef300d3ff49bef0589f8c092934f603d5f09efbdf64a4f32ff78b30ae7afb6a5868221fb15394525db8d8cd3d096f6dce270ff2e22b4d SHA512 7a411fcef607ef7b41496284df88f9e6c4bd82ba87cdd0693ed34b820c698dba384a81886764fac86c0386f004fdfba787d29f22ca58e12aad58e7f5e56bbc3f
EBUILD libraw-0.18.6.ebuild 1724 BLAKE2B b54447a16c286c835e3d8dfac31dd879fe33604a7f6b58c3fbf7bcee01314bb1a7380dd265b7c3195c5de981b8a73591cf1650bb65a2825d626540867de704cf SHA512 c8d43d50d6e092fa4469cc0262d0eac82f6c09893aa1d507f9a4a5d5f4340084a558d98a73b8ffa975bfc854b5af47e3b220ef4c079d7d060ab0d335d56201f2
+EBUILD libraw-0.18.7.ebuild 1724 BLAKE2B 0ee8e541096ea18d807bd415b555787a1b05ed4de25da96532acff9c3c5dc66195ab55aa89122a0927b359d393ab6ad5a6a95ad152aff53c6bd78322874512b5 SHA512 4e6337c9558d007325a24aa839cb167fa68c3e18d3bd4d671d03d87f93bd9f012924145355f87e2543c4f0fbf67f0dc3424d17e502718c39da551a17b47f3636
MISC metadata.xml 437 BLAKE2B d43c89433ab4eff6a760dce4f7fc83253cb572ab048af7fb1df5bca74db8d7fde84cf147f5941e65407776d281edc4c0297006c75f83c285a5febc37625d6265 SHA512 b06d476afa85710b25dc7d1c1567ba30469ce6d08d278aaa64413611edf95433df315a5a77670d74ca5341be3b96fa0f4451e48f544783f031178b8cf73cd388
diff --git a/media-libs/libraw/libraw-0.18.5.ebuild b/media-libs/libraw/libraw-0.18.7.ebuild
index e66ec29b75cb..4989fcd6c7fb 100644
--- a/media-libs/libraw/libraw-0.18.5.ebuild
+++ b/media-libs/libraw/libraw-0.18.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -6,8 +6,8 @@ EAPI=6
inherit multilib-minimal toolchain-funcs
MY_PN=LibRaw
-MY_PV=${PV/_b/-B}
-MY_P=${MY_PN}-${MY_PV}
+MY_PV="${PV/_b/-B}"
+MY_P="${MY_PN}-${MY_PV}"
DESCRIPTION="LibRaw is a library for reading RAW files obtained from digital photo cameras"
HOMEPAGE="https://www.libraw.org/ https://github.com/LibRaw/LibRaw"
@@ -28,7 +28,7 @@ RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
DEPEND="${RDEPEND}
virtual/pkgconfig"
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
DOCS=( Changelog.txt README )
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 1c30391a96e0..f6c533023d42 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -2,8 +2,10 @@ AUX eselect-mesa.conf.9.2 1630 BLAKE2B 6c67ef9b5dc94f2f26378c004a459680b05084900
DIST mesa-17.1.10.tar.xz 9872168 BLAKE2B 205ece7b016fcc1de5bb72711775cd8f4b90f5d6c26db77d1576752fcd4a99a36cbcd902bb6ad1041d476d1c3b32479baceb4087c902ce598ede3d57851c6b9d SHA512 728dbd41f5d3a7a1c33fc18c08a8b8eb1f6d236c5f00781209f46b144dd66a27ecd723ab1635868b7ad77de3a18ad53f1a88c932f17c0be97605a2775e3b3a9b
DIST mesa-17.2.8.tar.xz 10393304 BLAKE2B 558321eefc6d599aaedfe468f03c2f1f99b5c96c253637db00b7da3265ec38e031d15f77623db1f4408f15912c93347e0f5769b01d92329be7f55e45f6f6bf75 SHA512 ce05ad2d3e1b55ffe9c8ef65023a840c04b29014c7876b23182a6a6dd0b768f248ec21bc5b738d21b846f59f4b73501a9fe834d6a87e7dba16c6f821008e0f01
DIST mesa-17.3.3.tar.xz 10637708 BLAKE2B a2cec4abc58eb71c1ec92d073ac3a128e1f993f69b163c9f6e474fef4520fe074d84ca8d972a7822a76226e132230f6e7fac320b940ea3462553d398ef6bcfce SHA512 7ac8ecdcf3b2b43239835bc2c5da7f2730f80a2db945fe00df03d1548920fbc074dd4806ddd345a1ce682fd29d75b2209ef81b6b06e657f9c8ae8622a34a03c1
+DIST mesa-18.0.0-rc2.tar.xz 10962300 BLAKE2B 89444a46261d837bd5c7bc54898ebdafe58e863d3532bd80f6592432d2925317fc0ac144dd55862a249d6390efc3955942dc2980ce87e589b9360de61a1f6148 SHA512 aada4caf4c2021bc1e7c071b32ed0ccbbbfe415bc1cb5a80eee3911b1b11a2bd87a10e99c5a152790709488afbdb60e87b4b66c2ca22c0cf89c029fb10c6e8b3
EBUILD mesa-17.1.10.ebuild 13439 BLAKE2B bb22c34fa2e7a794ba78ea621e7e3fc6e0aeeb65efe3599f2d5d6024a2e1b21101ac91c5e3a706a7f23c868db662928684be478d1be4c0ee4ed3bb186d981285 SHA512 033085950f8ee3c6390e1f083ed18abfe3c0fb875a8f71fc488857c2fa663e4e10221c0d43d32520928abd2eaa308ee807c67bfe296e050ab90af0d811dbcb9d
EBUILD mesa-17.2.8.ebuild 14999 BLAKE2B 48693ff690c7f7283e5d8412b282265a24100d7e5a05acc2054b5058bad9d1971b3bfd5b4070803eff6c045c8904accc78b68e84958c73528036e42d8a856335 SHA512 c00b4d4ebaeabfbece7727f9605d9a91c691a759247b59d7b719bd576864f69ac6887a92b1bade227e374da19d8c609abe934a979714a7259e21cb60b10abe31
EBUILD mesa-17.3.3.ebuild 14892 BLAKE2B 4b44795597c2e47151553133e75476155fde4c438f384434254027a7d73f2d80de3412ba11edfee83d434814378234875b1f4f884897fce7153baab5ac6c592b SHA512 3246e7864889ffb4d0bb907e3393edc9d718398f0002478e0b5a5cb02aa3a2320c3675b7320053c46b3336d62dcd366d96af85c37d2b8d10539d0adbea66870e
+EBUILD mesa-18.0.0_rc2.ebuild 14974 BLAKE2B b829d32a94238ffb139ad6f539f1a56207cc17fca91e3b61446688c760b1f04f1f36cf1419619a6ae9c16fd6e63c3959e47703d69ffc86839cb3cd93ecf48153 SHA512 2f882fd3a2735513e9fe0290c8203ed50955b0e3ac6a3a9b446041c447b1cb0914ce20c661813ce0ec2c04765f86b2b13284b7fc071dc5f65af9aab79e51dd49
EBUILD mesa-9999.ebuild 14974 BLAKE2B b829d32a94238ffb139ad6f539f1a56207cc17fca91e3b61446688c760b1f04f1f36cf1419619a6ae9c16fd6e63c3959e47703d69ffc86839cb3cd93ecf48153 SHA512 2f882fd3a2735513e9fe0290c8203ed50955b0e3ac6a3a9b446041c447b1cb0914ce20c661813ce0ec2c04765f86b2b13284b7fc071dc5f65af9aab79e51dd49
MISC metadata.xml 2095 BLAKE2B c1c858a478bbb1c7e38a45dbf00e380a3d26c56920db1897521a7e9f4eb005157e535207ae2274d744e3ce5514a57654eb0effb2cfc773263a0f417874cdc742 SHA512 c3db8aeb4f4ae7ea27c8b48cb26ee9348d84e6fb4b99df815b177e62e78cd980a7834c152e2c10c6fdbe2b91a032861a0c0503625874bfb6df58ccc3bf54e705
diff --git a/media-libs/mesa/mesa-18.0.0_rc2.ebuild b/media-libs/mesa/mesa-18.0.0_rc2.ebuild
new file mode 100644
index 000000000000..e2f425d49acd
--- /dev/null
+++ b/media-libs/mesa/mesa-18.0.0_rc2.ebuild
@@ -0,0 +1,582 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/mesa.git"
+
+if [[ ${PV} = 9999 ]]; then
+ GIT_ECLASS="git-r3"
+ EXPERIMENTAL="true"
+fi
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools llvm multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS}
+
+OPENGL_DIR="xorg-x11"
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
+
+if [[ $PV == 9999 ]]; then
+ SRC_URI=""
+else
+ SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="!bindist? ( bindist )"
+
+RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
+VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 imx intel nouveau vc4 virgl vivante vmware"
+for card in ${VIDEO_CARDS}; do
+ IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+ bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 unwind
+ +llvm +nptl opencl osmesa pax_kernel openmax pic selinux vaapi valgrind
+ vdpau vulkan wayland xvmc xa"
+
+REQUIRED_USE="
+ d3d9? ( dri3 gallium )
+ llvm? ( gallium )
+ opencl? ( gallium llvm )
+ openmax? ( gallium )
+ gles1? ( egl )
+ gles2? ( egl )
+ vaapi? ( gallium )
+ vdpau? ( gallium )
+ vulkan? ( || ( video_cards_i965 video_cards_radeonsi )
+ video_cards_radeonsi? ( llvm ) )
+ wayland? ( egl gbm )
+ xa? ( gallium )
+ video_cards_freedreno? ( gallium )
+ video_cards_intel? ( classic )
+ video_cards_i915? ( || ( classic gallium ) )
+ video_cards_i965? ( classic )
+ video_cards_imx? ( gallium video_cards_vivante )
+ video_cards_nouveau? ( || ( classic gallium ) )
+ video_cards_radeon? ( || ( classic gallium )
+ gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
+ video_cards_r100? ( classic )
+ video_cards_r200? ( classic )
+ video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) )
+ video_cards_r600? ( gallium )
+ video_cards_radeonsi? ( gallium llvm )
+ video_cards_vc4? ( gallium )
+ video_cards_virgl? ( gallium )
+ video_cards_vivante? ( gallium gbm )
+ video_cards_vmware? ( gallium )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.89"
+# keep correct libdrm and dri2proto dep
+# keep blocks in rdepend for binpkg
+RDEPEND="
+ !<x11-base/xorg-server-1.7
+ !<=x11-proto/xf86driproto-2.0.3
+ abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
+ classic? ( app-eselect/eselect-mesa )
+ gallium? ( app-eselect/eselect-mesa )
+ >=app-eselect/eselect-opengl-1.3.0
+ >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+ >=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
+ >=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+ >=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
+ >=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
+ >=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
+ >=x11-libs/libxcb-1.9.3:=[${MULTILIB_USEDEP}]
+ x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
+ unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+ llvm? (
+ video_cards_radeonsi? (
+ virtual/libelf:0=[${MULTILIB_USEDEP}]
+ )
+ video_cards_r600? (
+ virtual/libelf:0=[${MULTILIB_USEDEP}]
+ )
+ video_cards_radeon? (
+ virtual/libelf:0=[${MULTILIB_USEDEP}]
+ )
+ )
+ opencl? (
+ app-eselect/eselect-opencl
+ dev-libs/libclc
+ virtual/libelf:0=[${MULTILIB_USEDEP}]
+ )
+ openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}] )
+ vaapi? (
+ >=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
+ video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
+ )
+ vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
+ wayland? (
+ >=dev-libs/wayland-1.11.0:=[${MULTILIB_USEDEP}]
+ >=dev-libs/wayland-protocols-1.8
+ )
+ xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
+ ${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
+
+ video_cards_intel? (
+ !video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+ )
+ video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+"
+for card in ${RADEON_CARDS}; do
+ RDEPEND="${RDEPEND}
+ video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
+ "
+done
+RDEPEND="${RDEPEND}
+ video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
+"
+
+# Please keep the LLVM dependency block separate. Since LLVM is slotted,
+# we need to *really* make sure we're not pulling one than more slot
+# simultaneously.
+#
+# How to use it:
+# 1. List all the working slots (with min versions) in ||, newest first.
+# 2. Update the := to specify *max* version, e.g. < 7.
+# 3. Specify LLVM_MAX_SLOT, e.g. 6.
+LLVM_DEPSTR="
+ || (
+ sys-devel/llvm:7[${MULTILIB_USEDEP}]
+ sys-devel/llvm:6[${MULTILIB_USEDEP}]
+ sys-devel/llvm:5[${MULTILIB_USEDEP}]
+ sys-devel/llvm:4[${MULTILIB_USEDEP}]
+ >=sys-devel/llvm-3.9.0:0[${MULTILIB_USEDEP}]
+ )
+ sys-devel/llvm:=[${MULTILIB_USEDEP}]
+"
+LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
+CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+RDEPEND="${RDEPEND}
+ llvm? (
+ opencl? (
+ video_cards_r600? (
+ ${CLANG_DEPSTR_AMDGPU}
+ )
+ !video_cards_r600? (
+ video_cards_radeonsi? (
+ ${CLANG_DEPSTR_AMDGPU}
+ )
+ )
+ !video_cards_r600? (
+ !video_cards_radeonsi? (
+ video_cards_radeon? (
+ ${CLANG_DEPSTR_AMDGPU}
+ )
+ )
+ )
+ !video_cards_r600? (
+ !video_cards_radeon? (
+ !video_cards_radeonsi? (
+ ${CLANG_DEPSTR}
+ )
+ )
+ )
+ )
+ !opencl? (
+ video_cards_r600? (
+ ${LLVM_DEPSTR_AMDGPU}
+ )
+ !video_cards_r600? (
+ video_cards_radeonsi? (
+ ${LLVM_DEPSTR_AMDGPU}
+ )
+ )
+ !video_cards_r600? (
+ !video_cards_radeonsi? (
+ video_cards_radeon? (
+ ${LLVM_DEPSTR_AMDGPU}
+ )
+ )
+ )
+ !video_cards_r600? (
+ !video_cards_radeon? (
+ !video_cards_radeonsi? (
+ ${LLVM_DEPSTR}
+ )
+ )
+ )
+ )
+ )
+"
+unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
+
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ opencl? (
+ >=sys-devel/gcc-4.6
+ )
+ sys-devel/gettext
+ virtual/pkgconfig
+ valgrind? ( dev-util/valgrind )
+ >=x11-proto/dri2proto-2.8-r1:=[${MULTILIB_USEDEP}]
+ dri3? (
+ >=x11-proto/dri3proto-1.0:=[${MULTILIB_USEDEP}]
+ >=x11-proto/presentproto-1.0:=[${MULTILIB_USEDEP}]
+ )
+ >=x11-proto/glproto-1.4.17-r1:=[${MULTILIB_USEDEP}]
+ >=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]
+ >=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}]
+ >=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}]
+ vulkan? (
+ $(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
+ )
+"
+[[ ${PV} == 9999 ]] && DEPEND+="
+ sys-devel/bison
+ sys-devel/flex
+ $(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
+"
+
+S="${WORKDIR}/${MY_P}"
+EGIT_CHECKOUT_DIR=${S}
+
+QA_WX_LOAD="
+x86? (
+ !pic? (
+ usr/lib*/libglapi.so.0.0.0
+ usr/lib*/libGLESv1_CM.so.1.1.0
+ usr/lib*/libGLESv2.so.2.0.0
+ usr/lib*/libGL.so.1.2.0
+ usr/lib*/libOSMesa.so.8.0.0
+ )
+)"
+
+llvm_check_deps() {
+ local flags=${MULTILIB_USEDEP}
+ if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
+ then
+ flags+=",llvm_targets_AMDGPU(-)"
+ fi
+
+ if use opencl; then
+ has_version "sys-devel/clang[${flags}]" || return 1
+ fi
+ has_version "sys-devel/llvm[${flags}]"
+}
+
+pkg_setup() {
+ # warning message for bug 459306
+ if use llvm && has_version sys-devel/llvm[!debug=]; then
+ ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
+ ewarn "detected! This can cause problems. For details, see bug 459306."
+ fi
+
+ if use llvm; then
+ llvm_pkg_setup
+ fi
+ python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ [[ ${PV} == 9999 ]] && eautoreconf
+ eapply_user
+}
+
+multilib_src_configure() {
+ local myconf
+
+ if use classic; then
+ # Configurable DRI drivers
+ driver_enable swrast
+
+ # Intel code
+ driver_enable video_cards_i915 i915
+ driver_enable video_cards_i965 i965
+ if ! use video_cards_i915 && \
+ ! use video_cards_i965; then
+ driver_enable video_cards_intel i915 i965
+ fi
+
+ # Nouveau code
+ driver_enable video_cards_nouveau nouveau
+
+ # ATI code
+ driver_enable video_cards_r100 radeon
+ driver_enable video_cards_r200 r200
+ if ! use video_cards_r100 && \
+ ! use video_cards_r200; then
+ driver_enable video_cards_radeon radeon r200
+ fi
+ fi
+
+ if use egl; then
+ myconf+=" --with-platforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm")"
+ fi
+
+ if use gallium; then
+ myconf+="
+ $(use_enable d3d9 nine)
+ $(use_enable llvm)
+ $(use_enable openmax omx-bellagio)
+ $(use_enable vaapi va)
+ $(use_enable vdpau)
+ $(use_enable xa)
+ $(use_enable xvmc)
+ "
+ use vaapi && myconf+=" --with-va-libdir=/usr/$(get_libdir)/va/drivers"
+
+ gallium_enable swrast
+ gallium_enable video_cards_vc4 vc4
+ gallium_enable video_cards_vivante etnaviv
+ gallium_enable video_cards_vmware svga
+ gallium_enable video_cards_nouveau nouveau
+ gallium_enable video_cards_i915 i915
+ gallium_enable video_cards_imx imx
+ if ! use video_cards_i915 && \
+ ! use video_cards_i965; then
+ gallium_enable video_cards_intel i915
+ fi
+
+ gallium_enable video_cards_r300 r300
+ gallium_enable video_cards_r600 r600
+ gallium_enable video_cards_radeonsi radeonsi
+ if ! use video_cards_r300 && \
+ ! use video_cards_r600; then
+ gallium_enable video_cards_radeon r300 r600
+ fi
+
+ gallium_enable video_cards_freedreno freedreno
+ # opencl stuff
+ if use opencl; then
+ myconf+="
+ $(use_enable opencl)
+ --with-clang-libdir="${EPREFIX}/usr/lib"
+ "
+ fi
+
+ gallium_enable video_cards_virgl virgl
+ fi
+
+ if use vulkan; then
+ vulkan_enable video_cards_i965 intel
+ vulkan_enable video_cards_radeonsi radeon
+ fi
+
+ # x86 hardened pax_kernel needs glx-rts, bug 240956
+ if [[ ${ABI} == x86 ]]; then
+ myconf+=" $(use_enable pax_kernel glx-read-only-text)"
+ fi
+
+ # on abi_x86_32 hardened we need to have asm disable
+ if [[ ${ABI} == x86* ]] && use pic; then
+ myconf+=" --disable-asm"
+ fi
+
+ if use gallium; then
+ myconf+=" $(use_enable osmesa gallium-osmesa)"
+ else
+ myconf+=" $(use_enable osmesa)"
+ fi
+
+ # build fails with BSD indent, bug #428112
+ use userland_GNU || export INDENT=cat
+
+ ECONF_SOURCE="${S}" \
+ econf \
+ --enable-dri \
+ --enable-glx \
+ --enable-shared-glapi \
+ $(use_enable !bindist texture-float) \
+ $(use_enable d3d9 nine) \
+ $(use_enable debug) \
+ $(use_enable dri3) \
+ $(use_enable egl) \
+ $(use_enable gbm) \
+ $(use_enable gles1) \
+ $(use_enable gles2) \
+ $(use_enable nptl glx-tls) \
+ $(use_enable unwind libunwind) \
+ --enable-valgrind=$(usex valgrind auto no) \
+ --enable-llvm-shared-libs \
+ --disable-opencl-icd \
+ --with-dri-drivers=${DRI_DRIVERS} \
+ --with-gallium-drivers=${GALLIUM_DRIVERS} \
+ --with-vulkan-drivers=${VULKAN_DRIVERS} \
+ PYTHON2="${PYTHON}" \
+ ${myconf}
+}
+
+multilib_src_install() {
+ emake install DESTDIR="${D}"
+
+ if use classic || use gallium; then
+ ebegin "Moving DRI/Gallium drivers for dynamic switching"
+ local gallium_drivers=( i915_dri.so i965_dri.so r300_dri.so r600_dri.so swrast_dri.so )
+ keepdir /usr/$(get_libdir)/dri
+ dodir /usr/$(get_libdir)/mesa
+ for x in ${gallium_drivers[@]}; do
+ if [ -f "$(get_libdir)/gallium/${x}" ]; then
+ mv -f "${ED}/usr/$(get_libdir)/dri/${x}" "${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \
+ || die "Failed to move ${x}"
+ fi
+ done
+ if use classic; then
+ emake -C "${BUILD_DIR}/src/mesa/drivers/dri" DESTDIR="${D}" install
+ fi
+ for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do
+ if [ -f ${x} -o -L ${x} ]; then
+ mv -f "${x}" "${x/dri/mesa}" \
+ || die "Failed to move ${x}"
+ fi
+ done
+ pushd "${ED}"/usr/$(get_libdir)/dri || die "pushd failed"
+ ln -s ../mesa/*.so . || die "Creating symlink failed"
+ # remove symlinks to drivers known to eselect
+ for x in ${gallium_drivers[@]}; do
+ if [ -f ${x} -o -L ${x} ]; then
+ rm "${x}" || die "Failed to remove ${x}"
+ fi
+ done
+ popd
+ eend $?
+ fi
+ if use opencl; then
+ ebegin "Moving Gallium/Clover OpenCL implementation for dynamic switching"
+ local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa"
+ dodir ${cl_dir}/{lib,include}
+ if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then
+ mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \
+ "${ED}"${cl_dir}
+ fi
+ if [ -f "${ED}/usr/include/CL/opencl.h" ]; then
+ mv -f "${ED}"/usr/include/CL \
+ "${ED}"${cl_dir}/include
+ fi
+ eend $?
+ fi
+
+ if use openmax; then
+ echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share/mesa/xdg\"" > "${T}/99mesaxdgomx"
+ doenvd "${T}"/99mesaxdgomx
+ keepdir /usr/share/mesa/xdg
+ fi
+}
+
+multilib_src_install_all() {
+ find "${ED}" -name '*.la' -delete
+ einstalldocs
+
+ if use !bindist; then
+ dodoc docs/patents.txt
+ fi
+
+ # Install config file for eselect mesa
+ insinto /usr/share/mesa
+ newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf
+}
+
+multilib_src_test() {
+ if use llvm; then
+ local llvm_tests='lp_test_arit lp_test_arit lp_test_blend lp_test_blend lp_test_conv lp_test_conv lp_test_format lp_test_format lp_test_printf lp_test_printf'
+ pushd src/gallium/drivers/llvmpipe >/dev/null || die
+ emake ${llvm_tests}
+ pax-mark m ${llvm_tests}
+ popd >/dev/null || die
+ fi
+ emake check
+}
+
+pkg_postinst() {
+ # Switch to the xorg implementation.
+ echo
+ eselect opengl set --use-old ${OPENGL_DIR}
+
+ # Select classic/gallium drivers
+ if use classic || use gallium; then
+ eselect mesa set --auto
+ fi
+
+ # Switch to mesa opencl
+ if use opencl; then
+ eselect opencl set --use-old ${PN}
+ fi
+
+ # run omxregister-bellagio to make the OpenMAX drivers known system-wide
+ if use openmax; then
+ ebegin "Registering OpenMAX drivers"
+ BELLAGIO_SEARCH_PATH="${EPREFIX}/usr/$(get_libdir)/libomxil-bellagio0" \
+ OMX_BELLAGIO_REGISTRY=${EPREFIX}/usr/share/mesa/xdg/.omxregister \
+ omxregister-bellagio
+ eend $?
+ fi
+
+ # warn about patent encumbered texture-float
+ if use !bindist; then
+ elog "USE=\"bindist\" was not set. Potentially patent encumbered code was"
+ elog "enabled. Please see /usr/share/doc/${P}/patents.txt.bz2 for an"
+ elog "explanation."
+ fi
+}
+
+pkg_prerm() {
+ if use openmax; then
+ rm "${EPREFIX}"/usr/share/mesa/xdg/.omxregister
+ fi
+}
+
+# $1 - VIDEO_CARDS flag
+# other args - names of DRI drivers to enable
+# TODO: avoid code duplication for a more elegant implementation
+driver_enable() {
+ case $# in
+ # for enabling unconditionally
+ 1)
+ DRI_DRIVERS+=",$1"
+ ;;
+ *)
+ if use $1; then
+ shift
+ for i in $@; do
+ DRI_DRIVERS+=",${i}"
+ done
+ fi
+ ;;
+ esac
+}
+
+gallium_enable() {
+ case $# in
+ # for enabling unconditionally
+ 1)
+ GALLIUM_DRIVERS+=",$1"
+ ;;
+ *)
+ if use $1; then
+ shift
+ for i in $@; do
+ GALLIUM_DRIVERS+=",${i}"
+ done
+ fi
+ ;;
+ esac
+}
+
+vulkan_enable() {
+ case $# in
+ # for enabling unconditionally
+ 1)
+ VULKAN_DRIVERS+=",$1"
+ ;;
+ *)
+ if use $1; then
+ shift
+ for i in $@; do
+ VULKAN_DRIVERS+=",${i}"
+ done
+ fi
+ ;;
+ esac
+}
diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest
index 42f2d81566ee..44d40886aa70 100644
--- a/media-libs/mlt/Manifest
+++ b/media-libs/mlt/Manifest
@@ -8,5 +8,5 @@ AUX mlt-6.4.1-qtopengl-2.patch 2573 BLAKE2B 3a313c170a079b8c036a75773b2e9f8b047b
DIST mlt-6.4.1.tar.gz 1344030 BLAKE2B 835561eac31a44d292c5915567338eb43110b3474778327af282403b43e3e89eaec407e5920f81a774c03968b4c08a496b0ef6c3e6d0970c17353613e7f4d051 SHA512 b082274e2184a0496f496517ddbcae33bab44cd1f50c1708942b7a24e5861ba97cae9fa21ec41ea21d662cbf56e2e2e66caa707a100077ef6e13aa7140f7a9fb
EBUILD mlt-6.4.1-r2.ebuild 5611 BLAKE2B afd7fbeea301840cda11ac7c8855c15f94fe22d8701fe35efe520ec9efae68e6e9342d8c23bf754a48ab150b5f97ed8187480aef4b3334c63c382a38b065246c SHA512 dc24d3812d5452b056ee7e7192f22712177aec8cdf5470e76314a7335f7a8ba849f5dd629b9d6f5c9f873a4b03181cb00914398406106b1aec682b8e8f0bed20
EBUILD mlt-6.4.1-r4.ebuild 5814 BLAKE2B ba612ea2de197a01ce80ff6a6a618995e44a0abfab61d552a4f06915df3adff9a1d8b00b49cf9480acd39b0550305c18a897355cdb37b8488c36a12645a72aad SHA512 a9dad9ccaf640182da4f94bcdc5f9ce1a7a8cb0462a98b1a01dcaf8781c50b734ba74d0c4f597f6c41b2d1fe2de29f3ad0e73def1562768d30fc2f16fb880064
-EBUILD mlt-6.4.1-r5.ebuild 5687 BLAKE2B a8c50f6c2fc9f18aeabd10cdd485736220de8eff4a47e68e90b4ad4b9915ee4c79598cd0ba57758049f6e8e906c27fca330b8b047a97e1e39ef5b72a178d6216 SHA512 91cc96806795f71a3c2e8d0ba5974f554b2435d30ff610d0cb99eb0313a89731eec5afdccd7c99a27eb37129d270bda9571e0b3ad66bf448331e1318cb1429eb
+EBUILD mlt-6.4.1-r6.ebuild 5687 BLAKE2B 00fdbefaa9c1c8f2609b1ad6d72d5d43f446cf5c3353bb0a03bfe4d8a727eccb7139f8b289be338ec847ec8cc3d0fac49a26fcbc5aeb7feee54fb9bbce27db0b SHA512 4a7046100abe253d3afd9ad5943a3a32f0d417d68197889e326ad56ac42d28b32a484a41e42fa32ae4857c4f3cf74cf211c382611c5387a9b17b15e69d9f6979
MISC metadata.xml 1501 BLAKE2B 88eb294bb8844bef1c8d6397649ce3d99edf5691e4f048061b9faee4776043233327b4094e8a06998ac648207836965523036a5e5f3e8a937c50dcfce2051330 SHA512 e3afcec0da4ce1e08e77b0c1a43a7dfb082282da02ab3aa694035bd0c229640b7094ceca0cac0834d33e3b49bc22e924fad0e5d167ea961934f03703eb39cca4
diff --git a/media-libs/mlt/mlt-6.4.1-r5.ebuild b/media-libs/mlt/mlt-6.4.1-r6.ebuild
index cf1136ab792b..1d9f408817c2 100644
--- a/media-libs/mlt/mlt-6.4.1-r5.ebuild
+++ b/media-libs/mlt/mlt-6.4.1-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -6,7 +6,7 @@ PYTHON_COMPAT=( python2_7 )
# this ebuild currently only supports installing ruby bindings for a single ruby version
# so USE_RUBY must contain only a single value (the latest stable) as the ebuild calls
# /usr/bin/${USE_RUBY} directly
-USE_RUBY="ruby22"
+USE_RUBY="ruby23"
inherit eutils flag-o-matic multilib python-single-r1 ruby-single toolchain-funcs
DESCRIPTION="Open source multimedia framework for television broadcasting"
diff --git a/media-libs/munt-mt32emu/Manifest b/media-libs/munt-mt32emu/Manifest
new file mode 100644
index 000000000000..d223d67dab55
--- /dev/null
+++ b/media-libs/munt-mt32emu/Manifest
@@ -0,0 +1,4 @@
+AUX docs.patch 810 BLAKE2B 941da013c47dd7b51ceb18be748b21edaec86157afa43fbaeab2310229302b3fb7ca2cbf058fc104ce9d9135089084aa2b009706618c81e8c4cae48a601fafde SHA512 99a2707a7eb94579de27a8f0351641d22dd963257edc58ae5d01f8d79722827f25677e6d7ca0b4d24ffbf71281df5cac428a8c0ddde8f42925995f5451d326bf
+DIST munt_2_3_0.tar.gz 418703 BLAKE2B d9c4290f11f4114b26aa45d6591c04a73d56981e7f618c1466db81fd35be3588b2853fb60b9cf65dd523ce8ea120a5a187bd805b58ba2f75719d460929c2e4e1 SHA512 87fe4891628ea33967270fe3c6c3840e40deb14bd7c8d61490d4c0057438af6bc0099c10e24e813ef1613ca9cc9fc1567a0340c7ea1f4254b209f7fc99c8c7a1
+EBUILD munt-mt32emu-2.3.0.ebuild 592 BLAKE2B 124ac1da68cbe70f86a61c9de2f1cc50fc9bb0ccdd0387b85e5dff56a344bf2a9ce551314d6046964ce05d1b7f846e90e40dcc02a6869e8ec15fab3d8530c502 SHA512 ff901148241e2ac1358146798ec08d7f0251a048c0970a88064dbe3e8abcd17a6704ba618662a4efacce9afb25640c46df8eb449e61bfc941f63ca3ae1b16d2e
+MISC metadata.xml 620 BLAKE2B be9835ba92d5c8d4cf03c2a716886e422e2539ae773a8e281f4e804192caae29c185e8bac79a5b3a0ca9f7e639f9c5aa099c1ee8f496e1a508b096d4216bc1a9 SHA512 80cde499938128dc44148fdce298a26a49a8cd2660508cd5c6b0e5a9ed8c07eb9d067561d96f8fa94798edff7aa439d9d9269b9ee19a2f83759f574e08e192b3
diff --git a/media-libs/munt-mt32emu/files/docs.patch b/media-libs/munt-mt32emu/files/docs.patch
new file mode 100644
index 000000000000..20034b933641
--- /dev/null
+++ b/media-libs/munt-mt32emu/files/docs.patch
@@ -0,0 +1,27 @@
+From 43b3a932650ffd52fc1bc56f5c515ee4855bfd79 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Mon, 22 Jan 2018 21:07:52 +0000
+Subject: [PATCH] Install documentation in Gentoo-compliant manner
+
+---
+ mt32emu/CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/mt32emu/CMakeLists.txt b/mt32emu/CMakeLists.txt
+index 248f576..704d4f9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -251,8 +251,8 @@ endif()
+
+ if(libmt32emu_PACKAGE_TYPE STREQUAL "Runtime" OR NOT libmt32emu_PACKAGE_TYPE STREQUAL "Devel")
+ install(FILES
+- AUTHORS.txt COPYING.txt COPYING.LESSER.txt NEWS.txt README.txt TODO.txt
+- DESTINATION share/doc/munt/libmt32emu
++ AUTHORS.txt NEWS.txt README.txt TODO.txt
++ DESTINATION share/doc/$ENV{PF}
+ )
+ endif()
+
+--
+2.15.0
+
diff --git a/media-libs/munt-mt32emu/metadata.xml b/media-libs/munt-mt32emu/metadata.xml
new file mode 100644
index 000000000000..168b3b7149fc
--- /dev/null
+++ b/media-libs/munt-mt32emu/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>chewi@gentoo.org</email>
+ <name>James Le Cuirot</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">munt</remote-id>
+ <remote-id type="github">munt/munt</remote-id>
+ </upstream>
+ <longdescription lang="en">
+ A multi-platform software synthesiser emulating (currently inaccurately) pre-GM MIDI devices such as the Roland MT-32, CM-32L, CM-64 and LAPC-I. In no way endorsed by or affiliated with Roland Corp.
+ </longdescription>
+</pkgmetadata>
diff --git a/media-libs/munt-mt32emu/munt-mt32emu-2.3.0.ebuild b/media-libs/munt-mt32emu/munt-mt32emu-2.3.0.ebuild
new file mode 100644
index 000000000000..8e19616aa4da
--- /dev/null
+++ b/media-libs/munt-mt32emu/munt-mt32emu-2.3.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+MY_P="munt_${PV//./_}"
+DESCRIPTION="Library for emulating the Roland MT-32, CM-32L, CM-64 and LAPC-I"
+HOMEPAGE="https://github.com/munt/munt"
+SRC_URI="https://github.com/munt/munt/archive/${MY_P}.tar.gz"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/munt-${MY_P}/mt32emu"
+
+PATCHES=(
+ "${FILESDIR}"/docs.patch
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
+ )
+
+ cmake-utils_src_configure
+}
diff --git a/media-libs/openal/Manifest b/media-libs/openal/Manifest
index f0d2a34c8e1d..a09c8d42bed9 100644
--- a/media-libs/openal/Manifest
+++ b/media-libs/openal/Manifest
@@ -1,5 +1,5 @@
DIST openal-soft-1.15.1.tar.bz2 253006 BLAKE2B 0023eed2e98d07190aa4301a84e6818224feb6459303681276525237c5de9c145cdaab3437cae6b7998307a2294aafebedf3852cbebe8c12232d1e39ba6e15e8 SHA512 ca6dafdd503d06892dff08763bc00b974ec6e7c4bf3dcebb4cb41a486b4ea777c278299a198db182fee888a19a5716bd57d91a2859b764a532138a79f2bd672f
DIST openal-soft-1.18.2.tar.bz2 639420 BLAKE2B 8e31db9d3c6eb49fe4833a6449603dc6284e39810942536594fb5e96d0bc2b867b69bd90e64d40cf99f9a279f3809509cf1c9af3114a4887057e78962a5463e8 SHA512 752e2fb0a5a014caa6d6bac1590d3df46140b463fbaa13378fb5de89f1c97ee8b62bec74f68484d4ec02ee8755c1a2d0c9394cdb477db1b7401deae2fb9eeb4d
EBUILD openal-1.15.1-r2.ebuild 1461 BLAKE2B 96c339461509d21beccecef1f52a60f2181d1dc87b31d2cc05aad10dc3e8a4e47cc5be6721dcbaae07ad401650f38092bd20d501302137354ca668b0c631186a SHA512 0f4ce8cfdeb34c1ab3ef16cb7fdb72fd6d2e53ff306ac241c472f161f298fe9eec4b64603bda566e2fd45ed8fc89f8a4ad60f3043594e53568711b728af1a098
-EBUILD openal-1.18.2-r1.ebuild 2027 BLAKE2B 96f03de444a5933b72104c88d6c76675b8823cf8e87905f2d398d6f7418125af2fcf8ceba1ab4025e989bf653e85c15e61d527a251fdf0e381fb262aded054f4 SHA512 81a7c17bde4045bed9eb54432e9d5d3c5db79d8750aeed50176ab1c3434b574e7b34d4254df5951305d5127620e9ed1f56dc140b9b6dd3056377f3b86304df90
+EBUILD openal-1.18.2-r1.ebuild 2026 BLAKE2B 19565179ae0ee6da4f82a035aca850d0b155c754451b0399e2ef3f8deeab4c9036323f7ae9e000a0cb97095fad1fd6cb39dcdf8dd98117bac8589d176a72f5e6 SHA512 48a8131eecc06bd97486f1fc1bd0a283e9fbb0460f61cae532eb1a44d057b66d7babc31772e2b38fb4b762d239016cb084040bc249bd8633426e37d000d0b8e2
MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-libs/openal/openal-1.18.2-r1.ebuild b/media-libs/openal/openal-1.18.2-r1.ebuild
index fa00593534f4..4ec48c899f8a 100644
--- a/media-libs/openal/openal-1.18.2-r1.ebuild
+++ b/media-libs/openal/openal-1.18.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://kcat.strangesoft.net/openal-releases/${MY_P}.tar.bz2"
LICENSE="LGPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="
alsa coreaudio debug jack oss portaudio pulseaudio qt5
cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1
diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest
index b0bbbff79e8e..b479d7cd1afe 100644
--- a/media-libs/openimageio/Manifest
+++ b/media-libs/openimageio/Manifest
@@ -1,15 +1,14 @@
-AUX openimageio-1.3.5-openexr-2.x.patch 1655 BLAKE2B e75ad1bd47d640e4f6b79246f90a853b0d6f8436b252e5625e48c5630b93a3a7754386cd038617c81d9efb606d69efe7d42ac1a92bbb139daf7970d7de020758 SHA512 3e7819aa866129b20d66ee371d653e80b34fd86a173a70ee280453f38d2b6815ca8fa403ddb85b2ae26a8f20dfbb6d319646b486b664933e665c48ea9ac54a87
AUX openimageio-1.6.18-make-python-and-boost-detection-more-generic.patch 15826 BLAKE2B 7f1744321e4dd59264502ecbb9ec958a6d0ee26a0e1a53be3e0b31fa5e3cc7f0846c95af81b66796f1901378689fb5c217bfd9f991d44451a95de0716a1bcb78 SHA512 57fbd123445ea474609239bb54a2032f4f97fd686ce74479431a90e1b251d4cae1d7f740b14c8360dd498edcac9c51c1d84dece82b2f6b513e709c386bb9ad9e
AUX openimageio-1.6.18-repair-breaks-after-boost-python-1.65-changes.patch 9877 BLAKE2B 0325e373bae367d3581343d49cda84ee27161a8a9a07e85ec00c81e6a0f11de5ce26d71ccc91153187ee79a97933d8307cbff84713524b3a5e40083dc075384c SHA512 e507ba714689a5da0f0a864804eaa0862b1aa4fc0e77f68934ae369c4de11ca566c9efd75ba5060d0294b42bf2bd7f20127eaf8e50efb4ff92497f1b60295f4c
AUX openimageio-1.6.18-use-gnuinstalldirs.patch 11257 BLAKE2B 524d40a5ad4827743d20a259f2fd2ed094945439eef620473ff1097efb150cdfc80c66f4576b869aed6c7b9d086499d5d286c3dcaae4d891a37f6ae06f504a85 SHA512 3ca9e8474bc58b726686d1e87766d20f2cdcb2544b07b20a8a48594b442409f753c1e860219bfe948d19cdf0f5090bd04299ab6fdc6bf39f753d158d9f75a1e1
AUX openimageio-1.7.17-make-python-and-boost-detection-more-generic.patch 15432 BLAKE2B 550a6aa0b962b6efc5c9fb01dcb781dc78bc26a42624c8d4f4be24925464d66e6cbc1a0a7d9dcececa5c5681a70e34d97bfd72ee3224158cffe8ca151a0750c9 SHA512 433dda4b999d60248fecffe0c5866c1214a2db68dedb0e63e36f9c5e0fbcd5c54d3faff3effd19d7b3bb57bce9016eca10f58ba6b3a4143391325838cb637227
AUX openimageio-1.7.17-use-gnuinstalldirs.patch 11236 BLAKE2B f8adc11f949906bce9046fffb0074487962c8832b4b026a7c2a47b081d0c30ca813536462a685feb5e67b793b37cb5985c3cfc6766df65424c6921ec0bc28e60 SHA512 27d51f70406812efad10cc099a3c9cabb21f98db4bc718ec14269bea564059be40e691210537cb5609708e1ba318fb485a8e02317a34c20106b2b826200ad79f
-DIST openimageio-1.3.5.tar.gz 13472488 BLAKE2B 2bd6985b338cc6ec4951d372c613aa79b10571b4a0f901f16ce34ecc9c03394aaa25de42b9e1a2e29f4c6f3a68694ee54788e766a2aaa6b5b782a6fd94cf5d22 SHA512 15c4a53ab4d139839da9e9b4bbbf8ad6e00da98e73e0373cec136ce8f54b0ceae0daa2b1680c8ddab49e1680825a08be7778a9f1b7a13dd30e020b8a8c517b95
DIST openimageio-1.6.13.tar.gz 24846132 BLAKE2B a72b7756257d4ffd1567efd73c24bf65fc2bffff82c96c18a77211e918323e65e1c99076e272b3b77115ca30910ea4cfced222892b062e339d8e4e85bd2221f7 SHA512 8cd490b6d6a3c0b542c4bcab709897c5f35ce6844ce7465e0158ac52a1b108603ccc76439f7f2e46af2ec08be4293bda6a76ec68a959026af70a444cbbdc21d6
DIST openimageio-1.6.18.tar.gz 24881550 BLAKE2B debd5624cf91a087cb73b88047767fe1915a5c52bf27bf3fb60b14abb572e980ea039d2626818c6b99cc5d596892aec0693226cabdc74cc2620f8221d7358f89 SHA512 b94429b77263e00c33fa79fcae1b444eab01937f6dc77168b31249204de9a31c17765a8b41bec2f7d53c3d03512ba151001607bd719cb1861a3f0231a1865d51
DIST openimageio-1.7.17.tar.gz 27164765 BLAKE2B 8245c2573577ad681753db0cad16dfd806e869ff1f443997bcf39d9a6474c585c749e9ff26bce5f23b9d42ef035bf8ce519374261a21ca0e3c4e7e13809f1a6b SHA512 c5ee9173d3acc24a5045e6ac97657d4bf0c5ac1d3250497db51b8bd9e27e2fc48979eba3598635eb6053b87748f8827be2d2831d425459a41c893e6cb43bce94
-EBUILD openimageio-1.3.5.ebuild 2751 BLAKE2B 906669397274921918f70ab582cd8b493ba2cf953b9b0efd3a878ffac352462b52bbf5ad75cadf88af105e0535fd6c3899aa247fd808af43a9847cbc742c607b SHA512 27bd18128ca8728ba14f6bb4efebc95d0fc4d8beb3b3fc761d9911eece4bc0f0111b22aaf323182d39b7f40c3437839df4e9d8ecf620c34b2c97f4ec4bce7265
-EBUILD openimageio-1.6.13.ebuild 2466 BLAKE2B 7273dfa5a76b39e7aaa7a9e6bfbda3c2de387d8c6c6e78605dd94b95342384b6c02242319df25e6eb927744e8d623c452b892ff509ac33904df13e840fe8c21b SHA512 3f9d4b34e90248b6bd8b8d0d2f631974d00af19dee7a232d025deba7919c549386644ba4c3959ed6f70a9442e180afdf181def470cf4dde8b037ac672390ee54
-EBUILD openimageio-1.6.18.ebuild 2965 BLAKE2B b090ec9bad08a9989363012a212fc781e44cce2877fb00bda995ff6076ce863255c913487c6a1a373dc41e8ec40af83ab741f749661b566201f0975d22b2ad01 SHA512 8de65e7d4a338ae771cefda91e48f0a90a2bf094e257ff7cf20c16fcd96e1f9e78c697be0005fafaadebf024d17fe89398a80bc10fea89a48a0e70e7ac077732
-EBUILD openimageio-1.7.17.ebuild 2964 BLAKE2B f9e01b2eaed873edd5935e01beb6c4149a5934b0a00ae8b949ce22a502577d790f86de147406e206ffd0ba12a8d0f0bbf4d070b876c08ad2b4c62baa624fe556 SHA512 a4a625449eb2737072760c8d00413d2193b7ddd3a70b5eeff1fb2e9daec31c6884635a0e6e49b61c65a3ebe83df118f29153464232cdae13cb0697404575a3c1
-MISC metadata.xml 993 BLAKE2B 5a252fa4f9f3fc0de4cfebaf1b4fe00e48943f018f1860c35d189e1ce78e995371a25ee6c9366fcc5e0d6d1d0e09144973c2c44b418002fd8e0badeafa0921a6 SHA512 71a43980fef699fcf83ff6a9773a8f10c33b87fe40ff0a3540052f79cf130eb71a0ad18f97247ca6ac9355a9dcf3d847e7df0822e775dd9877f5d2501733917f
+DIST openimageio-1.8.7.tar.gz 27658771 BLAKE2B 4fe680eacbcca8b6ac6f9f94ef68e4d8a118b5ad58bb7f7091f2800c6b8fa1ad0c2c125c76ca025e956e92c04dbf5e6e0cecb48e1f29feffd804b97abcd61678 SHA512 d31e2790798959572f02de26111805b4bb5a26f73252d2f222f749e867354ca93e292738c04a36769f08c35d9b26605d1fdf66d96b2de5928d8e726bb819e963
+EBUILD openimageio-1.6.13.ebuild 2381 BLAKE2B b8a5ff95b6acc88f1de5d12e113e9812b56f5330ee677fe470650f4077635d667071090226a51762d5c1c2e55bbae928b3c9583a8b9ae56b333ed4c16ae5b931 SHA512 e3b005728837a83100594e4fbce4ce18e5af8e24b5addb0023c0da4cc45cff66a42fd551960d6a13bc2e8342e234e5eb8f53a318cbd44a32264e57ef633f5e78
+EBUILD openimageio-1.6.18.ebuild 2884 BLAKE2B 5402981510f3886fd9a143403bacc084703c6a3898319d8f61b124111e26084bdabcb5d8cb0e085cf745d66e9e8d20a68c06ad9382319482fca17a59fd3f2ee4 SHA512 6b07dd2e6239aa9c86f1b2d7dd548dbc6501e06d41c184e99dfbf400a06bd0e4c3a02d54999017e44522c50b069e94d3539d57dce78937f84bb5fcd43a97a970
+EBUILD openimageio-1.7.17.ebuild 2947 BLAKE2B e3acdfbdc35099f771713866210a32a5dbb461a5c38f9a7351f65e2e12b168cf5d314f2a71b324f2577acaa427bdfa97f79424bc16433646c50733474ab57b86 SHA512 5237f675425d64a87a15d09b23c1f335d57f7a230f9c823bf823b0d0ea81e91f46490c591b60366bc98ec7f748b1ab7ab172187ff65d9affaa922a23ac34635a
+EBUILD openimageio-1.8.7.ebuild 2936 BLAKE2B bb57729c82e47998ff76ce112dca5d63950ae4e3c02b93ae8b3c57aef4d5af69ed8984318306c6ad38c66cf735cb856de7d1281d2880307d887656ce2eac6cac SHA512 d96f0ce9f748da35447758b6c1c9d38dff61ffc7d7823887cf8f5b8a97a282fc4a6237793905a7fc5b20ddeb69a6a8eb527600210a292d673d942625f45a0bb6
+MISC metadata.xml 940 BLAKE2B 540f2e00e2790b5e1ec7af2f9165d8a911151c9c9d2d6dbaa80f697ae91fcfe4889ec68141ed18a321550f7b9a3a14a306de5199e3cd603f4f6b5a019005f815 SHA512 ff5c1d96b3de7d144f2cd7bcf55c9953e7e385717ad49d009adef1e21ffa32843350a71f98210b724fb74af916be98eb4f5d2927c58b4a848efbffd85f39d933
diff --git a/media-libs/openimageio/files/openimageio-1.3.5-openexr-2.x.patch b/media-libs/openimageio/files/openimageio-1.3.5-openexr-2.x.patch
deleted file mode 100644
index 0668f0466a9a..000000000000
--- a/media-libs/openimageio/files/openimageio-1.3.5-openexr-2.x.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-There is no IlmBaseConfig.h in OpenEXR 2.x
-
-../libOpenImageIO/libOpenImageIO.so.1.3.5: error: undefined reference to 'pthread_mutexattr_init'
-../libOpenImageIO/libOpenImageIO.so.1.3.5: error: undefined reference to 'pthread_mutexattr_settype'
-../libOpenImageIO/libOpenImageIO.so.1.3.5: error: undefined reference to 'pthread_mutexattr_destroy'
-../libOpenImageIO/libOpenImageIO.so.1.3.5: error: undefined reference to 'pthread_spin_lock'
-../libOpenImageIO/libOpenImageIO.so.1.3.5: error: undefined reference to 'pthread_spin_unlock'
-../libOpenImageIO/libOpenImageIO.so.1.3.5: error: undefined reference to 'pthread_spin_destroy'
-../libOpenImageIO/libOpenImageIO.so.1.3.5: error: undefined reference to 'pthread_spin_init'
-../libOpenImageIO/libOpenImageIO.so.1.3.5: error: undefined reference to 'pthread_detach'
-
---- src/cmake/modules/FindIlmBase.cmake
-+++ src/cmake/modules/FindIlmBase.cmake
-@@ -176,17 +176,11 @@
- set (ILMBASE_CACHED_STATE ${ILMBASE_CURRENT_STATE}
- CACHE INTERNAL "State last seen by FindIlmBase.cmake" FORCE)
-
--# Link with pthreads if required
--if (NOT WIN32 AND EXISTS ${ILMBASE_INCLUDE_DIR}/OpenEXR/IlmBaseConfig.h)
-- file (STRINGS ${ILMBASE_INCLUDE_DIR}/OpenEXR/IlmBaseConfig.h
-- ILMBASE_HAVE_PTHREAD
-- REGEX "^[ \\t]*#define[ \\t]+HAVE_PTHREAD[ \\t]1[ \\t]*\$"
-- )
-- if (ILMBASE_HAVE_PTHREAD)
-- find_package (Threads)
-- if (CMAKE_USE_PTHREADS_INIT)
-- set (ILMBASE_PTHREADS ${CMAKE_THREAD_LIBS_INIT})
-- endif ()
-+# Always link to pthreads for OpenEXR 2.x
-+if (NOT WIN32)
-+ find_package (Threads)
-+ if (CMAKE_USE_PTHREADS_INIT)
-+ set (ILMBASE_PTHREADS ${CMAKE_THREAD_LIBS_INIT})
- endif ()
- endif ()
-
diff --git a/media-libs/openimageio/metadata.xml b/media-libs/openimageio/metadata.xml
index 935e4012defd..27cefe35ec56 100644
--- a/media-libs/openimageio/metadata.xml
+++ b/media-libs/openimageio/metadata.xml
@@ -20,7 +20,6 @@
<flag name="ptex" restrict="&gt;=media-libs/openimageio-1.6.18">
Use <pkg>media-libs/ptex</pkg>
</flag>
- <flag name="tbb">Use <pkg>dev-cpp/tbb</pkg></flag>
</use>
<upstream>
<remote-id type="github">OpenImageIO/oiio</remote-id>
diff --git a/media-libs/openimageio/openimageio-1.3.5.ebuild b/media-libs/openimageio/openimageio-1.3.5.ebuild
deleted file mode 100644
index db5c150d4757..000000000000
--- a/media-libs/openimageio/openimageio-1.3.5.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils eutils multilib python-single-r1 vcs-snapshot
-
-DESCRIPTION="A library for reading and writing images"
-HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
-SRC_URI="https://github.com/OpenImageIO/oiio/archive/Release-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-IUSE="gif jpeg2k colorio opencv opengl python qt4 ssl tbb +truetype"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RESTRICT="test" #431412
-
-RDEPEND="
- dev-libs/boost:=
- dev-libs/pugixml:=
- media-libs/glew:=
- media-libs/ilmbase:=
- media-libs/libpng:0=
- >=media-libs/libwebp-0.2.1:=
- media-libs/openexr:=
- media-libs/tiff:0=
- sci-libs/hdf5
- sys-libs/zlib:=
- virtual/jpeg:0
- gif? ( media-libs/giflib )
- jpeg2k? ( >=media-libs/openjpeg-1.5:0= )
- colorio? ( >=media-libs/opencolorio-1.0.7:= )
- opencv? (
- >=media-libs/opencv-2.3:=
- python? ( >=media-libs/opencv-2.4.8[python,${PYTHON_USEDEP}] )
- )
- opengl? (
- virtual/glu
- virtual/opengl
- )
- python? (
- ${PYTHON_DEPS}
- dev-libs/boost:=[python,${PYTHON_USEDEP}]
- )
- qt4? (
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- dev-qt/qtopengl:4
- )
- ssl? ( dev-libs/openssl:0 )
- tbb? ( dev-cpp/tbb )
- truetype? ( media-libs/freetype:2= )"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${P}/src
-PATCHES=( "${FILESDIR}"/${P}-openexr-2.x.patch )
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- cmake-utils_src_prepare
-
- # remove bundled code to make it build
- # https://github.com/OpenImageIO/oiio/issues/403
- rm */pugixml* || die
-
- # fix man page building
- # https://github.com/OpenImageIO/oiio/issues/404
- use qt4 || sed -i -e '/list.*APPEND.*cli_tools.*iv/d' doc/CMakeLists.txt
-
- use python && python_fix_shebang .
-}
-
-src_configure() {
- local mycmakeargs=(
- -DLIB_INSTALL_DIR="/usr/$(get_libdir)"
- -DBUILDSTATIC=OFF
- -DLINKSTATIC=OFF
- $(use python && echo -DPYLIB_INSTALL_DIR="$(python_get_sitedir)")
- -DUSE_EXTERNAL_PUGIXML=ON
- -DUSE_FIELD3D=OFF # missing in Portage
- -DOIIO_BUILD_TESTS=OFF # as they are RESTRICTed
- -DSTOP_ON_WARNING=OFF
- $(cmake-utils_use_use truetype freetype)
- $(cmake-utils_use_use colorio OCIO)
- $(cmake-utils_use_use opencv)
- $(cmake-utils_use_use opengl)
- $(cmake-utils_use_use jpeg2k OPENJPEG)
- $(cmake-utils_use_use python)
- $(cmake-utils_use_use qt4 QT)
- $(cmake-utils_use_use tbb)
- $(cmake-utils_use_use ssl OPENSSL)
- $(cmake-utils_use_use gif)
- )
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- rm -rf "${ED}"/usr/share/doc
- dodoc ../{CHANGES,CREDITS,README*} # doc/CLA-{CORPORATE,INDIVIDUAL}
- docinto pdf
- dodoc doc/*.pdf
-}
diff --git a/media-libs/openimageio/openimageio-1.6.13.ebuild b/media-libs/openimageio/openimageio-1.6.13.ebuild
index d1f065679aee..f7a101f8a20c 100644
--- a/media-libs/openimageio/openimageio-1.6.13.ebuild
+++ b/media-libs/openimageio/openimageio-1.6.13.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/OpenImageIO/oiio/archive/Release-${PV}.tar.gz -> ${P
LICENSE="BSD"
SLOT="0"
KEYWORDS="amd64 ~ppc64 x86"
-IUSE="colorio ffmpeg gif jpeg2k opencv opengl python qt4 raw ssl +truetype"
+IUSE="colorio ffmpeg gif jpeg2k opencv opengl python raw ssl +truetype"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
RESTRICT="test" #431412
@@ -45,12 +45,6 @@ RDEPEND="
${PYTHON_DEPS}
dev-libs/boost:=[python,${PYTHON_USEDEP}]
)
- qt4? (
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- dev-qt/qtopengl:4
- media-libs/glew:=
- )
raw? ( media-libs/libraw:= )
ssl? ( dev-libs/openssl:0 )
truetype? ( media-libs/freetype:2= )"
@@ -91,7 +85,7 @@ src_configure() {
-DUSE_OPENSSL=$(usex ssl)
-DUSE_PYTHON=$(usex python)
-DUSE_LIBRAW=$(usex raw)
- -DUSE_QT=$(usex qt4)
+ -DUSE_QT=OFF # Deprecated
)
if [[ ${EPYTHON} == python3* ]]; then
diff --git a/media-libs/openimageio/openimageio-1.6.18.ebuild b/media-libs/openimageio/openimageio-1.6.18.ebuild
index 874a927f7b8d..7f5f2086dbf8 100644
--- a/media-libs/openimageio/openimageio-1.6.18.ebuild
+++ b/media-libs/openimageio/openimageio-1.6.18.ebuild
@@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~ppc64 ~x86"
X86_CPU_FEATURES=( sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2 )
CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
-IUSE="colorio doc ffmpeg field3d gif jpeg2k opencv opengl ptex python qt4 raw ssl +truetype ${CPU_FEATURES[@]%:*}"
+IUSE="colorio doc ffmpeg field3d gif jpeg2k opencv opengl ptex python raw ssl +truetype ${CPU_FEATURES[@]%:*}"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
RESTRICT="test" #431412
@@ -30,7 +30,7 @@ RDEPEND="dev-libs/boost:=
media-libs/openexr:=
media-libs/tiff:0=
sys-libs/zlib:=
- virtual/jpeg:=
+ virtual/jpeg:0
colorio? ( media-libs/opencolorio:0= )
ffmpeg? ( media-video/ffmpeg:0= )
field3d? ( media-libs/Field3D )
@@ -46,12 +46,6 @@ RDEPEND="dev-libs/boost:=
${PYTHON_DEPS}
dev-libs/boost:=[python,${PYTHON_USEDEP}]
)
- qt4? (
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- dev-qt/qtopengl:4
- media-libs/glew:=
- )
raw? ( media-libs/libraw:0= )
ssl? ( dev-libs/openssl:0= )
truetype? ( media-libs/freetype:2= )"
@@ -101,8 +95,8 @@ src_configure() {
-DUSE_OPENSSL=$(usex ssl)
-DUSE_PTEX=$(usex ptex)
-DUSE_PYTHON=$(usex python)
- -DUSE_QT=$(usex qt4)
- -DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")"
+ -DUSE_QT=OFF # Deprecated
+ -DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
)
cmake-utils_src_configure
diff --git a/media-libs/openimageio/openimageio-1.7.17.ebuild b/media-libs/openimageio/openimageio-1.7.17.ebuild
index 20a3d9542038..163f0a64e763 100644
--- a/media-libs/openimageio/openimageio-1.7.17.ebuild
+++ b/media-libs/openimageio/openimageio-1.7.17.ebuild
@@ -20,7 +20,7 @@ X86_CPU_FEATURES=(
)
CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
-IUSE="colorio doc ffmpeg field3d gif jpeg2k opencv opengl ptex python qt4 raw ssl +truetype ${CPU_FEATURES[@]%:*}"
+IUSE="colorio doc ffmpeg field3d gif jpeg2k libressl opencv opengl ptex python raw ssl +truetype ${CPU_FEATURES[@]%:*}"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
RESTRICT="test" #431412
@@ -33,7 +33,7 @@ RDEPEND=">=dev-libs/boost-1.62:=
>=media-libs/openexr-2.2.0-r2:=
media-libs/tiff:0=
sys-libs/zlib:=
- virtual/jpeg:=
+ virtual/jpeg:0
colorio? ( media-libs/opencolorio:= )
ffmpeg? ( media-video/ffmpeg:= )
field3d? ( media-libs/Field3D:= )
@@ -49,14 +49,11 @@ RDEPEND=">=dev-libs/boost-1.62:=
${PYTHON_DEPS}
dev-libs/boost:=[python,${PYTHON_USEDEP}]
)
- qt4? (
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- dev-qt/qtopengl:4
- media-libs/glew:=
- )
raw? ( media-libs/libraw:= )
- ssl? ( dev-libs/openssl:0= )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )
truetype? ( media-libs/freetype:2= )"
DEPEND="${RDEPEND}
doc? ( app-doc/doxygen[latex] )"
@@ -105,8 +102,8 @@ src_configure() {
-DUSE_OPENSSL=$(usex ssl)
-DUSE_PTEX=$(usex ptex)
-DUSE_PYTHON=$(usex python)
- -DUSE_QT=$(usex qt4)
- -DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")"
+ -DUSE_QT=OFF # Deprecated
+ -DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
)
cmake-utils_src_configure
diff --git a/media-libs/openimageio/openimageio-1.8.7.ebuild b/media-libs/openimageio/openimageio-1.8.7.ebuild
new file mode 100644
index 000000000000..1c69cf3c6d6a
--- /dev/null
+++ b/media-libs/openimageio/openimageio-1.8.7.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit cmake-utils vcs-snapshot python-single-r1
+
+DESCRIPTION="A library for reading and writing images"
+HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
+SRC_URI="https://github.com/OpenImageIO/oiio/archive/Release-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+X86_CPU_FEATURES=(
+ sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
+ avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
+)
+CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
+
+IUSE="colorio doc ffmpeg field3d gif jpeg2k libressl opencv opengl ptex python qt5 raw ssl +truetype ${CPU_FEATURES[@]%:*}"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RESTRICT="test" #431412
+
+RDEPEND=">=dev-libs/boost-1.62:=
+ dev-libs/pugixml:=
+ >=media-libs/ilmbase-2.2.0-r1:=
+ media-libs/libpng:0=
+ >=media-libs/libwebp-0.2.1:=
+ >=media-libs/openexr-2.2.0-r2:=
+ media-libs/tiff:0=
+ sys-libs/zlib:=
+ virtual/jpeg:0
+ colorio? ( media-libs/opencolorio:= )
+ ffmpeg? ( media-video/ffmpeg:= )
+ field3d? ( media-libs/Field3D:= )
+ gif? ( media-libs/giflib:0= )
+ jpeg2k? ( >=media-libs/openjpeg-1.5:0= )
+ opencv? ( media-libs/opencv:= )
+ opengl? (
+ virtual/glu
+ virtual/opengl
+ media-libs/glew:=
+ )
+ ptex? ( media-libs/ptex:= )
+ python? (
+ ${PYTHON_DEPS}
+ dev-libs/boost:=[python,${PYTHON_USEDEP}]
+ )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ opengl? ( dev-qt/qtopengl:5 )
+ )
+ raw? ( media-libs/libraw:= )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )
+ truetype? ( media-libs/freetype:2= )"
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen[latex] )"
+
+DOCS=( CHANGES.md CREDITS.md README.md src/doc/${PN}.pdf )
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+ # Build with SIMD support
+ local cpufeature
+ local mysimd=()
+ for cpufeature in "${CPU_FEATURES[@]}"; do
+ use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
+ done
+
+ # If no CPU SIMDs were used, completely disable them
+ [[ -z ${mysimd} ]] && mysimd=("0")
+
+ local mycmakeargs=(
+ -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
+ -DINSTALL_DOCS=$(usex doc)
+ -DOIIO_BUILD_TESTS=OFF # as they are RESTRICTed
+ -DSTOP_ON_WARNING=OFF
+ -DUSE_CPP14=ON
+ -DUSE_EXTERNAL_PUGIXML=ON
+ -DUSE_FFMPEG=$(usex ffmpeg)
+ -DUSE_FIELD3D=$(usex field3d)
+ -DUSE_FREETYPE=$(usex truetype)
+ -DUSE_GIF=$(usex gif)
+ -DUSE_JPEGTURBO=ON
+ -DUSE_LIBRAW=$(usex raw)
+ -DUSE_NUKE=NO # Missing in Gentoo
+ -DUSE_NUKE=OFF
+ -DUSE_OCIO=$(usex colorio)
+ -DUSE_OPENCV=$(usex opencv)
+ -DUSE_OPENGL=$(usex opengl)
+ -DUSE_OPENJPEG=$(usex jpeg2k)
+ -DUSE_OPENSSL=$(usex ssl)
+ -DUSE_PTEX=$(usex ptex)
+ -DUSE_PYTHON=$(usex python)
+ -DUSE_QT=$(usex qt5)
+ -DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
+ )
+
+ cmake-utils_src_configure
+}
diff --git a/media-libs/openjpeg/Manifest b/media-libs/openjpeg/Manifest
index 4c00f952917b..9fd7465f3c12 100644
--- a/media-libs/openjpeg/Manifest
+++ b/media-libs/openjpeg/Manifest
@@ -6,10 +6,10 @@ DIST openjpeg-2.3.0.tar.gz 2207329 BLAKE2B b03ddb02127cc85e647cbda11423f63f2caa0
DIST openjpeg-data_20160921.tar.gz 401771303 BLAKE2B f3ce2f4614a5ae19bed58dd46d1eb5855130b339d715893cd30cd2517c8ce12240d28a4ede046b82e6e0c34d199f6e3413f4f81965bbcf5ea9f6bcf5417818ce SHA512 58521c14f49c546b24a0c7b17ebdb3dfecf6ffdcc814b3c59a79a1325e5adf88047b2bd8a4ae608c5d106b584f08efc4e6c66f03254119763e01abee2da7d027
DIST openjpeg-data_20170809.tar.gz 497454555 BLAKE2B dba7ded4a19f0139c1ad7e716930a7211d24bfb8d0e4387e171172406dd4df8a3a80b535f3df35f0592cac989456d45ebb345b8febc85a52c8eac5020fe50c48 SHA512 7beb0cb944764b526ed7a011ba0c72768e22516950f337f1df713fa6949b1255e800933aebffde81c6ebeedd32050b7d5627112e44bf7d24cab75274c59d7d49
DIST openjpeg-data_20170814.tar.gz 497454197 BLAKE2B ea27ab763e685724dfd5c2242a93d9b93111a0516ea7a8aef9f37ec31b00cc887d84d4d0bf7f79f3636aa0ea9a0302f43df4596fc967c243a8773ccde6e79fe0 SHA512 a13c941839f0d3f3a71b3f5b36d6c2ddb789e765526ebb6aed99150991bb717363e3ce40f335451a983d44a0b047538e0870d0fe5b37d6a002497eb99a403e24
-EBUILD openjpeg-1.5.2-r1.ebuild 2004 BLAKE2B 171fddd8465100dacb006b35414347dd9435d8a7bfff017002d5681e5776ba1cb803087a77088a4c4987fd50d0a9f793993ef5a61203fa2284a002442509426b SHA512 83b3e453f73185ff359e930e33a37833f9391644a894c4a5b545de2a648aeff2d6279bd9f4196c88500a130ffd8b5948ff457de79444ee8fabca81bb1c1530ef
-EBUILD openjpeg-1.5.2.ebuild 1999 BLAKE2B a93f89e9dcf1a15b4db84da050fe2f3299df32ad8aca0ea540a2446218230e1403dbc26a39f7c1aa9b89448539388d614939abe38d6169d01fd766931f0e2e44 SHA512 f1e7193be4a303555803a90d54dff3da1c1d6bd396b7ef4b329ce677d914a0f5ec25cf874dc2a016ca32b4f770a0e6b2f06d193df8e97299f8610f7774af719d
-EBUILD openjpeg-2.1.1_p20160922.ebuild 4104 BLAKE2B b7a1ece07efda5c9fd71a7579087fb071540c8a69f2c73262f8e6b764a0337874c0d2e43a7136ca95c33a22b08950bea4067153f48b408a21c837f3af92cb32f SHA512 3759a99a8846e7bd48dca6479dc2f5d8c3a6e289c0e0facbfb09b5c0fe8f61a7c56a44510837d9229b7d0e4f437a2bec3cf0abb7fe54b7c946ed069e8f97f1c1
-EBUILD openjpeg-2.1.2.ebuild 4013 BLAKE2B 997390fc5acd50f60df245a4d3a96c962458a29780e43aef548db1130abe7afb4bef8d3118aa29de5db41351fca58e095bcd535208fe2e5b090e68b97022d313 SHA512 b25b772e1dba9af812d82d1a416c7bbd025ccf699e72999fa8d7df45871417bc716436b81a4ce6917b359e3edb95571f58deb70dd49f2bf3889157d91a6ce688
-EBUILD openjpeg-2.2.0.ebuild 4008 BLAKE2B f24ca1b7d00645eae086e0b4bac475013497634f1b579c3764f115aa9f664a42e75b9649a0b0d55528a121bece04f5eae31a25affe7eb68ccae6ccf79f15a5e6 SHA512 67d000a44837aa623b08d95b66a14b1f6a95ba4e03729fec93eabd983295ac9bfe14b2a2f107b047095203598826bd9c9e7936d4737f1fc11bc86fce60f8066a
-EBUILD openjpeg-2.3.0.ebuild 4123 BLAKE2B 055c26ace299d0f9d05da8ecfe49fce1275dfb6565902e00593d6154ada14b89f748c708eb35df85dff854166076367b57c0e910b5f6a0694470b7947df8ad4e SHA512 79638cee72d7e0999af5cb117de7310cf3def54fe47b0c06e9d0d8738beb21fe9cf69bcf170af0ed978ee36f4221239cdb98fa7e683dcbeba0a0fa31548d4366
+EBUILD openjpeg-1.5.2-r1.ebuild 1992 BLAKE2B 8cc839bd75ddfad70068673a75b9ba74701ea52ace5990d83f680a4a27ef09f2c89814e538175f328709cacbbeac9faa7d9445753d56898caaae01d5b73a1069 SHA512 b2e9e487f819fc3bd4ece6788cc9c08bac3c6bdcc8e316cb38847f1839245b23f01eff29f81cf23eda767efe4e9f2480605c3c95ede38ac246fe0c3c64244eb6
+EBUILD openjpeg-1.5.2.ebuild 1987 BLAKE2B db3baed20766524d12687b9e444197c09ec49ac7937ad0deeb83f1f5a6367dbb81d44a7dedd172357a1ef188fe5823542ed6cdcbdd068b7d9f2e54f76408a981 SHA512 64f90025e0c15e7b90e2528ff96c6a18cb0e67a082e354ab994f076ed4c8d492a5e266e76eca694dd0eac6731da918685099a5656f382673f1840bde4179f65f
+EBUILD openjpeg-2.1.1_p20160922.ebuild 4092 BLAKE2B 85ab13d0633af394100d407c6eff373f2b9f39d3327695dd9d2680091ed692219167c4055570956c1885345905fe76101903fedd0d8d6c1db883ed998e0f1a11 SHA512 5090949204cbfe463f34440337e62508ac90540ba68891dd3654f4e2ddeec320b5395db5e179866ade6a035ed7d9604b8a429bd74f9692e2322ecdfef8b16a83
+EBUILD openjpeg-2.1.2.ebuild 4001 BLAKE2B c44c16ca3332ec81f9cb6eb4cf453fc73d37a56a0a863f1a06d273c6b1f5902c6e0a9f720180176379dc3e1a0104dc5773e48781bc483478d2573f27a805f961 SHA512 a35adf52d35c9dedede2578adc0a28768166fefa8ef5221b09cb1197c788a50288d19962a48793bb5352c0bfc36cc905468d62c72a53a55f5328b3b6740eab90
+EBUILD openjpeg-2.2.0.ebuild 3996 BLAKE2B 0b371bcec49e8cb58c7bdf9f652b4e955d8e3a5b166741032b4068de708f9c1346da53ed5df02ee4a8b834dc571d710be2a2bb7608574d422399e11437efcd21 SHA512 b4a73b2ac624e9488a0d03da236bd28ca79664eb8b66fba77f996ad7f76c4f8f1a8e23423c84e4e85e1b676a0c4a65c6d7e29cc7fd567c489c5f332c74446575
+EBUILD openjpeg-2.3.0.ebuild 4111 BLAKE2B 377fb0dae725fe265a356a0bdcd08ce5303d264198b20491fd3584437d1968fc5f9c6a1add469702601e1cbe5c12af673e889152aac9448bb7ccf693bb4ab56a SHA512 ca71685f5185d52a766946e08d2664362f7a16bc53dadfe9d9c1dc66a574e5b15501c702d31af9c218ec78dc1044c47893285749f0605903306c601b04e845c8
MISC metadata.xml 455 BLAKE2B ee0da6c575d6fd05b1aa361cb11e09eaffc18f24f57010a66c31127bd1e55073262c1c0789f07779ef864d6cb27670e8653c6b1269681b5b6497185b5d0583aa SHA512 b956f115708b8afff16126117cacfa9bb51fb55660e19cb6b295081d81790c5c6e8858bc28193f3d9a5b0da66189490938c83c32124e33dedb37ea4a8c8ef99d
diff --git a/media-libs/openjpeg/openjpeg-1.5.2-r1.ebuild b/media-libs/openjpeg/openjpeg-1.5.2-r1.ebuild
index d18ff016351f..0f2a1158f9a5 100644
--- a/media-libs/openjpeg/openjpeg-1.5.2-r1.ebuild
+++ b/media-libs/openjpeg/openjpeg-1.5.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}.mirror/${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0/5" # based on SONAME
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc static-libs test"
RDEPEND="media-libs/lcms:2=
diff --git a/media-libs/openjpeg/openjpeg-1.5.2.ebuild b/media-libs/openjpeg/openjpeg-1.5.2.ebuild
index 91e87da6e58f..929ae7fa4767 100644
--- a/media-libs/openjpeg/openjpeg-1.5.2.ebuild
+++ b/media-libs/openjpeg/openjpeg-1.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}.mirror/${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0/5" # based on SONAME
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc static-libs test"
RDEPEND="media-libs/lcms:2=
diff --git a/media-libs/openjpeg/openjpeg-2.1.1_p20160922.ebuild b/media-libs/openjpeg/openjpeg-2.1.1_p20160922.ebuild
index 7f5bbd95c5a6..38028f5227e8 100644
--- a/media-libs/openjpeg/openjpeg-2.1.1_p20160922.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.1.1_p20160922.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/uclouvain/${PN}/archive/${MY_P_COMMIT}.tar.gz -> ${P
LICENSE="BSD-2"
SLOT="2/7" # based on SONAME
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc static-libs test"
RDEPEND="media-libs/lcms:2=
diff --git a/media-libs/openjpeg/openjpeg-2.1.2.ebuild b/media-libs/openjpeg/openjpeg-2.1.2.ebuild
index 38944c8dc6fb..bffdb98ee645 100644
--- a/media-libs/openjpeg/openjpeg-2.1.2.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
LICENSE="BSD-2"
SLOT="2/7" # based on SONAME
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc static-libs test"
RDEPEND="media-libs/lcms:2=
diff --git a/media-libs/openjpeg/openjpeg-2.2.0.ebuild b/media-libs/openjpeg/openjpeg-2.2.0.ebuild
index bacb56b8b37d..97799c976dd9 100644
--- a/media-libs/openjpeg/openjpeg-2.2.0.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
LICENSE="BSD-2"
SLOT="2/7" # based on SONAME
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc static-libs test"
RDEPEND="media-libs/lcms:2=
diff --git a/media-libs/openjpeg/openjpeg-2.3.0.ebuild b/media-libs/openjpeg/openjpeg-2.3.0.ebuild
index 4bb165d93fb2..67d0d09f8ad8 100644
--- a/media-libs/openjpeg/openjpeg-2.3.0.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
LICENSE="BSD-2"
SLOT="2/7" # based on SONAME
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc static-libs test"
RDEPEND="media-libs/lcms:2=
diff --git a/media-libs/tiff/Manifest b/media-libs/tiff/Manifest
index 6d9a023f262e..e442f31a6904 100644
--- a/media-libs/tiff/Manifest
+++ b/media-libs/tiff/Manifest
@@ -14,7 +14,7 @@ AUX tiff-4.0.7-pdfium-0021-oom-TIFFFillStrip.patch 1228 BLAKE2B ca3babb8a10c96ec
DIST tiff-3.9.7.tar.gz 1468097 BLAKE2B 303339acf9bb48558695b13fcc2b41acacbbf2ce6d2ec497067761895cb2de7674108e8ca2f35f845dcd2e45801777fe25d234af1c308acf59846c2f5617ab53 SHA512 ca89584a9ffa33b4986e4bc2165043cec239896f1f0ab73db00818d0442b570efaa6345b2ed422e884202324d359713df849bf14782bb0cf3b959655febddd77
DIST tiff-4.0.8.tar.gz 2065574 BLAKE2B b9ece26d3549836d2cbbce1b90ce724a6eae51adae0abbd6193942ced8be965df63d1aa8e774b83d9ae689e5d08033705ef62b77276b40c34913cd535caa72b9 SHA512 5d010ec4ce37aca733f7ab7db9f432987b0cd21664bd9d99452a146833c40f0d1e7309d1870b0395e947964134d5cfeb1366181e761fe353ad585803ff3d6be6
DIST tiff-4.0.9.tar.gz 2305681 BLAKE2B 3de03408d2974b9f9f5f2444029cc3018ef43beb67e9fd21be68ee400cdcc6deca1247f055d880841a18b92284ce81f112682c8b5f083ddc61e5255d73a7de3f SHA512 04f3d5eefccf9c1a0393659fe27f3dddd31108c401ba0dc587bca152a1c1f6bc844ba41622ff5572da8cc278593eff8c402b44e7af0a0090e91d326c2d79f6cd
-EBUILD tiff-3.9.7-r1.ebuild 2084 BLAKE2B 729f896f2bbb1b502ada459db539b03bd628ea4f183a55e87295b9aadb4aae44d34748a4fe44a7e27829b73902431176bd544cdaba1c6ad96933a8cd6fc320bd SHA512 9204dbe59144189fc74619eb9cc87e3cc13bdefb00ff569ab1b7986e8f0112a94283febbceba27ad61cf265977c7cffd653844a86ff59b23446a0fff4740677e
-EBUILD tiff-4.0.8.ebuild 2631 BLAKE2B 7f60433b851f5e6f97da5251f94791019641fe891507e7785dc862aae0cb8166595d87ec12a07e8fbd6d626c646e06731d17056ff3913eddae5a0fae12119f99 SHA512 0f751cb980e6375726e3d1cf3747c2d36e48f2a6321972d82f54a7732fc92a8d671f673d5b78ed865c3a99f1192890178c6a8891863dce5cbed04b9309ee09b0
-EBUILD tiff-4.0.9.ebuild 2498 BLAKE2B 60706b627aa7833637e824c90532898447856abc57b5f30868d5d9f065875f416cd76da254b5d1d191e3232c35881f0b050da88b35072326e37e0dde782eeaf2 SHA512 731e3f99dc2f938513d243a4c1c86e92ff4abce397c719daf4f1b3e6e95350c8751dc7e4d1e06049b326f1b2d6a3790c5d51498ef516981a30d649f76a242972
+EBUILD tiff-3.9.7-r1.ebuild 2072 BLAKE2B 1a1fbd60077b9d98c591041006443f2074d78d86dc6e165b9ca0e8d8b1578ec7b4a610046a1bb3a5860dac17f7dcfc7da142ae7a4f15ea2ca388ded15e4c9d6e SHA512 735b3fc6b18d754463f0b3b7e8c4ce31c9bf66a89bc5f761dcf1a8cdad28e494107784dd1a49a496095e0eec3dfca792bb62632190a95c9cb9e5c4ced03e3336
+EBUILD tiff-4.0.8.ebuild 2619 BLAKE2B ea84c84c765588cd4e148e4f62f3182062532cea1ec5a1460bf0fc0be286df2619b6daabbe999ba9446d4d4e9f16e6d8d8197e6696b6952d3593e9c5a2db48c3 SHA512 c2754d6d0a097319f2b1ac9122e16ec2e0f25ddd434f4158f806631670cfa00a9a5a838cb50fb9336d70e0baa54c6cfabaec9fe7380c65fb0f58e65dc0a39900
+EBUILD tiff-4.0.9.ebuild 2486 BLAKE2B 39a931e22b9cc13b7ca8a863ddfa07e5812a3299465799b0bd156b044edb3154cb94a6d4cfe11cb1a3ff09a99df5d19485fd4f606a0072a898e848b3be0cba90 SHA512 fc596b278c56d07fa5f58a053528f73d4486935a3783d4d1653f0d83bd891697b70a9e0fc3098c419dc34a9f674398299037ea47870eed9d596a98109ff7f4c5
MISC metadata.xml 565 BLAKE2B 3d487835599974795ba6007439bf1d08756ab1c5dbe191509832b302f3199e4ffc05be64df3e26b4d4a1c11d1292c48cbb59ffa6e412831d16d7415e076f1062 SHA512 289043206dbb512c97e4bb703b32549ac4a77f40e212548b80ea865052b80fed9d4562f9fc94638fda54da9bc3e0c19ba303c027e66e7b75c772aeec91aebe6f
diff --git a/media-libs/tiff/tiff-3.9.7-r1.ebuild b/media-libs/tiff/tiff-3.9.7-r1.ebuild
index 66315663f5fe..a691fbf8fd05 100644
--- a/media-libs/tiff/tiff-3.9.7-r1.ebuild
+++ b/media-libs/tiff/tiff-3.9.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.remotesensing.org/pub/libtiff/${P}.tar.gz"
LICENSE="libtiff"
SLOT="3"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="+cxx jbig jpeg zlib"
RDEPEND="jpeg? ( >=virtual/jpeg-0-r2[${MULTILIB_USEDEP}] )
diff --git a/media-libs/tiff/tiff-4.0.8.ebuild b/media-libs/tiff/tiff-4.0.8.ebuild
index 6f8049841afe..238df3e4c9d5 100644
--- a/media-libs/tiff/tiff-4.0.8.ebuild
+++ b/media-libs/tiff/tiff-4.0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -11,7 +11,7 @@ SRC_URI="http://download.osgeo.org/libtiff/${P}.tar.gz
LICENSE="libtiff"
SLOT="0"
-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 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="+cxx jbig jpeg lzma static-libs test zlib"
RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
diff --git a/media-libs/tiff/tiff-4.0.9.ebuild b/media-libs/tiff/tiff-4.0.9.ebuild
index 403bd9768b40..cebe715adcac 100644
--- a/media-libs/tiff/tiff-4.0.9.ebuild
+++ b/media-libs/tiff/tiff-4.0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -11,7 +11,7 @@ SRC_URI="http://download.osgeo.org/libtiff/${P}.tar.gz
LICENSE="libtiff"
SLOT="0"
-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 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="+cxx jbig jpeg lzma static-libs test zlib"
RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )