gentoo resync : 25.08.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-08-25 07:36:27 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-08-25 07:36:27 +0100
commit: 43793fab84041cfc5c60c0151d1591b8a69fb24a (patch)
tree: 6208a7f4fc744684fce0f55acbb47511acace498 /media-libs
parent: 28e3d252dc8ac8a5635206dfefe1cfe05058d1db (diff)
118 files changed, 2295 insertions, 1227 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index c985d01afdac..7bead5f63bf9 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/allegro/Manifest b/media-libs/allegro/Manifest
index c95867e9decb..0f2daa99e4e7 100644
--- a/media-libs/allegro/Manifest
+++ b/media-libs/allegro/Manifest
@@ -1,3 +1,4 @@
+AUX allegro-4.4.2-Werror-format-security.patch 5100 BLAKE2B 1e52bd5bb0eaa4df2c0c5ecb9d5421d9e41c074a7535dc29532ce976f5562de3c59979b33c042d33da4ee775d190e93036d3a5e3579786b10933f1ecec99110c SHA512 42a4f59d10a5bf3290178943181ba23ef08074abe94bd32d2f6f94f316424bbc0031350793c3d5610feef62a4a42080820fec5dbdb27802c1dc1abd0e64b13f9
 AUX allegro-4.4.2-gentoo.patch 756 BLAKE2B 9273b38794a904eedadf8210d5519eda46103e2441090eeff45bfa7810d0112177f334bff66f943f915f5a48fb41542c6aa1b9f2edbaac2130dcab15332e06b5 SHA512 8abac7ade02fe7592ea77f782562d74b9cd45006e63e71f2965f8fa53c37cd5c3fb2543301bb1610a8f41f5c50b734ab9497c52721495c59fae4f3e434cbb615
 AUX allegro-4.4.2-rpath.patch 182 BLAKE2B c6bae5a2ca5cd77022bf07690c5eb4d5b78f442f5951098bb30b036e37c0272fea6955908df73fdacef2e5f8698ae57a99dd73de32a056a9580a0e808a8f54f0 SHA512 6e262dc9dac274bdcbeeb2cf54b1c073a69db4a4abeb720caf5c58cb1d692286300c93fd9b7d3cea2f01aea4aeed33a34cb9e585a58ab083685c5f8c937c6536
 AUX allegro-4.4.2-shared.patch 247 BLAKE2B d5bada972b4c2555f9ad9da18b30b224f5aa70762d6d68883601df933cc44788b6e5a78289d0bde863f788b65cf583ea828ffb6455d03d1d7493b00ff6c40b77 SHA512 5b982f857197dd9256bb1a151b544484b0178fa8e90d6b876bf2d26ea37c6e6bf6f44d1b729f9d2ccd11899024dccc2afbfbbfb73b816cb17e97dc3eb4df51e5
@@ -6,6 +7,8 @@ AUX allegro-5.0.11-multilib.patch 340 BLAKE2B 61dd9c6308a1303ec07ec50b4d1ee0ede7
 AUX allegro-5.0.11-underlink.patch 390 BLAKE2B 9e28af560d359d1ef2e2a13ac30ede196252a5ff2e33e90fdd3bcf6b5a5f2efc443ef6634fea6d7dbdeea5a6c9843539993f475de3811a35b30bc38b3b01b00f SHA512 aaf982cf3e91bb6c5f300f3ac5f925a14e7dec7a2366ca80a734410926e382339ad1b0b0e8be9efedbd2126da899f3babba92d4458bdfb338b8fe609a764d8f5
 DIST allegro-4.4.2.tar.gz 4674902 BLAKE2B 9f43fad416348425692481524f6c15808ee03946d93df4a072a46557817ccd5f6ae7eede908ca4a02a0a9e49f9a7c42909c48c14923b2155d3999ff370401006 SHA512 ad4bc1c15fc83bc8a019031fed82f37a793664bb6683cf023ec05fd9cd945f00f43764f3126892426036249c63afa5678fb4906407bb325ce5827b36aee0fa86
 DIST allegro-5.0.11.tar.gz 3203777 BLAKE2B b8946e58cde38fdf52f42e041fb27ea92e9589f3425c8047afa4d66ca466cb294e6c8efdc03f0e6942f665e4624c10e533a64bc77bcfaf132662b2123b97de34 SHA512 bcf3bec236d5dee11c789394144959d2a2f6028ae3d89a91a726f796d74f785c7f28749ac1cda94becaf18c31c76fcf75b8f2f6d1f2c32c52d556f967a406052
-EBUILD allegro-4.4.2-r1.ebuild 2465 BLAKE2B d5fb5a8eeabe45dc5b54d53ff3725741560c75269da58ce131a62362906a7b5a453d18a6e1b5d3c9295be1d0bdd17b7c9bb11fea8f0e6600e1ffc8b363d062f6 SHA512 fd80275b9d42851765e0af9703ce4472e2b233b4a78a7dd6d005c2e46af2c691ef927e3de238d0d8e61a502869c532c8984fb8f5e47c6f491957483538e843a0
-EBUILD allegro-5.0.11.ebuild 2374 BLAKE2B 04971e4b4750e37e7e4fa1d0a1ee5d8c21412502935b5e8cabb3c5772c96adc8791e5fd5e5df9bcf6b2466189003c9b89a2679daab30ed9e6a84e1bd8ceec04f SHA512 48493bd135f0ced07ad854aa2fe0f0c9393f0ba154a1f846bb06200abf020eaeb2de3024730d0c911650c55a5cb9a543a182efea63a5a67e1efeefd9890a2379
-MISC metadata.xml 1034 BLAKE2B c1cdd935feae4561903bde181428ef0d71743f85e7756f507087528641471b4af3d1339758c3d829f8244b5cec7cc74bb7563699b9e5b05146ae4c6abe8dd5af SHA512 21301cc66fe94a4d728900cd5856d3e0d27507b1d340e36246c183b13232cb7f9c9da9f8b20428bd387c7216a892dce169c2bc885caabacb08a32892faffc994
+DIST allegro-5.2.4.0.tar.gz 7822903 BLAKE2B 50538e27276fbe1572a660b3f1396bdb9b542dc2aafaa819a4108e0e2771731cb6924cf1d0b7a7bfea1ff5c12b4772ff58dc571c81bb6a601d31a2083f5f9bea SHA512 c5f80191005165331635464ffd345369943d37dcb55345176a7171614e12826b25d9d74ab656333302d6682d404f1b46a5d94c0dd23d7873151e6e488d62c776
+EBUILD allegro-4.4.2-r1.ebuild 2527 BLAKE2B 232f6a17a76131b75fb9c5251504715a5bb74c084ef23cfe29fdceefe8927a3a5cacb5840f9767139b50b0a8a4842e13ef2a8226afbef096d61b5980cb917508 SHA512 af76323c8fb530e1140dcc20ac37138210634593a416e7dd45090f8641473b2b7e3aaf5cc3e068b5a74c92e8f0ef86aa04a92ed16213aa52486abf7643b9dd47
+EBUILD allegro-5.0.11.ebuild 2397 BLAKE2B 1477ed40dc61ac329d85893dca32fa4d9c805c7dc0254e22fbda6a25c9b84907634bf83a24aebb113fe28f548311b547a60be6a9a54f32560935f2b36927d851 SHA512 a4663c4c33f07b9f5b58ede35e369107d3585b9489150c50c3cc312a6ae61e12e0a023b19208c53c2dea2fbff4fdf285fd7962afa30d6ad1ba5c55b40e760719
+EBUILD allegro-5.2.4.0.ebuild 2711 BLAKE2B 79c85013e97894e1b1adfd9bc0d6ba144d62b682022b74efecbbb56b9309ba824675bac662096b615774cac439f00f9d675b50306838c75a00e5e945eafbb907 SHA512 fe644140fd2a5cc2dc4fc401eb4858cad32abd3be427d35d9e0c7101e4308ce150c572a5e309bef925774d07852ed6f2c4f7927a030c143d168b489f19ce17c9
+MISC metadata.xml 1089 BLAKE2B 195c71477c57ae4e873d7abec9ab26e8047e88fc8d0ecc5977a9059f990dabcfdb2ea184f6fe873a96868e684936ee1926ab5a9d15b34a7885e5769c981c23b3 SHA512 55c72ad0b2a1f00004f676e8a603551aba34b8a6cbb491ddfde7938d18093e42e4610d3cf1154196625e92a25f3d08cddca19930a20df312c455d3338fe30a1a
diff --git a/media-libs/allegro/allegro-4.4.2-r1.ebuild b/media-libs/allegro/allegro-4.4.2-r1.ebuild
index fff77ed7e25f..06ed3de8d269 100644
--- a/media-libs/allegro/allegro-4.4.2-r1.ebuild
+++ b/media-libs/allegro/allegro-4.4.2-r1.ebuild
@@ -44,6 +44,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-underlink.patch
 	"${FILESDIR}"/${P}-gentoo.patch
 	"${FILESDIR}"/${P}-rpath.patch
+	"${FILESDIR}"/${P}-Werror-format-security.patch # bug 540470
 )
 
 src_prepare() {
diff --git a/media-libs/allegro/allegro-5.0.11.ebuild b/media-libs/allegro/allegro-5.0.11.ebuild
index 858be8f9f103..e5d44d7afb74 100644
--- a/media-libs/allegro/allegro-5.0.11.ebuild
+++ b/media-libs/allegro/allegro-5.0.11.ebuild
@@ -61,6 +61,7 @@ src_configure() {
 		-DWANT_VORBIS=$(usex vorbis)
 		-DWANT_NATIVE_DIALOG=$(usex gtk)
 		-DWANT_OPENGL=$(usex X)
+		-DWANT_X11=$(usex X)
 		-DWANT_X11_XINERAMA=$(usex xinerama)
 	)
 
diff --git a/media-libs/allegro/allegro-5.2.4.0.ebuild b/media-libs/allegro/allegro-5.2.4.0.ebuild
new file mode 100644
index 000000000000..487d398bbadb
--- /dev/null
+++ b/media-libs/allegro/allegro-5.2.4.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-multilib
+
+DESCRIPTION="Cross-platform library aimed at video game and multimedia programming"
+HOMEPAGE="https://liballeg.org/"
+SRC_URI="https://github.com/liballeg/allegro5/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="BSD ZLIB"
+SLOT="5"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="alsa dumb flac gtk jpeg openal opengl opus oss physfs png pulseaudio test truetype vorbis webp X xinerama"
+
+REQUIRED_USE="X? ( opengl ) xinerama? ( X )"
+
+RDEPEND="
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	dumb? ( >=media-libs/dumb-0.9.3-r2[${MULTILIB_USEDEP}] )
+	flac? ( >=media-libs/flac-1.2.1-r5[${MULTILIB_USEDEP}] )
+	gtk? ( >=x11-libs/gtk+-2.24.23:2[${MULTILIB_USEDEP}] )
+	jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
+	openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
+	opengl? (
+		>=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
+		>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
+	)
+	opus? ( media-libs/opus[${MULTILIB_USEDEP}] )
+	physfs? ( >=dev-games/physfs-2.0.3-r1[${MULTILIB_USEDEP}] )
+	png? ( >=media-libs/libpng-1.5.18:0=[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+	truetype? ( >=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}] )
+	vorbis? ( >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] )
+	webp? ( media-libs/libwebp:0=[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}]
+		>=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]
+	)
+	xinerama? ( >=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	x11-base/xorg-proto
+"
+
+MULTILIB_WRAPPED_HEADERS=( /usr/include/allegro5/allegro_native_dialog.h )
+
+src_configure() {
+	local mycmakeargs=(
+		-DWANT_ALSA=$(usex alsa)
+		-DWANT_DEMO=OFF
+		-DWANT_EXAMPLES=OFF
+		-DWANT_FLAC=$(usex flac)
+		-DWANT_IMAGE_JPG=$(usex jpeg)
+		-DWANT_IMAGE_PNG=$(usex png)
+		-DWANT_MODAUDIO=$(usex dumb)
+		-DWANT_NATIVE_DIALOG=$(usex gtk)
+		-DWANT_OPENAL=$(usex openal)
+		-DWANT_OPENGL=$(usex opengl)
+		-DWANT_OPUS=$(usex opus)
+		-DWANT_OSS=$(usex oss)
+		-DWANT_PHYSFS=$(usex physfs)
+		-DWANT_PULSEAUDIO=$(usex pulseaudio)
+		-DWANT_TESTS=$(usex test)
+		-DWANT_TTF=$(usex truetype)
+		-DWANT_OGG_VIDEO=$(usex vorbis)
+		-DWANT_VORBIS=$(usex vorbis)
+		-DWANT_IMAGE_WEBP=$(usex webp)
+		-DWANT_X11=$(usex X)
+		-DWANT_X11_XINERAMA=$(usex xinerama)
+	)
+
+	cmake-multilib_src_configure
+}
+
+src_install() {
+	local HTML_DOCS=( docs/html/refman/. )
+	cmake-multilib_src_install
+
+	dodoc CHANGES-5.0.txt
+	doman docs/man/*.3
+}
diff --git a/media-libs/allegro/files/allegro-4.4.2-Werror-format-security.patch b/media-libs/allegro/files/allegro-4.4.2-Werror-format-security.patch
new file mode 100644
index 000000000000..b3b0bc30b344
--- /dev/null
+++ b/media-libs/allegro/files/allegro-4.4.2-Werror-format-security.patch
@@ -0,0 +1,107 @@
+diff -up allegro-4.4.2/src/unix/umodules.c~ allegro-4.4.2/src/unix/umodules.c
+--- allegro-4.4.2/src/unix/umodules.c~	2011-05-13 10:11:33.000000000 +0200
++++ allegro-4.4.2/src/unix/umodules.c	2017-03-15 14:42:39.822612368 +0100
+@@ -126,11 +126,11 @@ void _unix_load_modules(int system_drive
+ 	 continue;
+ 
+       if (!fullpath_slash) {
+-         snprintf(fullpath, sizeof fullpath, filename);
++         snprintf(fullpath, sizeof fullpath, "%s", filename);
+ 	 fullpath[(sizeof fullpath) - 1] = 0;
+       }
+       else {
+-	 snprintf(fullpath_slash+1, (sizeof fullpath) - (fullpath_slash - fullpath) - 1, filename);
++	 snprintf(fullpath_slash+1, (sizeof fullpath) - (fullpath_slash - fullpath) - 1, "%s", filename);
+ 	 fullpath[(sizeof fullpath) - 1] = 0;
+       }
+       
+diff -up allegro-4.4.2/src/linux/ljoy.c~ allegro-4.4.2/src/linux/ljoy.c
+--- allegro-4.4.2/src/linux/ljoy.c~	2010-02-20 06:18:16.000000000 +0100
++++ allegro-4.4.2/src/linux/ljoy.c	2017-03-15 14:52:28.474215615 +0100
+@@ -93,7 +93,7 @@ static int joy_init(void)
+ 
+       if (ioctl(joy_fd[i], JSIOCGVERSION, &raw_version) < 0) {
+          /* NOTE: IOCTL fails if the joystick API is version 0.x */
+-         uszprintf(allegro_error, ALLEGRO_ERROR_SIZE, get_config_text("Your Linux joystick API is version 0.x which is unsupported."));
++         uszprintf(allegro_error, ALLEGRO_ERROR_SIZE, "%s", get_config_text("Your Linux joystick API is version 0.x which is unsupported."));
+          return -1; 
+       }
+       
+diff -up allegro-4.4.2/examples/extrans2.c~ allegro-4.4.2/examples/extrans2.c
+--- allegro-4.4.2/examples/extrans2.c~	2008-01-30 11:56:50.000000000 +0100
++++ allegro-4.4.2/examples/extrans2.c	2017-03-15 15:43:03.494831521 +0100
+@@ -211,7 +211,7 @@ int main(int argc, char **argv)
+       } else {
+          msg = "no flipping";
+       }
+-      textprintf_ex(buffer, font, 1, 1, makecol(255, 255, 255), -1, msg);
++      textprintf_ex(buffer, font, 1, 1, makecol(255, 255, 255), -1, "%s", msg);
+ 
+       /* finally blit the back buffer on the screen */
+       blit(buffer, screen, 0, 0, 0, 0, buffer->w, buffer->h);
+diff -up allegro-4.4.2/setup/setup.c~ allegro-4.4.2/setup/setup.c
+--- allegro-4.4.2/setup/setup.c~	2010-05-23 18:05:33.000000000 +0200
++++ allegro-4.4.2/setup/setup.c	2017-03-15 16:13:42.243136380 +0100
+@@ -1163,7 +1163,7 @@ static void plot_joystick_state(BITMAP *
+ 	 textprintf_ex(bmp, font, SCREEN_W/2-96, SCREEN_H/2-60+c*20, -1, -1, uconvert_ascii("%s (%d/%d)", tmp),
+                     joystick_driver->name, i+1, num_joysticks);
+       else
+-	 textprintf_ex(bmp, font, SCREEN_W/2-96, SCREEN_H/2-60+c*20, -1, -1, joystick_driver->name);
++	 textprintf_ex(bmp, font, SCREEN_W/2-96, SCREEN_H/2-60+c*20, -1, -1, "%s", joystick_driver->name);
+       c++;
+    }
+ 
+@@ -2879,7 +2879,7 @@ int main(void)
+       alert(uconvert_ascii("Error loading " SETUP_DATA_FILE, tmp1), NULL, NULL, uconvert_ascii("OK", tmp2), NULL, 13, 0);
+     #else
+       set_gfx_mode(GFX_TEXT, 0, 0, 0, 0);
+-      allegro_message(uconvert_ascii("Error loading " SETUP_DATA_FILE "\n", tmp1));
++      allegro_message("%s", uconvert_ascii("Error loading " SETUP_DATA_FILE "\n", tmp1));
+     #endif
+       return 1;
+    }
+diff -up allegro-4.4.2/examples/exkeys.c~ allegro-4.4.2/examples/exkeys.c
+--- allegro-4.4.2/examples/exkeys.c~	2008-01-10 20:46:00.000000000 +0100
++++ allegro-4.4.2/examples/exkeys.c	2017-03-15 16:17:30.268545467 +0100
+@@ -193,7 +193,7 @@ int main(void)
+       if (key_shifts & KB_NUMLOCK_FLAG)  strcat(buf, " num");
+       if (key_shifts & KB_SCROLOCK_FLAG) strcat(buf, " scrl");
+       scroll();
+-      textprintf_ex(screen, font, 8, SCREEN_H-16, makecol(0, 0, 0), makecol(255, 255, 255), buf);
++      textprintf_ex(screen, font, 8, SCREEN_H-16, makecol(0, 0, 0), makecol(255, 255, 255), "%s", buf);
+    } while (k != 27);
+ 
+    /* various scan codes are defined in allegro.h as KEY_* constants */
+@@ -234,7 +234,7 @@ int main(void)
+       if (key[KEY_8]) buf[8] = '8'; else buf[8] = ' ';
+       if (key[KEY_9]) buf[9] = '9'; else buf[9] = ' ';
+       buf[10] = 0;
+-      textprintf_ex(screen, font, 8, SCREEN_H-16, makecol(0, 0, 0), makecol(255, 255, 255), buf);
++      textprintf_ex(screen, font, 8, SCREEN_H-16, makecol(0, 0, 0), makecol(255, 255, 255), "%s", buf);
+       rest(1);
+    } while (!keypressed() || (readkey() >> 8) != KEY_ESC);
+ 
+diff -up allegro-4.4.2/tests/play.c~ allegro-4.4.2/tests/play.c
+--- allegro-4.4.2/tests/play.c~	2005-03-19 12:15:07.000000000 +0100
++++ allegro-4.4.2/tests/play.c	2017-03-15 16:35:18.628156496 +0100
+@@ -74,7 +74,7 @@ void usage(void)
+ 
+    strcat(msg, "\nIf you don't specify the card, Allegro will auto-detect (ie. guess :-)\n");
+ 
+-   allegro_message(msg);
++   allegro_message("%s", msg);
+    free(msg);
+ }
+
+diff -up allegro-4.2.3/tools/pack.c~ allegro-4.2.3/tools/pack.c
+--- allegro-4.2.3/tools/pack.c~	2006-05-20 16:49:58.000000000 +0200
++++ allegro-4.2.3/tools/pack.c	2010-12-30 11:20:42.425231307 +0100
+@@ -42,7 +42,7 @@ static void err(char *s1, char *s2)
+       printf(": %s", s1);
+
+    if (s2)
+-      printf(s2);
++      printf("%s", s2);
+
+    printf("\n");
+
diff --git a/media-libs/allegro/metadata.xml b/media-libs/allegro/metadata.xml
index 1a6f9338ec6e..0c51c0b4e8ac 100644
--- a/media-libs/allegro/metadata.xml
+++ b/media-libs/allegro/metadata.xml
@@ -16,6 +16,7 @@ and a GUI.
 </longdescription>
   <use>
     <flag name="dumb">Enable <pkg>media-libs/dumb</pkg> module library support</flag>
+    <flag name="opus">Enable Opus codec support</flag>
     <flag name="physfs">Enable physfs support</flag>
     <flag name="vga">Enables the VGA graphics driver</flag>
   </use>
diff --git a/media-libs/avidemux-plugins/Manifest b/media-libs/avidemux-plugins/Manifest
index 8e8758275e91..53d7e67c0c37 100644
--- a/media-libs/avidemux-plugins/Manifest
+++ b/media-libs/avidemux-plugins/Manifest
@@ -1,7 +1,8 @@
 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.6.20.tar.gz 20172362 BLAKE2B d458749e470e60b133a177ddf97ee04a665da3f7b2c52e8cc51f907aa5b51d11338ddab9306603b615170b5cf75ec2d3444bd648756bdb724aa442abf7044553 SHA512 d01d0fc24a3004770bd3923c2debc4fa2752eb71df08cfe423746b9c44a2562ca01d82965ed2563b99572a4bed8034b79487199ce330208b51a3b7f87ccf7103
 DIST avidemux_2.7.0.tar.gz 21474504 BLAKE2B c6e55a0b5220d6d3746fa06162bf11253145fd28f2f6f744702d5e0342fba85e546a28883eb847139eadd34c94037ebc7d68f5576e7505a85288556468d14b96 SHA512 7c92213d3bd2849dbdb5a1aff2acd6da231fd76c561b756fbf4a1d5a41e9705d609d7a35b6ca6b77ceb3bf5138f861cd24ed16d8fcec4fd713f09a2ff07e9015
 EBUILD avidemux-plugins-2.6.20.ebuild 4638 BLAKE2B 1ab4804335317d6c12906ec9a000a38cf1665ebcd0223b8dc563ed75f9e23f0631125c5b6521611b96a375a509ad8b54ba82095cb6f626ff122904572a95e692 SHA512 48e038364240357a6c6328b101973b94dd3cc813273ae5e36711aa4b3121b0ac322d2577a0faca8a7455ae6e2063cb4e1b0db3100564f84a77c3a44e4154ddb2
-EBUILD avidemux-plugins-2.7.0.ebuild 4838 BLAKE2B 701319a074861f69f17ea4970006eedf087f5586197f6a9ab158f8120aaed817236f880a4f59d588534c474cf550ef37764f2f44f0f7cff7f0ee3d5c8bda0c3c SHA512 f3b4c8dad3e24a9af37b7593b7a9d6014960eae9ec91bf9422251148bf336a8a7015d72713d4541a8466bf3695707a47731f0373339c4d5343581260dd319b03
+EBUILD avidemux-plugins-2.7.0.ebuild 4873 BLAKE2B a9a95cea60229f38ac116166cb449f31c9035f6b59b7577d1ade5b19f4218b8977e89292583149284bb727048bb602b47e0a176bf586ca933b3c7c7b13f5c364 SHA512 5d5b7526d4857161530d3c969fed0bbb2eb8b44f073609447e6e62588cb8be137273971038dff24dd44fda8775ca07a0246db9be0c3e0f9661f1ca671096a822
 EBUILD avidemux-plugins-9999.ebuild 4838 BLAKE2B 701319a074861f69f17ea4970006eedf087f5586197f6a9ab158f8120aaed817236f880a4f59d588534c474cf550ef37764f2f44f0f7cff7f0ee3d5c8bda0c3c SHA512 f3b4c8dad3e24a9af37b7593b7a9d6014960eae9ec91bf9422251148bf336a8a7015d72713d4541a8466bf3695707a47731f0373339c4d5343581260dd319b03
 MISC metadata.xml 1406 BLAKE2B 11611c16434167ee45901a059c37d8802c7b605d21cee9f813982cd8e22e98aac1fa0921662178ef532ef060e7d2c61353a2e057caef3b63a9bf5df06fa6f2a6 SHA512 117225570689a4b78a36b18f5e6c50e185d2db2b10ba6d38869105fa5e718d5dc753eb151cba411df8eba48705e0eee29c2acae8c1a491cc343832d9cfa0290c
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 2556ab1d6c62..1c70e135cbf6 100644
--- a/media-libs/avidemux-plugins/avidemux-plugins-2.7.0.ebuild
+++ b/media-libs/avidemux-plugins/avidemux-plugins-2.7.0.ebuild
@@ -83,7 +83,10 @@ RDEPEND="${COMMON_DEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
-PATCHES=( "${FILESDIR}"/${PN}-2.6.20-optional-pulse.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.6.20-optional-pulse.patch
+	"${FILESDIR}"/${P}-qt-5.11.patch
+)
 
 src_prepare() {
 	default
diff --git a/media-libs/avidemux-plugins/files/avidemux-plugins-2.7.0-qt-5.11.patch b/media-libs/avidemux-plugins/files/avidemux-plugins-2.7.0-qt-5.11.patch
new file mode 100644
index 000000000000..8ac9bbc3b4ac
--- /dev/null
+++ b/media-libs/avidemux-plugins/files/avidemux-plugins-2.7.0-qt-5.11.patch
@@ -0,0 +1,48 @@
+From ba667da44fcb88ee660339e52859bb90dc1b00d3 Mon Sep 17 00:00:00 2001
+From: mean <fixounet@free.fr>
+Date: Wed, 30 May 2018 07:31:03 +0200
+Subject: [PATCH] [Qt] Compatibilty patch with newer qt (>=5.11), patch by
+ Chris Clayton
+
+---
+ avidemux/qt4/ADM_jobs/src/ADM_jobControl.cpp         | 1 +
+ avidemux/qt4/ADM_jobs/src/ADM_jobs.cpp               | 1 +
+ avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp | 1 +
+ 3 files changed, 3 insertions(+)
+
+diff --git a/avidemux/qt4/ADM_jobs/src/ADM_jobControl.cpp b/avidemux/qt4/ADM_jobs/src/ADM_jobControl.cpp
+index 256f69d5e..54b0ac639 100644
+--- a/avidemux/qt4/ADM_jobs/src/ADM_jobControl.cpp
++++ b/avidemux/qt4/ADM_jobs/src/ADM_jobControl.cpp
+@@ -17,6 +17,7 @@
+ #include "ADM_coreJobs.h"
+ #include "DIA_coreToolkit.h"
+ #include <QtCore/QDir>
++#include <QAction>
+ 
+ extern void loadTranslator(void);
+ extern void initTranslator(void);
+diff --git a/avidemux/qt4/ADM_jobs/src/ADM_jobs.cpp b/avidemux/qt4/ADM_jobs/src/ADM_jobs.cpp
+index 85cec5f9a..f537995ca 100644
+--- a/avidemux/qt4/ADM_jobs/src/ADM_jobs.cpp
++++ b/avidemux/qt4/ADM_jobs/src/ADM_jobs.cpp
+@@ -21,6 +21,7 @@
+ #include "ADM_memsupport.h"
+ #include "ADM_crashdump.h"
+ #include "ADM_win32.h"
++#include <QAction>
+ 
+ void onexit( void );
+ 
+diff --git a/avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp b/avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp
+index 94bdd577e..b2a01e54b 100644
+--- a/avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp
++++ b/avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp
+@@ -17,6 +17,7 @@
+ #include "Q_eq2.h"
+ #include "ADM_toolkitQt.h"
+ #include <QSignalMapper>
++#include <QAction>
+ 
+ //
+ //	Video is in YV12 Colorspace
+\ No newline at end of file
diff --git a/media-libs/babl/Manifest b/media-libs/babl/Manifest
index b4b3ea4a72fd..6a218420da99 100644
--- a/media-libs/babl/Manifest
+++ b/media-libs/babl/Manifest
@@ -15,6 +15,7 @@ DIST babl-0.1.48.tar.bz2 659945 BLAKE2B 7daa742f27f39dee9ec1ff6955082585246ecd45
 DIST babl-0.1.50.tar.bz2 661756 BLAKE2B 634e5bdaf4e32fe78ed913051d7bd226de9417d7a81535597bcef24b61b7fcc6cc76a0b9a2e7885ebc90eb0215d826a5c2f1e99d64096552e2fb7e0328c18068 SHA512 9b321933f6da41ce9be85a9b5e33a24857cb33d2a2a02ec30173c99dff66354d03c53e5e94ae46f9b59b11b9404b0cffbc39fc14e360412eca70584b61d25097
 DIST babl-0.1.52.tar.bz2 665120 BLAKE2B 5584ba82b69151a7eb7d1157b3619dbd88db6ee50126178568db92c63c82913b3f118cb6cc8c87a8fc5d620f4fe5386a1da0c2c5289b23550b16ffe8e0b469e1 SHA512 39fddb2393e4533665c444ab77105966f86c2938a3b48ca7683ccaecefe0c1b8b08374f0028360ccd05b0d03848dfadba54c7bd9d73ef40549c4e0501e61785f
 DIST babl-0.1.54.tar.bz2 668959 BLAKE2B d12f7c7e3d3d2724d7ab797d4c4cff0ed8fa788edb376f0f25b82fbeb81fb17f68309f3aa5cbe53eecf60e4b18c1c6a26bd80790b152946066eadda34336075b SHA512 91406c4e6f3fc6167ae68760c14e391707177f6e5afde49e09fa90cb70d25cf69e71d1de9cd8e96a6944aa49a44f28deffa86821d93de79cfa3faa95ec5b174e
+DIST babl-0.1.56.tar.bz2 673080 BLAKE2B a172819342e6982249734d2e5a0014bc9feaf882788c50c72494adac7160e9cca4b8d45411c110217b8bd8642fe46689295801f1207e54de1219be5e13a475b0 SHA512 e3d6192126df136537ce13b2858a7ec078251093762052bb3edd826a26ab36fee73375ee854bdf423f22fc30f23bcafb3ae46e986ed6555f3ef0809b12c612ba
 EBUILD babl-0.1.12.ebuild 1336 BLAKE2B 0034d85113ab047a7e0eb363e1bce67246678b4c08a5d562cd4121fa8465ab4c8f571af5ca46fed7e9184e2e710d36a0ecd57dc7c181e47e8a3f0488488da630 SHA512 4b97fc493ade3c9ab855e007120e710a6918875481656f86f9d721dfae0e68d591208f55787069fc6a7473da9ecdabe27dec7031906b3ab0f1116f1b9a7f03d4
 EBUILD babl-0.1.18.ebuild 1466 BLAKE2B 8aa28a3d191cec1963032c99a7b8f6bcb663ba90290062c1e86efd760d96086a9e94de7f0bcc3881ce27ff583d627ded168e81693a9062a563ee47075aef9ca0 SHA512 4b4af9460080eeb97899a303c04527e7c970664b8bc754073b11ac8ace172b048109c40831bad70e14d3bd081a6a9f3509418f6f9995cbc3ae171e5d7a232d99
 EBUILD babl-0.1.20.ebuild 1474 BLAKE2B 670df7c287b3ddb67aa63e770e58d546465f2fe67b484fc4847d761c4268a7582f7af84d55b3ca4db4b7e3a38ea46e9947cd3c1eb75a25683b0df3951fa86557 SHA512 76b6996b06b4b346d500752f2d6096c7b0ad568d8d81c540f0662454175143aa143ca856140cafb96941fc1259e6633892501281b421c66f6b7c1d322e83cb9d
@@ -31,5 +32,6 @@ EBUILD babl-0.1.48.ebuild 1589 BLAKE2B 332a0d1f01e977bd1d657c6c342a012219a229c8a
 EBUILD babl-0.1.50.ebuild 1597 BLAKE2B 60e227d902b027c7cdf4b6835df6a36060caefc0c79ec3dc26943b0c5f57a57db7a462d4337d7affaf6e530a028da277652879ddaf1b5e95ac7a7a56c9c29441 SHA512 03f85b11813203af2ca948dbee32c3252602d9515b98c50046c8cae4b0b3e25f52aa810276c80b247cd7f87b0490f01a99a0065bbf2fa905997d2a46dfabd154
 EBUILD babl-0.1.52.ebuild 1533 BLAKE2B 0cc2974e7b34bd1c19cfa66b7426e29da1b1a7853fddac00032f3718fd625fde73afa6ce295337009eac6366e098001609e57b0bfd2e9219b809a399252167ef SHA512 d0d2a701b353898601c308de5b50c0119f0290c16cfd80b069b02cefff4c308cc21baecffb65203884a7973f042670341bbe97eb3922366ab60d016f4ea372a6
 EBUILD babl-0.1.54.ebuild 1533 BLAKE2B 0cc2974e7b34bd1c19cfa66b7426e29da1b1a7853fddac00032f3718fd625fde73afa6ce295337009eac6366e098001609e57b0bfd2e9219b809a399252167ef SHA512 d0d2a701b353898601c308de5b50c0119f0290c16cfd80b069b02cefff4c308cc21baecffb65203884a7973f042670341bbe97eb3922366ab60d016f4ea372a6
+EBUILD babl-0.1.56.ebuild 1533 BLAKE2B 0cc2974e7b34bd1c19cfa66b7426e29da1b1a7853fddac00032f3718fd625fde73afa6ce295337009eac6366e098001609e57b0bfd2e9219b809a399252167ef SHA512 d0d2a701b353898601c308de5b50c0119f0290c16cfd80b069b02cefff4c308cc21baecffb65203884a7973f042670341bbe97eb3922366ab60d016f4ea372a6
 EBUILD babl-9999.ebuild 1603 BLAKE2B 8a870dfec71b8ff498107eba616c3878784c94f1dcc528d4c41df02323cab14f61d3777c87e999acfa97ac7768c92eda3262daa494779157b29e1c946511b988 SHA512 eeab542b8d7eecd2142cfc89f2948ee4a475e35dbaaa3c4d3b726b1c2d3f34c3fcdd0a2d29df2a6dcb35ce60e217462fb7c267a8b7d699147af252d9dbca5232
 MISC metadata.xml 307 BLAKE2B 95a78257a39aec8fdf8c1c1c1fa0a6f2d911f6c7f22021021f3d1457d7beffad0a47b0f0131926e988340fccc4ca8ef49d086940e0e17acb89d4f3c6845b79f4 SHA512 a86588c27e62fec9d8474d9ba5edd9d235a6ffd1251d5ba729593ba7bdffdb272020567a7db2d596f17bba9c2a39a75eed9ac5eee5e0ba73af081a05fcb1af9e
diff --git a/media-libs/babl/babl-0.1.56.ebuild b/media-libs/babl/babl-0.1.56.ebuild
new file mode 100644
index 000000000000..e3d94c34b54e
--- /dev/null
+++ b/media-libs/babl/babl-0.1.56.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit ltprune
+
+if [[ ${PV} == *9999* ]]; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="git://git.gnome.org/babl"
+	SRC_URI=""
+else
+	inherit autotools
+	SRC_URI="http://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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"
+HOMEPAGE="http://www.gegl.org/babl/"
+
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE="altivec cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_mmx cpu_flags_x86_f16c"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	>=sys-devel/libtool-2.2
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# Automagic rsvg support is just for website generation we do not call,
+	#     so we don't need to fix it
+	# w3m is used for dist target thus no issue for us that it is automagically
+	#     detected
+	econf \
+		--disable-docs \
+		--disable-static \
+		--disable-maintainer-mode \
+		$(use_enable altivec) \
+		$(use_enable cpu_flags_x86_f16c f16c) \
+		$(use_enable cpu_flags_x86_mmx mmx) \
+		$(use_enable cpu_flags_x86_sse sse) \
+		$(use_enable cpu_flags_x86_sse2 sse2) \
+		$(use_enable cpu_flags_x86_sse3 sse3) \
+		$(use_enable cpu_flags_x86_sse4_1 sse4_1)
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
diff --git a/media-libs/chromaprint/Manifest b/media-libs/chromaprint/Manifest
index aa2e1c39d6bb..29f45636d054 100644
--- a/media-libs/chromaprint/Manifest
+++ b/media-libs/chromaprint/Manifest
@@ -3,5 +3,5 @@ DIST chromaprint-1.4.2.tar.gz 613367 BLAKE2B ffec54c952a35f8f5bf6bc74b5d58339af3
 DIST chromaprint-1.4.3.tar.gz 613741 BLAKE2B 728f08e14c46a36d98c3a32a7c7a221a48b51561b623a403d9bee6aeea5cb5254866da26d50db0dbc5b0b4ceddb8312d52a8aab4c2979709bd2c8221b9e84d0f SHA512 101360bd643d2410fafcdd4aef8fe4c716ec728f0e4b9b3a62ba125fe010b0315e55a1839a2ca8c29d9abfbf8171560b23d68b732e75632ce8f4a4698f77ea72
 DIST gtest-1.8.0.tar.gz 1281617 BLAKE2B ac052b4d0eb0d8ded03a8c7dff05177818627b8a51f2dbc2c162b2ee2a5d1323539e7d0d02236d9ebb799995e018f0171c2fdaeb4de3bb339548265e50de79e6 SHA512 1dbece324473e53a83a60601b02c92c089f5d314761351974e097b2cf4d24af4296f9eb8653b6b03b1e363d9c5f793897acae1f0c7ac40149216035c4d395d9d
 EBUILD chromaprint-1.4.2.ebuild 1355 BLAKE2B 266f15e363ba036a702044d0e067e779e9db15cf6874cc1fc8f543f48ed877f56a430f66bd3f04a7898f9f73e6cdae54e3a6a0a6cc2ef24a0ee53c71f35d9f29 SHA512 9619edbec8b7c40e60985a65c7f146f56f2d3c380512b467ef37a0f02fce4c0ef921ea3ded9fc6c730dd9d7350829476ec7964c73cb4f3c0159e661eef9a1036
-EBUILD chromaprint-1.4.3.ebuild 1468 BLAKE2B a7aca368f640e533b391838aa2b865442310d6c210ef64a4872b8245417e4b19dba18cd20738ba7195d99dd66b31c038af01d6cf40b352e8cf9a2abf7ef69120 SHA512 7419ae2d36b6cb92a1d8aac11075eadd1775358768b890ba58a32a12b767a307eacafda9e88c7cc92909b213a16ff42d3b8babbf91f2cdc7ab66f1a6911ca344
+EBUILD chromaprint-1.4.3.ebuild 1462 BLAKE2B 95664cfa90ba5ed4cc0edb9a29491eccef1a55a1e4f78b10bce55ef3abbef3d073240900f6270ff8fcf9d1413c9e187ffa2da8afdaaf15e84eb15bd00cdbc436 SHA512 c4760988e86265a575ec825a443820619e6b51a163564f27eb8abd1d90fcdd793d40f59ca171b73c26045350a076e7e3ee1ef187155c3862d1ea3704a89dd11d
 MISC metadata.xml 502 BLAKE2B b4f7420ba8b5e4004b6f8fa9cc70c0eddea04a0e1759c9724b94198e3df99c2505893706cb5232c643a43208822d7ef5bb56660c76029cadb52b9a0562fd8021 SHA512 229e807429496e637ba289f269af83eca274c53eb2fc2d9dc5f304c39118eaf1d0ae9a5cca01ffa1958d110c55537f1792e26343bf3309ad72b1f0411af9dafe
diff --git a/media-libs/chromaprint/chromaprint-1.4.3.ebuild b/media-libs/chromaprint/chromaprint-1.4.3.ebuild
index 12ae454f9693..2d24d62657ed 100644
--- a/media-libs/chromaprint/chromaprint-1.4.3.ebuild
+++ b/media-libs/chromaprint/chromaprint-1.4.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/acoustid/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~ppc ppc64 sparc x86 ~amd64-fbsd"
 IUSE="libav test tools"
 
 # note: use ffmpeg or libav instead of fftw because it's recommended and required for tools
diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index 2ad4627853ad..380a85826b11 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -6,5 +6,5 @@ AUX fontconfig-2.13.0-names.patch 2421 BLAKE2B e8e922a445dee1d7bc77b72384cf3ab58
 DIST fontconfig-2.12.6.tar.bz2 1624683 BLAKE2B 48432f3d3cc90240ec19dffb6714e7f780eb6b401693b40e2efa2bb593bc89c42b03c99fce8f2ceb7c108da254dc248d91a790849d22feaa50a725338b80fd1f SHA512 2a1d3e62cae2bfcae2e67e9cb75ab6534a35bda4215f1ad4b8bf757e77e7d9d609c016562f5288fd10046a0e94655a807f6dd044d7868ed81a146c4275c4dd06
 DIST fontconfig-2.13.0.tar.bz2 1700500 BLAKE2B bf137b27c9f73c5e2763b7a4a443a4aa5016bd3c0e35138249c2cf8841eb364c8e7bbea6495b53b88de26e3d5a429ebfb598a9f4fe7d875028a621df592ff35a SHA512 f0ad8f2542c8b1e900f5c3d213466a31dd3785da726d6eb455b6734c71c6e5751b28172203e2f9668e9c8e1512072235ea46a1a5e6a85ec54ccc332adb4e5fbc
 EBUILD fontconfig-2.12.6.ebuild 4925 BLAKE2B 3f5cb18e7af4f0b20020b52d6804b8410fee703164ba3f62dad2993dad51b17f3572af57e3b9229f0e420235481c0c018247dd5e19bad289ddebd8cd3490f5b6 SHA512 9fff043fb6ea1445198868f96dee0d626c1cda0948893cccd05e8ea002282e3a1bdf8e05d59ac96c047a203a6ad00e17d365396188da3557d8b583c26a4bf011
-EBUILD fontconfig-2.13.0-r4.ebuild 5177 BLAKE2B 563b84a4cdcec1c807760fe3eaae980a622a255f4c6ca7e8ed2f915be04091003384401d7b9f1fc4868aeab375baf485b99e98c19030c49be12787b16835550a SHA512 a223d661449ff058445d1e0e35cb2a0199a55f1db1befd4bb7aa1b391e748dedfea971edc3837dadff696022a4c362120b85dcd741cbb86028023cf7994e81f3
+EBUILD fontconfig-2.13.0-r4.ebuild 5201 BLAKE2B 066d56a8684f2ba3fc3b1c41360a1cc75161116966eddfa078fa17ed84ca86d6e83491610f53736914fb96597bab7576629395cbce5136877b38c6f7afe89392 SHA512 fcf61644a570f56fa8173c4886f187ff8084e8cb199c7c206a31adf4535a845dcfd36531bd480564292ef910c4d4c01f3dd5601d7d108f06723cb89499eb60b7
 MISC metadata.xml 500 BLAKE2B 5326535fbf21d56868f15d3e5cda11bddba722762423b8831da99f9ff31bee71ed6d4e5ec62af46a7981c233c9d516068257413cb473c02657d3543619692b24 SHA512 bfc956b5196face33a60fa495b7948cd8f01802f23efd02da9da41146443b76f3d01ef5192a7541dd65e107df5e1935f73f5bfdb939c14fdde599919c7fde190
diff --git a/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild b/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
index e8703c5c52e9..2127a830b0f3 100644
--- a/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://fontconfig.org/release/${P}.tar.bz2"
 LICENSE="MIT"
 SLOT="1.0"
 [[ $(ver_cut 3) -ge 90 ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc static-libs"
 
 # Purposefully dropped the xml USE flag and libxml2 support.  Expat is the
@@ -24,6 +24,7 @@ RDEPEND=">=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
 	virtual/libintl[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
+	>=sys-devel/gettext-0.19.8
 	doc? ( =app-text/docbook-sgml-dtd-3.1*
 		app-text/docbook-sgml-utils[jadetex] )"
 PDEPEND="!x86-winnt? ( app-eselect/eselect-fontconfig )
diff --git a/media-libs/freeglut/Manifest b/media-libs/freeglut/Manifest
index 10c3b5601b64..1e55496cdd71 100644
--- a/media-libs/freeglut/Manifest
+++ b/media-libs/freeglut/Manifest
@@ -1,6 +1,6 @@
 AUX freeglut-2.4.0-bsd-usb-joystick.patch 755 BLAKE2B 858a7f7b4845e75963855cd7d6191cb57c96da017faf50a78addd75a994a53f5adca66c33e8aa2564623a469596e443a24caefb3288b2e77e768ee13e8b3d287 SHA512 7aa28f277864357e9b2bb6e7fcd801bb9dd6e131fec8989aca26990cf59b60c3465030ea5068ca01cb7f46bf406c0f3fce2327affb7f288ee3026b5717717561
 DIST freeglut-2.8.1.tar.gz 1005343 BLAKE2B d830f6d19659ba6bbe60fc9c981ae16582de8d90e05d58bcaee43133b7699a5f0b2507a777c11c5fcdb730b17c394dd6fc562d5e857024d99d4feb2130ff7cde SHA512 935fddfa197c5f0ec74c5f2005fe5a0ebfd39f4a402cc79363da7cfe2e8576263130e44bd7e4f6c07ea53d3137bd7ca8ee8db85c0a09f25508fcf1b9ed07052e
 DIST freeglut-3.0.0.tar.gz 419095 BLAKE2B 6065044fb2816ddfebd363189cdb897e00fa433d79c09f5a705b80ff730e1312158ed5db8d7a2cbfc2ddac0d0a9400300c5c245d967c33c937da11303fc316de SHA512 9c45d5b203b26a7ff92331b3e080a48e806c92fbbe7c65d9262dd18c39cd6efdad8a795a80f499a2d23df84b4909dbd7c1bab20d7dd3555d3d88782ce9dd15b0
-EBUILD freeglut-2.8.1-r1.ebuild 1093 BLAKE2B 02f6fbbe3bfa11a27e36e4189d5422a8210870ba02288681634c3a303907e91990385234e3fe8cca6b7bbd932210ca4a092c709f2e4480a9fa0807e31fc43f75 SHA512 3065ef4d85722f1bfaa98331ed97609f3295f73fe9354f5aab17f04f5a1a1c234d68fe004de71dfd1bce173e716a7a0097a00cea1e6656a12977e94129e15065
-EBUILD freeglut-3.0.0.ebuild 1219 BLAKE2B 9d031ffcf0a789e6fe6310819417e6ec0b49d823f425fd4cd05da45da9a63fce13e69212da1da61a7bc0e35bf970e0ee1e06926889d3a47679fccb8e70fb1dee SHA512 14de4daeb6eddee38463bec2b6669af86b902f4daef17679b132f23c1496c67934c518a9b865b61709932b976ada7925b5c6d4fd5071a1807a1891f54033cdf9
+EBUILD freeglut-2.8.1-r1.ebuild 1091 BLAKE2B 6f80874ea0d55177b70898e7886a9b4f016008a8672e8fabc82ec88e4d29ecfaf7a7d7e031cbc88760056881a87db2c90342a6b4f78d9a70d634fb4544b9f451 SHA512 87fb9a6d839b74c77a2e1fcd4c51bee57d34cf57f4f4d7eb551c478a7f1ae6a714470e18b9ff7d6cade2364953a48fe77278d75a7f3b81389db7b23676ebb40c
+EBUILD freeglut-3.0.0.ebuild 1218 BLAKE2B 9a8ca641d99a2cc91fc3a78400c2380d76aaa8ecf7c3405d3bc3c8a20a9fafbc29cc360638547bd25f8dff401b096ee8ce839685db4c6047d3eb5fa8b42bbd29 SHA512 bb14cd5cc3d8e120a2ada00d6afdb469acabf348a592a910edbdc44537a5132c3a3773a7f93a38eff95ca14de3b91c3051f3cc39df6419fde7d57fcbeda0cb68
 MISC metadata.xml 528 BLAKE2B ee8c09e46677ec77c1d6771b31ac1b28e75464d7e0e4405c41831e19446c5a442c782dbd32a79d0fe5e7ed85ecbd2404764f2121f5f4bff5483db4571fd89212 SHA512 94dc412f8f049bb88723fdba9f9b89645eb792547a768ea524a711ad9302c5cac38a7292ab09726154fc6829a05f41af05220f91d9f6eaed056e4cff8324370e
diff --git a/media-libs/freeglut/freeglut-2.8.1-r1.ebuild b/media-libs/freeglut/freeglut-2.8.1-r1.ebuild
index e82008028a8d..ddd46e1ea7da 100644
--- a/media-libs/freeglut/freeglut-2.8.1-r1.ebuild
+++ b/media-libs/freeglut/freeglut-2.8.1-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=5
 inherit autotools-multilib
 
-DESCRIPTION="A completely OpenSourced alternative to the OpenGL Utility Toolkit (GLUT) library"
+DESCRIPTION="Completely OpenSourced alternative to the OpenGL Utility Toolkit (GLUT) library"
 HOMEPAGE="http://freeglut.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
diff --git a/media-libs/freeglut/freeglut-3.0.0.ebuild b/media-libs/freeglut/freeglut-3.0.0.ebuild
index 2d031d28ddbd..2a60b23ef112 100644
--- a/media-libs/freeglut/freeglut-3.0.0.ebuild
+++ b/media-libs/freeglut/freeglut-3.0.0.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
+
 inherit cmake-multilib
 
-DESCRIPTION="A completely OpenSourced alternative to the OpenGL Utility Toolkit (GLUT) library"
+DESCRIPTION="Completely OpenSourced alternative to the OpenGL Utility Toolkit (GLUT) library"
 HOMEPAGE="http://freeglut.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
diff --git a/media-libs/game-music-emu/Manifest b/media-libs/game-music-emu/Manifest
index 64217a532c78..b34883bd97f5 100644
--- a/media-libs/game-music-emu/Manifest
+++ b/media-libs/game-music-emu/Manifest
@@ -1,3 +1,5 @@
 DIST game-music-emu-0.6.1.tar.bz2 171140 BLAKE2B d42a34fa531cf5da8ddd5b1d72cf7735c9edaad67bf47733d75dd74c201652d4031bdc3d634a5f64317957791db0446e96e788c4c07cbdb1c908bfffd094fee0 SHA512 06b3544086fae51361706b0417ae1bc3769863c7d060ebabdd09b930d37df973314c43afff32aedaa9ebb74cdeafdeadaac4aa5d448700ee961d79d7fc9012b4
-EBUILD game-music-emu-0.6.1.ebuild 487 BLAKE2B 931290940f303656f6cfd2a7a8c1e8b3039ac12282400e65e1d5277e1bda7311f6daac3bc93399351c7f3104955933657f05346515af6b47e994c6c963409589 SHA512 58fbdce32e2350dcd62a7faf9f0a00632d84e7651764fb7d37180c4a2a2c12461b93f0332c6464bc3d1aa9d47a6dd014d0deff7ea358c99cb210341ab52b511a
+DIST game-music-emu-0.6.2.tar.xz 163052 BLAKE2B 8bce2a5c09eef947f02cfc3521aa380564ddaad5f8a8f40ac38b645fc146332ba1cb6755592892dab00200c169a4d1f94978d80c52976c04e120d9d01c8db9dc SHA512 1808d28b54cbbd8dc5e3240eb27d2e546398fb62ab6577e59430a7543cfdaa06482f70b4750656b73a05f1c1bc0c0254db97d0940271ea2144724e1c44f5da10
+EBUILD game-music-emu-0.6.1.ebuild 490 BLAKE2B ca4d490aaeb4e4a55a45fc7f42d4dc84b761c15c0b14604edfa9d428d2312a24f070fe8bfbdc569935afd77a9f38e237ce4d04a1c0aa47d5acc87e355e80aeb5 SHA512 2a5134fc33a4c54aec96b33b8dc6e695eca618b9fdc853a54aa6c792ec40c511c1578a21704f4c8a5ffaaec2a3f4ba5ef06a31ac39f74298330ea2f9617bd721
+EBUILD game-music-emu-0.6.2.ebuild 496 BLAKE2B ae0b4de6994c18a50d0e08c5fad8694f5cb068bf3a59912012ba78e6b93c3457a3d6f4b0befb06aa4b1be7154262927c6fb3fe00449488b39cbd2167a9a3953e SHA512 930a00eab07d0cdae0c194d79075dc2fa852400e70366081240fca140320692e04b696b38238af468ca453cf7b05d2a70e4d3d9794d3f6c4c62c6a0f7374be7f
 MISC metadata.xml 400 BLAKE2B 1dd7cab3e13a3364222e52dc2e4c3dcbeb12e4169aaaa4196bc8ab325e42e04aa7b8aaa6fccb64db1de7ed6163d3060fdddb6df21c7243c4c0b3a7b7f28bd3ed SHA512 2abd1362876b6019d1538a6cd6a5740c29c1920037db3f3c622fb7c533a64b6d559ef8cdead9e2fdecc9c64c799fd1d2f8fc5887d493354604e4a99ed77cbf1d
diff --git a/media-libs/game-music-emu/game-music-emu-0.6.1.ebuild b/media-libs/game-music-emu/game-music-emu-0.6.1.ebuild
index 70c22bbe3c9e..116ab63d0cd2 100644
--- a/media-libs/game-music-emu/game-music-emu-0.6.1.ebuild
+++ b/media-libs/game-music-emu/game-music-emu-0.6.1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
+
 inherit cmake-multilib
 
 DESCRIPTION="Video game music file emulators"
@@ -13,4 +14,4 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
-DOCS="changes.txt design.txt gme.txt readme.txt"
+DOCS=( changes.txt design.txt gme.txt readme.txt )
diff --git a/media-libs/game-music-emu/game-music-emu-0.6.2.ebuild b/media-libs/game-music-emu/game-music-emu-0.6.2.ebuild
new file mode 100644
index 000000000000..f2a08154d906
--- /dev/null
+++ b/media-libs/game-music-emu/game-music-emu-0.6.2.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-multilib
+
+DESCRIPTION="Video game music file emulators"
+HOMEPAGE="https://bitbucket.org/mpyne/game-music-emu/wiki/Home"
+SRC_URI="https://bitbucket.org/mpyne/game-music-emu/downloads/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+DOCS=( changes.txt design.txt gme.txt readme.txt )
diff --git a/media-libs/glu/Manifest b/media-libs/glu/Manifest
index 4b10a2b8b3c6..9297be50de3c 100644
--- a/media-libs/glu/Manifest
+++ b/media-libs/glu/Manifest
@@ -1,4 +1,4 @@
 DIST glu-9.0.0.tar.bz2 493206 BLAKE2B 9c8c27bf8b415f4962079f200f64d4ecadaabecc7cddf832ccc75146b30260bb386ddb87cee26d911f6b7c2451ed0484e0fe8bfa39ac27e33b87a2b5d025ca81 SHA512 ff920e3fbca739794e1432a92fdd8517aa732110fea71ed724185425042f83ce18e9866c16f95c6e10f6993f0814a90fac9636e2b3d8ca2084d1ac0a860f61c8
-EBUILD glu-9.0.0-r1.ebuild 866 BLAKE2B 606c9f855435751dd58b9495d2afa9f7fb68186a9076ee12235b3444c3e35deec3b14730319faacf4b27028400d929180fc0acbb1be54c09cc605ec04b1ca544 SHA512 6bfeb606a727dcf359be4a073790eb6c32a39a59bcc06ca415a9cff8dfdf1d8c6d608682ab2dbc5260d161050cc8a940d5119ce5d23dc3be460f6d048845ee54
+EBUILD glu-9.0.0-r1.ebuild 865 BLAKE2B e097e5308f0ef4403fb9bd237c4c58e720cc1380a1276fae8c544246a262ee2be7f39b5bbd07f8e0170ef15482b2d883bcfb2775bd9a092980b3074a8c5cb84e SHA512 5814b22bc8c7c01561015e82de39d6db0dcb85d8a6837f2b3267bdb8402f8c294c425875a4044aeb03c175084691ddabeebd25efd8ff94bccf3b1f4199db39d6
 EBUILD glu-9999.ebuild 1110 BLAKE2B ff62ebb8660e3507d3bb8a72859a52b914577e25bbdcb1cee3a665988b3eb9c37d44e4f1036dbfc34ce564e7efbaa5a51112894b8afa66cef008949a9fbdfe89 SHA512 f60e1a9f41a41488e8d53d1c1fd11d07e44d5a29e00b87af9d640d01ea3b711a5b36bac1fca2aa22ab4257e2be6275e5f18fa4a07e83f40636236d3172bc1cdc
 MISC metadata.xml 240 BLAKE2B 7361e68ba9e9d62530d9e45896fa3473e5606d67f87f78f4be394145abb8ee5851fff417cbd973c913a05ce60530eca628c3864cfeef75bf7b5f69b3e8e87da8 SHA512 e23d56b08b47406b57f50a1028febb4c4e1809ce967715b2a46aed1124dfaf306a85a3b2398c4ce058df4305bfc8645b79e8ef3569e6cfe8ec467f63e967b5d1
diff --git a/media-libs/glu/glu-9.0.0-r1.ebuild b/media-libs/glu/glu-9.0.0-r1.ebuild
index 379b61d7c309..2c66edd816d4 100644
--- a/media-libs/glu/glu-9.0.0-r1.ebuild
+++ b/media-libs/glu/glu-9.0.0-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
@@ -20,7 +20,7 @@ if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://mesa.freedesktop.org/archive/glu/${P}.tar.bz2"
-	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="SGI-B-2.0"
diff --git a/media-libs/gst-plugins-bad/Manifest b/media-libs/gst-plugins-bad/Manifest
index 855d3443b1b4..a354dbd7c418 100644
--- a/media-libs/gst-plugins-bad/Manifest
+++ b/media-libs/gst-plugins-bad/Manifest
@@ -6,6 +6,6 @@ DIST gst-plugins-bad-1.14.1.tar.xz 4651852 BLAKE2B 915798f9d07e18b445cae818978de
 DIST gst-plugins-bad-1.14.2.tar.xz 4664260 BLAKE2B 477c9a864088676ead3170dc11017ad997c4d0ef136845a7ad34d15745d5f1abf4486dda7a226feb5ff6c7c65c8788cd39eb5e9901f3f15a426d79bf2b81e78c SHA512 7282c8941f1eabf7141362bb8e61097b3b26ef39410ae767712c34d7e40779fc22f6ea97a950009fdb6d62175f9a153d435ead8f663cf66cc6af5aac7f2a73db
 EBUILD gst-plugins-bad-0.10.23-r4.ebuild 1565 BLAKE2B 8907f6548ae1d077342bf0f35280c9cd59c492bd8a2e23e9c176c1682e32cab561835123af61fc40067f55c43574e401aa16e418ede39a56786744f741f203f7 SHA512 6c68c102487868c23bc177aa65a9a734f7e2cd89bcca5af827d98dcfb61d26a84b09a07d4ec6d7397a17ffa57ab33fdbfc5fc290bb9eb397209150da86ebb492
 EBUILD gst-plugins-bad-1.12.4.ebuild 2819 BLAKE2B 19d7afaf0e34e98ffd67ac1dbb453ce8477cd719803560a445e0cf2c8829c07f8355780151cd2273ea36e4bf624c1bdb278507ab8aa0da44e42746037abab895 SHA512 3414136d383f5669e11edfee11732de39b5f4f1fe20f821e2add0cf0d66b675fc337bfeed392770d3beee2144b70505c067121a2b7381c67c347dec431986425
-EBUILD gst-plugins-bad-1.14.1-r1.ebuild 2610 BLAKE2B 40ae19b9a9a4fc1da539d401ec3ea5a601da128ab55f8fbeffd3dd4000bee4b834451c54ceda4e788698531b487c6496c88ba3c4ba0a787a19c0a299b3c9f7f4 SHA512 a604ab7f28db3df03a1d459756be3eecbc3894a17f58bb462d645b6a7e9c836eca2d29a16caf02885aae3277200331958198b695912f9392146ec0ce606fed67
+EBUILD gst-plugins-bad-1.14.1-r1.ebuild 2609 BLAKE2B 721f749819d27e5a3f0ebca333c8f319c3515783b18d8b60e3512353917afcfd43b75db5139b55bbfb1baf5fa49c8ca07f38d3d75ce2849fbb9bf2ad02c7e78d SHA512 ec5c81a1d5dde75689cbcf11aafadb100fd7536cc74dc8deea5e7a90f210ca4acc165df844aac7946d2e17978cd36cea0ff05caddf51e0a6a564e87ebdf5a2b8
 EBUILD gst-plugins-bad-1.14.2.ebuild 2616 BLAKE2B b02623dc74e3d00029d03361886d00e45520d677eb600415c0a0c3343a5686f25c21c8706497f6516fef160f58207936460f842f9aafef42c37fc19c3db59ace SHA512 c335ce9e3f45831d1bbd8d84839d9a4093ff4e25f88eb855bd61dd5b80c5ae74c241b6fbc9649eb170bf3e6fb962d7c3cccef8a2342fbd95ea4bc1b19e93745d
 MISC metadata.xml 439 BLAKE2B 5a4a36ccf4bd485eaf1fa66650eec8fa592d4c5bbf9fa478f1645e1b39649b7115694bf55dee7aeb4a5c53b2ba3c4614591cdf4e7d745938397c304108e0aa7c SHA512 9bd27a1a513fc2d697f7d0f2ceb7fa0701c446fe21b597256afd4c2c1f44145e875323ed1ef6202bf7b85472ab4aab43a4b6db5795bb1d28ff53a2a7e484055e
diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.1-r1.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.1-r1.ebuild
index 7f18ae9c9e78..ee610b243d95 100644
--- a/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.1-r1.ebuild
+++ b/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.1-r1.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Less plugins for GStreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="LGPL-2"
-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"
 
 # TODO: egl and gtk IUSE only for transition
 IUSE="X bzip2 +egl gles2 gtk +introspection +opengl +orc vcd vnc wayland" # Keep default IUSE mirrored with gst-plugins-base where relevant
diff --git a/media-libs/gst-plugins-base/Manifest b/media-libs/gst-plugins-base/Manifest
index ba7a42571ab9..d9a7389c8b43 100644
--- a/media-libs/gst-plugins-base/Manifest
+++ b/media-libs/gst-plugins-base/Manifest
@@ -6,7 +6,7 @@ DIST gst-plugins-base-1.14.1.tar.xz 3689184 BLAKE2B 17abcab2c84b113180de55d6c781
 DIST gst-plugins-base-1.14.2.tar.xz 3693856 BLAKE2B 7ed05718bfd1dcb15e05e5a2c8758ad409c4ad7f331146363f264aaf7123c8a14c1db81f482710d1069d33e5281087f66e2e38504e39b214befba73ffdd9295c SHA512 35e7eb5c42fe265d38c433575f88d3306f15ff927a989eb375ed5399cbf92af2e9bf553d6eee349dc13673540cee00e1f879595f25e58c188ea443d8a969682f
 EBUILD gst-plugins-base-0.10.36-r2.ebuild 2120 BLAKE2B 5e670a72e651af6a8ef1e4992fc42a7a444e9a77e708b86cdf5d373d96cc549c2953df5da5b001479938f77498eb09de861e89e705ce555618cd45227209a769 SHA512 bc9f491322b473f7ae2a55a7fab8315584b1ef3f71f94ec4968705fb1063d72e6dd2dd80342bd85b7abb29315abb26adbe3002c94c7a7ec27517c8edcf32eafb
 EBUILD gst-plugins-base-1.12.4.ebuild 2635 BLAKE2B 135ac9f8423f4d994fc90320871716c18bc37afef01fdd8fbadb25b1b37addd05aaf9efe915850a64d041f3d1cb52231cf64af87021cb4cc24205e4618d85536 SHA512 01ccfae2d189a9506ae1261f15126aee3967bf76e91808d88b0d2214083e19d628ceba84e44b6a1f47ef673137d42dcecf13ba7750e4f279dbc4a605948e3f76
-EBUILD gst-plugins-base-1.14.1.ebuild 6101 BLAKE2B 59b7553bf67e3f8c293cd45c2db84e5012babbef8bd026bba645500c9f723dde58bff6b0f0d796c1ce680f858263009af2718ab084ba03322097d5416228f6e4 SHA512 4527760fb7655f9cc0f796f992a4a936e63f3bc5573a0407736b93e78dbef4e1f289738c15cc98841b4cdf2de38927d99fb1a338b01d8a90fc24bf66b4b0053a
+EBUILD gst-plugins-base-1.14.1.ebuild 6100 BLAKE2B 080dbc05e8d365f1d6637e56804ae52c7f2f5c15ed3e8061671cbd09419afafd1146c7868ddac357b3b5f9f241b9543d8d27d86d1e3eab5f1c93f7d8fbcbc03d SHA512 e9f2db66f46cdffadb8c2843d0c5e4045cb44d81bacf720d11f1fbeb4eaa2c04134a7ea2681c88ba4290e70d3647bf916a456e27826589563f64f6859486bb21
 EBUILD gst-plugins-base-1.14.2-r1.ebuild 5876 BLAKE2B 52c207b6767159345add53e4a7a811e012bdb42fc1026a9209c5a2f8edc6a827bdf07985efc672d5e43a8a54c70694ec07d34d02464d1f7e52dc5ce607ff89f7 SHA512 99f50208cd8a35919d6141928b12e562b9274ffb76e282793241dd6799968e44347a94c530b6239b3d34ac059326104d56c357ba6e3ca4f6b2474481be686454
 EBUILD gst-plugins-base-1.14.2.ebuild 6045 BLAKE2B 2b3b0519874526c0780d01380259a0a4986e613af7a4491941e85e504134c505a343812086f128fe251ec912ff528926d96e9f845a524f73162b78b4682e626b SHA512 e88bab789aeedb188724faaa92f39364219b1e512ce1279c2ad617b8302bea1372bea4a1ff57060e12008e81e8627c3d102ed46b2f89b461fa8c01ecd3afcf3b
 MISC metadata.xml 1065 BLAKE2B 9736df3218c6157e5cc0f14e96a15ec6ab6140e8774c7361dd4fe9378efd37d1a3da593527313a81591818ad48a5585bd4395fbeb85d357449b00bf7e51bbb5c SHA512 520802b59fc6575e16edd765dacab4ff0ff6e51dd162f03fe7e4e07eb472aeb78f3974a32ba613939932e123179106a450c503234ed806a08416dc6b8dd534c2
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.14.1.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.14.1.ebuild
index 6b6a09e0f0f9..f140744db6d8 100644
--- a/media-libs/gst-plugins-base/gst-plugins-base-1.14.1.ebuild
+++ b/media-libs/gst-plugins-base/gst-plugins-base-1.14.1.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Basepack of plugins for gstreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="GPL-2+ LGPL-2+"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-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 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 # For OpenGL we have three separate concepts, with a list of possibilities in each:
 #  * opengl APIs - opengl and/or gles2; USE=opengl and USE=gles2 enable these accordingly; if neither is enabled, OpenGL helper library and elements are not built at all and all the other options aren't relevant
diff --git a/media-libs/gst-plugins-good/Manifest b/media-libs/gst-plugins-good/Manifest
index def3604b8a61..9374567c9e41 100644
--- a/media-libs/gst-plugins-good/Manifest
+++ b/media-libs/gst-plugins-good/Manifest
@@ -6,6 +6,6 @@ DIST gst-plugins-good-1.14.1.tar.xz 3776168 BLAKE2B 5b17ac49d5bae423ee887f1516ba
 DIST gst-plugins-good-1.14.2.tar.xz 3779912 BLAKE2B d49f82a6be7423d233ec15660470533d6bfc5da3d2ac5912ce7b3f97739b1540424c02593aff269aae3df7c6f15ca37b2d9d45fe85f3b36b910cdac4ba98f093 SHA512 26ff40d949ab95043ed717350fb344a616c72b049cd52c3e7debd9cc37f73eb9d4704b4f437ba257cecb9dba702ce451647279cb821e9405b36210b46ae9aa05
 EBUILD gst-plugins-good-0.10.31-r2.ebuild 1661 BLAKE2B 25c45ebacc5a0a532761dcfdf49cdd4dbd1b61a133dbf1845d293570bdc203b4e9b72b917e5e8833ad9fee0f8595d6371615ae5fb0a2d616ac2f0dc3bf31260e SHA512 a66cb0a552686b588d54a962e9888c29edcf49442aaefa665b753658e31a96b108b07b7fa8033eb4bd7f0535a2fd4b3a6fa8ecc1a91649fd3ab0456e91c01f0c
 EBUILD gst-plugins-good-1.12.4.ebuild 1431 BLAKE2B 464355f1ed004290395cb487a31d32c82a61e400cac1b0260c1e4254854db8d4414fda88d849502fcac10faab192018959a6d4386861300c391843d2dee23186 SHA512 1b7e52559dc1287bd8b9b1256464c21662f396f648cf50a66430f712bdcad6baf52c03e78c40153795df74586ab71f4f0cd219b38ab743f00c063a8546d1e568
-EBUILD gst-plugins-good-1.14.1.ebuild 1501 BLAKE2B 3d3f9d389010429416ef4fe554264fea7370af31167be1ce39428164710b4814bd0b4ba1b06ae83a02d2e15dce1a39f7fd40bbd5dd04d82c2f29edf0e3291088 SHA512 eef75c2c90ab39d345845dbbf4ffa046bc2f014498bdb2948854bc044521f67698efbbe12bd6808a16a190c7e85a66303119f361795f326f1e6ae3eca1e8a936
+EBUILD gst-plugins-good-1.14.1.ebuild 1500 BLAKE2B 6e7190d3722375e120d6bf12495eedcf96967bcaadd851ad4404584db3565bb2766953e7a6977ba34d4a9493d4824b3265f5a60214c40e04b4987044c23ee13d SHA512 a42035a11bdd729a17ca569ec898ecd3785cb9042527458cd81dbcd20030d0d1687cdb138d24277bb3da31355e1bfd75e3b0e9a8e6f7becf3dbaa6459d1de6c8
 EBUILD gst-plugins-good-1.14.2.ebuild 1442 BLAKE2B b2c006b4f5ea87049b61b3f24ff2c256eff3fd4281c640419e95e3a7745e7d92d7070399f4727fa0ab9f750b7964c2870c4aa5308736d45be241c14dc576bde7 SHA512 271bda64072634995858e6c3af499a77a87df4fa3fc60131b4e305058211686ca5a2516a4231725ed44f3dfc82d800c0992aae7f31061d662f616685b7e6e3d6
 MISC metadata.xml 266 BLAKE2B 3180109d2a1479e9436a76fb478dfb1b23db0daedbf0ef264a469fbbfecd858adf6ec01f3fdc5c56270d0a9e1e150ac947f4a1f893e967d6b1dc1f1b8f6d4ccb SHA512 aa2ce82fa0c848119ff309462722e1d7897da904f9e1dc9ae12dd61582823b69cf5a40faf8da0825ec397d2f01d44e82cb56730d9545abd619a17696091eca75
diff --git a/media-libs/gst-plugins-good/gst-plugins-good-1.14.1.ebuild b/media-libs/gst-plugins-good/gst-plugins-good-1.14.1.ebuild
index 9e3be4a177fb..f231b4b18f7a 100644
--- a/media-libs/gst-plugins-good/gst-plugins-good-1.14.1.ebuild
+++ b/media-libs/gst-plugins-good/gst-plugins-good-1.14.1.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Basepack of plugins for GStreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="LGPL-2.1+"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="+orc"
 
 RDEPEND="
diff --git a/media-libs/gst-plugins-ugly/Manifest b/media-libs/gst-plugins-ugly/Manifest
index ed8b1a941bf9..8b29f9d63abd 100644
--- a/media-libs/gst-plugins-ugly/Manifest
+++ b/media-libs/gst-plugins-ugly/Manifest
@@ -4,6 +4,6 @@ DIST gst-plugins-ugly-1.14.1.tar.xz 884668 BLAKE2B 8e1cef0ebabac65ad2b1d6ac3fdc0
 DIST gst-plugins-ugly-1.14.2.tar.xz 887116 BLAKE2B f1dc5732ef6e9dc7909d1131d36429cf140c6861b07abc97818afbf180a9fc986914c23228328126d4a93f5da234238f95b96ad36e8a4ffdec76554a24ddd213 SHA512 7902a6ef6d207663eebf00d630aac9c20b1ae0c333890f1f6aba8544eff0ef4d349b4d1d0e481d8cbcd5b1800f900ea4e6a0cb6017b0727559ab5c5acc3d0ea5
 EBUILD gst-plugins-ugly-0.10.19-r1.ebuild 1058 BLAKE2B 3e51a96a9cec4e7cb9d5ea36620fc7210b0efdf9fb9d4e88984eb492786c441a6bedf87a91133ec24e014a08bbe161e785cab0415bc6e0844d8a0db5d4be5d69 SHA512 32c32c59686f099e1e5a9c2b75aad193fdcff900734d8dee31129a00cbdf84e219ae86c89bc6e35f4c5fb54532183cbe24683c463ce45e92c26041267e5ee1d1
 EBUILD gst-plugins-ugly-1.12.4.ebuild 1029 BLAKE2B 552f9a5075bd61c3b8cfa6659fa834fef445a19059f9a10cf7c6ac0e72db070dfa807f02db3534a037eebf94c1effd3555f701d1131b2868f0694ec9dae3f81e SHA512 6c0815445be549b133012a5e1fe90fe798df27f4c55f73e8bf816db04f5871c4e12f5c8978ad117696a1afaf3202e5627f8a849b78e642d97a76543ccabdbdd2
-EBUILD gst-plugins-ugly-1.14.1.ebuild 970 BLAKE2B 17b3eb074dc05162413898e0d56515beb19dd6b8401fc117745dafb888806cd29834b6634f746d4310b71efae08bcb238c194a952082633ccb413be74bed4ed7 SHA512 0c5d860428c02eb63b35141fb08f1dee5afa1a3ac126a0b2ef37f2df2cabd49a564ce562ade148af12b9ae690869f89b637d5d381353ef52a961579df78f6b4a
+EBUILD gst-plugins-ugly-1.14.1.ebuild 969 BLAKE2B d75400c791e672aa2f68d4a83cbfdb75b1865c1863609cc95fb545a368d87a767897e3c4bd849adde8297d388ab7b49e8270a7be5d495f8340e0019bbd8d5d42 SHA512 5d53a244446d79f735a065c56a5c8c63766616ce213f25a89baafadf9735f8d1a1befe93bd414dc34f2b39fa33a2927e228d923079313508ba8fb250b184bb8a
 EBUILD gst-plugins-ugly-1.14.2.ebuild 976 BLAKE2B 7096ff1cd28e8ca267d014b6c5444ae3311410de4d2dcb194e008a2d33fb97181f6cf47a9a0f7be414afc2e76ce74abc2ba5bdba5bc1ebb572d71b77abb36c95 SHA512 ce35f48e6ce9378ea81c11b328c6de5c50b5bb3f2bfea435b4c085cb96a8e9612ddaf1de7e63a56be84fb9b19b64edc3ffc2edd49c1ec9e4c935850cacfd8ae3
 MISC metadata.xml 345 BLAKE2B c8af39d4811da5ca9cad30110ed9b2a090fd27a957bf32f831b4c3f5a22bb87fcc15957151ce9752521d2a92c667568d8ab002c8f4f9ba3363d9b7ca79655ce8 SHA512 c8c693633f2fdbf66f2308a2ee82880bf0cdd58b0c1e42a2d3b2733b3a7411769da60e8beb375def6473fe50303f1a68a0c7712e48abf88935b045f93103b206
diff --git a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.14.1.ebuild b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.14.1.ebuild
index effeaf4c44be..d124d7e84d99 100644
--- a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.14.1.ebuild
+++ b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.14.1.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Basepack of plugins for gstreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="LGPL-2+" # some split plugins are LGPL but combining with a GPL library
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 
 RDEPEND="
 	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
diff --git a/media-libs/gstreamer/Manifest b/media-libs/gstreamer/Manifest
index 0106f09fa9cf..34274b9264a4 100644
--- a/media-libs/gstreamer/Manifest
+++ b/media-libs/gstreamer/Manifest
@@ -6,6 +6,6 @@ DIST gstreamer-1.14.1.tar.xz 3252440 BLAKE2B c2142621b126926dd9ec886f0478154b3f0
 DIST gstreamer-1.14.2.tar.xz 3255404 BLAKE2B 290e8fec3eb6629a0e6e8f01c7c027fcc085f632afeac1ffe7bd4f1d8a9a3d3b78145334a11c91fcabea40b9f202a3b451ca55db13fd23be66c7167c76614932 SHA512 270dba318d15b54fff6e09d09d77dea13be55bbf82a5bb510efb43f954e234230505366cc6f19f5431e2dd24f5a7734daf5a89d9bd94de8302ed722df0e1eb84
 EBUILD gstreamer-0.10.36-r2.ebuild 3843 BLAKE2B 5755f04502e3fd6bb5eafbba0710009fd0dba7f402c4a28c20c768ad6290201a900200a33f21b2d97bf6aa7596df06a0001530f001164eb2777a9f3b5cb0adfb SHA512 3a9be6924cb416b173297ff022edffb6a8c496607a4b5f88c1b81fb8489ec045e9f611a88a736fb67a84418d472e37fbdb078e9e9d8593a03418cb6658de6c67
 EBUILD gstreamer-1.12.4.ebuild 3310 BLAKE2B 3628c62235e16443c6cc95dcdbaaf51b8e5931f6b50553eaa786b21b98fac481bfa27bdec00bfcef0f8abc78f3be5f1652e9996a13d75d8dc2022da1d368f07f SHA512 04ee255b76d7aa2fb18c978baf51dd427586a8255449931165c7e327eb16387e640a1a0f5ff7354dc3080f19dda5610a430994dfbbb41397df43d3155c183133
-EBUILD gstreamer-1.14.1.ebuild 3379 BLAKE2B 9cbaf9991fab17d2e513e927049e70d8d0dd2358cc34fd6f51a96fedd2bb46c6c287aba9f83e517675902d101ddb76fd9b0ab0dba277dcc82394fdbca43e7977 SHA512 af215fcc0443177241b2c34d5b93cb17a84232f0cf8399c230a316317dab6a182e7d074c5783a7c2fe4b0ff01a98c628072659cdcfd741dc1a4f683a317a842d
+EBUILD gstreamer-1.14.1.ebuild 3378 BLAKE2B e55dd67b330a26f0c7551546d4309a4478bb80a7449247ff25345b98b2f4be37eebddd0e5acda5166758b9c3d9fc7d2d974b9fee8386187b11a08fa78cab645f SHA512 1ba3f2d90a8f87164c69543a405edbd67edbb2a03f35d8a734968a66d45a2f93b413923168e12a3ad336567596dac73b663ec36dbb7d845c950a2af9572461bb
 EBUILD gstreamer-1.14.2.ebuild 3385 BLAKE2B a6c6839a8aefebe90e187edb2ef84df743f4597979e5bd9403e0f64640b15dde702de7bd712171cb8ba1106a189e6b4c6f4b14313837be8757f2ec8f61496053 SHA512 16fdfc15e1ffa26aa270541fdb611fa0f5dfb6b92990b743b58b023f17fe16ead20229fe424e52a3d00305802a1fcdb62f3125af149214bd3a47a666a464d569
 MISC metadata.xml 586 BLAKE2B 319df0c2c013f3018bdb31afddcd80b298f9b74d0a581981f30d483b0773339befe4dc62eb78a267b3a0f5a63a7e6462bd0ece4d4285c0ca91a1329c12ba1b93 SHA512 f7de0325f671119a5b787dcba9572d06d58375ba9d815854beffd668da55e4d4695f586365b3455e63cd56f4469fb8e1a92ab6de4e05847668f56c076dfdaf57
diff --git a/media-libs/gstreamer/gstreamer-1.14.1.ebuild b/media-libs/gstreamer/gstreamer-1.14.1.ebuild
index f8dfc171de54..82abaebe4fa9 100644
--- a/media-libs/gstreamer/gstreamer-1.14.1.ebuild
+++ b/media-libs/gstreamer/gstreamer-1.14.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://${PN}.freedesktop.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="1.0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-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 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+caps +introspection nls +orc test unwind"
 
 RDEPEND="
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index c3040225283e..7a3b9d2d43ed 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,13 +1,11 @@
 AUX harfbuzz-1.7.6-test_fixup.patch 789 BLAKE2B 6a57e25b3b20607c571c61c06f9f37f10b2c506e1f0c303f2b52302d1c32e7cb282a8a0544b91689da9fe1bfc6d07c2ab5d56698377af83752d4939f582536cd SHA512 87184db1f0a8e7bdf66fdabb1b556e2fdeb44c26ae7dc215e2a8a8808116274822e08d71f47c21fc3f027bae1bb15010404881ce36c053143e447fe252df9e40
 DIST harfbuzz-1.7.6.tar.bz2 2586909 BLAKE2B 0ae5902b9fe00a4f05a5dc407d698195920454efff79be10f1d85af5430d8bde7df071ba226b978c860d1dd8778a8259f330ab633a1aaa416a4451888fa9ae6a SHA512 259656574b1ec2916ada951b759a591f45c11c5c639fa29831e06320312bf951f4f5ef6306f9ffc373abf0d40dbf944db918d4c54aca3bd7eab2c3a886db7a68
 DIST harfbuzz-1.8.1.tar.bz2 3804867 BLAKE2B 9687b35bbdb74a42c28764a7b026a46ff90640b84bc40702bdbfadc79bbe3c393de837d4cdbbb8798f28aa8c75687c4f07e1c79e98bf9bd506403d89b4baf6a5 SHA512 7ef27232b294883b0c7404c8412837acfba95f12677f226d764f87e22cd169fe037e7bf13a9309e78c9aa905225fb332b3a143a01b13308b05fcccaeddb0c931
-DIST harfbuzz-1.8.5.tar.bz2 3859514 BLAKE2B 6e44de23d81e68ccbe69008f852f5d29fbac8c255808a8330c47d47703035065cf4b48e4d3ce06b50d83d5d3412c3300d0010806b5fed251450d7a7dd0d1395d SHA512 81e4df32d848d52b27413ddf4551bbaa16c04e2cc98f4e2318359b611a725cd55099138106344babcc912a662e6c70354370615452b0d69c38bfa419e063b1a9
-DIST harfbuzz-1.8.6.tar.bz2 3864337 BLAKE2B 166425cfec185b23c3d5bb210d88e0b32a9d58c66d38947e0a3366939a5dcd27a047e800b1d1b3cba2597e2034f60efecce5d90f819319e1790e0d4adb793fac SHA512 7412b0f046ef30346358c9321d25fddd98ad44e4cf403f68b77c41b29b9369b5ab9e94164262cea3f487c185786bbdd7813d481896df221f4ab2461d7d43e834
 DIST harfbuzz-1.8.7.tar.bz2 3863545 BLAKE2B fac6a6b198fc8cc4d92ae128f9064a3c5ae71ba55891e80cbedd51e91a7df5bd1190f9d51051613a704a3c005b0a8eb850b387ca15b5ff09321ad9df23c70fab SHA512 8654b148fa6fcc34a0e2a981493901a5d93c46934861655c070a228baf136e5ed231cd8a5268948b6ff12ab551870f37d7270d9be649d35d515130540d0eeefa
+DIST harfbuzz-1.8.8.tar.bz2 3862626 BLAKE2B c5b2b89f6fbefa004927c0ed5dc314d3f8fd4ce8c58918f4020a91247d9e781ff1ffb4ba05b138b4b1aebbdcad2041d749301143523a808f61f013e2efb5efdd SHA512 eb96cd710571a96473b20bc9a01dadf2a3c11224497e52c63368e8edec64a8eb7085dd847c78111b798a1e8a6a950f0a04c930209822aabf13cf86d7a53b1f79
 EBUILD harfbuzz-1.7.6.ebuild 3252 BLAKE2B e9d0be30511ff76b2423c84a97488fae78af56b346ab3b650bc24e392513dd8748b0f9fc59032d24529b96020fc83463e2a38c66bb9d2f49c8979322fcac3d48 SHA512 ab4b7ccb76e49f3bccc5ed61a8282db84d03f7b70b75963fb01b5a2613ff4ea568379464b89ae4357edd6d6eb057088cc5424d59ae20b6f0c4a4bd6ba665d0a3
 EBUILD harfbuzz-1.8.1.ebuild 3207 BLAKE2B 1dd250ac33c8b6ec4fa9fff4ba6d1746d2881cc18a6510b2848ea06b20e70fcf8b00b03e01defe0fe8888627004e4440083e611a79476856a5a40e2042715591 SHA512 30763dd7704d2b41d2b3d85aec21c9fa3ead4ab11cacea58bca739cfa3c1d0801fbb6aeec0565e25e0d8b812c51c9f57edff2d93fbcfc8f2fd360ccd18a9f68a
-EBUILD harfbuzz-1.8.5.ebuild 3048 BLAKE2B 63ceb77b82c4d56f58f15923dae72b22483e3316ba8bb4d6414fdbcc4e5062754e8825de9f0fb7ff7e73c63a5330ae8c30ea981e82ebd01b235ba024e291f4b3 SHA512 e06bbb4410096544d1f0f91eb7937afb5a6aa4aff80ce54ef32b4f2858c3cc38b244e7ab178d6cfeb74b0ec13b3ddf8161e71a6fc107df13b87f67c321565828
-EBUILD harfbuzz-1.8.6.ebuild 3048 BLAKE2B 63ceb77b82c4d56f58f15923dae72b22483e3316ba8bb4d6414fdbcc4e5062754e8825de9f0fb7ff7e73c63a5330ae8c30ea981e82ebd01b235ba024e291f4b3 SHA512 e06bbb4410096544d1f0f91eb7937afb5a6aa4aff80ce54ef32b4f2858c3cc38b244e7ab178d6cfeb74b0ec13b3ddf8161e71a6fc107df13b87f67c321565828
 EBUILD harfbuzz-1.8.7.ebuild 3048 BLAKE2B 63ceb77b82c4d56f58f15923dae72b22483e3316ba8bb4d6414fdbcc4e5062754e8825de9f0fb7ff7e73c63a5330ae8c30ea981e82ebd01b235ba024e291f4b3 SHA512 e06bbb4410096544d1f0f91eb7937afb5a6aa4aff80ce54ef32b4f2858c3cc38b244e7ab178d6cfeb74b0ec13b3ddf8161e71a6fc107df13b87f67c321565828
+EBUILD harfbuzz-1.8.8.ebuild 3048 BLAKE2B 63ceb77b82c4d56f58f15923dae72b22483e3316ba8bb4d6414fdbcc4e5062754e8825de9f0fb7ff7e73c63a5330ae8c30ea981e82ebd01b235ba024e291f4b3 SHA512 e06bbb4410096544d1f0f91eb7937afb5a6aa4aff80ce54ef32b4f2858c3cc38b244e7ab178d6cfeb74b0ec13b3ddf8161e71a6fc107df13b87f67c321565828
 EBUILD harfbuzz-9999.ebuild 3048 BLAKE2B 63ceb77b82c4d56f58f15923dae72b22483e3316ba8bb4d6414fdbcc4e5062754e8825de9f0fb7ff7e73c63a5330ae8c30ea981e82ebd01b235ba024e291f4b3 SHA512 e06bbb4410096544d1f0f91eb7937afb5a6aa4aff80ce54ef32b4f2858c3cc38b244e7ab178d6cfeb74b0ec13b3ddf8161e71a6fc107df13b87f67c321565828
 MISC metadata.xml 645 BLAKE2B aadcef9412392874d361b5c09e7450bf88db64fa704558553861cf16ffd1a5b5715291fefc0624e3ad0d86a537cdbd2b810fa093b289428e68a19c82049188ef SHA512 645e451768a5dba2e16d18b51ece20fa28172450bf22e29fe73ed29748f712187f997ce2f6f0a24c725f0cb10434b4a65c6de9a5fd1aa7d820e00b7dca8b8b63
diff --git a/media-libs/harfbuzz/harfbuzz-1.8.6.ebuild b/media-libs/harfbuzz/harfbuzz-1.8.6.ebuild
deleted file mode 100644
index c723137a7e55..000000000000
--- a/media-libs/harfbuzz/harfbuzz-1.8.6.ebuild
+++ /dev/null
@@ -1,109 +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 flag-o-matic libtool multilib-minimal python-any-r1 xdg-utils
-
-DESCRIPTION="An OpenType text shaping engine"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
-
-if [[ ${PV} = 9999 ]] ; then
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/harfbuzz.git"
-	inherit git-r3 autotools
-else
-	SRC_URI="https://www.freedesktop.org/software/${PN}/release/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
-fi
-
-LICENSE="Old-MIT ISC icu"
-SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
-
-IUSE="+cairo debug fontconfig +glib +graphite icu +introspection static-libs test +truetype"
-REQUIRED_USE="introspection? ( glib )"
-
-RDEPEND="
-	cairo? ( x11-libs/cairo:= )
-	fontconfig? ( media-libs/fontconfig:1.0[${MULTILIB_USEDEP}] )
-	glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] )
-	graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
-	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.34:= )
-	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	virtual/pkgconfig
-	test? ( ${PYTHON_DEPS} )
-"
-# eautoreconf requires gobject-introspection-common
-# ragel needed if regenerating *.hh files from *.rl
-if [[ ${PV} = 9999 ]] ; then
-	DEPEND+="
-		>=dev-libs/gobject-introspection-common-1.34
-		dev-util/ragel
-	"
-fi
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-	if ! use debug ; then
-		append-cppflags -DHB_NDEBUG
-	fi
-}
-
-src_prepare() {
-	default
-
-	xdg_environment_reset
-
-	if [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] ; then
-		# on Darwin/Solaris we need to link with g++, like automake defaults
-		# to, but overridden by upstream because on Linux this is not
-		# necessary, bug #449126
-		sed -i \
-			-e 's/\<LINK\>/CXXLINK/' \
-			src/Makefile.am || die
-		sed -i \
-			-e '/libharfbuzz_la_LINK = /s/\<LINK\>/CXXLINK/' \
-			src/Makefile.in || die
-		sed -i \
-			-e '/AM_V_CCLD/s/\<LINK\>/CXXLINK/' \
-			test/api/Makefile.in || die
-	fi
-
-	[[ ${PV} == 9999 ]] && eautoreconf
-	elibtoolize # for Solaris
-
-	# bug 618772
-	append-cxxflags -std=c++14
-}
-
-multilib_src_configure() {
-	# harfbuzz-gobject only used for instrospection, bug #535852
-	local myeconfargs=(
-		--without-coretext
-		--without-uniscribe
-		$(use_enable static-libs static)
-		$(multilib_native_use_with cairo)
-		$(use_with fontconfig)
-		$(use_with glib)
-		$(use_with introspection gobject)
-		$(use_with graphite graphite2)
-		$(use_with icu)
-		$(multilib_native_use_enable introspection)
-		$(use_with truetype freetype)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-
-	if multilib_is_native_abi; then
-		ln -s "${S}"/docs/html docs/html || die
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/media-libs/harfbuzz/harfbuzz-1.8.5.ebuild b/media-libs/harfbuzz/harfbuzz-1.8.8.ebuild
index c723137a7e55..c723137a7e55 100644
--- a/media-libs/harfbuzz/harfbuzz-1.8.5.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-1.8.8.ebuild
diff --git a/media-libs/id3lib/Manifest b/media-libs/id3lib/Manifest
index 7936a79d087c..0764e42c5de4 100644
--- a/media-libs/id3lib/Manifest
+++ b/media-libs/id3lib/Manifest
@@ -1,11 +1,11 @@
-AUX id3lib-3.8.3-autoconf259.patch 1130 BLAKE2B e65f7693f5ac6284348aaa52bc286856a22cbd4396725c83113dda96f4637e92fb0ce453b737ae97c61e1d284910fb0894f6e4d21e5a575f1f9f99de25b1d261 SHA512 e7d15ca57889934d1956293454e6326e1fbf81116d42e42732a2f0c9fc04b067ebf43f896d28bfa2fa18978b9099fdc6a36c573da137c2ee80efcbb83cdb04ae
-AUX id3lib-3.8.3-doxyinput.patch 977 BLAKE2B 799a43e588b3c4d196521e0fc183dbc1b47b7faafe24e8225b6adcaa514446519b85fbd93a7ea7944a4394a17240fade7d7911b1e7f55ed546416e18b7f4f87e SHA512 f226281ba0afb7d0f2c49d5769ba374ab36edd228a7b4251c9775c83b50489db6b853044f442268134e2885e9d90500708597d59adccdb563c2eff2dd9af9fa8
-AUX id3lib-3.8.3-gcc-4.3.patch 2971 BLAKE2B 2eac3593420d2d73863e4fe1feff92496bf4515bf4b7a401f13ab26b54578181660fb26449f2786b116354bedb985954b3681ede17d15b0bdd92ee016abc7695 SHA512 14c5376c676d3a67c7fe92f271d0e6067f6168f16fed0c9ac4dd28a0b7280896cb993f17911baac7d8c2cfacd210f6c587c92bc38e54ef71584fbbff50e86bb5
-AUX id3lib-3.8.3-missing_nullpointer_check.patch 329 BLAKE2B 8e4b21193814f4b7c1bb08f54238ea314aec293bb85b2576ed90de812e557ec59d12e9e08d658d04c3c58c6782328b351e7abf03ab8fac8c568c89dd0b5b8535 SHA512 bfda0531711d2dc8a9d0581aaaef940f456ba1d3544c2399d9eff6806f0b564678a4d428e35920cbeac9ed9e2efe3aee640500a89c6853fc921ef79afbf6fdb4
-AUX id3lib-3.8.3-security.patch 1455 BLAKE2B a24784a2921404235d23cc163b9948b41aa834cede1e3f76de8cbe4a15aeeb4d9da8fcf2cf767ae0219242f518b96d322229ae489f2d88d87418c1bcf15719b6 SHA512 ded434b26c36636aef77a69376cece644ad09c81168bbd50e02eea21c4af32efe62fbc31d772fbe94560da6411a8b0562708bfd043b9ab31a4a0944bddb2814f
-AUX id3lib-3.8.3-test_io.patch 281 BLAKE2B 23b6563c1398bb77d1c3af76ebb34adbc9a5012ad1e08b4fb414a2023cdda5c422ca21b0c1cd3ffb8415d59729b8f8368e8a96225d383a3f432fffa5e5748773 SHA512 41138975241980cbdc1e602a6d5ce3c3cfefe7db316b95db99ba8f10daf251e6d761716ab60bfceaa476df3e56597b18a69d0ffed171e4de25bfcb44c6fcfd1d
-AUX id3lib-3.8.3-unicode16.patch 1544 BLAKE2B bb1c6509586f110cd926ee5444119753b4984b37a243fc42b279b6c3e9cefbed0957a2079769b28381c7090995d621156277badd60bf9542422834ae7f51325e SHA512 ba56f77a0672c34df1757435e27aac3b202c8ad4a8b79213f0d314016568937466a535f51d3b65c7ec18d5349bbfcb6d87d37d7124125cfb0aad8eab72e8fe6d
-AUX id3lib-3.8.3-zlib.patch 833 BLAKE2B cf45b2a69a48abe90ee40365d95b6b2aa2df600106e93c905e07ef22ef49cc48ec13785031aa2434e79d082b9c454658c7eee677b0aa49d6beabdf38ff75c4ce SHA512 61937ec6c2751467dd13179db15f06eff04b5b186f82b4327c38388f03c03ac7de277b9173b2b0326141c77335cad7fcd98234994cc5694cd1228e0d81919e53
+AUX id3lib-3.8.3-autoconf259.patch 1103 BLAKE2B f9bc438534eb157fece6500cc8d009d88e3ff88d4b486c54eacd6c735b768a24bf1487eb1e3db24d621f2879b0d049d5a08ca8a92b943477b69f1ead6056c943 SHA512 b0a4bcea15e42b9f599726918d690ec707afcb7e5c7c1b7f80900947f0b3b8a877bdabf303ba001a43139a1249cb48c9099a96e4b1b78438f26b4fa37d2e8f4a
+AUX id3lib-3.8.3-doxyinput.patch 950 BLAKE2B 85c44b5aec6a2c5ab385db977f0ace57cd463cc25f4a628e88ab92d74d2fd98c348ce1699889b7d806a9341a15e80d0721b9a06269c28a088e408847f7a58a1d SHA512 86bdec42d0b6411d493899d1ad00f667ea38133f5b8cf2665fe94ce9db80d54e4aad1f9d8e94bc7578b8c1fd5c43747d07c929f01f66e0d4f71b63543ff04012
+AUX id3lib-3.8.3-gcc-4.3.patch 2670 BLAKE2B 065b6d57a20b0af65c8fb584decfcec56f58162bb356a6fd83c96e1b8897d87ebd409ec9aa9520bc67b352132dc8f5978213dffb6dc47e80c66ce7daa420fc9b SHA512 a8eec4e9b122f4627af2e81fa3b391fb5bfca5d95c6520fe2b67f1388824490c1434f8dfabdbd42ab2855d8ad7a85f2477a0c26c9930dd033a5d4e596f9838cb
+AUX id3lib-3.8.3-missing_nullpointer_check.patch 302 BLAKE2B fe6fd77ab360b1804f937dbeb903aa8837a32dea0c0c3822c469dc0d08093dba90d8682a4a050850072249389c7638311b8b97a323959fe4d887896d7aa45116 SHA512 aad3b6371e060d4121b34831fa84791ad81558f64dcafa2ebd729de62c8b9c160fe949030c985c4bd3fafbc05290eb4268a3821db6bf3e1c44f414883f61f598
+AUX id3lib-3.8.3-security.patch 1459 BLAKE2B eb8401ae625ae374848fcf777502dcc7d541d8d960441533232f6c7772dbe4bdfed69b109acf2ea60ff10c5b0c894a810a801bf7214ad36f3d606feed29ecadd SHA512 ac3920696a3d9a6e5b08fcf93d65ab96855f3493bd6c9d0cf11cebddc5fc9e5e4a1ee9f2076774590f4121f35e3b63710fedf25216194c6b391f073b0489cd5f
+AUX id3lib-3.8.3-test_io.patch 254 BLAKE2B 3b38a82fb990de47a8f65d46171ef8273b180a6a337274fed9ee59e0f53bb3c08285b661a687adc86dd181996362e5c5aea95334e314154bef9b468a314c4df7 SHA512 5efca41cec0e77b325f35f646448edf8ef93ad9f90e8ae687c833cc581aa5ae321a59b3c6089d6b1d17a0245cbc3ca834190cf8ec3dd5ecb0a06cdef2d9d8e7c
+AUX id3lib-3.8.3-unicode16.patch 1490 BLAKE2B 8e9c23cacc11fe87e846830c91946e16641a32baa9717647999fc32522d10e553480d9b5ac5e5e3f12fc4fa72e31667df1c90b734016d0c1adc88d74d0a1901e SHA512 270e498a0586d25ae7cee45dcd45d5d143b0ba5799be34ef10b1577d766a82239bb949c9463cb59d1bf3a92070063252680441cb0691829c963fb4b4520ff4ab
+AUX id3lib-3.8.3-zlib.patch 779 BLAKE2B e7379e6d3136ebc93ddc8b79ce52ba92a41d911b883a74bfdb58d0ac6f774483f821ef66b453fef96649e5e67dbb1afa9c871d104c0dd29a8e1bf11ae8caa853 SHA512 e9c29883731ef417602812d714a14e1b7547d89581ffe40d0d0400218b0491f38cf50b24ab6dd8bcfcc94c95af914c6d34b53429a2789d7c27f0cb7661474dae
 DIST id3lib-3.8.3.tar.gz 950726 BLAKE2B 37afb1292d598e8416251e18beb1d1b4402d11ebd971d3e9b151ae9e092884ec4b0b7f9c19bbd8296fbb7fe7320ced7ba1f733a367662d378d2d82b2b52b7bb2 SHA512 3787e261f86933c1c2f2bff2c4b349b42f5d8636e489e4f39f9d75e6dfbdc79b87009a0f4ce4b786f2fb3dbc01ca9d56c4112095b46244f897e6c9a28573adaf
-EBUILD id3lib-3.8.3-r8.ebuild 1319 BLAKE2B d294a5995a84ec43a686035d709e22abefc0e79b800629aeac0929f609007ebec630ad992e75e0bcdc91566bf9298a63adb1bfad68a13f5b770733d80c76df6b SHA512 b3d158cd02607bacdb717d27114ab69e9cda8be3ef9588803467488c9f77733234998f4298868a2acf91ff078f065635fbb2413164d8b972bae5e83345e51f7b
+EBUILD id3lib-3.8.3-r8.ebuild 1351 BLAKE2B 73e2f951cd87d781007c3b9cee93ab9d3937c538223357cc19b970066d12236ca3631fba9c304c794930dd5332b28cc3039a86bd5de1360861f023fe357bc85f SHA512 6c52bba8d8410096befe2fec96a8409b9f1219b2a65b1a012b25cd9768bdf9e4307f30993a1ea0e2bd906e4405d647fd2b53c392d73ca6f503189a7dfa391f09
 MISC metadata.xml 339 BLAKE2B 7edd7b91c817463342d9d8123d07014bc77b8d1342a1bbf17811ec54ed2c749441de32f6d518b30ab718459a3edde8b1f4953b7202df294407da192f33c669b7 SHA512 e5d02d27394556f17ac426d2c87cc19aa8c603913d9c5ca3641154e87b54f5de6768dfa4334c371d3a65af5c39f265f561b1bac6ab497ed5b41ad10891d5a800
diff --git a/media-libs/id3lib/files/id3lib-3.8.3-autoconf259.patch b/media-libs/id3lib/files/id3lib-3.8.3-autoconf259.patch
index 16921e17425e..faa21fc175c0 100644
--- a/media-libs/id3lib/files/id3lib-3.8.3-autoconf259.patch
+++ b/media-libs/id3lib/files/id3lib-3.8.3-autoconf259.patch
@@ -1,7 +1,7 @@
 Index: id3lib-3.8.3/configure.in
 ===================================================================
---- id3lib-3.8.3.orig/configure.in
-+++ id3lib-3.8.3/configure.in
+--- a/configure.in
++++ b/configure.in
 @@ -168,7 +168,7 @@ if test $has_iconv = 1; then
  		iconv_oldstyle=1, iconv_oldstyle=0)
    if test $iconv_oldstyle = 1; then
diff --git a/media-libs/id3lib/files/id3lib-3.8.3-doxyinput.patch b/media-libs/id3lib/files/id3lib-3.8.3-doxyinput.patch
index b118f487e06c..9e230a5cb81e 100644
--- a/media-libs/id3lib/files/id3lib-3.8.3-doxyinput.patch
+++ b/media-libs/id3lib/files/id3lib-3.8.3-doxyinput.patch
@@ -1,7 +1,7 @@
 Index: id3lib-3.8.3/doc/Doxyfile
 ===================================================================
---- id3lib-3.8.3.orig/doc/Doxyfile
-+++ id3lib-3.8.3/doc/Doxyfile
+--- a/doc/Doxyfile
++++ b/doc/Doxyfile
 @@ -262,17 +262,7 @@ WARN_FORMAT            = "$file:$line: $
  # with spaces. 
  
diff --git a/media-libs/id3lib/files/id3lib-3.8.3-gcc-4.3.patch b/media-libs/id3lib/files/id3lib-3.8.3-gcc-4.3.patch
index 090dc0bc092d..1aad1a86d8c3 100644
--- a/media-libs/id3lib/files/id3lib-3.8.3-gcc-4.3.patch
+++ b/media-libs/id3lib/files/id3lib-3.8.3-gcc-4.3.patch
@@ -1,6 +1,6 @@
-diff -Naur id3lib-3.8.3-orig/configure.in id3lib-3.8.3/configure.in
---- id3lib-3.8.3-orig/configure.in	2008-03-05 18:03:25.000000000 -0600
-+++ id3lib-3.8.3/configure.in	2008-03-05 18:15:42.000000000 -0600
+diff -Naur a/configure.in id3lib-3.8.3/configure.in
+--- a/configure.in	2008-03-05 18:03:25.000000000 -0600
++++ b/configure.in	2008-03-05 18:15:42.000000000 -0600
 @@ -227,7 +227,6 @@
  )
  AC_CHECK_HEADERS(               \
@@ -9,9 +9,9 @@ diff -Naur id3lib-3.8.3-orig/configure.in id3lib-3.8.3/configure.in
    ,,AC_MSG_ERROR([Missing a vital header file for id3lib])
  )
  
-diff -Naur id3lib-3.8.3-orig/include/id3/id3lib_strings.h id3lib-3.8.3/include/id3/id3lib_strings.h
---- id3lib-3.8.3-orig/include/id3/id3lib_strings.h	2008-03-05 18:19:46.000000000 -0600
-+++ id3lib-3.8.3/include/id3/id3lib_strings.h	2008-03-05 18:19:38.000000000 -0600
+diff -Naur a/include/id3/id3lib_strings.h id3lib-3.8.3/include/id3/id3lib_strings.h
+--- a/include/id3/id3lib_strings.h	2008-03-05 18:19:46.000000000 -0600
++++ b/include/id3/id3lib_strings.h	2008-03-05 18:19:38.000000000 -0600
 @@ -30,6 +30,7 @@
  #define _ID3LIB_STRINGS_H_
  
@@ -20,9 +20,9 @@ diff -Naur id3lib-3.8.3-orig/include/id3/id3lib_strings.h id3lib-3.8.3/include/i
  
  #if (defined(__GNUC__) && (__GNUC__ >= 3) || (defined(_MSC_VER) && _MSC_VER > 1000))
  namespace std
-diff -Naur id3lib-3.8.3-orig/include/id3/writers.h id3lib-3.8.3/include/id3/writers.h
---- id3lib-3.8.3-orig/include/id3/writers.h	2003-03-01 18:23:00.000000000 -0600
-+++ id3lib-3.8.3/include/id3/writers.h	2008-03-05 18:23:05.000000000 -0600
+diff -Naur a/include/id3/writers.h id3lib-3.8.3/include/id3/writers.h
+--- a/include/id3/writers.h	2003-03-01 18:23:00.000000000 -0600
++++ b/include/id3/writers.h	2008-03-05 18:23:05.000000000 -0600
 @@ -30,7 +30,7 @@
  
  #include "id3/writer.h"
@@ -32,9 +32,9 @@ diff -Naur id3lib-3.8.3-orig/include/id3/writers.h id3lib-3.8.3/include/id3/writ
  
  class ID3_CPP_EXPORT ID3_OStreamWriter : public ID3_Writer
  {
-diff -Naur id3lib-3.8.3-orig/examples/demo_convert.cpp id3lib-3.8.3/examples/demo_convert.cpp
---- id3lib-3.8.3-orig/examples/demo_convert.cpp	2003-03-01 18:23:00.000000000 -0600
-+++ id3lib-3.8.3/examples/demo_convert.cpp	2008-03-05 18:26:50.000000000 -0600
+diff -Naur a/examples/demo_convert.cpp id3lib-3.8.3/examples/demo_convert.cpp
+--- a/examples/demo_convert.cpp	2003-03-01 18:23:00.000000000 -0600
++++ b/examples/demo_convert.cpp	2008-03-05 18:26:50.000000000 -0600
 @@ -84,7 +84,7 @@
    }
  }
@@ -44,9 +44,9 @@ diff -Naur id3lib-3.8.3-orig/examples/demo_convert.cpp id3lib-3.8.3/examples/dem
  {
    flags_t ulFlag = ID3TT_ALL;
    gengetopt_args_info args;
-diff -Naur id3lib-3.8.3-orig/examples/demo_info.cpp id3lib-3.8.3/examples/demo_info.cpp
---- id3lib-3.8.3-orig/examples/demo_info.cpp	2003-03-01 18:23:00.000000000 -0600
-+++ id3lib-3.8.3/examples/demo_info.cpp	2008-03-05 18:27:40.000000000 -0600
+diff -Naur a/examples/demo_info.cpp id3lib-3.8.3/examples/demo_info.cpp
+--- a/examples/demo_info.cpp	2003-03-01 18:23:00.000000000 -0600
++++ b/examples/demo_info.cpp	2008-03-05 18:27:40.000000000 -0600
 @@ -309,7 +309,7 @@
  
  #define DEBUG
@@ -56,9 +56,9 @@ diff -Naur id3lib-3.8.3-orig/examples/demo_info.cpp id3lib-3.8.3/examples/demo_i
  {
    ID3D_INIT_DOUT();
  
-diff -Naur id3lib-3.8.3-orig/examples/demo_tag.cpp id3lib-3.8.3/examples/demo_tag.cpp
---- id3lib-3.8.3-orig/examples/demo_tag.cpp	2003-03-01 18:23:00.000000000 -0600
-+++ id3lib-3.8.3/examples/demo_tag.cpp	2008-03-05 18:31:20.000000000 -0600
+diff -Naur a/examples/demo_tag.cpp id3lib-3.8.3/examples/demo_tag.cpp
+--- a/examples/demo_tag.cpp	2003-03-01 18:23:00.000000000 -0600
++++ b/examples/demo_tag.cpp	2008-03-05 18:31:20.000000000 -0600
 @@ -46,7 +46,7 @@
      os << "v2";
  }
@@ -68,9 +68,9 @@ diff -Naur id3lib-3.8.3-orig/examples/demo_tag.cpp id3lib-3.8.3/examples/demo_ta
  {
    int ulFlag = ID3TT_ID3;
    ID3D_INIT_DOUT();
-diff -Naur id3lib-3.8.3-orig/examples/demo_copy.cpp id3lib-3.8.3/examples/demo_copy.cpp
---- id3lib-3.8.3-orig/examples/demo_copy.cpp	2003-03-01 18:23:00.000000000 -0600
-+++ id3lib-3.8.3/examples/demo_copy.cpp	2008-03-05 18:32:44.000000000 -0600
+diff -Naur a/examples/demo_copy.cpp id3lib-3.8.3/examples/demo_copy.cpp
+--- a/examples/demo_copy.cpp	2003-03-01 18:23:00.000000000 -0600
++++ b/examples/demo_copy.cpp	2008-03-05 18:32:44.000000000 -0600
 @@ -81,7 +81,7 @@
    }
  }
diff --git a/media-libs/id3lib/files/id3lib-3.8.3-missing_nullpointer_check.patch b/media-libs/id3lib/files/id3lib-3.8.3-missing_nullpointer_check.patch
index 3b9437967842..d075e62f9bdb 100644
--- a/media-libs/id3lib/files/id3lib-3.8.3-missing_nullpointer_check.patch
+++ b/media-libs/id3lib/files/id3lib-3.8.3-missing_nullpointer_check.patch
@@ -1,5 +1,5 @@
---- id3lib-3.8.3/src/header_tag.cpp.orig	2003-03-02 01:23:00.000000000 +0100
-+++ id3lib-3.8.3/src/header_tag.cpp	2009-07-13 22:54:21.000000000 +0200
+--- a/src/header_tag.cpp	2003-03-02 01:23:00.000000000 +0100
++++ b/src/header_tag.cpp	2009-07-13 22:54:21.000000000 +0200
 @@ -54,7 +54,7 @@
  {
    size_t bytesUsed = ID3_TagHeader::SIZE;
diff --git a/media-libs/id3lib/files/id3lib-3.8.3-security.patch b/media-libs/id3lib/files/id3lib-3.8.3-security.patch
index 2cf7c1420340..9f1e4a98ee43 100644
--- a/media-libs/id3lib/files/id3lib-3.8.3-security.patch
+++ b/media-libs/id3lib/files/id3lib-3.8.3-security.patch
@@ -1,7 +1,7 @@
 http://bugs.gentoo.org/189610
 
---- src/tag_file.cpp
-+++ src/tag_file.cpp
+--- a/src/tag_file.cpp
++++ b/src/tag_file.cpp
 @@ -242,8 +242,8 @@
      strcpy(sTempFile, filename.c_str());
      strcat(sTempFile, sTmpSuffix.c_str());
diff --git a/media-libs/id3lib/files/id3lib-3.8.3-test_io.patch b/media-libs/id3lib/files/id3lib-3.8.3-test_io.patch
index b4a0d24d65e3..115e6aafc1a0 100644
--- a/media-libs/id3lib/files/id3lib-3.8.3-test_io.patch
+++ b/media-libs/id3lib/files/id3lib-3.8.3-test_io.patch
@@ -1,5 +1,5 @@
---- id3lib-3.8.3/examples/test_io.cpp.orig	2004-09-21 23:40:48.398826320 +0200
-+++ id3lib-3.8.3/examples/test_io.cpp	2004-09-21 23:40:55.408760648 +0200
+--- a/examples/test_io.cpp	2004-09-21 23:40:48.398826320 +0200
++++ b/examples/test_io.cpp	2004-09-21 23:40:55.408760648 +0200
 @@ -16,6 +16,7 @@
  using std::cerr;
  
diff --git a/media-libs/id3lib/files/id3lib-3.8.3-unicode16.patch b/media-libs/id3lib/files/id3lib-3.8.3-unicode16.patch
index 7b1b59358903..de856df6c43c 100644
--- a/media-libs/id3lib/files/id3lib-3.8.3-unicode16.patch
+++ b/media-libs/id3lib/files/id3lib-3.8.3-unicode16.patch
@@ -1,6 +1,6 @@
 diff -ruN id3lib-3.8.3.orig/ChangeLog id3lib-3.8.3/ChangeLog
---- id3lib-3.8.3.orig/ChangeLog	2003-03-02 01:23:00.000000000 +0100
-+++ id3lib-3.8.3/ChangeLog	2006-02-22 00:33:59.946214472 +0100
+--- a/ChangeLog	2003-03-02 01:23:00.000000000 +0100
++++ b/ChangeLog	2006-02-22 00:33:59.946214472 +0100
 @@ -1,3 +1,8 @@
 +2006-02-17  Jerome Couderc
 +
@@ -11,8 +11,8 @@ diff -ruN id3lib-3.8.3.orig/ChangeLog id3lib-3.8.3/ChangeLog
  
  	* THANKS (1.20): added more people 
 diff -ruN id3lib-3.8.3.orig/src/io_helpers.cpp id3lib-3.8.3/src/io_helpers.cpp
---- id3lib-3.8.3.orig/src/io_helpers.cpp	2003-03-02 01:23:00.000000000 +0100
-+++ id3lib-3.8.3/src/io_helpers.cpp	2006-02-22 00:35:02.926639992 +0100
+--- a/src/io_helpers.cpp	2003-03-02 01:23:00.000000000 +0100
++++ b/src/io_helpers.cpp	2006-02-22 00:35:02.926639992 +0100
 @@ -363,11 +363,22 @@
      // Write the BOM: 0xFEFF
      unicode_t BOM = 0xFEFF;
diff --git a/media-libs/id3lib/files/id3lib-3.8.3-zlib.patch b/media-libs/id3lib/files/id3lib-3.8.3-zlib.patch
index 177320bc17a3..721d640200df 100644
--- a/media-libs/id3lib/files/id3lib-3.8.3-zlib.patch
+++ b/media-libs/id3lib/files/id3lib-3.8.3-zlib.patch
@@ -1,6 +1,6 @@
 diff -Naur id3lib-3.8.3.orig/Makefile.am id3lib-3.8.3/Makefile.am
---- id3lib-3.8.3.orig/Makefile.am	2003-03-01 16:23:00.000000000 -0800
-+++ id3lib-3.8.3/Makefile.am	2004-09-12 19:05:39.564456828 -0700
+--- a/Makefile.am	2003-03-01 16:23:00.000000000 -0800
++++ b/Makefile.am	2004-09-12 19:05:39.564456828 -0700
 @@ -28,7 +28,7 @@
  endif
  
@@ -11,8 +11,8 @@ diff -Naur id3lib-3.8.3.orig/Makefile.am id3lib-3.8.3/Makefile.am
  INCLUDES = @ID3LIB_DEBUG_FLAGS@
  
 diff -Naur id3lib-3.8.3.orig/src/Makefile.am id3lib-3.8.3/src/Makefile.am
---- id3lib-3.8.3.orig/src/Makefile.am	2003-03-01 16:23:00.000000000 -0800
-+++ id3lib-3.8.3/src/Makefile.am	2004-09-12 19:08:30.814149521 -0700
+--- a/src/Makefile.am	2003-03-01 16:23:00.000000000 -0800
++++ b/src/Makefile.am	2004-09-12 19:08:30.814149521 -0700
 @@ -77,6 +77,7 @@
  endif
  
diff --git a/media-libs/id3lib/id3lib-3.8.3-r8.ebuild b/media-libs/id3lib/id3lib-3.8.3-r8.ebuild
index df3dc169a92f..74943e462577 100644
--- a/media-libs/id3lib/id3lib-3.8.3-r8.ebuild
+++ b/media-libs/id3lib/id3lib-3.8.3-r8.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools eutils
+EAPI=6
+
+inherit autotools
 
 DESCRIPTION="Id3 library for C/C++"
 HOMEPAGE="http://id3lib.sourceforge.net/"
@@ -19,20 +20,23 @@ DEPEND="${RDEPEND}
 
 RESTRICT="test"
 
-DOCS="AUTHORS ChangeLog HISTORY README THANKS TODO"
+DOCS=( AUTHORS ChangeLog HISTORY README THANKS TODO )
 
 S=${WORKDIR}/${P/_}
 
+PATCHES=(
+	"${FILESDIR}"/${P}-zlib.patch
+	"${FILESDIR}"/${P}-test_io.patch
+	"${FILESDIR}"/${P}-autoconf259.patch
+	"${FILESDIR}"/${P}-doxyinput.patch
+	"${FILESDIR}"/${P}-unicode16.patch
+	"${FILESDIR}"/${P}-gcc-4.3.patch
+	"${FILESDIR}"/${P}-missing_nullpointer_check.patch
+	"${FILESDIR}"/${P}-security.patch
+)
+
 src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-zlib.patch \
-		"${FILESDIR}"/${P}-test_io.patch \
-		"${FILESDIR}"/${P}-autoconf259.patch \
-		"${FILESDIR}"/${P}-doxyinput.patch \
-		"${FILESDIR}"/${P}-unicode16.patch \
-		"${FILESDIR}"/${P}-gcc-4.3.patch \
-		"${FILESDIR}"/${P}-missing_nullpointer_check.patch \
-		"${FILESDIR}"/${P}-security.patch
+	default
 
 	sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' {.,zlib}/configure.in || die
 
@@ -46,14 +50,14 @@ src_configure() {
 src_compile() {
 	default
 	if use doc; then
-		pushd doc >/dev/null
+		pushd doc >/dev/null || die
 		doxygen Doxyfile || die
-		popd >/dev/null
+		popd >/dev/null || die
 	fi
 }
 
 src_install() {
+	use doc && local HTML_DOCS=( doc/. )
 	default
-	prune_libtool_files
-	use doc && dohtml -r doc
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/media-libs/imlib2/Manifest b/media-libs/imlib2/Manifest
index 51b22ae43812..5147c012ca34 100644
--- a/media-libs/imlib2/Manifest
+++ b/media-libs/imlib2/Manifest
@@ -1,4 +1,4 @@
 DIST imlib2-1.5.1.tar.gz 1020701 BLAKE2B 33213a49293fba9e86cfec312d3cd8018c2284d60040b63899778d2fa65bffe173926eb14bc893c1a80e1472084a711423f77f6288779486512074e75d92acfd SHA512 9872aa3c4d45b1e9cbb0b1d0a7d5b47256e35f01a4fe19d84d276096c2da053c55bd28554441f92464d19edf1222b427571ba7b06d716031021ff1f9b4bc9656
-EBUILD imlib2-1.5.1-r1.ebuild 2103 BLAKE2B a014302a51fc32f7350df239ce57568c3a2da057592012b9052704ec264ff773223f1770835fb7e2b66c4dc0347da2130baa090a76b5c12307efaa12f97ff263 SHA512 696357d7f83070d3cb63970133a7884459f6376b7415a3f78a185061245fe10fe451a73d5e9e32a7cbf851a63b3660265e39e4ba8c14ea08a2bf8f95e34b15d2
+EBUILD imlib2-1.5.1-r1.ebuild 2105 BLAKE2B 2ea5426ac1589d768ca22780fb5c1134997991f6cac4dad857c0b3adecd778e54e17ad9af4866da628d2c6be3c46fcef0e18be7a79776ef68de4abb175d11587 SHA512 bd10312b6592e795d101735a748100efab0e4ffe856d8ff05ec2413cbb1787b70e654c30a8ea13eb07ce2e517bde1d2f89b6efd2ab388edb4cc3d97ea2be1bb0
 EBUILD imlib2-1.5.1.ebuild 1965 BLAKE2B 7da6e8ba071a76ac60fe4e84482c4755d2c73f6cd5239b72aeaee28937addd59d01b31c0f66b764a780d9159d89d1915a353f096bfa1a5dfb44c3ad7344f7ec0 SHA512 4ab5ded399a3df668baace65b1cecfe410fa25494ccd4e05badeda46ae671dd72891d42940711c3ef2448e18c715cb3d108ab475fc21d0af97007eed448d903c
 MISC metadata.xml 2534 BLAKE2B 5f49ea63a52648dc587ea6409cd8030efc1ed82a3bd8c77f4b37c388e17e0faddd2d841616bf073c63aaf5440a9954c62bff07d9e94a6302d9285cad211180c9 SHA512 fb6cdef2cce2f36b2c772f54c81353e319223f45bfff52490165905e03a6ffd2c36c86e199f4bfd99b0450c3c1a23af371a12bee9c230308751362d1627791e5
diff --git a/media-libs/imlib2/imlib2-1.5.1-r1.ebuild b/media-libs/imlib2/imlib2-1.5.1-r1.ebuild
index ca27d229d37c..54c743ce05e5 100644
--- a/media-libs/imlib2/imlib2-1.5.1-r1.ebuild
+++ b/media-libs/imlib2/imlib2-1.5.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://downloads.sourceforge.net/enlightenment/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="bzip2 cpu_flags_x86_mmx cpu_flags_x86_sse2 doc gif jpeg mp3 nls png shm static-libs tiff X zlib"
+IUSE="bzip2 cpu_flags_x86_mmx cpu_flags_x86_sse2 doc gif jpeg mp3 nls png +shm static-libs tiff +X zlib"
 
 REQUIRED_USE="shm? ( X )"
 
diff --git a/media-libs/libart_lgpl/Manifest b/media-libs/libart_lgpl/Manifest
index 8c70ef3bda15..0880d544cb4a 100644
--- a/media-libs/libart_lgpl/Manifest
+++ b/media-libs/libart_lgpl/Manifest
@@ -1,5 +1,5 @@
 AUX libart_lgpl-2.3.21-crosscompile.patch 2007 BLAKE2B b5a1ab145e5f33ea33d23ca6eace0dfbb156056dd82a195ed72e853cbcba4bd0d774425f8cfc0f8c7658302a5113c9deb9364b1cd0fa702d3e165d92e5e58e67 SHA512 d7710f23972b309b08a318a76ef58c0bb2303c52f1348e817be01298466b894e2b7ab3cc666ef94e8cc3571b5d0fdf543139a24d2c85cecab16a01d5af124ff0
 AUX libart_lgpl-2.3.21-no-test-build.patch 535 BLAKE2B b7752c0b0a84a56164bcca9fb30b10f5810112dd4829571185a5d759151de59473f8ee9621718440d29e5becd593d50ca819d26db7f88175fff55296ea917f1a SHA512 17baab4a8f572812d49a25abe6a455c3cf6637bb03833e8f4bd662e96d30a74a15cbc70bc2eb78b0d23d6f2448a8f272dc9317841f6dc9f27caee06933ee8e42
 DIST libart_lgpl-2.3.21.tar.bz2 329102 BLAKE2B 581fbe3b0c52e69543eebb244f9a49046437d907d498aff1fddead24930f7e33067c7ea657917860a1171251b77b09b9520244a2216122c28bf83a71dcb3128b SHA512 8a632a6a4da59e5e8c02ec2f5a57e36d182b325b46513765425e5f171ff9ae326af1b133725beba28f7e76654309e001aee9bace727b5b4c8589405256a3c020
-EBUILD libart_lgpl-2.3.21-r3.ebuild 1154 BLAKE2B bb23a9b405405d1ec702918b2ecc1d9054239e1fec9f34b9e81a3f375752c2c102f941f4c30d7dcb35768fa7ae7b23f025e5a3a52d2662dbec6565d749a0fac6 SHA512 cf40f5142c6f7ef40aba03f1b8003ba8f429e89f85a03c97cedb3b1bdd34026918f4be1db417f9a6a9b7c3d2ed0d216684bbaee9e1428e3b2f3632c20758cdb7
+EBUILD libart_lgpl-2.3.21-r3.ebuild 1153 BLAKE2B c93d374575eceb5f681cfd622fb578a7cf3de95f485f281e967944eca560637d6bab857128e5f1c0dcc031232e579bd39b2ee336e78ae3d4b84bda5b11867b5e SHA512 2c79bb8a3a98e8e3a42d3b36bb8337dbc4824cee704f4923dae02ad34f43d6a2c7d36ba2e4e31121214fd81f7debb7ed186e3ed53ecc5e9d908800bfae512027
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-libs/libart_lgpl/libart_lgpl-2.3.21-r3.ebuild b/media-libs/libart_lgpl/libart_lgpl-2.3.21-r3.ebuild
index a46b6bcf6385..366c468a90f4 100644
--- a/media-libs/libart_lgpl/libart_lgpl-2.3.21-r3.ebuild
+++ b/media-libs/libart_lgpl/libart_lgpl-2.3.21-r3.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 @@ HOMEPAGE="http://www.levien.com/libart"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-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 ~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 ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/media-libs/libdmtx/Manifest b/media-libs/libdmtx/Manifest
index dde1ba84e3ab..515fcf216734 100644
--- a/media-libs/libdmtx/Manifest
+++ b/media-libs/libdmtx/Manifest
@@ -1,5 +1,5 @@
 DIST libdmtx-0.7.4.tar.gz 370999 BLAKE2B 7c87d1b1ca8a1466aed6dbd8b60b31c1acacbff46d99855a2366c89a0998acbc8e0b3d3e70612d6bfc736b48e2001d8de14b9169920e802490623009f3395ea9 SHA512 307aeb30506e60fc44550d1bb86081634f0718d53e7b878b45b0e704e75c5996e27285a16881b7c3a93cafa9a9b125175dadc0f0c2c2f976878666eb652108ae
 DIST libdmtx-0.7.5.tar.gz 790944 BLAKE2B af94a998e6ab0b06c17d64d6c720e874540830282fd1219260aa1e5fb44159b59f63fcfd1fbd750333ae50b080c341ec02b81216c2e975a8ef85628b23d4fb55 SHA512 c4bccc9eff4a93b6bb417ed23ed46e82cc98b650a94be40479d192af8537ee02a16700fbbd8f2271035ff8b804c40ab6461825d94bd80a3081d3a4b3988ea22a
 EBUILD libdmtx-0.7.4.ebuild 559 BLAKE2B 2bf658670fbe81aa3d73265f684582be428ad3cf3e4454787cf48ce5e05d5417440f934562fcf3e1467dd7a5aaf6eacdadb9c60bd07bfc3798902df2c88bad31 SHA512 c9dec7100a4fffc636cde5fb6b99f7a9e5a4cee565d2ac52685db6df4c5b128adadefda51aeef494449e71f4a06dd48033905cff1c773e6d1eb9c0229f37127e
-EBUILD libdmtx-0.7.5.ebuild 604 BLAKE2B e101e1511342b4d50d098810abb3f87a0a43ea0ebeaa363d515b00e4d21ab4deaf66dee8a65bce271bb26eb92aff596a678188fb5065ffb53c5ebfe531ec27b2 SHA512 6c0aed13647b96e0f175d1031903e88dd81464ecd9dd785890ebe258580708c6b8490976940393fc18b7b6f7fa83d6466ff03ae96233e0ec42e4c7e6c174478f
+EBUILD libdmtx-0.7.5.ebuild 667 BLAKE2B 0016a960c64cb003682ad790ad8319f9bf0f8ed7bec7e7c09f083db71b80b5b040c5630f3a0d3f76b60245a6ef2741a72ac9c03c2bde6b3e743de1686fb41fd5 SHA512 aa74bfdc89d850c9781b7425f071921b59475e558d36a434011ebd53b4d7a681d59c10e87bcbe66b413cbee7bfb39a0396c633df6a81a947a3e16f5e8a44f394
 MISC metadata.xml 378 BLAKE2B 9dcdc2a67e0836e73a48174390263c6344f329beb3682a92ffc52a11856b87ce5a4338803ee67f07f9d2337b4292433727c3edca55b155ebd93200351231113a SHA512 f4374bbe8333e1e1700cedd7482667159e5c2e31d8b0f6e52074c9261a11327ca9eab2c857f768cdccd287728b3ab3f52628733e4d91725230fedd985d376a7d
diff --git a/media-libs/libdmtx/libdmtx-0.7.5.ebuild b/media-libs/libdmtx/libdmtx-0.7.5.ebuild
index 1210c5c02638..e13c9ff42c43 100644
--- a/media-libs/libdmtx/libdmtx-0.7.5.ebuild
+++ b/media-libs/libdmtx/libdmtx-0.7.5.ebuild
@@ -15,6 +15,9 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE="static-libs"
 
 src_prepare() {
+	#bug 663346
+	sed -i -e "s/-ansi//" test/*/Makefile.am || die
+
 	default
 	eautoreconf
 }
diff --git a/media-libs/libfishsound/Manifest b/media-libs/libfishsound/Manifest
index 272a8724509d..dffe870765b8 100644
--- a/media-libs/libfishsound/Manifest
+++ b/media-libs/libfishsound/Manifest
@@ -1,4 +1,4 @@
-AUX libfishsound-1.0.0-pc.patch 406 BLAKE2B 5c6488cffb3dc4140202931b8c7f2b32a562b3fa51a89a0438fb42a137fc9777ff58bc4afdf89c2383f1329a05646804d28c472c81bb8dd3f3e78b3502bb1ba8 SHA512 c6b11b2fe8c8774cac0194f96873a5e110544b414c66fc47a685afc63c41a1d6c33ba666973101a2b447942ee2c4a44a82a0184fadee3074fcd3b950e61195e9
+AUX libfishsound-1.0.0-pc.patch 410 BLAKE2B a949e5c3e843017f7c901ef936da4dac2f9d3300cc6fe57032d28bfba94919baee9a77054464cd97c567bc90733bbd6cd92fa25f7fb4a41cc38e5f502b075eae SHA512 b4b5f70363633702ed1932454bf8133d24ff7703f432ebd0c8721e33d48c1a21fc996c4759713fb2272f230038b40fe6cc773aea715726dfee13066669e32f1e
 DIST libfishsound-1.0.0.tar.gz 444980 BLAKE2B eadb6bed80d51fa7399f9557a38b65183a4f583e431bc68ee961dcca947856c79f011206fdcb04ed6ee5f709e1045b2a9c4fd4a34afa00b09656b1a4623c3ab0 SHA512 97d850fb42b394fca098a96b1784da431a0af1d54d57127179b612e4b88a7a2e406eb1411f55536e5a11ec2e8956f2659182c60ac46d49f6d14250e39a740339
-EBUILD libfishsound-1.0.0.ebuild 1019 BLAKE2B 8ccca84ac86cb5db9c542d7c84928551ceda413951b5a47fd2e783ad6586b6d1be3267a1389316c181c084a95f64b6d17fa858ec58cbc260eba7f347c278d712 SHA512 bbca57efb304947202a5d59c0d36406072ed2731b485987f4730200eab3a0be6a01e6de885d2ed42b3bcb5a2449024f37730aee610356f33d0d24c8675531636
+EBUILD libfishsound-1.0.0.ebuild 1004 BLAKE2B d973991296c28287e4ca56a574431bdb0695349e1cce6435ce2282e7ca00c6afbb7fdeb9e2458f771ca9b8cf5d4e4ad44ed41f10287556fe797b89c3812425c8 SHA512 b5f7cfa3a9e290349dfcc591ba626e4356b29d2491ee5523ad6e7f0c90c1309d5ce3143e13dc4f6ad6e54c7cdba8794f447786e81b4d166374a1b2addf744874
 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/media-libs/libfishsound/files/libfishsound-1.0.0-pc.patch b/media-libs/libfishsound/files/libfishsound-1.0.0-pc.patch
index fa417bb98ef8..fae476bf8e26 100644
--- a/media-libs/libfishsound/files/libfishsound-1.0.0-pc.patch
+++ b/media-libs/libfishsound/files/libfishsound-1.0.0-pc.patch
@@ -1,8 +1,8 @@
 This will avoid including -I/usr/include/FLAC in `pkg-config --cflags fishsound` since
 FLAC/assert.h will collide with system assert.h.
 
---- fishsound.pc.in
-+++ fishsound.pc.in
+--- a/fishsound.pc.in
++++ b/fishsound.pc.in
 @@ -5,7 +5,6 @@
  
  Name: fishsound
diff --git a/media-libs/libfishsound/libfishsound-1.0.0.ebuild b/media-libs/libfishsound/libfishsound-1.0.0.ebuild
index e67184a6f17c..d5fe387728b8 100644
--- a/media-libs/libfishsound/libfishsound-1.0.0.ebuild
+++ b/media-libs/libfishsound/libfishsound-1.0.0.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
-inherit eutils
+EAPI=7
 
-DESCRIPTION="Simple programming interface for decoding and encoding audio data using vorbis or speex"
-HOMEPAGE="http://www.xiph.org/fishsound/"
-SRC_URI="http://downloads.xiph.org/releases/libfishsound/${P}.tar.gz"
+DESCRIPTION="Simple programming interface to decode and encode audio with vorbis or speex"
+HOMEPAGE="https://www.xiph.org/fishsound/"
+SRC_URI="https://downloads.xiph.org/releases/libfishsound/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="flac speex"
 
-RDEPEND="media-libs/libvorbis
+RDEPEND="
 	media-libs/libogg
+	media-libs/libvorbis
 	flac? ( media-libs/flac )
 	speex? ( media-libs/speex )"
 DEPEND="${RDEPEND}
@@ -23,8 +23,10 @@ DEPEND="${RDEPEND}
 # bug #395153
 RESTRICT="test"
 
+PATCHES=( "${FILESDIR}"/${P}-pc.patch )
+
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-pc.patch
+	default
 	sed -i \
 		-e 's:doxygen:doxygen-dummy:' \
 		configure || die
@@ -42,6 +44,6 @@ src_configure() {
 
 src_install() {
 	emake DESTDIR="${D}" \
-		docdir="${D}/usr/share/doc/${PF}" install || die
+		docdir="${D}/usr/share/doc/${PF}" install
 	dodoc AUTHORS ChangeLog README
 }
diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest
index 04b800c47f3a..c710b528f747 100644
--- a/media-libs/libgphoto2/Manifest
+++ b/media-libs/libgphoto2/Manifest
@@ -1,5 +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 6275 BLAKE2B e59c1e9e66f9737eaee1ac3d4cce62cff26a44723450627a727e4bffff451c14fa51f1f941e5a6b0b32dc607514d04f8ddc99a94cbedfb29dfdf8fa62ee89598 SHA512 48f244c9d9a936a17ab1d650779e7f541732dd49a09feb6e6c3485fa36bee8040614404962a3ef0694b373d2f5dc9f055be48cf6be483682718a003de941a6db
+EBUILD libgphoto2-2.5.14.ebuild 6227 BLAKE2B 8190fdd390cd567388bf0648ce593e50c38778f5006a096bb0f8bcec061b9f1c7b7c7d369dffebb0bb98229c1c588c592f8d9ba2948c81de1b0efb97ed28b037 SHA512 361a169bc125a3833c2c6f795c908a7c3cce8ecc21d3961d4a8e556048be3d588b5776134900bd16eeaaeae032966fc4b20f55f1c3c5d289ced3c7029af391d3
+EBUILD libgphoto2-2.5.16.ebuild 6229 BLAKE2B 9d262eca412015cde4da8de60397b48755cbd8a2cdfa31bc9ec7cbb7e7136d33f4ec7d5f2f1633d4f051fa6cb744353288115b4740bc7e9fa1da5c5fb11627b4 SHA512 f9d9dad4101d373ab462b379969ca544633d19a94f7ee19df70410a240b3dde9710d01b251e0e698db90d1ed5b0d101ba440c7284111a7d55ffefe094bce0146
 MISC metadata.xml 520 BLAKE2B 113ca8821b8ba1d594d64f86facadebf238372742380ce99c6f3172712873d1ebb3d0bf32eb072d7af1771f6099f5bde84114d6e45468a0d33503fbbe393a19b SHA512 905b25e683f85a23323e1205c0492e3b955e11f9d93a9c9c360108ecdd3608fa2f9f4c2572444c0a4be0df3f5e350dd13ca4ebb5ca523c0fd70fed3f40e39ed0
diff --git a/media-libs/libgphoto2/libgphoto2-2.5.14.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.14.ebuild
index 1a52953bea43..85c31936976e 100644
--- a/media-libs/libgphoto2/libgphoto2-2.5.14.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.5.14.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# 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
+#    https://sourceforge.net/p/gphoto/bugs/643/
 
 EAPI=6
 inherit eutils multilib multilib-minimal udev user
diff --git a/media-libs/libgphoto2/libgphoto2-2.5.16.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.16.ebuild
index 0ca3ce3d2785..c013cac6c19a 100644
--- a/media-libs/libgphoto2/libgphoto2-2.5.16.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.5.16.ebuild
@@ -3,7 +3,7 @@
 
 # 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
+#    https://sourceforge.net/p/gphoto/bugs/643/
 
 EAPI=6
 inherit eutils multilib multilib-minimal udev user
diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest
index e39b61d4608e..77f75728081f 100644
--- a/media-libs/libjpeg-turbo/Manifest
+++ b/media-libs/libjpeg-turbo/Manifest
@@ -1,4 +1,5 @@
 AUX libjpeg-turbo-1.2.0-x32.patch 1248 BLAKE2B 760f35a02c6a565a43702a4188186732f93c57a5c879cdc6920c427da097c3dc5eb111189c40510252c0209caf63100ecff7ffec1b10a177b09449db4dc5c3c6 SHA512 9ffc28a89db43eba9545bca2d4c1f5a11953f36a46e294b697bda190058dcaa59982f83552ce54f37ef83970d4b0fefd1e14497854c7991db38ab7f7c1c6afae
+AUX libjpeg-turbo-1.5.3-cve-2018-11813.patch 1240 BLAKE2B 469eefb5673f48ca8892050507bc7566cacb0b7ff2d2914428971a994bb41d9d717be7fe0a4908cee2ee57a74f6ca8112bee53cb021f4fadbef201536ebee979 SHA512 2542833a6afdbf1f2112695c524197bf5a319ef99c1c6ecea0fe0436681c45321bb6eb59e25fa97d8fa923717452f609e3f85d25547751fa4f8fe99f4ee789c9
 AUX libjpeg-turbo-1.5.3-divzero_fix.patch 792 BLAKE2B 31d3617155ac639ebd49a5db9c3898fdd6b20dc04776003121d6c906a96a8963984405b674ad6bee81c6de97304da78fa1de249cca7000fa7eed42f011e5a918 SHA512 b8ba793319e1f8c658f550fe6427625b2053486d784133c6b9e6778fac74c4eedadb6b9c208c6725a27cf585b4857c719ae03efaf602e181c4b782d55cb9b47a
 DIST libjpeg-turbo-1.5.0.tar.gz 1654276 BLAKE2B b3f1ad4c6bbe5b75ef8daa38e0ccf6165616768d1427d41f9b5cc6f5775720d2977aff6758ec0a9679c9eabc7c2395d4cdecdcb22c92522900de52900281b9bd SHA512 3b7249a5f5c7b1f1fa99924ac6bc9bff3bf811815ef38505af5359d1f0edb0bfb771f0fa54308743a2d9305cb19a997453fdb00d0aade3f2f17ea917a45fde22
 DIST libjpeg-turbo-1.5.1.tar.gz 1650647 BLAKE2B 5e9eb7889c430a735a8b8ac22fbf66fc98102acf372d08aa2dbd86ac55d43c5700438a77925f894c473e81289e4d3d2e6fe3da435d2799db21782da9bd5dfe41 SHA512 a03823cf4b3d1aada24e502fea0a979b1f656c01e55ffddc06013b9c79509c2da1e3bcf0b85282289451d77d4cb5f56dd8cbf6e492744836ddda1f7136534852
@@ -9,7 +10,7 @@ DIST libjpeg8_8d-2.debian.tar.gz 14764 BLAKE2B e93d12afa062da28b717b540492221f70
 EBUILD libjpeg-turbo-1.5.0.ebuild 2861 BLAKE2B 4110c8947b54c3959a8bcf10a57810fca35ff31e389b51d32b03d5ab15db542ebf63d931c8aa926da4b3c49d1b005031fd2468ade8a0c980714f77a76310538e SHA512 3aa56d232af1153e2c7747d7d390d11d43ff3955691420d8d3247ce104f6b959e55fa83bafa601401cb0095944504c5474b3564b98762907cf413ad504643c45
 EBUILD libjpeg-turbo-1.5.1.ebuild 2923 BLAKE2B 67850bed77be9bd0b06c1d4c4f95bcdd73430e8b26e1698409213837edaee047578f79b4f019979aab48dbfac6210272594b28aacba1d25e6237034c85e3c4d6 SHA512 13e10d81a0543f6b7cf44b185c3534aa08e2fc07bcb243aa159bc3fcd6194ed7d7e4f8bee51570acf0962731275a4f2d91cdfa931b62ec370e54f27487bf13ff
 EBUILD libjpeg-turbo-1.5.2.ebuild 2925 BLAKE2B c519f100505bcccb2d7b9192e26d5ffcc2d881b4bfc90b3e2e4f72447512686745434e4754f8393c14d4d2b7a285a6bc2d0ba0dd20a9916f00e2cccb85129023 SHA512 4e320a1a69fb0ca060ea35a9e2cc5aa7a971ad727bf661c9f64472874200a941f1502eecbe99d26642b21f06a4c1c3faf6d57885ccc63e1e9ec5edb3a7746d11
-EBUILD libjpeg-turbo-1.5.3-r1.ebuild 2982 BLAKE2B b439df02f28f006fc0feb319f10a7e1f2ab4190c5f3a4fa03999c785db4c6c52cc5d78cc69fd0c080e521bffec0dbcacdd02253ab1dd13763fee4a07e202d40b SHA512 41d082e0245ddbd4fd2b3a85e01ac57132cf75af146327171287463c846b8b03fbd502ef114ae1e22cb38df808d969dec15f6a247063684ad2054da606e83190
+EBUILD libjpeg-turbo-1.5.3-r2.ebuild 3015 BLAKE2B f5e9fdca33c3eb9d21da03bbfb5d6162f2db859eb273b21c4409234d43d8a45ca0fc21a2163bb221483a4a3f5b11024db74ab12cf4c46e605a96305bab8101a6 SHA512 3654b6ab0bb0ba5d1509835e43e3a3f5114bbe9484bcc4057af825f667a591117057c0a4adb565d899719a6c867ab8c5b84ac37762e47ac920619eb73f028876
 EBUILD libjpeg-turbo-1.5.3.ebuild 2935 BLAKE2B bb75f57fbc1926c3973660a52c531020c5e6a105d443b2df068f1db472d1395f4361136b56e3c9a1a88e219511706cd96025b0f44235adee2090dbd8880bf867 SHA512 cf593ba887b822db77155d348789d74435e6209e72918afb5b323085c5c1e9ea03ac8bfee2f03dd279ce477a2116539ef76159980063da2a8c83175a6dd482a2
 EBUILD libjpeg-turbo-2.0.0.ebuild 2695 BLAKE2B a7f05452a03d7cd6f61a9eccf0c282e94ea64ab9265598e4571fb24a168afbdadc89273208412f7fe9f2b80182268fd11d7b294a6fca063ccf4f5c61c2c2d369 SHA512 87ef21be051b6a99846975118930468dad06124b4599b9a20c19b8f2168f1c9c8ded5d1810970db09f98c4b8410ef55b0d876b54e15dc0e79d2ba1412ab6344e
 MISC metadata.xml 466 BLAKE2B 989b0d905baa9ba6217f871c43b1d06f8ea718ab7250d31cce0d498b219b3d1077638b2fecfaeb747e2505f2608d73390789bd442462a9e2f410b0939e2dbb77 SHA512 2b8725c3493aa2294b43f3328f3506458254f57b8ac2914b96a7bbf987caa4c6a011e7afe72099bd0d33ff605c018853efde3e77faf2bcb012d7e49d229f17ea
diff --git a/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.5.3-cve-2018-11813.patch b/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.5.3-cve-2018-11813.patch
new file mode 100644
index 000000000000..f99a1ab27f97
--- /dev/null
+++ b/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.5.3-cve-2018-11813.patch
@@ -0,0 +1,45 @@
+From 909a8cfc7bca9b2e6707425bdb74da997e8fa499 Mon Sep 17 00:00:00 2001
+From: DRC <information@libjpeg-turbo.org>
+Date: Tue, 12 Jun 2018 16:08:26 -0500
+Subject: [PATCH] Fix CVE-2018-11813
+
+Refer to change log for details.
+
+Fixes #242
+---
+ ChangeLog.md | 14 ++++++++++++++
+ rdtarga.c    |  6 ++----
+ 2 files changed, 16 insertions(+), 4 deletions(-)
+
+--- libjpeg-turbo-1.5.3/rdtarga.c
++++ libjpeg-turbo-1.5.3/rdtarga.c
+@@ -125,11 +125,10 @@
+ read_non_rle_pixel (tga_source_ptr sinfo)
+ /* Read one Targa pixel from the input file; no RLE expansion */
+ {
+-  register FILE *infile = sinfo->pub.input_file;
+   register int i;
+ 
+   for (i = 0; i < sinfo->pixel_size; i++) {
+-    sinfo->tga_pixel[i] = (U_CHAR) getc(infile);
++    sinfo->tga_pixel[i] = (U_CHAR) read_byte(sinfo);
+   }
+ }
+ 
+@@ -138,7 +137,6 @@
+ read_rle_pixel (tga_source_ptr sinfo)
+ /* Read one Targa pixel from the input file, expanding RLE data as needed */
+ {
+-  register FILE *infile = sinfo->pub.input_file;
+   register int i;
+ 
+   /* Duplicate previously read pixel? */
+@@ -160,7 +158,7 @@
+ 
+   /* Read next pixel */
+   for (i = 0; i < sinfo->pixel_size; i++) {
+-    sinfo->tga_pixel[i] = (U_CHAR) getc(infile);
++    sinfo->tga_pixel[i] = (U_CHAR) read_byte(sinfo);
+   }
+ }
+ 
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3-r1.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3-r2.ebuild
index a18bcc5812bc..698ffe37228c 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3-r1.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 
 LICENSE="BSD IJG"
 SLOT="0"
-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 ~x64-macos ~x86-macos"
+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 ~x64-macos ~x86-macos"
 IUSE="java static-libs"
 
 ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )"
@@ -36,6 +36,7 @@ MULTILIB_WRAPPED_HEADERS=( /usr/include/jconfig.h )
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.2.0-x32.patch #420239
 	"${FILESDIR}"/${P}-divzero_fix.patch #658624
+	"${FILESDIR}"/${P}-cve-2018-11813.patch
 )
 
 src_prepare() {
diff --git a/media-libs/libmtp/Manifest b/media-libs/libmtp/Manifest
index da6ee2f6e410..7b2162688e7a 100644
--- a/media-libs/libmtp/Manifest
+++ b/media-libs/libmtp/Manifest
@@ -1,6 +1,6 @@
 DIST libmtp-1.1.14.tar.gz 804354 BLAKE2B 8a5ec431b3a3c1445b3ae62dd0f6ebee36a473ce3d7da07400263434d6e1be49624b8c807bce015f9e55d450f9e25eb2dcf0831c639b97e39cb900ac4d62f81c SHA512 337d259462cf9700fe5a5f09b38f4652045ee71249d54562661362e6d0ec7fe087ab77ec68d443e4fb84839a8ad9dc686c207d723ab47bc1a542dd0a71b294b1
 DIST libmtp-1.1.15.tar.gz 805983 BLAKE2B f464c58a9844706ecc066a4a744b525ac6e8020ab80e35b01eab2813562ea1452deb5e6fb4477eb243b6631c24f8bc11887ec35279cb6cd89e1a459aca6b36cb SHA512 c85f47ef4e05d7f5b47d06463ca97c123fa068c4b7369aeba496cb1cfa03f0148b3ba73feed7da96269ba94b76b4b81858ee4bda5af67b0aac3b07fe39b5354a
 EBUILD libmtp-1.1.14.ebuild 1597 BLAKE2B fb0ff0ba1478dd9c6d8b1e6be56f88d288a0cce2294ff271a1c392881c009dbf41ee457ff8a97282e76faede81a35296fd04507d64c9bd5cdb425e593e50df93 SHA512 ed6d56fa731f121082cc27e7790530ef4c4a02885685a8f0fdaea693c963d0b9a18c6b74bba8772c4965d2d910590131cf4da96fdc1f35568c7135f4da11ccea
-EBUILD libmtp-1.1.15.ebuild 1603 BLAKE2B 52649939b562e4af906e7ee5613afa6cb35d3c7834a6593a426553f19a921f87a7a2a0bd763843a7c115e236de9c7919855af60702d88d128c8fbf0648e7d652 SHA512 8de4ae97012b8c8cbe4d7b5408834a048c73d91b8e9371d936c48a93193a8b528d5b3e148d14d31cdbbb669bb995f796c8bdb22cf9e708e60e1c59a74e2885f1
+EBUILD libmtp-1.1.15.ebuild 1598 BLAKE2B 77884c0c2d1e4ff58abf53d55e8fcc290aaa053fad947133a24692dde07937cc5d6503aaa6d31723e0996fa3a2f182e37be7766b204276b3324f5dc02bf78f7b SHA512 066fb35601f31f9d610b8951ae7789cda8a8b8f2cc8d77db4dface52bca8dd47d1005b524809fd3dcbde4f5bb3c02dd184bf820f3d24166daf1aa16bed40bf81
 EBUILD libmtp-9999.ebuild 1603 BLAKE2B 68dbef72c8b95ddf2e6f483c4f29edd373190900750f1fe8b14ec9136877fff8c8905e9fca6065daeb447b0ce60359e1f828b92fd457f665a47ce4cc58ef4a66 SHA512 19295d09b442b0fd7bc5961cc38a587edc9f41e0d8a3656f92628db71cf4f542e27af35a2f23535678fba7d76dbe1fa926a58bcf3fdbe612dcf8db7a527c601a
 MISC metadata.xml 329 BLAKE2B 4d7d938ffffc075084e5d43ca37040cb1612e7d6bdfed9c12d5edb00e0ce536d2d19b070dcd26d64a46a6664985db1f07aed073e2912c3dfc743ff6d55e8d187 SHA512 99fed0095b41d435c1bf82d7fa9c51b03fadc01646d959735693219cbfe2b69f784610fb296d5f1fdc8bb7c84dca4dbf3718effd350745de6483f8a8f9407d6c
diff --git a/media-libs/libmtp/libmtp-1.1.15.ebuild b/media-libs/libmtp/libmtp-1.1.15.ebuild
index abcb9e7c7fd3..5f72a9d5555d 100644
--- a/media-libs/libmtp/libmtp-1.1.15.ebuild
+++ b/media-libs/libmtp/libmtp-1.1.15.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit autotools git-r3
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 DESCRIPTION="An implementation of Microsoft's Media Transfer Protocol (MTP)"
diff --git a/media-libs/libpagemaker/Manifest b/media-libs/libpagemaker/Manifest
index 2dbeef4f7eeb..11d7d710928e 100644
--- a/media-libs/libpagemaker/Manifest
+++ b/media-libs/libpagemaker/Manifest
@@ -1,6 +1,6 @@
 DIST libpagemaker-0.0.3.tar.xz 292960 BLAKE2B df95adcbf5ff4ee312667b9b5201a53724d9d7d104bb252f5d5cae6719f490fe3541aa39875c1458ef06e8e06a1b23fd19e34e0de05e9e861b24189146c3f865 SHA512 f9a5cb8b2cdfaf550002d5d078eb79537ed29614a2433f8d41101f1e35e9536cbb324c1d96328d21e2d2e0f21ff58d807813e51f8c660b199843fc8710ae29e0
 DIST libpagemaker-0.0.4.tar.xz 306496 BLAKE2B 9928d5759c35359c4983724477e432b6876fa4d6e3039296a880661a4587de612ce93908a93d1d2dfbd033c6478748a4329a1682e327db528ddb7dc0947374ef SHA512 d9d9436622ae378da2a3c8e50a35b6133582a595c9ff0fe0e3b124fd0b83f1f12afdfc6a27d16b509ca9bab33067215d7300e505d4bf6b280be7e4bf46da6c64
 EBUILD libpagemaker-0.0.3-r1.ebuild 960 BLAKE2B 92f636895c4209c49a4388cb6c7ae73b62625f84f80e408a5b3633400e6004fdc9030cd321e57cc165848bfb4dba574801c7494aa7e83eff0394601c317131e6 SHA512 476a0a94e086fef11041f8974cfe3557adce8f8b10931034d3861e6dd103f5f30aa7e4452ae3f0f98388525aa7c638ba2e895dffb4dfc52fc2f2185511c281c9
-EBUILD libpagemaker-0.0.4.ebuild 964 BLAKE2B 84883f3284ea13c357ac2fdd2cb825810618db084123a883b64d894e11885e41203d497bf5a8f9c798f2566c7eedf67f88c3d15167e3a25fa268bb2d179a2f1c SHA512 7c02bb4f8fe43d9a7ddcdf218e3be98a40e966b547f49751a430a8e41e0b27870e48082c56641dd20264033401795cac9e41b382879457c7344b3d7fd7294851
+EBUILD libpagemaker-0.0.4.ebuild 962 BLAKE2B e94f042fa23b31fc3c6fac8db173571337a026befcea718289f39ab1276caa35a2ebccd9c8f7752b49894b45d66b45edff52516d9b8b019e6082ca218e2f46bb SHA512 6030cb96659e62d9d0f1244ffb02bce29110f42e702ed9b651b291c216c235c6d0eb007c7a459398d4943d3d08ad8bf00b23a7b56c5c4f143c6626942053e5ab
 EBUILD libpagemaker-9999.ebuild 964 BLAKE2B 84883f3284ea13c357ac2fdd2cb825810618db084123a883b64d894e11885e41203d497bf5a8f9c798f2566c7eedf67f88c3d15167e3a25fa268bb2d179a2f1c SHA512 7c02bb4f8fe43d9a7ddcdf218e3be98a40e966b547f49751a430a8e41e0b27870e48082c56641dd20264033401795cac9e41b382879457c7344b3d7fd7294851
 MISC metadata.xml 346 BLAKE2B 3957184c53e81e9b9727c3da9593b8c4e9c3ab4b59c03f4a6deeae528d397affac28282108c760ac4ddd0c6699b3027158ba33abb0540d12aa15c56302b3110d SHA512 2585fb6fd9ef4008842e0a5c7b1db3d86f152e2d012fdddeba02d1ca0c6e1e457f10c01c8e76b030a0316807f38f6a6853c0111790d7cb6a93437259dbdf503c
diff --git a/media-libs/libpagemaker/libpagemaker-0.0.4.ebuild b/media-libs/libpagemaker/libpagemaker-0.0.4.ebuild
index ce90d99852b3..7d07ed3e7856 100644
--- a/media-libs/libpagemaker/libpagemaker-0.0.4.ebuild
+++ b/media-libs/libpagemaker/libpagemaker-0.0.4.ebuild
@@ -14,7 +14,7 @@ LICENSE="MPL-2.0"
 SLOT="0"
 
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug doc tools"
 
 RDEPEND="
diff --git a/media-libs/libsbsms/Manifest b/media-libs/libsbsms/Manifest
index 34cba4058645..f5dcc3eb1017 100644
--- a/media-libs/libsbsms/Manifest
+++ b/media-libs/libsbsms/Manifest
@@ -1,5 +1,5 @@
 AUX libsbsms-2.0.2-cflags.patch 688 BLAKE2B f42728c599064927973f65a1eb3443cdf7a931f4f5d971a61d749ba4f0b990b34d8c47a2d52b08c5720202732e8409f006dae481b94634ba5b97a57f76bfdf40 SHA512 330a26e5b4b99f00546a2f625c4bae90f8a8645e855379e7de4f833a1c561c3c8e23f0faa954a989359f0de09a1310374ff93644d2f646bae3b9788293cfcd29
 DIST libsbsms-2.0.2.tar.gz 450170 BLAKE2B a9e75f1f2a3da2a407d21bd267fe842d2c2367f85e4cb588902ae34e56b76297c2f60968113ae7a08a6652e57bc20376f1a60e97d6d59863f9f1ae30589e0723 SHA512 8aaab3e191f3e10e559683ab4ebdcb8d951cf0e776390234f25675a98640d60d20aed872061ba72fdc3bd7827b7d46bc27225fe947cdd7fa4312f75cbdd78e6c
-EBUILD libsbsms-2.0.2-r1.ebuild 763 BLAKE2B 450b674ebd93e994b53b82f1ab2f19136b4cb2f4ca5a0d29c4ffdb08275ff304e3bb6d1f3d5e4f6a52040076d8c336aa9cb7fd350fd5ef0045d3874f386ac4fa SHA512 3c00bb75a643e6d916aaac2967570a192e315f2400c670727b8013f2fe76e35937b1014b1d485d6d45204284e484ed9def263841efb4086ef265c3d0a8ba79c0
+EBUILD libsbsms-2.0.2-r1.ebuild 762 BLAKE2B ed6dc5696b418e8e7d67bb821f60e5197f3a66e0a67df4048e545e92bf024900e194bade90ffa04b567f0979e8c1d3b7b7bbd7a1dc92f4b96ee2f430e0f01830 SHA512 a1de6029ca6982e9feaec11e45a05ce5ab36e31469f9c6adbe3e761210694c225e7df7d4cf24164f35bc44d70e6af80909448e93713ca52de3160e0e0893d3be
 EBUILD libsbsms-2.0.2.ebuild 719 BLAKE2B 55acec37cbe5b91798d60adec0081c386fac9a75edfea35159619fc393205f613f14e72d6fd6bd978e96153d5ff30901da1245000ae9cb9d1318e49aa201b958 SHA512 ebfc7e0316c67e1fa2d9cd34a6c79386fa634879509731bde60ee08ae528f98fad4cef6ca19faf40545216cf4a364a698947a4fd1aeb7498db46e227d032dd8c
 MISC metadata.xml 334 BLAKE2B 27f96c580033502f5fae3be23efbde22dff9671695e36128f4e8aa1103d81383d718dd36225f1a966b0bf800a7566a89f735197aba72d4842f7162f3e7f06333 SHA512 0bdcb69cb01f3ee3734ee6374e72b0e2d6b413660067b0c63df773f61d13230d0e1b7af19ed5ffe8a31472a4f8e715c3da3b76bdb3e350cfbadab5dbb4d25a59
diff --git a/media-libs/libsbsms/libsbsms-2.0.2-r1.ebuild b/media-libs/libsbsms/libsbsms-2.0.2-r1.ebuild
index 4e77d0d1ecce..bbb59254b9b5 100644
--- a/media-libs/libsbsms/libsbsms-2.0.2-r1.ebuild
+++ b/media-libs/libsbsms/libsbsms-2.0.2-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/sbsms/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~mips ~ppc ~ppc64 x86"
 IUSE="cpu_flags_x86_sse static-libs"
 
 PATCHES=( "${FILESDIR}/${P}-cflags.patch" )
diff --git a/media-libs/libsoundtouch/Manifest b/media-libs/libsoundtouch/Manifest
index 31bbaa8d280e..f643a2fb0b12 100644
--- a/media-libs/libsoundtouch/Manifest
+++ b/media-libs/libsoundtouch/Manifest
@@ -1,8 +1,9 @@
 AUX libsoundtouch-1.7.0-flags.patch 651 BLAKE2B 92e136aaa85b88a3a90a5d966e316d48b9be3fd1637c8738173c09d10b3fdf9c5d4993162625e18b041463101d083aa43edd200269121ffb8cadf65208b84df7 SHA512 10ce7ad86d442430af3c2bee3cc1358f98e54ebe205c1eb50c817fb687da21dbfe2db4499a8b623ff5d2d2bbbf04d4d7d9c4856399bcd3934ac7f8b6b8369b60
+AUX libsoundtouch-2.0.0-CVE-2017-92xx.patch 1587 BLAKE2B 29cbb252a2a161e890a354291b6e83f0271ec83f2683bde43c56ca96eeb1dcca5eea3534777158939bfbec288acd2d4404bf8e70987663f43693c259a41dccb3 SHA512 aec797125ac6e0891baedf36552686342e83a2e362544e8d81ae960356227f275c5ec906f595f676497763dc411506b85de06a35e540f173c0d0e966451b1783
 DIST soundtouch-1.8.0.tar.gz 106229 BLAKE2B 158a1e4f8c8cbdc550e310f1c2531ace208159c986abbb25aa9787089538308940b61793acd6c26c2937cfc725b5ad3a23849e37b9958d05c09f55045493cc7d SHA512 724e6ecc1727ee4c4f2503d183717dc1503ee2017b176677da6f0268e82254a7cca3ff9a27dbb9cab59e32d002797eec1b39d2b729f741e5f2ea77a147af4d39
 DIST soundtouch-1.9.2.tar.gz 171369 BLAKE2B c60d06191a2e8268e7980bf30824676f4f3761357c5a41b1e376efa90f92153386f29447cdc9159c74acbd0a26d3cd4f8de51ee689cfe717cf422705e61f2e16 SHA512 d8f3f8970198a46ef3dc252719749bc19cbd2f8de5e00eeb2874565bfc421b60d94d400bacf702591293e595edf6c1c35917b6153fd395cad8d6b03115da7068
 DIST soundtouch-2.0.0.tar.gz 455148 BLAKE2B e38358b0b773edc03a1b227222418d1e79a97f7a1c7abd22f2cb96bb2a7e3427802214775c908329eeec87710b4d199fba819ad7b99f3d58071749cf372991a1 SHA512 c916bdd2cb3d7547f264b1caf09b739b48a161c8c6288c3893fc97379546ed6b41dafaf603b583fbf64ae91270fdeb90811e5b0df0e9c051dc9f6ddca4d319f9
 EBUILD libsoundtouch-1.8.0-r1.ebuild 1274 BLAKE2B fa21e1b1b979ed1ebb1e9db95f0b1d4567ae4a02c58d982642863c83c17de0e3c60b347503b1b70838b08e20219aa86a215dae1503000880040fd79f80ce956c SHA512 1ce547e6fadaae27978584b70efb7b9a5a1fe2fe9ec29c43d56a8f69621ce87ee045bec59c550793c71adfddffee8db72b520f6650d8354238fc54a7b75ce63b
 EBUILD libsoundtouch-1.9.2.ebuild 1385 BLAKE2B 57891bc2c877ce225b2d4a8613d2545e8f509ac29ff2bea9753877b24fdcb08d310cd16fe3b07acce63f39680ac84a7421607877b03bcc93adcb3cc96a1ecaa8 SHA512 bb278dea26b3fdc73e598b7fe05ce7af5595bd64a894eb0746b5ba36fbba90fcbfcfc3d43e43d7406b60f3f8bed5034368644dc1563a2a275103e93db87cd72d
-EBUILD libsoundtouch-2.0.0.ebuild 1440 BLAKE2B c318072d1ce1a97fa83c06a0cc80d7dc4d8b30e844e68d475b7389a8a85a955f40f9c4c1fa72908843d90c36d73cf5b1400b9eba4e92d36236060661595841cf SHA512 5ba4d6220fb33c1defdcefa8e0f1bbc0ce5720ae0f0c3e58a2230f23862c7b93e6087cf63e78c98216695a9469a39d29e252ba0d62d3f86bbecabb7fbdeac472
+EBUILD libsoundtouch-2.0.0-r1.ebuild 1502 BLAKE2B 5a99374f2124bc512c1bff07030201b160522556baff1a9c4c0c4f0e2e6ec2cf61c3a431aa21dafec69e2b1e1a72e9c3396868e784cdc1d0c59a0d4f82a29c4b SHA512 313dfeeabba45d946d1ac11443bb4999bd8e182cf867714c0d68e48487112ac6f54ad6e99ff1df8310a4cdc3999299717bb644bab1b41e4ee60ae0565c121d94
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-libs/libsoundtouch/files/libsoundtouch-2.0.0-CVE-2017-92xx.patch b/media-libs/libsoundtouch/files/libsoundtouch-2.0.0-CVE-2017-92xx.patch
new file mode 100644
index 000000000000..0e475a3e44e6
--- /dev/null
+++ b/media-libs/libsoundtouch/files/libsoundtouch-2.0.0-CVE-2017-92xx.patch
@@ -0,0 +1,36 @@
+Description: Fix CVE-2017-9258, CVE-2017-9259, CVE-2017-9260
+ Based on an upstream commit, original commit message was: "Added sanity
+ checks against illegal input audio stream parameters e.g. wildly excessive
+ samplerate".
+ . 
+ There is no reference to CVEs or bugs, the commit was made after disclosure
+ of the CVEs and all three proofs of concept (crafted wav files) fail after
+ this commit.
+ . 
+ The commit was made after version 2.0.0, so that version is also vulnerable.
+ .
+ Unrelated changes were stripped away by patch author, upstream commit author
+ is Olli Parviainen <oparviai@iki.fi>.
+Author: Gabor Karsay <gabor.karsay@gmx.at>
+Origin: upstream, https://sourceforge.net/p/soundtouch/code/256/
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=870854
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=870856
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=870857
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/source/SoundTouch/TDStretch.cpp
++++ b/source/SoundTouch/TDStretch.cpp
+@@ -128,7 +128,12 @@
+                               int aSeekWindowMS, int aOverlapMS)
+ {
+     // accept only positive parameter values - if zero or negative, use old values instead
+-    if (aSampleRate > 0)   this->sampleRate = aSampleRate;
++    if (aSampleRate > 0)
++    {
++        if (aSampleRate > 192000) ST_THROW_RT_ERROR("Error: Excessive samplerate");
++        this->sampleRate = aSampleRate;
++    }
++
+     if (aOverlapMS > 0)    this->overlapMs = aOverlapMS;
+ 
+     if (aSequenceMS > 0)
diff --git a/media-libs/libsoundtouch/libsoundtouch-2.0.0.ebuild b/media-libs/libsoundtouch/libsoundtouch-2.0.0-r1.ebuild
index c95ddf7bd4b3..cf33c842180e 100644
--- a/media-libs/libsoundtouch/libsoundtouch-2.0.0.ebuild
+++ b/media-libs/libsoundtouch/libsoundtouch-2.0.0-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools flag-o-matic ltprune multilib-minimal
 
 MY_PN="${PN/lib}"
+inherit autotools flag-o-matic multilib-minimal
 
 DESCRIPTION="Audio processing library for changing tempo, pitch and playback rates"
 HOMEPAGE="https://www.surina.net/soundtouch/"
@@ -13,13 +13,15 @@ SRC_URI="https://www.surina.net/soundtouch/${P/lib}.tar.gz"
 LICENSE="LGPL-2.1"
 # subslot = libSoundTouch.so soname
 SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm ~hppa ~mips ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="cpu_flags_x86_sse openmp static-libs"
 
 DEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
 
 S="${WORKDIR}/${MY_PN}"
 
+PATCHES=( "${FILESDIR}/${P}-CVE-2017-92xx.patch" )
+
 src_prepare() {
 	default
 	if use openmp ; then
@@ -50,5 +52,5 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	prune_libtool_files
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index f50351e62780..c5711cc5603b 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,13 +1,15 @@
 AUX eselect-mesa.conf.9.2 1630 BLAKE2B 6c67ef9b5dc94f2f26378c004a459680b05084900a9199107a23f9c55514b59438265bce9ca207b05e2d20c3aa43e475d3f228c283dc965402c962a4cd0b6ebf SHA512 0fa9a23b4fba10599268266a82c7fa8dc5bfa1a0d565732875064c381dc4ff40c23faddb02b5849b1522eb9b7fd2ec2a0fac14406442a4aa0afa44bf760b42b5
 DIST mesa-17.3.9.tar.xz 10660456 BLAKE2B 54f4a75f9040e50e9eea8f5c52a276578379d25d2a01ac4767ab12bee85fe5dae1492d5bb1df06b6e8c6b0fe960bbd5ea38691c75d08a6b4302c64377ce58e54 SHA512 83deffbc6b9823b8e93cccf57d7952106f3d55fea881e3924f9f9586f0e9347a6e3a1a36cc19c24af819f2fde3af9496652a6ff56132511a5618d5774404f63f
 DIST mesa-18.0.5.tar.xz 10952996 BLAKE2B 708cdb2ef95a618430cd4e7eb45bcab0f6575774065b61f53787aa378385fe0dfa0b04f9c80c5426f9581851edc545a75c137777dc304ac8ba57465d365fcd50 SHA512 63b47cdca7f8282aab7aaa66233411f02918e5c4804b7a0010de2b1867fe90171e492ff031dfc4aa20968dfc99bd7dceb5d35fd44c709e54a2ece61175a60f3d
-DIST mesa-18.1.4.tar.xz 11133392 BLAKE2B b0c205e5baa04bb018333ffd89942f86f19edd3f610cce004db23bad4ebc1a3379ea35e72c85ccc08c34c8bc0991c1f0b595227fae2259e4b76895542d3f25b9 SHA512 04b8e5bbfa640f2303c388ab701fc2aca7f6d5d127ca5a9f9409975556813ba8e94305d27c9cea236a0e6d44a38b97e2877509268a96d9ed2a6762ab385aa3dc
-DIST mesa-18.1.5.tar.xz 11137340 BLAKE2B 3c18d2d73aa7ee920344691bd6de68b27b5cfb37e707921e04e3989596f3e5a088ac7171b033bb61473627cc1a5bf11d24a1f28d8483164b855f8023a74497e1 SHA512 f0bcb903bbf2ff7fc0b4a8fe100ea26ee91c0029b64adaf5fc4877ed7681f325c54b1be8eb0b140bff620da79f30a96375c2e1085e504ebfaf50e57f6da93013
-DIST mesa-18.2.0-rc2.tar.xz 11325108 BLAKE2B 5eb18c5b65d1e72959be85f40e45e355d1a8a3f72d2d54bc986b303648d376e5357a08ab7d63393d4949c8380376caefcff4946cc80677afe1d6073801200d55 SHA512 a60e6f1a0e819a1231946f9a50609ae670595c8dcd7d9d7ff1f928485e450dd25c622a451369c1f2999c3b986d2c5d9f4e6afd0e6cf24a7ae56595265f5d2aee
+DIST mesa-18.1.6.tar.xz 11142884 BLAKE2B fdd156fe7debf5223285dfa238070a2bd7d8ec684dec168afab78b9d2d38d53c10d939aaa64f34c2910e542dce3869adfca6383fca6a854c6dd03287a044b0e3 SHA512 2966210800215f5ced2720691063a8519b51ebeab9fb1e99bde4b1bd7ccc719d6395a1c29f25c88efe62d1592cf14ceafc163aca349490b1f8cee81070d46fcc
+DIST mesa-18.1.7.tar.xz 4833280 BLAKE2B 3c997ed40838a2dcce82b474f0120169e13eadc9db571492e200f10aabebff0867e3ff47bb9acb8c9ebbc594e996aab560be8f199bf96ef422e9e894861a6e2d SHA512 f5e2f39ba53886b61b2596c2caf4116063d1dd8b13318604f377eeebde1763e42ea9eb74fbe895494958fa9f4da323bd7279f72ef7e7d384d3e18287b74d8093
+DIST mesa-18.2.0-rc3.tar.xz 11327960 BLAKE2B 7ce236d6a308904a8f76b2fda86af181ae4e422d637caffb45ffd5ce0ed427fdfbd107f44c52825bff173ec8aaf4e3a3dbae939167da9f6a1a719b7366914526 SHA512 175dbdffdcdf61c7ac0e4e1fae021daba80311fac02074ad6dea208971ab50c68bc43ba8d7b36ecf82b7081c051d301cb562f66785446973b88657d48f7bb663
+DIST mesa-18.2.0-rc4.tar.xz 11320208 BLAKE2B bf99295f462ec8162bced6ff6d8496f3d2246ef85b5b6512f1b2d6c6ac63c04a2677b0e0368e857e0becd0ea08d96c53c557a4a103bbee8e169d3e1f80dd9092 SHA512 8aa5c75567c23228c80174c36f1cbc30bea79e5a5cf93804a9ca6c6142c428c55ea256b0a76d83493a52d60d4c4ace96ae81434f01fcdfc1971151bf3900f655
 EBUILD mesa-17.3.9.ebuild 14465 BLAKE2B 9fbe7ed8fd4f46d918288fe6f8b944d56cdd470c804d2786a19ef713b65c6b609e7286425c2cdc47aa52fd509af02eb077bea83ba04fa9dc232b2e6e19e59b1f SHA512 2f09d42d19cb4ef714d6b5fc1b6526f630393428522d98d24106d351a135e93eab172a2072e11cd9968e9c9e18da82b3f96cd7f6b0dc81ab316db80d6c542e3a
 EBUILD mesa-18.0.5.ebuild 14421 BLAKE2B d1170f83f571b84a1c3906b02aff38190c9586e3a22928b3f85b16c98448c928574faa18975bc01210c524d10221af679a894c975f83e0cdbca0146b553950a1 SHA512 a9d5c7284211a34f8022388838fedf2df792bac3188cc4e12ed4a5f362a978651b39c571402d798e559bc625708a2dd3a0363c19ccc43dfed9de81eda40e22b7
-EBUILD mesa-18.1.4.ebuild 13432 BLAKE2B 0ecb168929a67a1829e9b1e8ace99091813afb6e7facddae82e22b89c0011abfa0fba0d577649dff24b6ec6569651077ae77069f7ec6ad59d1bfe023ffa3f53c SHA512 19c6d34947e4962014b3df6738d2564bd6c0172be81d6101b051bdef96e8b1f2d901b8566aa4ed9212f42c190251477e70ad16188655c17ce32848703190d02f
-EBUILD mesa-18.1.5.ebuild 13432 BLAKE2B 0ecb168929a67a1829e9b1e8ace99091813afb6e7facddae82e22b89c0011abfa0fba0d577649dff24b6ec6569651077ae77069f7ec6ad59d1bfe023ffa3f53c SHA512 19c6d34947e4962014b3df6738d2564bd6c0172be81d6101b051bdef96e8b1f2d901b8566aa4ed9212f42c190251477e70ad16188655c17ce32848703190d02f
-EBUILD mesa-18.2.0_rc2.ebuild 11982 BLAKE2B a7a84d5edfdd47d27e4a6b49a75c93ad31eedae896ee6e0e673c1f1e10e5104d4dca6921a20ce8edd5bfac736ab7a461e3d3c78312156dccf5124e8b3d7f0e5f SHA512 bcd6dd622284752f37e7b41478d1a167f7033a6c34767892bb1c8d34b38bfc3899c32d4ac5ef7459e12678611f3747ae4f22d045124dac9d93b32f8d5a15cd15
-EBUILD mesa-9999.ebuild 12003 BLAKE2B 4b4c2b86f66e48d5891f7afafb4d265b996f5b3bfce06bd539a6298a2ccbea9e9a8ef96e1890e0c5478e95cd64d6855c9172cd571309f77c7da29d49f9a953f5 SHA512 42e75d4c83f9fcffe2a0df96b6cd9ffde8fe8cec298f63fb9d80ce1efc72dd27305486cde97e9cb0c4013df78117c3d47864a26faaa676161e7645a412851696
+EBUILD mesa-18.1.6.ebuild 13426 BLAKE2B 0bff5bf2683d72f587f338059891d0793e46388c928889f1f87f0188bdaaac53598bf54ecd43d8df5e52eb8ca283a6ef345929c7ccefd986d8a9a88c0eb40c64 SHA512 d91efb79205c93049d00f577088dcb43e258ae85d942c65516ff404d07aad36dfdb37d4f1a791c2ce0b0fbe695e9ca7304093dfd11175bcce5bb8a19373f1bde
+EBUILD mesa-18.1.7.ebuild 13432 BLAKE2B 0ecb168929a67a1829e9b1e8ace99091813afb6e7facddae82e22b89c0011abfa0fba0d577649dff24b6ec6569651077ae77069f7ec6ad59d1bfe023ffa3f53c SHA512 19c6d34947e4962014b3df6738d2564bd6c0172be81d6101b051bdef96e8b1f2d901b8566aa4ed9212f42c190251477e70ad16188655c17ce32848703190d02f
+EBUILD mesa-18.2.0_rc3.ebuild 14361 BLAKE2B fc960ca9fb0edc6c3b5069cbe78b9538bfa8e934de75964a5e13520aea452d9234d7469a654595252139dd508a74ffe5b9f0e6fa2d94ed216f91b7dd2dfe6dff SHA512 ef0d0754e18789bb297d83ac6abc1b4d626bfc1c0499854627cdce47cc36ec5421f28959b533b3d9c1171321e3b85069ad156aa9193b5c1e48c2345d67fb2169
+EBUILD mesa-18.2.0_rc4.ebuild 14361 BLAKE2B fc960ca9fb0edc6c3b5069cbe78b9538bfa8e934de75964a5e13520aea452d9234d7469a654595252139dd508a74ffe5b9f0e6fa2d94ed216f91b7dd2dfe6dff SHA512 ef0d0754e18789bb297d83ac6abc1b4d626bfc1c0499854627cdce47cc36ec5421f28959b533b3d9c1171321e3b85069ad156aa9193b5c1e48c2345d67fb2169
+EBUILD mesa-9999.ebuild 14412 BLAKE2B 9f12d63fbf9025703d11620eef373739e3040e36805dac1fae16dd5c31a7ea7f68358bd4b30a13852ddf9c1ede0ac233b37320af528ab5171ce761131c6c8df8 SHA512 35e440cc790485dbf6e898e2a8c82e79ab768b65b46434b127c0e82e0670fee9ee4f49f284a3f82b5e0d097f43dcb31a509ee294c5cea62c7f08b7ab0b31ab40
 MISC metadata.xml 2095 BLAKE2B c1c858a478bbb1c7e38a45dbf00e380a3d26c56920db1897521a7e9f4eb005157e535207ae2274d744e3ce5514a57654eb0effb2cfc773263a0f417874cdc742 SHA512 c3db8aeb4f4ae7ea27c8b48cb26ee9348d84e6fb4b99df815b177e62e78cd980a7834c152e2c10c6fdbe2b91a032861a0c0503625874bfb6df58ccc3bf54e705
diff --git a/media-libs/mesa/mesa-18.1.5.ebuild b/media-libs/mesa/mesa-18.1.6.ebuild
index fab799310391..bb7a9cee34d2 100644
--- a/media-libs/mesa/mesa-18.1.5.ebuild
+++ b/media-libs/mesa/mesa-18.1.6.ebuild
@@ -25,7 +25,7 @@ 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"
+	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"
diff --git a/media-libs/mesa/mesa-18.1.4.ebuild b/media-libs/mesa/mesa-18.1.7.ebuild
index fab799310391..fab799310391 100644
--- a/media-libs/mesa/mesa-18.1.4.ebuild
+++ b/media-libs/mesa/mesa-18.1.7.ebuild
diff --git a/media-libs/mesa/mesa-18.2.0_rc2.ebuild b/media-libs/mesa/mesa-18.2.0_rc3.ebuild
index af17740a3a81..76e780a05ff7 100644
--- a/media-libs/mesa/mesa-18.2.0_rc2.ebuild
+++ b/media-libs/mesa/mesa-18.2.0_rc3.ebuild
@@ -37,22 +37,17 @@ done
 
 IUSE="${IUSE_VIDEO_CARDS}
 	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm lm_sensors
-	opencl osmesa openmax pax_kernel pic selinux test unwind vaapi valgrind
-	vdpau vulkan wayland xa xvmc"
+	opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind vdpau
+	vulkan wayland xa xvmc"
 
 REQUIRED_USE="
-	d3d9?   ( dri3 gallium )
-	llvm?   ( gallium )
-	opencl? ( gallium llvm || ( video_cards_r600 video_cards_radeonsi ) )
-	openmax? ( gallium )
+	d3d9?   ( dri3 )
 	gles1?  ( egl )
 	gles2?  ( egl )
-	vaapi? ( gallium )
-	vdpau? ( gallium )
-	vulkan? ( || ( video_cards_i965 video_cards_radeonsi )
+	vulkan? ( dri3
+			  || ( 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 ) )
@@ -104,10 +99,6 @@ RDEPEND="
 					dev-libs/libclc
 					virtual/libelf:0=[${MULTILIB_USEDEP}]
 				)
-		openmax? (
-			>=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}]
-			x11-misc/xdg-utils
-		)
 		vaapi? (
 			>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
 			video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
@@ -222,7 +213,8 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	valgrind? ( dev-util/valgrind )
 	x11-base/xorg-proto
-	$(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
+	x11-libs/libXrandr[${MULTILIB_USEDEP}]
+	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
 "
 
 S="${WORKDIR}/${MY_P}"
@@ -252,6 +244,72 @@ llvm_check_deps() {
 	has_version "sys-devel/llvm[${flags}]"
 }
 
+pkg_pretend() {
+	if use d3d9; then
+		if ! use video_cards_r300 &&
+		   ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau &&
+		   ! use video_cards_vmware; then
+			ewarn "Ignoring USE=d3d9       since VIDEO_CARDS does not contain r300, r600, radeonsi, nouveau, or vmware"
+		fi
+	fi
+
+	if use opencl; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi; then
+			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
+		fi
+	fi
+
+	if use vaapi; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use vdpau; then
+		if ! use video_cards_r300 &&
+		   ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use xa; then
+		if ! use video_cards_freedreno &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno or nouveau"
+		fi
+	fi
+
+	if use xvmc; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does not contain r600 or nouveau"
+		fi
+	fi
+
+	if ! use gallium; then
+		use d3d9       && ewarn "Ignoring USE=d3d9       since USE does not contain gallium"
+		use lm_sensors && ewarn "Ignoring USE=lm_sensors since USE does not contain gallium"
+		use llvm       && ewarn "Ignoring USE=llvm       since USE does not contain gallium"
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain gallium"
+		use vaapi      && ewarn "Ignoring USE=vaapi      since USE does not contain gallium"
+		use vdpau      && ewarn "Ignoring USE=vdpau      since USE does not contain gallium"
+		use unwind     && ewarn "Ignoring USE=unwind     since USE does not contain gallium"
+		use xa         && ewarn "Ignoring USE=xa         since USE does not contain gallium"
+		use xvmc       && ewarn "Ignoring USE=xvmc       since USE does not contain gallium"
+	fi
+
+	if ! use llvm; then
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
+	fi
+}
+
 pkg_setup() {
 	# warning message for bug 459306
 	if use llvm && has_version sys-devel/llvm[!debug=]; then
@@ -295,25 +353,66 @@ multilib_src_configure() {
 
 	if use gallium; then
 		emesonargs+=(
-			$(meson_use d3d9 gallium-nine)
 			$(meson_use llvm)
-			-Dgallium-omx=$(usex openmax bellagio disabled)
-			$(meson_use vaapi gallium-va)
-			$(meson_use vdpau gallium-vdpau)
-			$(meson_use xa gallium-xa)
-			$(meson_use xvmc gallium-xvmc)
+			$(meson_use lm_sensors lmsensors)
+			$(meson_use unwind libunwind)
 		)
-		use vaapi && emesonargs+=( -Dva-libs-path=/usr/$(get_libdir)/va/drivers )
+
+		if use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_use d3d9 gallium-nine))
+		else
+			emesonargs+=(-Dgallium-nine=false)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use vaapi gallium-va))
+			use vaapi && emesonargs+=( -Dva-libs-path=/usr/$(get_libdir)/va/drivers )
+		else
+			emesonargs+=(-Dgallium-va=false)
+		fi
+
+		if use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use vdpau gallium-vdpau))
+		else
+			emesonargs+=(-Dgallium-vdpau=false)
+		fi
+
+		if use video_cards_freedreno ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use xa gallium-xa))
+		else
+			emesonargs+=(-Dgallium-xa=false)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use xvmc gallium-xvmc))
+		else
+			emesonargs+=(-Dgallium-xvmc=false)
+		fi
 
 		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
+
+		# Only one i915 driver (classic vs gallium). Default to classic.
+		if ! use classic; then
+			gallium_enable video_cards_i915 i915
+			if ! use video_cards_i915 && \
+				! use video_cards_i965; then
+				gallium_enable video_cards_intel i915
+			fi
 		fi
 
 		gallium_enable video_cards_r300 r300
@@ -373,8 +472,6 @@ multilib_src_configure() {
 		$(meson_use gles1)
 		$(meson_use gles2)
 		$(meson_use selinux)
-		$(meson_use unwind libunwind)
-		$(meson_use lm_sensors lmsensors)
 		-Dvalgrind=$(usex valgrind auto false)
 		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
 		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
@@ -405,12 +502,6 @@ multilib_src_install() {
 		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() {
@@ -430,21 +521,6 @@ pkg_postinst() {
 	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
-}
-
-pkg_prerm() {
-	if use openmax; then
-		rm "${EPREFIX}"/usr/share/mesa/xdg/.omxregister
-	fi
 }
 
 # $1 - VIDEO_CARDS flag (check skipped for "--")
diff --git a/media-libs/mesa/mesa-18.2.0_rc4.ebuild b/media-libs/mesa/mesa-18.2.0_rc4.ebuild
new file mode 100644
index 000000000000..76e780a05ff7
--- /dev/null
+++ b/media-libs/mesa/mesa-18.2.0_rc4.ebuild
@@ -0,0 +1,547 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit llvm meson multilib-minimal pax-utils python-any-r1
+
+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
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
+	EXPERIMENTAL="true"
+	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 ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="
+	!test? ( test )
+"
+
+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}
+	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm lm_sensors
+	opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind vdpau
+	vulkan wayland xa xvmc"
+
+REQUIRED_USE="
+	d3d9?   ( dri3 )
+	gles1?  ( egl )
+	gles2?  ( egl )
+	vulkan? ( dri3
+			  || ( video_cards_i965 video_cards_radeonsi )
+			  video_cards_radeonsi? ( llvm ) )
+	wayland? ( egl gbm )
+	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.93"
+RDEPEND="
+	!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.13:=[${MULTILIB_USEDEP}]
+	x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
+	gallium? (
+		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}]
+			)
+		)
+		lm_sensors? ( sys-apps/lm_sensors:=[${MULTILIB_USEDEP}] )
+		opencl? (
+					app-eselect/eselect-opencl
+					dev-libs/libclc
+					virtual/libelf:0=[${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}] )
+		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
+	)
+	wayland? (
+		>=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.8
+	)
+	${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_MAX_SLOT="7"
+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/bison
+	sys-devel/flex
+	sys-devel/gettext
+	virtual/pkgconfig
+	valgrind? ( dev-util/valgrind )
+	x11-base/xorg-proto
+	x11-libs/libXrandr[${MULTILIB_USEDEP}]
+	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${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.0.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_pretend() {
+	if use d3d9; then
+		if ! use video_cards_r300 &&
+		   ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau &&
+		   ! use video_cards_vmware; then
+			ewarn "Ignoring USE=d3d9       since VIDEO_CARDS does not contain r300, r600, radeonsi, nouveau, or vmware"
+		fi
+	fi
+
+	if use opencl; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi; then
+			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
+		fi
+	fi
+
+	if use vaapi; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use vdpau; then
+		if ! use video_cards_r300 &&
+		   ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use xa; then
+		if ! use video_cards_freedreno &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno or nouveau"
+		fi
+	fi
+
+	if use xvmc; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does not contain r600 or nouveau"
+		fi
+	fi
+
+	if ! use gallium; then
+		use d3d9       && ewarn "Ignoring USE=d3d9       since USE does not contain gallium"
+		use lm_sensors && ewarn "Ignoring USE=lm_sensors since USE does not contain gallium"
+		use llvm       && ewarn "Ignoring USE=llvm       since USE does not contain gallium"
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain gallium"
+		use vaapi      && ewarn "Ignoring USE=vaapi      since USE does not contain gallium"
+		use vdpau      && ewarn "Ignoring USE=vdpau      since USE does not contain gallium"
+		use unwind     && ewarn "Ignoring USE=unwind     since USE does not contain gallium"
+		use xa         && ewarn "Ignoring USE=xa         since USE does not contain gallium"
+		use xvmc       && ewarn "Ignoring USE=xvmc       since USE does not contain gallium"
+	fi
+
+	if ! use llvm; then
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
+	fi
+}
+
+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
+}
+
+multilib_src_configure() {
+	local emesonargs=()
+
+	if use classic; then
+		# Intel code
+		dri_driver_enable video_cards_i915 i915
+		dri_driver_enable video_cards_i965 i965
+		if ! use video_cards_i915 && \
+			! use video_cards_i965; then
+			dri_driver_enable video_cards_intel i915 i965
+		fi
+
+		# Nouveau code
+		dri_driver_enable video_cards_nouveau nouveau
+
+		# ATI code
+		dri_driver_enable video_cards_r100 r100
+		dri_driver_enable video_cards_r200 r200
+		if ! use video_cards_r100 && \
+			! use video_cards_r200; then
+			dri_driver_enable video_cards_radeon r100 r200
+		fi
+	fi
+
+	if use egl; then
+		emesonargs+=( -Dplatforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm") )
+	fi
+
+	if use gallium; then
+		emesonargs+=(
+			$(meson_use llvm)
+			$(meson_use lm_sensors lmsensors)
+			$(meson_use unwind libunwind)
+		)
+
+		if use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_use d3d9 gallium-nine))
+		else
+			emesonargs+=(-Dgallium-nine=false)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use vaapi gallium-va))
+			use vaapi && emesonargs+=( -Dva-libs-path=/usr/$(get_libdir)/va/drivers )
+		else
+			emesonargs+=(-Dgallium-va=false)
+		fi
+
+		if use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use vdpau gallium-vdpau))
+		else
+			emesonargs+=(-Dgallium-vdpau=false)
+		fi
+
+		if use video_cards_freedreno ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use xa gallium-xa))
+		else
+			emesonargs+=(-Dgallium-xa=false)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use xvmc gallium-xvmc))
+		else
+			emesonargs+=(-Dgallium-xvmc=false)
+		fi
+
+		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_imx imx
+
+		# Only one i915 driver (classic vs gallium). Default to classic.
+		if ! use classic; then
+			gallium_enable video_cards_i915 i915
+			if ! use video_cards_i915 && \
+				! use video_cards_i965; then
+				gallium_enable video_cards_intel i915
+			fi
+		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
+			emesonargs+=(
+				-Dgallium-opencl="$(usex opencl standalone disabled)"
+			)
+		fi
+
+		gallium_enable video_cards_virgl virgl
+	fi
+
+	if use vulkan; then
+		vulkan_enable video_cards_i965 intel
+		vulkan_enable video_cards_radeonsi amd
+	fi
+
+	# x86 hardened pax_kernel needs glx-rts, bug 240956
+	if [[ ${ABI} == x86 ]]; then
+		emesonargs+=( $(meson_use pax_kernel glx-read-only-text) )
+	fi
+
+	# on abi_x86_32 hardened we need to have asm disable
+	if [[ ${ABI} == x86* ]] && use pic; then
+		emesonargs+=( -Dasm=false )
+	fi
+
+	if use gallium; then
+		gallium_enable -- swrast
+		emesonargs+=( -Dosmesa=$(usex osmesa gallium none) )
+	else
+		dri_driver_enable -- swrast
+		emesonargs+=( -Dosmesa=$(usex osmesa classic none) )
+	fi
+
+	driver_list() {
+		local drivers="$(sort -u <<< "${1// /$'\n'}")"
+		echo "${drivers//$'\n'/,}"
+	}
+
+	emesonargs+=(
+		$(meson_use test build-tests)
+		-Dglx=dri
+		-Dshared-glapi=true
+		$(meson_use dri3)
+		$(meson_use egl)
+		$(meson_use gbm)
+		$(meson_use gles1)
+		$(meson_use gles2)
+		$(meson_use selinux)
+		-Dvalgrind=$(usex valgrind auto false)
+		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
+		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
+		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
+		--buildtype $(usex debug debug plain)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_install() {
+	meson_src_install
+
+	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
+}
+
+multilib_src_install_all() {
+	einstalldocs
+}
+
+multilib_src_test() {
+	meson_src_test
+}
+
+pkg_postinst() {
+	# Switch to the xorg implementation.
+	echo
+	eselect opengl set --use-old ${OPENGL_DIR}
+
+	# Switch to mesa opencl
+	if use opencl; then
+		eselect opencl set --use-old ${PN}
+	fi
+}
+
+# $1 - VIDEO_CARDS flag (check skipped for "--")
+# other args - names of DRI drivers to enable
+dri_driver_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		DRI_DRIVERS+=("$@")
+	fi
+}
+
+gallium_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		GALLIUM_DRIVERS+=("$@")
+	fi
+}
+
+vulkan_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		VULKAN_DRIVERS+=("$@")
+	fi
+}
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 48cf2cd6807d..229179f667aa 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_4 python3_5 python3_6 python3_7 )
 
 inherit llvm meson multilib-minimal pax-utils python-any-r1
 
@@ -37,22 +37,17 @@ done
 
 IUSE="${IUSE_VIDEO_CARDS}
 	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm lm_sensors
-	opencl osmesa openmax pax_kernel pic selinux test unwind vaapi valgrind
-	vdpau vulkan wayland xa xvmc"
+	opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind vdpau
+	vulkan wayland xa xvmc"
 
 REQUIRED_USE="
-	d3d9?   ( dri3 gallium )
-	llvm?   ( gallium )
-	opencl? ( gallium llvm || ( video_cards_r600 video_cards_radeonsi ) )
-	openmax? ( gallium )
+	d3d9?   ( dri3 )
 	gles1?  ( egl )
 	gles2?  ( egl )
-	vaapi? ( gallium )
-	vdpau? ( gallium )
-	vulkan? ( || ( video_cards_i965 video_cards_radeonsi )
+	vulkan? ( dri3
+			  || ( 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 ) )
@@ -104,10 +99,6 @@ RDEPEND="
 					dev-libs/libclc
 					virtual/libelf:0=[${MULTILIB_USEDEP}]
 				)
-		openmax? (
-			>=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}]
-			x11-misc/xdg-utils
-		)
 		vaapi? (
 			>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
 			video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
@@ -222,7 +213,8 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	valgrind? ( dev-util/valgrind )
 	x11-base/xorg-proto
-	$(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
+	x11-libs/libXrandr[${MULTILIB_USEDEP}]
+	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
 "
 
 S="${WORKDIR}/${MY_P}"
@@ -252,6 +244,72 @@ llvm_check_deps() {
 	has_version "sys-devel/llvm[${flags}]"
 }
 
+pkg_pretend() {
+	if use d3d9; then
+		if ! use video_cards_r300 &&
+		   ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau &&
+		   ! use video_cards_vmware; then
+			ewarn "Ignoring USE=d3d9       since VIDEO_CARDS does not contain r300, r600, radeonsi, nouveau, or vmware"
+		fi
+	fi
+
+	if use opencl; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi; then
+			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
+		fi
+	fi
+
+	if use vaapi; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use vdpau; then
+		if ! use video_cards_r300 &&
+		   ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use xa; then
+		if ! use video_cards_freedreno &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno or nouveau"
+		fi
+	fi
+
+	if use xvmc; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does not contain r600 or nouveau"
+		fi
+	fi
+
+	if ! use gallium; then
+		use d3d9       && ewarn "Ignoring USE=d3d9       since USE does not contain gallium"
+		use lm_sensors && ewarn "Ignoring USE=lm_sensors since USE does not contain gallium"
+		use llvm       && ewarn "Ignoring USE=llvm       since USE does not contain gallium"
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain gallium"
+		use vaapi      && ewarn "Ignoring USE=vaapi      since USE does not contain gallium"
+		use vdpau      && ewarn "Ignoring USE=vdpau      since USE does not contain gallium"
+		use unwind     && ewarn "Ignoring USE=unwind     since USE does not contain gallium"
+		use xa         && ewarn "Ignoring USE=xa         since USE does not contain gallium"
+		use xvmc       && ewarn "Ignoring USE=xvmc       since USE does not contain gallium"
+	fi
+
+	if ! use llvm; then
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
+	fi
+}
+
 pkg_setup() {
 	# warning message for bug 459306
 	if use llvm && has_version sys-devel/llvm[!debug=]; then
@@ -295,25 +353,66 @@ multilib_src_configure() {
 
 	if use gallium; then
 		emesonargs+=(
-			$(meson_use d3d9 gallium-nine)
 			$(meson_use llvm)
-			-Dgallium-omx=$(usex openmax bellagio disabled)
-			$(meson_use vaapi gallium-va)
-			$(meson_use vdpau gallium-vdpau)
-			$(meson_use xa gallium-xa)
-			$(meson_use xvmc gallium-xvmc)
+			$(meson_use lm_sensors lmsensors)
+			$(meson_use unwind libunwind)
 		)
-		use vaapi && emesonargs+=( -Dva-libs-path=/usr/$(get_libdir)/va/drivers )
+
+		if use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_use d3d9 gallium-nine))
+		else
+			emesonargs+=(-Dgallium-nine=false)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use vaapi gallium-va))
+			use vaapi && emesonargs+=( -Dva-libs-path=/usr/$(get_libdir)/va/drivers )
+		else
+			emesonargs+=(-Dgallium-va=false)
+		fi
+
+		if use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use vdpau gallium-vdpau))
+		else
+			emesonargs+=(-Dgallium-vdpau=false)
+		fi
+
+		if use video_cards_freedreno ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use xa gallium-xa))
+		else
+			emesonargs+=(-Dgallium-xa=false)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use xvmc gallium-xvmc))
+		else
+			emesonargs+=(-Dgallium-xvmc=false)
+		fi
 
 		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
+
+		# Only one i915 driver (classic vs gallium). Default to classic.
+		if ! use classic; then
+			gallium_enable video_cards_i915 i915
+			if ! use video_cards_i915 && \
+				! use video_cards_i965; then
+				gallium_enable video_cards_intel i915
+			fi
 		fi
 
 		gallium_enable video_cards_r300 r300
@@ -373,8 +472,6 @@ multilib_src_configure() {
 		$(meson_use gles1)
 		$(meson_use gles2)
 		$(meson_use selinux)
-		$(meson_use unwind libunwind)
-		$(meson_use lm_sensors lmsensors)
 		-Dvalgrind=$(usex valgrind auto false)
 		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
 		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
@@ -405,12 +502,6 @@ multilib_src_install() {
 		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() {
@@ -430,21 +521,6 @@ pkg_postinst() {
 	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
-}
-
-pkg_prerm() {
-	if use openmax; then
-		rm "${EPREFIX}"/usr/share/mesa/xdg/.omxregister
-	fi
 }
 
 # $1 - VIDEO_CARDS flag (check skipped for "--")
diff --git a/media-libs/nas/Manifest b/media-libs/nas/Manifest
index 4036bda541cf..fadb67d63e4b 100644
--- a/media-libs/nas/Manifest
+++ b/media-libs/nas/Manifest
@@ -1,9 +1,10 @@
-AUX nas-1.9.2-asneeded.patch 370 BLAKE2B 4deff0ad4c2638facb8c166e722e02a467c7bc8599681696709fafdfa7f65cea569572f5b9052d0bba373cb3bd80fc7b8fbee1baddf14737e53c7c25991a5afe SHA512 09675986d17ca8273a4ea86946385b40bad76e377d70f0f74f3c997b90cbd2d0ae272b78d6cb63590832e3515a1b28c07330fde75cc3484986d88b8b55083fd0
+AUX nas-1.9.2-asneeded.patch 374 BLAKE2B a142f505190214db4f235ef8ec6283029c127b9b3c313b2405e6222a6f3d6d89931066d64a71b350b289ed07bed198bbc71a862396ef77d3fb5e7a2426b5abad SHA512 ad9275577d2e10f5201556e21f6251065d392a9620c475e1451b673fa62dc50ac8e45248862a802a70cd0efb19ad67205b50e05df1588f91ef854e66860334a3
+AUX nas-1.9.4-libfl.patch 349 BLAKE2B ee8d3ec8859fc47c87bf5d9a40cc2b468c136983a6b8dfb22d4c6469630b5dae92d3ec382ff7afc5ac2f94435ac8208059f90313a03700c4da7b93a19e34c05c SHA512 e4291fce8199f4340b969da6e2742e26ef6589e71ecc947a0fb1d68b9f995ae7dd514ad98232a4c11d1ebc7ea0ab3ea95674893fedbae7626c97c06c9ba88459
 AUX nas-1.9.4-remove-abs-fabs.patch 1164 BLAKE2B 1fd8fb65a12cb340c47ee80929e2617d278c84bca2231ed55806301fbbd69f2b820327d06aad9f3ac5b763183fabc0282470bf396e08193ce35d4482d742e821 SHA512 bb8753e6dac817ec5df490ee385619ce39fff6c033aa6171e7ff3da5df649fd30dbf405729b1d27d2e37a24be5c6e7782a713f5cf452a2b68dab63d639e39ffb
 AUX nas.conf.d 229 BLAKE2B 2ac8a6d914d02bc92258d7dfe3118e89ed6e3fe9d98e7a24eb8d72ded22dbb68a2d8129d066dc1457c0b8959f1762197b61f90502d3c60cdefd8aaeced04bbb3 SHA512 53cb9906d169b63b3592443bc0b63d59c4d0683e4b2194c60b1bc4297e6556f04b3ee9bf81da3a7f144757354de9aebe08c8445fccaa9a458a3b6537da68a2ac
 AUX nas.init.d 347 BLAKE2B 8b87c877fafd0e5993f909a4e132ed9f7042a3d8bdced8c7487afc962dfcad24a586ac754b99cbff815475f1326f44d52effb8eefd65cd0e25e6bc45991233af SHA512 556fc5d5135f789b0691de889aeaadce29319964443052787db5cb4cda480ed68c547c772de97c07ba2e0800f25cfa859376a3d80e9518995aae8136fe171468
 DIST nas-1.9.4.src.tar.gz 1464598 BLAKE2B d79ecda9f86a89d2d61bfadfeee4bb6a9feca6754bb88249b1eb3c1964e784d18098465f30f1b5bbb13d0550aebf48bb1b98aeb1b7c712f344a2eddc7720531b SHA512 3f8bd60f8ce0f25a2605af17caaadfe4f21223ba4cd3fa02078d1427b17cdf33ebda887e5dc30cd68eb7f64bfad80aafc9071ff0a26f0d3a4a93caacac03b5bb
 EBUILD nas-1.9.4-r1.ebuild 2290 BLAKE2B 5b7430bf135bff1254da018c4d430be7a064a021563789fc1c4ad95e8a67fded25c57b4ea310eacb05228575019f65466bcdf0f2fd4710d0dd5241386f0f76cc SHA512 db3dce97cbebeb460f7bde498526cf4b5a0554aca02458fa7a9030e968ff2d59b8d9110e8694cd446276c73f5e53fb2f35b981c2b59c6c6bb5de4e8cf8401187
-EBUILD nas-1.9.4-r2.ebuild 2400 BLAKE2B 3beb32f3da7b45b6d758f971e0f90e20841037b6fa78fa5cf34c01c87e70e1e92002fc23e42e272e5112b34c57a36ab59c9a5bb304667fd66e2f341f9d4773fe SHA512 6e9997c03681b545e040b92cb6438cfda3acb1fb675b5a7eb35e1f6d012f427de8d65b3102b7bafced8642c9442d7eb2e559d0f54dad3c10107ed9e14ab360fb
+EBUILD nas-1.9.4-r2.ebuild 2452 BLAKE2B e55e420d62dad1ef02e082bf06ea305f1785cc4ed59f4814d83dc84ca79edd7cfe85b2d9aa8ee948e58d9a8d3983d750ee6de8e749bc414ff60780fd6daffe86 SHA512 871818d27a19eb361c055cac52b8afd798e3918c64ea4668309922ca2b47597583534b3b859b77357f05ff3eda2da23741acb4cc1ca9618620e1b9166c83d115
 EBUILD nas-1.9.4.ebuild 2234 BLAKE2B 67b5e2f22991ea8418c40947790fddb5ac3b33edbe950d533bb5450b2e9bdba47f2a4a5bb7bf330390d7b970a31d988c3984985cd6fb0d405127d95feebfcb45 SHA512 312cb7a453b619d8d1cd95d347a145305d5033f9c7e25ce1c5dad0266bbc937af1dba5a571c270b0039f87cdddedab46c2007e18a2546476cd689553851938b5
 MISC metadata.xml 326 BLAKE2B 837bd2d88bfc59121d0e166ae65c8d4732b8cdc6a898183bfb1fd984b5bc3e8e3a2c3f22d763a26664da7f97c9091fc9c3af8c419b3e9e39a7410989434ed739 SHA512 7a2a048b46af5cfd9167aec79f8a4f4e8a10f8327d1aec4b59330cdfdc7e4b90d9b9ab85e73e2b0a0e5db6b71bb729e7886dc3763a4d75d8ed4602b7b6cb61e7
diff --git a/media-libs/nas/files/nas-1.9.2-asneeded.patch b/media-libs/nas/files/nas-1.9.2-asneeded.patch
index 2ac89487a2c8..8c588be136f2 100644
--- a/media-libs/nas/files/nas-1.9.2-asneeded.patch
+++ b/media-libs/nas/files/nas-1.9.2-asneeded.patch
@@ -1,7 +1,7 @@
 http://bugs.gentoo.org/show_bug.cgi?id=247761
 
---- config/NetAudio.tmpl
-+++ config/NetAudio.tmpl
+--- a/config/NetAudio.tmpl
++++ b/config/NetAudio.tmpl
 @@ -162,7 +162,7 @@
  
    AUDIODEPLIBS = $(DEPAULIB) $(DEPXTOOLLIB) $(DEPXLIB)
diff --git a/media-libs/nas/files/nas-1.9.4-libfl.patch b/media-libs/nas/files/nas-1.9.4-libfl.patch
new file mode 100644
index 000000000000..cea30f46ba69
--- /dev/null
+++ b/media-libs/nas/files/nas-1.9.4-libfl.patch
@@ -0,0 +1,12 @@
+diff -pur nas-1.9.4-orig/server/Imakefile nas-1.9.4/server/Imakefile
+--- a/server/Imakefile	2013-04-27 02:41:06.000000000 +0200
++++ b/server/Imakefile	2017-03-14 18:58:27.445311356 +0100
+@@ -57,7 +57,7 @@ XCOMM $NCDId: @(#)Imakefile,v 1.17 1995/
+ 
+ # endif
+ #else
+-        SYSLIBS =
++        SYSLIBS = $(LEXLIB)
+ #endif
+ 
+ #ifdef NetBSDArchitecture
diff --git a/media-libs/nas/nas-1.9.4-r2.ebuild b/media-libs/nas/nas-1.9.4-r2.ebuild
index f1d536a4f7b9..44e154e0af40 100644
--- a/media-libs/nas/nas-1.9.4-r2.ebuild
+++ b/media-libs/nas/nas-1.9.4-r2.ebuild
@@ -1,19 +1,21 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils multilib toolchain-funcs multilib-minimal
+EAPI=7
+
+inherit multilib-minimal toolchain-funcs
 
 DESCRIPTION="Network Audio System"
-HOMEPAGE="http://radscan.com/nas.html"
+HOMEPAGE="https://radscan.com/nas.html"
 SRC_URI="mirror://sourceforge/${PN}/${P}.src.tar.gz"
 
 LICENSE="HPND MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~x86-fbsd"
 IUSE="doc static-libs"
 
-RDEPEND="x11-libs/libICE
+RDEPEND="
+	x11-libs/libICE
 	x11-libs/libSM
 	x11-libs/libX11
 	>=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}]
@@ -32,10 +34,14 @@ DEPEND="${RDEPEND}
 
 DOCS=( BUILDNOTES FAQ HISTORY README RELEASE TODO )
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.9.2-asneeded.patch
-	epatch "${FILESDIR}"/${PN}-1.9.4-remove-abs-fabs.patch
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.9.2-asneeded.patch
+	"${FILESDIR}"/${PN}-1.9.4-remove-abs-fabs.patch
+	"${FILESDIR}"/${PN}-1.9.4-libfl.patch
+)
 
+src_prepare() {
+	default
 	multilib_copy_sources
 }
 
@@ -99,5 +105,7 @@ multilib_src_install_all() {
 	newconfd "${FILESDIR}"/nas.conf.d nas
 	newinitd "${FILESDIR}"/nas.init.d nas
 
-	use static-libs || rm -f "${D}"/usr/lib*/libaudio.a
+	if ! use static-libs; then
+		rm -f "${D}"/usr/lib*/libaudio.a || die
+	fi
 }
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index c54555031160..1fefc68ff845 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -34,11 +34,9 @@ DIST opencv-3.4.1.tar.gz 87051748 BLAKE2B 87c83ab9b3d7fb048263f047aa5d6e95b153e1
 DIST opencv-3.4.1_contrib.tar.gz 57126844 BLAKE2B 63d9d5cb088371754eb132607789c8f1d4820f3e0e486593d6f64ee8f918ea4362152f050baec16f17904c03a6cdc0abc6e5fb2510308dcbabebe97b29285fbc SHA512 431dfba0f413071d7faa18bc6e6f5e4f015285e2cc730c5dd69b2a4d6aa4250b7e0bcb1814ac6f06f5c76f103aea1f93f72f32aee6bc0cd7ddacdaf1f40075c1
 DIST tiny-dnn-1.0.0a3.tar.gz 12885646 BLAKE2B 85c0715ab6c692b77522487775e70b0db645528baed1830c83c9f44d2b67a5207e4f7ea1709b35c6a4217d287199549304e9be19f4a5cec9a1183b0b5dccc562 SHA512 5f2c1a161771efa67e85b1fea395953b7744e29f61187ac5a6c54c912fb195b3aef9a5827135c3668bd0eeea5ae04a33cc433e1f6683e2b7955010a2632d168b
 DIST vgg_boostdesc-3.2.0.tar.gz 1867770 BLAKE2B 1fa5b58e73b6fa56ecf8d19af22298f729942ee1369082e173445d09d3de767bf844bad3d2b462efc1199c392f37c88ba49a9996ba8bfd84b4abeba7de94db63 SHA512 4a046aedd639c8eb4b295b0f499e756deb66210ca083f0124c75531e540663367cb58f6d175f66c4713324177036cd89a8869bdab2de8d1736dafc7f00ef9f44
-EBUILD opencv-2.4.13-r3.ebuild 6007 BLAKE2B 1b78cbb84733a057876a8e0a942c753786ac0b836b4e1116b9225b46cb36c37deca4c53d5df78784b99ce628e15010bf60ee750691c657d935ffa75733f54cdf SHA512 eb633e9f6e19de369a8bfcc75ca644a47cb2ca2fb2ccc8a91703e1c964d952dbdbcbae635163014839d62a647b0fa9a6c6ad8ae20c9d72fa87b270de55a57a44
-EBUILD opencv-3.2.0-r2.ebuild 10387 BLAKE2B d9b6b704e465ee03862a2b264af592025197b7b7a79b8ce61ca0e2535bd4b7d0930d53d5e4acefb44774a1135488c394424066ce3320560bc8f694358272628f SHA512 e065790498734f16ce6f5fa4446e44e776b7097467f4ce8dc9da39d65038f4c8a646ef0e286daa4c1a5070c41595cbfe7731cc6965206b7650969306385db8af
-EBUILD opencv-3.2.0-r3.ebuild 12171 BLAKE2B f5fdc59285166a2a4e2e31901eef8d66cf0bfa948ce4b06ee9f80c91f2acceeefccc6fa4a03cbf05f609d1d51ebe58f9b192df071a016d157f921b738d00ef13 SHA512 b4dc53882ea13aeb90454dd54818d5d7ea3f0d00425c2f3eaea9ee493f84dd0956115bf2289e58b36b5de35dff455a86e24df0a804faf0f53db490030e99affb
-EBUILD opencv-3.3.0-r2.ebuild 12169 BLAKE2B a6ed4ce0fc0f3a2bd432979c2caa88f8e27ad2dfe2b94e8c871d394496b7443452323463e7cbc47b52a8bdfaf02d9573d146746bd38248e26da05bcf36d0203e SHA512 d56942b7173929b842e068fcc83dceba38c9cad6e48dfc745438d2bd007a1db604e312034a423e299fd082a3d22ae0cbe52ad82219ffe8a228fb3a8e3ecc80f6
-EBUILD opencv-3.3.0-r4.ebuild 16525 BLAKE2B 053b335e77f6a85ccc3d31de2e0ab7211fff0ef93d37d43f659161581d130c2fd64d9e5558e4f3c0fb2628dee01e37093782ed05e57c74a1eff74064d4c194bd SHA512 4b2a62017bc97ea01c08e56fb33a55f48abebea743cb6d6b9be15cc42c7fbc26707bc016b4f27f39c183abbeca1c4666e7c98844413e2495ebd6a93cf85d42ba
-EBUILD opencv-3.3.0-r5.ebuild 17096 BLAKE2B b831fe5601493b228023ee9f2d86d265b3841375beec391c1c2622df8c7b673c239086d249470a98b09aade2be3c7f983e7748b386f385d23dd2762ccd8cfa0e SHA512 9f8b51d1adaae620133c144ca3f4c1ad6d249a4bc77db883a7318eb3d80034978e371852d003866de5376824e1808fc2644da2308365920842f4c3590b0b452f
-EBUILD opencv-3.4.1-r2.ebuild 18471 BLAKE2B 88ae4e84db3546588aa16bc9a627c25559246254838f9c8b20d452a3d0dc2778c583eb2f157ee87ab55482fec8ea45156ce71ec79cdab966e43c794e46b1d74d SHA512 cc9ef5c86592cfd5fbbbe68c648891e33087fccc0cc6ffea04b36050e215b635ede62d7843454fcc293dab154130e784e9ff95e0816bf401d1dccee94f5ed9b2
-MISC metadata.xml 2648 BLAKE2B fe794c98503b602b365ea04bf32c1011fc485faf7da60e4475db32a3403be3f13be3c713270121feab8f5ec7dc6ac4caa7cbd9dbefaa121fa337273184d5a326 SHA512 60544f21407bffb30e12a2207288832487f0e2ff535343f06d103c0db13441776d84c0645d568ee7a9f7d502ca4267a8be923fe1cbbb8902a950ca7395616848
+EBUILD opencv-2.4.13-r3.ebuild 5972 BLAKE2B e8cf37172bb279877c88e4a25564d58f0cc39e46ea185587033922083ff6f34c774f2d9dd0220831db040b8f3654f95a0cb6e28aef0cf3893392000f45c10bba SHA512 2ee9f1749172d504dafb927b9310c30c92300b9ecc19999421e0e891bc0dfb436871ad7fb35466f84275370877240a222aa71d1f6f47808726d5ba1875606e3b
+EBUILD opencv-3.2.0-r3.ebuild 12120 BLAKE2B ec841b5fb9fef1ea6cd7c61bb693830d9c95b8a21c1cb85db1b31c06ebd6127d27ec6bffc40ec740f808312ae29283610df4eaced04749c405a3d48c267f4feb SHA512 fa3c372253b3edc09095603b6cb867ab2d0f3020607a9e11013bb96b56a4fc755575785c0328b5877f5590b554eebac2fe65fad2c11fee677f0853c8bd1f13c5
+EBUILD opencv-3.3.0-r5.ebuild 17045 BLAKE2B 61f4d401f71ff70af717cf04be8e672705531183b7641cc0d5b26a2bea3486ecba8db844e34d9bce181f4386d7881ca13cef2cbab0799ca1c8161c5e9250e73a SHA512 1c4a1a1d4a36b0c703422cd803613b087c0b6c07d42daa0a00f16e42ee488cc4650789d627d50e4b641f6981b9ed4e40eca11214b3c1182968715fdbb53e6109
+EBUILD opencv-3.4.1-r2.ebuild 18420 BLAKE2B 1d002a35c093aede94f968fe4a8b5bde8af55508442094813b9e701da87e6eef437b2261caa525cf738c73206c894bc1ac1357844230b162252ff0f2208ce7d7 SHA512 78e79f66d1736b3bda066066ff9a2b8ff7034faf1d855f1c479ac79b6ceba6686c3a27865e4506522646cf40b7179e95cf63a64f0fa9d23d8ee52ca839109d48
+EBUILD opencv-3.4.1-r4.ebuild 18495 BLAKE2B 08a3a897c917669691b1c5fb7d7f39b81cd0b8f23b41a5ca4ef03e8b5d619867420001bd466db2fdcb8bd1d9b4f84d5f9f92b94be262146d2e98db80eebeefc3 SHA512 986839e6f74e608fd6d85077314565412f031d814442faa360a25fad04450164df202dec243f980146d865e1222c29f77213d08678274d29f943cb7e7ff5010d
+MISC metadata.xml 2580 BLAKE2B fa071ec1998c6e3daf2b09feb25f5f4a42ebe4a01e3bfa1ca8c6b9a9bc81f73f27b2916eed81d92e252127ca3fb07513f90bc655fd0976b9acd080d4747f55a4 SHA512 fe025e3adf0f6a8f5e1e1c8db0caacbbf871981217bfbcb43ab1bc2e949e2bfe82c19086dbc76d587fef2c4b53bf880e874861148aab61a525fc23df558f1e05
diff --git a/media-libs/opencv/metadata.xml b/media-libs/opencv/metadata.xml
index f87770fadafa..edc61febd4c1 100644
--- a/media-libs/opencv/metadata.xml
+++ b/media-libs/opencv/metadata.xml
@@ -21,7 +21,6 @@ Face Recognition; Gesture Recognition; Motion Tracking, Ego Motion, Motion Under
 		<flag name="gdal">Enable support for sci-libs/gdal library</flag>
 		<flag restrict="&gt;=media-libs/opencv-3.1.0" name="gflags">Use Google's C++ argument parsing library</flag>
 		<flag restrict="&gt;=media-libs/opencv-3.1.0" name="glog">Use Google's C++ loggin library</flag>
-		<flag name="ipp">Enable Intel Integrated Primitive support</flag>
 		<flag restrict="&gt;=media-libs/opencv-3.1.0" name="contrib_xfeatures2d">Enables xfeatures2d and autodownload of samples in contrib</flag>
 		<flag restrict="&gt;=media-libs/opencv-3.1.0" name="contrib_cvv">CVV module requires Qt5</flag>
 		<flag restrict="&gt;=media-libs/opencv-3.3.0" name="contrib_dnn">DNN module contrib requires tiny dnn</flag>
diff --git a/media-libs/opencv/opencv-2.4.13-r3.ebuild b/media-libs/opencv/opencv-2.4.13-r3.ebuild
index 9ff99bb067e2..37b41c40568e 100644
--- a/media-libs/opencv/opencv-2.4.13-r3.ebuild
+++ b/media-libs/opencv/opencv-2.4.13-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/Itseez/opencv/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0/2.4"
 KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux"
-IUSE="cuda +eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k libav opencl openexr opengl openmp pch png +python qt5 testprograms threads tiff v4l vtk xine"
+IUSE="cuda +eigen examples ffmpeg gstreamer gtk ieee1394 jpeg jpeg2k libav opencl openexr opengl openmp pch png +python qt5 testprograms threads tiff v4l vtk xine"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
@@ -48,7 +48,6 @@ RDEPEND="
 		media-libs/libdc1394
 		sys-libs/libraw1394
 	)
-	ipp? ( sci-libs/ipp )
 	opencl? ( virtual/opencl )
 	openexr? ( media-libs/openexr )
 	opengl? ( virtual/opengl virtual/glu )
@@ -122,7 +121,7 @@ src_configure() {
 		-DWITH_GSTREAMER_0_10=OFF
 		-DWITH_GTK=$(usex gtk)
 		-DWITH_IMAGEIO=OFF
-		-DWITH_IPP=$(usex ipp)
+		-DWITH_IPP=OFF
 		-DWITH_JASPER=$(usex jpeg2k)
 		-DWITH_JPEG=$(usex jpeg)
 		-DWITH_OPENEXR=$(usex openexr)
diff --git a/media-libs/opencv/opencv-3.2.0-r2.ebuild b/media-libs/opencv/opencv-3.2.0-r2.ebuild
deleted file mode 100644
index f12619bdadbf..000000000000
--- a/media-libs/opencv/opencv-3.2.0-r2.ebuild
+++ /dev/null
@@ -1,332 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit toolchain-funcs cmake-utils python-r1 java-pkg-opt-2 java-ant-2
-
-DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
-HOMEPAGE="https://opencv.org"
-
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	contrib? ( https://github.com/${PN}/${PN}_contrib/archive/${PV}.tar.gz -> ${P}_contrib.tar.gz
-		contrib_xfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-${PV}.tar.gz ) )"
-LICENSE="BSD"
-SLOT="0/3.2" # subslot = libopencv* soname version
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE="contrib cuda debug +eigen examples ffmpeg gdal gflags glog gphoto2 gstreamer gtk ieee1394 ipp jpeg jpeg2k lapack libav opencl openexr opengl openmp pch png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine contrib_cvv contrib_hdf contrib_sfm contrib_xfeatures2d"
-
-# OpenGL needs gtk or Qt installed to activate, otherwise build system
-# will silently disable it without the user knowing, which defeats the
-# purpose of the opengl use flag.
-REQUIRED_USE="
-	cuda? ( tesseract? ( opencl ) )
-	gflags? ( contrib )
-	glog? ( contrib )
-	contrib_cvv? ( contrib qt5 )
-	contrib_hdf? ( contrib )
-	contrib_sfm? ( contrib eigen gflags glog )
-	opengl? ( || ( gtk qt5 ) )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	tesseract? ( contrib )"
-
-# The following logic is intrinsic in the build system, but we do not enforce
-# it on the useflags since this just blocks emerging pointlessly:
-#	gtk? ( !qt5 )
-#	openmp? ( !threads )
-
-RDEPEND="
-	app-arch/bzip2
-	sys-libs/zlib
-	cuda? ( dev-util/nvidia-cuda-toolkit:0= )
-	contrib_hdf? ( sci-libs/hdf5 )
-	ffmpeg? (
-		libav? ( media-video/libav:0= )
-		!libav? ( media-video/ffmpeg:0= )
-	)
-	gdal? ( sci-libs/gdal:= )
-	gflags? ( dev-cpp/gflags )
-	glog? ( dev-cpp/glog )
-	gphoto2? ( media-libs/libgphoto2 )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	gtk? (
-		dev-libs/glib:2
-		x11-libs/gtk+:2
-		opengl? ( x11-libs/gtkglext )
-	)
-	ieee1394? (
-		media-libs/libdc1394
-		sys-libs/libraw1394
-		)
-	ipp? ( sci-libs/ipp )
-	java? ( >=virtual/jre-1.6:* )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/jasper:= )
-	lapack? ( virtual/lapack )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr )
-	opengl? ( virtual/opengl virtual/glu )
-	png? ( media-libs/libpng:0= )
-	python? ( ${PYTHON_DEPS} dev-python/numpy[${PYTHON_USEDEP}] )
-	qt5? (
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		dev-qt/qttest:5
-		dev-qt/qtconcurrent:5
-		opengl? ( dev-qt/qtopengl:5 )
-	)
-	tesseract? ( app-text/tesseract[opencl=] )
-	threads? ( dev-cpp/tbb )
-	tiff? ( media-libs/tiff:0 )
-	v4l? ( >=media-libs/libv4l-0.8.3 )
-	vtk? ( sci-libs/vtk[rendering] )
-	webp? ( media-libs/libwebp )
-	xine? ( media-libs/xine-lib )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	eigen? ( dev-cpp/eigen:3 )
-	java?  ( >=virtual/jdk-1.6 )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.0.0-gles.patch"
-	"${FILESDIR}/${PN}-3.1.0-java-magic.patch"
-	"${FILESDIR}/${PN}-3.1.0-find-libraries-fix.patch"
-	"${FILESDIR}/${P}-vtk.patch"
-	"${FILESDIR}/${P}-gcc-6.0.patch"
-	"${FILESDIR}/${PN}-3.2.0-fix_ussage_cpu_instructions.patch"
-	"${FILESDIR}/${P}-cpu-mno-sse2.patch"
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# remove bundled stuff
-	rm -rf 3rdparty || die "Removing 3rd party components failed"
-	sed -e '/add_subdirectory(.*3rdparty.*)/ d' \
-		-i CMakeLists.txt cmake/*cmake || die
-
-	if use contrib && use contrib_xfeatures2d; then
-		cd  "${WORKDIR}/${PN}_contrib-${PV}" || die
-		eapply "${FILESDIR}/${P}-contrib_xfeatures2d-autodownload.patch"
-		mv "${WORKDIR}"/*.i "${WORKDIR}/${PN}_contrib-${PV}"/modules/xfeatures2d/src/ || die
-	fi
-
-	java-pkg-opt-2_src_prepare
-}
-
-src_configure() {
-	JAVA_ANT_ENCODING="iso-8859-1"
-	# set encoding so even this cmake build will pick it up.
-	export ANT_OPTS+=" -Dfile.encoding=iso-8859-1"
-	java-ant-2_src_configure
-
-	# please dont sort here, order is the same as in CMakeLists.txt
-	GLOBALCMAKEARGS=(
-	# Optional 3rd party components
-	# ===================================================
-		-DWITH_1394=$(usex ieee1394)
-	#	-DWITH_AVFOUNDATION=OFF 	# IOS
-		-DWITH_VTK=$(usex vtk)
-		-DWITH_EIGEN=$(usex eigen)
-		-DWITH_VFW=OFF     		# Video windows support
-		-DWITH_FFMPEG=$(usex ffmpeg)
-		-DWITH_GSTREAMER=$(usex gstreamer)
-		-DWITH_GSTREAMER_0_10=OFF	# Don't want this
-		-DWITH_GTK=$(usex gtk)
-		-DWITH_GTK_2_X=$(usex gtk)
-		-DWITH_IPP=$(usex ipp)
-		-DWITH_JASPER=$(usex jpeg2k)
-		-DWITH_JPEG=$(usex jpeg)
-		-DWITH_WEBP=$(usex webp)
-		-DWITH_OPENEXR=$(usex openexr)
-		-DWITH_OPENGL=$(usex opengl)
-		-DWITH_OPENVX=OFF
-		-DWITH_OPENNI=OFF 		# Not packaged
-		-DWITH_OPENNI2=OFF 		# Not packaged
-		-DWITH_PNG=$(usex png)
-		-DWITH_GDCM=OFF
-		-DWITH_PVAPI=OFF
-		-DWITH_GIGEAPI=OFF
-		-DWITH_ARAVIS=OFF
-		-DWITH_QT=$(usex qt5 5 OFF)
-		-DWITH_WIN32UI=OFF		# Windows only
-	#	-DWITH_QUICKTIME=OFF
-	#	-DWITH_QTKIT=OFF
-		-DWITH_TBB=$(usex threads)
-		-DWITH_OPENMP=$(usex openmp)
-		-DWITH_CSTRIPES=OFF
-		-DWITH_PTHREADS_PF=ON
-		-DWITH_TIFF=$(usex tiff)
-		-DWITH_UNICAP=OFF		# Not packaged
-		-DWITH_V4L=$(usex v4l)
-		-DWITH_LIBV4L=$(usex v4l)
-		-DWITH_DSHOW=ON			# direct show supp
-		-DWITH_MSMF=OFF
-		-DWITH_XIMEA=OFF 		# Windows only
-		-DWITH_XINE=$(usex xine)
-		-DWITH_CLP=OFF
-		-DWITH_OPENCL=$(usex opencl)
-		-DWITH_OPENCL_SVM=OFF
-		-DWITH_OPENCLAMDFFT=$(usex opencl)
-		-DWITH_OPENCLAMDBLAS=$(usex opencl)
-		-DWITH_DIRECTX=OFF
-		-DWITH_INTELPERC=OFF
-		-DWITH_JAVA=$(usex java) # Ant needed, no compile flag
-		-DWITH_IPP_A=OFF
-		-DWITH_MATLAB=OFF
-		-DWITH_VA=$(usex vaapi)
-		-DWITH_VA_INTEL=$(usex vaapi)
-		-DWITH_GDAL=$(usex gdal)
-		-DWITH_GPHOTO2=$(usex gphoto2)
-		-DWITH_LAPACK=$(usex lapack)
-	# ===================================================
-	# CUDA build components: nvidia-cuda-toolkit takes care of GCC version
-	# ===================================================
-		-DWITH_CUDA=$(usex cuda)
-		-DWITH_CUBLAS=$(usex cuda)
-		-DWITH_CUFFT=$(usex cuda)
-		-DWITH_NVCUVID=OFF
-#		-DWITH_NVCUVID=$(usex cuda)
-		-DCUDA_NPP_LIBRARY_ROOT_DIR=$(usex cuda "${EPREFIX}/opt/cuda" "")
-	# ===================================================
-	# OpenCV build components
-	# ===================================================
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_ANDROID_EXAMPLES=OFF
-		-BUILD_opencv_apps=
-		-DBUILD_DOCS=OFF # Doesn't install anyways.
-		-DBUILD_EXAMPLES=$(usex examples)
-		-DBUILD_PERF_TESTS=OFF
-		-DBUILD_TESTS=$(usex testprograms)
-		-DBUILD_WITH_DEBUG_INFO=$(usex debug)
-	#	-DBUILD_WITH_STATIC_CRT=OFF
-		-DBUILD_WITH_DYNAMIC_IPP=OFF
-		-DBUILD_FAT_JAVA_LIB=$(usex java)
-	#	-DBUILD_ANDROID_SERVICE=OFF
-		-DBUILD_CUDA_STUBS=$(usex cuda)
-		-DOPENCV_EXTRA_MODULES_PATH=$(usex contrib "${WORKDIR}/opencv_contrib-${PV}/modules" "")
-	# ===================================================
-	# OpenCV installation options
-	# ===================================================
-		-DINSTALL_CREATE_DISTRIB=OFF
-		-DINSTALL_C_EXAMPLES=$(usex examples)
-		-DINSTALL_TESTS=$(usex testprograms)
-		-DINSTALL_PYTHON_EXAMPLES=$(usex examples)
-	#	-DINSTALL_ANDROID_EXAMPLES=OFF
-		-DINSTALL_TO_MANGLED_PATHS=OFF
-	# ===================================================
-	# OpenCV build options
-	# ===================================================
-		-DENABLE_CCACHE=OFF
-		-DENABLE_PRECOMPILED_HEADERS=$(usex pch)
-		-DENABLE_SOLUTION_FOLDERS=OFF
-		-DENABLE_PROFILING=OFF
-		-DENABLE_COVERAGE=OFF
-		-DENABLE_OMIT_FRAME_POINTER=OFF
-		-DENABLE_FAST_MATH=OFF
-		-DENABLE_SSE=OFF
-		-DENABLE_SSE2=OFF
-		-DENABLE_SSE3=OFF
-		-DENABLE_SSSE3=OFF
-		-DENABLE_SSE41=OFF
-		-DENABLE_SSE42=OFF
-		-DENABLE_POPCNT=OFF
-		-DENABLE_AVX=OFF
-		-DENABLE_AVX=OFF
-		-DENABLE_AVX2=OFF
-		-DENABLE_FMA3=OFF
-		-DENABLE_NEON=OFF
-
-		-DHAVE_opencv_java=$(usex java YES NO)
-		-DENABLE_NOISY_WARNINGS=OFF
-		-DOPENCV_WARNINGS_ARE_ERRORS=OFF
-		-DENABLE_IMPL_COLLECTION=OFF
-		-DENABLE_INSTRUMENTATION=OFF
-		-DGENERATE_ABI_DESCRIPTOR=OFF
-		-DDOWNLOAD_EXTERNAL_TEST_DATA=OFF
-	# ===================================================
-	# things we want to be hard off or not yet figured out
-	# ===================================================
-		-DBUILD_PACKAGE=OFF
-		-DENABLE_PROFILING=OFF
-	# ===================================================
-	# things we want to be hard enabled not worth useflag
-	# ===================================================
-		-DCMAKE_SKIP_RPATH=ON
-		-DOPENCV_DOC_INSTALL_PATH=
-	)
-
-	# ===================================================
-	# OpenCV Contrib Modules
-	# ===================================================
-	if use contrib; then
-		GLOBALCMAKEARGS+=(
-			-DBUILD_opencv_dnn=OFF
-			-DBUILD_opencv_dnns_easily_fooled=OFF
-			-DBUILD_opencv_xfeatures2d=$(usex contrib_xfeatures2d ON OFF)
-			-DBUILD_opencv_cvv=$(usex contrib_cvv ON OFF)
-			-DBUILD_opencv_hdf=$(usex contrib_hdf ON OFF)
-			-DBUILD_opencv_sfm=$(usex contrib_sfm ON OFF)
-		)
-	fi
-
-	# workaround for bug 413429
-	tc-export CC CXX
-
-	local mycmakeargs=( ${GLOBALCMAKEARGS[@]}
-		-DPYTHON_EXECUTABLE=OFF
-		-DINSTALL_PYTHON_EXAMPLES=OFF
-	)
-
-	cmake-utils_src_configure
-}
-
-python_module_compile() {
-	local mycmakeargs=( ${GLOBALCMAKEARGS[@]} )
-
-	# Set all python variables to load the correct Gentoo paths
-	mycmakeargs+=(
-		# cheap trick: python_setup sets one of them as a symlink
-		# to the correct interpreter, and the other to fail-wrapper
-		-DPYTHON2_EXECUTABLE=$(type -P python2)
-		-DPYTHON3_EXECUTABLE=$(type -P python3)
-		-DINSTALL_PYTHON_EXAMPLES=$(usex examples)
-	)
-
-	# Compile and install all at once because configuration will be wiped
-	# for each impl of Python
-	BUILD_DIR="${WORKDIR}"/${P}_build
-	cd "${BUILD_DIR}" || die "cd failed"
-
-	# Regenerate cache file. Can't use rebuild_cache as it won't
-	# have the Gentoo specific options.
-	rm -rf CMakeCache.txt || die "rm failed"
-	cmake-utils_src_configure
-	cmake-utils_src_compile
-	cmake-utils_src_install
-
-	# Remove compiled binary so new version compiles
-	# Avoid conflicts with new module builds as build system doesn't
-	# really support it.
-	rm -rf modules/python2 || die "rm failed"
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# Build and install the python modules for all targets
-	use python && python_foreach_impl python_module_compile
-}
diff --git a/media-libs/opencv/opencv-3.2.0-r3.ebuild b/media-libs/opencv/opencv-3.2.0-r3.ebuild
index 4046f42d260b..ed0aa785e85b 100644
--- a/media-libs/opencv/opencv-3.2.0-r3.ebuild
+++ b/media-libs/opencv/opencv-3.2.0-r3.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
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="BSD"
 SLOT="0/3.2" # subslot = libopencv* soname version
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE="contrib cuda debug +eigen examples ffmpeg gdal gflags glog gphoto2 gstreamer gtk ieee1394 ipp jpeg jpeg2k lapack libav opencl openexr opengl openmp pch png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine contrib_cvv contrib_hdf contrib_sfm contrib_xfeatures2d"
+IUSE="contrib cuda debug +eigen examples ffmpeg gdal gflags glog gphoto2 gstreamer gtk ieee1394 jpeg jpeg2k lapack libav opencl openexr opengl openmp pch png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine contrib_cvv contrib_hdf contrib_sfm contrib_xfeatures2d"
 
 # OpenGL needs gtk or Qt installed to activate, otherwise build system
 # will silently disable it without the user knowing, which defeats the
@@ -63,7 +63,6 @@ RDEPEND="
 		media-libs/libdc1394[${MULTILIB_USEDEP}]
 		sys-libs/libraw1394[${MULTILIB_USEDEP}]
 	)
-	ipp? ( sci-libs/ipp )
 	java? ( >=virtual/jre-1.6:* )
 	jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
 	jpeg2k? ( media-libs/jasper:=[${MULTILIB_USEDEP}] )
@@ -176,7 +175,7 @@ multilib_src_configure() {
 		-DWITH_GSTREAMER_0_10=OFF	# Don't want this
 		-DWITH_GTK=$(usex gtk)
 		-DWITH_GTK_2_X=$(usex gtk)
-		-DWITH_IPP=$(multilib_native_usex ipp)
+		-DWITH_IPP=OFF
 		-DWITH_JASPER=$(usex jpeg2k)
 		-DWITH_JPEG=$(usex jpeg)
 		-DWITH_WEBP=$(usex webp)
diff --git a/media-libs/opencv/opencv-3.3.0-r2.ebuild b/media-libs/opencv/opencv-3.3.0-r2.ebuild
deleted file mode 100644
index d37063d4ff3d..000000000000
--- a/media-libs/opencv/opencv-3.3.0-r2.ebuild
+++ /dev/null
@@ -1,361 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit toolchain-funcs python-r1 java-pkg-opt-2 java-ant-2 cmake-multilib
-
-DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
-HOMEPAGE="https://opencv.org"
-
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~amynka/snap/imgcodecs-${P}.tar.gz
-	contrib? ( https://github.com/${PN}/${PN}_contrib/archive/${PV}.tar.gz -> ${P}_contrib.tar.gz
-		contrib_xfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz  ) ) "
-LICENSE="BSD"
-SLOT="0/3.3" # subslot = libopencv* soname version
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE="contrib cuda debug +eigen examples ffmpeg gdal gflags glog gphoto2 gstreamer gtk ieee1394 ipp jpeg jpeg2k lapack libav opencl openexr opengl openmp pch png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine contrib_cvv contrib_hdf contrib_sfm contrib_xfeatures2d"
-
-# OpenGL needs gtk or Qt installed to activate, otherwise build system
-# will silently disable it without the user knowing, which defeats the
-# purpose of the opengl use flag.
-REQUIRED_USE="
-	cuda? ( tesseract? ( opencl ) )
-	gflags? ( contrib )
-	glog? ( contrib )
-	contrib_cvv? ( contrib qt5 )
-	contrib_hdf? ( contrib )
-	contrib_sfm? ( contrib eigen gflags glog )
-	contrib_xfeatures2d? ( contrib cuda )
-	java? ( python )
-	opengl? ( || ( gtk qt5 ) )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	tesseract? ( contrib )"
-
-# The following logic is intrinsic in the build system, but we do not enforce
-# it on the useflags since this just blocks emerging pointlessly:
-#	gtk? ( !qt5 )
-#	openmp? ( !threads )
-
-RDEPEND="
-	app-arch/bzip2[${MULTILIB_USEDEP}]
-	dev-libs/protobuf:=[${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	cuda? ( dev-util/nvidia-cuda-toolkit:0= )
-	contrib_hdf? ( sci-libs/hdf5 )
-	ffmpeg? (
-		libav? ( media-video/libav:0=[${MULTILIB_USEDEP}] )
-		!libav? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] )
-	)
-	gdal? ( sci-libs/gdal:= )
-	gflags? ( dev-cpp/gflags[${MULTILIB_USEDEP}] )
-	glog? ( dev-cpp/glog[${MULTILIB_USEDEP}] )
-	gphoto2? ( media-libs/libgphoto2[${MULTILIB_USEDEP}] )
-	gstreamer? (
-		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-		media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
-	)
-	gtk? (
-		dev-libs/glib:2[${MULTILIB_USEDEP}]
-		x11-libs/gtk+:2[${MULTILIB_USEDEP}]
-		opengl? ( x11-libs/gtkglext[${MULTILIB_USEDEP}] )
-	)
-	ieee1394? (
-		media-libs/libdc1394[${MULTILIB_USEDEP}]
-		sys-libs/libraw1394[${MULTILIB_USEDEP}]
-	)
-	ipp? ( sci-libs/ipp )
-	java? ( >=virtual/jre-1.6:* )
-	jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
-	jpeg2k? ( media-libs/jasper:=[${MULTILIB_USEDEP}] )
-	lapack? ( virtual/lapack )
-	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-	openexr? ( media-libs/openexr[${MULTILIB_USEDEP}] )
-	opengl? (
-		virtual/opengl[${MULTILIB_USEDEP}]
-		virtual/glu[${MULTILIB_USEDEP}]
-	)
-	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
-	python? ( ${PYTHON_DEPS} dev-python/numpy[${PYTHON_USEDEP}] )
-	qt5? (
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		dev-qt/qttest:5
-		dev-qt/qtconcurrent:5
-		opengl? ( dev-qt/qtopengl:5 )
-	)
-	tesseract? ( app-text/tesseract[opencl=] )
-	threads? ( dev-cpp/tbb[${MULTILIB_USEDEP}] )
-	tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
-	v4l? ( >=media-libs/libv4l-0.8.3[${MULTILIB_USEDEP}] )
-	vtk? ( sci-libs/vtk[rendering] )
-	webp? ( media-libs/libwebp[${MULTILIB_USEDEP}] )
-	xine? ( media-libs/xine-lib )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	eigen? ( dev-cpp/eigen:3 )
-	java?  ( >=virtual/jdk-1.6 )"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/opencv2/cvconfig.h
-	/usr/include/opencv2/opencv_modules.hpp
-	# [contrib_cvv]
-	/usr/include/opencv2/cvv.hpp
-	/usr/include/opencv2/cvv/call_meta_data.hpp
-	/usr/include/opencv2/cvv/cvv.hpp
-	/usr/include/opencv2/cvv/debug_mode.hpp
-	/usr/include/opencv2/cvv/dmatch.hpp
-	/usr/include/opencv2/cvv/filter.hpp
-	/usr/include/opencv2/cvv/final_show.hpp
-	/usr/include/opencv2/cvv/show_image.hpp
-	# [contrib_hdf]
-	/usr/include/opencv2/hdf.hpp
-	/usr/include/opencv2/hdf/hdf5.hpp
-	# [vtk]
-	/usr/include/opencv2/viz.hpp
-	/usr/include/opencv2/viz/types.hpp
-	/usr/include/opencv2/viz/viz3d.hpp
-	/usr/include/opencv2/viz/vizcore.hpp
-	/usr/include/opencv2/viz/widget_accessor.hpp
-	/usr/include/opencv2/viz/widgets.hpp
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.0.0-gles.patch"
-	"${FILESDIR}/${PN}-3.1.0-java-magic.patch"
-	"${FILESDIR}/${PN}-3.1.0-find-libraries-fix.patch"
-	"${WORKDIR}/${P}-imgcodecs-gcc.patch" # bug 627958 and https://github.com/opencv/opencv/pull/9376
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# remove bundled stuff
-	rm -rf 3rdparty || die "Removing 3rd party components failed"
-	sed -e '/add_subdirectory(.*3rdparty.*)/ d' \
-		-i CMakeLists.txt cmake/*cmake || die
-
-	if use contrib && use contrib_xfeatures2d; then
-		cd  "${WORKDIR}/${PN}_contrib-${PV}" || die
-		eapply "${FILESDIR}/${P}-contrib-xfeatures2d.patch"
-		mv "${WORKDIR}"/*.i "${WORKDIR}/${PN}_contrib-${PV}"/modules/xfeatures2d/src/ || die
-	fi
-
-	java-pkg-opt-2_src_prepare
-
-	# this really belongs in src_prepare() too
-	JAVA_ANT_ENCODING="iso-8859-1"
-	# set encoding so even this cmake build will pick it up.
-	export ANT_OPTS+=" -Dfile.encoding=iso-8859-1"
-	java-ant-2_src_configure
-}
-
-multilib_src_configure() {
-	# please dont sort here, order is the same as in CMakeLists.txt
-	GLOBALCMAKEARGS=(
-	# Optional 3rd party components
-	# ===================================================
-		-DWITH_1394=$(usex ieee1394)
-	#	-DWITH_AVFOUNDATION=OFF # IOS
-		-DWITH_VTK=$(multilib_native_usex vtk)
-		-DWITH_EIGEN=$(usex eigen)
-		-DWITH_VFW=OFF # Video windows support
-		-DWITH_FFMPEG=$(usex ffmpeg)
-		-DWITH_GSTREAMER=$(usex gstreamer)
-		-DWITH_GSTREAMER_0_10=OFF	# Don't want this
-		-DWITH_GTK=$(usex gtk)
-		-DWITH_GTK_2_X=$(usex gtk)
-		-DWITH_IPP=$(multilib_native_usex ipp)
-		-DWITH_JASPER=$(usex jpeg2k)
-		-DWITH_JPEG=$(usex jpeg)
-		-DWITH_WEBP=$(usex webp)
-		-DWITH_OPENEXR=$(usex openexr)
-		-DWITH_OPENGL=$(usex opengl)
-		-DWITH_OPENVX=OFF
-		-DWITH_OPENNI=OFF	# Not packaged
-		-DWITH_OPENNI2=OFF	# Not packaged
-		-DWITH_PNG=$(usex png)
-		-DWITH_GDCM=OFF
-		-DWITH_PVAPI=OFF
-		-DWITH_GIGEAPI=OFF
-		-DWITH_ARAVIS=OFF
-		-DWITH_QT=$(multilib_native_usex qt5 5 OFF)
-		-DWITH_WIN32UI=OFF		# Windows only
-	#	-DWITH_QUICKTIME=OFF
-	#	-DWITH_QTKIT=OFF
-		-DWITH_TBB=$(usex threads)
-		-DWITH_OPENMP=$(usex openmp)
-		-DWITH_CSTRIPES=OFF
-		-DWITH_PTHREADS_PF=ON
-		-DWITH_TIFF=$(usex tiff)
-		-DWITH_UNICAP=OFF		# Not packaged
-		-DWITH_V4L=$(usex v4l)
-		-DWITH_LIBV4L=$(usex v4l)
-		-DWITH_DSHOW=ON			# direct show supp
-		-DWITH_MSMF=OFF
-		-DWITH_XIMEA=OFF	# Windows only
-		-DWITH_XINE=$(multilib_native_usex xine)
-		-DWITH_CLP=OFF
-		-DWITH_OPENCL=$(usex opencl)
-		-DWITH_OPENCL_SVM=OFF
-		-DWITH_OPENCLAMDFFT=$(usex opencl)
-		-DWITH_OPENCLAMDBLAS=$(usex opencl)
-		-DWITH_DIRECTX=OFF
-		-DWITH_INTELPERC=OFF
-		-DWITH_JAVA=$(multilib_native_usex java) # Ant needed, no compile flag
-		-DWITH_IPP_A=OFF
-		-DWITH_MATLAB=OFF
-		-DWITH_VA=$(usex vaapi)
-		-DWITH_VA_INTEL=$(usex vaapi)
-		-DWITH_GDAL=$(multilib_native_usex gdal)
-		-DWITH_GPHOTO2=$(usex gphoto2)
-		-DWITH_LAPACK=$(multilib_native_usex lapack)
-		-DWITH_ITT=OFF # 3dparty libs itt_notify
-	# ===================================================
-	# CUDA build components: nvidia-cuda-toolkit takes care of GCC version
-	# ===================================================
-		-DWITH_CUDA=$(multilib_native_usex cuda)
-		-DWITH_CUBLAS=$(multilib_native_usex cuda)
-		-DWITH_CUFFT=$(multilib_native_usex cuda)
-		-DWITH_NVCUVID=OFF
-#		-DWITH_NVCUVID=$(usex cuda)
-		-DCUDA_NPP_LIBRARY_ROOT_DIR=$(usex cuda "${EPREFIX}/opt/cuda" "")
-	# ===================================================
-	# OpenCV build components
-	# ===================================================
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_ANDROID_EXAMPLES=OFF
-		-BUILD_opencv_apps=
-		-DBUILD_DOCS=OFF # Doesn't install anyways.
-		-DBUILD_EXAMPLES=$(multilib_native_usex examples)
-		-DBUILD_PERF_TESTS=OFF
-		-DBUILD_TESTS=$(multilib_native_usex testprograms)
-		-DBUILD_WITH_DEBUG_INFO=$(usex debug)
-	#	-DBUILD_WITH_STATIC_CRT=OFF
-		-DBUILD_WITH_DYNAMIC_IPP=OFF
-		-DBUILD_FAT_JAVA_LIB=$(multilib_native_usex java)
-	#	-DBUILD_ANDROID_SERVICE=OFF
-		-DBUILD_CUDA_STUBS=$(multilib_native_usex cuda)
-		-DOPENCV_EXTRA_MODULES_PATH=$(usex contrib "${WORKDIR}/opencv_contrib-${PV}/modules" "")
-	# ===================================================
-	# OpenCV installation options
-	# ===================================================
-		-DINSTALL_CREATE_DISTRIB=OFF
-		-DINSTALL_C_EXAMPLES=$(multilib_native_usex examples)
-		-DINSTALL_TESTS=$(multilib_native_usex testprograms)
-		-DINSTALL_PYTHON_EXAMPLES=$(multilib_native_usex examples)
-	#	-DINSTALL_ANDROID_EXAMPLES=OFF
-		-DINSTALL_TO_MANGLED_PATHS=OFF
-	# ===================================================
-	# OpenCV build options
-	# ===================================================
-		-DENABLE_CCACHE=OFF
-		-DENABLE_PRECOMPILED_HEADERS=$(usex pch)
-		-DENABLE_SOLUTION_FOLDERS=OFF
-		-DENABLE_PROFILING=OFF
-		-DENABLE_COVERAGE=OFF
-
-		-DHAVE_opencv_java=$(multilib_native_usex java YES NO)
-		-DENABLE_NOISY_WARNINGS=OFF
-		-DOPENCV_WARNINGS_ARE_ERRORS=OFF
-		-DENABLE_IMPL_COLLECTION=OFF
-		-DENABLE_INSTRUMENTATION=OFF
-		-DGENERATE_ABI_DESCRIPTOR=OFF
-		-DDOWNLOAD_EXTERNAL_TEST_DATA=OFF
-	# ===================================================
-	# things we want to be hard off or not yet figured out
-	# ===================================================
-		-DBUILD_PACKAGE=OFF
-	# ===================================================
-	# Not building protobuf but update files bug #631418
-	# ===================================================
-		-DBUILD_PROTOBUF=OFF
-		-DPROTOBUF_UPDATE_FILES=ON
-	# ===================================================
-	# things we want to be hard enabled not worth useflag
-	# ===================================================
-		-DCMAKE_SKIP_RPATH=ON
-		-DOPENCV_DOC_INSTALL_PATH=
-	)
-
-	# ===================================================
-	# OpenCV Contrib Modules
-	# ===================================================
-	if use contrib; then
-		GLOBALCMAKEARGS+=(
-			-DBUILD_opencv_dnn=OFF
-			-DBUILD_opencv_dnns_easily_fooled=OFF
-			-DBUILD_opencv_xfeatures2d=$(usex contrib_xfeatures2d ON OFF)
-			-DBUILD_opencv_cvv=$(usex contrib_cvv ON OFF)
-			-DBUILD_opencv_hdf=$(multilib_native_usex contrib_hdf ON OFF)
-			-DBUILD_opencv_sfm=$(usex contrib_sfm ON OFF)
-		)
-
-		if multilib_is_native_abi; then
-			GLOBALCMAKEARGS+=(
-				-DCMAKE_DISABLE_FIND_PACKAGE_Tesseract=$(usex !tesseract)
-			)
-		else
-			GLOBALCMAKEARGS+=(
-				-DCMAKE_DISABLE_FIND_PACKAGE_Tesseract=ON
-			)
-		fi
-	fi
-
-	# workaround for bug 413429
-	tc-export CC CXX
-
-	local mycmakeargs=( ${GLOBALCMAKEARGS[@]}
-		-DPYTHON_EXECUTABLE=OFF
-		-DINSTALL_PYTHON_EXAMPLES=OFF
-	)
-
-	cmake-utils_src_configure
-}
-
-python_module_compile() {
-	local BUILD_DIR=${orig_BUILD_DIR}
-	local mycmakeargs=( ${GLOBALCMAKEARGS[@]} )
-
-	# Set all python variables to load the correct Gentoo paths
-	mycmakeargs+=(
-		# cheap trick: python_setup sets one of them as a symlink
-		# to the correct interpreter, and the other to fail-wrapper
-		-DPYTHON2_EXECUTABLE=$(type -P python2)
-		-DPYTHON3_EXECUTABLE=$(type -P python3)
-		-DINSTALL_PYTHON_EXAMPLES=$(usex examples)
-	)
-
-	# Regenerate cache file. Can't use rebuild_cache as it won't
-	# have the Gentoo specific options.
-	rm -rf CMakeCache.txt || die "rm failed"
-	cmake-utils_src_configure
-	cmake-utils_src_compile
-	cmake-utils_src_install
-
-	# Remove compiled binary so new version compiles
-	# Avoid conflicts with new module builds as build system doesn't
-	# really support it.
-	rm -rf modules/python2 || die "rm failed"
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-
-	# Build and install the python modules for all targets
-	if multilib_is_native_abi && use python; then
-		local orig_BUILD_DIR=${BUILD_DIR}
-		python_foreach_impl python_module_compile
-	fi
-}
diff --git a/media-libs/opencv/opencv-3.3.0-r5.ebuild b/media-libs/opencv/opencv-3.3.0-r5.ebuild
index 8b76d7910413..b9fbce050f1e 100644
--- a/media-libs/opencv/opencv-3.3.0-r5.ebuild
+++ b/media-libs/opencv/opencv-3.3.0-r5.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="BSD"
 SLOT="0/3.3" # subslot = libopencv* soname version
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE="contrib cuda debug +eigen examples ffmpeg gdal gflags glog gphoto2 gstreamer gtk ieee1394 ipp jpeg jpeg2k lapack libav opencl openexr opengl openmp pch png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine contrib_cvv contrib_dnn contrib_hdf contrib_sfm contrib_xfeatures2d"
+IUSE="contrib cuda debug +eigen examples ffmpeg gdal gflags glog gphoto2 gstreamer gtk ieee1394 jpeg jpeg2k lapack libav opencl openexr opengl openmp pch png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine contrib_cvv contrib_dnn contrib_hdf contrib_sfm contrib_xfeatures2d"
 
 # OpenGL needs gtk or Qt installed to activate, otherwise build system
 # will silently disable it without the user knowing, which defeats the
@@ -68,7 +68,6 @@ RDEPEND="
 		media-libs/libdc1394[${MULTILIB_USEDEP}]
 		sys-libs/libraw1394[${MULTILIB_USEDEP}]
 	)
-	ipp? ( sci-libs/ipp )
 	java? ( >=virtual/jre-1.6:* )
 	jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
 	jpeg2k? ( media-libs/jasper:=[${MULTILIB_USEDEP}] )
@@ -280,7 +279,7 @@ multilib_src_configure() {
 		-DWITH_GSTREAMER_0_10=OFF	# Don't want this
 		-DWITH_GTK=$(usex gtk)
 		-DWITH_GTK_2_X=$(usex gtk)
-		-DWITH_IPP=$(multilib_native_usex ipp)
+		-DWITH_IPP=OFF
 		-DWITH_JASPER=$(usex jpeg2k)
 		-DWITH_JPEG=$(usex jpeg)
 		-DWITH_WEBP=$(usex webp)
diff --git a/media-libs/opencv/opencv-3.4.1-r2.ebuild b/media-libs/opencv/opencv-3.4.1-r2.ebuild
index 34085a8db247..2b315c3dae25 100644
--- a/media-libs/opencv/opencv-3.4.1-r2.ebuild
+++ b/media-libs/opencv/opencv-3.4.1-r2.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="BSD"
 SLOT="0/3.4.1" # subslot = libopencv* soname version
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE="contrib contrib_cvv contrib_dnn contrib_hdf contrib_sfm contrib_xfeatures2d cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_popcnt cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cuda debug dnn_samples +eigen examples ffmpeg gdal gflags glog gphoto2 gstreamer gtk ieee1394 ipp jpeg jpeg2k lapack libav opencl openexr opengl openmp pch png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
+IUSE="contrib contrib_cvv contrib_dnn contrib_hdf contrib_sfm contrib_xfeatures2d cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_popcnt cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cuda debug dnn_samples +eigen examples ffmpeg gdal gflags glog gphoto2 gstreamer gtk ieee1394 jpeg jpeg2k lapack libav opencl openexr opengl openmp pch png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
 # OpenGL needs gtk or Qt installed to activate, otherwise build system
 # will silently disable it Wwithout the user knowing, which defeats the
 # purpose of the opengl use flag.
@@ -73,7 +73,6 @@ RDEPEND="
 		media-libs/libdc1394[${MULTILIB_USEDEP}]
 		sys-libs/libraw1394[${MULTILIB_USEDEP}]
 	)
-	ipp? ( sci-libs/ipp )
 	java? ( >=virtual/jre-1.6:* )
 	jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
 	jpeg2k? ( media-libs/jasper:=[${MULTILIB_USEDEP}] )
@@ -286,7 +285,7 @@ multilib_src_configure() {
 		-DWITH_GSTREAMER_0_10=OFF	# Don't want this
 		-DWITH_GTK=$(usex gtk)
 		-DWITH_GTK_2_X=$(usex gtk)
-		-DWITH_IPP=$(multilib_native_usex ipp)
+		-DWITH_IPP=OFF
 		-DWITH_JASPER=$(usex jpeg2k)
 		-DWITH_JPEG=$(usex jpeg)
 		-DWITH_WEBP=$(usex webp)
diff --git a/media-libs/opencv/opencv-3.3.0-r4.ebuild b/media-libs/opencv/opencv-3.4.1-r4.ebuild
index 5910a643bae5..e2aeffdea2cd 100644
--- a/media-libs/opencv/opencv-3.3.0-r4.ebuild
+++ b/media-libs/opencv/opencv-3.4.1-r4.ebuild
@@ -1,31 +1,40 @@
-# Copyright 1999-2017 Gentoo Foundation
+# 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} )
 
-inherit toolchain-funcs python-r1 java-pkg-opt-2 java-ant-2 cmake-multilib
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+inherit java-pkg-opt-2 java-ant-2 python-r1 toolchain-funcs cmake-multilib
 
 DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
 HOMEPAGE="https://opencv.org"
-
+TINY_DNN_PV="1.0.0a3"
 SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~amynka/snap/imgcodecs-${P}.tar.gz
-	contrib? ( https://github.com/${PN}/${PN}_contrib/archive/${PV}.tar.gz -> ${P}_contrib.tar.gz
-		contrib_xfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz  ) ) "
+	dnn_samples? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-res10_300x300-caffeemodel.tar.gz )
+	contrib? (
+		https://github.com/${PN}/${PN}_contrib/archive/${PV}.tar.gz -> ${P}_contrib.tar.gz
+		contrib_dnn? ( https://github.com/tiny-dnn/tiny-dnn/archive/v${TINY_DNN_PV}.tar.gz -> tiny-dnn-${TINY_DNN_PV}.tar.gz
+			       https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-face_landmark_model.tar.gz
+		)
+		contrib_xfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz )
+	)"
+
 LICENSE="BSD"
-SLOT="0/3.3" # subslot = libopencv* soname version
+SLOT="0/3.4.1" # subslot = libopencv* soname version
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE="contrib cuda debug +eigen examples ffmpeg gdal gflags glog gphoto2 gstreamer gtk ieee1394 ipp jpeg jpeg2k lapack libav opencl openexr opengl openmp pch png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine contrib_cvv contrib_hdf contrib_sfm contrib_xfeatures2d"
-
+IUSE="contrib contrib_cvv contrib_dnn contrib_hdf contrib_sfm contrib_xfeatures2d cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_popcnt cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cuda debug dnn_samples +eigen examples ffmpeg gdal gflags glog gphoto2 gstreamer gtk ieee1394 jpeg jpeg2k lapack libav opencl openexr opengl openmp pch png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
 # OpenGL needs gtk or Qt installed to activate, otherwise build system
-# will silently disable it without the user knowing, which defeats the
+# will silently disable it Wwithout the user knowing, which defeats the
 # purpose of the opengl use flag.
 REQUIRED_USE="
 	cuda? ( tesseract? ( opencl ) )
+	dnn_samples? ( examples )
 	gflags? ( contrib )
 	glog? ( contrib )
 	contrib_cvv? ( contrib qt5 )
+	contrib_dnn? ( contrib )
 	contrib_hdf? ( contrib )
 	contrib_sfm? ( contrib eigen gflags glog )
 	contrib_xfeatures2d? ( contrib cuda )
@@ -66,7 +75,6 @@ RDEPEND="
 		media-libs/libdc1394[${MULTILIB_USEDEP}]
 		sys-libs/libraw1394[${MULTILIB_USEDEP}]
 	)
-	ipp? ( sci-libs/ipp )
 	java? ( >=virtual/jre-1.6:* )
 	jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
 	jpeg2k? ( media-libs/jasper:=[${MULTILIB_USEDEP}] )
@@ -95,6 +103,7 @@ RDEPEND="
 	xine? ( media-libs/xine-lib )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	contrib_dnn? ( dev-libs/cereal )
 	eigen? ( dev-cpp/eigen:3 )
 	java?  ( >=virtual/jdk-1.6 )"
 
@@ -217,9 +226,10 @@ MULTILIB_WRAPPED_HEADERS=(
 
 PATCHES=(
 	"${FILESDIR}/${PN}-3.0.0-gles.patch"
-	"${FILESDIR}/${PN}-3.1.0-java-magic.patch"
-	"${FILESDIR}/${PN}-3.1.0-find-libraries-fix.patch"
-	"${WORKDIR}/${P}-imgcodecs-gcc.patch" # bug 627958 and https://github.com/opencv/opencv/pull/9376
+	"${FILESDIR}/${PN}-3.4.0-disable-download.patch"
+	"${FILESDIR}/${P}-compilation-C-mode.patch" # https://bugs.gentoo.org/656530
+	"${FILESDIR}/${P}-python-lib-suffix-hack.patch"
+	"${FILESDIR}/${P}-cuda-add-relaxed-constexpr.patch"
 )
 
 pkg_pretend() {
@@ -239,10 +249,17 @@ src_prepare() {
 	sed -e '/add_subdirectory(.*3rdparty.*)/ d' \
 		-i CMakeLists.txt cmake/*cmake || die
 
-	if use contrib && use contrib_xfeatures2d; then
+	if use dnn_samples; then
+		mv  "${WORKDIR}/res10_300x300_ssd_iter_140000.caffemodel" "${WORKDIR}/${P}/samples/dnn/" || die
+	fi
+
+	if use contrib; then
 		cd  "${WORKDIR}/${PN}_contrib-${PV}" || die
-		eapply "${FILESDIR}/${P}-contrib-xfeatures2d.patch"
-		mv "${WORKDIR}"/*.i "${WORKDIR}/${PN}_contrib-${PV}"/modules/xfeatures2d/src/ || die
+		eapply "${FILESDIR}/${PN}-3.3.0-remove-tiny-dnn-autodownload.patch"
+
+		if use contrib_xfeatures2d; then
+			mv "${WORKDIR}"/*.i "${WORKDIR}/${PN}_contrib-${PV}"/modules/xfeatures2d/src/ || die
+		fi
 	fi
 
 	java-pkg-opt-2_src_prepare
@@ -259,6 +276,7 @@ multilib_src_configure() {
 	GLOBALCMAKEARGS=(
 	# Optional 3rd party components
 	# ===================================================
+		-DENABLE_DOWNLOAD=OFF
 		-DWITH_1394=$(usex ieee1394)
 	#	-DWITH_AVFOUNDATION=OFF # IOS
 		-DWITH_VTK=$(multilib_native_usex vtk)
@@ -269,7 +287,7 @@ multilib_src_configure() {
 		-DWITH_GSTREAMER_0_10=OFF	# Don't want this
 		-DWITH_GTK=$(usex gtk)
 		-DWITH_GTK_2_X=$(usex gtk)
-		-DWITH_IPP=$(multilib_native_usex ipp)
+		-DWITH_IPP=OFF
 		-DWITH_JASPER=$(usex jpeg2k)
 		-DWITH_JPEG=$(usex jpeg)
 		-DWITH_WEBP=$(usex webp)
@@ -306,7 +324,6 @@ multilib_src_configure() {
 		-DWITH_OPENCLAMDBLAS=$(usex opencl)
 		-DWITH_DIRECTX=OFF
 		-DWITH_INTELPERC=OFF
-		-DWITH_JAVA=$(multilib_native_usex java) # Ant needed, no compile flag
 		-DWITH_IPP_A=OFF
 		-DWITH_MATLAB=OFF
 		-DWITH_VA=$(usex vaapi)
@@ -328,6 +345,7 @@ multilib_src_configure() {
 	# OpenCV build components
 	# ===================================================
 		-DBUILD_SHARED_LIBS=ON
+		-DBUILD_JAVA=$(multilib_native_usex java) # Ant needed, no compile flag
 		-DBUILD_ANDROID_EXAMPLES=OFF
 		-BUILD_opencv_apps=
 		-DBUILD_DOCS=OFF # Doesn't install anyways.
@@ -350,6 +368,9 @@ multilib_src_configure() {
 		-DINSTALL_PYTHON_EXAMPLES=$(multilib_native_usex examples)
 	#	-DINSTALL_ANDROID_EXAMPLES=OFF
 		-DINSTALL_TO_MANGLED_PATHS=OFF
+		# opencv uses both ${CMAKE_INSTALL_LIBDIR} and ${LIB_SUFFIX}
+		# to set its destination libdir
+		-DLIB_SUFFIX=
 	# ===================================================
 	# OpenCV build options
 	# ===================================================
@@ -380,6 +401,21 @@ multilib_src_configure() {
 	# ===================================================
 		-DCMAKE_SKIP_RPATH=ON
 		-DOPENCV_DOC_INSTALL_PATH=
+	# ==================================================
+	# cpu flags, should solve 633900
+	#===================================================
+		-DOPENCV_CPU_OPT_IMPLIES_IGNORE=ON
+		-DCPU_DISPATCH=
+		-DENABLE_SSE=$(usex cpu_flags_x86_sse)
+		-DENABLE_SSE2=$(usex cpu_flags_x86_sse2)
+		-DENABLE_SSE3=$(usex cpu_flags_x86_sse3)
+		-DENABLE_SSSE3=$(usex cpu_flags_x86_ssse3)
+		-DENABLE_SSE41=$(usex cpu_flags_x86_sse4_1)
+		-DENABLE_SSE42=$(usex cpu_flags_x86_sse4_2)
+		-DENABLE_POPCNT=$(usex cpu_flags_x86_popcnt)
+		-DENABLE_AVX=$(usex cpu_flags_x86_avx)
+		-DENABLE_AVX2=$(usex cpu_flags_x86_avx2)
+		-DENABLE_FMA3=$(usex cpu_flags_x86_fma3)
 	)
 
 	# ===================================================
@@ -387,7 +423,8 @@ multilib_src_configure() {
 	# ===================================================
 	if use contrib; then
 		GLOBALCMAKEARGS+=(
-			-DBUILD_opencv_dnn=OFF
+			-DBUILD_opencv_dnn=$(usex contrib_dnn ON OFF)
+			-DTINYDNN_ROOT="${WORKDIR}/tiny-dnn-${TINY_DNN_PV}"
 			-DBUILD_opencv_dnns_easily_fooled=OFF
 			-DBUILD_opencv_xfeatures2d=$(usex contrib_xfeatures2d ON OFF)
 			-DBUILD_opencv_cvv=$(usex contrib_cvv ON OFF)
@@ -415,6 +452,14 @@ multilib_src_configure() {
 	)
 
 	cmake-utils_src_configure
+
+	# Copy face_land_model to ${CMAKE_BINARY_DIR}/${OPENCV_TEST_DATA_INSTALL_PATH}
+	# TODO patch ocv_download to copy files into destination dirs
+	if use contrib_dnn; then
+		mkdir -p "${BUILD_DIR}"/share/OpenCV/testdata/cv/face/ || die
+		cp "${WORKDIR}"/face_landmark_model.dat "${BUILD_DIR}"/share/OpenCV/testdata/cv/face/ || die
+	fi
+
 }
 
 python_module_compile() {
@@ -428,6 +473,7 @@ python_module_compile() {
 		-DPYTHON2_EXECUTABLE=$(type -P python2)
 		-DPYTHON3_EXECUTABLE=$(type -P python3)
 		-DINSTALL_PYTHON_EXAMPLES=$(usex examples)
+		-DLIBPY_SUFFIX=64
 	)
 
 	# Regenerate cache file. Can't use rebuild_cache as it won't
diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest
index 8b706df81652..337643caf35b 100644
--- a/media-libs/openimageio/Manifest
+++ b/media-libs/openimageio/Manifest
@@ -7,9 +7,11 @@ AUX openimageio-1.8.7-ffmpeg4.patch 752 BLAKE2B 53b0ee1dec1dd5ef3c9847d46868130b
 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
+DIST openimageio-1.8.13.tar.gz 27829708 BLAKE2B 8c3a6721f7039e22fcea538694c32651e042d926f40494e5b3623c11158da2f49a8e49698920269d0f3076d060c5849c62f2a6bb256d77dcd5565f86e6de04d2 SHA512 578d039399846f994dd8e4b94a7b56f2bcec45571c2144705fc4e2fe6a3e1d878d79a96c0484350d54b46eef7796d46becda9f5d50f266cd730f63d97af0650e
 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 2946 BLAKE2B 7a40878d3fab0bf03777a4a9b45118525985bbfa1b494f0641a52a73d3fecc9bc7d76616e1c61757b8b10b93c60c2a9ba5a3066971b017271aeb5b21e4ec266b SHA512 cb9df0dade489b996818b73a62e0d4de82a485b7e7f2123c95be1a46a2405d7690913878d676477857bbda07a8877138de805f8390e0d2899f3f7a26ccbf8128
+EBUILD openimageio-1.8.13.ebuild 2958 BLAKE2B b37b784f30d4f2815cc7fa2421436bc7f56acfe5b5f6996c4f9ca48ac296acf655f7834693871f2549a51a132318295abd204623d05c21e64dbe3995c4c2ce91 SHA512 b3d31a096a1b450aac0779536e971f6a558facabfce87d7a869db1f14f67e46b468da743917019aa8c43e7032bd0cb5be939b655dcdf5d36aea8bd691872a57d
 EBUILD openimageio-1.8.7.ebuild 2983 BLAKE2B 8b71066fbc00e8ede83b6767a37956aa1df54dea03d8bb00ffabd6c65e3d95f453153482e34b4c090bc9f694370bfa5a06d92e2d45014dd10bf9a841e2c69ca3 SHA512 5f314056c16ba4585afe8c68aabe74fcb3580e05d0b19952e8fea373fd0cc65f50ac58270501a2391cc8a1d8ad14d97387b49e9dcce244949302b6a5b361492a
 MISC metadata.xml 940 BLAKE2B 540f2e00e2790b5e1ec7af2f9165d8a911151c9c9d2d6dbaa80f697ae91fcfe4889ec68141ed18a321550f7b9a3a14a306de5199e3cd603f4f6b5a019005f815 SHA512 ff5c1d96b3de7d144f2cd7bcf55c9953e7e385717ad49d009adef1e21ffa32843350a71f98210b724fb74af916be98eb4f5d2927c58b4a848efbffd85f39d933
diff --git a/media-libs/openimageio/openimageio-1.8.13.ebuild b/media-libs/openimageio/openimageio-1.8.13.ebuild
new file mode 100644
index 000000000000..7e8ccfa61034
--- /dev/null
+++ b/media-libs/openimageio/openimageio-1.8.13.ebuild
@@ -0,0 +1,114 @@
+# 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 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
+}
+
+S="${WORKDIR}/oiio-Release-${PV}"
+
+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 6c411f42620a..dc920d4c7468 100644
--- a/media-libs/openjpeg/Manifest
+++ b/media-libs/openjpeg/Manifest
@@ -1,7 +1,7 @@
 DIST openjpeg-1.5.2.tar.gz 1385702 BLAKE2B 936ab6e0fb48f2839df13113c716c39b9572bd590206cd823dedccfd4001444d73a81ccbf82616a40a35ad8b1fae8d2f08d7c265a771d9d9ef413beac5e84ac1 SHA512 b945cf4f8b5e3227a0c07120c94b0ed5bf30c901de73059ee1d47975f46744fb62bbe84cdb2917c6431128f400020874eb07160af870b5448ced897998b08862
 DIST openjpeg-2.3.0.tar.gz 2207329 BLAKE2B b03ddb02127cc85e647cbda11423f63f2caa0abae40d5687a1b191e7857aa9b428da5afc86ce0c08cce1516c290eeac31ae1db841db56ba70afa020f126d2508 SHA512 0a9d427be4a820b1d759fca4b50e293721b45fe4885aa61ca1ae09e099f75ed93520448090c780d62f51076d575cc03618cd6d5181bdb6b34e4fc07b4cfdd568
 DIST openjpeg-data_20170814.tar.gz 497454197 BLAKE2B ea27ab763e685724dfd5c2242a93d9b93111a0516ea7a8aef9f37ec31b00cc887d84d4d0bf7f79f3636aa0ea9a0302f43df4596fc967c243a8773ccde6e79fe0 SHA512 a13c941839f0d3f3a71b3f5b36d6c2ddb789e765526ebb6aed99150991bb717363e3ce40f335451a983d44a0b047538e0870d0fe5b37d6a002497eb99a403e24
-EBUILD openjpeg-1.5.2-r1.ebuild 1992 BLAKE2B 8cc839bd75ddfad70068673a75b9ba74701ea52ace5990d83f680a4a27ef09f2c89814e538175f328709cacbbeac9faa7d9445753d56898caaae01d5b73a1069 SHA512 b2e9e487f819fc3bd4ece6788cc9c08bac3c6bdcc8e316cb38847f1839245b23f01eff29f81cf23eda767efe4e9f2480605c3c95ede38ac246fe0c3c64244eb6
+EBUILD openjpeg-1.5.2-r1.ebuild 1971 BLAKE2B c58450bd681763116254ad67c82061312bec7d0fb606d9b4a64ecb456a785388f6ea962b32a48db2362a0919b5e58814de2a8e9f90d58cdee0929cec85d7ea2b SHA512 254f0bd1424daf2b93d8d88964e696fd46c3572729e0758a92d14435296b3c2d81f2cb9526c2ad6a5d830664611f25876b0aed9942b6c7e349ffba6f86f2d22d
 EBUILD openjpeg-1.5.2.ebuild 1987 BLAKE2B db3baed20766524d12687b9e444197c09ec49ac7937ad0deeb83f1f5a6367dbb81d44a7dedd172357a1ef188fe5823542ed6cdcbdd068b7d9f2e54f76408a981 SHA512 64f90025e0c15e7b90e2528ff96c6a18cb0e67a082e354ab994f076ed4c8d492a5e266e76eca694dd0eac6731da918685099a5656f382673f1840bde4179f65f
 EBUILD openjpeg-2.3.0.ebuild 4082 BLAKE2B 0810dfc5c27dfa27e18a9c8e75e3f74348ac68de6acf76d319cfe19a2580a6895931bd728d57d146557f9dde2df8c50db2669b77fad7d839706df30f3668c1e3 SHA512 feb8ea2332b1b60cd8a702e9bd198ccdaf4033e8a901357b278266459e7c77987446ea45b9003eb0c3f70696ce047c81447be887d9f02a8065a3217b5117a796
 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 0f2a1158f9a5..3c43e9ed3c21 100644
--- a/media-libs/openjpeg/openjpeg-1.5.2-r1.ebuild
+++ b/media-libs/openjpeg/openjpeg-1.5.2-r1.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit multilib cmake-multilib
+EAPI=6
+
+inherit cmake-multilib
 
 DESCRIPTION="An open-source JPEG 2000 library"
 HOMEPAGE="http://www.openjpeg.org"
@@ -13,7 +14,8 @@ SLOT="0/5" # based on SONAME
 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=
+RDEPEND="
+	media-libs/lcms:2=
 	media-libs/libpng:0=
 	media-libs/tiff:0=
 	sys-libs/zlib:="
@@ -22,7 +24,7 @@ DEPEND="${RDEPEND}
 
 DOCS=( AUTHORS CHANGES NEWS README THANKS )
 
-RESTRICT="test" #409263
+RESTRICT="test" # bug 409263
 
 src_prepare() {
 	cmake-utils_src_prepare
@@ -33,20 +35,20 @@ src_prepare() {
 multilib_src_configure() {
 	local mycmakeargs=(
 		-DOPENJPEG_INSTALL_LIB_DIR="$(get_libdir)"
-		$(cmake-utils_use_build test TESTING)
+		-DBUILD_TESTING=$(usex test)
 		-DBUILD_DOC=$(multilib_native_usex doc ON OFF)
 		-DBUILD_CODEC=$(multilib_is_native_abi && echo ON || echo OFF)
-		)
+	)
 
 	cmake-utils_src_configure
 
 	if use static-libs; then
 		mycmakeargs=(
 			-DOPENJPEG_INSTALL_LIB_DIR="$(get_libdir)"
-			$(cmake-utils_use_build test TESTING)
+			-DBUILD_TESTING=$(usex test)
 			-DBUILD_SHARED_LIBS=OFF
 			-DBUILD_CODEC=OFF
-			)
+		)
 		BUILD_DIR=${BUILD_DIR}_static cmake-utils_src_configure
 	fi
 }
diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest
index 923a484c82e4..4678aaac68a9 100644
--- a/media-libs/osl/Manifest
+++ b/media-libs/osl/Manifest
@@ -1,6 +1,8 @@
 AUX osl-1.8.12-cmake-fixes.patch 14704 BLAKE2B dd7d37ae117c338aa72893a26e59f3046c89d5ddc57c7dfc90225d1e49f5bd4346869db7621e2ec0b7c082650d54987a4f6c1196a169828fa17388ad7a3a32e3 SHA512 14059eb68c520e90ed3217b0480929efa4b1ccfa6860649ca86285856d8f5efd07a563ad01dc8bb46dd42d277708b27a9a9f8833f60960502162df0fc1ee243c
 DIST osl-1.8.12.tar.gz 14572814 BLAKE2B edf742b104e723e1e3e56b2fb28b1cd4c81921b04a00b8c0f58cf174105a78881283837b550fb4a67d38f5f0a37327fac7a17310974895ed747e8813e6c8ad7b SHA512 29bb0a23d9e1aa445e87b7080be056f939a1828fa87f001cc1503a8c76d21a5620c69146158d27800db71b1abee71a0c39804d85aea7b5899b0cb7ca1c617b56
 DIST osl-1.9.6.tar.gz 14765052 BLAKE2B c6c82d02d49d263361b5b3ba03fca8f35f16199d7d30bbeb50a6b2ee16efcb06ddddc9ce515f749b38b2428365c27a23bf673e9be64d1453c7a49ab0f0d09002 SHA512 e2eb8487038795630bfb38cfb7a39f0cc6877f83689d1e00327b9d95c4b5270c263546a02dff1511272d1d2f429757e11fa28095f9d16cb170b777b531678961
+DIST osl-1.9.9.tar.gz 14771575 BLAKE2B ffbfa935c0d6568c9b35048d5b05965abc75775f4a4f56a434a331a45f4963b3e5cb74fb965748a5fb94cdd3a4201a4745ce564646cbbe535ca2646a734dc33c SHA512 7f3a16bc654676f8e82bf87a2c33914997f1468772ad27bf284c848e9b02adddaf37cb6ef8bde16c81b9076247bca5463a1a5660023efd67d9ac20969ae99647
 EBUILD osl-1.8.12.ebuild 1784 BLAKE2B c01cae7aec718f704fe017dc0f3273db7e3046fa276b4b82030dafc4a59ab641b7faa20a7ce2735d52347a30b1188458a9b9f6316bd96bc406e3363018a51350 SHA512 d5148e294ac96cfd06639927af0b3d03a00193d1ffbf55b65e51e717e8ed72fc15cb81b3e418bcd9bde102ad8ede59b92aff966ae0dbb3e366f120706b119fa4
 EBUILD osl-1.9.6.ebuild 1748 BLAKE2B e6b99e1822ced26cf8d6e138f46d4c5e038f078e0b697ecd40e6cde3870efa945160af3cf83f675825fe5a878b5e5bd6a7ec8caea79d4961a0da23130d2d652b SHA512 d0ce4444dc300b869a520a7bc50ea1d95a0ac0342684495c0742a62e55a8f0cb9453ad71fa2ca0ba412970d7d0323409ae8eff99862908d80a24977ce3babaa5
+EBUILD osl-1.9.9.ebuild 1720 BLAKE2B 22d51d110a3128ece31bc2f0155e94f996ae65f2adc42690053305d4b8304737b82a991431114f48524fe5c1ab6b8643899e02a99a341ff5bf653fbff7990b91 SHA512 914cbed1d6020934a8139d8b7a553a275c09c4fa89178237c7105845e6e3cec86c5e1b163ec261a82237d0505c04b624f75294868d2ab469656b639bcefdb0c5
 MISC metadata.xml 1081 BLAKE2B eabbb5a86e04eed46ee43e48be4317009c619259c79df95b376d457a07a3ed3557297cad5fbe45f0dd81ce33eee9032c95016b55321295b1c49e63de4f95298e SHA512 e2752051556751cb815a34c39fa5a85898417753d0d933db7a5b14162e26c98e46d7e106bce65f7284cacc1b33e3aa3bf75e9801245dcb2266d51e9ef9c50504
diff --git a/media-libs/osl/osl-1.9.9.ebuild b/media-libs/osl/osl-1.9.9.ebuild
new file mode 100644
index 000000000000..c4781e7e7bc1
--- /dev/null
+++ b/media-libs/osl/osl-1.9.9.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-utils
+
+DESCRIPTION="Advanced shading language for production GI renderers"
+HOMEPAGE="http://opensource.imageworks.com/?p=osl"
+
+MY_PV=${PV//_} # Remove underscore if any.
+[[ "${PV}" = *_rc* ]] && MY_PV=${MY_PV^^} # They use capitals for RC.
+
+SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/Release-${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~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="doc partio test ${CPU_FEATURES[@]%:*}"
+
+RDEPEND="dev-libs/pugixml
+	>=media-libs/openexr-2.2.0
+	>=media-libs/openimageio-1.8.0
+	sys-libs/zlib:=
+	partio? ( media-libs/partio )"
+
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.62
+	sys-devel/clang
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig"
+
+# Restricting tests as Make file handles them differently
+RESTRICT="test"
+
+S="${WORKDIR}/OpenShadingLanguage-Release-${MY_PV}"
+
+src_configure() {
+	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")
+
+	# LLVM needs CPP11. Do not disable.
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
+		-DENABLERTTI=OFF
+		-DOSL_BUILD_TESTS=$(usex test)
+		-DINSTALL_DOCS=$(usex doc)
+		-DLLVM_STATIC=ON
+		-DSTOP_ON_WARNING=OFF
+		-DUSE_PARTIO=$(usex partio)
+		-DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")"
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/media-libs/partio/Manifest b/media-libs/partio/Manifest
index f77e0c0e408f..531b9277d116 100644
--- a/media-libs/partio/Manifest
+++ b/media-libs/partio/Manifest
@@ -1,7 +1,9 @@
 AUX partio-1.1.0-Rename-partconv.patch 2459 BLAKE2B d811f5174dd2c5e158e7985e8fdea520faeb248249b88c8ebec37dc91f50312ed44d39563142cb3a28fa07ce9b6907824835484881782ceac9b8894978bcb061 SHA512 1965a236f43092c05c940c0f2b33d9c77066ed5fbf3b1753bcf5d9b13c8e5a6e60ef41ba13c9471d1d26d1dc74fead52d0ef1c18f04b1f942345fd1412b0c932
 DIST partio-1.1.0_p20170829.tar.gz 275959 BLAKE2B 441c2d0ab9dd91fa52a826d49f7448dc4d5d0a8d6b72bdb58793dd3c97d86739b25e582bdff41160599489a2835ad8e68676012cb70ef8edff062df3205ab209 SHA512 daedb23ae2b89d3f2ef36ef13afc624a663b3fab91c22f9a454439ff3bc194b78a87e37c9133f6948567ab3b183eff960bb51951b0427cff8c1c29099b6578d6
 DIST partio-1.5.0.tar.gz 291604 BLAKE2B d0d6eab4ef541e61fe4498b4cdd8b9c60e62545a040d3f26b8a7b2d8adaa36c45f28c8a05df24c47dc504ec1dd4fb7bfec1fe5b08f6a035a0b3fdcdceacc46fc SHA512 10db9cfe691fd2341e2613132ad7f8d363007a62a5b5cb6226c53360e2e47d1be77c4d87ae31bd7537790cc8ba8bac7eef229c21fcd8227d98d2ab2154aac559
+DIST partio-1.5.4.tar.gz 291617 BLAKE2B 638fae984d392e1e6c95862ad9a8dd8b8a0d80b2c83dfd03e887af36e420d15fd67f0b2c71e5e8c335668b512660bf14f03a1329ac0d7a48431674a51043585d SHA512 967da5b648b19c45bd0c3c8ff56f891e2d54a07b2cd113f18d5d0b646cbfabd968e31ee48c0e167bf9a911d8d5af42d5291b355da305a2b9134fa78fc23e5636
 EBUILD partio-1.1.0_p20170829.ebuild 1060 BLAKE2B b235d53fa705d5e6d515ee983203ac0349c23a7b10f09093980fba0aaef4d770fcb469a0f357bf4a15f07c1017cc19b933fa0f0df6d6207def91a12677bc9bf7 SHA512 c80ff6fcc5e52201819b6477c735a51e94c72e63992c404a24e7c10ebe05955d542fce76ac4e21ff1f8e7192f5c42a968988be2cee2a9cdc4a07720bf15e9ce4
 EBUILD partio-1.5.0.ebuild 910 BLAKE2B 9191869a46ffb5971ec8afecd4aa2f703e855a34112a8eb34a5152ff25dd3efd5e5e542f93e31017f688c8a5aa9c42d49c766bf0d04bb146492c8b9c956bfbdf SHA512 3d50ed2fb8b808d78d2cc733be166d5b481388754b26740eb2f338bdd1209520a5fed34a2c24b55eac06991f01d3c43e8088660b4024dc67e73f997d5c21e3bf
+EBUILD partio-1.5.4.ebuild 910 BLAKE2B 9191869a46ffb5971ec8afecd4aa2f703e855a34112a8eb34a5152ff25dd3efd5e5e542f93e31017f688c8a5aa9c42d49c766bf0d04bb146492c8b9c956bfbdf SHA512 3d50ed2fb8b808d78d2cc733be166d5b481388754b26740eb2f338bdd1209520a5fed34a2c24b55eac06991f01d3c43e8088660b4024dc67e73f997d5c21e3bf
 EBUILD partio-9999.ebuild 1120 BLAKE2B 4d5c4d89eaacf786e2f097da917b9b78bfce8e392c8ce468f9e6042e7d2f01ff39f73b4960d3459ef834b21a98b2af984b7026d4ba94ea6ce731a09892ebcdca SHA512 f6ca5099221bdafce8704328f5f879d2a9ad569970e5618185dc95fa3c115d3a16f06ea420d8d4ff82f28fd3dab689f51f6936de91ffdaada38c7f68062bc6ba
 MISC metadata.xml 640 BLAKE2B 3b2c33cb14c466bd4641cc04781d1de05d01170ccc591b3caae40356f934944c4c969834bad5ccdcf9f5390d203270055863b08feb7321492a27d4d7575aced5 SHA512 7116217ccc87ab80d8cb4ee0ea20089ea1c0a5b4ea9b3f666548b37422c01a8917516a5db565fc55f779bb19613fbfb515cfae0b9f87f010f5034c14d27ed8e0
diff --git a/media-libs/partio/partio-1.5.4.ebuild b/media-libs/partio/partio-1.5.4.ebuild
new file mode 100644
index 000000000000..2aaed0b7b0be
--- /dev/null
+++ b/media-libs/partio/partio-1.5.4.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit cmake-utils python-single-r1
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/wdas/partio.git"
+else
+	SRC_URI="https://github.com/wdas/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="A library for particle IO and manipulation"
+HOMEPAGE="https://www.disneyanimation.com/technology/partio.html"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="doc"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	media-libs/freeglut
+	sys-libs/zlib:=
+	virtual/opengl
+"
+
+DEPEND="${RDEPEND}
+	dev-lang/swig:*
+	doc? ( app-doc/doxygen[latex] )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package doc Doxygen)
+	)
+	cmake-utils_src_configure
+}
diff --git a/media-libs/ptex/Manifest b/media-libs/ptex/Manifest
index 922d6c8cd135..996da0932b4d 100644
--- a/media-libs/ptex/Manifest
+++ b/media-libs/ptex/Manifest
@@ -1,6 +1,9 @@
 AUX ptex-2.1.28-20170213.patch 2324 BLAKE2B 1536d8b2f8c6c28718ae81a04e3041d5c25f562647e84a098500ca523cb2c4f0743b812e3a1fb9838604752a41b07d1dd41f65d7a9c2bca7a84cc25eb312f3be SHA512 dcdad0e6b2b37c523b5b54c4d885cd99facd7d50733150b2c75fac3b600010c61d2c219a14aecc24a86ff869b62a962e975dd5790228112fe004aa2d8b2fa51a
 AUX ptex-2.1.28-allow-custom-build-type.patch 1410 BLAKE2B 9d1bd1b41752bc3d8c21f72505dbc7c2bafccadcdb1ace339a8f25045f4e2b527af0b3263d4be2f5883912eca733d74cb20aa10eff6792ff89f288e34d27600f SHA512 fc51d24895c7624ee610f5f8537bacc15903816cf4cebb2c32f15afa6c9ab4dd087e21018a81e4d032b37735bf4fba73a406acef8e0c88cebfd6606ba2b11b24
+AUX ptex-2.3.0-cxx11.patch 399 BLAKE2B 482ff38239256f3195d13478a461c45eb812e1f4f047dbbebd275d77edca71273978c183360a6428ca411029be4174637bc591846554ad37af58cf64ee80d6c6 SHA512 9ab265f7d330142453b8b135ee32fde20b70ce6b17266ff61051682d6ca620a9d55c40f199c52feb807372cc64c21e1905907c10b609d2e5f07e572451c9b1d6
 DIST ptex-2.1.28.tar.gz 305327 BLAKE2B 4a91b08ae326e8ed8d420022c693ea60cb21908380b8c49a7672771686f9dd2ef05151b7d43755bc63ab6624db772c2b53d1ffdcdea9c1dff7627cc3fe0f3b15 SHA512 ddce3c79f14d196e550c1e8a5b371482f88190cd667a2e2aa84601de1639f7cabb8571c1b3a49b48df46ce550d27088a00a67b1403c3bfec2ed73437c3dca3e8
+DIST ptex-2.3.0.tar.gz 306462 BLAKE2B 790e3623ce6ebae2dfd8884d8e19e62395c54432289d88bdcf3a01c8ae1ef752ca88869357ac1e4657d59f1ca73d311a3fb9a08efe4e145ca259eff93d8a3b6a SHA512 2d9d320e4205236a4eff05ec3c67d085624809ebefa89fa3b943d18a8b2b6a5f61c022a4cc4363a7c6ceccfb9eac4f8738dff2e90a3355814f2c4ff096c09992
 EBUILD ptex-2.1.28-r1.ebuild 575 BLAKE2B 5ec37846a07464082c8863b53e523f1b046151f14cccb7b19672028560072703b303feeaac156c78c6a7006d79bed649e9a24d5dac6f2e81985e57077595850e SHA512 0289b417671552ad7400b5784f985d1b3d405b07d10e2101a06289292249d67ab88ad1c041f5641ea724de59a0285797fc7435cc68ad9f3c550bbb30b55bb967
 EBUILD ptex-2.1.28.ebuild 544 BLAKE2B 60cb8bb36eea64f38f892a91bd270eccfaae2b8f409a319688e491069e7c02739977f95663b7eb4aaadbe368ef069d444902dbf3acb13d4f256c4313a5a0fb51 SHA512 546b82932cdb673e44b6aa7e843e8f96564cb22436e274678c0910d4beda2cd483812cc5a6b4b03bab8c2dcdf028ea3ac62bcffd088bf1f51c8a974e9e58f39e
+EBUILD ptex-2.3.0.ebuild 663 BLAKE2B 6ff6a2c7e2668e6ce4dc60e666f5ed32024d9864375a27c8c060fad2baeed6c7105dbca800ed04846ef017f5042e4e75e2a6e6a072c694dc78e4ea6165b4bd81 SHA512 8d280943a293511704d4835c97f75451fa02ec0ebc4b4fb386b948a903e8c8dd7e7679264e64d0700df3cce3e2ae0973da7cef567874001f17dffe8a4520fd7e
 MISC metadata.xml 724 BLAKE2B eef5aec875f01dd70593862399d3edf26de9c9ae97848226017ea3e1f3c5834c57b1d59985d2d573196f79446971307751187adfed55c664aabc4908f93629e3 SHA512 c32578491cc729e4ac0b09e3dab84514356e8f3b03da810b6dcf93b293b8c36b86f9d7ab59ff2c6807866667a1097648c4fef118271f40a0f02f873a6275dd70
diff --git a/media-libs/ptex/files/ptex-2.3.0-cxx11.patch b/media-libs/ptex/files/ptex-2.3.0-cxx11.patch
new file mode 100644
index 000000000000..f0b600091377
--- /dev/null
+++ b/media-libs/ptex/files/ptex-2.3.0-cxx11.patch
@@ -0,0 +1,12 @@
+diff -purN a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt	2016-04-04 18:14:05.000000000 +0100
++++ b/CMakeLists.txt	2017-02-13 22:59:10.000000000 +0000
+@@ -16,7 +16,7 @@ else ()
+ endif ()
+ 
+ if (NOT WIN32)
+-    set(CMAKE_CXX_FLAGS "-std=c++98 -Wall -Wextra -pedantic ${CMAKE_CXX_FLAGS}")
++    set(CMAKE_CXX_FLAGS "-std=c++11 -Wall -Wextra -pedantic ${CMAKE_CXX_FLAGS}")
+ endif ()
+ 
+ if(MSVC)
diff --git a/media-libs/ptex/ptex-2.3.0.ebuild b/media-libs/ptex/ptex-2.3.0.ebuild
new file mode 100644
index 000000000000..b3cec3d387bf
--- /dev/null
+++ b/media-libs/ptex/ptex-2.3.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Per-Face Texture Mapping for Production Rendering"
+HOMEPAGE="http://ptex.us/"
+SRC_URI="https://github.com/wdas/ptex/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+
+RDEPEND="sys-libs/zlib:="
+DEPEND="${RDEPEND}
+	app-doc/doxygen"
+
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/${P}-cxx11.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}/html"
+		-DPTEX_BUILD_STATIC_LIBS=$(usex static-libs)
+	)
+	cmake-utils_src_configure
+}
diff --git a/media-libs/urt/Manifest b/media-libs/urt/Manifest
index 12ebe9646d91..fa55cd617c3a 100644
--- a/media-libs/urt/Manifest
+++ b/media-libs/urt/Manifest
@@ -1,10 +1,14 @@
 AUX gentoo-config 989 BLAKE2B cbf31d5d55ba2e104c2e757baac3d6cc097fe19e4950de41d11a5f61de83ce159b1c6b438bb05824eb1dc04d0cee6f7f001b00abf7cf859fd0df30cf25dda132 SHA512 bfd38aeb08f26b158dd1127c33bc858f5e59cda0b3aecf79d2283391018201b35ccac051309662ae11df46241fc30461923e2d542d4fa2580e3dc6f8c8d91f6d
-AUX urt-3.1b-build-fixes.patch 5182 BLAKE2B e1daff2dae2e82c13cc3c1d15f05a492482684d2a7af8f92af17f5df2039edd8035f325803398ee219f4e20d43bf1396857cd7aa6520d6697ffb059a019bb806 SHA512 0649f89182b7d197e126ea5874be7c531a5396953a56d360d7e8809f9fc1694646dbbcce871893d9015d2e6d62d828d082c045cf2fd68fd9621059fa6fff75fa
-AUX urt-3.1b-compile-updates.patch 3397 BLAKE2B 0cbbce5dfba5bc4025b991754e828c90aeff134216ea609492074b2d94b55c08c3f34ba83e283bf7e7950e708d94136198a9175c74313759e6c7dec9015a3616 SHA512 27f2266983c108d166e8704512beec36a57a14e9f92b226a33195deaf9966ef089e29bd739061a35bcbfc0601e45ab270a654b0f036d23c4e2bdc9607609b683
+AUX urt-3.1b-build-fixes.patch 5158 BLAKE2B 06d7768168d11166c8543f7d3377ae3968520661a5dcf7f0c59f10b20a60dfff67e476aa16273e8d8578bdadaa77dcd7b0e1a951875298fe820f05e9e532c41b SHA512 baa3719b62af4580ca8636052448811c1024f102df11f04c36a1acdd69883877cd793251e8aa23d05db5762989e2544dd25ffad77174da52deaf485532db0770
+AUX urt-3.1b-compile-updates.patch 3441 BLAKE2B f3c09e7bbd8f19c9ebe949c0f030e017e84f7d4ff73d6c5e160e709d63b95dc05be6a8b8ee4ab75027192ff7c8d1850e8e8599ec2f7efc773b9af691bde01677 SHA512 aec58e4065cafeded2de5adb7c679867f7144bfc501d03a9dd8d9d65f8dcf380360f2365a1a117a933882888c17917b76e2aafe72283a363b7ebe29f1b2d698c
+AUX urt-3.1b-implicit-function-declarations.patch 1840 BLAKE2B 00c019eacc36814c0ddf8b709c510538ee2c8829498c37b899b0b107371bb09dc6e098231eab3e3384a825df4a48392d56a5286a74c1a8a409df7eb8f6754070 SHA512 91474bbfa13a9d5249ed8eeafbc3291447f97a39a085cab4b0bccd48658b41bf4e9c534b466a410aa9b91418a7bbc85dcd13a50770313747f8edfe0d00e0e137
+AUX urt-3.1b-librle-toolchain.patch 1491 BLAKE2B 6fcdae4a255cb2ab7ee9dd6a2ad7e5dde6d5b42647029ea892d67e0171c7b299dabe352f0bc920eeb09f617d1840f8c9a7ff0138b9457036853f63f2fb2ac459 SHA512 49dbf6d00e27c1bbd7f25d14427219e55c1c7fb49d209d5c940118113dfb911c57d3ccf8488182e06f9cb34224defe54fc5fa64a1e04f53746e9afd04ce65503
 AUX urt-3.1b-make.patch 2455 BLAKE2B 9709fdbb29f33326f3006d0205cf7885cdf737fb18a9fab0daa98fcf39be3c69de1cb5558416d0b661099511993a1121b53f28ea1a45daff2774f50a3be76afb SHA512 44b4463fb9b63e5a0c9af3f574ff523138117f7e0b5012e4bbd5c7b3119797f812410da7909d22dce914017bc3e704ea830307d63f908b4c508b48fff8d8898a
-AUX urt-3.1b-rle-fixes.patch 5072 BLAKE2B ebaf3c54ccb83fff9884cf80b6fef719ee63379006b89cc2b464d272b550b7f9824d13c739e450eb298a812c6f94934a9c93df8c4fd7f5ce8698198f4d5e5100 SHA512 ea6b5211ff23abd9480b371ef4fb0feb87b759621d8604ec6634c38f3ed66dbc0327e01fc4382f03ae41bf1133e9a21844235f59b15e24072efc5dc7ecacac51
-AUX urt-3.1b-solaris.patch 277 BLAKE2B 6f7541f8f7de18b332c2e0a8189269158ae0a7710c02dde6bef6568cbbe320ff628aafbde37c0672f29a696180264e56ffa2c58a411798d6dbe3b93bc0178f7c SHA512 871ff71abd69473b23e133aa01868803a4c6776828ae80761b4215648605c6b18fee7fb4c6948963bb1705c51476b4de30f89221fe5240aca6f6c90399b439c6
-AUX urt-3.1b-tempfile.patch 593 BLAKE2B eef5868c8499b399dadea82284bb25f0df636cfafe3849d68fbf0821e663122c5944a4fdd30429628551c30e57517f4e1fff907e76c2d63128d1ea70e7210def SHA512 d456b7219a3d7986698f8f4f7b75c6b10c5b4d9fb5ef1491ec3e85e4263832f24514d187f31a5c76c747dd9381cb7a6be94b1c2147153e774c70dec7b5ca1b11
+AUX urt-3.1b-r2-build-fixes.patch 4888 BLAKE2B 0bb2dba64a62429df650652937712a7a51e5839af8565bab393f2d4df9d240e31872aeb7a113af0f85117036dafe600a486d3c7ad3f5debef2f7307c0fb0650a SHA512 698594422160f4f5102f7dd45cab479e981d753d68801862dc90a2c84e174d8bacc08afa650b3a1c54aefd0d73d358830f396cd2a3b682c1bdf3b64bdf922ae3
+AUX urt-3.1b-rle-fixes.patch 5108 BLAKE2B 0aca69e90f54386a654d1a20958239c988b48dd8a5bf1c879d2000df202beaa134a6d1aad538de4f9333e7c78010f27c55e227e332cef2dd232f84c834527d0c SHA512 b5a05d2ee083ee35105346fd7d0aa9e0f36c98f709abaa40e354adf858480c90793cfebfbd0a6214e832454c446828d50baedbc9767e7bc742209c9e86d0b030
+AUX urt-3.1b-solaris.patch 281 BLAKE2B 55cc8b4824624c5b9f6db6ff6e62c841950c222981de896c8c6e9d66a8dbb1cbe5b90e54e3f24b07bea23c508c260e0639720b4103ada81fea3277e06ca63939 SHA512 6403f48e858af2f8a177588e231367c09f8c939fc614198a10e45ca83ec000f9d5baf67681c5a65fe75177d59d34ab10c19c3621ac0eda6382793ed3b6bd8d84
+AUX urt-3.1b-tempfile.patch 597 BLAKE2B 9f032e0b4dab232d4540a5e7043ff73ace2e6fcdc69e0b2ba1ecedc7f2b62902e0dfadaa78a2e1cddf6f0c173767afe36ee20af0a586072472c77d8f7d81212a SHA512 83784725f216d387771698b0f29c6d5b2bd5e79e5f6deb091905bbb87839824314217641df760cfb18ce87c9d58196860a4c9d12f08da6020fc80a2e7d40347f
 DIST urt-3.1b.tar.Z 1016405 BLAKE2B 68742773591e2ae28702efb4286939c4000d32edd93110548abc25ab62bfa85e36354f20de6aa74c805ea1c4c8dfa23219c9e6fb08e1c73d90d2625404583aa1 SHA512 6c9070cd106f1d696d22f862cc1c4e10325fafc7bae51e8bb1fb98f6bf8babe21a133e21b3acc0c11cf1b28a23123c8ee7bb064c9d86301b14a1c217fbe1a12d
 EBUILD urt-3.1b-r1.ebuild 2048 BLAKE2B ebc3ba7771fc3d28fa320bb582a0633967b0f66ddd338894fa2b8cf47094e8b1b445bcb761bd0fff7620c280f45b821f9915a5dabbde8bd9636c542a0a0de3be SHA512 aac4efadbcc839df66b3538fb43c0dd0659bc8f8b3c362a358763a2a911c538993fb7ab7f05eeaf96e2d325df0b977a2271202cb9aa798dfee70924538e05e2a
-MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
+EBUILD urt-3.1b-r3.ebuild 2394 BLAKE2B 0af0c58376306fc5d977988b67948ed7db37ceb19623710ef31a4cabcda5e348c6f40e74dc27707fa39144b6b75e904d0e1b6313da9a0807ada9916821d0c27d SHA512 f5e46847535a3879790470e7d1eabf5095c1beea90e4c6e738a3de86f69f5544fb5138ffdf4fde1f4baaff184c843044f6d5acfb932136f010dd27832773c1e8
+MISC metadata.xml 308 BLAKE2B 6006038e97bc7af97fd7e4c95f87d19d2458452da5ba066df88aff58fd10bf0f29daef641aaf39ec14a102f4e23a0b3be30006a6aed3830322e2f148a13dc5b7 SHA512 1056a163d7f6c3f2e540e6f1b315ea23aa4e9664c14ba51d094e33ab8ac4e3888fc9b049b91e3f2596e9458efe6041a7e2c5c40979171f7fd473fa6994862ffd
diff --git a/media-libs/urt/files/urt-3.1b-build-fixes.patch b/media-libs/urt/files/urt-3.1b-build-fixes.patch
index 28da6b9b66d9..2f801e0c984a 100644
--- a/media-libs/urt/files/urt-3.1b-build-fixes.patch
+++ b/media-libs/urt/files/urt-3.1b-build-fixes.patch
@@ -4,8 +4,8 @@ http://bugs.gentoo.org/107428
 respect user LDFLAGS
 http://bugs.gentoo.org/126872
 
---- urt/lib/makefile.src
-+++ urt/lib/makefile.src
+--- a/lib/makefile.src
++++ b/lib/makefile.src
 @@ -181,8 +181,7 @@
  # Rebuild the library from all the .o files.
  buildlib: $(OBJS)
@@ -16,8 +16,8 @@ http://bugs.gentoo.org/126872
  #ifndef NO_RANLIB
  	ranlib $(LIBNAME)
  #endif
---- urt/tools/clock/makefile.src
-+++ urt/tools/clock/makefile.src
+--- a/tools/clock/makefile.src
++++ b/tools/clock/makefile.src
 @@ -6,7 +6,7 @@ install: rleClock
  	mv rleClock ../rleClock.out
  
@@ -27,8 +27,8 @@ http://bugs.gentoo.org/126872
  
  font.c:font.src makeFont
  	chmod +x makeFont
---- urt/tools/makefile.src
-+++ urt/tools/makefile.src
+--- a/tools/makefile.src
++++ b/tools/makefile.src
 @@ -62,21 +62,21 @@ applymap.out rlebg.out: $(RI)/rle_raw.h
  pyrlib.o: pyrlib.c $(RI)/pyramid.h $(RI)/rle.h $(RI)/rle_config.h
  	$(CC) $(CFLAGS) pyrlib.c -c
@@ -64,8 +64,8 @@ http://bugs.gentoo.org/126872
  	mv $*.new $@
  
  .c.o:
---- urt/cnv/makefile.src
-+++ urt/cnv/makefile.src
+--- a/cnv/makefile.src
++++ b/cnv/makefile.src
 @@ -76,13 +76,13 @@ PBMDIR = 
  # ppmtorle - ppm format to RLE
  # rletoppm - RLE to ppm format
@@ -127,8 +127,8 @@ http://bugs.gentoo.org/126872
  	mv $*.new $@
  
  # Dependency lines.  Make sure to #ifdef them.
---- urt/cnv/rletoabA62/makefile.src
-+++ urt/cnv/rletoabA62/makefile.src
+--- a/cnv/rletoabA62/makefile.src
++++ b/cnv/rletoabA62/makefile.src
 @@ -15,7 +15,7 @@ all		:	$(PGMS)
  # Executables.  The .out will be stripped off in the install action.
  
@@ -138,8 +138,8 @@ http://bugs.gentoo.org/126872
  			  rletoabA62.o rle.o $(LIBS)
  			mv rletoabA62.new rletoabA62.out
  
---- urt/cnv/rletogif/makefile.src
-+++ urt/cnv/rletogif/makefile.src
+--- a/cnv/rletogif/makefile.src
++++ b/cnv/rletogif/makefile.src
 @@ -15,7 +15,7 @@ all:	$(PGMS)
  # The executable.  The ".out" will be stripped off in the install action.
  
diff --git a/media-libs/urt/files/urt-3.1b-compile-updates.patch b/media-libs/urt/files/urt-3.1b-compile-updates.patch
index 105f7c41f6a7..d33f004fe80f 100644
--- a/media-libs/urt/files/urt-3.1b-compile-updates.patch
+++ b/media-libs/urt/files/urt-3.1b-compile-updates.patch
@@ -1,13 +1,13 @@
---- get/getx11/XGetHClrs.c
-+++ get/getx11/XGetHClrs.c
+--- a/get/getx11/XGetHClrs.c
++++ b/get/getx11/XGetHClrs.c
 @@ -1,5 +1,4 @@
  #ifndef XLIBINT_H_NOT_AVAILABLE
 -#include <X11/copyright.h>
  
  /* $XConsortium: XGetHClrs.c,v 11.10 88/09/06 16:07:50 martin Exp $ */
  /* Copyright    Massachusetts Institute of Technology    1986	*/
---- tools/mallocNd.c
-+++ tools/mallocNd.c
+--- a/tools/mallocNd.c
++++ b/tools/mallocNd.c
 @@ -67,7 +67,7 @@
  
  /* Imports */
@@ -17,8 +17,8 @@
  
  /* Forward declarations */
  char *BuildIndirectionTable();
---- tools/into.c
-+++ tools/into.c
+--- a/tools/into.c
++++ b/tools/into.c
 @@ -40,8 +40,8 @@
  static char buf[MAXPATHLEN+1];
  short forceflg;				/* overwrite an unwritable file? */
@@ -39,8 +39,8 @@
  	unlink(buf);
  	exit(1);
      }
---- cnv/tex/dvirle2.c
-+++ cnv/tex/dvirle2.c
+--- a/cnv/tex/dvirle2.c
++++ b/cnv/tex/dvirle2.c
 @@ -55,7 +55,6 @@
  void DumpTopOfBand(), MoveDown(), WriteBuf(), WriteBlanks();
  
@@ -49,8 +49,8 @@
  extern char *optarg;
  extern int optind;
  
---- cnv/wasatchrle.c
-+++ cnv/wasatchrle.c
+--- a/cnv/wasatchrle.c
++++ b/cnv/wasatchrle.c
 @@ -32,7 +32,6 @@
  #include <errno.h>
  #include "rle.h"
@@ -59,8 +59,8 @@
  
  /* "short" in our world is 16 bits.  Beware of swyte-bopping. */
  
---- get/getx11/x11_stuff.c
-+++ get/getx11/x11_stuff.c
+--- a/get/getx11/x11_stuff.c
++++ b/get/getx11/x11_stuff.c
 @@ -155,7 +155,6 @@
  			IPC_CREAT|0777 );
  	    if ( img->shm_img.shmid < 0 )
@@ -77,8 +77,8 @@
  		if ( errno == ENOSPC )
  		{
  		    if ( !no_shared_space )
---- get/qcr/qcr.h
-+++ get/qcr/qcr.h
+--- a/get/qcr/qcr.h
++++ b/get/qcr/qcr.h
 @@ -6,8 +6,6 @@
  #define GREEN 1
  #define BLUE 2
@@ -88,8 +88,8 @@
  /* Command defs for QCR-Z Film Recorder */
  
  /* These are for 8 bit Look Up Tables */
---- get/gettaac.c
-+++ get/gettaac.c
+--- a/get/gettaac.c
++++ b/get/gettaac.c
 @@ -24,6 +24,7 @@
   * Send bug fixes and improvements to:  ksp@maxwell.nde.swri.edu
   */
@@ -106,8 +106,8 @@
       struct  direct     *nameEntry;
       DIR                *dirChan;
       struct  passwd     *pwdEntry;
---- tools/clock/rleClock.c
-+++ tools/clock/rleClock.c
+--- a/tools/clock/rleClock.c
++++ b/tools/clock/rleClock.c
 @@ -598,7 +598,7 @@
      { TRUE,  "-tf", STRING, "Text area format string", 	          (char *)&FormatString }, 
      { FALSE, "-Xm", BOOL,   "Output the alpha channel on RGB",    (char *)&DebugAlpha },
@@ -117,8 +117,8 @@
  };
  
  void
---- tools/to8.c
-+++ tools/to8.c
+--- a/tools/to8.c
++++ b/tools/to8.c
 @@ -175,7 +175,7 @@
  	 * Give it a background color of black, since the real background
  	 * will be dithered anyway.
@@ -128,8 +128,8 @@
  	{
  	    out_hdr.bg_color = (int *)malloc( sizeof( int ) );
  	    RLE_CHECK_ALLOC( cmd_name( argv ), out_hdr.bg_color, 0 );
---- cnv/rletoabA62/rletoabA62.c
-+++ cnv/rletoabA62/rletoabA62.c
+--- a/cnv/rletoabA62/rletoabA62.c
++++ b/cnv/rletoabA62/rletoabA62.c
 @@ -157,7 +157,7 @@
  	exit(1);
      }
diff --git a/media-libs/urt/files/urt-3.1b-implicit-function-declarations.patch b/media-libs/urt/files/urt-3.1b-implicit-function-declarations.patch
new file mode 100644
index 000000000000..4e0e31e660b1
--- /dev/null
+++ b/media-libs/urt/files/urt-3.1b-implicit-function-declarations.patch
@@ -0,0 +1,96 @@
+Fix implicit declaration of functions
+
+--- a/cnv/rletoabA62/rletoabA62.c
++++ b/cnv/rletoabA62/rletoabA62.c
+@@ -42,6 +42,10 @@
+ */
+ 
+ #include <stdio.h>
++#include <stdlib.h>
++#include <unistd.h>
++#include <sys/stat.h>
++#include <fcntl.h>
+ 
+ #ifndef TRUE
+ #define TRUE 1
+--- a/tools/mallocNd.c
++++ b/tools/mallocNd.c
+@@ -67,6 +67,7 @@
+ 
+ /* Imports */
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <string.h>
+ 
+ /* Forward declarations */
+--- a/get/getx11/getx11.h
++++ b/get/getx11/getx11.h
+@@ -29,6 +29,8 @@
+ #include <stdio.h>
+ #include <math.h>
+ #include <ctype.h>
++#include <unistd.h>
++#include <X11/Xlibint.h>
+ #include <X11/X.h>
+ #include <X11/Xlib.h>
+ #include <X11/Xutil.h>
+--- a/tools/into.c
++++ b/tools/into.c
+@@ -27,6 +27,7 @@
+ 
+ #include "rle_config.h"
+ #include <stdio.h>
++#include <unistd.h>
+ #include <errno.h>
+ #include <sys/types.h>
+ #include <sys/param.h>			/* for MAXPATHLEN */
+--- a/tools/rlecat.c
++++ b/tools/rlecat.c
+@@ -15,6 +15,7 @@
+ */
+ 
+ #include <stdio.h>
++#include <unistd.h>
+ #include "rle.h"
+ #include "rle_raw.h"
+ 
+--- a/tools/rleaddcom.c
++++ b/tools/rleaddcom.c
+@@ -26,6 +26,7 @@
+  */
+ 
+ #include <stdio.h>
++#include <unistd.h>
+ #include "rle.h"
+ #include <sys/types.h>
+ #include <sys/param.h>			/* for MAXPATHLEN */
+--- a/tools/rlenoise.c
++++ b/tools/rlenoise.c
+@@ -20,6 +20,7 @@
+  */
+ 
+ #include <stdio.h>
++#include <time.h>
+ #include "rle.h"
+ 
+ /* Change this according the value on your system.  This is a crock. */
+--- a/cnv/rletorla.c
++++ b/cnv/rletorla.c
+@@ -29,6 +29,7 @@
+  * System includes.
+  */
+ #include <stdio.h>
++#include <unistd.h>
+ #include "rlb_header.h"
+ #include "rle.h"
+ 
+--- a/cnv/giftorle.c
++++ b/cnv/giftorle.c
+@@ -22,6 +22,7 @@
+ /* +------------------------------------------------------------------+ */
+ 
+ #include	<stdio.h>
++#include	<unistd.h>
+ #include	"rle.h"
+ 
+ #ifndef lint
diff --git a/media-libs/urt/files/urt-3.1b-librle-toolchain.patch b/media-libs/urt/files/urt-3.1b-librle-toolchain.patch
new file mode 100644
index 000000000000..19c492988a1e
--- /dev/null
+++ b/media-libs/urt/files/urt-3.1b-librle-toolchain.patch
@@ -0,0 +1,60 @@
+--- a/lib/makefile.src
++++ b/lib/makefile.src
+@@ -5,10 +5,6 @@
+ DEST =
+ #endif
+ 
+-#ifndef NO_RANLIB
+-RANLIB = ranlib
+-#endif
+-
+ # If nothing else is specified, default is to build the library.
+ default: buildlib
+ 
+@@ -40,8 +36,8 @@
+ 		echo cp $(LIBNAME) $(DEST)/$(LIBNAME) ; \
+ 		cp $(LIBNAME) $(DEST)/$(LIBNAME) ; \
+ 		if test x$(RANLIB) != x ; then \
+-			echo ranlib $(DEST)/$(LIBNAME) ; \
+-			ranlib $(DEST)/$(LIBNAME) ; \
++			echo $(RANLIB) $(DEST)/$(LIBNAME) ; \
++			$(RANLIB) $(DEST)/$(LIBNAME) ; \
+ 		else \
+ 			true ; \
+ 		fi ; \
+@@ -49,11 +45,11 @@
+ 			echo cp $(LIBNAME) $(DEST)/debug/$(LIBNAME) ; \
+ 			if test x$(RANLIB) != x ; then \
+ 				cp $(LIBNAME) $(DEST)/debug/$(LIBNAME) ; \
+-				echo ranlib $(DEST)/debug/$(LIBNAME) ; \
++				echo $(RANLIB) $(DEST)/debug/$(LIBNAME) ; \
+ 			else \
+ 				true ; \
+ 			fi ; \
+-			ranlib $(DEST)/debug/$(LIBNAME) ; \
++			$(RANLIB) $(DEST)/debug/$(LIBNAME) ; \
+ 		else \
+ 			true ; \
+ 		fi ; \
+@@ -65,13 +61,18 @@
+ # Rebuild the library from all the .o files.
+ buildlib: $(OBJS)
+ 	-rm -f $(LIBNAME)
+-	ar rc $(LIBNAME)
+-	ar q $(LIBNAME) $(OBJS)
++	$(AR) rc $(LIBNAME) $(OBJS)
+ #ifndef NO_RANLIB
+-	ranlib $(LIBNAME)
++	$(RANLIB) $(LIBNAME)
+ #endif
+ 	touch buildlib
+ 
++# Gentoo wants dynamic linking
++buildlibso: $(OBJS)
++	-rm -f $(LIBNAME).so
++	$(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-soname=librle-0.0.0.so $(OBJS) -lm -o librle.so
++	touch buildlibso
++
+ # Clean up installed stuff and binaries
+ pristine: clean
+ 	-@if test $(DEST)X != X ; then \
diff --git a/media-libs/urt/files/urt-3.1b-r2-build-fixes.patch b/media-libs/urt/files/urt-3.1b-r2-build-fixes.patch
new file mode 100644
index 000000000000..0463abec15de
--- /dev/null
+++ b/media-libs/urt/files/urt-3.1b-r2-build-fixes.patch
@@ -0,0 +1,139 @@
+some hosts are more anal about ar usage than others
+http://bugs.gentoo.org/107428
+
+respect user LDFLAGS
+http://bugs.gentoo.org/126872
+
+--- a/tools/clock/makefile.src
++++ b/tools/clock/makefile.src
+@@ -6,7 +6,7 @@ install: rleClock
+ 	mv rleClock ../rleClock.out
+ 
+ rleClock:rleClock.o font.o
+-	${CC} ${CFLAGS} rleClock.o font.o -lm ${LIBS} -o rleClock
++	${CC} ${CFLAGS} ${LDFLAGS} rleClock.o font.o ${LIBS} -o rleClock -lm
+ 
+ font.c:font.src makeFont
+ 	chmod +x makeFont
+--- a/tools/makefile.src
++++ b/tools/makefile.src
+@@ -62,21 +62,21 @@ applymap.out rlebg.out: $(RI)/rle_raw.h
+ pyrlib.o: pyrlib.c $(RI)/pyramid.h $(RI)/rle.h $(RI)/rle_config.h
+ 	$(CC) $(CFLAGS) pyrlib.c -c
+ pyrmask.out: pyrlib.o pyrmask.c $(RI)/pyramid.h
+-	$(CC) $(CFLAGS) -I$(RI) pyrmask.c pyrlib.o $(LIBS) -lm -o pyrmask.new
++	$(CC) $(LDFLAGS) $(CFLAGS) -I$(RI) pyrmask.c pyrlib.o $(LIBS) -lm -o pyrmask.new
+ 	mv pyrmask.new pyrmask.out
+ 
+ fant.out: fant.o mallocNd.o
+-	$(CC) $(CFLAGS) -I$(RI) fant.o mallocNd.o $(LIBS) -lm -o fant.new
++	$(CC) $(LDFLAGS) $(CFLAGS) -I$(RI) fant.o mallocNd.o $(LIBS) -lm -o fant.new
+ 	mv fant.new fant.out
+ 	
+ # rlebox and crop use some common code.
+ rle_box.o: $(RI)/rle.h $(RI)/rle_config.h $(RI)/rle_raw.h
+ 
+ crop.out: crop.c rle_box.o
+-	${CC} ${CFLAGS} crop.c rle_box.o ${LIBS} -o crop.new
++	${CC} ${LDFLAGS} ${CFLAGS} crop.c rle_box.o ${LIBS} -o crop.new
+ 	mv crop.new crop.out
+ rlebox.out: rlebox.c rle_box.o
+-	${CC} ${CFLAGS} rlebox.c rle_box.o ${LIBS} -o rlebox.new
++	${CC} ${LDFLAGS} ${CFLAGS} rlebox.c rle_box.o ${LIBS} -o rlebox.new
+ 	mv rlebox.new rlebox.out
+ 
+ # rleClock has it's own directory, must be built special
+@@ -100,7 +100,7 @@ clean:	clean-pgm
+ .SUFFIXES:
+ .SUFFIXES: .out .c .o
+ .c.out:
+-	$(CC) $(CFLAGS) $< $(LIBS) -lm -o $*.new
++	$(CC) $(LDFLAGS) $(CFLAGS) $< $(LIBS) -lm -o $*.new
+ 	mv $*.new $@
+ 
+ .c.o:
+--- a/cnv/makefile.src
++++ b/cnv/makefile.src
+@@ -76,13 +76,13 @@ PBMDIR = 
+ # ppmtorle - ppm format to RLE
+ # rletoppm - RLE to ppm format
+ pgmtorle.out: pgmtorle.c
+-	$(CC) $(CFLAGS) $(INCPBMPLUS) $*.c $(LIBS) $(LIBPBMPLUS) -o $*.new
++	$(CC) $(CFLAGS) $(LDFLAGS) $(INCPBMPLUS) $*.c $(LIBS) $(LIBPBMPLUS) -o $*.new
+ 	mv $*.new $@
+ ppmtorle.out: ppmtorle.c
+-	$(CC) $(CFLAGS) $(INCPBMPLUS) $*.c $(LIBS) $(LIBPBMPLUS) -o $*.new
++	$(CC) $(CFLAGS) $(LDFLAGS) $(INCPBMPLUS) $*.c $(LIBS) $(LIBPBMPLUS) -o $*.new
+ 	mv $*.new $@
+ rletoppm.out: rletoppm.c
+-	$(CC) $(CFLAGS) $(INCPBMPLUS) $*.c $(LIBS) $(LIBPBMPLUS) -o $*.new
++	$(CC) $(CFLAGS) $(LDFLAGS) $(INCPBMPLUS) $*.c $(LIBS) $(LIBPBMPLUS) -o $*.new
+ 	mv $*.new $@
+ #endif
+ 
+@@ -95,10 +95,10 @@ rletoppm.out: rletoppm.c
+ # iristorle/rletoiris - Convert between RLE and SGI image format.
+ #
+ iristorle.out: iristorle.c
+-	$(CC) $(CFLAGS) -I/usr/include/gl $*.c $(LIBS) -limage -o $*.new
++	$(CC) $(CFLAGS) $(LDFLAGS) -I/usr/include/gl $*.c $(LIBS) -limage -o $*.new
+ 	mv $*.new $@
+ rletoiris.out: rletoiris.c
+-	$(CC) $(CFLAGS) -I/usr/include/gl $*.c $(LIBS) -limage -o $*.new
++	$(CC) $(CFLAGS) $(LDFLAGS) -I/usr/include/gl $*.c $(LIBS) -limage -o $*.new
+ 	mv $*.new $@
+ #endif
+ 
+@@ -108,10 +108,10 @@ TIFFDIR =
+ # tifftorle - Convert TIFF images to RLE
+ # rletotiff - Convert RLE images to TIFF
+ rletotiff.out: rletotiff.c
+-	$(CC) $(CFLAGS) $(INCTIFF) $*.c $(LIBS) $(LIBTIFF) -lm -o $*.new
++	$(CC) $(CFLAGS) $(LDFLAGS) $(INCTIFF) $*.c $(LIBS) $(LIBTIFF) -lm -o $*.new
+ 	mv $*.new $@
+ tifftorle.out: tifftorle.c
+-	$(CC) $(CFLAGS) $(INCTIFF) $*.c $(LIBS) $(LIBTIFF) -lm -o $*.new
++	$(CC) $(CFLAGS) $(LDFLAGS) $(INCTIFF) $*.c $(LIBS) $(LIBTIFF) -lm -o $*.new
+ 	mv $*.new $@
+ #endif
+ 
+@@ -125,7 +125,7 @@ tifftorle.out: tifftorle.c
+ # Will build with the default rule.
+ # rletorla - RLE to Wavefront RLA
+ rletorla.out: rletorla.c
+-	$(CC) $(CFLAGS) $*.c $(LIBS) $(LIBWAVEFRONT) -lm -o $*.new
++	$(CC) $(CFLAGS) $(LDFLAGS) $*.c $(LIBS) $(LIBWAVEFRONT) -lm -o $*.new
+ 	mv $*.new $@
+ #endif WAVEFRONT
+ 
+@@ -144,7 +144,7 @@ pristine: pristine-pgm
+ .SUFFIXES:
+ .SUFFIXES: .out .c
+ .c.out:
+-	$(CC) $(CFLAGS) $*.c $(LIBS) -lm -o $*.new
++	$(CC) $(CFLAGS) $(LDFLAGS) $*.c $(LIBS) -lm -o $*.new
+ 	mv $*.new $@
+ 
+ # Dependency lines.  Make sure to #ifdef them.
+--- a/cnv/rletoabA62/makefile.src
++++ b/cnv/rletoabA62/makefile.src
+@@ -15,7 +15,7 @@ all		:	$(PGMS)
+ # Executables.  The .out will be stripped off in the install action.
+ 
+ rletoabA62.out	:	rletoabA62.o rle.o
+-			$(CC) $(CFLAGS) -o rletoabA62.new \
++			$(CC) $(CFLAGS) $(LDFLAGS) -o rletoabA62.new \
+ 			  rletoabA62.o rle.o $(LIBS)
+ 			mv rletoabA62.new rletoabA62.out
+ 
+--- a/cnv/rletogif/makefile.src
++++ b/cnv/rletogif/makefile.src
+@@ -15,7 +15,7 @@ all:	$(PGMS)
+ # The executable.  The ".out" will be stripped off in the install action.
+ 
+ rletogif.out: ${OBJ}
+-	${CC} ${CFLAGS} ${OBJ} ${LIBS} -o rletogif.new
++	${CC} ${CFLAGS} ${LDFLAGS} ${OBJ} ${LIBS} -o rletogif.new
+ 	mv rletogif.new rletogif.out
+ 
+ # Incremental install, copies executable to DEST dir.
diff --git a/media-libs/urt/files/urt-3.1b-rle-fixes.patch b/media-libs/urt/files/urt-3.1b-rle-fixes.patch
index 3720806960fe..b892f0acdeee 100644
--- a/media-libs/urt/files/urt-3.1b-rle-fixes.patch
+++ b/media-libs/urt/files/urt-3.1b-rle-fixes.patch
@@ -1,7 +1,7 @@
 Fixes taken from netpbm
 
---- lib/rle_global.c
-+++ lib/rle_global.c
+--- a/lib/rle_global.c
++++ b/lib/rle_global.c
 @@ -76,7 +76,7 @@ rle_hdr rle_dflt_hdr = {
      8,				/* cmaplen (log2 of length of color map) */
      NULL,			/* pointer to color map */
@@ -11,8 +11,8 @@ Fixes taken from netpbm
      { 7 },			/* RGB channels only */
      0L,				/* Can't free name and file fields. */
      "Urt",			/* Default "program name". */
---- lib/rle_hdr.c
-+++ lib/rle_hdr.c
+--- a/lib/rle_hdr.c
++++ b/lib/rle_hdr.c
 @@ -269,6 +273,9 @@
  {
      rle_hdr *ret_hdr;
@@ -23,8 +23,8 @@ Fixes taken from netpbm
      if ( the_hdr == &rle_dflt_hdr )
  	return the_hdr;
  
---- lib/dither.c
-+++ lib/dither.c
+--- a/lib/dither.c
++++ b/lib/dither.c
 @@ -38,10 +38,10 @@ void	make_square();
  #endif
  
@@ -40,8 +40,8 @@ Fixes taken from netpbm
  };
  
  /* basic dithering macro */
---- lib/rle_open_f.c
-+++ lib/rle_open_f.c
+--- a/lib/rle_open_f.c
++++ b/lib/rle_open_f.c
 @@ -9,7 +9,11 @@
   */
  
@@ -62,8 +62,8 @@ Fixes taken from netpbm
  
      /* Check args. */
      if ( *mode != 'r' && *mode != 'w' )
---- lib/rle_getcom.c
-+++ lib/rle_getcom.c
+--- a/lib/rle_getcom.c
++++ b/lib/rle_getcom.c
 @@ -53,11 +53,12 @@
  {
      for ( ; *n != '\0' && *n != '=' && *n == *v; n++, v++ )
@@ -78,8 +78,8 @@ Fixes taken from netpbm
  
      return NULL;
  }
---- lib/scanargs.c
-+++ lib/scanargs.c
+--- a/lib/scanargs.c
++++ b/lib/scanargs.c
 @@ -128,10 +130,10 @@
  va_list argl;
  {
@@ -124,8 +124,8 @@ Fixes taken from netpbm
  				    if (typchr == 'N')
  					tmpflg = toupper( tmpflg );
  
---- lib/inv_cmap.c
-+++ lib/inv_cmap.c
+--- a/lib/inv_cmap.c
++++ b/lib/inv_cmap.c
 @@ -42,7 +42,7 @@
  static long cbinc, cginc, crinc;
  static unsigned long *gdp, *rdp, *cdp;
@@ -135,8 +135,8 @@ Fixes taken from netpbm
  static long x, xsqr, colormax;
  static int cindex;
  #ifdef INSTRUMENT_IT
---- lib/rle_getrow.c
-+++ lib/rle_getrow.c
+--- a/lib/rle_getrow.c
++++ b/lib/rle_getrow.c
 @@ -351,7 +351,7 @@
  	    bzero( (char *)scanline[-1] + the_hdr->xmin,
  		   the_hdr->xmax - the_hdr->xmin + 1 );
@@ -185,8 +185,8 @@ Fixes taken from netpbm
  	    if ( RLE_BIT( *the_hdr, channel ) )
  	    {
  		/* Don't fill past end of scanline! */
---- lib/rle_putcom.c
-+++ lib/rle_putcom.c
+--- a/lib/rle_putcom.c
++++ b/lib/rle_putcom.c
 @@ -53,11 +53,12 @@
  {
      for ( ; *n != '\0' && *n != '=' && *n == *v; n++, v++ )
diff --git a/media-libs/urt/files/urt-3.1b-solaris.patch b/media-libs/urt/files/urt-3.1b-solaris.patch
index c1775d7e9783..739b937d8903 100644
--- a/media-libs/urt/files/urt-3.1b-solaris.patch
+++ b/media-libs/urt/files/urt-3.1b-solaris.patch
@@ -2,8 +2,8 @@ usage of errno requires errno.h
 
 Fabian Groffen <grobian@gentoo.org>
 
---- get/getx11/x11_stuff.c
-+++ get/getx11/x11_stuff.c
+--- a/get/getx11/x11_stuff.c
++++ b/get/getx11/x11_stuff.c
 @@ -42,6 +42,7 @@
  #ifdef X_SHARED_MEMORY
  #include <sys/errno.h>
diff --git a/media-libs/urt/files/urt-3.1b-tempfile.patch b/media-libs/urt/files/urt-3.1b-tempfile.patch
index 12acce151b5d..8be2793ed71c 100644
--- a/media-libs/urt/files/urt-3.1b-tempfile.patch
+++ b/media-libs/urt/files/urt-3.1b-tempfile.patch
@@ -1,5 +1,5 @@
---- tools/rlecat.c
-+++ tools/rlecat.c
+--- a/tools/rlecat.c
++++ b/tools/rlecat.c
 @@ -110,8 +110,14 @@
  	    nflag = 0;		/* Not really repeating! */
  	else
diff --git a/media-libs/urt/metadata.xml b/media-libs/urt/metadata.xml
index 19bf1be2581e..86d48d06885f 100644
--- a/media-libs/urt/metadata.xml
+++ b/media-libs/urt/metadata.xml
@@ -5,4 +5,7 @@
 	<email>graphics@gentoo.org</email>
 	<name>Gentoo Graphics Project</name>
 </maintainer>
+<use>
+<flag name='tools'>Install tools</flag>
+</use>
 </pkgmetadata>
diff --git a/media-libs/urt/urt-3.1b-r3.ebuild b/media-libs/urt/urt-3.1b-r3.ebuild
new file mode 100644
index 000000000000..d17db2efb3d0
--- /dev/null
+++ b/media-libs/urt/urt-3.1b-r3.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="the Utah Raster Toolkit is a library for dealing with raster images"
+HOMEPAGE="http://www.cs.utah.edu/gdc/projects/urt/"
+SRC_URI="ftp://ftp.iastate.edu/pub/utah-raster/${P}.tar.Z"
+
+LICENSE="URT gif? ( free-noncomm )"
+SLOT="0/3.1b-r2"
+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 ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="gif postscript static-libs tiff tools X"
+
+RDEPEND="
+	X? ( x11-libs/libXext )
+	gif? ( media-libs/giflib )
+	postscript? ( app-text/ghostscript-gpl )
+	tiff? ( media-libs/tiff:= )
+"
+DEPEND="
+	${RDEPEND}
+	X? ( x11-base/xorg-proto )
+"
+
+S=${WORKDIR}
+
+urt_config() {
+	use $1 && echo "#define $2" || echo "##define $2"
+}
+PATCHES=(
+	"${FILESDIR}"/${P}-rle-fixes.patch
+	"${FILESDIR}"/${P}-compile-updates.patch
+	"${FILESDIR}"/${P}-tempfile.patch
+	"${FILESDIR}"/${P}-r2-build-fixes.patch
+	"${FILESDIR}"/${P}-make.patch
+	"${FILESDIR}"/${P}-solaris.patch
+	"${FILESDIR}"/${P}-librle-toolchain.patch
+	"${FILESDIR}"/${P}-implicit-function-declarations.patch
+)
+
+src_prepare() {
+	rm -f bin/README
+
+	default
+
+	# punt bogus manpage #109511
+	rm -f man/man1/template.1
+
+	# stupid OS X declares a stack_t type already #107428
+	sed -i -e 's:stack_t:_urt_stack:g' tools/clock/rleClock.c || die
+
+}
+
+src_configure() {
+	append-cflags -fPIC
+
+	sed -i -e '/^CFLAGS/s: -O : :' makefile.hdr
+
+	cp "${FILESDIR}"/gentoo-config config/gentoo
+	cat >> config/gentoo <<-EOF
+	$(urt_config X X11)
+	$(urt_config postscript POSTSCRIPT)
+	$(urt_config tiff TIFF)
+	ExtraCFLAGS = ${CFLAGS}
+	MFLAGS = ${MAKEOPTS}
+	# prevent circular depend #111455
+	$(has_version media-libs/giflib && urt_config gif GIF)
+	EOF
+
+	./Configure config/gentoo || die "config"
+}
+
+src_compile() {
+	tc-export AR RANLIB
+
+	emake CC=$(tc-getCC) -C lib buildlibso
+	emake CC=$(tc-getCC)
+}
+
+src_install() {
+	mkdir -p man-dest/man{1,3,5}
+	# this just installs it into some local dirs
+	make install || die
+
+	use tools && dobin bin/*
+
+	use static-libs && dolib.a lib/librle.a
+
+	dolib.so lib/librle.so
+	dosym librle.so /usr/$(get_libdir)/librle-0.0.0.so
+
+	insinto /usr/include
+	doins include/rle*.h
+	doman man-dest/man?/*.[135]
+	dodoc *-changes CHANGES* README blurb
+}
diff --git a/media-libs/woff2/Manifest b/media-libs/woff2/Manifest
index b67ced0c167a..8fbd6725289d 100644
--- a/media-libs/woff2/Manifest
+++ b/media-libs/woff2/Manifest
@@ -1,3 +1,3 @@
 DIST woff2-1.0.2.tar.gz 38934 BLAKE2B b4a762cb2377b896147d9ebdae97f17e80bdb94fa8ec1b04e28e9df48c2f3456f83fc548b10a49bbc271bead349348f7582a85c5011f60a9feb4dda84920b6f3 SHA512 c788bba1530aec463e755e901f9342f4b599e3a07f54645fef1dc388ab5d5c30625535e5dd38e9e792e04a640574baa50eeefb6b7338ab403755f4a4e0c3044d
-EBUILD woff2-1.0.2-r1.ebuild 685 BLAKE2B 2b5acec8575f31b7bbfecadd7dea7c0e3ca3582aee14cf36ce4d6e4ee74f2e8e21dfca9b2ccb4b8e6f0c316e847da5eb1779651d7ec7643fc8b71564502310de SHA512 1e196e6cc079159e1baefc571c9f919bce2a3447bdaea6746372fe014eb5c9decc7f0320e0007eb9d21984703298c6c59e11691ce2698ea4877a97d72b890147
+EBUILD woff2-1.0.2-r1.ebuild 709 BLAKE2B 6babc6d9aa6ee5e021d95456a504f907dd7c50b505d01fcf1bf53007390b17993ea6cc618a21372314fcfddbe7b1a11ffd1b16cd3a029c24fd2cd9947b2b5e35 SHA512 c3abde69ae674ee037b60f59f8d229720d4232af94a14be453bec1ae744e8c5fe402fe52bc1115d3041f81ae616c50268792746746e002cf24dfdb511d588962
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-libs/woff2/woff2-1.0.2-r1.ebuild b/media-libs/woff2/woff2-1.0.2-r1.ebuild
index da2442b94f67..2644f825a78e 100644
--- a/media-libs/woff2/woff2-1.0.2-r1.ebuild
+++ b/media-libs/woff2/woff2-1.0.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
 IUSE=""
 
 RDEPEND="app-arch/brotli"
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index b5961779df79..9cbbb1c88470 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1,5 +1,5 @@
 AUX xine-lib-1.2.6-imagemagick7.patch 384 BLAKE2B 876c66e9e06b8f2437b1ec9945d4f1cf09efe1e57774280af501abf1a4214785dc875d6ca68515d48ebad37a90184b2db922034705df83592e1479741f15e726 SHA512 13badc72163f41a14fa85d84cbc835a396ab2bc195125025962257de4a41925e29c74159c3941472334f9eb10feee4278ea96288201689d5fcc48c494940ceb9
 DIST xine-lib-1.2.9.tar.xz 5180452 BLAKE2B 43d977d31bf2fcabd896c806e56d5cd12cf579951a4e0df5451df7323fb43cff2770fb2bf1b65b9041e761ec9e9e68d55f761e18522c787aa643f71bb73bd0b7 SHA512 bc672b32d6d72e6fa5641319e0bd15d721ea4b65e6d025e3cdbf6ba3655a7b2c714809d919a53fca8a908a7ce37541a341c13dd8a336799c2e942d5f86b84d3c
-EBUILD xine-lib-1.2.9-r1.ebuild 5465 BLAKE2B 228635a52f9a391bfdefab38040eed72941bf7d3a01d5169fec82eab24c8ba1788856bda2c8c2746fd8143863d5df5da575035dc01b091c50f3d69d05e1eaaf5 SHA512 7bebed6e02042ecb0a22ad8fd73ecb42a7b38e84ef61d5cdd84264437121e86201404975e6a877aa234a2f7dfd755bf529a4a1b45d9ace33fcb30b003f49ee60
-EBUILD xine-lib-1.2.9999.ebuild 5353 BLAKE2B cd2702c8604e9b9ec7cb0eba1df213df2860ae2a7f6a5404cd10ec20b819433e5fa6bfb45ce3f987c9323a44e71005c29008c12bad1c0711e03853b700c70412 SHA512 287424631d94d2f05e50bba16b53069a00aa28ae205e2b46514e8d4aea6800748c0710bc1755c0d8d007be3ab3af4ecafca537c9f9ead7c063ebce3168fe3b34
-MISC metadata.xml 2668 BLAKE2B 64956b27b10284478ae15509a1aa4a1408104c1e98263ac7e1ea376cbb8e596f532e049f4b3381c51f86d4cd4187784be6ad481177ffc62aef0964c90094d6b1 SHA512 17263da5cdc28752dc9344b9806665d236d8a5d3ccad7b19209912a3510b17c9d6587fd1aa847e509a3c4accd53cc96c7d1fc476f6adf9aa63c90b7eed45183b
+EBUILD xine-lib-1.2.9-r2.ebuild 5355 BLAKE2B 51850a735106de45ee02196dfffb877808a8990762123a3a359bba173426d9bec09385899fcb356cbfac9a542ce029208b23575a18d56c6320dd14e6a8c089fc SHA512 4cc3a1c26122fbfbe7413e8594ce82ace1e0d15585e7e6f1b43dff548cdaa3e9ef0cf42d23fa362d8a30a599e8e6b560d918aec3b07734b2c82d617ece5073a5
+EBUILD xine-lib-1.2.9999.ebuild 5243 BLAKE2B 8888c9919af784852b6559444a68a9893bda5c12eca5b930f026231c686eb8aba342345e5848c40ae73f4a138bd1c43194290f07df15927f992da0f09fab022f SHA512 9501d294ecb056060f1cbc9b3367ab48ca56e30bd3448f13027ec51764a707a70db707852587a68a29896fffd302e00cc22c602436e90a049f3d3a161bedbf66
+MISC metadata.xml 2580 BLAKE2B 15f578e1434e0e507eee410a4e28cb87528998e6041569dbfbd65858829697e234987ec773dcb2328ea4dfd56b3992cf92ff1f185dd08d68605f2e10f950ba56 SHA512 85e34bb9a10120c27e144cfc56b9a4f5aa26f29593d0bc6382741549b75e0a8cb0192bdb3960b3482cecc49cd9d0ea3d65a5b30183b0fceb222ac635d1a236a8
diff --git a/media-libs/xine-lib/metadata.xml b/media-libs/xine-lib/metadata.xml
index 9d10869197e7..18cafd445906 100644
--- a/media-libs/xine-lib/metadata.xml
+++ b/media-libs/xine-lib/metadata.xml
@@ -18,9 +18,6 @@
 			container (OggFLAC), but might have better support for exotic features like
 			24-bit samples or 96kHz sample rates.
 		</flag>
-		<flag name="fusionsound">
-			Enable support for the Fusion audio sub system
-		</flag>
 		<flag name="gtk">
 			Build the gdkpixbuf-based image decoder plugin.
 		</flag>
diff --git a/media-libs/xine-lib/xine-lib-1.2.9-r1.ebuild b/media-libs/xine-lib/xine-lib-1.2.9-r2.ebuild
index 8b7764e24710..ffafb74e6957 100644
--- a/media-libs/xine-lib/xine-lib-1.2.9-r1.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.9-r2.ebuild
@@ -3,10 +3,10 @@
 
 EAPI=6
 
-inherit flag-o-matic libtool multilib
+inherit flag-o-matic libtool
 
 if [[ ${PV} == *9999* ]]; then
-	EHG_REPO_URI="http://hg.debian.org/hg/xine-lib/xine-lib-1.2"
+	EHG_REPO_URI="http://hg.code.sf.net/p/xine/xine-lib-1.2"
 	inherit autotools mercurial
 	unset NLS_IUSE
 	NLS_DEPEND="sys-devel/gettext"
@@ -24,12 +24,12 @@ HOMEPAGE="http://xine.sourceforge.net/"
 
 LICENSE="GPL-2"
 SLOT="1"
-IUSE="a52 aac aalib +alsa altivec bluray +css dts dvb dxr3 fbcon flac fusionsound gtk imagemagick ipv6 jack jpeg libav libcaca mad +mmap mng modplug musepack opengl oss pulseaudio samba sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack +X +xcb xinerama +xv xvmc ${NLS_IUSE}"
+IUSE="a52 aac aalib +alsa altivec bluray +css dts dvb dxr3 fbcon flac gtk imagemagick ipv6 jack jpeg libav libcaca mad +mmap mng modplug musepack opengl oss pulseaudio samba sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack +X +xcb xinerama +xv xvmc ${NLS_IUSE}"
 
 RDEPEND="${NLS_RDEPEND}
 	dev-libs/libxdg-basedir
 	media-libs/libdvdnav
-	sys-libs/zlib
+	sys-libs/zlib:=
 	virtual/libiconv
 	a52? ( media-libs/a52dec )
 	aac? ( media-libs/faad2 )
@@ -40,78 +40,81 @@ RDEPEND="${NLS_RDEPEND}
 	dts? ( media-libs/libdca )
 	dxr3? ( media-libs/libfame )
 	flac? ( media-libs/flac )
-	fusionsound? ( >=dev-libs/DirectFB-1.7.1[fusionsound] )
 	gtk? ( x11-libs/gdk-pixbuf:2 )
 	imagemagick? ( virtual/imagemagick-tools )
-	jack? ( >=media-sound/jack-audio-connection-kit-0.100 )
+	jack? ( virtual/jack )
 	jpeg? ( virtual/jpeg:0 )
 	!libav? ( media-video/ffmpeg:0= )
 	libav? (
 		media-libs/libpostproc:0=
 		media-video/libav:0=
-		)
+	)
 	libcaca? ( media-libs/libcaca )
 	mad? ( media-libs/libmad )
-	mng? ( media-libs/libmng )
+	mng? ( media-libs/libmng:= )
 	modplug? ( >=media-libs/libmodplug-0.8.8.1 )
 	musepack? ( >=media-sound/musepack-tools-444 )
 	opengl? (
 		virtual/glu
 		virtual/opengl
-		)
+	)
 	pulseaudio? ( media-sound/pulseaudio )
 	samba? ( net-fs/samba )
 	sdl? ( media-libs/libsdl )
 	speex? (
 		media-libs/libogg
 		media-libs/speex
-		)
+	)
 	theora? (
 		media-libs/libogg
 		media-libs/libtheora
-		)
+	)
 	truetype? (
 		media-libs/fontconfig
 		media-libs/freetype:2
-		)
+	)
 	v4l? ( media-libs/libv4l )
 	vaapi? ( x11-libs/libva:0=[X,opengl] )
 	vcd? (
 		>=media-video/vcdimager-0.7.23
 		dev-libs/libcdio:0=[-minimal]
-		)
+	)
 	vdpau? ( x11-libs/libvdpau )
 	vorbis? (
 		media-libs/libogg
 		media-libs/libvorbis
-		)
+	)
 	vpx? ( media-libs/libvpx:0= )
 	wavpack? ( media-sound/wavpack )
 	X? (
 		x11-libs/libX11
 		x11-libs/libXext
-		)
+	)
 	xcb? ( x11-libs/libxcb )
 	xinerama? ( x11-libs/libXinerama )
 	xv? ( x11-libs/libXv )
-	xvmc? ( x11-libs/libXvMC )"
+	xvmc? ( x11-libs/libXvMC )
+"
 DEPEND="${RDEPEND}
 	${NLS_DEPEND}
 	app-arch/xz-utils
-	virtual/pkgconfig
 	>=sys-devel/libtool-2.2.6b
+	virtual/pkgconfig
 	oss? ( virtual/os-headers )
 	v4l? ( virtual/os-headers )
 	X? (
 		x11-base/xorg-proto
 		x11-libs/libXt
-		)
+	)
 	xv? ( x11-base/xorg-proto )
 	xvmc? ( x11-base/xorg-proto )
-	xinerama? ( x11-base/xorg-proto )"
-REQUIRED_USE="vidix? ( || ( X fbcon ) )
+	xinerama? ( x11-base/xorg-proto )
+"
+REQUIRED_USE="
+	vidix? ( || ( X fbcon ) )
 	xv? ( X )
-	xinerama? ( X )"
+	xinerama? ( X )
+"
 
 src_prepare() {
 	default
@@ -156,6 +159,7 @@ src_configure() {
 		--with-w32-path=${win32dir}
 		--with-xv-path=/usr/$(get_libdir)
 		--without-esound
+		--without-fusionsound
 		$(use_enable a52 a52dec)
 		$(use_enable aac faad)
 		$(use_enable aalib)
@@ -190,7 +194,6 @@ src_configure() {
 		$(use_enable vpx)
 		$(use_with alsa)
 		$(use_with flac libflac)
-		$(use_with fusionsound)
 		$(use_with imagemagick)
 		$(use_with jack)
 		$(use_with libcaca caca)
@@ -222,5 +225,5 @@ src_compile() {
 src_install() {
 	default
 	find "${D}" -name '*.la' -delete || die
-	rm -f "${ED}"usr/share/doc/${PF}/COPYING
+	rm -f "${ED}"usr/share/doc/${PF}/COPYING || die
 }
diff --git a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
index 053e16e28383..07cffc7a62f0 100644
--- a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
@@ -3,10 +3,10 @@
 
 EAPI=6
 
-inherit flag-o-matic libtool multilib
+inherit flag-o-matic libtool
 
 if [[ ${PV} == *9999* ]]; then
-	EHG_REPO_URI="http://hg.debian.org/hg/xine-lib/xine-lib-1.2"
+	EHG_REPO_URI="http://hg.code.sf.net/p/xine/xine-lib-1.2"
 	inherit autotools mercurial
 	unset NLS_IUSE
 	NLS_DEPEND="sys-devel/gettext"
@@ -24,12 +24,12 @@ HOMEPAGE="http://xine.sourceforge.net/"
 
 LICENSE="GPL-2"
 SLOT="1"
-IUSE="a52 aac aalib +alsa altivec bluray +css dts dvb dxr3 fbcon flac fusionsound gtk imagemagick ipv6 jack jpeg libav libcaca mad +mmap mng modplug musepack opengl oss pulseaudio samba sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack +X +xcb xinerama +xv xvmc ${NLS_IUSE}"
+IUSE="a52 aac aalib +alsa altivec bluray +css dts dvb dxr3 fbcon flac gtk imagemagick ipv6 jack jpeg libav libcaca mad +mmap mng modplug musepack opengl oss pulseaudio samba sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack +X +xcb xinerama +xv xvmc ${NLS_IUSE}"
 
 RDEPEND="${NLS_RDEPEND}
 	dev-libs/libxdg-basedir
 	media-libs/libdvdnav
-	sys-libs/zlib
+	sys-libs/zlib:=
 	virtual/libiconv
 	a52? ( media-libs/a52dec )
 	aac? ( media-libs/faad2 )
@@ -40,78 +40,81 @@ RDEPEND="${NLS_RDEPEND}
 	dts? ( media-libs/libdca )
 	dxr3? ( media-libs/libfame )
 	flac? ( media-libs/flac )
-	fusionsound? ( >=dev-libs/DirectFB-1.7.1[fusionsound] )
 	gtk? ( x11-libs/gdk-pixbuf:2 )
 	imagemagick? ( virtual/imagemagick-tools )
-	jack? ( >=media-sound/jack-audio-connection-kit-0.100 )
+	jack? ( virtual/jack )
 	jpeg? ( virtual/jpeg:0 )
 	!libav? ( media-video/ffmpeg:0= )
 	libav? (
 		media-libs/libpostproc:0=
 		media-video/libav:0=
-		)
+	)
 	libcaca? ( media-libs/libcaca )
 	mad? ( media-libs/libmad )
-	mng? ( media-libs/libmng )
+	mng? ( media-libs/libmng:= )
 	modplug? ( >=media-libs/libmodplug-0.8.8.1 )
 	musepack? ( >=media-sound/musepack-tools-444 )
 	opengl? (
 		virtual/glu
 		virtual/opengl
-		)
+	)
 	pulseaudio? ( media-sound/pulseaudio )
 	samba? ( net-fs/samba )
 	sdl? ( media-libs/libsdl )
 	speex? (
 		media-libs/libogg
 		media-libs/speex
-		)
+	)
 	theora? (
 		media-libs/libogg
 		media-libs/libtheora
-		)
+	)
 	truetype? (
 		media-libs/fontconfig
 		media-libs/freetype:2
-		)
+	)
 	v4l? ( media-libs/libv4l )
 	vaapi? ( x11-libs/libva:0=[X,opengl] )
 	vcd? (
 		>=media-video/vcdimager-0.7.23
 		dev-libs/libcdio:0=[-minimal]
-		)
+	)
 	vdpau? ( x11-libs/libvdpau )
 	vorbis? (
 		media-libs/libogg
 		media-libs/libvorbis
-		)
+	)
 	vpx? ( media-libs/libvpx:0= )
 	wavpack? ( media-sound/wavpack )
 	X? (
 		x11-libs/libX11
 		x11-libs/libXext
-		)
+	)
 	xcb? ( x11-libs/libxcb )
 	xinerama? ( x11-libs/libXinerama )
 	xv? ( x11-libs/libXv )
-	xvmc? ( x11-libs/libXvMC )"
+	xvmc? ( x11-libs/libXvMC )
+"
 DEPEND="${RDEPEND}
 	${NLS_DEPEND}
 	app-arch/xz-utils
-	virtual/pkgconfig
 	>=sys-devel/libtool-2.2.6b
+	virtual/pkgconfig
 	oss? ( virtual/os-headers )
 	v4l? ( virtual/os-headers )
 	X? (
 		x11-base/xorg-proto
 		x11-libs/libXt
-		)
+	)
 	xv? ( x11-base/xorg-proto )
 	xvmc? ( x11-base/xorg-proto )
-	xinerama? ( x11-base/xorg-proto )"
-REQUIRED_USE="vidix? ( || ( X fbcon ) )
+	xinerama? ( x11-base/xorg-proto )
+"
+REQUIRED_USE="
+	vidix? ( || ( X fbcon ) )
 	xv? ( X )
-	xinerama? ( X )"
+	xinerama? ( X )
+"
 
 src_prepare() {
 	default
@@ -152,6 +155,7 @@ src_configure() {
 		--with-w32-path=${win32dir}
 		--with-xv-path=/usr/$(get_libdir)
 		--without-esound
+		--without-fusionsound
 		$(use_enable a52 a52dec)
 		$(use_enable aac faad)
 		$(use_enable aalib)
@@ -186,7 +190,6 @@ src_configure() {
 		$(use_enable vpx)
 		$(use_with alsa)
 		$(use_with flac libflac)
-		$(use_with fusionsound)
 		$(use_with imagemagick)
 		$(use_with jack)
 		$(use_with libcaca caca)
@@ -218,5 +221,5 @@ src_compile() {
 src_install() {
 	default
 	find "${D}" -name '*.la' -delete || die
-	rm -f "${ED}"usr/share/doc/${PF}/COPYING
+	rm -f "${ED}"usr/share/doc/${PF}/COPYING || die
 }
author	V3n3RiX <venerix@redcorelinux.org>	2018-08-25 07:36:27 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-08-25 07:36:27 +0100
commit	43793fab84041cfc5c60c0151d1591b8a69fb24a (patch)
tree	6208a7f4fc744684fce0f55acbb47511acace498 /media-libs
parent	28e3d252dc8ac8a5635206dfefe1cfe05058d1db (diff)