gentoo resync : 14.07.2019

28 files changed, 728 insertions, 297 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index e8c1046984ec..269efb2f0fe9 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/avidemux-plugins/Manifest b/media-libs/avidemux-plugins/Manifest
index 4496c7ebbd7f..0ff5581a813a 100644
--- a/media-libs/avidemux-plugins/Manifest
+++ b/media-libs/avidemux-plugins/Manifest
@@ -1,5 +1,5 @@
 AUX avidemux-plugins-2.6.20-optional-pulse.patch 743 BLAKE2B e60a7433e539d49d5bff7dea62bfda984866dd72b93158827ee5ed785d77174db3fbde9e67c9c3fdc8d652485d8e704c075811c65848ef48f78490c6a3061b7f SHA512 dcec29c63aa7eb828fc1aaf4b54edb76290e3c7655b00002efa8036f0572b1c0111c30e873b925bb606e8e672e177ba8d103100b1fb55dcc830b83e4a5556710
 AUX avidemux-plugins-2.7.0-qt-5.11.patch 1664 BLAKE2B 080497a678e869e143eb350ecdca2b77d5e5906a8a469e24f16fc58853665791dbbd94880418b492df6816b8f420d54ee7ecd06c805b0aab16e8d05ab43f545d SHA512 49186e7648db60e081f78e1257ea788313cac6e991c995249701189ab344744f0c410203b39b49e5530a8dd33de937582099eb8b615d19fe7d0e3731254d535c
 DIST avidemux_2.7.0.tar.gz 21474504 BLAKE2B c6e55a0b5220d6d3746fa06162bf11253145fd28f2f6f744702d5e0342fba85e546a28883eb847139eadd34c94037ebc7d68f5576e7505a85288556468d14b96 SHA512 7c92213d3bd2849dbdb5a1aff2acd6da231fd76c561b756fbf4a1d5a41e9705d609d7a35b6ca6b77ceb3bf5138f861cd24ed16d8fcec4fd713f09a2ff07e9015
-EBUILD avidemux-plugins-2.7.0.ebuild 4873 BLAKE2B a9a95cea60229f38ac116166cb449f31c9035f6b59b7577d1ade5b19f4218b8977e89292583149284bb727048bb602b47e0a176bf586ca933b3c7c7b13f5c364 SHA512 5d5b7526d4857161530d3c969fed0bbb2eb8b44f073609447e6e62588cb8be137273971038dff24dd44fda8775ca07a0246db9be0c3e0f9661f1ca671096a822
+EBUILD avidemux-plugins-2.7.0.ebuild 4871 BLAKE2B ba2b03b69c02011be5930397b2229e4d51d3f8b350a31a12f923d50f11ba1008ce7d6ccac62d25d787fed704c1af2c08a4847c5fad8faa9fce14787bb09bb359 SHA512 99945e92b65aa422c701818763aee164fba1e3ab0b345f29266b8151d159d9b636ae8e0b23393fb6cba7fa5f81bed6e6e413e9da56ece76d94d641b73078cf18
 MISC metadata.xml 1313 BLAKE2B 931af633c34ab1bf1f45705ac5b6e2fd6ea3b3fa86dc870c404d29e7fbdb723f1f3d1bf60f051fd9ab30ac8ee83142c1082d0ca3994019d527c3b2f66884ed20 SHA512 26aa4c4bb69ea3d2b41c2f6b8147019b79d8b740690ac7381f28abbc51232e9340b007a53562e4b74ff8a46cbbdb6d9091b2d1981720f4bfe89656cbde28fb3d
diff --git a/media-libs/avidemux-plugins/avidemux-plugins-2.7.0.ebuild b/media-libs/avidemux-plugins/avidemux-plugins-2.7.0.ebuild
index 1c70e135cbf6..a2730251a4a4 100644
--- a/media-libs/avidemux-plugins/avidemux-plugins-2.7.0.ebuild
+++ b/media-libs/avidemux-plugins/avidemux-plugins-2.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -45,7 +45,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	amr? ( media-libs/opencore-amr:0 )
 	dcaenc? ( media-sound/dcaenc:0 )
 	dts? ( media-libs/libdca:0 )
-	fdk? ( media-libs/fdk-aac:0 )
+	fdk? ( media-libs/fdk-aac:0= )
 	fontconfig? ( media-libs/fontconfig:1.0 )
 	fribidi? ( dev-libs/fribidi:0 )
 	jack? (
diff --git a/media-libs/graphene/Manifest b/media-libs/graphene/Manifest
index c977b9037f3e..44bd69f6e354 100644
--- a/media-libs/graphene/Manifest
+++ b/media-libs/graphene/Manifest
@@ -1,5 +1,3 @@
-DIST graphene-1.8.2.tar.xz 127436 BLAKE2B a22251db7cf4719c8a6cde49e6feb0a998d1ec7296fee549a4797d72fa575d4266e48fb5a6d9ebd204b93954a6278b4fa88dc56e5f86d7cf8625a5edc685a09b SHA512 8d250dccac345251081419f4ad7079c8035cb6225e10b23d25799386b067288831c23be667d608228ef44a2f6107ac47fc86bb495eda7881b1336598d6c43234
 DIST graphene-1.8.6.tar.xz 127984 BLAKE2B 7f67b99796cca1a47324674b1871ddfbcce1193ded5f0a37c8c2894d52b6b5823b0fb1909018ea6adb90f7ed53ad6b09eeda9b1606a22a8b85cd0d661d500195 SHA512 ef6e9b5587bd540099216a7e3f7c86eb62368d49876dcd380c9767c6740c8267c9d510c5025dbe56402f3cd15084ef8fc634d3abe486b516f4f5328b87df277c
-EBUILD graphene-1.8.2.ebuild 1743 BLAKE2B ee7cf602d60a917cbf63d825e0ce2c82c702f1719f7bc772645a956b1889c133cdd284b397bbbfd9cd4f3521f4e29d47c9a1df626f7c820e7026adfe689a509a SHA512 02c21c16bffaed406bd4cd1d3c0a439ec571d2e9c88981bbfe7c5983a840ac6df3bccb74c42ed7562ea0b00f2cb2efffe7a7b20f8a4f50173f5c4d2cc01d6962
 EBUILD graphene-1.8.6.ebuild 1826 BLAKE2B 4ecab28c20a172f30360fd5d6637712105057858352a2f9f4f9d7a4efd5c6e239774b15d0dba2f05ece6e301bebf3baf71c9080b1aae69e7f3a52c727f7427ee SHA512 5f6de343071e11e0d21a3c3e5f5edde0a1db1ec4d2e4664e28600b68868e138051cf062f979c8fb50131b86dad1522f7ac0c9a2772f0843a3b093315dcd61b53
 MISC metadata.xml 333 BLAKE2B 3d34baf2b84e2ca8cc20638b381fdb4771e94f07df133f5d997b5d7bdf3704f8b8f77d2c79815f70246affa2e399d1118e03eae7c7cf8e419fec3dae89ef0405 SHA512 aef6b787ac7f14b56e4eacd746c91671b9a115cb40b312b415c7302d4339f5d3b3a887bd52a2b30ba31b3e0f027360a9fa55f6d3065cf7baedc4bd28dbbcd056
diff --git a/media-libs/graphene/graphene-1.8.2.ebuild b/media-libs/graphene/graphene-1.8.2.ebuild
deleted file mode 100644
index 9e2e37488754..000000000000
--- a/media-libs/graphene/graphene-1.8.2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6,7} )
-inherit xdg-utils meson multilib-minimal python-any-r1
-
-DESCRIPTION="A thin layer of types for graphic libraries"
-HOMEPAGE="https://ebassi.github.io/graphene/"
-SRC_URI="https://github.com/ebassi/graphene/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm ~hppa ppc ppc64 ~sparc x86 ~amd64-fbsd"
-IUSE="cpu_flags_arm_neon cpu_flags_x86_sse2 doc +introspection test"
-
-RDEPEND="
-	>=dev-libs/glib-2.30.0:2[${MULTILIB_USEDEP}]
-	introspection? ( dev-libs/gobject-introspection:= )
-"
-# Python is only needed with USE=introspection or FEATURES=test, but not bothering with conditional python_setup
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	doc? ( dev-util/gtk-doc )
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	xdg_environment_reset
-	default
-	# Disable installed-tests
-	sed -e 's/install: true/install: false/g' -i src/tests/meson.build || die
-}
-
-multilib_src_configure() {
-	# TODO: Do we want G_DISABLE_ASSERT as buildtype=release would do upstream?
-	local emesonargs=(
-		-Dgtk_doc=$(multilib_native_usex doc true false)
-		-Dgobject_types=true
-		-Dintrospection=$(multilib_native_usex introspection true false)
-		-Dgcc_vector=true # if built-in support tests fail, it'll just not enable vector intrinsics; unfortunately this probably means disabled on clang too, due to it claiming to be <gcc-4.9
-		$(meson_use cpu_flags_x86_sse2 sse2)
-		$(meson_use cpu_flags_arm_neon arm_neon)
-		$(meson_use test tests)
-		-Dbenchmarks=false
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
-multilib_src_install() {
-	meson_src_install
-}
diff --git a/media-libs/libaom/Manifest b/media-libs/libaom/Manifest
index e2547fa44cb3..7c3c71642488 100644
--- a/media-libs/libaom/Manifest
+++ b/media-libs/libaom/Manifest
@@ -1,9 +1,10 @@
 AUX libaom-1.0.0-armv7l.patch 677 BLAKE2B 600f7ea90c611e0a7b7a54e70c208061f6aefb0d2f4d096b19f5d77288fd0c8760cb5a1b044c5c9bbefe2d3c9ecfe6049a7d14a55586bae44c770fc3c953511b SHA512 0ab5a011d458238f4cae1e5d618e928ba3ba780c494c4e56ff2dc28b782de62265fade7a0a08b001a1c5ff6128d7d625516f61f7f1ce0452116ca873fd1544ec
+AUX libaom-1.0.0-update-vsx-ppc.patch 6367 BLAKE2B 4afed9f37d8fa8a9267b21700dbebd4fdc622b734d7fcd431c357ae328dacb372c75b4b47493b2c88889becc92e5a49723b19e47793a75cf0b47d42a67f65256 SHA512 3c5d1907e754c303ee3a44fc91c17afd99341dcf79be5eb8bf2122824391db8f0523d919a0375cd31a2033fe43b2d7e30509d2c2e283996b8992877635951c96
 AUX libaom-1.0.0-version.patch 403 BLAKE2B 8ab115aecb2251750f964bafea7e74ea8e4ede648bffa42724e0b71a47bd1ffe841c36059a8e634cc581488a645dc4cc42d8884516067ec79a3f71adae1e8b06 SHA512 ca715566cb821de9b32cdc77b1a1f2b11627e7ced3c134f75fa9a1d1dc59494c4097bb6d9efa0adfa5c841f73666fe10cd86f2ca9db01e07ab97e1966d8dd159
 AUX libdirpc2.patch 2481 BLAKE2B 6236c31784ebd76884e716857e665824f9b325a97c2cb8e01a38c97b0398141202d7cab0a8d9b69b037ad8ba0b7d5e293bda3e2c491906ac6dd9555f7d4631ec SHA512 ec47d5b026c4b687649a2ce46500376103ae3fef21cba2cb564771c3738dba4e61e51858875516f884ab4604b0c160e6ee07b98e6740643e18f596c624df1ccb
 AUX pthread_lib2.patch 535 BLAKE2B 17eabab9e5d7b9d22b4f25ec8006e7e48bc3683b88f560bcb092234a1448ff47ae20d6ba04efb1af5742d7fc253acf9c944322acc8e8ed1acfad0b08df358eda SHA512 be19983342bae014409dd22c2e94ce11a5003a8ded3547a287ff71f53ef63ce1a1cfd6cdfbbfbf36deece2d3c1d9fb3e8e679598698a045229f79ba704976001
 DIST libaom-1.0.0.tar.gz 2775454 BLAKE2B 09b891d365804f0c086785a00760af3191b40fc66fc752294e915b54454171fb47d3d1b037fb6d276727772ceec3177d78c14f90a2b01e28250d2de735bf02ec SHA512 131512ef286cb138047bb56dea54196f9a8d2b0d9f3d7689299f185338e5c03ee658b0cfe017a099f1a6be351a3a7157204dea70d2645a1d0a9249fd582c3fa4
 EBUILD libaom-1.0.0-r1.ebuild 2464 BLAKE2B f73d81d653a1913287af544186bad78e33124c6b2c30ff96a4bc4c92a5b5f2decc60411523d129bc50b8a0569dc29d497eb70224fdcc44e75fa7e4382c57deda SHA512 2b4e8e4413cab4534fbaed0781d97c5fa6b36b4969a5aea29bde54b304b74ad9bcb8da1b398a6f82f97bc16b4a1d893821bb9bb1ad237c8f290c627ef46db48d
-EBUILD libaom-1.0.0-r2.ebuild 2561 BLAKE2B 2b012558f99331025ff8b0f7e98a95f4ef4d04c34b6f1c90c7330c08de3feacfbce8476de6736cbc50eae5ea71dfa5363d1843213da1672207a6aaa86e197a35 SHA512 10bca7469b24b9a67c8f440a79d871c7b290afd66dba1bc2237c6ec148c30b100bf8e050ac18912ae230fd28fa41c6e82a580e2ee703280417b5714e131bd82c
+EBUILD libaom-1.0.0-r2.ebuild 2602 BLAKE2B 765a726c23c4e13ad9a7c6ec5440891cd0faba75fc8b586761ec895b25ac084fbe4a5e72303b876554f8b27c91fef251c2a8585f7310ece43f08a90277fa4443 SHA512 6e67331228e61a9cd98247c0a64de41a1b28e247a521a8a1567b43279fb0b595496b510a706222394b2e8bc1cc275b45e4566d59b11f0ac1372d10eb57dbaae7
 EBUILD libaom-9999.ebuild 2110 BLAKE2B fc0aabd237735452c5218edccfdfd723808d67877025d20e344fc13e567f8705bd48a97316d641b056578a4d70fca8ece459a3fad684febca2198f27f8644d9b SHA512 401a82d1cc0ec2ca9086edb0203d3e9c39dc995241bccbc546b322bb0ad6da8af2a01101d7ceed32b381b3ad175bc7bc616f3fbec17c28eb1cda99d2fb7cde2e
 MISC metadata.xml 223 BLAKE2B 1a772bb5add75cb4343b09bb2456adcd5e46896daaab4091ab64b667c5fa1a4adab0940015a3e755df3d6540b456694dc67ef9581d02d40c63b89290f8f83e43 SHA512 27b688917e0b1c4a75ea34c97d2d67d309573941492ab04124de11034f3b2796480f02408d86e2eba77ca2000722ea6606fe12a49622c04f9e2c1fa27b6fc8db
diff --git a/media-libs/libaom/files/libaom-1.0.0-update-vsx-ppc.patch b/media-libs/libaom/files/libaom-1.0.0-update-vsx-ppc.patch
new file mode 100644
index 000000000000..7293c1a75e3a
--- /dev/null
+++ b/media-libs/libaom/files/libaom-1.0.0-update-vsx-ppc.patch
@@ -0,0 +1,126 @@
+From 2f8587a8b30cb2e4b45df36c6c8461a440a77336 Mon Sep 17 00:00:00 2001
+From: Luca Barbato <lu_zero@gentoo.org>
+Date: Sat, 23 Jun 2018 02:47:16 -0500
+Subject: [PATCH] Update the VSX support
+
+The CFL function signature takes a source and destination pointer.
+Also make the typedef compatible with clang.
+
+Change-Id: Ia633d10141ac0fd10af0a40b9878d18293463fb8
+---
+ av1/common/ppc/cfl_ppc.c | 85 ++++++++++++++++++++--------------------
+ 1 file changed, 42 insertions(+), 43 deletions(-)
+
+diff --git a/av1/common/ppc/cfl_ppc.c b/av1/common/ppc/cfl_ppc.c
+index 58933a7b3..026a07809 100644
+--- a/av1/common/ppc/cfl_ppc.c
++++ b/av1/common/ppc/cfl_ppc.c
+@@ -24,19 +24,21 @@
+ #define CFL_LINE_2 128
+ #define CFL_LINE_3 192
+ 
+-typedef vector int8_t int8x16_t;
+-typedef vector uint8_t uint8x16_t;
+-typedef vector int16_t int16x8_t;
+-typedef vector uint16_t uint16x8_t;
+-typedef vector int32_t int32x4_t;
+-typedef vector uint32_t uint32x4_t;
+-typedef vector uint64_t uint64x2_t;
++typedef vector signed char int8x16_t;          // NOLINT(runtime/int)
++typedef vector unsigned char uint8x16_t;       // NOLINT(runtime/int)
++typedef vector signed short int16x8_t;         // NOLINT(runtime/int)
++typedef vector unsigned short uint16x8_t;      // NOLINT(runtime/int)
++typedef vector signed int int32x4_t;           // NOLINT(runtime/int)
++typedef vector unsigned int uint32x4_t;        // NOLINT(runtime/int)
++typedef vector unsigned long long uint64x2_t;  // NOLINT(runtime/int)
+ 
+-static INLINE void subtract_average_vsx(int16_t *pred_buf, int width,
+-                                        int height, int round_offset,
++static INLINE void subtract_average_vsx(const uint16_t *src_ptr, int16_t *dst,
++                                        int width, int height, int round_offset,
+                                         int num_pel_log2) {
+-  const int16_t *end = pred_buf + height * CFL_BUF_LINE;
+-  const int16_t *sum_buf = pred_buf;
++  //  int16_t *dst = dst_ptr;
++  const int16_t *dst_end = dst + height * CFL_BUF_LINE;
++  const int16_t *sum_buf = (const int16_t *)src_ptr;
++  const int16_t *end = sum_buf + height * CFL_BUF_LINE;
+   const uint32x4_t div_shift = vec_splats((uint32_t)num_pel_log2);
+   const uint8x16_t mask_64 = { 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
+                                0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07 };
+@@ -71,43 +73,40 @@ static INLINE void subtract_average_vsx(int16_t *pred_buf, int width,
+   const int32x4_t avg = vec_sr(sum_32x4, div_shift);
+   const int16x8_t vec_avg = vec_pack(avg, avg);
+   do {
+-    vec_vsx_st(vec_sub(vec_vsx_ld(OFF_0, pred_buf), vec_avg), OFF_0, pred_buf);
+-    vec_vsx_st(vec_sub(vec_vsx_ld(OFF_0 + CFL_LINE_1, pred_buf), vec_avg),
+-               OFF_0 + CFL_BUF_LINE_BYTES, pred_buf);
+-    vec_vsx_st(vec_sub(vec_vsx_ld(OFF_0 + CFL_LINE_2, pred_buf), vec_avg),
+-               OFF_0 + CFL_LINE_2, pred_buf);
+-    vec_vsx_st(vec_sub(vec_vsx_ld(OFF_0 + CFL_LINE_3, pred_buf), vec_avg),
+-               OFF_0 + CFL_LINE_3, pred_buf);
++    vec_vsx_st(vec_sub(vec_vsx_ld(OFF_0, dst), vec_avg), OFF_0, dst);
++    vec_vsx_st(vec_sub(vec_vsx_ld(OFF_0 + CFL_LINE_1, dst), vec_avg),
++               OFF_0 + CFL_BUF_LINE_BYTES, dst);
++    vec_vsx_st(vec_sub(vec_vsx_ld(OFF_0 + CFL_LINE_2, dst), vec_avg),
++               OFF_0 + CFL_LINE_2, dst);
++    vec_vsx_st(vec_sub(vec_vsx_ld(OFF_0 + CFL_LINE_3, dst), vec_avg),
++               OFF_0 + CFL_LINE_3, dst);
+     if (width >= 16) {
+-      vec_vsx_st(vec_sub(vec_vsx_ld(OFF_1, pred_buf), vec_avg), OFF_1,
+-                 pred_buf);
+-      vec_vsx_st(vec_sub(vec_vsx_ld(OFF_1 + CFL_LINE_1, pred_buf), vec_avg),
+-                 OFF_1 + CFL_LINE_1, pred_buf);
+-      vec_vsx_st(vec_sub(vec_vsx_ld(OFF_1 + CFL_LINE_2, pred_buf), vec_avg),
+-                 OFF_1 + CFL_LINE_2, pred_buf);
+-      vec_vsx_st(vec_sub(vec_vsx_ld(OFF_1 + CFL_LINE_3, pred_buf), vec_avg),
+-                 OFF_1 + CFL_LINE_3, pred_buf);
++      vec_vsx_st(vec_sub(vec_vsx_ld(OFF_1, dst), vec_avg), OFF_1, dst);
++      vec_vsx_st(vec_sub(vec_vsx_ld(OFF_1 + CFL_LINE_1, dst), vec_avg),
++                 OFF_1 + CFL_LINE_1, dst);
++      vec_vsx_st(vec_sub(vec_vsx_ld(OFF_1 + CFL_LINE_2, dst), vec_avg),
++                 OFF_1 + CFL_LINE_2, dst);
++      vec_vsx_st(vec_sub(vec_vsx_ld(OFF_1 + CFL_LINE_3, dst), vec_avg),
++                 OFF_1 + CFL_LINE_3, dst);
+     }
+     if (width == 32) {
+-      vec_vsx_st(vec_sub(vec_vsx_ld(OFF_2, pred_buf), vec_avg), OFF_2,
+-                 pred_buf);
+-      vec_vsx_st(vec_sub(vec_vsx_ld(OFF_2 + CFL_LINE_1, pred_buf), vec_avg),
+-                 OFF_2 + CFL_LINE_1, pred_buf);
+-      vec_vsx_st(vec_sub(vec_vsx_ld(OFF_2 + CFL_LINE_2, pred_buf), vec_avg),
+-                 OFF_2 + CFL_LINE_2, pred_buf);
+-      vec_vsx_st(vec_sub(vec_vsx_ld(OFF_2 + CFL_LINE_3, pred_buf), vec_avg),
+-                 OFF_2 + CFL_LINE_3, pred_buf);
++      vec_vsx_st(vec_sub(vec_vsx_ld(OFF_2, dst), vec_avg), OFF_2, dst);
++      vec_vsx_st(vec_sub(vec_vsx_ld(OFF_2 + CFL_LINE_1, dst), vec_avg),
++                 OFF_2 + CFL_LINE_1, dst);
++      vec_vsx_st(vec_sub(vec_vsx_ld(OFF_2 + CFL_LINE_2, dst), vec_avg),
++                 OFF_2 + CFL_LINE_2, dst);
++      vec_vsx_st(vec_sub(vec_vsx_ld(OFF_2 + CFL_LINE_3, dst), vec_avg),
++                 OFF_2 + CFL_LINE_3, dst);
+ 
+-      vec_vsx_st(vec_sub(vec_vsx_ld(OFF_3, pred_buf), vec_avg), OFF_3,
+-                 pred_buf);
+-      vec_vsx_st(vec_sub(vec_vsx_ld(OFF_3 + CFL_LINE_1, pred_buf), vec_avg),
+-                 OFF_3 + CFL_LINE_1, pred_buf);
+-      vec_vsx_st(vec_sub(vec_vsx_ld(OFF_3 + CFL_LINE_2, pred_buf), vec_avg),
+-                 OFF_3 + CFL_LINE_2, pred_buf);
+-      vec_vsx_st(vec_sub(vec_vsx_ld(OFF_3 + CFL_LINE_3, pred_buf), vec_avg),
+-                 OFF_3 + CFL_LINE_3, pred_buf);
++      vec_vsx_st(vec_sub(vec_vsx_ld(OFF_3, dst), vec_avg), OFF_3, dst);
++      vec_vsx_st(vec_sub(vec_vsx_ld(OFF_3 + CFL_LINE_1, dst), vec_avg),
++                 OFF_3 + CFL_LINE_1, dst);
++      vec_vsx_st(vec_sub(vec_vsx_ld(OFF_3 + CFL_LINE_2, dst), vec_avg),
++                 OFF_3 + CFL_LINE_2, dst);
++      vec_vsx_st(vec_sub(vec_vsx_ld(OFF_3 + CFL_LINE_3, dst), vec_avg),
++                 OFF_3 + CFL_LINE_3, dst);
+     }
+-  } while ((pred_buf += CFL_BUF_LINE * 4) < end);
++  } while ((dst += CFL_BUF_LINE * 4) < dst_end);
+ }
+ 
+ // Declare wrappers for VSX sizes
+-- 
+2.22.0
+
diff --git a/media-libs/libaom/libaom-1.0.0-r2.ebuild b/media-libs/libaom/libaom-1.0.0-r2.ebuild
index 2d3d0f2b2e8f..52296f61d4ae 100644
--- a/media-libs/libaom/libaom-1.0.0-r2.ebuild
+++ b/media-libs/libaom/libaom-1.0.0-r2.ebuild
@@ -47,6 +47,7 @@ PATCHES=(
 	"${FILESDIR}/pthread_lib2.patch"
 	"${FILESDIR}/${P}-version.patch"
 	"${FILESDIR}/${P}-armv7l.patch"
+	"${FILESDIR}/${P}-update-vsx-ppc.patch"
 )
 
 # the PATENTS file is required to be distributed with this package bug #682214
diff --git a/media-libs/libepoxy/Manifest b/media-libs/libepoxy/Manifest
index 755070d8929f..262b4e7d6a54 100644
--- a/media-libs/libepoxy/Manifest
+++ b/media-libs/libepoxy/Manifest
@@ -1,5 +1,5 @@
 DIST libepoxy-1.5.3.tar.gz 326768 BLAKE2B 053665429a249adca4c9b3d57797949e3a0ffd0ed3f1c66cb8becfb884431e44a4cccb6b2fd3788a86ee01268ebad3cc36e67e391d2aa5cdea28837a162be9ad SHA512 e831f4f918f08fd5f799501efc0e23b8d404478651634f5e7b35f8ebcc29d91abc447ab20da062dde5be75e18cb39ffea708688e6534f7ab257b949f9c53ddc8
-EBUILD libepoxy-1.5.3-r1.ebuild 1276 BLAKE2B 5ef12342ca586c044bf3680c1f71923031f971521536b0d94c04171624a693f83ce60e082272eb2ea1f4291f8f0af628a62a24b8fde45c40b3fd12c0618f866c SHA512 a678b488bee821c8cc5e28dd85b4d98b3ed38b826b4465edc720d3992fb88ee96746c74fe7cbe581e7d13f2186f8d5ca17e067197ffcb5d1936339abf059fd38
+EBUILD libepoxy-1.5.3-r1.ebuild 1275 BLAKE2B 7b8d18ae1303e6969d98bac57a2e5b512a900fac25854d5bf57b9139e06499e2cdaf785d3394850c013e986b0d47ba8ee377e62e4f56beee0d4adad29123fd53 SHA512 5b14b21ae3336813a2a568f165117cd048f050e52b18eb40010c773879c358f0fc5409e18b8bab2f64a5e7f1db150207b177e2ed60445628ee71e06302f3eb41
 EBUILD libepoxy-1.5.3.ebuild 1245 BLAKE2B 6de1b1561df3842b3cd90ff06703ec51e5eb61a0e2e89768eeaa790f6cf71711d4760cafc4d1d75a24746281e800f71945d76424494c10aa231b57dd62f756d5 SHA512 8d22a6fc0c8ff21f70aa998c6fde33a0dc810fed00c7afe301bd19e87e80fcd3abfb4bb9ed39a51c10b758f49b718f2eb1b232de6c42ef6175ac64426b41e163
 EBUILD libepoxy-9999.ebuild 1272 BLAKE2B ba91a63b33a5cbb320353e066749210509e6401d503ec3990ea1fed6e43753ab6a3f008ea87f0518cec65106a1524db90a013b9d24e6efacb01a9ed6bff56518 SHA512 bb1139c5457aa1a6ef9680883e19e45ab0206d7a6a5b4092b2a88240d0a9c39ba2d7d0d487a031610036bf7f9594c95ec797cce08d94a273060174503cf699d4
 MISC metadata.xml 375 BLAKE2B 09993b726e54558d32b0dfb2a221bdd8928b85f55bdaaeb2faf30a0711ed58b05022a9fb669ec43806aff223860e47db53226a0f8f34d7b35edf0a842ab45923 SHA512 fec0ce8c99534083afc197c156a7fbaf2e83b2e22887ef134984ea7a4e6226f2714db399a118cd96f22b20012e7b7572156fc13aa72516e2557880c716140ad6
diff --git a/media-libs/libepoxy/libepoxy-1.5.3-r1.ebuild b/media-libs/libepoxy/libepoxy-1.5.3-r1.ebuild
index 1caadee14dce..7176ab355235 100644
--- a/media-libs/libepoxy/libepoxy-1.5.3-r1.ebuild
+++ b/media-libs/libepoxy/libepoxy-1.5.3-r1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/anholt/libepoxy"
 if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-fbsd"
 	SRC_URI="https://github.com/anholt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
diff --git a/media-libs/libicns/Manifest b/media-libs/libicns/Manifest
index 80330b3bf919..d59e26d89b6e 100644
--- a/media-libs/libicns/Manifest
+++ b/media-libs/libicns/Manifest
@@ -1,3 +1,7 @@
+AUX libicns-0.8.1-fix-build-system.patch 1873 BLAKE2B 385f98787a65dce2e6295d2360c9b299d0a57cef6ed763f6501eda0a3babac92632e8056e78ef039854dfc54024d0a8204ca2a530cfa5e83528b7ef4f87e61bd SHA512 057617f9cca64d5886810902b22f7ed95dfffe8ea7a2b7e6bdf026f4cfaef8684a225d49151882a1db4fce189e2192a431b40446d14ff09c8f5213bf42c7db19
+AUX libicns-0.8.1-fix-gcc-warnings.patch 1406 BLAKE2B e16cf880e1b73809169f04163d84b01ee135e54a8a7a8580b6796b80b0af9fc9d71fedf18809f36a41c6eac48278ea41b4c3349f6dc23b4975d1354a1d399929 SHA512 3094ae73bf36c5d1621e11bb47f8a40b402b0b430c471ec6e135e84aa8b196906707400916147c6749d9ea3690d50dcc8acf640b1b675a6958ccf9f2b27b3840
+AUX libicns-0.8.1-support-libopenjp2.patch 11807 BLAKE2B ed074caa669d755e5a19fe2a1a079ce9c6bd2e4627902ffbd024160af2b74bc379d8ae7c1c8bd7c41c5182950ee94603cf9cf5ed89f3150b50db4e6006bf09d7 SHA512 be6e1c83c4f580438ac7aad362bc79b33e08b6682841a8aa5ad3cfbab516c4c0a5ff9d273b250494f9aaf6c6f18c10cb56ec23217e186ff163ba2f0d5b813cad
 DIST libicns-0.8.1.tar.gz 460819 BLAKE2B bc8989d2e58bff343cdf9538ca2d14600e1bee25697e767dfd51dd69b533995c76f83d3076b63c6604c18a2e08bbfd489408f0dd28847ac6b354210b7732b87a SHA512 e9a6da6d639c4e7aa85e21cf0201ec2e8fcad5c8542ef55375dee7628eff6e0136974ebae93f6c7d95447f879d3d001e8f5d480f6590061c8e0ad0e06b52742c
+EBUILD libicns-0.8.1-r1.ebuild 816 BLAKE2B 8121da975e1996885eecaa64422992fd403351ab2a36f63eb51879898985aba1a5d866a11860e893ee3549dd17e63a55172ad5a2e13ce3156e0eaaa05aec0ccd SHA512 f975624417f52f2b8ea27870924b2dac7e0c54bdb40bc0fd943aadf6b40c274af58fbefea858fe3c044541d340504310298cc6ba2e2c0de46dc9a0fb61a499f3
 EBUILD libicns-0.8.1.ebuild 599 BLAKE2B 8fbd8bfeaa0ccd7144cabad071ee5261f234aa6746faa4a046b63f64f9da32a7af4d054de29fbc968caa4d798fdb670cbffc8fcf0ef622fe53c401ea79649626 SHA512 083e230b61da5b0449f8fa0addbec32a4136485fdc63de0ae72e0718d4a81da507cebc43e2a141bf82bdcabfa1ab23650369ef6a6677fcbdf02b7806ec350f09
 MISC metadata.xml 333 BLAKE2B 7e301b02d958a41b5f991e4db560fbe37f78e051ef1166c3721f1ea65f34fdd48f6f56f6718ea9d0f8936f45921b061f9c6d7bf5c8d5e67bd8c1b8af1981b2da SHA512 398c15324aff5d97d6cc431f8b4455f37879c5afa0bc3e41e994e65e052c8c3fd07e3d2c473b4bf42c14d7fe203a91ee6cef28dd149612a289333e8ce7a7d9f6
diff --git a/media-libs/libicns/files/libicns-0.8.1-fix-build-system.patch b/media-libs/libicns/files/libicns-0.8.1-fix-build-system.patch
new file mode 100644
index 000000000000..63555b5596e3
--- /dev/null
+++ b/media-libs/libicns/files/libicns-0.8.1-fix-build-system.patch
@@ -0,0 +1,61 @@
+Use pkg-config instead of brittle AC_CHECK_LIB hackery
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -142,41 +142,11 @@
+ ] )
+ 
+ # Check for libpng
+-AC_CHECK_LIB(png, png_create_read_struct, [
+-AC_SUBST(PNG_LIBS, "-lpng")
+-], [
+-  AC_CHECK_LIB(png10, png_create_read_struct, [
+-  AC_SUBST(PNG_LIBS, "-lpng10")
+-  ], [
+-    AC_CHECK_LIB(png12, png_create_read_struct, [
+-    AC_SUBST(PNG_LIBS, "-lpng12")
+-    ], [
+-      AC_MSG_ERROR([cannot find required library png])
+-    ], [])
+-  ], [])
+-], [])
+-AC_CHECK_HEADERS([png.h libpng/png.h libpng10/png.h libpng12/png.h])
++PKG_CHECK_MODULES([PNG], [libpng])
+ 
+ # Check for libopenjpeg, fall back to libjasper if not available
+-AC_CHECK_LIB(jasper, jas_init, [
+-AC_SUBST(JP2000_LIBS, "-ljasper")
+-AC_CHECK_HEADERS([jasper/jasper.h])
+-AC_DEFINE([ICNS_JASPER],[1],[We have Jasper])
+-], [
+-  AC_CHECK_LIB(openjpeg2, opj_setup_decoder, [
+-  AC_SUBST(JP2000_LIBS, "-lopenjpeg2")
+-  AC_CHECK_HEADERS([openjpeg.h])
+-  AC_DEFINE([ICNS_OPENJPEG],[1],[We have OpenJPEG])
+-  ], [
+-    AC_CHECK_LIB(openjpeg, opj_setup_decoder, [
+-    AC_SUBST(JP2000_LIBS, "-lopenjpeg")
+-    AC_CHECK_HEADERS([openjpeg.h])
+-    AC_DEFINE([ICNS_OPENJPEG],[1],[We have OpenJPEG])
+-    ], [
+-      AC_MSG_WARN([libopenjpeg or libjasper jp2000 codec libraries not found])
+-      AC_MSG_WARN([libicns will be built without 256x256 and 512x512 support])
+-    ])
+-  ])
++PKG_CHECK_MODULES([JP2000], [libopenjp2], [
++  AC_DEFINE([ICNS_OPENJPEG], [2], [We have OpenJPEG 2.x])
+ ])
+ 
+ AC_CONFIG_FILES([Makefile libicns.spec icnsutils/Makefile src/Makefile src/libicns.pc])
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -3,7 +3,8 @@
+ 
+ libicns_la_LDFLAGS = -version-info 3:0:2
+ 
+-libicns_la_LIBADD = @PNG_LIBS@ @JP2000_LIBS@
++libicns_la_LIBADD = $(PNG_LIBS) $(JP2000_LIBS)
++libicns_la_CPPFLAGS = $(PNG_CFLAGS) $(JP2000_CFLAGS)
+ 
+ libicns_la_SOURCES = \
+   icns_debug.c \
diff --git a/media-libs/libicns/files/libicns-0.8.1-fix-gcc-warnings.patch b/media-libs/libicns/files/libicns-0.8.1-fix-gcc-warnings.patch
new file mode 100644
index 000000000000..d7f0dd60e216
--- /dev/null
+++ b/media-libs/libicns/files/libicns-0.8.1-fix-gcc-warnings.patch
@@ -0,0 +1,52 @@
+From: Carlos Maddela <e7appew@gmail.com>
+Date: Fri, 11 Nov 2016 17:12:25 +1100
+Subject: Fix GCC warnings.
+
+Description: Fix GCC warnings.
+Author: Carlos Maddela <e7appew@gmail.com>
+Origin: vendor
+Forwarded: no
+Last-Update: 2016-11-11
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+---
+ icnsutils/icns2png.c | 12 +++++++-----
+ icnsutils/png2icns.c |  2 ++
+ 2 files changed, 9 insertions(+), 5 deletions(-)
+
+--- a/icnsutils/icns2png.c
++++ b/icnsutils/icns2png.c
+@@ -530,15 +530,17 @@
+ 			case ICNS_ICON_VERSION:
+ 			{
+ 				icns_byte_t	iconBytes[4];
+-				icns_uint32_t	iconVersion = 0;
+-				float		iconVersionNumber = 0;
++				union
++				{
++					icns_uint32_t	asUint32;
++					float		asFloat;
++				} iconVersion = { .asUint32 = 0 };
+ 				if(iconDataSize == 4) {
+ 					memcpy(&iconBytes[0],(dataPtr+dataOffset+8),4);
+-					iconVersion = iconBytes[3]|iconBytes[2]<<8|iconBytes[1]<<16|iconBytes[0]<<24;
+-					iconVersionNumber = *((float *)(&iconVersion));
++					iconVersion.asUint32 = iconBytes[3]|iconBytes[2]<<8|iconBytes[1]<<16|iconBytes[0]<<24;
+ 				}
+ 				if(extractMode & LIST_MODE) {
+-					printf(" value: %f\n",iconVersionNumber);
++					printf(" value: %f\n",iconVersion.asFloat);
+ 				}
+ 			}
+ 			break;
+--- a/icnsutils/png2icns.c
++++ b/icnsutils/png2icns.c
+@@ -28,6 +28,8 @@
+ #include <png.h>

+ #include <icns.h>

+ 

++#include <unistd.h>

++

+ #define	FALSE	0

+ #define	TRUE	1

+ 

diff --git a/media-libs/libicns/files/libicns-0.8.1-support-libopenjp2.patch b/media-libs/libicns/files/libicns-0.8.1-support-libopenjp2.patch
new file mode 100644
index 000000000000..7440ad96a052
--- /dev/null
+++ b/media-libs/libicns/files/libicns-0.8.1-support-libopenjp2.patch
@@ -0,0 +1,365 @@
+From: Carlos Maddela <e7appew@gmail.com>
+Date: Wed, 9 Nov 2016 05:05:01 +1100
+Subject: Add support for linking with openjpeg 2.x library.
+
+Description: Add support for linking with openjpeg 2.x library.
+ Even though the Debian package attempted to build with the openjpeg 2.x
+ library, the resulting binaries didn't support conversion of images with
+ dimensions of 256x256 or greater, since autoconf was incorrectly trying
+ to find libopenjpeg2 instead of libopenjp2. Changes were also required
+ to address the API differences between openjpeg 1.x and openjpeg 2.x.
+ (Closes: #844055)
+Author: Carlos Maddela <e7appew@gmail.com>
+Origin: vendor
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=844055
+Last-Update: 2016-11-12
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+---
+ src/icns_jp2.c | 264 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
+ 1 file changed, 256 insertions(+), 8 deletions(-)
+
+diff --git a/src/icns_jp2.c b/src/icns_jp2.c
+index 6d809fb..e994f58 100644
+--- a/src/icns_jp2.c
++++ b/src/icns_jp2.c
+@@ -125,19 +125,19 @@ int icns_image_to_jp2(icns_image_t *image, icns_size_t *dataSizeOut, icns_byte_t
+ 	
+ 	#ifdef ICNS_JASPER
+ 		error = icns_jas_image_to_jp2(image, dataSizeOut, dataPtrOut);	
+-	#else
+-	#ifdef ICNS_OPENJPEG
++	#elif (ICNS_OPENJPEG == 1)
+ 		// OpenJPEG is broken for RGB+A images for now. See a possible patch here:
+ 		// http://groups.google.com/group/openjpeg/browse_thread/thread/1cb7807b2053592e
+ 		// error = icns_opj_image_to_jp2(image, dataSizeOut, dataPtrOut);
+ 		icns_print_err("icns_image_to_jp2: Saving JP2 data with OpenJPEG is not yet supported!\n");
+ 		error = ICNS_STATUS_UNSUPPORTED;
++	#elif (ICNS_OPENJPEG == 2)
++		error = icns_opj_image_to_jp2(image, dataSizeOut, dataPtrOut);
+ 	#else
+ 		*dataPtrOut = NULL;
+ 		error = ICNS_STATUS_UNSUPPORTED;
+ 	#endif
+-	#endif
+-	
++
+ 	return error;
+ }
+ 
+@@ -547,9 +547,136 @@ int icns_opj_jp2_to_image(icns_size_t dataSize, icns_byte_t *dataPtr, icns_image
+ 	return error;	
+ }
+ 
++#if (ICNS_OPENJPEG == 2)
++
++typedef struct mem_stream
++{
++	OPJ_BYTE     *buffer;
++	OPJ_SIZE_T    bufferSize;
++	OPJ_OFF_T     offset;
++	OPJ_BOOL      readOnly;
++	opj_stream_t *stream;
++} mem_stream_t;
++
++static OPJ_SIZE_T read_mem_stream(void *buffer, OPJ_SIZE_T numBytes, void *userData)
++{
++	mem_stream_t *memStream = (mem_stream_t *) userData;
++	OPJ_SIZE_T    remaining = memStream->bufferSize - memStream->offset;
++	OPJ_SIZE_T    bytesRead = (remaining < numBytes) ? remaining : numBytes;
++	memcpy(buffer, memStream->buffer + memStream->offset, bytesRead);
++	memStream->offset += bytesRead;
++	return bytesRead ? bytesRead : (OPJ_SIZE_T) -1;
++}
++
++static OPJ_SIZE_T write_mem_stream(void *buffer, OPJ_SIZE_T numBytes, void *userData)
++{
++	mem_stream_t *memStream = (mem_stream_t *) userData;
++	if(!memStream->readOnly) {
++		OPJ_SIZE_T remaining = memStream->bufferSize - memStream->offset;
++		if(remaining < numBytes) {
++			OPJ_SIZE_T newBufferSize = memStream->bufferSize + numBytes;
++			OPJ_BYTE  *newBuffer = (OPJ_BYTE *) realloc(memStream->buffer, newBufferSize);
++			if(!newBuffer) {
++				return (OPJ_SIZE_T) -1;
++			}
++			memStream->buffer = newBuffer;
++			memStream->bufferSize = newBufferSize;
++			opj_stream_set_user_data_length(memStream->stream, newBufferSize);
++		}
++		memcpy(memStream->buffer + memStream->offset, buffer, numBytes);
++		memStream->offset += numBytes;
++		return numBytes ? numBytes : (OPJ_SIZE_T) -1;
++	}
++	return (OPJ_SIZE_T) -1;
++}
++
++static OPJ_OFF_T skip_mem_stream(OPJ_OFF_T offset, void *userData)
++{
++	mem_stream_t *memStream = (mem_stream_t *) userData;
++	OPJ_OFF_T remaining = memStream->bufferSize - memStream->offset;
++	if(offset > remaining) {
++		if(!memStream->readOnly) {
++			OPJ_SIZE_T newBufferSize = memStream->bufferSize + offset;
++			OPJ_BYTE  *newBuffer = (OPJ_BYTE *) realloc(memStream->buffer, newBufferSize);
++			if(!newBuffer) {
++				return (OPJ_OFF_T) -1;
++			}
++			memStream->buffer = newBuffer;
++			memStream->bufferSize = newBufferSize;
++			opj_stream_set_user_data_length(memStream->stream, newBufferSize);
++		} else {
++			offset = remaining;
++		}
++	}
++	memStream->offset += offset;
++	if(memStream->offset < 0) {
++		offset -= memStream->offset;
++		memStream->offset = 0;
++	}
++	return offset ? offset : (OPJ_OFF_T) -1;
++}
++
++static OPJ_BOOL seek_mem_stream(OPJ_OFF_T offset, void *userData)
++{
++	mem_stream_t *memStream = (mem_stream_t *) userData;
++	if(offset < 0) {
++		return OPJ_FALSE;
++	}
++	if((OPJ_SIZE_T) offset > memStream->bufferSize) {
++		if(!memStream->readOnly) {
++			OPJ_SIZE_T newBufferSize = offset;
++			OPJ_BYTE  *newBuffer = (OPJ_BYTE *) realloc(memStream->buffer, newBufferSize);
++			if(!newBuffer) {
++				return OPJ_FALSE;
++			}
++			memStream->buffer = newBuffer;
++			memStream->bufferSize = newBufferSize;
++			opj_stream_set_user_data_length(memStream->stream, newBufferSize);
++		} else {
++			return OPJ_FALSE;
++		}
++	}
++	memStream->offset = offset;
++	return OPJ_TRUE;
++}
++
++static opj_stream_t *create_mem_stream(OPJ_BYTE *buffer, OPJ_SIZE_T bufferSize, OPJ_BOOL readOnly, mem_stream_t **memStreamOut)
++{
++	opj_stream_t *stream = opj_stream_default_create(readOnly);
++	if(stream) {
++		mem_stream_t *memStream = malloc(sizeof(*memStream));
++		if(memStream) {
++			memStream->buffer = buffer;
++			memStream->bufferSize = bufferSize;
++			memStream->offset = 0;
++			memStream->readOnly = readOnly;
++			memStream->stream = stream;
++			if(memStreamOut) {
++				*memStreamOut = memStream;
++			}
++			opj_stream_set_user_data(stream, memStream, free);
++			opj_stream_set_user_data_length(stream, bufferSize);
++			opj_stream_set_read_function(stream, read_mem_stream);
++			if(!readOnly) {
++				opj_stream_set_write_function(stream, write_mem_stream);
++			}
++			opj_stream_set_skip_function(stream, skip_mem_stream);
++			opj_stream_set_seek_function(stream, seek_mem_stream);
++		} else {
++			opj_stream_destroy(stream);
++			stream = NULL;
++		}
++	}
++	return stream;
++}
++
++#endif /* (ICNS_OPENJPEG == 2) */
++
+ // Decode jp2 data using OpenJPEG
+ int icns_opj_jp2_dec(icns_size_t dataSize, icns_byte_t *dataPtr, opj_image_t **imageOut)
+ {
++#if (ICNS_OPENJPEG == 1)
++
+ 	opj_event_mgr_t    event_mgr;	
+ 	opj_dparameters_t  parameters;
+ 	opj_dinfo_t        *dinfo = NULL;
+@@ -583,6 +710,59 @@ int icns_opj_jp2_dec(icns_size_t dataSize, icns_byte_t *dataPtr, opj_image_t **i
+ 	opj_destroy_decompress(dinfo);
+ 
+ 	return ICNS_STATUS_OK;
++
++#else /* (ICNS_OPENJPEG == 2) */
++
++	opj_dparameters_t  parameters;
++	opj_codec_t        *decoder = NULL;
++	opj_stream_t       *stream = NULL;
++	opj_image_t        *image = NULL;
++
++	*imageOut = NULL;
++
++	decoder = opj_create_decompress(OPJ_CODEC_JP2);
++	if(!decoder) {
++		icns_print_err("icns_opj_jp2_dec: failed to create decoder!\n");
++		return ICNS_STATUS_NO_MEMORY;
++	}
++
++	opj_set_error_handler(decoder, icns_opj_error_callback, stderr);
++	opj_set_warning_handler(decoder, icns_opj_warning_callback, stderr);
++	opj_set_info_handler(decoder, icns_opj_info_callback, stderr);
++
++	opj_set_default_decoder_parameters(&parameters);
++	opj_setup_decoder(decoder, &parameters);
++
++	stream = create_mem_stream(dataPtr, dataSize, OPJ_TRUE, NULL);
++	if(!stream) {
++		icns_print_err("icns_opj_jp2_dec: failed to create stream!\n");
++		opj_destroy_codec(decoder);
++		return ICNS_STATUS_NO_MEMORY;
++	}
++
++	if(!opj_read_header(stream, decoder, &image)) {
++		icns_print_err("icns_opj_jp2_dec: failed to read header!\n");
++		opj_stream_destroy(stream);
++		opj_destroy_codec(decoder);
++		return ICNS_STATUS_INVALID_DATA;
++	}
++
++	if(!opj_decode(decoder, stream, image) || !opj_end_decompress(decoder, stream)) {
++		icns_print_err("icns_opj_jp2_dec: failed to decode image!\n");
++		opj_image_destroy(image);
++		opj_stream_destroy(stream);
++		opj_destroy_codec(decoder);
++		return ICNS_STATUS_INVALID_DATA;
++	}
++
++	*imageOut = image;
++
++	opj_stream_destroy(stream);
++	opj_destroy_codec(decoder);
++
++	return ICNS_STATUS_OK;
++
++#endif /* (ICNS_OPENJPEG == 2) */
+ }
+ 
+ // Convert from opj_image_t to icns_image_t
+@@ -666,18 +846,30 @@ int icns_opj_to_image(opj_image_t *opjImg, icns_image_t *iconImg)
+ 
+ int icns_opj_image_to_jp2(icns_image_t *iconImg, icns_size_t *dataSizeOut, icns_byte_t **dataPtrOut)
+ {
+-	int		     error = ICNS_STATUS_OK;
++#if (ICNS_OPENJPEG == 1)
++	int                  error = ICNS_STATUS_OK;
+ 	opj_event_mgr_t      event_mgr;
++#endif /* (ICNS_OPENJPEG == 1) */
+ 	opj_cparameters_t    parameters;
++#if (ICNS_OPENJPEG == 1)
+ 	OPJ_COLOR_SPACE      color_space = CLRSPC_SRGB;
++#else /* (ICNS_OPENJPEG == 2) */
++	OPJ_COLOR_SPACE      color_space = OPJ_CLRSPC_SRGB;
++#endif /* (ICNS_OPENJPEG == 2) */
+ 	opj_image_cmptparm_t cmptparm[4];
+ 	opj_image_t	     *opjImg = NULL;
+ 	icns_byte_t	     *dataPtr = NULL;
+ 	int                  i, j;
+ 	int                  rowOffset, colOffset;
++#if (ICNS_OPENJPEG == 1)
+ 	opj_cinfo_t          *cinfo = NULL;
+ 	opj_cio_t            *cio = NULL;
+ 	int                  success = 0;
++#else /* (ICNS_OPENJPEG == 2) */
++	opj_codec_t          *encoder = NULL;
++	opj_stream_t         *stream = NULL;
++	mem_stream_t         *memStream = NULL;
++#endif /* (ICNS_OPENJPEG == 2) */
+ 	
+ 	if(iconImg == NULL)
+ 	{
+@@ -713,12 +905,14 @@ int icns_opj_image_to_jp2(icns_image_t *iconImg, icns_size_t *dataSizeOut, icns_
+ 	
+ 	*dataSizeOut = 0;
+ 	*dataPtrOut = NULL;
+-	
++
++#if (ICNS_OPENJPEG == 1)
+ 	memset(&event_mgr, 0, sizeof(opj_event_mgr_t));
+ 	event_mgr.error_handler = icns_opj_error_callback;
+ 	event_mgr.warning_handler = icns_opj_warning_callback;
+ 	event_mgr.info_handler = icns_opj_info_callback;
+-	
++#endif /* (ICNS_OPENJPEG == 1) */
++
+ 	opj_set_default_encoder_parameters(&parameters);
+ 
+ 	parameters.tcp_numlayers = 1;
+@@ -766,7 +960,9 @@ int icns_opj_image_to_jp2(icns_image_t *iconImg, icns_size_t *dataSizeOut, icns_
+ 			opjImg->comps[3].data[p] = src_pixel->a;
+ 		}
+ 	}
+-	
++
++#if (ICNS_OPENJPEG == 1)
++
+ 	cinfo = opj_create_compress(CODEC_JP2);
+ 	opj_set_event_mgr((opj_common_ptr)cinfo, &event_mgr, stderr);
+ 	opj_setup_encoder(cinfo, &parameters, opjImg);
+@@ -810,6 +1006,58 @@ exception:
+ 	}
+ 	
+ 	return error;
++
++#else /* (ICNS_OPENJPEG == 2) */
++
++	encoder = opj_create_compress(OPJ_CODEC_JP2);
++	if(!encoder) {
++		icns_print_err("icns_opj_image_to_jp2: failed to create encoder!\n");
++		opj_image_destroy(opjImg);
++		return ICNS_STATUS_NO_MEMORY;
++	}
++
++	opj_set_error_handler(encoder, icns_opj_error_callback, stderr);
++	opj_set_warning_handler(encoder, icns_opj_warning_callback, stderr);
++	opj_set_info_handler(encoder, icns_opj_info_callback, stderr);
++
++	opj_setup_encoder(encoder, &parameters, opjImg);
++
++	stream = create_mem_stream(NULL, 0, OPJ_FALSE, &memStream);
++	if(!stream) {
++		icns_print_err("icns_opj_image_to_jp2: failed to create stream!\n");
++		opj_image_destroy(opjImg);
++		opj_destroy_codec(encoder);
++		return ICNS_STATUS_NO_MEMORY;
++	}
++
++	if(!opj_start_compress(encoder, opjImg, stream) || !opj_encode(encoder, stream) || !opj_end_compress(encoder, stream)) {
++		icns_print_err("icns_opj_image_to_jp2: Error while encoding jp2 data!\n");
++		opj_image_destroy(opjImg);
++		opj_stream_destroy(stream);
++		opj_destroy_codec(encoder);
++		return ICNS_STATUS_INVALID_DATA;
++	}
++
++	*dataSizeOut = memStream->bufferSize + 34;
++	*dataPtrOut = (icns_byte_t *) realloc(memStream->buffer, *dataSizeOut);
++
++	if(!(*dataPtrOut))
++	{
++		icns_print_err("icns_opj_image_to_jp2: Unable to allocate memory block of size: %d!\n", (int) *dataSizeOut);
++		opj_image_destroy(opjImg);
++		opj_stream_destroy(stream);
++		opj_destroy_codec(encoder);
++		return ICNS_STATUS_NO_MEMORY;
++	}
++
++	icns_place_jp2_cdef(*dataPtrOut, *dataSizeOut);
++
++	opj_image_destroy(opjImg);
++	opj_stream_destroy(stream);
++	opj_destroy_codec(encoder);
++
++	return ICNS_STATUS_OK;
++#endif /* (ICNS_OPENJPEG == 2) */
+ }
+ 
+ void icns_opj_error_callback(const char *msg, void *client_data) {
diff --git a/media-libs/libicns/libicns-0.8.1-r1.ebuild b/media-libs/libicns/libicns-0.8.1-r1.ebuild
new file mode 100644
index 000000000000..2573e085ea67
--- /dev/null
+++ b/media-libs/libicns/libicns-0.8.1-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="A library for manipulating MacOS X .icns icon format"
+HOMEPAGE="https://sourceforge.net/projects/icns/"
+SRC_URI="mirror://sourceforge/icns/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+
+RDEPEND="
+	media-libs/libpng:0=
+	media-libs/openjpeg:2="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.8.1-fix-build-system.patch
+	"${FILESDIR}"/${PN}-0.8.1-support-libopenjp2.patch
+	"${FILESDIR}"/${PN}-0.8.1-fix-gcc-warnings.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libraw/Manifest b/media-libs/libraw/Manifest
index ca0e5e1294fb..03c683750c91 100644
--- a/media-libs/libraw/Manifest
+++ b/media-libs/libraw/Manifest
@@ -5,5 +5,5 @@ DIST LibRaw-demosaic-pack-GPL2-0.18.8.tar.gz 30868 BLAKE2B 30cef85c49e066fa4b1d8
 DIST LibRaw-demosaic-pack-GPL3-0.18.8.tar.gz 39002 BLAKE2B 544a1eab61c825c7f2202107d623a56e1f81ad3e5111b419bf12708e2d8a9903f192c23904ab8fb274636d9262d3d89f02fa5e05a0e70d7834782c2df8ec0548 SHA512 10e8cb6694159d04deb813a88e5c3195eed6e2e438f41533db91b17997af1b9d54f286303447ca6e3d1b377922e388f6fcc8a8370254011e11b85612c914d500
 EBUILD libraw-0.18.13.ebuild 1840 BLAKE2B 7b86c52d8ae048f2287455ab34ed05a69192ceded8f8a68b97fda2647517afd90983b5b45991809d87cd7d219e11087bc6a506f00749d0a4719d2451ab85b562 SHA512 9681595927e116f9b97815745b097219c3dfac4fa3020ddaf2ff320a9315327d3e02fa2964b468dde2f981035516e2ad49e8e6cdd69221841011f54764dfa90c
 EBUILD libraw-0.19.2.ebuild 1495 BLAKE2B 8d447b1613e72790cf2e3c556741b3eec0f331ebbf140416cad2595125f757d4c5ce32131b54f954e5dfba3758ab5ca4d41719e2be6bf23cc0b64d039edbc858 SHA512 658dbcdecfed69773dea274a272afa0232a080ce4e21921a528efd2de6bb43ff26a1e2b0010acfa113f3c2b631ba1800bb6ef8ed0a6e1bb4c7ee7858cfbaf28e
-EBUILD libraw-0.19.3.ebuild 1496 BLAKE2B f9c5512ddbc8264786424136abe8ef82546f79df15b1b1727f59417d06bff1df27d74b5eb89aaa5f133b90489884ba8524e10ba83cacec095b5b026674426052 SHA512 5ad61fc6e0e3e0d3bcf91a2eb2792ca5073a00cad3099b33d8be14759c9679816bf6b813c71ce1092f56fd855f0637bd87c12639bcb0404fd6d76c8945642918
+EBUILD libraw-0.19.3.ebuild 1495 BLAKE2B fcace1449b3e08bb85fcab1b01c2b37fc2b78baaaed3de8c5eb339e90ff527e4c4fd585cd3e2e675c01f3f93f20de7f8a761f92ee6eca547e7b889f56b9cd0c4 SHA512 db80112346ec662667b011079a501c74fb77f8bc919e02167b3406bdee3ffd444ab5fd705bd5d0da76d81b7311c08734617493234261b724e2182d744b01f79f
 MISC metadata.xml 437 BLAKE2B d43c89433ab4eff6a760dce4f7fc83253cb572ab048af7fb1df5bca74db8d7fde84cf147f5941e65407776d281edc4c0297006c75f83c285a5febc37625d6265 SHA512 b06d476afa85710b25dc7d1c1567ba30469ce6d08d278aaa64413611edf95433df315a5a77670d74ca5341be3b96fa0f4451e48f544783f031178b8cf73cd388
diff --git a/media-libs/libraw/libraw-0.19.3.ebuild b/media-libs/libraw/libraw-0.19.3.ebuild
index 053b22516abf..3654272e5912 100644
--- a/media-libs/libraw/libraw-0.19.3.ebuild
+++ b/media-libs/libraw/libraw-0.19.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.libraw.org/data/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1 CDDL"
 SLOT="0/19" # subslot = libraw soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples jpeg jpeg2k +lcms openmp"
 
 RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
diff --git a/media-libs/libwebp/Manifest b/media-libs/libwebp/Manifest
index 4a70a4d5da78..7e8739fc6d97 100644
--- a/media-libs/libwebp/Manifest
+++ b/media-libs/libwebp/Manifest
@@ -1,11 +1,5 @@
-DIST libwebp-0.5.2.tar.gz 1221153 BLAKE2B bf8f20c9dd45f70e68dda4eb1104b511be07b4e7bf13850e376c6fff32cf18048f46c718c900fedd6150b010b4a33d96dbcb602e1b0cd693c13dcec7954a2234 SHA512 f0d798e0ef8b58bc159c53214a62b29dff4309ced9efd7c5f0e6f837877906db8318c4c3453f92725ef6f2b069b931ce3e7961ca26db723a31eedc7b52988de2
-DIST libwebp-0.6.1.tar.gz 3990217 BLAKE2B 680dcc56bd10797e93d09dc64ed04fd2ffb0b8131aa0c0f1497054c50f5cff73b7ee2aa96df4f7ca760640b636f6f5265ae26e7874a77a86d39d2c74197c93b7 SHA512 fece551d8fabdd8d7ba6807baa54a69a345f8690be4415dd0c0dea54002d78fe893a5d5aacfc13800300edd462b969d596709ac3213f6bc90f8e3698b2490d5f
-DIST libwebp-1.0.0.tar.gz 4023549 BLAKE2B 10286182ddc1f3561d01edf095ba8921b932b950175c45bbc86400318f9a88237c7623b0bcdd0dfecea6efb085e84e029c82a61396cb784d778d59902353d2b4 SHA512 2af7036957722a3f1533fa2da0da15c76d7eb8ac98ec4ad5cf71dd4262f3d7c9897fb6b50befab83b7de22f0abceeb2c0ff52d60927513d40f8a41aa6a9abd99
-DIST libwebp-1.0.1.tar.gz 4030276 BLAKE2B 4ea3b31bac14c61fbedad14ed675adb4cc0deaed83f8c58f8d589ab2453a8cff33d7832acba39c673aa31cbb3d5c6b487151173d162f92a3698115833b03b694 SHA512 44e0c278b4569c03c39a1e047bccd7b4270bda12feae0dadc54f8a61fd6a66be011229f1e7e853f64749bcd9ea9e8146989e2b632459b67a4aaea4a8033a1361
 DIST libwebp-1.0.2.tar.gz 4036397 BLAKE2B 708c1083f62bdb3526f8319d9b6ce1e8aeba2bc785105ff7db07c9c7041311cedcfff000de5b8fd8e93550fc86ec149f6dd4a21f576709b80cb6a4b20ddd2863 SHA512 e095b8fdf0096395daf12892b3b74c472868e727f23640ba7aa5922a5a028b778a6a60d8a94f696f6c0ca49577dfc9a0b599ecb74ad831ade48c6db812b71d2e
-EBUILD libwebp-0.5.2.ebuild 1770 BLAKE2B 3ad8b99c05e38a51755fd047be8e51339dafff3dbdd829012252427308d1417bd3ddf7d6e7a1d7b039b6de7cdda987913085b7006b499acaa3aba43bdea681e5 SHA512 3d30b059d51b531cc22b2497c955cf3a4752042d2bb9af655932e5ee8e122101d03050823925064e34c2d52a3d9fb8d294413c502938f2eed0cf2af51dd2c2c9
-EBUILD libwebp-0.6.1.ebuild 1780 BLAKE2B afaa8d09c4ea4ae4e7c6c9a9f58620518e46b2b9946dbb148291c507c7daa568831063db2ce1dd0e7ae4539114ee3e82ce0a0f4ad1f07a739d8e6409e39c22b7 SHA512 b258c8ab17c12ccf7c5daf68edfb6bbde1fcb32f65949ecdb6ca8df8c48fd437971e4bf4ef6890b4fe4ee5438c7ad96e772fb4f20925f4012b7a6b87d80b5115
-EBUILD libwebp-1.0.0.ebuild 1824 BLAKE2B c1d551960e915c4c6984182b1211a007373f32dbc16612a355dd7c53dc0701da7672b1e75d1ea6a1c8d4689c54684047efb553f30d3ad321524aa7ef85b68f47 SHA512 06800280eaefc56b6cb8dd8cafb7531ab24ffcb15b05163b9adc0a5509c1a7fabc5f1dedd3637a1efb0ec1b38b754ec6c4657fdd9acc6aba14cb6739f53f5e5d
-EBUILD libwebp-1.0.1.ebuild 1842 BLAKE2B acca7da3a910aac00296c93582ead28869a9e17c5abc6bd2f9b6dc978119e49a3b2dae13bad5ffe9f3dbaabfecb072e2e1bd4b1e0e6dfd777e0c1f4b3c1bcb9c SHA512 82bf2cff0dd2c8da705c0818e6e122334d56b3fbcbe57e708ee29e3d303785afb4ac71b75a9bbdb7fadecb02f69966a4799134305daecb433b905b7fd20c5598
+DIST libwebp-1.0.3.tar.gz 4029909 BLAKE2B c2b7f65515e455658153ef3042c50d35f3a1e11668f3c75bdcedeee91d232d8724ca34cad0b893912463efc28658b48ff7ea08d98d7f02050a831f50d77691a4 SHA512 3ccdc62e5906f8de791053560e932b39df3cfdd7793617bd4562b7d95e2f6feac1535bc035e1b02591cab14b117ab15e51af6f9e4e3af1df0869c63945ec86b9
 EBUILD libwebp-1.0.2.ebuild 1831 BLAKE2B 2bcb206a9a857c95c9b75bb0a589b0da2a7e620b7100c4c3cb4c9a3bd3590f5371fe6dd91daa18357134e31b9eea11f3e258786387576bc2d7f983e1866d554a SHA512 5e0476b0553ec4823225c2f540369385bafe1b675442f3f4427f3ed0e4528872cfa2f77bf09880fb26e656e298872bcf9f40858ac28f194c67a7d6be03813330
-MISC metadata.xml 626 BLAKE2B b3ca86f5241deb376b10d159d67eb6001b2a3d8700167b0bc512c067a6b7c72e6a53173e6f22a8a8a923097d67eec93642ed92c132743980cbf27af022f15e1a SHA512 b7348f6c830bb9537f97fcc0f3cbf8b55491913ea45020005734088e7c1aa71dfcacab9dd87bf3085e79554a3326f90b6c30543ad41f08d863639732132be78b
+EBUILD libwebp-1.0.3.ebuild 1850 BLAKE2B e942f2cbd7f28edad3f78b723a17b3a1dd16f74a8f6f868f0c6fa5d864e51b60d841fd6fa965448e807b59ed83298594f06f6e414836785dfda44e6e79362126 SHA512 f335ebf94adde8dd90aea6e67e2c5ae390ceef750cf8ca3e4089b97d131207bee38b52d906f0a1be50da190fff39e039bab8d18f212f9ed4d9b018c6564b7260
+MISC metadata.xml 551 BLAKE2B be0c5dde4ced33103958fc19f5c5f4e9f17c417ced75f9ca065f35fadd50cf286c2a5dba0889dbbe439aa59a5a60d975725984687c1e008cf338cf1cff0ff7ed SHA512 8557a448b4d83f68911d02ef4d2cc003eddae753f28a57f3f87670cbe7e89fbce784416270ecf4f471c883e2bfcabafc3340e16026c883712b96f8b295c868be
diff --git a/media-libs/libwebp/libwebp-0.5.2.ebuild b/media-libs/libwebp/libwebp-0.5.2.ebuild
deleted file mode 100644
index afda0169dee6..000000000000
--- a/media-libs/libwebp/libwebp-0.5.2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils libtool multilib-minimal
-
-DESCRIPTION="A lossy image compression format"
-HOMEPAGE="https://developers.google.com/speed/webp/download"
-SRC_URI="http://downloads.webmproject.org/releases/webp/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/6" # subslot = libwebp soname version
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~m68k-mint"
-IUSE="cpu_flags_x86_avx2 cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 experimental gif +jpeg neon opengl +png static-libs swap-16bit-csp tiff"
-
-# TODO: dev-lang/swig bindings in swig/ subdirectory
-RDEPEND="gif? ( media-libs/giflib:= )
-	jpeg? ( virtual/jpeg:0= )
-	opengl? (
-		media-libs/freeglut
-		virtual/opengl
-		)
-	png? ( media-libs/libpng:0= )
-	tiff? ( media-libs/tiff:0= )"
-DEPEND="${RDEPEND}"
-
-ECONF_SOURCE=${S}
-
-src_prepare() {
-	default
-
-	# Fix libtool relinking, bug 499270.
-	#elibtoolize
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local args=(
-		--enable-libwebpmux
-		--enable-libwebpdemux
-		--enable-libwebpdecoder
-		$(use_enable static-libs static)
-		$(use_enable swap-16bit-csp)
-		$(use_enable experimental)
-		$(use_enable jpeg)
-		$(use_enable png)
-		$(use_enable opengl gl)
-		$(use_enable tiff)
-
-		$(use_enable cpu_flags_x86_avx2 avx2)
-		$(use_enable cpu_flags_x86_sse2 sse2)
-		$(use_enable cpu_flags_x86_sse4_1 sse4.1)
-		$(use_enable neon)
-
-		# Only used for gif2webp binary wrt #486646
-		$(multilib_native_use_enable gif)
-	)
-
-	econf "${args[@]}"
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	prune_libtool_files
-	dodoc AUTHORS ChangeLog doc/*.txt NEWS README{,.mux}
-}
diff --git a/media-libs/libwebp/libwebp-0.6.1.ebuild b/media-libs/libwebp/libwebp-0.6.1.ebuild
deleted file mode 100644
index a6d1b40ede54..000000000000
--- a/media-libs/libwebp/libwebp-0.6.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils libtool multilib-minimal
-
-DESCRIPTION="A lossy image compression format"
-HOMEPAGE="https://developers.google.com/speed/webp/download"
-SRC_URI="http://downloads.webmproject.org/releases/webp/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/7" # subslot = libwebp soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~m68k-mint"
-IUSE="cpu_flags_x86_avx2 cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 experimental gif +jpeg neon opengl +png static-libs swap-16bit-csp tiff"
-
-# TODO: dev-lang/swig bindings in swig/ subdirectory
-RDEPEND="gif? ( media-libs/giflib:= )
-	jpeg? ( virtual/jpeg:0= )
-	opengl? (
-		media-libs/freeglut
-		virtual/opengl
-		)
-	png? ( media-libs/libpng:0= )
-	tiff? ( media-libs/tiff:0= )"
-DEPEND="${RDEPEND}"
-
-ECONF_SOURCE=${S}
-
-src_prepare() {
-	default
-
-	# Fix libtool relinking, bug 499270.
-	#elibtoolize
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local args=(
-		--enable-libwebpmux
-		--enable-libwebpdemux
-		--enable-libwebpdecoder
-		$(use_enable static-libs static)
-		$(use_enable swap-16bit-csp)
-		$(use_enable experimental)
-		$(use_enable jpeg)
-		$(use_enable png)
-		$(use_enable opengl gl)
-		$(use_enable tiff)
-
-		$(use_enable cpu_flags_x86_avx2 avx2)
-		$(use_enable cpu_flags_x86_sse2 sse2)
-		$(use_enable cpu_flags_x86_sse4_1 sse4.1)
-		$(use_enable neon)
-
-		# Only used for gif2webp binary wrt #486646
-		$(multilib_native_use_enable gif)
-	)
-
-	econf "${args[@]}"
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	prune_libtool_files
-	dodoc AUTHORS ChangeLog doc/*.txt NEWS README{,.mux}
-}
diff --git a/media-libs/libwebp/libwebp-1.0.0.ebuild b/media-libs/libwebp/libwebp-1.0.0.ebuild
deleted file mode 100644
index ea796fca8f7e..000000000000
--- a/media-libs/libwebp/libwebp-1.0.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools libtool multilib-minimal
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="A lossy image compression format"
-HOMEPAGE="https://developers.google.com/speed/webp/download"
-SRC_URI="http://downloads.webmproject.org/releases/webp/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/7" # subslot = libwebp soname version
-[[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~m68k-mint"
-IUSE="cpu_flags_x86_avx2 cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 gif +jpeg neon opengl +png static-libs swap-16bit-csp tiff"
-
-# TODO: dev-lang/swig bindings in swig/ subdirectory
-RDEPEND="gif? ( media-libs/giflib:= )
-	jpeg? ( virtual/jpeg:0= )
-	opengl? (
-		media-libs/freeglut
-		virtual/opengl
-		)
-	png? ( media-libs/libpng:0= )
-	tiff? ( media-libs/tiff:0= )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-ECONF_SOURCE="${S}"
-
-src_prepare() {
-	default
-
-	# Fix libtool relinking, bug 499270.
-	#elibtoolize
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local args=(
-		--enable-libwebpmux
-		--enable-libwebpdemux
-		--enable-libwebpdecoder
-		$(use_enable static-libs static)
-		$(use_enable swap-16bit-csp)
-		$(use_enable jpeg)
-		$(use_enable png)
-		$(use_enable opengl gl)
-		$(use_enable tiff)
-
-		$(use_enable cpu_flags_x86_avx2 avx2)
-		$(use_enable cpu_flags_x86_sse2 sse2)
-		$(use_enable cpu_flags_x86_sse4_1 sse4.1)
-		$(use_enable neon)
-
-		# Only used for gif2webp binary wrt #486646
-		$(multilib_native_use_enable gif)
-	)
-
-	econf "${args[@]}"
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name "*.la" -delete || die
-	dodoc AUTHORS ChangeLog doc/*.txt NEWS README{,.mux}
-}
diff --git a/media-libs/libwebp/libwebp-1.0.1.ebuild b/media-libs/libwebp/libwebp-1.0.3.ebuild
index e55b68551443..87c3f6593331 100644
--- a/media-libs/libwebp/libwebp-1.0.1.ebuild
+++ b/media-libs/libwebp/libwebp-1.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -65,6 +65,6 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	find "${ED}" -name "*.la" -delete || die
+	find "${ED}" -type f -name "*.la" -delete || die
 	dodoc AUTHORS ChangeLog doc/*.txt NEWS README{,.mux}
 }
diff --git a/media-libs/libwebp/metadata.xml b/media-libs/libwebp/metadata.xml
index f90c38f0311e..a4733f12cce1 100644
--- a/media-libs/libwebp/metadata.xml
+++ b/media-libs/libwebp/metadata.xml
@@ -10,7 +10,6 @@
 		<name>Chromium in Gentoo Project</name>
 	</maintainer>
 	<use>
-		<flag name="experimental">Build with -DWEBP_EXPERIMENTAL_FEATURES</flag>
 		<flag name="swap-16bit-csp">Enable byte swapping for 16 bit colorspace</flag>
 	</use>
 	<upstream>
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 4efada3a0f76..5c295e6494b7 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -3,7 +3,7 @@ DIST mesa-19.0.8.tar.xz 11967592 BLAKE2B 91a46b67bdb8cb3ab4c7337be7c2b0dc6ab5ec8
 DIST mesa-19.1.1.tar.xz 10927620 BLAKE2B 503d7fb37144868c4e71e22fd310b7049265a6babf3b7ccd4f8d5a4db6a3b2e309e9e20006c913e02a0015750eaa9ca303165818b0b3542cdaa59e016817149c SHA512 73b190eeb0b5809217c04f39d90edc0844dac476d8284543013a4a8889a4be805bc15b43c91bbf0d3a36f35dc576e7085255f7012d207c74466e81cee7f67922
 DIST mesa-19.1.2.tar.xz 10930748 BLAKE2B 2f4882837902f02104db0198ecb8f24a48803fb9ff442c49b6b5055967c9f60662e3d65c92bb40391ee1824ac48ff1ef0c9db96adc0830bb11a3a83eb69ce1b5 SHA512 cab30694a409a5037996dd50cef1567eb9e0b83ed69cdb4fbc893a844ed35434fcd05023d48fce2831219866fa420500b53650c791bea286233f4cd6c2703e19
 EBUILD mesa-18.3.6.ebuild 13714 BLAKE2B f380e34556fe72952161527a13c4ce2d0380239e5d32d8b83018fdb6a204976ca9a43979749568862ca3c9a3498ddede5a978430946e812d5da4c7065df70f44 SHA512 b1ad91b975099bb51efe3ee0dbb15c7839834f593151a9f7c42cd85a1e9a84fae2af2073c2bd3cdda6ce5076ad16baec52919d7ea6d4a436e731ccc9a15afc57
-EBUILD mesa-19.0.8.ebuild 13861 BLAKE2B 0bfd509f54f4a40b32f9facd59644b1e9255aa2e654d9ea9258e7300f72b52362c02e4b2427c1a201712bbdb41745bf94cc8113c5e5e9825eaca7ec6378d6801 SHA512 29d64942434e840efca372cef1e11ca393954df10d250910d6163e70d7ee8994670dd53af2a2a50562e9f50c75928befcb0219eb9dd552f5fd45555434271da9
+EBUILD mesa-19.0.8.ebuild 13860 BLAKE2B d25ccdb2bfaceff35836d17141ffefe32d728d89ef6c2e0fad8801c58c6646c64ac28e1201a9fcb1d41d31679fda2627e5943bbfc7b7dfaf25fc6a8141203432 SHA512 27d586e55f24e8a78c57b01c37e21b642b485307dc10e51cfab629fff365b905850f6f1b97fc25ce8160326920c7aca9c70c5326f22aa690e0bf942f7026d732
 EBUILD mesa-19.1.1.ebuild 14274 BLAKE2B 91ba79babe477a14635dfe5213ff303d5afdb5aa1263df7b6ec22b16aa27aa57c71d85a84a77a080a7d4cbcf2be558b28ac315636b7949624fb34fc3743c1b7d SHA512 7cfde1a84760a5ba9ba906b61fbc8aedd9433a744485526331cf7bf3bb0e8ba5f5a32acaae03e8b3a07cdb70586e782391492f594748ec039a9896ab702932a2
 EBUILD mesa-19.1.2.ebuild 14274 BLAKE2B 91ba79babe477a14635dfe5213ff303d5afdb5aa1263df7b6ec22b16aa27aa57c71d85a84a77a080a7d4cbcf2be558b28ac315636b7949624fb34fc3743c1b7d SHA512 7cfde1a84760a5ba9ba906b61fbc8aedd9433a744485526331cf7bf3bb0e8ba5f5a32acaae03e8b3a07cdb70586e782391492f594748ec039a9896ab702932a2
 EBUILD mesa-9999.ebuild 14122 BLAKE2B fe10c24df409bb4edb3b79d4731230c1e82907e95b601e8f8db282fb762a93c574c775d1ea38beeff14817de6486ab02781063f978238bfd0ba41fd7c7e4c4a7 SHA512 478f1f09d12f9b165005aaa76f9e6d1bd7b6a4364faab44647c1a3a18c1bf3a231519cda5e0e421a3aac7946ca169edf329899db60f522ec6e0aab2db5d9cb04
diff --git a/media-libs/mesa/mesa-19.0.8.ebuild b/media-libs/mesa/mesa-19.0.8.ebuild
index dab30b830f15..eabccac2ffbf 100644
--- a/media-libs/mesa/mesa-19.0.8.ebuild
+++ b/media-libs/mesa/mesa-19.0.8.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 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 ~x86-linux ~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 ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest
index 913dee69421e..ba5926035ad4 100644
--- a/media-libs/vulkan-loader/Manifest
+++ b/media-libs/vulkan-loader/Manifest
@@ -1,10 +1,12 @@
 DIST vulkan-loader-1.1.101.tar.gz 1346567 BLAKE2B a116df430606e4d94a94c5b307319e4f0d366353f1949c27f5dc3bcbd9997bb97e7d7dc13f141c0423ab162706399a45693da5dc5ed7e6802cc65ec55c711724 SHA512 b26a9389a90cd833c7b18a50766ee0d54ad52aa252d33eb1760ebef38305559664974198a84b0ddbe92950fffc8d2a136c23acff40f73d3cbbd183bc75489a10
 DIST vulkan-loader-1.1.106.tar.gz 1347960 BLAKE2B cfce908571d7033cfaeb1491847b3b1d2032a073cd824e0368402840dfc49ff223023b2d5b2de66f2df63bca7a526c94ab8e11d27d3c1d47b43042659ac38052 SHA512 b5c0f50644f6f026d309af41a232373052ba926c969ce4e5eacdb0accd997906f673bdb3c73b98593ca90e656d444ebd40a7e26a48470b64dea6e9f0c88cfe22
+DIST vulkan-loader-1.1.114.tar.gz 1343624 BLAKE2B 1212c837d86f29160b19bbc14a82564d57722d0d8b540e9360af0a470db59d8c5ad76a1f9f5f892a09b7f43ae62792262b1713c8cabace087c37c2cbb103215b SHA512 90fe8fa7b0a0028faaf8e3aea0724799eb57989a0297e416b3b651a81e0de99b0506eb6b17f84bfc1a6ed33edcc806a5b6c1b187d0d49ea0c8d99ae9dcb5338c
 DIST vulkan-loader-1.1.82.0.tar.gz 1342427 BLAKE2B 4b2c589e2c1edaa29e13e892cc839f2d7af5bbadf7dda3f50eca2543c1877af175e9640545b886ffe3e8b1c51373502ee272829ddb15c07629ea08ece697e5b9 SHA512 624e493454e622e29bc0de5fdf1c425691b3c98f317660847e95aee6bc42dafa0b4d8caa9de52e8f3229b7e743afa475485cd3affbdb295e16ba49d30d1eb19e
 DIST vulkan-loader-1.1.92.1.tar.gz 1346712 BLAKE2B 60d29c38e72ff234261a3e75934d44de08c334c475e715066c210844ea672f0e2db3ebc8826df7d72392e3c2a0bbd0604b8770c0b35ddd8f72ed875234bae15d SHA512 c29d1fb43a2bdd0f291860dee0ffe7ec23a34c9431aeb76a46f8df0ec2f70601ccd3e96280f94d881f5550e3c9f07fe478f94eebcfd2aaf123045c7281313aac
 EBUILD vulkan-loader-1.1.101.ebuild 1545 BLAKE2B 453c9783dc86b037c10e2369ca7f63a3dcc9e09507d967344e835bab8cc4348fb207ac39786a610912c01f1ef643015b345e6581acdf9f7b2ea05b2372e64dc0 SHA512 b144467cc7b0f583417c590a94d2ba7e393e135256b5ec42fe5df1d0ac55fba7ae1f2af05a7131e94c971a8fedacb98a1d85e5d9c8d3346fec545933f8c2b794
 EBUILD vulkan-loader-1.1.106.ebuild 1545 BLAKE2B 36621d2e64bd111a7ad31735cef78da859f39730b0ba1dadbbac4c051d39b35a463c1f5429831052c991f470e71439562925b7ec200a4230c342b6289380015f SHA512 f509cd95f6270a8f12ecd924e982a91074af9310ceb74e13f8f2584f1e70f81078e2833dc9fc25bc3a3c6af7f777e478898db3b0a60d220fb2c2d23b07d3b260
+EBUILD vulkan-loader-1.1.114.ebuild 1546 BLAKE2B 864d20027485428d3f252e3182fd33cb488d9fc51a4ad37e9c30986ccf91025370641ca76f6f11e4cad155b3174493f0f4351bec5eadcdd88b1987b9451c570d SHA512 01abf36a3efb2efc6d39624a715888d066768cc21a631562ade8b7d0b92acfa134fff00e1a7c7e6b673568357a461c02f996de97914bda16381ae7b97e35265d
 EBUILD vulkan-loader-1.1.82.0.ebuild 1577 BLAKE2B 35be92f5ef1db058387d143a0f3c3582184cbb6de3bfd180b4d0b65414fbdea17c288dc2c783836ca954ab86503e03d5b6c31b42a3d2f6a3bc6784ec60d4e0e1 SHA512 bf016f1e3feb1f1833b081d10748fe744556baa247919c7fdde981b8ba99d01f74a8e87290162c03648e85cd3cc553286a4fe9f2108b2733e90de2fa16f75306
 EBUILD vulkan-loader-1.1.92.1.ebuild 1541 BLAKE2B 73bedd25efbf694a49f813c1f519ad19a38da9475ffb2dbd83d56ef1f115b6a8ddf0495d1123a378830922641e25d340e7ea81dba7f87fccdb4fa8644f7adf14 SHA512 5990de98b83d7b270f35efa7de0df9b5c6fc2d226bbac8d96cbc84bd0521bd9de27b9ca5a4ef3803f391fe4e782969f61b7757399942d87edfa8125da15ee87d
-EBUILD vulkan-loader-9999.ebuild 1541 BLAKE2B d3138d9e1c88b86ed2bfeba73a081a73dbb181b26ec002e1a18da0b650e678c0aeafc6d7e5ab8aac425713176f53ea6157e6ffb81619269318267555e17a2619 SHA512 8947aa69d23701acb381698f5c8f837964c2e5176a8f5535120ed08f32295fda9b24a81e223e507b73de48bbaa89f28c6e0599e8c8a6e4b309d8e4a917e83585
+EBUILD vulkan-loader-9999.ebuild 1541 BLAKE2B 203234a07960cfd576212095173a1ac3e8b94d7db8aa06a16b5e63ca2b35c8c0a21d942bbef73b75ca7337a99a7611e384a41d6d4b365b9b398fbfac55c38458 SHA512 d15c216c8346e7c3efa5864deb8d0a586b9a2b4b5929ce7a34e149cf30e01fc93ce4433b1b8dfaab3032e07cc8716d2d2254ac4708ce215af98783099ecb04bc
 MISC metadata.xml 414 BLAKE2B 53100d7021d8350e960e2b087bba612ee99f6ce960b63964aa2ba50b1172f5b9fe13fb9addb069ae74cc03292b92fc88838b41eac1083c8779dcb8e0e480d1dc SHA512 6328c52f607ed4ea3ba31430f63df84e942ea3e6726b5107c8840e3869725bd7407b446d4f905765a0c6d6dd04fda643bd2b5e06681f6ac771bbb4fbc8d4c417
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.1.114.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.1.114.ebuild
new file mode 100644
index 000000000000..0b90fe573373
--- /dev/null
+++ b/media-libs/vulkan-loader/vulkan-loader-1.1.114.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{5,6} )
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Loader.git"
+	EGIT_SUBMODULES=()
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+	EGIT_COMMIT="1bb7f68564fe565de2927071c79008bd6ede5af5"
+	SRC_URI="https://github.com/KhronosGroup/Vulkan-Loader/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/Vulkan-Loader-${EGIT_COMMIT}"
+fi
+
+inherit python-any-r1 cmake-multilib
+
+DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Loader"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="layers wayland X"
+
+PDEPEND="layers? ( media-libs/vulkan-layers:=[${MULTILIB_USEDEP}] )"
+DEPEND="${PYTHON_DEPS}
+	>=dev-util/vulkan-headers-1.1.114
+	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
+	X? (
+		x11-libs/libX11:=[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
+	)"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=True
+		-DBUILD_TESTS=False
+		-DBUILD_LOADER=True
+		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
+		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
+		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
+		-DVULKAN_HEADERS_INSTALL_DIR="/usr"
+	)
+	cmake-utils_src_configure
+}
+
+multilib_src_install() {
+	keepdir /etc/vulkan/icd.d
+
+	cmake-utils_src_install
+}
+
+pkg_postinst() {
+	einfo "USE=demos has been dropped as per upstream packaging"
+	einfo "vulkaninfo is now available in the dev-util/vulkan-tools package"
+}
diff --git a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
index 256d3e244f31..e1b75cb13198 100644
--- a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
@@ -26,7 +26,7 @@ IUSE="layers wayland X"
 
 PDEPEND="layers? ( media-libs/vulkan-layers:=[${MULTILIB_USEDEP}] )"
 DEPEND="${PYTHON_DEPS}
-	>=dev-util/vulkan-headers-1.1.106
+	>=dev-util/vulkan-headers-1.1.114
 	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
 	X? (
 		x11-libs/libX11:=[${MULTILIB_USEDEP}]