gentoo resync : 16.06.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-06-16 21:23:20 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-06-16 21:23:20 +0100
commit: fab849d1daed0ba7f2ac497d07985c3dbb692543 (patch)
tree: 10baa743a5340b42ad538dd19d48669ccac209b1 /media-libs
parent: 73c318acdaf6f8309d68bd266051e6dd1f1bd787 (diff)
113 files changed, 686 insertions, 7164 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 7b19d79f1e81..5549cd8a1d88 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/allegro/Manifest b/media-libs/allegro/Manifest
index 005969f3b24e..2c4d532ae1ea 100644
--- a/media-libs/allegro/Manifest
+++ b/media-libs/allegro/Manifest
@@ -4,14 +4,10 @@ AUX allegro-4.4.2-glibc228.patch 1586 BLAKE2B e25f3f34a6a980b1a2067daec2cfaba49b
 AUX allegro-4.4.2-rpath.patch 182 BLAKE2B c6bae5a2ca5cd77022bf07690c5eb4d5b78f442f5951098bb30b036e37c0272fea6955908df73fdacef2e5f8698ae57a99dd73de32a056a9580a0e808a8f54f0 SHA512 6e262dc9dac274bdcbeeb2cf54b1c073a69db4a4abeb720caf5c58cb1d692286300c93fd9b7d3cea2f01aea4aeed33a34cb9e585a58ab083685c5f8c937c6536
 AUX allegro-4.4.2-shared.patch 247 BLAKE2B d5bada972b4c2555f9ad9da18b30b224f5aa70762d6d68883601df933cc44788b6e5a78289d0bde863f788b65cf583ea828ffb6455d03d1d7493b00ff6c40b77 SHA512 5b982f857197dd9256bb1a151b544484b0178fa8e90d6b876bf2d26ea37c6e6bf6f44d1b729f9d2ccd11899024dccc2afbfbbfb73b816cb17e97dc3eb4df51e5
 AUX allegro-4.4.2-underlink.patch 456 BLAKE2B ede5f9e5195b1c54460f584924afd9daa64c795a0e083499084c7377f1989bc0df621339ff3988bc2a997447050ebf3fe0f5055fbcef8ee21dd66dfdf1ca003a SHA512 0e873aa6d1b6e72e2e4b46276f0a2a4ffe816c8d0b6a10dd9462cfed826b40d7b3461ebe51e595e9f2e7a5d2f19fd261b1ad0e05f60b77717224911e59a537d0
-AUX allegro-5.0.11-multilib.patch 340 BLAKE2B 61dd9c6308a1303ec07ec50b4d1ee0ede73a363b988b5b2c7847fb1baf924874aea48ec29a1e099569309a745f0c591a8527b2f458e61b276992dd2d3611a0fd SHA512 4a8d28e3a76a9974af77e9ab1d22c6d3fc3117efd23ab11e50121e4003f4875a75411c0fb7b7ff798a23d91c5a2145224034c71d62fa83e56cf8620de89e91db
-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
 DIST allegro-5.2.4.0.tar.gz 7822903 BLAKE2B 50538e27276fbe1572a660b3f1396bdb9b542dc2aafaa819a4108e0e2771731cb6924cf1d0b7a7bfea1ff5c12b4772ff58dc571c81bb6a601d31a2083f5f9bea SHA512 c5f80191005165331635464ffd345369943d37dcb55345176a7171614e12826b25d9d74ab656333302d6682d404f1b46a5d94c0dd23d7873151e6e488d62c776
 DIST allegro-5.2.5.0.tar.gz 7849326 BLAKE2B 8d8995b9ad252b81c534099ffd91d81bbdcf4a34f7ca7c4fb7dd97e5c075869c212fa68445a5fe479a675d755ad0414976c11cbc112ecdd61f1fa09704957b21 SHA512 c6341396ad7340233c1297ed122095e5c2d129a32da2350b4bb39c4b74f8d56d57ec4e608defec471d63fff51d786f0a9f3844be82f81cdb3d48d5bc49908b12
 EBUILD allegro-4.4.2-r2.ebuild 2586 BLAKE2B 9436548344a878ee11ffdd2fd20c6f7c6f7157ee1c8f73f9d55e376d386fb8fdbaa5a1178c3bfff2e0fecc9c83ec0275b9883935354746277c4ec0970e2090ea SHA512 8ca49bd5e811faa9e707cb0af64c07857286f6af9f962adc97ae33d3c267e996010bd4f3ce76faa99414ce922f6eb6bb123b9671da388019c8109ee6f8805fa0
-EBUILD allegro-5.0.11.ebuild 2397 BLAKE2B 1477ed40dc61ac329d85893dca32fa4d9c805c7dc0254e22fbda6a25c9b84907634bf83a24aebb113fe28f548311b547a60be6a9a54f32560935f2b36927d851 SHA512 a4663c4c33f07b9f5b58ede35e369107d3585b9489150c50c3cc312a6ae61e12e0a023b19208c53c2dea2fbff4fdf285fd7962afa30d6ad1ba5c55b40e760719
 EBUILD allegro-5.2.4.0.ebuild 2704 BLAKE2B 00be6767ea9561888a856b5645d62b50b35d52881cfa39e0914e60bffb55409db6eb9c81280deb14307140527830428eb638221dee672eb545912946b04479a4 SHA512 6ed0efe4520dada386b2bf29b660696606afe69a723f64f699980a103e5a4b3206724dee9f4c6c77e43009146747973880ad96610cf410b6f5c698904d6a61e6
 EBUILD allegro-5.2.5.0.ebuild 2792 BLAKE2B c68cd10374a280e4e230954b1843c3e0c5d5c3854da9c7309bb7ffeaffeae8d8c69938aefb4dd3cec619f3de54da34b3d4b5aeb5a49da9696827cd395591bddd SHA512 d9771f255e1ce41b34c0c880bbcc8fed5ad81101b0beb57b2fa0d27dc648f73450de07376b08e9ccfb1bb2c28e278bfdd2889c1fe815995898b465b693c36d75
 MISC metadata.xml 1034 BLAKE2B c1cdd935feae4561903bde181428ef0d71743f85e7756f507087528641471b4af3d1339758c3d829f8244b5cec7cc74bb7563699b9e5b05146ae4c6abe8dd5af SHA512 21301cc66fe94a4d728900cd5856d3e0d27507b1d340e36246c183b13232cb7f9c9da9f8b20428bd387c7216a892dce169c2bc885caabacb08a32892faffc994
diff --git a/media-libs/allegro/allegro-5.0.11.ebuild b/media-libs/allegro/allegro-5.0.11.ebuild
deleted file mode 100644
index e5d44d7afb74..000000000000
--- a/media-libs/allegro/allegro-5.0.11.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib
-
-DESCRIPTION="A game programming library"
-HOMEPAGE="https://liballeg.org/"
-SRC_URI="mirror://sourceforge/alleg/${P}.tar.gz"
-
-LICENSE="BSD ZLIB"
-SLOT="5"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="alsa dumb flac gtk jpeg openal oss physfs png pulseaudio test truetype vorbis X xinerama"
-
-RDEPEND="
-	>=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}]
-	>=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
-	>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
-	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}] )
-	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}] )
-	xinerama? ( >=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	x11-base/xorg-proto
-"
-
-PATCHES=( "${FILESDIR}"/${P}-{underlink,multilib}.patch )
-
-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_OPENAL=$(usex openal)
-		-DWANT_OSS=$(usex oss)
-		-DWANT_PHYSFS=$(usex physfs)
-		-DWANT_PULSEAUDIO=$(usex pulseaudio)
-		-DWANT_TESTS=$(usex test)
-		-DWANT_TTF=$(usex truetype)
-		-DWANT_VORBIS=$(usex vorbis)
-		-DWANT_NATIVE_DIALOG=$(usex gtk)
-		-DWANT_OPENGL=$(usex X)
-		-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-5.0.11-multilib.patch b/media-libs/allegro/files/allegro-5.0.11-multilib.patch
deleted file mode 100644
index 8cd1dc1037b3..000000000000
--- a/media-libs/allegro/files/allegro-5.0.11-multilib.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/CMakeLists.txt	2013-06-16 10:16:08.000000000 +0600
-+++ b/CMakeLists.txt	2016-02-25 14:32:40.350446191 +0500
-@@ -560,7 +560,6 @@
- endif(SUPPORT_X11 AND NOT SUPPORT_OPENGL)
- 
- if(SUPPORT_X11)
--    set(CMAKE_REQUIRED_LIBRARIES ${X11_LIBRARIES})
- 
-     check_library_exists(Xcursor XcursorImageCreate "" CAN_XCURSOR)
-     if(CAN_XCURSOR)
diff --git a/media-libs/allegro/files/allegro-5.0.11-underlink.patch b/media-libs/allegro/files/allegro-5.0.11-underlink.patch
deleted file mode 100644
index 1e0b502ed3e4..000000000000
--- a/media-libs/allegro/files/allegro-5.0.11-underlink.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt	2011-06-06 23:56:09.367125536 +0200
-+++ b/CMakeLists.txt	2011-06-06 23:56:19.311748807 +0200
-@@ -703,7 +703,7 @@
- 
- if(ALLEGRO_UNIX) # not MACOSX
-     list(APPEND LIBRARY_SOURCES ${ALLEGRO_SRC_UNIX_FILES})
--    list(APPEND PLATFORM_LIBS m ${CMAKE_THREAD_LIBS_INIT})
-+    list(APPEND PLATFORM_LIBS dl m ${CMAKE_THREAD_LIBS_INIT})
- endif(ALLEGRO_UNIX)
- 
- if(SUPPORT_X11)
diff --git a/media-libs/cimg/Manifest b/media-libs/cimg/Manifest
index 404222bc54ce..9fe455ee730a 100644
--- a/media-libs/cimg/Manifest
+++ b/media-libs/cimg/Manifest
@@ -1,5 +1,7 @@
 DIST cimg-2.4.3.tar.gz 11074736 BLAKE2B 097da7f5b214470247296265950061acefec19a169139c65eb12b27ed8e1256b97f77d28deb910bb444f38d396e36c204c761437e8991421422e840fd7505a95 SHA512 3409fde40780d293051914ce988193063139f1f805e5b0205e829234944c76b877a2723dd7c616158bbb58238baf653a03f34d55052103286d3ee28a33136d15
 DIST cimg-2.4.5.tar.gz 11075045 BLAKE2B 6e9b9ccb5aa826526e9f9adbb964296a5f298772b696bad400a432bfd68e4b0048bbbb8591ac225393867aa2f00b708ea48c2858799522edcc2b021f3ba7fa7b SHA512 0a306ba4265a0e68d358e1ca54c597e80b43e72205de161d0971cd5837ca7d48322725d6ec129381e708a1d11fb5697884a5901ac753080fd8d8c08b80b28138
+DIST cimg-2.6.5.tar.gz 11071672 BLAKE2B 61fa37c2f78e09d6aba0eb867c3797f86ed5a685a114dae779e439c76f4cc9768fada70affd2b14139c7fe7b2e79b61e653165abc47833e3a5cf857af0eb4ca4 SHA512 d8c1e10f702b47f6788fedf27681fe8e7ab3994c8018f96d4964694edda6acb1ca040244d7d1436a5381ec5a12e7a2b991ede6d9ea6d961ae6c4842feb2bf141
 EBUILD cimg-2.4.3.ebuild 589 BLAKE2B 91b3c36c716f6e60a9652906cf7ef61bb2aab6ab56d7a40d6bcbccf924aab632886f6acc7d71c6d1ec5c8fc0e1c69d8e4c18258f45eee025f597587f247bb3fd SHA512 a1692a63111073a207c64e7e963af46be35d4b363eaf35f178cbf593391125d53232436a17a1e33426972e135452781887fc74eae68e36b5675c37520018bff3
 EBUILD cimg-2.4.5.ebuild 589 BLAKE2B ba27cc3c33dcecbd207d4a656893daa6cfafa4bf745da82a312075db4c23c7379348e1b37194afec9252c17c887cf342406c9fbc25dfd24119ca6f4b3085ba58 SHA512 1e6aba42be7cc3ce84384e49b2a2e59aafd0d0ffae2f07bed0fcdcc0dc9cd164c28b49f03af07ce15a0bbd25cdea4aee24fee4c4d425e58fac03ffa52b6d335e
+EBUILD cimg-2.6.5.ebuild 589 BLAKE2B ba27cc3c33dcecbd207d4a656893daa6cfafa4bf745da82a312075db4c23c7379348e1b37194afec9252c17c887cf342406c9fbc25dfd24119ca6f4b3085ba58 SHA512 1e6aba42be7cc3ce84384e49b2a2e59aafd0d0ffae2f07bed0fcdcc0dc9cd164c28b49f03af07ce15a0bbd25cdea4aee24fee4c4d425e58fac03ffa52b6d335e
 MISC metadata.xml 386 BLAKE2B f7a15bc91bb1eb327b7a491dcf59b1ebadac6e36560bfbecaa07f7d3b189bfb86df12f1c2214b86cc83e70bce941f44a9424f13865c963ba38e9d992ca89075d SHA512 7273a9131bce0af6a2ae93e4893be6beadf25ed510dd3d32c267ea4400e0524929c49df92627fa3aa83ab539075d3404c7e5a2df77628261253aaced1216d59f
diff --git a/media-libs/cimg/cimg-2.6.5.ebuild b/media-libs/cimg/cimg-2.6.5.ebuild
new file mode 100644
index 000000000000..a3f01bc9ba22
--- /dev/null
+++ b/media-libs/cimg/cimg-2.6.5.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="C++ template image processing toolkit"
+HOMEPAGE="https://cimg.eu/ https://github.com/dtschump/CImg"
+SRC_URI="https://github.com/dtschump/CImg/archive/v.${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="CeCILL-2 CeCILL-C"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples"
+
+S=${WORKDIR}/CImg-v.${PV}
+
+src_install() {
+	doheader CImg.h
+	dodoc README.txt
+
+	use doc && dodoc -r html
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/media-libs/ctl/Manifest b/media-libs/ctl/Manifest
index bf07604fefd6..f4b70b4dfe14 100644
--- a/media-libs/ctl/Manifest
+++ b/media-libs/ctl/Manifest
@@ -1,9 +1,5 @@
-AUX ctl-1.4.1-gcc43.patch 2696 BLAKE2B 628ad07e0a8fdf1677cdf01dc47400ed8e9437b90ec382511686fd5edabf155478a4e23e3b2ef62dd302eaac47cc0b63f16fd528b7a977dc5555c55af0193cf6 SHA512 dfceeb1ab50299c1f8b09e118d28c81307bca5a28691994e4a7e413f8e1e508b4efd06084857dcfcfa7605fa304f312495d354a8d33748858cb77c02ac4933ba
-AUX ctl-1.4.1-gcc47.patch 302 BLAKE2B 8cbf57d3e0068e8527f82f426f7128d66ff096c24ec602ab7630e1c119cc83e8972161f4a0679b75b8ab887e4ffec253dd888125e28209aa50fa15bd282ba488 SHA512 40f2afde912a9d35703b755f569c9d42f8c90f957e1acecea4eed6b55d514fee1252acbf1f229b23e69ea9d5e47c73311e0a293af801af2e61e3981566258c93
 AUX ctl-1.5.2-Use-GNUInstallDirs-and-fix-PkgConfig-files-1.patch 16825 BLAKE2B 4a732a2b461e81016d0d3e165d998b19904fbd9a77af4cc041b29a6c785beaedec109fe33ddcc6cb05c08f3001231b1e832a687dfccf96fbef70c4e517737fb0 SHA512 53df4449eb0acca2f20a42cf9945870e580de3be6be416c52428e300aca1833eda081d6fc17024aa61f1ecd0886098958d187249a9189fb6d1e62c82d0964afb
 AUX ctl-1.5.2-openexr-2.3.patch 455 BLAKE2B b42032d28612bef6f6a3beeda67c6b6a20fb4b99527003acd6a97eceec8286e073b3c6594c92ae99ad559c9d520b9d94fe93ea783e9d6021d81f66b258c3e2f1 SHA512 0e97065c78c6ef5c2a8f657c6c41031f66379483aaf2754f612d69261932a7f6ee1ccd01c5c0b1b450e511aa758a640cacf55629651d5974a92c519f4ff3a25a
-DIST ctl-1.4.1.tar.gz 996923 BLAKE2B 20dba7a3cb93e89ecb656a6ee34b35e1a35c3c4cda63bafe2162de15afca4b8e32f2156a0b1b2268d59bc5923c1687817433c41031be07b810762f9feea36fc8 SHA512 671efbdef287c69b416462d479be58c6cfba331b5b6faa1a694ece162aa2ee966482423babb49c61de3d5046499a81110e4cd30824d9d36a3d6b69068b075063
 DIST ctl-1.5.2.tar.gz 1411871 BLAKE2B 223740aa8b68630f449b65e17470c76b2825a77eead040724b65e9e69752a696f642ae6755116046e188305a7d043c4def7cb8a773ad08d51fba35e9273b3a71 SHA512 c92af23e897f30f96ecb27b4b865e2fe1a1e33c8616797fc18f68e7fcc89210ce8ae70a003169b2f449bfd5f90d192734f1e8038b1d3e03c5f48c81587c871c6
-EBUILD ctl-1.4.1.ebuild 746 BLAKE2B 95436778c6f9687dacc3969eda2530510b401e4c498e41c80b035d7a261caa2daee22f8f5ed5b0941c5b5c36a05d03f49cd6fe0105f811347b347703da753998 SHA512 f4e82d25b87b3704d60cc3701a4dbb91c0eb47716d33444a1fb2cdf5961d2b4e6e4d7b7666c51456bc2b2019f13afbfd3b239e4671085bce5d5723f2fa845802
 EBUILD ctl-1.5.2-r1.ebuild 718 BLAKE2B 45773a3bea5c0c5c82852e3eaf25a7fa3d2139157c00d6bc2c4a0c0435f3e55d703fad300f232909ed0407eed9c57fd30010cee0add96489df905e56f2fdc728 SHA512 aa386fa9c2f9558b71912c46faf03adc7b50753aa2fa856cd2de9bc7ed09cec229c11565721bd65c58d4079aead1e97f67a257074ff8e4a9bec63f453cbc2449
 MISC metadata.xml 297 BLAKE2B 773f2836e68b0405f210dc51fac01e9c40845d34e4d7ed036916af8f8d63bebcd91bbd672bf84e4dac6ab84135915db85914c07a8bdecdb1ce3c3ff1b5f6408b SHA512 e437384a215b9cd38ecc3e4721bb47c6acf9b8c17d6bc348ddb1272b899428cf7835371a3fca39e6b66f49f1760996fccc336bf15f6d4e36783bd12db84afe49
diff --git a/media-libs/ctl/ctl-1.4.1.ebuild b/media-libs/ctl/ctl-1.4.1.ebuild
deleted file mode 100644
index 222c1c5518f3..000000000000
--- a/media-libs/ctl/ctl-1.4.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils libtool
-
-DESCRIPTION="AMPAS' Color Transformation Language"
-HOMEPAGE="https://sourceforge.net/projects/ampasctl"
-SRC_URI="mirror://sourceforge/ampasctl/${P}.tar.gz"
-
-LICENSE="AMPAS"
-SLOT="0"
-KEYWORDS="amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="static-libs"
-
-RDEPEND="media-libs/ilmbase:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc4{3,7}.patch
-	elibtoolize
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	emake DESTDIR="${D}" docdir=/usr/share/doc/${PF} install
-	dodoc AUTHORS ChangeLog NEWS README
-
-	prune_libtool_files --all
-}
diff --git a/media-libs/ctl/files/ctl-1.4.1-gcc43.patch b/media-libs/ctl/files/ctl-1.4.1-gcc43.patch
deleted file mode 100644
index 5f7e8fa8d560..000000000000
--- a/media-libs/ctl/files/ctl-1.4.1-gcc43.patch
+++ /dev/null
@@ -1,106 +0,0 @@
---- IlmCtl/CtlLex.h
-+++ IlmCtl/CtlLex.h
-@@ -58,10 +58,11 @@
- //-----------------------------------------------------------------------------
- 
- #include <CtlLContext.h>
- #include <CtlTokens.h>
- #include <string>
-+#include <cstdlib>
- 
- namespace Ctl {
- 
- 
- class Lex
---- IlmCtlMathTest/testAffineRec.cpp
-+++ IlmCtlMathTest/testAffineRec.cpp
-@@ -43,13 +43,14 @@
- // OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
- // IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- //
- ///////////////////////////////////////////////////////////////////////////
- 
--#include <string>
-+#include <cstring>
- #include <fstream>
- #include <iostream>
-+#include <cstdlib>
- #include <assert.h>
- #include <CtlRbfInterpolator.h>
- #include <ImathVec.h>
- 
- using namespace std;
---- IlmCtlMathTest/testGaussRec.cpp
-+++ IlmCtlMathTest/testGaussRec.cpp
-@@ -43,13 +43,14 @@
- // OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
- // IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- //
- ///////////////////////////////////////////////////////////////////////////
- 
--#include <string>
-+#include <cstring>
- #include <fstream>
- #include <iostream>
-+#include <cstdlib>
- #include <assert.h>
- #include <CtlRbfInterpolator.h>
- #include <ImathVec.h>
- 
- using namespace std;
---- IlmCtlSimd/CtlSimdReg.h
-+++ IlmCtlSimd/CtlSimdReg.h
-@@ -50,10 +50,11 @@
- #define INCLUDED_CTL_SIMD_REG_H
- 
- #include <typeinfo>
- #include <CtlExc.h>
- #include <Iex.h>
-+#include <cstring>
- 
- //-----------------------------------------------------------------------------
- //
- //	Registers for the SIMD color transformation engine
- //
---- IlmCtlTest/testExamples.cpp
-+++ IlmCtlTest/testExamples.cpp
-@@ -43,10 +43,11 @@
- // OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
- // IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- //
- ///////////////////////////////////////////////////////////////////////////
- 
-+#include <cstring>
- #include <CtlSimdInterpreter.h>
- #include <CtlFunctionCall.h>
- #include <CtlType.h>
- #include <assert.h>
- 
---- IlmCtlTest/testVarying.cpp
-+++ IlmCtlTest/testVarying.cpp
-@@ -49,10 +49,11 @@
- #include <CtlSimdInterpreter.h>
- #include <CtlFunctionCall.h>
- #include <CtlType.h>
- #include <ImathMath.h>
- #include <iostream>
-+#include <cstring>
- #include <exception>
- #include <assert.h>
- #include <sstream>
- #include <limits>
- #include <half.h>
---- IlmCtlTest/testVaryingReturn.cpp
-+++ IlmCtlTest/testVaryingReturn.cpp
-@@ -49,10 +49,11 @@
- #include <CtlSimdInterpreter.h>
- #include <CtlFunctionCall.h>
- #include <CtlType.h>
- #include <ImathMath.h>
- #include <iostream>
-+#include <cstring>
- #include <exception>
- #include <assert.h>
- #include <sstream>
- #include <limits>
- #include <half.h>
diff --git a/media-libs/ctl/files/ctl-1.4.1-gcc47.patch b/media-libs/ctl/files/ctl-1.4.1-gcc47.patch
deleted file mode 100644
index 1aa4be4fe6d0..000000000000
--- a/media-libs/ctl/files/ctl-1.4.1-gcc47.patch
+++ /dev/null
@@ -1,15 +0,0 @@
- https://bugs.gentoo.org/426368
- 
- IlmCtl/CtlInterpreter.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/IlmCtl/CtlInterpreter.cpp
-+++ b/IlmCtl/CtlInterpreter.cpp
-@@ -64,6 +64,7 @@
- #include <fstream>
- #include <algorithm>
- #include <cassert>
-+#include <unistd.h>
- 
- #ifdef WIN32
-     #include <io.h>
diff --git a/media-libs/exiftool/Manifest b/media-libs/exiftool/Manifest
index c5fc62f7d82e..b077d854c2c4 100644
--- a/media-libs/exiftool/Manifest
+++ b/media-libs/exiftool/Manifest
@@ -1,13 +1,7 @@
-DIST Image-ExifTool-11.29.tar.gz 4503877 BLAKE2B 9afbb695edebb1be2c673abbdf32626482c81c847610840e82ca0cb1fa83d697aeb2635ad4b62a692f09ae1effb8f2261aa3968adc35d72e82f1261db393b48a SHA512 fa9a7d28ef09dcbc52e43e1f5b938fa857d4d2b949b47b36ea259bf010637852b3aa7fe8d51bbf5ab22adc6fb67f7858f38a08c2be143f0b0139960347688a3f
-DIST Image-ExifTool-11.32.tar.gz 4513430 BLAKE2B cae07a83ab5c46297ce0b4a12707450b9ded1a4e7edca08413e9671105a34d82ba7ee35eaf39ca64dfbd2b4607cd672b2399a325f8a3d3a76e18e348456fa550 SHA512 9dbb0d297292051171c28cf110976557f96df7079ea7ee38a722ed6ea9efbd758849ca77d9503c7d61964da5e48ab766c8cf58b3c5dfa96d499cbe6b5fb66668
-DIST Image-ExifTool-11.33.tar.gz 4526448 BLAKE2B a286809cdfc10c4015ddca95666ea7ac294c1b4c04c36cc2895918406e2cfed005b5b194a7f2a9c66e6d8f3551553e86ccfbc22339a14b2f9b906038b5fe8a6f SHA512 96a3a2421e3849ae6a2e49b7099415c11c2f65db1a49bebaf8b0c7f4de285aff0d412fb4ac12fa3d7fb59939199fdd49d86be0e55c72cd8b2056803a16fe5eb9
-DIST Image-ExifTool-11.37.tar.gz 4531738 BLAKE2B 2ed39e3767aed9766dad91869ae55503aaec7abd20a70a4bdf69646559fa2886e9a484c83dd3ae6257399267ceef8cc8f6a44dbbd71c0814fb8b1e7b342505cf SHA512 582198247e4804caa94df8acf684c6ac27b9f0b9b90b163079ed03b2f150ce7861f8d6464e56dec54a58e416d00f78ce8b02051b64f5e4df6df49a0c4c3ca25b
-DIST Image-ExifTool-11.40.tar.gz 4546521 BLAKE2B da0cffa18c415caf669688fb26d3cc252e2ce4fa0d9fba342b3c7743fedc6d8942e96a0d0d8ce2f76f7484264a5bc9651f2641e2cee1899dad1da23be5db53d3 SHA512 588c26076d1674de6521f8f5ac9dd6701faceb11b970d4e2567d30abca599e1f3b4da44647c980d1a56bfc228c560ff4db60dafe02bbb74ca75bfb22f9d943f7
 DIST Image-ExifTool-11.41.tar.gz 4547105 BLAKE2B 8bb2d2c2815b59aa744866790f2c46e7096d74f093bee9fd9c6615162c8be8b6716fe2ca967485fef4bff53ed56af1f0e8aafef162ab5504075fff133e21e84a SHA512 fff6806c30cea6d38ed30c3d736664af2e0021d29ad2798036407af6edc928e52a72e0b37e6cbe12e3511077b041bce9c251414d5b6e87328fcd08bfd3fe12a1
-EBUILD exiftool-11.29.ebuild 605 BLAKE2B 321361a04e5d97128b6d1bfcb845150b287b4a47e57b8a512d7fda58684b67393a1455f6a40eee426c5240dd1160bbd656783c1c4b02966a7808be9b73d40c78 SHA512 88d9ba9249f429d2d36c516298b9461f36bfea90f6025b770fc9012ee4d182f83ffcce76e0010f19eaa1b8bfe5b80de1c7c07d76ff127a044f78e42accc1768a
-EBUILD exiftool-11.32.ebuild 603 BLAKE2B 00226b431f94580444fcc66ef0a2d8980ef06c792c60cca04504d6e5e460c18bd16573ab7d9151b588c1b8756428ed90679a0207a08ac4ed6a190c2391ddedc8 SHA512 5289573c84cc3e1a7e63079bfa821534982babf9fb334b2a84bb1929b4f67131f8010e464b9d5acf4b331ff2a8e3b9b52a0694e5ede936ecd405041cb427f373
-EBUILD exiftool-11.33.ebuild 603 BLAKE2B 00226b431f94580444fcc66ef0a2d8980ef06c792c60cca04504d6e5e460c18bd16573ab7d9151b588c1b8756428ed90679a0207a08ac4ed6a190c2391ddedc8 SHA512 5289573c84cc3e1a7e63079bfa821534982babf9fb334b2a84bb1929b4f67131f8010e464b9d5acf4b331ff2a8e3b9b52a0694e5ede936ecd405041cb427f373
-EBUILD exiftool-11.37.ebuild 603 BLAKE2B 00226b431f94580444fcc66ef0a2d8980ef06c792c60cca04504d6e5e460c18bd16573ab7d9151b588c1b8756428ed90679a0207a08ac4ed6a190c2391ddedc8 SHA512 5289573c84cc3e1a7e63079bfa821534982babf9fb334b2a84bb1929b4f67131f8010e464b9d5acf4b331ff2a8e3b9b52a0694e5ede936ecd405041cb427f373
-EBUILD exiftool-11.40.ebuild 603 BLAKE2B 00226b431f94580444fcc66ef0a2d8980ef06c792c60cca04504d6e5e460c18bd16573ab7d9151b588c1b8756428ed90679a0207a08ac4ed6a190c2391ddedc8 SHA512 5289573c84cc3e1a7e63079bfa821534982babf9fb334b2a84bb1929b4f67131f8010e464b9d5acf4b331ff2a8e3b9b52a0694e5ede936ecd405041cb427f373
-EBUILD exiftool-11.41.ebuild 603 BLAKE2B 00226b431f94580444fcc66ef0a2d8980ef06c792c60cca04504d6e5e460c18bd16573ab7d9151b588c1b8756428ed90679a0207a08ac4ed6a190c2391ddedc8 SHA512 5289573c84cc3e1a7e63079bfa821534982babf9fb334b2a84bb1929b4f67131f8010e464b9d5acf4b331ff2a8e3b9b52a0694e5ede936ecd405041cb427f373
+DIST Image-ExifTool-11.49.tar.gz 4566133 BLAKE2B f4b74a7ee20fd0cb44943eb3ddeaa04d3dccbc00722aa37e101ac54901ccc86f52bc4b3bf7bb34286ce8c110c690e5c20d0e76d7edda5d445d32a38f55c21983 SHA512 f90efbf35cd78f2def0f7dfbc4154812ab71f197765c078f64d23521a16eebb75afd0af4cd9184f07a04240bab227a13f02d0ca2db4ed9205e39ff158118ee1c
+DIST Image-ExifTool-11.51.tar.gz 4573052 BLAKE2B 9b38550127e9d21471ce11d25fa267a13e21deb65da3e0f1fbee7f7970f65b82e9e3a1b30ba6340739a2fc402fa8aac874a1813edf5e71634e5f23268a3fff96 SHA512 e6f48d803714a3fb8e12f869d3f9d3957db9aa330cf4e910a6eaadde759aa4ec0fc4873576d46bcbe40462d87bac341e6a546813f4753ba0bf61cf36dde7deeb
+EBUILD exiftool-11.41.ebuild 605 BLAKE2B 321361a04e5d97128b6d1bfcb845150b287b4a47e57b8a512d7fda58684b67393a1455f6a40eee426c5240dd1160bbd656783c1c4b02966a7808be9b73d40c78 SHA512 88d9ba9249f429d2d36c516298b9461f36bfea90f6025b770fc9012ee4d182f83ffcce76e0010f19eaa1b8bfe5b80de1c7c07d76ff127a044f78e42accc1768a
+EBUILD exiftool-11.49.ebuild 610 BLAKE2B e3d631967c3970948f44d2fb65d4bd49e5520cf2bad7e2113db9d9ee699d676eb4e7c7f26fce256169aac4be26eb4d4c7e1ef6d07ce9d7f500a7f1a4d8317e8b SHA512 2f03d0599dc67f567878cdec992a41fa27fb6e137b0ead6efe41b411338d9dd4b6aca397ccdf0a9553f7315f2fbe68e50ece85d0e705fef7c1857b56b3c9f026
+EBUILD exiftool-11.51.ebuild 610 BLAKE2B e3d631967c3970948f44d2fb65d4bd49e5520cf2bad7e2113db9d9ee699d676eb4e7c7f26fce256169aac4be26eb4d4c7e1ef6d07ce9d7f500a7f1a4d8317e8b SHA512 2f03d0599dc67f567878cdec992a41fa27fb6e137b0ead6efe41b411338d9dd4b6aca397ccdf0a9553f7315f2fbe68e50ece85d0e705fef7c1857b56b3c9f026
 MISC metadata.xml 10159 BLAKE2B 3b879f3679b07864e8e32d0223d1512919d56ede4b51bc5a550a83694c8c956c6e6e60a92309ceafef61ed738ccd0b5a6817094b4132be013560d3d7830f6349 SHA512 88662e634877bf2b67144fd37a862626e247f7df5daa82ed8d7a91a00611290d3976687221b5f58b78111a8894d45d55c8999966436f621baebf1bc7b3561484
diff --git a/media-libs/exiftool/exiftool-11.33.ebuild b/media-libs/exiftool/exiftool-11.33.ebuild
deleted file mode 100644
index f6bf1a90acd6..000000000000
--- a/media-libs/exiftool/exiftool-11.33.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_NAME=Image-ExifTool
-inherit perl-module
-
-DESCRIPTION="Read and write meta information in image, audio and video files"
-HOMEPAGE="https://www.sno.phy.queensu.ca/~phil/exiftool/ ${HOMEPAGE}"
-SRC_URI="https://www.sno.phy.queensu.ca/~phil/exiftool/${DIST_P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x64-macos"
-IUSE="doc"
-
-SRC_TEST="do"
-
-src_install() {
-	perl-module_src_install
-	use doc && dodoc -r html/
-
-	insinto /usr/share/${PN}
-	doins -r fmt_files config_files arg_files
-}
diff --git a/media-libs/exiftool/exiftool-11.37.ebuild b/media-libs/exiftool/exiftool-11.37.ebuild
deleted file mode 100644
index f6bf1a90acd6..000000000000
--- a/media-libs/exiftool/exiftool-11.37.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_NAME=Image-ExifTool
-inherit perl-module
-
-DESCRIPTION="Read and write meta information in image, audio and video files"
-HOMEPAGE="https://www.sno.phy.queensu.ca/~phil/exiftool/ ${HOMEPAGE}"
-SRC_URI="https://www.sno.phy.queensu.ca/~phil/exiftool/${DIST_P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x64-macos"
-IUSE="doc"
-
-SRC_TEST="do"
-
-src_install() {
-	perl-module_src_install
-	use doc && dodoc -r html/
-
-	insinto /usr/share/${PN}
-	doins -r fmt_files config_files arg_files
-}
diff --git a/media-libs/exiftool/exiftool-11.40.ebuild b/media-libs/exiftool/exiftool-11.40.ebuild
deleted file mode 100644
index f6bf1a90acd6..000000000000
--- a/media-libs/exiftool/exiftool-11.40.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_NAME=Image-ExifTool
-inherit perl-module
-
-DESCRIPTION="Read and write meta information in image, audio and video files"
-HOMEPAGE="https://www.sno.phy.queensu.ca/~phil/exiftool/ ${HOMEPAGE}"
-SRC_URI="https://www.sno.phy.queensu.ca/~phil/exiftool/${DIST_P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x64-macos"
-IUSE="doc"
-
-SRC_TEST="do"
-
-src_install() {
-	perl-module_src_install
-	use doc && dodoc -r html/
-
-	insinto /usr/share/${PN}
-	doins -r fmt_files config_files arg_files
-}
diff --git a/media-libs/exiftool/exiftool-11.41.ebuild b/media-libs/exiftool/exiftool-11.41.ebuild
index f6bf1a90acd6..3afc7ec316dc 100644
--- a/media-libs/exiftool/exiftool-11.41.ebuild
+++ b/media-libs/exiftool/exiftool-11.41.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.sno.phy.queensu.ca/~phil/exiftool/ ${HOMEPAGE}"
 SRC_URI="https://www.sno.phy.queensu.ca/~phil/exiftool/${DIST_P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x64-macos"
+KEYWORDS="amd64 arm64 ppc ppc64 x86 ~x64-macos"
 IUSE="doc"
 
 SRC_TEST="do"
diff --git a/media-libs/exiftool/exiftool-11.29.ebuild b/media-libs/exiftool/exiftool-11.49.ebuild
index 3afc7ec316dc..d65975820b77 100644
--- a/media-libs/exiftool/exiftool-11.29.ebuild
+++ b/media-libs/exiftool/exiftool-11.49.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.sno.phy.queensu.ca/~phil/exiftool/ ${HOMEPAGE}"
 SRC_URI="https://www.sno.phy.queensu.ca/~phil/exiftool/${DIST_P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc ppc64 x86 ~x64-macos"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos"
 IUSE="doc"
 
 SRC_TEST="do"
diff --git a/media-libs/exiftool/exiftool-11.32.ebuild b/media-libs/exiftool/exiftool-11.51.ebuild
index f6bf1a90acd6..d65975820b77 100644
--- a/media-libs/exiftool/exiftool-11.32.ebuild
+++ b/media-libs/exiftool/exiftool-11.51.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.sno.phy.queensu.ca/~phil/exiftool/ ${HOMEPAGE}"
 SRC_URI="https://www.sno.phy.queensu.ca/~phil/exiftool/${DIST_P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x64-macos"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos"
 IUSE="doc"
 
 SRC_TEST="do"
diff --git a/media-libs/fluidsynth-dssi/Manifest b/media-libs/fluidsynth-dssi/Manifest
index d65c36078f96..0be94150a783 100644
--- a/media-libs/fluidsynth-dssi/Manifest
+++ b/media-libs/fluidsynth-dssi/Manifest
@@ -1,3 +1,5 @@
+AUX 1.0.0-fluidsynth2.patch 2976 BLAKE2B 37574f9644ca71cd2d3eda56582deed12affc57a0ede91ed7f5c8ad41e438c4cdb2463897ead130ceda633781094e2ed03354689308653e018e58dd6412c3cfc SHA512 62848af647f754d46e785c3af13cb5921bdadf54fffbe4bb9d6f15ba1f8ddd1ed55e1c28ec95470cc101a948028f2861820f8d2e77619e58dd4e215d5277d557
 DIST fluidsynth-dssi-1.0.0.tar.gz 325047 BLAKE2B 1290a3eda38e9381bba3fcdaeac7cdcd6fe4bd33e521d40ae084118da77f8aa00c45456b5bf71c919c3009b47aa18f4cfc4eb9a643e66c9e0e6b25b6f2fa021d SHA512 e67ef9c4133c1c0bdba16a094f2e179ddc4c0ed5cff22bfd832dd29697604211de6dc5092e9d6cc82dfe6243fa2a91fe6fc41cccb1d9f5a8ee5b31ebc9d2b724
+EBUILD fluidsynth-dssi-1.0.0-r1.ebuild 553 BLAKE2B ba86898645de7f5928853511437176d7b6f05932a8040cd913677b0622cfd8ea2e3016e0563f41dba455b9d68d6b818224ae8e3b6d9a30079de46edab8642254 SHA512 bf04f0d39662891528b29ee66621b0f4460d0c555153c6c897697b737791b92cbcf53798e1fa795adcfcbd38321639b7ae1a0c10a79eb17fb64eaf0f15d69dd0
 EBUILD fluidsynth-dssi-1.0.0.ebuild 453 BLAKE2B 6a8abd215ddf4cf8a78b80d67c526bdb9c69758de28f0a4205108d2b329c8ac19318f0623db4adf70e5632d29052a24d405ac74fa004bed595989dee06b14b0e SHA512 db5f0af73dbea7e49c458055edad07e83ce429789d91c2cd3125cf725e1124a8ace450c3729339d5f3ef5c98f830460602edf085c5f5846a7128c2d0b5e05cd1
 MISC metadata.xml 343 BLAKE2B e857bc160f1b72d05f1395dea52fac9f2084e559480515b1f123c027d24e3e2c170045006dcf877a7dc7fdd5df7e8cb412d74f6c0f8f3ddd5df7242da15f57e5 SHA512 a7eb8732dae53f7a4c9766de1a04a093483149b52c4b180bcb44b32c751741414b075e65c191c0fa01d50af75ca24d569c0d001211a826e546fff94886b0a44d
diff --git a/media-libs/fluidsynth-dssi/files/1.0.0-fluidsynth2.patch b/media-libs/fluidsynth-dssi/files/1.0.0-fluidsynth2.patch
new file mode 100644
index 000000000000..8d187864c71b
--- /dev/null
+++ b/media-libs/fluidsynth-dssi/files/1.0.0-fluidsynth2.patch
@@ -0,0 +1,76 @@
+Patch based on https://sourceforge.net/p/dssi/fluidsynth-dssi/merge-requests/1
+
+diff --git a/configure.ac b/configure.ac
+index 365957d..dbf6d82 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -33,6 +33,12 @@ else
+   echo "using fluid_synth_nwrite_float() workaround"
+   echo "(You may wish to upgrade your FluidSynth to version 1.0.6 or later)"
+ fi
++have200=no
++PKG_CHECK_EXISTS(fluidsynth >= 2.0.0, have200=yes)
++if test "x${have200}" = xyes ; then
++  echo "using FluidSynth API V2 (>= 2.0.0)"
++  AC_DEFINE(USE_FLUIDSYNTH_API_V2, 1, [Define to 1 if your libfluidsynth is version 2.0.0 or later])
++fi
+ 
+ dnl Check for GTK+
+ AC_ARG_WITH(gtk2, AC_HELP_STRING([--with-gtk2], [use GTK+ 2.0 default=yes]),
+@@ -43,10 +49,6 @@ dnl First look for GTK+ 2.x, unless '--without-gtk2' was specified.
+ if test "x${try_gtk2}" = 'xyes'; then
+     AM_PATH_GTK_2_0(2.0.0, with_gtk='yes (version 2.0)', with_gtk=no)
+ fi
+-dnl  No GTK+ 2.x found, look for GTK+ 1.2 instead
+-if test "x${with_gtk}" = 'xno'; then
+-    AM_PATH_GTK(1.2.0, with_gtk='yes (version 1.2)', AC_MSG_WARN([GUI will not be built because no version of GTK+ was found]))
+-fi
+ AM_CONDITIONAL(BUILD_GUI, test "x${with_gtk}" != 'xno')
+ echo "GTK support: $with_gtk"
+ 
+diff --git a/src/fluidsynth-dssi.c b/src/fluidsynth-dssi.c
+index 99436c3..428f5bd 100644
+--- a/src/fluidsynth-dssi.c
++++ b/src/fluidsynth-dssi.c
+@@ -167,7 +167,11 @@ fsd_get_soundfont(const char *path)
+     fsd_sfont_t *sfont;
+     int palloc;
+     fluid_sfont_t *fluid_sfont;
++#ifdef USE_FLUIDSYNTH_API_V2
++    fluid_preset_t *preset;
++#else
+     fluid_preset_t preset;
++#endif
+ 
+     /* soundfont already loaded? */
+     sfont = fsd_find_loaded_soundfont(path);
+@@ -206,8 +210,13 @@ fsd_get_soundfont(const char *path)
+         return NULL;
+     }
+     fluid_sfont = fluid_synth_get_sfont_by_id(fsd_synth.fluid_synth, sfont->sfont_id);
++#ifdef USE_FLUIDSYNTH_API_V2
++    fluid_sfont_iteration_start(fluid_sfont);
++    while ((preset = fluid_sfont_iteration_next(fluid_sfont)) != NULL) {
++#else
+     fluid_sfont->iteration_start(fluid_sfont);
+     while (fluid_sfont->iteration_next(fluid_sfont, &preset)) {
++#endif
+         if (sfont->preset_count == palloc) {
+             palloc *= 2;
+             sfont->presets = (DSSI_Program_Descriptor *)realloc(sfont->presets,
+@@ -219,9 +228,15 @@ fsd_get_soundfont(const char *path)
+                 return NULL;
+             }
+         }
++#ifdef USE_FLUIDSYNTH_API_V2
++        sfont->presets[sfont->preset_count].Bank = fluid_preset_get_banknum(preset);
++        sfont->presets[sfont->preset_count].Program = fluid_preset_get_num(preset);
++        sfont->presets[sfont->preset_count].Name = fluid_preset_get_name(preset);
++#else
+         sfont->presets[sfont->preset_count].Bank = preset.get_banknum(&preset);
+         sfont->presets[sfont->preset_count].Program = preset.get_num(&preset);
+         sfont->presets[sfont->preset_count].Name = preset.get_name(&preset);
++#endif
+         sfont->preset_count++;
+     }
+ 
diff --git a/media-libs/fluidsynth-dssi/fluidsynth-dssi-1.0.0-r1.ebuild b/media-libs/fluidsynth-dssi/fluidsynth-dssi-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..a858fce99498
--- /dev/null
+++ b/media-libs/fluidsynth-dssi/fluidsynth-dssi-1.0.0-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="DSSI Soft Synth Interface"
+HOMEPAGE="http://dssi.sourceforge.net/"
+SRC_URI="mirror://sourceforge/dssi/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="
+	media-libs/dssi
+	media-libs/liblo
+	media-sound/fluidsynth:=
+	x11-libs/gtk+:2
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PV}-fluidsynth2.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest
index 3a6b4a573013..464ca4edfe67 100644
--- a/media-libs/freetype/Manifest
+++ b/media-libs/freetype/Manifest
@@ -6,8 +6,8 @@ DIST freetype-doc-2.10.0.tar.bz2 2130601 BLAKE2B 7814b8ad53343dc72f0b11b29224f97
 DIST freetype-doc-2.9.1.tar.bz2 2130292 BLAKE2B 667032fa447fbc28c0f753df3ade7a07a4f8d4d26cdd00fed2fa0e8098e9d6a083572608b7d06446ea91baa932e3c6d18beb1f86f6b549a8cd2c07a2df567da0 SHA512 1668f02f67e6e047df04e5e2fccb564cd9af780ec9b3c4878109868302a83eaec7b627390ff82c3e875122400e6f20fc690936a1e4964dfa65143e5309fa22d4
 DIST ft2demos-2.10.0.tar.bz2 237599 BLAKE2B 722e586f412059b8b29a26c832037a860dc1b26afed85b8b0aa5fc71245293f45d19b379c54993f64ba4b8de329799834656d00fc4b6f6610ddd0b08cfd05449 SHA512 d48cbabd5cc673e0af2e0c4056dba95cee8e08092f881958c6908ea2d4da7104ca81b701d47a17640ac36cbdfd8aa274cc26353bb43f026f55c00d565f2ad641
 DIST ft2demos-2.9.1.tar.bz2 233462 BLAKE2B c689942b222b2c600b5ec3963791621ae87acefb9b01caa5dc35af52525d03e3a1094e48c0789d5eaabbce787bddd7c3055e12454e54ea3c7fae92bca47614de SHA512 38bee59184b20c2eb983deaa5c1f241e31c1b4793e47dc06b1b419601489cfece3b11fde4cf4fb6c5af12254ad0c1ce9a1547885c208e8e715655e9c48f22a46
-EBUILD freetype-2.10.0.ebuild 6746 BLAKE2B e6eb8129f4b6ec62562894b8d3e784579e530d147c62ff77b8f8a197d3858c97d47bb6b4008a53a1390e6dbf5c992b117d2c1a6205184763f1649c804110c61d SHA512 b854be4a2cd7978718799f3f696529e83ed4b377c16583faf47dcec34dd6ff2aa7aa2b41d35f2c3392baaf46f7c9331fbcb3396f2bd157d839eed292de75bd89
-EBUILD freetype-2.9.1-r3.ebuild 6689 BLAKE2B 252937acb877001d791d75cbd525472a46ad3553ab914f2206bb18d11118c23ac27ea769a1a8384e87d05c6114c9fd9af89e3220a510524314c79cfe9f6580f8 SHA512 dc1700843ea2b73b48f6914599b2cae5277be3bc44811821f1bfe306af60e318eed9563dc126a26f7ac0ec112f74dc1c6a7511458382a6cdbfc5b38a64dfc098
-EBUILD freetype-2.9.1-r4.ebuild 6701 BLAKE2B ac812cb18c4c6c9304c9d67c84c2ce782de3c19984c42004afa4ee76fa69f9ec5770a7a9ad0aa3c48c9db234d1ab45157042a00ab070430048cf020dba3930bc SHA512 a14a2b29ca998ef0c23933e2f192d9ec4cdc4b478c9007165d49cf9d964f7fd6ee7f9aee2dd4337a1f6f6300e53f26487e5e3bffac46185ddc1aa094ef5294c7
-EBUILD freetype-9999.ebuild 6746 BLAKE2B e6eb8129f4b6ec62562894b8d3e784579e530d147c62ff77b8f8a197d3858c97d47bb6b4008a53a1390e6dbf5c992b117d2c1a6205184763f1649c804110c61d SHA512 b854be4a2cd7978718799f3f696529e83ed4b377c16583faf47dcec34dd6ff2aa7aa2b41d35f2c3392baaf46f7c9331fbcb3396f2bd157d839eed292de75bd89
+EBUILD freetype-2.10.0.ebuild 6740 BLAKE2B 56f809235b4192b31f41fd7590c6741e08614af68239377c30c84212d4764e479126a5ed8f7fcccaa03ce9dd0af1629a76ccdf7a6de9a6e698c91cacfb181608 SHA512 940f33fcf3ef4a78a866329d6763149278c0cca49f9221dda12efd36242cb05fa1b02db62151ac00388bdaeb6816a2127c1d0ed44815cf87c020dea668341234
+EBUILD freetype-2.9.1-r3.ebuild 6683 BLAKE2B d5479a651d75bcd4f668fb6bb145b0f4e20e9083a77cc54ab454d7176c13d671ab894d1de8d9800be6a842bc207323329460d056bca573178482e6b1f8df47ab SHA512 7c299ec881fb5eacd2982c21d85c68a15ad28b80367baac491ae655398a1c4587905799134a7ce9b49759b237ef4b1dc83ebb85b8120dcd95e582786e739c2dc
+EBUILD freetype-2.9.1-r4.ebuild 6695 BLAKE2B 2f332731ffd8ff4f62318a11f29d6153ad031e3b3c15e611c6a6128582fd53a1986cae0d8b64892b9206ebf3ecf4101df994a50eb8bb1b9a8fd6847c948d0676 SHA512 8af93af65bbf2df27d5c24ec09f8d64a39bcd66665b07375bdc86c5930c71e39fa45649fe7193d7835f67b0244ab101b5d544096c7456c7cd3d19c6e184634f6
+EBUILD freetype-9999.ebuild 6740 BLAKE2B 56f809235b4192b31f41fd7590c6741e08614af68239377c30c84212d4764e479126a5ed8f7fcccaa03ce9dd0af1629a76ccdf7a6de9a6e698c91cacfb181608 SHA512 940f33fcf3ef4a78a866329d6763149278c0cca49f9221dda12efd36242cb05fa1b02db62151ac00388bdaeb6816a2127c1d0ed44815cf87c020dea668341234
 MISC metadata.xml 1363 BLAKE2B 2cadaca7ada476301e4fa15dabaf7e823a9bcf6e59fb018876e3d2ca61c528c7096cb65ac44d8311a8e9a5eada744f41db3ca2960622980a8f5438d2f003202c SHA512 a9272c439ffb4c9ca6597b2ef26e86e99830ff298940abf38fdecf5c8d794ffdb96a212c67e2e23526a0e2686deff48664da4a5af01d2977256038846e7221f8
diff --git a/media-libs/freetype/freetype-2.10.0.ebuild b/media-libs/freetype/freetype-2.10.0.ebuild
index d845306b9464..968731b2230b 100644
--- a/media-libs/freetype/freetype-2.10.0.ebuild
+++ b/media-libs/freetype/freetype-2.10.0.ebuild
@@ -61,10 +61,10 @@ _egit_repo_handler() {
 		esac
 
 		local EGIT_REPO_URI
-		EGIT_REPO_URI="https://git.savannah.gnu.org/r/freetype/freetype2.git"
+		EGIT_REPO_URI="https://git.sv.nongnu.org/r/freetype/freetype2.git"
 		git-r3_src_${phase}
 		if use utils ; then
-			EGIT_REPO_URI="https://git.savannah.gnu.org/r/freetype/freetype2-demos.git"
+			EGIT_REPO_URI="https://git.sv.nongnu.org/r/freetype/freetype2-demos.git"
 			local EGIT_CHECKOUT_DIR="${WORKDIR}/ft2demos-${PV}"
 			git-r3_src_${phase}
 		fi
diff --git a/media-libs/freetype/freetype-2.9.1-r3.ebuild b/media-libs/freetype/freetype-2.9.1-r3.ebuild
index d3cd1dee862b..ad7bc0626702 100644
--- a/media-libs/freetype/freetype-2.9.1-r3.ebuild
+++ b/media-libs/freetype/freetype-2.9.1-r3.ebuild
@@ -61,10 +61,10 @@ _egit_repo_handler() {
 		esac
 
 		local EGIT_REPO_URI
-		EGIT_REPO_URI="https://git.savannah.gnu.org/r/freetype/freetype2.git"
+		EGIT_REPO_URI="https://git.sv.nongnu.org/r/freetype/freetype2.git"
 		git-r3_src_${phase}
 		if use utils ; then
-			EGIT_REPO_URI="https://git.savannah.gnu.org/r/freetype/freetype2-demos.git"
+			EGIT_REPO_URI="https://git.sv.nongnu.org/r/freetype/freetype2-demos.git"
 			local EGIT_CHECKOUT_DIR="${WORKDIR}/ft2demos-${PV}"
 			git-r3_src_${phase}
 		fi
diff --git a/media-libs/freetype/freetype-2.9.1-r4.ebuild b/media-libs/freetype/freetype-2.9.1-r4.ebuild
index 9dbc2fc98b53..48b9f12deaf6 100644
--- a/media-libs/freetype/freetype-2.9.1-r4.ebuild
+++ b/media-libs/freetype/freetype-2.9.1-r4.ebuild
@@ -61,10 +61,10 @@ _egit_repo_handler() {
 		esac
 
 		local EGIT_REPO_URI
-		EGIT_REPO_URI="https://git.savannah.gnu.org/r/freetype/freetype2.git"
+		EGIT_REPO_URI="https://git.sv.nongnu.org/r/freetype/freetype2.git"
 		git-r3_src_${phase}
 		if use utils ; then
-			EGIT_REPO_URI="https://git.savannah.gnu.org/r/freetype/freetype2-demos.git"
+			EGIT_REPO_URI="https://git.sv.nongnu.org/r/freetype/freetype2-demos.git"
 			local EGIT_CHECKOUT_DIR="${WORKDIR}/ft2demos-${PV}"
 			git-r3_src_${phase}
 		fi
diff --git a/media-libs/freetype/freetype-9999.ebuild b/media-libs/freetype/freetype-9999.ebuild
index d845306b9464..968731b2230b 100644
--- a/media-libs/freetype/freetype-9999.ebuild
+++ b/media-libs/freetype/freetype-9999.ebuild
@@ -61,10 +61,10 @@ _egit_repo_handler() {
 		esac
 
 		local EGIT_REPO_URI
-		EGIT_REPO_URI="https://git.savannah.gnu.org/r/freetype/freetype2.git"
+		EGIT_REPO_URI="https://git.sv.nongnu.org/r/freetype/freetype2.git"
 		git-r3_src_${phase}
 		if use utils ; then
-			EGIT_REPO_URI="https://git.savannah.gnu.org/r/freetype/freetype2-demos.git"
+			EGIT_REPO_URI="https://git.sv.nongnu.org/r/freetype/freetype2-demos.git"
 			local EGIT_CHECKOUT_DIR="${WORKDIR}/ft2demos-${PV}"
 			git-r3_src_${phase}
 		fi
diff --git a/media-libs/gmmlib/Manifest b/media-libs/gmmlib/Manifest
index ee991cd4d4c0..b7ecaa33a9ca 100644
--- a/media-libs/gmmlib/Manifest
+++ b/media-libs/gmmlib/Manifest
@@ -2,8 +2,10 @@ AUX gmmlib-19.1.2_so_patch_version.patch 371 BLAKE2B 2a11045d40729e3d5c931a79638
 DIST intel-gmmlib-18.3.0.tar.gz 620491 BLAKE2B 555a733b42b8e4c40170db9ecabc25bb04779c3aba38b9141f021df1dbe83d74e385a3437d4a87577d9e5ff4df21ce618393909cd98fce4a59ec19aeff4eb44d SHA512 358598873556822be6748a282cd1447ca3e0bcaeb11c2bb8862414bac2ab8e57deee9581fa14bfe22d33d712e567db936332b7fe715dae9816b31121af934dec
 DIST intel-gmmlib-18.4.1.tar.gz 621793 BLAKE2B 41d6f93ec68cf29b8bc2d01c103c69dd4f732ce1aaf72cc959f993af73df9b355f0c4c7c97af4102cc1996e7732597dac4fe0abaf359806e2accbee1bf852d90 SHA512 8dcb5892cfc98822e8173d0a71dfb4883e1ef838de8c936a9b36fb05d61137b7c7d7edf941d3ebd532a1126d8d8b978b95843afb3514ba8cbf3eec54f05c8b8b
 DIST intel-gmmlib-19.1.2.tar.gz 632661 BLAKE2B 4a9995a9e4c8b5c8e081d757193212180fbae3a88040da24be4225149c4c0924b56d5969e125a0c21a5af7b2b3d249277d7e27cb3ce13135c69bb977a976879d SHA512 fcc0beedfc3716b6204627f7daa5e0a5aec720b2a29ab2f8262b613a11d31bfe14dc8476513515d8470cf7d66f58d109ed4d5cf203e041228f53a64cb4a6c243
+DIST intel-gmmlib-19.2.1.tar.gz 633194 BLAKE2B fe6105bd76d18f3c4e0d42550fa91a1cfa75413b7289d4cfd89c6edbd9c2104f11dbb9c549f3331259d3629eba5f3698f8289da5f551f55f9a76cb704680e9fb SHA512 686b47d9de54f96ff1b4b75e595175a08e5a619d1b3f3e71388d851263dcb12315be7834721c88c698d4dbf6f68845d7850ce7a238f4e639ca0896de724c408d
 EBUILD gmmlib-18.3.0.ebuild 807 BLAKE2B 7a58c4ee12ab5d2d970742cf8199f71be6e66a44231b58c3ef618a94c0e07b04e27f0767c02545e5f50d667895c7841cfd97425419d0749c493c15807ed03f59 SHA512 9dbbf041162c336914f0877ad0adc74b91ab695eb9886b46e5efdb4a9635e5f77295d3fec65558993d271e70999ea6144430a3ed9f04a000f62e9ca8c4bc3ca8
 EBUILD gmmlib-18.4.1.ebuild 807 BLAKE2B 2800dcb9e11d3b6958c095a31f53c38e4b1633b36e727d0924c6842b862f307ed198ad0b2b23525f973de5720695fabbebe2f94be1ea4d997e56cfb92faec69c SHA512 9777b3431af111fe2ec7cd211bb29bbc242e5b1b07e2eb9ac2b82722c04f59d48a70f5df2bab5c1d3653d96774cd1336dd7b0d98c9f5b1d9e922f2dec49b046a
 EBUILD gmmlib-19.1.2.ebuild 883 BLAKE2B 5ef30d7f29660cebbb9d6e0d0146714c737108e4ec05c01819858d2ac6daaa3a5e0999daf0a20b648228da1aa54ce7cd8b458cad45ec00d0c8409b4ab7fafabc SHA512 cea321160c7b2b74d4b04e12ddcf86295dd680c3f77d4f4b40090a53f6444e6a81b43478059303f54d5cfad1f971acf4c1166777610141b3a86af9178eb279ed
-EBUILD gmmlib-9999.ebuild 807 BLAKE2B 7a58c4ee12ab5d2d970742cf8199f71be6e66a44231b58c3ef618a94c0e07b04e27f0767c02545e5f50d667895c7841cfd97425419d0749c493c15807ed03f59 SHA512 9dbbf041162c336914f0877ad0adc74b91ab695eb9886b46e5efdb4a9635e5f77295d3fec65558993d271e70999ea6144430a3ed9f04a000f62e9ca8c4bc3ca8
+EBUILD gmmlib-19.2.1.ebuild 819 BLAKE2B b73f418ae95b025e76499a26e5b7bc04923bd1c6115fb1d7d3788ac24bb07c763fcd0fd2e953084f2cb5a476cee303b233afb2860911b7568f0208518e3a61c0 SHA512 43dfe602d4588bd394f0c4218cdf6b40a8094527393cddc5af7d5180b1bdead3f93e312f1a5f8fd7e780f624a765987ef833195b8e3ea727a2805ca8ae5a059c
+EBUILD gmmlib-9999.ebuild 819 BLAKE2B b73f418ae95b025e76499a26e5b7bc04923bd1c6115fb1d7d3788ac24bb07c763fcd0fd2e953084f2cb5a476cee303b233afb2860911b7568f0208518e3a61c0 SHA512 43dfe602d4588bd394f0c4218cdf6b40a8094527393cddc5af7d5180b1bdead3f93e312f1a5f8fd7e780f624a765987ef833195b8e3ea727a2805ca8ae5a059c
 MISC metadata.xml 322 BLAKE2B 802cb8da9b68866ac616c175586bc3651330ecbfb1b08fe3fad52ec8817e1994f347ae49815869d50296504d9607fcf6c41d40543d8896fafd8d36c4421604f6 SHA512 52324c98984d04659d8ee327850152e41b6146f45a35b147a1fba2043be7ca91e220dd57fc3712e5154b416d04f8a1b0f614259cd9fde8c66ad7734853bb50ec
diff --git a/media-libs/gmmlib/gmmlib-19.2.1.ebuild b/media-libs/gmmlib/gmmlib-19.2.1.ebuild
new file mode 100644
index 000000000000..aee2550263c0
--- /dev/null
+++ b/media-libs/gmmlib/gmmlib-19.2.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-multilib
+
+if [[ ${PV} == *9999 ]] ; then
+	: ${EGIT_REPO_URI:="https://github.com/intel/gmmlib"}
+	if [[ ${PV%9999} != "" ]] ; then
+		: ${EGIT_BRANCH:="release/${PV%.9999}"}
+	fi
+	inherit git-r3
+fi
+
+DESCRIPTION="Intel Graphics Memory Management Library"
+HOMEPAGE="https://github.com/intel/gmmlib"
+if [[ ${PV} == *9999 ]] ; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz"
+	S="${WORKDIR}/${PN}-intel-${P}"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+multilib_src_configure() {
+# once upstream makes this optional
+#	local mycmakeargs=(
+#		-DMEDIA_RUN_TEST_SUITE=OFF
+#	)
+
+	cmake-utils_src_configure
+}
diff --git a/media-libs/gmmlib/gmmlib-9999.ebuild b/media-libs/gmmlib/gmmlib-9999.ebuild
index f0dd8d2cd690..aee2550263c0 100644
--- a/media-libs/gmmlib/gmmlib-9999.ebuild
+++ b/media-libs/gmmlib/gmmlib-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils
+inherit cmake-multilib
 
 if [[ ${PV} == *9999 ]] ; then
 	: ${EGIT_REPO_URI:="https://github.com/intel/gmmlib"}
@@ -31,7 +31,7 @@ IUSE=""
 DEPEND=""
 RDEPEND="${DEPEND}"
 
-src_configure() {
+multilib_src_configure() {
 # once upstream makes this optional
 #	local mycmakeargs=(
 #		-DMEDIA_RUN_TEST_SUITE=OFF
diff --git a/media-libs/ilmbase/Manifest b/media-libs/ilmbase/Manifest
index bbc6b65bd65a..f003e64bd522 100644
--- a/media-libs/ilmbase/Manifest
+++ b/media-libs/ilmbase/Manifest
@@ -1,4 +1,4 @@
 AUX ilmbase-2.3.0-testBox.patch 2826 BLAKE2B ddafd231e641cd518ca864e6aa27f88b24b81f1bed29fe05fe79accc033484479e891482529ead24ddc2b1b931d808eb20a6b960f7281da83357b637c3d937ca SHA512 81eb09823fed3841742ef8b85b262d9d6fbce97ae87fdc5e902c4d85c7f8c7a01b7be08acac23fee5c5cfdb8815f410b200f2af4039ade0cedd31866312015db
 DIST ilmbase-2.3.0.tar.gz 595490 BLAKE2B db956fe7dbabf94632eb98635f4ebda8e937f26e26ed69f33743069fa2bf6d5ed3711f00eb33377c98b4f8ea367bbfc51b11d4cb884ce02238b537857cc19a9c SHA512 db0804a7c37c2a97f9dbf81b20f40f7fdea73242baa2759d9dc3728e6849e7ecae0e178fa1c710add980d050499151650675e4b2cda6cbbaa61aca406a1f929a
-EBUILD ilmbase-2.3.0.ebuild 1041 BLAKE2B a53b7f81ad6f2ce916280a5f59f869ae0d6d3984727f0faf360f0bc9b41270b9bfea7f8e825dd861baa36182b56fe262460664c79431f6314b4bfe859e2ac4a5 SHA512 a7f6924497a066ce26c712de0e67e050d9978ce80aa575b5d5bb5b009b829ea61814612760ec4c6ddcef0383c4f1aba0f64ac258a368a7f45b92cf5e2f14220b
+EBUILD ilmbase-2.3.0.ebuild 1040 BLAKE2B e8c99e5a82e864a5e511c7b5417c107646a9ddf580f198a2ed595ec9de89cc251d0fa54f8c4632760c797f9e0d7456b16bde35da77c3974b95dee51c98f3c4bb SHA512 eb63dd2a7b78bcb89fe2ed75670984c1bbdecf69fa981706c371eebaee18cc20847d84da9c80a3eb71379dacdeb5bcfaa41f203625d9a0a04f2e000a3a2e26a9
 MISC metadata.xml 303 BLAKE2B 53fb5019bd6fe939d485f1eccb4a140ca9b7ce121b06744d8155842ccb6c5e1378ea39a9ae74c8d519be7b3926bd76040df4b8107137fcc2e25be97431e7a1be SHA512 0ab8d735dd7a8e0dc96b14cfde1ae06969d15cfbad956f4fda60b093660aee38fe98709376eedc9362a26858678d2f28eec795c1accb2560858fd804a11bb7ca
diff --git a/media-libs/ilmbase/ilmbase-2.3.0.ebuild b/media-libs/ilmbase/ilmbase-2.3.0.ebuild
index d528540b5d81..10b9361e8527 100644
--- a/media-libs/ilmbase/ilmbase-2.3.0.ebuild
+++ b/media-libs/ilmbase/ilmbase-2.3.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/openexr/openexr/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0/24" # based on SONAME
-KEYWORDS="amd64 -arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 -arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE="static-libs"
 
 DEPEND="virtual/pkgconfig[${MULTILIB_USEDEP}]"
diff --git a/media-libs/jbig2dec/Manifest b/media-libs/jbig2dec/Manifest
index 2116f7080d92..59442f6ca093 100644
--- a/media-libs/jbig2dec/Manifest
+++ b/media-libs/jbig2dec/Manifest
@@ -3,5 +3,5 @@ DIST jbig2dec-0.13-patchset.tar.bz2 8452 BLAKE2B 473a338b460c8a66991fb50e110f438
 DIST jbig2dec-0.13.tar.gz 442571 BLAKE2B 6a973f91502d8effc00cd49b68bb2f853edd41286fdc5cb159460607db8627c2c959ba1c96e65b2ef1df3d4072c9993ce66c06bc5dc1837c89f87c6da0025550 SHA512 ef64a65c54bec65f61602de7130dc9594aae58aaea7958f7cc987f25d0794511e15a423e86501ace4f40c0364796fb97ceab72edb0b69232926767ba16c1b05d
 DIST jbig2dec-0.14.tar.gz 463572 BLAKE2B 91351a3879bd1906fabe2620cf5379fbbc32eaae808a8c2754c661d6dc592d3c9da13c558c8f7ced30c48b73fbd9ed4631f2817298f959b59ad4dff5fce9ac1a SHA512 066bd880ac0665fc1e42b0ae0e481008b125aab6e173b7f82d61a2a30e72c90085cbded9b2a68c6836f92dea3d8d8d5c2228dba76e0d99c79c922197d215705b
 EBUILD jbig2dec-0.13-r4.ebuild 1473 BLAKE2B acad9053091c1be3d6b7c72ed249cdbb90a92f2c532c250ae863deff76c5142d67d27ab77b6e05b42b74087d223e861b9d71278ccd007931d588c1bc3802b315 SHA512 035196ce25a11ac4c73ee2f8cf2dadd2c1d869d9f5625cbd894f50807af7cb85438b4b7783f775655059ef108d367fc084c1123aabc674d275216831c15fce47
-EBUILD jbig2dec-0.14.ebuild 1167 BLAKE2B c2643abd084b782b5eaddfb44c215ace9c284314db48cc9d0dd0742ffb88bee633523637b9cf15946662df0c7f5ccaf25c3949427b50d998da5d28f626895202 SHA512 5f252bc5018a3e62cc5f49a31525b07820ecbf59724a5dcaf62ded16dcf87a0abbc801a1071cf448e59bc76feb35784437c27a02bfb382e780a4fa102f2f3f65
+EBUILD jbig2dec-0.14.ebuild 1166 BLAKE2B 2d4218f2e736a1d856c1b39374812e4edd895c563f245543c0f411d5a26a9b071d153b64d86cb1f0444c4f0eebf4e1ce9176b46df622f7dbd1420e705b4a6483 SHA512 21a825a0e922ad0119b6a7526818f236ebc932edf2a061cb9cfc6b65fb72add7a20dca5fd60be9c2baf98464e1efa461030076313616a731f0ac6e3ec5269b03
 MISC metadata.xml 473 BLAKE2B 6d374023a106375c7f5500968ed4ea2f4dd5584fb0db8f85b042844d08afb6196b7d7c019ae69b35917f43e496c9a25212aec328f0c3cf78aaa94b963de65c15 SHA512 501077ac27f5c6f8a616fa32cec23d28cb16dc0e0c19ce933cbc067494117c9c55fc3e00dfc21270892d57478a9e268f99215c8d074d6cc4114916f55a571a6f
diff --git a/media-libs/jbig2dec/jbig2dec-0.14.ebuild b/media-libs/jbig2dec/jbig2dec-0.14.ebuild
index 8e3906758dae..fa1e83c53fa8 100644
--- a/media-libs/jbig2dec/jbig2dec-0.14.ebuild
+++ b/media-libs/jbig2dec/jbig2dec-0.14.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://downloads.ghostscript.com/public/${PN}/${P}.tar.gz
 
 LICENSE="AGPL-3"
 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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="png static-libs test"
 
 RDEPEND="png? ( media-libs/libpng:0= )"
diff --git a/media-libs/libharu/Manifest b/media-libs/libharu/Manifest
index b01cf86135da..756b375f3cdb 100644
--- a/media-libs/libharu/Manifest
+++ b/media-libs/libharu/Manifest
@@ -2,8 +2,6 @@ AUX libharu-2.3.0-1-Included-necessary-char-widths-in-generated-PDF.patch 8278 B
 AUX libharu-2.3.0-2-Avoid-issue-with-libtiff-duplicate-symbols.patch 2867 BLAKE2B aa68693458cf1f8c6677a7014e66feba95145f41099d555d07b05d914a117d8fce9dfc9a07ae0418bfe68f4ec4b6e66f3286009ec33dc80aea8866d9d175a7cd SHA512 05e7abd46ab817edd68fd1f5baac6a95155c1410651e92aea1067b8d80fc1e3cfa1c142527ab5bc578b4703361a992d6c5865beede5297f95260c59215e3d900
 AUX libharu-2.3.0-3-cmake-fixes.patch 6376 BLAKE2B ec14be6aeda6e0e43a40bc2f1d41fcec4b601161cdcf1bdeff3e585bd78d6924aae322ffa5fe48f4fe221b1750b672ec7a80ba0a985368da4e5b00122b7d6617 SHA512 186d36b0b943c811e9fc34d448f58177914d2146a3df5cf8b12fe8c9fe7525046a7e53361052d308164cb99d4ec9a28341e4fe3b6cc69d6cb2c0ea03a49b0355
 AUX libharu-2.3.0-4-Add-support-for-free-form-triangle-Shading-objects.patch 15988 BLAKE2B 6cbd9826317e6d1de126dfdcdd3508bfb6351c34cd58fda8f09fe44efead890d78c67f33750223cb2291312b2299ecf16f7b91e4e20a3024bb6007da96753f86 SHA512 94d1377e529d1d96941a90ac82276748f5bf7f0e248a6770d938394151e453aaa082c0d256c0de28f737e7e995bc0ee60a4eb5562aa450af1dfcc1733b403466
-AUX libharu-2.3.0-dont-force-strip.patch 504 BLAKE2B 5450783ed2ae778d2d522a4e7157f681c12765e6493955a363187bc4032387580f121e427ad26c596a1b6da53d83bf857525a710ad3499188b8a6b7985de9067 SHA512 df72ea19a1c8da3f06c9fff5b5a9d7307baf0144b59b5f4342769027c947ef5ded4e1f5ed3e3310dae27d7f5ec0ab37d585b9dc16ef83e38b7edda4ff13fc950
 DIST libharu-2.3.0.tar.gz 1396413 BLAKE2B 7f0c819f17740f12f9bf6c7a7c749eb8c6ada326d98985daeac4d3250733cfc8e085b540e0969cb1b4c3b1055f4d1e148a2ed010d9371685fd265b62a879be9c SHA512 ebcabf1e8488e21185a231e97b4c16f9de742ae0ac2ebc7535b72b6b8e2045c2619bc6a94a820f7f923b0dfeceb217408f4e4c613ef3602104373cdf000d3f41
-EBUILD libharu-2.3.0-r1.ebuild 845 BLAKE2B fea8329a56331571253f0679e725a5ae0590ad3d7f403d3a1b5cb2831ae59f4d118d1780bef81f6ec02633d696d15029d77dc382a45840eb7d3024ee29c15f8a SHA512 a0a3efba5722bb80fc98de2726c12306382f555f19422b9c34ccdd23b9777bbf08893df15fe2aed6603a092d289c5c0bd887f6b960f4f9c82e4bba533a342820
 EBUILD libharu-2.3.0-r2.ebuild 952 BLAKE2B 83962ebf529d74897a708be8ce40beb2a2027a3f9e8bd071a7ffc27e5b10ac1d31efc2d970ddac7fc4ab14b88024b5fd78258718588270b502586cb2926af453 SHA512 3b63bbb49edab24bee89d72fdb262219cc91bf06fbdd41011c19c6d2e07ad22a64b489336f5907198cc8cc4e87d0e32e001281e246b3e7de1065da3604496644
 MISC metadata.xml 1001 BLAKE2B 885dfdacbde50227739f7f1e4a0b23febf988628cecc2bf67995408e978673022633d14407bdf95c29c7a1c8cce11f3c0133dba529e25a1a6df2e5cdacbd27b0 SHA512 baab0fbcff40fe0cf1ac6df68416335bf01f08a0b26d8441d76cfb0e1a6b3227aa8ed54d3f080c0ba5cbcf372f7a99c0c45c9ea215e7210c5e77805a30140d4f
diff --git a/media-libs/libharu/files/libharu-2.3.0-dont-force-strip.patch b/media-libs/libharu/files/libharu-2.3.0-dont-force-strip.patch
deleted file mode 100644
index 393302bce239..000000000000
--- a/media-libs/libharu/files/libharu-2.3.0-dont-force-strip.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- configure.in.orig	2014-02-19 12:22:46.954651117 -0800
-+++ configure.in	2014-02-19 12:22:37.211604308 -0800
-@@ -171,11 +171,6 @@
- 
-   fi
- 
--  dnl Do not strip symbols from developer object files.
--  INSTALL_STRIP_FLAG=""
--else
--  dnl Make sure to strip symbols from non-developer object files.
--  INSTALL_STRIP_FLAG="-s"
- fi
- dnl }}}
- 
-@@ -322,7 +317,6 @@
- 
- dnl link against libm
- LIBS="$LIBS -lm"
--AC_SUBST(INSTALL_STRIP_FLAG)
- 
- AC_CONFIG_FILES([Makefile src/Makefile include/Makefile])
- AC_OUTPUT
diff --git a/media-libs/libharu/libharu-2.3.0-r1.ebuild b/media-libs/libharu/libharu-2.3.0-r1.ebuild
deleted file mode 100644
index 1f1764eb687d..000000000000
--- a/media-libs/libharu/libharu-2.3.0-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-utils multilib-minimal
-
-MYP=RELEASE_${PV//./_}
-
-DESCRIPTION="C/C++ library for PDF generation"
-HOMEPAGE="http://www.libharu.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${MYP}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE="png static-libs zlib"
-
-DEPEND="
-	png? ( >=media-libs/libpng-1.2.51[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-${MYP}"
-
-PATCHES=( "${FILESDIR}"/${P}-dont-force-strip.patch )
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_with png png "${EPREFIX}"/usr)
-		$(use_with zlib)
-	)
-	autotools-utils_src_configure
-}
diff --git a/media-libs/libheif/Manifest b/media-libs/libheif/Manifest
index d32bc441c333..f478911066cd 100644
--- a/media-libs/libheif/Manifest
+++ b/media-libs/libheif/Manifest
@@ -1,5 +1,7 @@
 AUX libheif-1.3.2-openjpeg-2.patch 2512 BLAKE2B 165576cb3da35534a9e628f3dfb3c47b52718109ffb3582acfde093a22284053fd1e7986216f670491652f1362011409888084b37a79777e393002b1d9ea7237 SHA512 c8bb96ef7091d2f0e46bbe61e05a30e8a3e93f7b5925d45a30a045cac39e26000c04166d5ea0417ebf530b8bff5992de0b46ca112041e1aa87ecf7eb5928e844
 DIST libheif-1.3.2.tar.gz 1328174 BLAKE2B 4c0f82bb90d48f89a4ce9aed525c5823bb5d008e54e580e761f6fa4f5493f265929a0607e7b81046ba7c249bd2ca21a0c5ab91da83b7e7f3a2a63e8f24df88ed SHA512 bcc8b4b2522ef6fe68f5a9ffd5312c2c8f6bc3718394eef1860e199c30fb735bb214f665ed6480b5f5fe5d578b3ed77a4301af93775ae2349ba5038b3f3ef63a
+DIST libheif-1.4.0.tar.gz 1366030 BLAKE2B a93b3b59a4f89e0aa5a5069fdebc54b9d09adeeff05ebf28b9535baa2fb26e4122b4c5d96b7015fdd181720f10e3dd0887038f0c5567c94509aa76d2ef119dd9 SHA512 fc48caaadb71ffa87227de75c9e13d5006c66f1c966ce454552defb8947999f5242a9bbd1413f58be1ccbf61df7f118defe96d67376e3b4e7b12fe5dfa0fe0c7
 EBUILD libheif-1.3.2-r1.ebuild 1247 BLAKE2B 5c420043fad3797adcdddbe1604f6264a110596495edb2a74bc8ad6eefed7ea985fd5f11d0e3901c442132f6423e0853086bddbde9203d1f79185f222eec91c0 SHA512 cf43868c006597926163c7a095248c375a09f4bf33406a9d6e7b2819f8536a48ac76f413635ac4b380a884d43bc2f3f47a2a0c49162084d776e07b731876c0c1
-EBUILD libheif-9999.ebuild 1325 BLAKE2B b13d52b4593ca62e796208564edb6a6696e86bfe3d0539ca74277027de4d9db7b89867667fb29b9af1f5eed8c583d337b34ed6a4083292ba681963b5ed871fe1 SHA512 ede20f379e5807387acd892472f8190e7ba71a522b027e1297a37bd722832bff6125ad43a94ce5e0ee6d33ec5beb80b1e93793e27e5d2550c8e83f4db24f9504
+EBUILD libheif-1.4.0.ebuild 1318 BLAKE2B 1b48eff2e13cef37b2fb31e9d816f0bd6d1e19bc293ca330c7d93b328699b6537da93aa508ab80d21920918a95227b7ae3d5da36e0989a935603041983c855e5 SHA512 3366e8ec40259561bc5b6a76a6c0093ae56c8b9fb10c0bd48b25eff0f3abcf4585754ab5af2ec37b416dc614f89a733554df29d3f643d9f097476b4ed8f9c565
+EBUILD libheif-9999.ebuild 1318 BLAKE2B 1b48eff2e13cef37b2fb31e9d816f0bd6d1e19bc293ca330c7d93b328699b6537da93aa508ab80d21920918a95227b7ae3d5da36e0989a935603041983c855e5 SHA512 3366e8ec40259561bc5b6a76a6c0093ae56c8b9fb10c0bd48b25eff0f3abcf4585754ab5af2ec37b416dc614f89a733554df29d3f643d9f097476b4ed8f9c565
 MISC metadata.xml 369 BLAKE2B e85296d149b4ebfe852a79ed951dff87e3586617cac09f2e81bc501f2739599e7fda1835f1d677cd923a1324e4f6d85e4f1552eb0589511372dd603d239880c5 SHA512 70bbaa03beb93f3649271be35d4c90e7d79395efefd0cfb9915525a5c736629bcf56bd66e2d1bbf2a746c62a5f21ddb8874cdf28f61180fe9abc3ad22ab51fc8
diff --git a/media-libs/libheif/libheif-1.4.0.ebuild b/media-libs/libheif/libheif-1.4.0.ebuild
new file mode 100644
index 000000000000..a03be0af6d3d
--- /dev/null
+++ b/media-libs/libheif/libheif-1.4.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools multilib-minimal
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/strukturag/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/strukturag/${PN}/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder"
+HOMEPAGE="https://github.com/strukturag/libheif"
+
+LICENSE="GPL-3"
+SLOT="0/1.4"
+IUSE="static-libs test +threads"
+
+BDEPEND="test? ( dev-lang/go )"
+DEPEND="
+	media-libs/libde265:=[${MULTILIB_USEDEP}]
+	media-libs/libpng:0=[${MULTILIB_USEDEP}]
+	media-libs/x265:=[${MULTILIB_USEDEP}]
+	sys-libs/zlib:=[${MULTILIB_USEDEP}]
+	virtual/jpeg:0=[${MULTILIB_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+
+	sed -i -e 's:-Werror::' \
+		configure.ac || die
+
+	eautoreconf
+
+	# prevent "stat heif-test.go: no such file or directory"
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable threads multithreading)
+		$(use_enable static-libs static)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name '*.la' -delete || die
+	if ! use static-libs ; then
+		find "${ED}" -name "*.a" -delete || die
+	fi
+}
diff --git a/media-libs/libheif/libheif-9999.ebuild b/media-libs/libheif/libheif-9999.ebuild
index d9ed4b630621..a03be0af6d3d 100644
--- a/media-libs/libheif/libheif-9999.ebuild
+++ b/media-libs/libheif/libheif-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -17,17 +17,16 @@ DESCRIPTION="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder"
 HOMEPAGE="https://github.com/strukturag/libheif"
 
 LICENSE="GPL-3"
-SLOT="0/1.3.9999"
-IUSE="static-libs +threads"
+SLOT="0/1.4"
+IUSE="static-libs test +threads"
 
-# Doesn't yet support libjpeg-turbo-2, https://github.com/strukturag/libheif/issues/70
+BDEPEND="test? ( dev-lang/go )"
 DEPEND="
 	media-libs/libde265:=[${MULTILIB_USEDEP}]
 	media-libs/libpng:0=[${MULTILIB_USEDEP}]
 	media-libs/x265:=[${MULTILIB_USEDEP}]
 	sys-libs/zlib:=[${MULTILIB_USEDEP}]
 	virtual/jpeg:0=[${MULTILIB_USEDEP}]
-	!>=media-libs/libjpeg-turbo-2
 "
 RDEPEND="${DEPEND}"
 
@@ -38,6 +37,9 @@ src_prepare() {
 		configure.ac || die
 
 	eautoreconf
+
+	# prevent "stat heif-test.go: no such file or directory"
+	multilib_copy_sources
 }
 
 multilib_src_configure() {
diff --git a/media-libs/libilbc/Manifest b/media-libs/libilbc/Manifest
index f92b39e68619..22cb41b64f93 100644
--- a/media-libs/libilbc/Manifest
+++ b/media-libs/libilbc/Manifest
@@ -1,7 +1,5 @@
 AUX libilbc-2.0.2-ppc_ppc64_sparc.patch 933 BLAKE2B 90bb615cb33dfb1eae9d276b08df85ed37b47f127fe9e88a983120d25c57cf669ed0e166d63b3b51e5ac29701107b9be9b683bb36b3e868177bdb2efb1b22e88 SHA512 6a468dff6c42d2e0628466cb9c71639052a17640c78134ee98634c473e4da60296b86eec8f8b8214f64d298d80587dcd03722a9cfc2e588efb73f72f4954eba1
-DIST libilbc-1.1.1.tar.xz 302324 BLAKE2B 726d53fc638f9d019b6d50a3ec463350efd59510ce15b9d6af30fc0ad6094f5acc53c4a5c2e77d17fdcd35f3e63bceb310716eb175e82ca7226dec023cb96df4 SHA512 7c9fa6da4d8b32fd49ea62f9e876e385930501c9caedcafac94ea74b9372722b06dd28062dc4fcca765ad6c519cfb52bb595d396ca50d361f563c715f6679845
 DIST libilbc-2.0.2.tar.bz2 392643 BLAKE2B 1b1772c415a823a63c2fdb64913eeee8becdda0438c3942e74dc0be5dc6e000538c8f0feb796d23eb815e792d9b9e695f598869a31dd69a90c1fb12823a09e28 SHA512 ad0ef3326144fa1e9b6983be9aeefcec0064930a0124980f0fa2b38967f145e4cef7be75d8eae72f4a9650f297f15968944e73ef256e642116125dea326d8ba8
-EBUILD libilbc-1.1.1.ebuild 738 BLAKE2B a62dd1e51dc9829091d0391f3f55a213a7c9650530afe630917ceb9d6ebe62345b763e351533aabca791dbce7f6f55628b464bda3e723b444bbd4e780dec0f29 SHA512 5b57dfc0be813d600f23a129fe31982ecc40d0b376f2f3bd9566f5a2f52f96bc99d6db71cec3a9fc63bfa20f2f8db5a1e2185030a1388ec4e117db74c5f7afbc
-EBUILD libilbc-2.0.2.ebuild 727 BLAKE2B d6e996a9b39fcbe50867bf68608d060ae7abd2c463eff1e21e93f84b9028a9779848a0eeb63b6d5e354d2ef4c5fb11aa46e8e344f83c70da9378072aa1c7a3db SHA512 925ed38c2eb24afbb882015208d9bbbc2fedcb6a228a60e34d23b06343ee0cbd65f64c7d75ace1685b3b5f6c0dda7ec75ebd50cf427f178414bc87ea8687d4c5
-EBUILD libilbc-9999.ebuild 673 BLAKE2B 4c40b095479be75fc7dd4e5c9a1e3200c0b176806c4d1ef44a1eab2aab5f0a59801748127dc2d2aae7136eb4e50a287fa6caf13d413f5266b6c699126b4ca466 SHA512 ab966edff2f696b7debd2449e289f196cc78e93e70c2017475be209952eaeef372c0e5ed1782437eedb7c10ced11ebc66959cec40802091c9429c9ff5a3164cd
+EBUILD libilbc-2.0.2.ebuild 887 BLAKE2B 823f2b98b090736d98a07eb2ad8e1489d02f12f33de72cfa2749058c499ae71098dfac05b875a02a2d9fac09e33fa6e4009ceac866162a168ff6e5a70156509e SHA512 eb28d8e92974fb0b2367bea26bae5443838f45e84535ce2a1890fccf1ecfbafc661a7baf3bf96bf64e89ee375adde735b3965fc11c4b85aa1cd17e8d31790d90
+EBUILD libilbc-9999.ebuild 832 BLAKE2B 905b3fbac3be812a69d44755949e950c234b84704e95f1527f35df46e162901b7852b74f24fc7de02a9d955da4da42c02c50c3d6e33a68fbf2df8675d493522f SHA512 b95d46ab5544775cd3be4d4a361de4c662df82de9c848499c30d8e1d3c0a302fe4ec491063b77b6a4129f16bdd5b42e713c03647f288f31c5577b21bc58a9061
 MISC metadata.xml 415 BLAKE2B 424981b7c747af54e0658541f8ed279ee5f0a66f3ddf92c62497c185f497341fb3b1a583c4786c6ffe8eea335fd0537802bfcff4567ca5f3c9f2482f0e526748 SHA512 f0be09fd8270ae30e2fc499de10ae5d7416a6ea50a787d6383428b81df8959ee4d18383011aca0d423549919982b6b05faa964c6378d2727d8be5bd82d4417ce
diff --git a/media-libs/libilbc/libilbc-1.1.1.ebuild b/media-libs/libilbc/libilbc-1.1.1.ebuild
deleted file mode 100644
index 69c70d5fafb1..000000000000
--- a/media-libs/libilbc/libilbc-1.1.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-if [[ ${PV} == 9999 ]] ; then
-	SCM="autotools git-2"
-	EGIT_REPO_URI="https://github.com/lu-zero/${PN}.git"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="https://dev.gentoo.org/~lu_zero/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-fi
-
-inherit eutils multilib ${SCM}
-
-DESCRIPTION="Packaged version of iLBC codec from the WebRTC project"
-HOMEPAGE="https://github.com/lu-zero/libilbc https://github.com/TimothyGu/libilbc"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-src_prepare() {
-	[[ ${PV} == *9999 ]] && eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	find "${D}"usr/$(get_libdir) -name '*.la' -delete
-}
diff --git a/media-libs/libilbc/libilbc-2.0.2.ebuild b/media-libs/libilbc/libilbc-2.0.2.ebuild
index 40eb6ee13b72..d01615a69b31 100644
--- a/media-libs/libilbc/libilbc-2.0.2.ebuild
+++ b/media-libs/libilbc/libilbc-2.0.2.ebuild
@@ -1,19 +1,18 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-if [[ ${PV} == 9999 ]] ; then
-	SCM="autotools git-2"
+inherit multilib-minimal
+
+if [[ ${PV} == *9999 ]]; then
+	inherit autotools git-r3
 	EGIT_REPO_URI="https://github.com/TimothyGu/${PN}"
-	SRC_URI=""
 else
 	SRC_URI="https://github.com/TimothyGu/${PN}/releases/download/v${PV}/${P}.tar.bz2"
 	KEYWORDS="amd64 arm arm64 ppc ppc64 ~sparc x86"
 fi
 
-inherit eutils multilib ${SCM} autotools-multilib
-
 DESCRIPTION="Packaged version of iLBC codec from the WebRTC project"
 HOMEPAGE="https://github.com/TimothyGu/libilbc"
 
@@ -21,8 +20,21 @@ LICENSE="BSD"
 SLOT="0"
 IUSE="static-libs"
 
+PATCHES=( "${FILESDIR}"/${PN}-2.0.2-ppc_ppc64_sparc.patch )
+
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.0.2-ppc_ppc64_sparc.patch
+	default
 	[[ ${PV} == *9999 ]] && eautoreconf
-	autotools-multilib_src_prepare
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# package provides .pc files
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/media-libs/libilbc/libilbc-9999.ebuild b/media-libs/libilbc/libilbc-9999.ebuild
index a7ac81e5c6d4..1d00bd81c2f7 100644
--- a/media-libs/libilbc/libilbc-9999.ebuild
+++ b/media-libs/libilbc/libilbc-9999.ebuild
@@ -1,19 +1,18 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-if [[ ${PV} == 9999 ]] ; then
-	SCM="autotools git-2"
+inherit multilib-minimal
+
+if [[ ${PV} == *9999 ]]; then
+	inherit autotools git-r3
 	EGIT_REPO_URI="https://github.com/TimothyGu/${PN}"
-	SRC_URI=""
 else
 	SRC_URI="https://github.com/TimothyGu/${PN}/releases/download/v${PV}/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 fi
 
-inherit eutils multilib ${SCM} autotools-multilib
-
 DESCRIPTION="Packaged version of iLBC codec from the WebRTC project"
 HOMEPAGE="https://github.com/TimothyGu/libilbc"
 
@@ -22,6 +21,18 @@ SLOT="0"
 IUSE="static-libs"
 
 src_prepare() {
+	default
 	[[ ${PV} == *9999 ]] && eautoreconf
-	autotools-multilib_src_prepare
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# package provides .pc files
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/media-libs/libmatroska/Manifest b/media-libs/libmatroska/Manifest
index 938016d4548a..0ad84e6a6e58 100644
--- a/media-libs/libmatroska/Manifest
+++ b/media-libs/libmatroska/Manifest
@@ -1,11 +1,5 @@
-DIST libmatroska-1.4.5.tar.bz2 612987 BLAKE2B 3cf0ddfdcda35a928a684d7f03abf8114dd08703201c5ff801b753ce1fbdba8ff27163f33432fa1afabdf2e70fff059106ffeecf38142afba2bd2e27ce57ab6e SHA512 94ce6fd920e5023b2846b629438a0bd42ff80f21b8f96e270d280311fba3619ab59f1cc6b73778c014ca2dbf060f3b119da052ea143f79aa1e83fac888799f3d
-DIST libmatroska-1.4.7.tar.bz2 619463 BLAKE2B 5cd5adad33e327b07ded8ae042b8e2f8988339e7b5fd79026a0dd6358d8fa93c87dad641eec741d783e0ef91c9d06cd3ad881d4664544a51ecf7e901cf4b1adb SHA512 75371a94c68a472fa55e2277b90a2717dd777b506ac89fb115fa83c5093aee6609eb4b01aa65c1d5a9ce9fc597684baff2ffc330a756050b2fb746abffc2417e
-DIST libmatroska-1.4.8.tar.xz 286284 BLAKE2B 46bec9bbba97d89fe7db63715c2b3d9b648076814b206f6fe2423b09e0b9c6ab130c9cd338442eb810471773c24fe6e32dc6cc044d02bd622789e6e41f36dda1 SHA512 af3b8bfae891be77896b6afa2da3325ebba73a957cd43a4e6086b68e1237bb37b2e6d5eb57322c05ede0ad0c03464087b77fbdf06101314f09411648e1073cee
 DIST libmatroska-1.4.9.tar.xz 64556 BLAKE2B 9f2c01213edd979b325eb1dda148054bc6e0117ad41b29385f6d505108d4e2a4da643df76f957d07541bb581e71d5fed9875f1aef0804894cbab4cc39da50a98 SHA512 281224b66ce7ef39daf0f186cda1144250e190b914e64f4f2524e8bf0170a3d18dbc50f204d4ca8d7eaffe183a61f96c92ba6ec4325bacb068272d62cdbcef33
 DIST libmatroska-1.5.0.tar.xz 64596 BLAKE2B a14f3f1aef87e2bc05989d3166b562edf852c20e5a25f6bb9376cd4b5224bfc7db3f45daffa5ccff140af75a2addca2bdac024228c7512016e6568e669c639e7 SHA512 eb59b5afd9d510c2d6c7408b0053a261cee6669a9f5bbb1a939d98d96ac6c9b8f340691e95310268f59c954a1d9f72322fd0ec7b442a74c56cd2e2c22eb3a754
-EBUILD libmatroska-1.4.5.ebuild 694 BLAKE2B bd3cb928ea029955ea64ca953c29df990e9f433f91f0dd08ffce3e12afd5be04256bba6447f73afe681150242a06d750f3c4bc84c51ce64defd3d1e650543d67 SHA512 58d2222582303d3b556071b46e0fc141836ebbc2b16b5d8c7120a6508e9b798b83b755fe8312f786451ba1fb08bcf62cd30453873b39a73f2c4d9ca3b7aeb353
-EBUILD libmatroska-1.4.7.ebuild 709 BLAKE2B 0cd3c996b2583541cd0db22420d46beb73aade0e6884ac4dca86341df70387d2e513f331b77c08b49dc7dcbe4f0072647996e4c4012bc40f3a2b3d6cc38a8175 SHA512 c1fd7b67325fd6895676f0391809dc71aa77b2d2b2bbfcc22b454f19ef692ae080ced026e1189d387a454723d6573831a0e9cb3d48691a1690f2235b7f98f5b5
-EBUILD libmatroska-1.4.8.ebuild 701 BLAKE2B 8db0db6e5a931f685f76fe67e9dba35ecdf54eaad1f4b4e496e2df77a8d3f468ec2ace53b7b906047cc3cb716f5919f0b37001a640233a7f853d8241a0857efa SHA512 a7a35513c071dd2f660f77dc3f2c062e183d062b913bd6d305b178ab1f9f87dd82bd6e3d0ca0a366b4133c322025f8b025bf211ef8e955770ce41a609d34d1f3
 EBUILD libmatroska-1.4.9.ebuild 661 BLAKE2B ae2a926e737b0cc32a9c8c0976e2d66c6a9c58eb0ed4ed23d970c626408736cc757944aade2ac03b3182d745f2ead53e67e12995f1aae82087a2a9b4ef47b7c4 SHA512 be7d2508b8ef0ce98f23330b7192a64cbd50ca62d26c4fc8e4865e76a048d2f08e2aeb1af4b056f066a8b58bb02da6fbfd3275155e17f401fc23fbcc1b15a2b6
 EBUILD libmatroska-1.5.0.ebuild 670 BLAKE2B e78268605d9dbe15a367f23354efb9e284b3fefc092892c4de2956edb3ba158b12340894f4a375351aaab639a09999a54dfdc76ebcf653668e0bbd9eab6545fe SHA512 1138fb82839cbcee9a9b0438d937ff047012e88151615cfa5027b1f12adb4d4a76cea3b41cad591ed1c247479a5c269d93fbacb9bd5638a5036b771d6ac0cb5d
 MISC metadata.xml 320 BLAKE2B edd6b2e35a7833d3510edec80f3771a319cbb257cbb203e0f71f33636431496c620cb3307b2bebb44360d6932a7e4376b0d134f3f42d26fc9271423c2eed11f6 SHA512 5c1dad06e1fef24b1ec68fb6b12d0d17b4bd05f22b1953f713c25a513340cb08540eebaec32fbe7c6607ba2142a057b8e6e5743a929b7368665d91bc014f35a9
diff --git a/media-libs/libmatroska/libmatroska-1.4.5.ebuild b/media-libs/libmatroska/libmatroska-1.4.5.ebuild
deleted file mode 100644
index ae18b42ea767..000000000000
--- a/media-libs/libmatroska/libmatroska-1.4.5.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Extensible multimedia container format based on EBML"
-HOMEPAGE="https://www.matroska.org/ https://github.com/Matroska-Org/libmatroska/"
-SRC_URI="https://dl.matroska.org/downloads/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0/6" # subslot = soname major version
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/libebml-1.3.4:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete
-}
diff --git a/media-libs/libmatroska/libmatroska-1.4.7.ebuild b/media-libs/libmatroska/libmatroska-1.4.7.ebuild
deleted file mode 100644
index 3910a74e6cf6..000000000000
--- a/media-libs/libmatroska/libmatroska-1.4.7.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Extensible multimedia container format based on EBML"
-HOMEPAGE="https://www.matroska.org/ https://github.com/Matroska-Org/libmatroska/"
-SRC_URI="https://dl.matroska.org/downloads/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0/6" # subslot = soname major version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/libebml-1.3.4:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete
-}
diff --git a/media-libs/libmatroska/libmatroska-1.4.8.ebuild b/media-libs/libmatroska/libmatroska-1.4.8.ebuild
deleted file mode 100644
index 85a0066e6a7f..000000000000
--- a/media-libs/libmatroska/libmatroska-1.4.8.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Extensible multimedia container format based on EBML"
-HOMEPAGE="https://www.matroska.org/ https://github.com/Matroska-Org/libmatroska/"
-SRC_URI="https://dl.matroska.org/downloads/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0/6" # subslot = soname major version
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/libebml-1.3.4:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete
-}
diff --git a/media-libs/libopenshot-audio/Manifest b/media-libs/libopenshot-audio/Manifest
index 2072af535bb4..4c442051995b 100644
--- a/media-libs/libopenshot-audio/Manifest
+++ b/media-libs/libopenshot-audio/Manifest
@@ -1,4 +1,6 @@
 AUX libopenshot-audio-0.1.4-fix-under-linking.patch 642 BLAKE2B d4ff9256d49efb3bc3bf4a626f1f9186ae6e5ac65dd0da517dde4461353f594a8b1d54ad4ea8974be289833984c77a49b351e1b9e0a49288ed993f9f175b097e SHA512 6fdfc0e8d4a2325389a530d166c5bb504ab71a5274d037a07b579d2855c425197bf0e88349204aadcbdfc9e8efd246f10ca3d20378055f739e1d4d8fba97d7c2
 DIST libopenshot-audio-0.1.4.tar.gz 2959997 BLAKE2B 0736d9f4877f46ac90fd236cbdcfce8c1f66f5ac5d5e9762672a4eaeb668eb61a5f1e45996f0feea604d2c30891198fa58fc89f360815336ea18311d019fed2c SHA512 5605164a8c66c33ac893cc2b42cdacffff03eb156a61740c1b2c00dd7e7602a802fa1dc3795c620810e3ee29a290aa6bae8b62bc17eab3f4dd2d8052e0481824
+DIST libopenshot-audio-0.1.9_pre20190502.tar.gz 1696201 BLAKE2B 6bc0be3f8374f734cb6b7271c09dad8f7da794acb87236441f41999fab9baa3fee69d6a820db51a4c116b3a5113bb8f72da396babd13511d013b8ffafc2c1bf7 SHA512 73ba3e2054de1b74e6ae7c874a61388220efe12b640f741d5e18d9b242d427fd0fc82b03527af7de64ecd6dbe0a450b884c8557bb5a51493be21838e1f4dfd1a
 EBUILD libopenshot-audio-0.1.4.ebuild 665 BLAKE2B bde925e36f3875a26c4688d7bbb151ba499c4b28cc00053306e86c947e601475ae9fca2d3341275800aef5925a2d31ffb73abce975ad02b23499c88428d16f0e SHA512 38a7755b907648bf091c3808571efaaee5c6111042fd3da07b6c97bdb0f8573ccb1fbfb10478a50fb1fa9d0f1a4334141521f3ba8d384b9f06ba95c0d38c4d4c
-MISC metadata.xml 386 BLAKE2B 152c514030a3927ea9779da2cccb6ab74a68aa6f8dbc01cf05dc0ed521d9afaa04783cc7a0c877154a57431da71eb64886ac9c2030eba905de29c32fba58d86e SHA512 65064e6f488f977b5dd7f16ee9b58c43a5ea0aa15193dbfe79f145e0da8f145d4ff8e0968524c2c6962311ee10d8e4ccd157f5710a00a922b3e1c42dfedc8491
+EBUILD libopenshot-audio-0.1.9_pre20190502.ebuild 633 BLAKE2B d5a2ad8a7ed97f37095942adbeacf83f2683cba5677992117edfb5605983cbd078451465f41ef2d32fb9b7f2245fecf54caa4b71f9b842302d51758fd682b951 SHA512 a650cea8ef85b49aea325b96ecf87c0b3582a393bff6352c97e771b1954c5032151f5a366243240c1178442f30f56babc316017db243cbee216b9dc7782eb846
+MISC metadata.xml 412 BLAKE2B df9cd019427d972709eec715b45ec81df6c13ef33ac4c35b5a91d9735003ca1da2efd64f9fca64e59a00281d981c28ab7b91e47c28566ba89069e8349559b49c SHA512 3df5c70cdc6f15b495560edb59148c83e9d6543af6b9e69b687e42e6f6161223e6eef364d2d87aaeb6c45c7c4aa4c4916ebd1b2a7bfae102709344200d75b929
diff --git a/media-libs/libopenshot-audio/libopenshot-audio-0.1.9_pre20190502.ebuild b/media-libs/libopenshot-audio/libopenshot-audio-0.1.9_pre20190502.ebuild
new file mode 100644
index 000000000000..c04e18d40fe6
--- /dev/null
+++ b/media-libs/libopenshot-audio/libopenshot-audio-0.1.9_pre20190502.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+COMMIT="77edb1f14dde35e1facecc309dbc4fb7f07d7014"
+
+DESCRIPTION="Library for audio editing and playback used by OpenShot"
+HOMEPAGE="https://www.openshot.org/"
+SRC_URI="https://github.com/OpenShot/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0/6"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	media-libs/alsa-lib
+	media-libs/freetype
+	x11-libs/libX11
+	x11-libs/libXcursor
+	x11-libs/libXext
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
diff --git a/media-libs/libopenshot-audio/metadata.xml b/media-libs/libopenshot-audio/metadata.xml
index 380e62435237..939a9b7b8299 100644
--- a/media-libs/libopenshot-audio/metadata.xml
+++ b/media-libs/libopenshot-audio/metadata.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>steils@gentoo.org</email>
+		<name>Stefan Strogin</name>
+	</maintainer>
 	<upstream>
-		<remote-id type="launchpad">libopenshot</remote-id>
 		<remote-id type="github">OpenShot/libopenshot-audio</remote-id>
 		<bugs-to>https://github.com/OpenShot/libopenshot-audio/issues</bugs-to>
 	</upstream>
diff --git a/media-libs/libopenshot/Manifest b/media-libs/libopenshot/Manifest
index fc330a608331..679a288a9c4d 100644
--- a/media-libs/libopenshot/Manifest
+++ b/media-libs/libopenshot/Manifest
@@ -1,4 +1,6 @@
 AUX libopenshot-0.2.2-imagemagick7.patch 3545 BLAKE2B e2fe6ae205459c69ff288f14ba2d0a2b461b761e7ff6e9e66e11e4895b10661d5fc2ab9e2011899ca983399af685a0d411aa4820c02d02b4600617bd314d7670 SHA512 06622c81253fd15440e1cf0256a0beb21e2039a5a98a8c889828898b137a9a6efeb6fb295a0646dc5aa12da9805ff73b62c29272b0037cb1ea2454de7571f59b
 DIST libopenshot-0.2.2.tar.gz 11037768 BLAKE2B c307e41bf17d40ae421a541bbdf4cd53c6ef4d97041a476c6910bd156c10815aa5a5811813b24fdc472401516f29cf8cb68fbda17a0b434767c3f3aa63d6f222 SHA512 b89189e57e82da68a063417bba9c94704c04b0546c0aed227daa23a794eee56341a05988d8e28dbd339edfcdeeaed48103b347060eccf94f32fe1a4bf23d6553
+DIST libopenshot-0.2.4_pre20190609.tar.gz 10268173 BLAKE2B 01e07c0a7c051b5804f24fab1bfb920862a165ef14d3fdd020430b9e3a47858842c8cab3408ba0d161cb15cc6e90531a3b5df9ad327a01f414ff2e7e392fc243 SHA512 bf8c06aba6a899cb1ca6fbe9ac89fc859083b03175338c04af8dce68698f4ac78eac0b5b594e2b02390cd5e64576445b1c95324b254a267506353bed97ca16d1
 EBUILD libopenshot-0.2.2.ebuild 2207 BLAKE2B 31c03e9f5cb7e596930bf01efc6c1897b586a355dd1bd516e37872b0b2a37259ed83a4a1b1155e65b620554d1842ea7c71cc1ba223a542dc622c54d2c4ade00b SHA512 fa3c05436c0bbd2949ac11d8e35e763a96693dbb48d352264f5abd71d24ddaadf099b9035b2236471e07418b8533d3ff3bcbea7034660875e0f740b9bb141c69
-MISC metadata.xml 374 BLAKE2B cc763fd4cda8c70fc654d85ebaa8a3b748499308a4633c6f70aeef1cbb767f5b5eaad0f6c4402a74862e8ebe392b6862722835e92cb53ef4b88a9cc87b2315db SHA512 2a1810910f38b67624eea2d8778c095bbe884cf8a06ababaf595a295d8fbb904e13a809ccc888b8d5956e87a2ddf1295982133741596a08e713f9cbb6a6347ba
+EBUILD libopenshot-0.2.4_pre20190609.ebuild 2530 BLAKE2B 3d7eebaa32640c90891e39202e594deb0b74268a8973d19962a134de011733c9f87c8e01293234d9721fec2f7e701e1b630d6513013bbe72c39a0bb008de9405 SHA512 d6875cbdeb5c0b90ed600bfba050396e168cceda296907871dee3c3c4a4b110dfe07c65a94e005e995a76243a3814fbaa28e49ebd73e3ee670e10a85f0cbd4e8
+MISC metadata.xml 400 BLAKE2B ec8a8b1e8bf03816ba138aa342d428ae322b5e7fe01dbf9d62cbebb42f59656f3d021156a7cf59aeaa75552fab8d1ff028e0b8283d342a1d64be837424104fd2 SHA512 0c5544878c2f7e1572b7e9716f996ede737cb2bb907f912a6b1d371beeee4b8694469eb03dc89197c19fe245a1d3eba193cd850fc52fb663f192d3522aa810d0
diff --git a/media-libs/libopenshot/libopenshot-0.2.4_pre20190609.ebuild b/media-libs/libopenshot/libopenshot-0.2.4_pre20190609.ebuild
new file mode 100644
index 000000000000..89b540bf332b
--- /dev/null
+++ b/media-libs/libopenshot/libopenshot-0.2.4_pre20190609.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit cmake-utils python-single-r1 toolchain-funcs
+
+COMMIT="0d4ea7fe71e88bcee4a7fd1404bd52c8e2169997"
+
+DESCRIPTION="Video editing library used by OpenShot"
+HOMEPAGE="https://www.openshot.org/"
+SRC_URI="https://github.com/OpenShot/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0/17"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples +imagemagick libav +python test"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	net-libs/cppzmq
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5[widgets]
+	>=media-libs/libopenshot-audio-0.1.9_pre20190502:0=
+	imagemagick? ( >=media-gfx/imagemagick-7:0=[cxx] )
+	libav? ( media-video/libav:0=[encode,x264,xvid,vpx,mp3,theora] )
+	!libav? ( media-video/ffmpeg:0=[encode,x264,xvid,vpx,mp3,theora] )
+	python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? ( app-doc/doxygen )
+	python? ( dev-lang/swig )
+	test? ( dev-libs/unittest++ )
+"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+# From Mageia
+# https://github.com/OpenShot/libopenshot/issues/60
+PATCHES=( ${FILESDIR}/${PN}-0.2.2-imagemagick7.patch )
+
+check_compiler() {
+	if [[ ${MERGE_TYPE} != binary ]] && ! tc-has-openmp; then
+		eerror "${P} requires a compiler with OpenMP support. Your current"
+		eerror "compiler does not support it. If you use gcc, you can"
+		eerror "re-emerge it with the 'openmp' use flag enabled."
+		die "The current compiler does not support OpenMP"
+	fi
+}
+
+pkg_pretend() {
+	check_compiler
+}
+
+pkg_setup() {
+	check_compiler
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+	# https://github.com/OpenShot/libopenshot/issues/17
+	use test || cmake_comment_add_subdirectory tests
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_RUBY=OFF # TODO: add ruby support
+		-DENABLE_PYTHON=$(usex python)
+		$(cmake-utils_use_find_package imagemagick ImageMagick)
+	)
+	use python && mycmakeargs+=(
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+		-DPYTHON_LIBRARY="$(python_get_library_path)"
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use doc && cmake-utils_src_make doc
+}
+
+src_test() {
+	cmake-utils_src_make os_test
+}
+
+src_install() {
+	local DOCS=( AUTHORS README.md doc/HW-ACCEL.md )
+	use examples && DOCS+=( src/examples/ )
+	use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
+
+	cmake-utils_src_install
+	use python && python_optimize
+}
diff --git a/media-libs/libopenshot/metadata.xml b/media-libs/libopenshot/metadata.xml
index 2f5ef7858c7c..e12300d5d59d 100644
--- a/media-libs/libopenshot/metadata.xml
+++ b/media-libs/libopenshot/metadata.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>steils@gentoo.org</email>
+		<name>Stefan Strogin</name>
+	</maintainer>
 	<upstream>
-		<remote-id type="launchpad">libopenshot</remote-id>
 		<remote-id type="github">OpenShot/libopenshot</remote-id>
 		<bugs-to>https://github.com/OpenShot/libopenshot/issues</bugs-to>
 	</upstream>
diff --git a/media-libs/libplacebo/Manifest b/media-libs/libplacebo/Manifest
index c9d95a7ac25a..65bb3b631432 100644
--- a/media-libs/libplacebo/Manifest
+++ b/media-libs/libplacebo/Manifest
@@ -1,6 +1,4 @@
 DIST libplacebo-v1.18.0.tar.gz 322963 BLAKE2B 640accaa64b1a5abdcc60f89c1b80ccc880ed060799a48cb9d41c7b891648913b05d06c62fa6dd21ccce07ac61b7c89e1702ac26013c596dc4a4d71c7b10721f SHA512 a2ca4a8b2bf9e5242c39c704e579575ccbfd0a7dadc4f73fe1994abb6e3f132d19f6d95415704a62e285e3f94e7b0ab8aeed14b4fce466df1ba34952f7127686
-DIST libplacebo-v1.7.0.tar.gz 312154 BLAKE2B 46a807e323cce5da6362828d931daeca3eaff8475a7318dfc756c097e2edc98f064a90b36e0f6d882f95f6bb077e72127fb6f8d7643dd992c7432a13b6fdbe64 SHA512 337662e538b1d6b3d063ec18db2627619e1bd72cff6017ac19027527b07a74b0f196a428b572c9f4e3c3856c32a123b70049d7938458fb4301fdd319d756ab27
 EBUILD libplacebo-1.18.0.ebuild 1288 BLAKE2B 283c89aeebb758473d5c9db5d84e774e6962a80b0cc625c08d3d0b4a07a459bc415c291e541b2cea07510268661336667f2a37cb6710f12e9d78d564e7a4746e SHA512 ed38e53a0d8f7ae09aa543f8a600047958f0cd1c716e75352c2a7e12a1db83db30e3687fc669c2df357b0a26f2c241bd9f756ed02aea614bc4e9c654e40d44a4
-EBUILD libplacebo-1.7.0.ebuild 1269 BLAKE2B eb4e3db0e4f23a76bb570d5a3c59727d5b882dbbf5e6d85ede981cfcfd8d82f3f1cd8ce8649380b3011050c00039c460bf1d8df8ea2507bef82c02c708f57ba2 SHA512 126c643abb16a95c173681d7626b47d805e1858408211b60cfaf0c2914beed3d50ecb270904df3a4ee61cfc7bec7c0c06ecca40108c9e52858e38dc46861c56e
 EBUILD libplacebo-9999.ebuild 1288 BLAKE2B 283c89aeebb758473d5c9db5d84e774e6962a80b0cc625c08d3d0b4a07a459bc415c291e541b2cea07510268661336667f2a37cb6710f12e9d78d564e7a4746e SHA512 ed38e53a0d8f7ae09aa543f8a600047958f0cd1c716e75352c2a7e12a1db83db30e3687fc669c2df357b0a26f2c241bd9f756ed02aea614bc4e9c654e40d44a4
 MISC metadata.xml 807 BLAKE2B f04df70a40523ad668bfa7dda7c841ce098f2105d2bc94ab6291bb194bf1fec18445b779952db33614d685ee0964c7ac6b7666b3d8cf89f8bd9391b1ccd2c553 SHA512 48d5e93ca7e964d80dc579789c6f626f9590d102b451c4f0fced538aed1301e0cb7f93fce4d03deaddb72dcad22489aa3846d8fa8ac443fcdbc4fcb90ef19040
diff --git a/media-libs/libplacebo/libplacebo-1.7.0.ebuild b/media-libs/libplacebo/libplacebo-1.7.0.ebuild
deleted file mode 100644
index d564dd10f444..000000000000
--- a/media-libs/libplacebo/libplacebo-1.7.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://code.videolan.org/videolan/libplacebo.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://code.videolan.org/videolan/libplacebo/-/archive/v${PV}/libplacebo-v${PV}.tar.gz"
-	S="${WORKDIR}/${PN}-v${PV}"
-fi
-
-inherit meson ninja-utils multilib-minimal
-
-DESCRIPTION="Reusable library for GPU-accelerated image processing primitives"
-HOMEPAGE="https://github.com/haasn/libplacebo"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="glslang lcms +shaderc +vulkan"
-REQUIRED_USE="vulkan? ( || ( glslang shaderc ) )"
-
-RDEPEND="glslang? ( <dev-util/glslang-7.10[${MULTILIB_USEDEP}] )
-	lcms? ( media-libs/lcms:2[${MULTILIB_USEDEP}] )
-	shaderc? ( >=media-libs/shaderc-2017.2[${MULTILIB_USEDEP}] )
-	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Dglslang=$(usex glslang enabled disabled)
-		-Dlcms=$(usex lcms enabled disabled)
-		-Dshaderc=$(usex shaderc enabled disabled)
-		-Dvulkan=$(usex vulkan enabled disabled)
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	eninja
-}
-
-multilib_src_install() {
-	DESTDIR="${D}" eninja install
-}
diff --git a/media-libs/libshout/Manifest b/media-libs/libshout/Manifest
index cb1f01e0c526..d4d11792ebd3 100644
--- a/media-libs/libshout/Manifest
+++ b/media-libs/libshout/Manifest
@@ -3,6 +3,8 @@ AUX libshout-2.4.1-underlinking.patch 529 BLAKE2B 993ab69f011caa49b96f28ede17bbe
 AUX libshout-2.4.2-tls-compile-with-OpenSSL-1.1.0.patch 1862 BLAKE2B d478fa25f0771d64e644fe9884202d63bf198a0c3627e4dc5912258c45c9b5fc0143c9fe956ba0adc47dbc20744417d031175a3bbe6430f0fbea967f4fc0b1a4 SHA512 973a96892244934143f901d4469036ffe5fef46ea4e44d1c321d9ab888cb7865d59546aa6211b3268672355491d6876faebe57bb8cb1c0915cc692e66958cf0b
 DIST libshout-2.4.1.tar.gz 516161 BLAKE2B bedea3c043018eff4675fdb8b95e0bb8ff02a98994a4afcc76537124ebf7357f012f2e9445ebd207b576fc4166fb761d65066fe166fc8b611b96f5c5482a0e92 SHA512 4d4b958947e020de3330d49d39d59220fc89315f25f653a7456b9aa24ca9566fca30bb3d65e6348e79958656096b6b864ea8885157d24e55c8d84d6604670219
 DIST libshout-2.4.2.tar.gz 519249 BLAKE2B 15bd6a552eeb39654a07f5a43f670e53b37c0b239424d2530f09f156e1404da8133e557d614aa7c89aa36e3cec093fecd25aa05d855f283d4af51e1b543eb631 SHA512 ae4b042009887de22d105eb8238f4362f6ff51bd645fd51b5a87c4b5e3f5fdc99e9f99f85c24ae2e9d23eab92b854a7e733bf9f8cc61a8362ce984f02a014e93
+DIST libshout-2.4.3.tar.gz 529563 BLAKE2B 30d982fcf52507e07af23113560cfc9e43ca4ce37c286854326ea09215dc30c3c0d57320dce46dd4faec43b3d473df2f7882ad759479fb023166cec3f24327c5 SHA512 fe36778c6640e620f27504cb21234940e18a65a33f9178bf7e77d4baf854a9affc82d85db8ed8c1c8e2d80399685d8be10106fff5be1ddf76e03e2ffeeed1d34
 EBUILD libshout-2.4.1-r2.ebuild 1421 BLAKE2B b814eab2c4ae2e3b6b2b7a82f1185ba6ea9e55a0d984910ea9b4810d6a93ebe070ff31de5adba3b6c153958d0db467c57f719f1a011852036077d1297a00b672 SHA512 aa3401795a97f89075b00515aa33ee9b8a2ed681aec0197bcc4a70b87d3570c2686b56881b20b4e452bfacf7e2068fcb2ca1fcb328f9783ba5bf8f9d5d87681d
 EBUILD libshout-2.4.2.ebuild 1408 BLAKE2B d326f61d38ddd063bd728a735ee5a16b51d968ed847f51152c7c70beefa4539cdea2bd404ad2ec789f96e2819bada1ffb92d39fd8903a9476be830ed23c4b966 SHA512 f63419d790238f0e50ba5d9e0a1e92e0d2a377d0716b4be0f9eb05c2ced2b0ba295a6122f142c05e2faa47940b6b693da2777ca3da7af9de314e3c8ba1d1ce78
+EBUILD libshout-2.4.3.ebuild 1344 BLAKE2B b7fa4461f2b1828d6c29a3a1c51db554efb92a9a8651ab2720dd022b76b4f068c02924b820b4bd29652839748a8d6d4987508ed276065733d2e1d52dcf93820b SHA512 11d9ae449dc34c4c5f126e8e0f7a127cb83bcee5a236e25896a65547e52b2e1f305f670d3ff169add38ba15d76b4f9fbdae771831ad52d498c3a4cdfef058a46
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libshout/libshout-2.4.3.ebuild b/media-libs/libshout/libshout-2.4.3.ebuild
new file mode 100644
index 000000000000..e3730421c58a
--- /dev/null
+++ b/media-libs/libshout/libshout-2.4.3.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="library for connecting and sending data to icecast servers"
+HOMEPAGE="http://www.icecast.org/"
+SRC_URI="http://downloads.xiph.org/releases/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="libressl speex static-libs theora"
+
+RDEPEND="
+	>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+	>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
+	theora? ( >=media-libs/libtheora-1.1.1[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/shout/shout.h
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.4.1-underlinking.patch
+)
+
+src_prepare() {
+	default
+	# Fix docdir
+	sed '/^docdir/s@$(PACKAGE)@$(PF)@' -i Makefile.am || die
+	eautoreconf
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable speex)
+		$(use_enable static-libs static)
+		$(use_enable theora)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libsidplay/Manifest b/media-libs/libsidplay/Manifest
index b9f554c5936a..150498d175a2 100644
--- a/media-libs/libsidplay/Manifest
+++ b/media-libs/libsidplay/Manifest
@@ -9,6 +9,5 @@ AUX libsidplay-2.1.1-no_libtool_reference.patch 558 BLAKE2B 7f115c941dc0f9dd8201
 DIST libsidplay-1.36.59.tgz 390097 BLAKE2B bcb7e9eab4884270c8047af7f61e0afb2cf6ba24465b4859ac404f34cacec9a8c67ad42f3adf0c5f109cedecaa7710919296e30401c2dc0ca6f337186c9a329a SHA512 e7b0859e1389683d3e6aad7040b78ba37bb0a393c85f68ddb8a064371f978b34cc2e951ec564fa1117d12885cd976d10b02937e132d9a11badecd8652cf4d410
 DIST sidplay-libs-2.1.1.tar.gz 1900252 BLAKE2B f04e34f4cfc641a8222e5d53575108bd52deb2de2dc0b0d58e91581ade7128ac87f320f16e044baa23b54de6b5b6b833e9f6c0d37a1885341a329e778c0a0228 SHA512 754cd41f3d2d76754049522c395022bc090f99ea838e6d1ffb8d7689f3aedad9b3879be0312d0af49ba108563296c1176d1e533d1151d5b33368bfda0a1910e3
 EBUILD libsidplay-1.36.59-r2.ebuild 769 BLAKE2B 958c67f849ad398c6f4ea6d685a0b33f924884859a32e199d6dff19d1fb4819403eb3e9455bfaa350864335bc12f51a4a71c748684bf80ff6c4f51dfefad947a SHA512 eb762f63d10c9e4c67b6a51523d8e36bce10a5ee837da7a6841536c9b249a371cb4b1488c9041dbddfa0d04d9adc6508276e8890f57b369eed73ccd3e1d0244e
-EBUILD libsidplay-2.1.1-r4.ebuild 1168 BLAKE2B 8b69bec5f74b52932a64ee8ebaa8195afe5ab5cac8fe899c465f32b125fbaeac0f2d8dc03203e3225aa6ed94cc841124aab4613a71f90e71f95a04f3a35f8db3 SHA512 ee3ef694f09cccc476bf1003441afddadc8f085a311889f6cc6be21414581c833bfad9d898aaf8f92380787e7949899fa07907258ace1d902c1131f70d53a8ad
 EBUILD libsidplay-2.1.1-r5.ebuild 1245 BLAKE2B 6bd8a692a5d7f93249b2fc9cfc138746b8bf2c172b2247954312591d823143533d483344602052d5a05c4312cf4f7bd9492e3e382a74bafa75d6d552d17b91da SHA512 1a3c3a8b3ee1e487f0132692176212bcabbb74bb22861f0c22ac60888ab322ddfda90bab47b47a0578dee8cbf1c4608c9dd21c35271fc956be49ca2770756930
 MISC metadata.xml 294 BLAKE2B 8fcfebdeea5012bebd45c78bf374aadf8092aa88fe731a66e0ec56e642745d613139b6c2cc080f49394d87ff3d04c2e6f84dcf4538e22cbb4299e0decfa83fa7 SHA512 f2ca3b91c3f0f046bc5fd9eafb91a8acfa5a7987d0db24a6e1e6b79bb54a4a466f660953699ca4a84d500a42542e403e12523220e881a466d54b4ea6a4508998
diff --git a/media-libs/libsidplay/libsidplay-2.1.1-r4.ebuild b/media-libs/libsidplay/libsidplay-2.1.1-r4.ebuild
deleted file mode 100644
index 2bb0d5a474fd..000000000000
--- a/media-libs/libsidplay/libsidplay-2.1.1-r4.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils libtool multilib-minimal
-
-MY_P=sidplay-libs-${PV}
-
-DESCRIPTION="C64 SID player library"
-HOMEPAGE="http://sidplay2.sourceforge.net/"
-SRC_URI="mirror://sourceforge/sidplay2/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="static-libs"
-
-S=${WORKDIR}/${MY_P}
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/sidplay/sidconfig.h
-)
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-gcc41.patch \
-		"${FILESDIR}"/${P}-fbsd.patch \
-		"${FILESDIR}"/${P}-gcc43.patch \
-		"${FILESDIR}"/${P}-no_libtool_reference.patch
-
-	elibtoolize
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	econf \
-		--enable-shared \
-		$(use_enable static-libs static) \
-		--with-pic
-}
-
-multilib_src_install_all() {
-	docinto libsidplay
-	dodoc libsidplay/{AUTHORS,ChangeLog,README,TODO}
-
-	docinto libsidutils
-	dodoc libsidutils/{AUTHORS,ChangeLog,README,TODO}
-
-	docinto resid
-	dodoc resid/{AUTHORS,ChangeLog,NEWS,README,THANKS,TODO}
-
-	doenvd "${FILESDIR}"/65resid
-
-	prune_libtool_files --all
-}
diff --git a/media-libs/libwebp/Manifest b/media-libs/libwebp/Manifest
index 5e0870696286..4a70a4d5da78 100644
--- a/media-libs/libwebp/Manifest
+++ b/media-libs/libwebp/Manifest
@@ -7,5 +7,5 @@ EBUILD libwebp-0.5.2.ebuild 1770 BLAKE2B 3ad8b99c05e38a51755fd047be8e51339dafff3
 EBUILD libwebp-0.6.1.ebuild 1780 BLAKE2B afaa8d09c4ea4ae4e7c6c9a9f58620518e46b2b9946dbb148291c507c7daa568831063db2ce1dd0e7ae4539114ee3e82ce0a0f4ad1f07a739d8e6409e39c22b7 SHA512 b258c8ab17c12ccf7c5daf68edfb6bbde1fcb32f65949ecdb6ca8df8c48fd437971e4bf4ef6890b4fe4ee5438c7ad96e772fb4f20925f4012b7a6b87d80b5115
 EBUILD libwebp-1.0.0.ebuild 1824 BLAKE2B c1d551960e915c4c6984182b1211a007373f32dbc16612a355dd7c53dc0701da7672b1e75d1ea6a1c8d4689c54684047efb553f30d3ad321524aa7ef85b68f47 SHA512 06800280eaefc56b6cb8dd8cafb7531ab24ffcb15b05163b9adc0a5509c1a7fabc5f1dedd3637a1efb0ec1b38b754ec6c4657fdd9acc6aba14cb6739f53f5e5d
 EBUILD libwebp-1.0.1.ebuild 1842 BLAKE2B acca7da3a910aac00296c93582ead28869a9e17c5abc6bd2f9b6dc978119e49a3b2dae13bad5ffe9f3dbaabfecb072e2e1bd4b1e0e6dfd777e0c1f4b3c1bcb9c SHA512 82bf2cff0dd2c8da705c0818e6e122334d56b3fbcbe57e708ee29e3d303785afb4ac71b75a9bbdb7fadecb02f69966a4799134305daecb433b905b7fd20c5598
-EBUILD libwebp-1.0.2.ebuild 1832 BLAKE2B 9b537b859f3586c02c1b3b70bc2375ed1876209f9f0e71bbc554369beb2c825f66095a45148b001f4e0e3f30723839c7c2be8ddd6b29a6b2d8ad24962ef5c632 SHA512 9bf0eedf023e66535e4156028976d55cfd8b4938279c5b247cd5d4e4f409b47cdda04aabaad3a82a866a80d755bbc67438324bf8b2eaf69eddeb5a96e71a9cf0
+EBUILD libwebp-1.0.2.ebuild 1831 BLAKE2B 2bcb206a9a857c95c9b75bb0a589b0da2a7e620b7100c4c3cb4c9a3bd3590f5371fe6dd91daa18357134e31b9eea11f3e258786387576bc2d7f983e1866d554a SHA512 5e0476b0553ec4823225c2f540369385bafe1b675442f3f4427f3ed0e4528872cfa2f77bf09880fb26e656e298872bcf9f40858ac28f194c67a7d6be03813330
 MISC metadata.xml 626 BLAKE2B b3ca86f5241deb376b10d159d67eb6001b2a3d8700167b0bc512c067a6b7c72e6a53173e6f22a8a8a923097d67eec93642ed92c132743980cbf27af022f15e1a SHA512 b7348f6c830bb9537f97fcc0f3cbf8b55491913ea45020005734088e7c1aa71dfcacab9dd87bf3085e79554a3326f90b6c30543ad41f08d863639732132be78b
diff --git a/media-libs/libwebp/libwebp-1.0.2.ebuild b/media-libs/libwebp/libwebp-1.0.2.ebuild
index bf12a1b1b3f4..a28d7e1a2475 100644
--- a/media-libs/libwebp/libwebp-1.0.2.ebuild
+++ b/media-libs/libwebp/libwebp-1.0.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://downloads.webmproject.org/releases/webp/${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0/7" # subslot = libwebp soname version
 [[ "${PV}" = *_rc* ]] || \
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 gif +jpeg neon opengl +png static-libs swap-16bit-csp tiff"
 
 # TODO: dev-lang/swig bindings in swig/ subdirectory
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index e099a6bb21f1..bc630adf2aa6 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,24 +1,8 @@
 DIST mesa-18.3.6.tar.xz 11882744 BLAKE2B f0f0de6d4c40cf01c6b9cb97d772c6386deb3d08f66f2731fe60eff21edfa822b6d7a293fbf9e426acddbb58445b9b0e3c0b1bc8ae05e8b19e802872571449c2 SHA512 3a6dcaba99185e28d162b130bbd760fe87e6072065958189b28f41ea287ef041397897e098d93218a64802cf11c73806f7400a866bd8e5ed69694fa15c147487
-DIST mesa-19.0.2.tar.xz 11959876 BLAKE2B 4d82a339a1577fb156b48d330157894891326f36cb265421453a5fde5086ee05f83962fde49113f34917f750cfffb40c8bce84bd003fe9d7c1e6900c52dc4d66 SHA512 6b317205efa7d62150fae23489fbad5f062ecde99fb5b210fa7ccbed2e0ef60aee1f1e66e2c606ea5d59193c3218f732556706ab3b645b175044342d88984d51
-DIST mesa-19.0.3.tar.xz 11963844 BLAKE2B 7d8bae717c0a2a6143d3aee35852145a2032d40ad7f4edcd76eec46392f3917787592d13f9695de54a15ea5bcb3dec3181c418ddfb5b69a3e1b52fb796f04eab SHA512 aa170577252aa4157e4bd49076bbf6207e4aada9fc9f23b255de332e816f9c63e5661f752f2f276dd43e232a8926866004e2a2ff9ad4b411330969c2a9a7ffa0
-DIST mesa-19.0.4.tar.xz 11964060 BLAKE2B 5c0d0c6e019792ff6cd195f3b59303e2230fa32c24aa1524c3cccddc56ef6634732e79ff03c7bb20055c0489dbdd7cc103b27989179602f3c9ab332afd531d1a SHA512 431cd9360e1f6376e0966daf82322877b3833032c800f2d86816b37a6f3978d76294a01c3905a01af610582c9541c2a8b52b2e89c56cc954651aa7a790e84ca5
-DIST mesa-19.0.5.tar.xz 11967816 BLAKE2B 941f99194492fcdf4545d06d4f2d576a1a2b206aa9211dd8c3a018877a42dfac4a6d7b4103e781e4c4211661c118b663225252567e22226a866386a8e242f177 SHA512 aecd5ee54ac0316d5e318dbea0abdc06f23e67d75d36eb82d6cf6a396c9e850e1ccf4fa8815f8c4097b6039ebb1524673189350cbfd4b766ce75ce17c26d9d8d
 DIST mesa-19.0.6.tar.xz 11971284 BLAKE2B 264b3afe0701f288c5ba3f28f902e55f2c4888f79854b12b57faf29a27ed9141c6967cc6807a739604641a8fcfb5feb5315ba7f9ba85d3a3ea80cc2115ee7394 SHA512 320fd6b12ccd5e4a40dfc93546354848a38da09d90e4d5a1dae5d100b8106942acfc25ac3f705a2d3ab3b355162c74c7dfadbdb99a46cf2e5e0761f8542bfeb1
-DIST mesa-19.1.0-rc1.tar.xz 10877180 BLAKE2B 1ea358595875fbe46b58f5445762cec0c0bd6ee087ce9819237373e2b41aacb64365ac9832b20b9f5fb8838c3d2c6c929cd642bba18b99c7ef153ca124135918 SHA512 a56215882a7c22b7b8fe57d5703914d674841e4045676e2cc2e7834d17f4d5a765516bec4f01eea6772c50e1d979cc430e032302f38c6e7a4274bc43a4d647b1
-DIST mesa-19.1.0-rc2.tar.xz 10876808 BLAKE2B 2da9603ea7ec5c1de94ee24c3200f570e4ea127601f370230dc1bf1b64167c6d405fbd6bdb4cdae6be46ed0ff1610f12c0445c3f5a65dd6559e91b6f664872ca SHA512 4d04bec48cbfb17d6dbe7b7700083612e46cbaad3e3630d6219fd1988f5e793cdb5100b8c2531a94b6078f8bb239fef27ed440122d12a2473be5be8648b6a8b1
-DIST mesa-19.1.0-rc3.tar.xz 10878280 BLAKE2B 0b95b82d46a2c72185652fef76a50ec82b51a2f8efa9ca72e2c10eb0443e9ba43c5906de37d2479dc97ed48a8932eebea27de7e08321d7d3205b188af9f64642 SHA512 740d5d13458b54e1942bfe7165938ec414aa7949aa60109ba872236f3b483c7305ac76b1b48c38dc6fd7691748106447757ac081f364952cc9e00f45fa9e2ea5
-DIST mesa-19.1.0-rc4.tar.xz 10877676 BLAKE2B 7d9237b56c74d72c3cf6a218aa3c72e7c3cefe2511a61a9c9a16dcab306a567ffdeb2d4745dcb4113667ffa4ab5b806677e3b065d8574c1cb44419b99d193569 SHA512 04cc5a537d803359b9eb3207f7b7ab1357126fe78ae0a0ba24df51d2fbbf4e0cf1815a60f99a10b33c822c08af0c84adef44849e73c883f5ce30fdae142c5b61
-DIST mesa-19.1.0-rc5.tar.xz 10878100 BLAKE2B b24fca148d01a05bc7c7a90b07f55fa9996e80b2ccce4ad6ee855889211226b792aedf7809acba26ec20ef961fe37672945ba00ddcc4361c64b42882d2f71dc1 SHA512 033920bbbf395104bfb6ffe9482e0f504b5cb0009be25bb1b0a4269bc6cf9c737de82350e994d568f454ed5b3206fc23927122032b3702122fe7edbc2d749e6d
+DIST mesa-19.1.0.tar.xz 10926676 BLAKE2B 87d21c2b79e6af7c020ca87d9ece79586d9a86ad4ce79df975b8bab4671d8d4f84b32e5146badeb337713ca6996338740b4d8f77ab4851f7b624fecc495c220e SHA512 25b186ae8037dedea5691e0b77b22f2065f3c877838378651726dfa1b34ef49dcc56f1dbd124e99285e5f14489db936a886a6740495b5b279e8363424bfb3433
 EBUILD mesa-18.3.6.ebuild 13688 BLAKE2B e8738fc05efad0af1f627af3339abcb609d55bc656402f4a7cd10d0216a0bfd067ae401c357ce4d9bb7b82d81fb8df5129025840d557863a04f183c38a299ef1 SHA512 9a99c7afc94de3e259156b7e48a8059a90bf8069684ba3354e83aa599e50baf6e63ea6c87fbfd672e0f97bf8383cabe93b193d56df840d586929301fc920ae10
-EBUILD mesa-19.0.2.ebuild 13837 BLAKE2B 3add45d862939caa95daf019edca4417c63b9e7d995b01f1ffec5d1ad2d918cb272d0136f357dcb65285ccdaa20a900a246760d56a6f56e0518d5bf32ef99718 SHA512 312e014c322297e5ad3438255689a10ef32c0bb3bcd379aef5f3187648e8d7a2e17587cda27f731f6e3dd9d5bb0719a4c590b6ea1b09b1bac8c54de36f553ce8
-EBUILD mesa-19.0.3.ebuild 13837 BLAKE2B 3add45d862939caa95daf019edca4417c63b9e7d995b01f1ffec5d1ad2d918cb272d0136f357dcb65285ccdaa20a900a246760d56a6f56e0518d5bf32ef99718 SHA512 312e014c322297e5ad3438255689a10ef32c0bb3bcd379aef5f3187648e8d7a2e17587cda27f731f6e3dd9d5bb0719a4c590b6ea1b09b1bac8c54de36f553ce8
-EBUILD mesa-19.0.4.ebuild 13837 BLAKE2B 3add45d862939caa95daf019edca4417c63b9e7d995b01f1ffec5d1ad2d918cb272d0136f357dcb65285ccdaa20a900a246760d56a6f56e0518d5bf32ef99718 SHA512 312e014c322297e5ad3438255689a10ef32c0bb3bcd379aef5f3187648e8d7a2e17587cda27f731f6e3dd9d5bb0719a4c590b6ea1b09b1bac8c54de36f553ce8
-EBUILD mesa-19.0.5.ebuild 13837 BLAKE2B 3add45d862939caa95daf019edca4417c63b9e7d995b01f1ffec5d1ad2d918cb272d0136f357dcb65285ccdaa20a900a246760d56a6f56e0518d5bf32ef99718 SHA512 312e014c322297e5ad3438255689a10ef32c0bb3bcd379aef5f3187648e8d7a2e17587cda27f731f6e3dd9d5bb0719a4c590b6ea1b09b1bac8c54de36f553ce8
 EBUILD mesa-19.0.6.ebuild 13837 BLAKE2B 3add45d862939caa95daf019edca4417c63b9e7d995b01f1ffec5d1ad2d918cb272d0136f357dcb65285ccdaa20a900a246760d56a6f56e0518d5bf32ef99718 SHA512 312e014c322297e5ad3438255689a10ef32c0bb3bcd379aef5f3187648e8d7a2e17587cda27f731f6e3dd9d5bb0719a4c590b6ea1b09b1bac8c54de36f553ce8
-EBUILD mesa-19.1.0_rc1.ebuild 14245 BLAKE2B d4b326ae22614a1433054829ac586b31c616b6142a2054e1202ce442835b56b05b7227d2fce08c7ab3007dbcc82b8652ed4fefa2201b04958791468f04bdecfa SHA512 ffcc6eae28666708750fb807ea96346275f5302a50f5c2f1d40026b8683ad85db381ae62a56449fb510724cd0d8218f28090b300efc52bdc7b0e4b150ee4ba56
-EBUILD mesa-19.1.0_rc2.ebuild 14245 BLAKE2B d4b326ae22614a1433054829ac586b31c616b6142a2054e1202ce442835b56b05b7227d2fce08c7ab3007dbcc82b8652ed4fefa2201b04958791468f04bdecfa SHA512 ffcc6eae28666708750fb807ea96346275f5302a50f5c2f1d40026b8683ad85db381ae62a56449fb510724cd0d8218f28090b300efc52bdc7b0e4b150ee4ba56
-EBUILD mesa-19.1.0_rc3.ebuild 14245 BLAKE2B d4b326ae22614a1433054829ac586b31c616b6142a2054e1202ce442835b56b05b7227d2fce08c7ab3007dbcc82b8652ed4fefa2201b04958791468f04bdecfa SHA512 ffcc6eae28666708750fb807ea96346275f5302a50f5c2f1d40026b8683ad85db381ae62a56449fb510724cd0d8218f28090b300efc52bdc7b0e4b150ee4ba56
-EBUILD mesa-19.1.0_rc4.ebuild 14245 BLAKE2B d4b326ae22614a1433054829ac586b31c616b6142a2054e1202ce442835b56b05b7227d2fce08c7ab3007dbcc82b8652ed4fefa2201b04958791468f04bdecfa SHA512 ffcc6eae28666708750fb807ea96346275f5302a50f5c2f1d40026b8683ad85db381ae62a56449fb510724cd0d8218f28090b300efc52bdc7b0e4b150ee4ba56
-EBUILD mesa-19.1.0_rc5.ebuild 14245 BLAKE2B d4b326ae22614a1433054829ac586b31c616b6142a2054e1202ce442835b56b05b7227d2fce08c7ab3007dbcc82b8652ed4fefa2201b04958791468f04bdecfa SHA512 ffcc6eae28666708750fb807ea96346275f5302a50f5c2f1d40026b8683ad85db381ae62a56449fb510724cd0d8218f28090b300efc52bdc7b0e4b150ee4ba56
+EBUILD mesa-19.1.0.ebuild 14245 BLAKE2B d4b326ae22614a1433054829ac586b31c616b6142a2054e1202ce442835b56b05b7227d2fce08c7ab3007dbcc82b8652ed4fefa2201b04958791468f04bdecfa SHA512 ffcc6eae28666708750fb807ea96346275f5302a50f5c2f1d40026b8683ad85db381ae62a56449fb510724cd0d8218f28090b300efc52bdc7b0e4b150ee4ba56
 EBUILD mesa-9999.ebuild 14245 BLAKE2B d4b326ae22614a1433054829ac586b31c616b6142a2054e1202ce442835b56b05b7227d2fce08c7ab3007dbcc82b8652ed4fefa2201b04958791468f04bdecfa SHA512 ffcc6eae28666708750fb807ea96346275f5302a50f5c2f1d40026b8683ad85db381ae62a56449fb510724cd0d8218f28090b300efc52bdc7b0e4b150ee4ba56
 MISC metadata.xml 2041 BLAKE2B dd7f78a57123408674d7ca6a8e7a455e84ac668bf9e6552502cf62dc2464f1a62765db5c22c0d4dab82e59a5325ad10d69b436aab96b5a4d5c789f0a7b671469 SHA512 f07128004b03ddfc6d235de15a95c0bd6338133b13daa31907bd2897d65eaa9c8ad1164ec5e21fb7fa6417927a8109cbf86b24bc62b09cfa29d0bb18fcd3c4b1
diff --git a/media-libs/mesa/mesa-19.0.2.ebuild b/media-libs/mesa/mesa-19.0.2.ebuild
deleted file mode 100644
index 6e5cc0499b8b..000000000000
--- a/media-libs/mesa/mesa-19.0.2.ebuild
+++ /dev/null
@@ -1,525 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_5 python3_6 python3_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 ~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 +libglvnd +llvm
-	lm_sensors opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind
-	vdpau vulkan wayland xa xvmc"
-
-REQUIRED_USE="
-	d3d9?   ( dri3 || ( video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
-	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.97"
-RDEPEND="
-	!app-eselect/eselect-mesa
-	>=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}]
-	libglvnd? (
-		media-libs/libglvnd[${MULTILIB_USEDEP}]
-		!app-eselect/eselect-opengl
-	)
-	!libglvnd? (
-		>=app-eselect/eselect-opengl-1.3.0
-	)
-	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? (
-					dev-libs/ocl-icd[khronos-headers,${MULTILIB_USEDEP}]
-					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. < 9.
-# 3. Specify LLVM_MAX_SLOT, e.g. 8.
-LLVM_MAX_SLOT="8"
-LLVM_DEPSTR="
-	|| (
-		sys-devel/llvm:8[${MULTILIB_USEDEP}]
-		sys-devel/llvm:7[${MULTILIB_USEDEP}]
-	)
-	<sys-devel/llvm-9:=[${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 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 &&
-		   ! use video_cards_vmware; then
-			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
-		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 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
-}
-
-python_check_deps() {
-	has_version --host-root ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
-}
-
-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
-
-	emesonargs+=( -Dplatforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm") )
-
-	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="${EPREFIX}"/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 ||
-		   use video_cards_vmware; 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
-		gallium_enable video_cards_virgl virgl
-
-		# opencl stuff
-		emesonargs+=(
-			-Dgallium-opencl="$(usex opencl icd disabled)"
-		)
-	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 libglvnd glvnd)
-		$(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)
-		-Db_ndebug=$(usex debug false true)
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	meson_src_install
-
-	use libglvnd && rm -f "${D}"/usr/$(get_libdir)/libGLESv{1_CM,2}.so*
-}
-
-multilib_src_install_all() {
-	einstalldocs
-}
-
-multilib_src_test() {
-	meson test -v -C "${BUILD_DIR}" -t 100
-}
-
-pkg_postinst() {
-	# Switch to the xorg implementation.
-	echo
-	eselect opengl set --use-old ${OPENGL_DIR}
-}
-
-# $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-19.0.3.ebuild b/media-libs/mesa/mesa-19.0.3.ebuild
deleted file mode 100644
index 6e5cc0499b8b..000000000000
--- a/media-libs/mesa/mesa-19.0.3.ebuild
+++ /dev/null
@@ -1,525 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_5 python3_6 python3_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 ~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 +libglvnd +llvm
-	lm_sensors opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind
-	vdpau vulkan wayland xa xvmc"
-
-REQUIRED_USE="
-	d3d9?   ( dri3 || ( video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
-	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.97"
-RDEPEND="
-	!app-eselect/eselect-mesa
-	>=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}]
-	libglvnd? (
-		media-libs/libglvnd[${MULTILIB_USEDEP}]
-		!app-eselect/eselect-opengl
-	)
-	!libglvnd? (
-		>=app-eselect/eselect-opengl-1.3.0
-	)
-	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? (
-					dev-libs/ocl-icd[khronos-headers,${MULTILIB_USEDEP}]
-					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. < 9.
-# 3. Specify LLVM_MAX_SLOT, e.g. 8.
-LLVM_MAX_SLOT="8"
-LLVM_DEPSTR="
-	|| (
-		sys-devel/llvm:8[${MULTILIB_USEDEP}]
-		sys-devel/llvm:7[${MULTILIB_USEDEP}]
-	)
-	<sys-devel/llvm-9:=[${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 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 &&
-		   ! use video_cards_vmware; then
-			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
-		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 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
-}
-
-python_check_deps() {
-	has_version --host-root ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
-}
-
-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
-
-	emesonargs+=( -Dplatforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm") )
-
-	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="${EPREFIX}"/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 ||
-		   use video_cards_vmware; 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
-		gallium_enable video_cards_virgl virgl
-
-		# opencl stuff
-		emesonargs+=(
-			-Dgallium-opencl="$(usex opencl icd disabled)"
-		)
-	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 libglvnd glvnd)
-		$(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)
-		-Db_ndebug=$(usex debug false true)
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	meson_src_install
-
-	use libglvnd && rm -f "${D}"/usr/$(get_libdir)/libGLESv{1_CM,2}.so*
-}
-
-multilib_src_install_all() {
-	einstalldocs
-}
-
-multilib_src_test() {
-	meson test -v -C "${BUILD_DIR}" -t 100
-}
-
-pkg_postinst() {
-	# Switch to the xorg implementation.
-	echo
-	eselect opengl set --use-old ${OPENGL_DIR}
-}
-
-# $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-19.0.4.ebuild b/media-libs/mesa/mesa-19.0.4.ebuild
deleted file mode 100644
index 6e5cc0499b8b..000000000000
--- a/media-libs/mesa/mesa-19.0.4.ebuild
+++ /dev/null
@@ -1,525 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_5 python3_6 python3_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 ~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 +libglvnd +llvm
-	lm_sensors opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind
-	vdpau vulkan wayland xa xvmc"
-
-REQUIRED_USE="
-	d3d9?   ( dri3 || ( video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
-	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.97"
-RDEPEND="
-	!app-eselect/eselect-mesa
-	>=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}]
-	libglvnd? (
-		media-libs/libglvnd[${MULTILIB_USEDEP}]
-		!app-eselect/eselect-opengl
-	)
-	!libglvnd? (
-		>=app-eselect/eselect-opengl-1.3.0
-	)
-	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? (
-					dev-libs/ocl-icd[khronos-headers,${MULTILIB_USEDEP}]
-					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. < 9.
-# 3. Specify LLVM_MAX_SLOT, e.g. 8.
-LLVM_MAX_SLOT="8"
-LLVM_DEPSTR="
-	|| (
-		sys-devel/llvm:8[${MULTILIB_USEDEP}]
-		sys-devel/llvm:7[${MULTILIB_USEDEP}]
-	)
-	<sys-devel/llvm-9:=[${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 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 &&
-		   ! use video_cards_vmware; then
-			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
-		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 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
-}
-
-python_check_deps() {
-	has_version --host-root ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
-}
-
-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
-
-	emesonargs+=( -Dplatforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm") )
-
-	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="${EPREFIX}"/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 ||
-		   use video_cards_vmware; 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
-		gallium_enable video_cards_virgl virgl
-
-		# opencl stuff
-		emesonargs+=(
-			-Dgallium-opencl="$(usex opencl icd disabled)"
-		)
-	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 libglvnd glvnd)
-		$(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)
-		-Db_ndebug=$(usex debug false true)
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	meson_src_install
-
-	use libglvnd && rm -f "${D}"/usr/$(get_libdir)/libGLESv{1_CM,2}.so*
-}
-
-multilib_src_install_all() {
-	einstalldocs
-}
-
-multilib_src_test() {
-	meson test -v -C "${BUILD_DIR}" -t 100
-}
-
-pkg_postinst() {
-	# Switch to the xorg implementation.
-	echo
-	eselect opengl set --use-old ${OPENGL_DIR}
-}
-
-# $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-19.0.5.ebuild b/media-libs/mesa/mesa-19.0.5.ebuild
deleted file mode 100644
index 6e5cc0499b8b..000000000000
--- a/media-libs/mesa/mesa-19.0.5.ebuild
+++ /dev/null
@@ -1,525 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_5 python3_6 python3_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 ~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 +libglvnd +llvm
-	lm_sensors opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind
-	vdpau vulkan wayland xa xvmc"
-
-REQUIRED_USE="
-	d3d9?   ( dri3 || ( video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
-	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.97"
-RDEPEND="
-	!app-eselect/eselect-mesa
-	>=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}]
-	libglvnd? (
-		media-libs/libglvnd[${MULTILIB_USEDEP}]
-		!app-eselect/eselect-opengl
-	)
-	!libglvnd? (
-		>=app-eselect/eselect-opengl-1.3.0
-	)
-	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? (
-					dev-libs/ocl-icd[khronos-headers,${MULTILIB_USEDEP}]
-					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. < 9.
-# 3. Specify LLVM_MAX_SLOT, e.g. 8.
-LLVM_MAX_SLOT="8"
-LLVM_DEPSTR="
-	|| (
-		sys-devel/llvm:8[${MULTILIB_USEDEP}]
-		sys-devel/llvm:7[${MULTILIB_USEDEP}]
-	)
-	<sys-devel/llvm-9:=[${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 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 &&
-		   ! use video_cards_vmware; then
-			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
-		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 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
-}
-
-python_check_deps() {
-	has_version --host-root ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
-}
-
-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
-
-	emesonargs+=( -Dplatforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm") )
-
-	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="${EPREFIX}"/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 ||
-		   use video_cards_vmware; 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
-		gallium_enable video_cards_virgl virgl
-
-		# opencl stuff
-		emesonargs+=(
-			-Dgallium-opencl="$(usex opencl icd disabled)"
-		)
-	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 libglvnd glvnd)
-		$(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)
-		-Db_ndebug=$(usex debug false true)
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	meson_src_install
-
-	use libglvnd && rm -f "${D}"/usr/$(get_libdir)/libGLESv{1_CM,2}.so*
-}
-
-multilib_src_install_all() {
-	einstalldocs
-}
-
-multilib_src_test() {
-	meson test -v -C "${BUILD_DIR}" -t 100
-}
-
-pkg_postinst() {
-	# Switch to the xorg implementation.
-	echo
-	eselect opengl set --use-old ${OPENGL_DIR}
-}
-
-# $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-19.1.0_rc1.ebuild b/media-libs/mesa/mesa-19.1.0.ebuild
index 20146f77c705..20146f77c705 100644
--- a/media-libs/mesa/mesa-19.1.0_rc1.ebuild
+++ b/media-libs/mesa/mesa-19.1.0.ebuild
diff --git a/media-libs/mesa/mesa-19.1.0_rc2.ebuild b/media-libs/mesa/mesa-19.1.0_rc2.ebuild
deleted file mode 100644
index 20146f77c705..000000000000
--- a/media-libs/mesa/mesa-19.1.0_rc2.ebuild
+++ /dev/null
@@ -1,538 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_5 python3_6 python3_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 ~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 intel iris 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 +libglvnd +llvm
-	lm_sensors opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind
-	vdpau vulkan vulkan-overlay wayland xa xvmc"
-
-REQUIRED_USE="
-	d3d9?   ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
-	gles1?  ( egl )
-	gles2?  ( egl )
-	vulkan? ( dri3
-			  || ( video_cards_i965 video_cards_iris video_cards_radeonsi )
-			  video_cards_radeonsi? ( llvm ) )
-	vulkan-overlay? ( vulkan )
-	wayland? ( egl gbm )
-	video_cards_freedreno?  ( gallium )
-	video_cards_intel?  ( classic )
-	video_cards_i915?   ( || ( classic gallium ) )
-	video_cards_i965?   ( classic )
-	video_cards_iris?   ( gallium )
-	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.97"
-RDEPEND="
-	!app-eselect/eselect-mesa
-	>=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}]
-	libglvnd? (
-		media-libs/libglvnd[${MULTILIB_USEDEP}]
-		!app-eselect/eselect-opengl
-	)
-	!libglvnd? (
-		>=app-eselect/eselect-opengl-1.3.0
-	)
-	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? (
-					dev-libs/ocl-icd[khronos-headers,${MULTILIB_USEDEP}]
-					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] )
-	vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] )
-"
-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. < 10.
-# 3. Specify LLVM_MAX_SLOT, e.g. 9.
-LLVM_MAX_SLOT="9"
-LLVM_DEPSTR="
-	|| (
-		sys-devel/llvm:9[${MULTILIB_USEDEP}]
-		sys-devel/llvm:8[${MULTILIB_USEDEP}]
-		sys-devel/llvm:7[${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 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 &&
-		   ! use video_cards_vmware; then
-			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
-		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 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
-}
-
-python_check_deps() {
-	has_version --host-root ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
-}
-
-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
-
-	emesonargs+=( -Dplatforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm") )
-
-	if use gallium; then
-		emesonargs+=(
-			$(meson_use llvm)
-			$(meson_use lm_sensors lmsensors)
-			$(meson_use unwind libunwind)
-		)
-
-		if use video_cards_iris ||
-		   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="${EPREFIX}"/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 ||
-		   use video_cards_vmware; 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
-
-		if use video_cards_freedreno ||
-		   use video_cards_vc4 ||
-		   use video_cards_vivante; then
-			gallium_enable -- kmsro
-		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
-
-		# 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_iris iris
-
-		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
-		gallium_enable video_cards_virgl virgl
-
-		# opencl stuff
-		emesonargs+=(
-			-Dgallium-opencl="$(usex opencl icd disabled)"
-		)
-	fi
-
-	if use vulkan; then
-		vulkan_enable video_cards_i965 intel
-		vulkan_enable video_cards_iris 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 libglvnd glvnd)
-		$(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[*]}")
-		$(meson_use vulkan-overlay vulkan-overlay-layer)
-		--buildtype $(usex debug debug plain)
-		-Db_ndebug=$(usex debug false true)
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	meson_src_install
-
-	use libglvnd && rm -f "${D}"/usr/$(get_libdir)/libGLESv{1_CM,2}.so*
-}
-
-multilib_src_install_all() {
-	einstalldocs
-}
-
-multilib_src_test() {
-	meson test -v -C "${BUILD_DIR}" -t 100
-}
-
-pkg_postinst() {
-	# Switch to the xorg implementation.
-	echo
-	eselect opengl set --use-old ${OPENGL_DIR}
-}
-
-# $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-19.1.0_rc3.ebuild b/media-libs/mesa/mesa-19.1.0_rc3.ebuild
deleted file mode 100644
index 20146f77c705..000000000000
--- a/media-libs/mesa/mesa-19.1.0_rc3.ebuild
+++ /dev/null
@@ -1,538 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_5 python3_6 python3_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 ~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 intel iris 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 +libglvnd +llvm
-	lm_sensors opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind
-	vdpau vulkan vulkan-overlay wayland xa xvmc"
-
-REQUIRED_USE="
-	d3d9?   ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
-	gles1?  ( egl )
-	gles2?  ( egl )
-	vulkan? ( dri3
-			  || ( video_cards_i965 video_cards_iris video_cards_radeonsi )
-			  video_cards_radeonsi? ( llvm ) )
-	vulkan-overlay? ( vulkan )
-	wayland? ( egl gbm )
-	video_cards_freedreno?  ( gallium )
-	video_cards_intel?  ( classic )
-	video_cards_i915?   ( || ( classic gallium ) )
-	video_cards_i965?   ( classic )
-	video_cards_iris?   ( gallium )
-	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.97"
-RDEPEND="
-	!app-eselect/eselect-mesa
-	>=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}]
-	libglvnd? (
-		media-libs/libglvnd[${MULTILIB_USEDEP}]
-		!app-eselect/eselect-opengl
-	)
-	!libglvnd? (
-		>=app-eselect/eselect-opengl-1.3.0
-	)
-	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? (
-					dev-libs/ocl-icd[khronos-headers,${MULTILIB_USEDEP}]
-					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] )
-	vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] )
-"
-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. < 10.
-# 3. Specify LLVM_MAX_SLOT, e.g. 9.
-LLVM_MAX_SLOT="9"
-LLVM_DEPSTR="
-	|| (
-		sys-devel/llvm:9[${MULTILIB_USEDEP}]
-		sys-devel/llvm:8[${MULTILIB_USEDEP}]
-		sys-devel/llvm:7[${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 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 &&
-		   ! use video_cards_vmware; then
-			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
-		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 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
-}
-
-python_check_deps() {
-	has_version --host-root ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
-}
-
-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
-
-	emesonargs+=( -Dplatforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm") )
-
-	if use gallium; then
-		emesonargs+=(
-			$(meson_use llvm)
-			$(meson_use lm_sensors lmsensors)
-			$(meson_use unwind libunwind)
-		)
-
-		if use video_cards_iris ||
-		   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="${EPREFIX}"/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 ||
-		   use video_cards_vmware; 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
-
-		if use video_cards_freedreno ||
-		   use video_cards_vc4 ||
-		   use video_cards_vivante; then
-			gallium_enable -- kmsro
-		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
-
-		# 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_iris iris
-
-		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
-		gallium_enable video_cards_virgl virgl
-
-		# opencl stuff
-		emesonargs+=(
-			-Dgallium-opencl="$(usex opencl icd disabled)"
-		)
-	fi
-
-	if use vulkan; then
-		vulkan_enable video_cards_i965 intel
-		vulkan_enable video_cards_iris 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 libglvnd glvnd)
-		$(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[*]}")
-		$(meson_use vulkan-overlay vulkan-overlay-layer)
-		--buildtype $(usex debug debug plain)
-		-Db_ndebug=$(usex debug false true)
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	meson_src_install
-
-	use libglvnd && rm -f "${D}"/usr/$(get_libdir)/libGLESv{1_CM,2}.so*
-}
-
-multilib_src_install_all() {
-	einstalldocs
-}
-
-multilib_src_test() {
-	meson test -v -C "${BUILD_DIR}" -t 100
-}
-
-pkg_postinst() {
-	# Switch to the xorg implementation.
-	echo
-	eselect opengl set --use-old ${OPENGL_DIR}
-}
-
-# $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-19.1.0_rc4.ebuild b/media-libs/mesa/mesa-19.1.0_rc4.ebuild
deleted file mode 100644
index 20146f77c705..000000000000
--- a/media-libs/mesa/mesa-19.1.0_rc4.ebuild
+++ /dev/null
@@ -1,538 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_5 python3_6 python3_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 ~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 intel iris 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 +libglvnd +llvm
-	lm_sensors opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind
-	vdpau vulkan vulkan-overlay wayland xa xvmc"
-
-REQUIRED_USE="
-	d3d9?   ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
-	gles1?  ( egl )
-	gles2?  ( egl )
-	vulkan? ( dri3
-			  || ( video_cards_i965 video_cards_iris video_cards_radeonsi )
-			  video_cards_radeonsi? ( llvm ) )
-	vulkan-overlay? ( vulkan )
-	wayland? ( egl gbm )
-	video_cards_freedreno?  ( gallium )
-	video_cards_intel?  ( classic )
-	video_cards_i915?   ( || ( classic gallium ) )
-	video_cards_i965?   ( classic )
-	video_cards_iris?   ( gallium )
-	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.97"
-RDEPEND="
-	!app-eselect/eselect-mesa
-	>=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}]
-	libglvnd? (
-		media-libs/libglvnd[${MULTILIB_USEDEP}]
-		!app-eselect/eselect-opengl
-	)
-	!libglvnd? (
-		>=app-eselect/eselect-opengl-1.3.0
-	)
-	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? (
-					dev-libs/ocl-icd[khronos-headers,${MULTILIB_USEDEP}]
-					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] )
-	vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] )
-"
-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. < 10.
-# 3. Specify LLVM_MAX_SLOT, e.g. 9.
-LLVM_MAX_SLOT="9"
-LLVM_DEPSTR="
-	|| (
-		sys-devel/llvm:9[${MULTILIB_USEDEP}]
-		sys-devel/llvm:8[${MULTILIB_USEDEP}]
-		sys-devel/llvm:7[${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 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 &&
-		   ! use video_cards_vmware; then
-			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
-		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 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
-}
-
-python_check_deps() {
-	has_version --host-root ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
-}
-
-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
-
-	emesonargs+=( -Dplatforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm") )
-
-	if use gallium; then
-		emesonargs+=(
-			$(meson_use llvm)
-			$(meson_use lm_sensors lmsensors)
-			$(meson_use unwind libunwind)
-		)
-
-		if use video_cards_iris ||
-		   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="${EPREFIX}"/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 ||
-		   use video_cards_vmware; 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
-
-		if use video_cards_freedreno ||
-		   use video_cards_vc4 ||
-		   use video_cards_vivante; then
-			gallium_enable -- kmsro
-		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
-
-		# 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_iris iris
-
-		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
-		gallium_enable video_cards_virgl virgl
-
-		# opencl stuff
-		emesonargs+=(
-			-Dgallium-opencl="$(usex opencl icd disabled)"
-		)
-	fi
-
-	if use vulkan; then
-		vulkan_enable video_cards_i965 intel
-		vulkan_enable video_cards_iris 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 libglvnd glvnd)
-		$(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[*]}")
-		$(meson_use vulkan-overlay vulkan-overlay-layer)
-		--buildtype $(usex debug debug plain)
-		-Db_ndebug=$(usex debug false true)
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	meson_src_install
-
-	use libglvnd && rm -f "${D}"/usr/$(get_libdir)/libGLESv{1_CM,2}.so*
-}
-
-multilib_src_install_all() {
-	einstalldocs
-}
-
-multilib_src_test() {
-	meson test -v -C "${BUILD_DIR}" -t 100
-}
-
-pkg_postinst() {
-	# Switch to the xorg implementation.
-	echo
-	eselect opengl set --use-old ${OPENGL_DIR}
-}
-
-# $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-19.1.0_rc5.ebuild b/media-libs/mesa/mesa-19.1.0_rc5.ebuild
deleted file mode 100644
index 20146f77c705..000000000000
--- a/media-libs/mesa/mesa-19.1.0_rc5.ebuild
+++ /dev/null
@@ -1,538 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_5 python3_6 python3_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 ~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 intel iris 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 +libglvnd +llvm
-	lm_sensors opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind
-	vdpau vulkan vulkan-overlay wayland xa xvmc"
-
-REQUIRED_USE="
-	d3d9?   ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
-	gles1?  ( egl )
-	gles2?  ( egl )
-	vulkan? ( dri3
-			  || ( video_cards_i965 video_cards_iris video_cards_radeonsi )
-			  video_cards_radeonsi? ( llvm ) )
-	vulkan-overlay? ( vulkan )
-	wayland? ( egl gbm )
-	video_cards_freedreno?  ( gallium )
-	video_cards_intel?  ( classic )
-	video_cards_i915?   ( || ( classic gallium ) )
-	video_cards_i965?   ( classic )
-	video_cards_iris?   ( gallium )
-	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.97"
-RDEPEND="
-	!app-eselect/eselect-mesa
-	>=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}]
-	libglvnd? (
-		media-libs/libglvnd[${MULTILIB_USEDEP}]
-		!app-eselect/eselect-opengl
-	)
-	!libglvnd? (
-		>=app-eselect/eselect-opengl-1.3.0
-	)
-	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? (
-					dev-libs/ocl-icd[khronos-headers,${MULTILIB_USEDEP}]
-					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] )
-	vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] )
-"
-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. < 10.
-# 3. Specify LLVM_MAX_SLOT, e.g. 9.
-LLVM_MAX_SLOT="9"
-LLVM_DEPSTR="
-	|| (
-		sys-devel/llvm:9[${MULTILIB_USEDEP}]
-		sys-devel/llvm:8[${MULTILIB_USEDEP}]
-		sys-devel/llvm:7[${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 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 &&
-		   ! use video_cards_vmware; then
-			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
-		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 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
-}
-
-python_check_deps() {
-	has_version --host-root ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
-}
-
-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
-
-	emesonargs+=( -Dplatforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm") )
-
-	if use gallium; then
-		emesonargs+=(
-			$(meson_use llvm)
-			$(meson_use lm_sensors lmsensors)
-			$(meson_use unwind libunwind)
-		)
-
-		if use video_cards_iris ||
-		   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="${EPREFIX}"/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 ||
-		   use video_cards_vmware; 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
-
-		if use video_cards_freedreno ||
-		   use video_cards_vc4 ||
-		   use video_cards_vivante; then
-			gallium_enable -- kmsro
-		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
-
-		# 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_iris iris
-
-		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
-		gallium_enable video_cards_virgl virgl
-
-		# opencl stuff
-		emesonargs+=(
-			-Dgallium-opencl="$(usex opencl icd disabled)"
-		)
-	fi
-
-	if use vulkan; then
-		vulkan_enable video_cards_i965 intel
-		vulkan_enable video_cards_iris 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 libglvnd glvnd)
-		$(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[*]}")
-		$(meson_use vulkan-overlay vulkan-overlay-layer)
-		--buildtype $(usex debug debug plain)
-		-Db_ndebug=$(usex debug false true)
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	meson_src_install
-
-	use libglvnd && rm -f "${D}"/usr/$(get_libdir)/libGLESv{1_CM,2}.so*
-}
-
-multilib_src_install_all() {
-	einstalldocs
-}
-
-multilib_src_test() {
-	meson test -v -C "${BUILD_DIR}" -t 100
-}
-
-pkg_postinst() {
-	# Switch to the xorg implementation.
-	echo
-	eselect opengl set --use-old ${OPENGL_DIR}
-}
-
-# $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/openal/Manifest b/media-libs/openal/Manifest
index 3b15243ff4e3..46fe87fe145f 100644
--- a/media-libs/openal/Manifest
+++ b/media-libs/openal/Manifest
@@ -1,6 +1,3 @@
-AUX openal-1.18.2-dont-specify-macros-as-arguments.patch 2072 BLAKE2B b42ed02e6be499198c2fbfb212a47a3c08aba72a63699e725f504b18662086335513a0a177fa85f2dd019d65b18074ea5e7b19348e34dbf17bcce208fe96ba11 SHA512 e28b2ad70c35fd7018491cba84f33bcd5e6d6dd9944d47ad4cbba5852663d436be16a901e3e643b48f5e29d72d5b154c79ce83cd291075ff4ad272a1c77a2fb4
-DIST openal-soft-1.18.2.tar.bz2 639420 BLAKE2B 8e31db9d3c6eb49fe4833a6449603dc6284e39810942536594fb5e96d0bc2b867b69bd90e64d40cf99f9a279f3809509cf1c9af3114a4887057e78962a5463e8 SHA512 752e2fb0a5a014caa6d6bac1590d3df46140b463fbaa13378fb5de89f1c97ee8b62bec74f68484d4ec02ee8755c1a2d0c9394cdb477db1b7401deae2fb9eeb4d
 DIST openal-soft-1.19.1.tar.bz2 577310 BLAKE2B f6ed5b2bce1bfcaa7f8085375d5d3e3323ea2f03896ba871fe3ec247e6e1bf524a9c5180399b0f0908aa69756a1f2ee8095f14a69e6a7eac55a25cc7c2ac545b SHA512 356a3f12bbe284bfac71f4f2a9f83d084083a832012222e73743042ac27812cf051c12b0ddcf53c010ff77e44ae2e9033cea9b9324d316a22a59a154307a64a4
-EBUILD openal-1.18.2-r1.ebuild 2087 BLAKE2B 21e2e6683182f2eb8779763cc46b682c01c33cb28b1a0828b5bf227eb9fd41c0f747ae136173eeb29b63f24d44de59293e3a5770d614dc7384a82f993bed6ca8 SHA512 24c1cd5cbadf059edc9554bf719e4318623412fc7f63bed1d0fdb15db75cac978072bec83ddee6480f14210008ed6cc85aadc3f4b439fdbe975fb25c1859f42f
-EBUILD openal-1.19.1.ebuild 2088 BLAKE2B aa1e2d78e7ebb6a4c1770e5e893e72c30e6013f30458a2df66618ebd01cb8b1e081ee14cfba972d5cb0742deec9aff86c8a761b78ebbf4527041c044668d1753 SHA512 63b6d8309f65e17af7034e1c872b3e955f9853246b68e209091e8125bec53d86f75345dcd8257503a10072cfcc7b4bba4bff7cf6325902e14157616710d9c5ce
+EBUILD openal-1.19.1.ebuild 2100 BLAKE2B f3ffceaf42231e82ddd9930a38cc2f2d9ff88ef91e74eabcc05b34aa167a544cd8177cd26c7cf1490cc125484ca9e09eb7f1fa82239896d1841c032c6db2dc84 SHA512 972e908e5f16d92a88c4389646d597d26bba0ec145a4af1f825877e2118ca30e0606f47d289aeac93a3968bd527ce8cdf36ee6d11ed2898fc12cd38d65776ca9
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-libs/openal/files/openal-1.18.2-dont-specify-macros-as-arguments.patch b/media-libs/openal/files/openal-1.18.2-dont-specify-macros-as-arguments.patch
deleted file mode 100644
index 83fc33d0a332..000000000000
--- a/media-libs/openal/files/openal-1.18.2-dont-specify-macros-as-arguments.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From cae4b1a062b53dd25eba7caa41622be730106749 Mon Sep 17 00:00:00 2001
-From: Chris Robinson <chris.kcat@gmail.com>
-Date: Wed, 28 Mar 2018 14:34:58 -0700
-Subject: [PATCH] Don't specify macros as arguments to CHECK_INCLUDE_FILE(S)
-
----
- CMakeLists.txt | 15 +++++++++++++--
- 1 file changed, 13 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index df1dfe63..07454f15 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -577,7 +577,12 @@ ENDIF()
- 
- 
- # Check if we have Windows headers
--CHECK_INCLUDE_FILE(windows.h HAVE_WINDOWS_H -D_WIN32_WINNT=0x0502)
-+SET(OLD_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS})
-+SET(CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} -D_WIN32_WINNT=0x0502)
-+CHECK_INCLUDE_FILE(windows.h HAVE_WINDOWS_H)
-+SET(CMAKE_REQUIRED_DEFINITIONS ${OLD_REQUIRED_DEFINITIONS})
-+UNSET(OLD_REQUIRED_DEFINITIONS)
-+
- IF(NOT HAVE_WINDOWS_H)
-     CHECK_SYMBOL_EXISTS(gettimeofday sys/time.h HAVE_GETTIMEOFDAY)
-     IF(NOT HAVE_GETTIMEOFDAY)
-@@ -975,8 +980,11 @@ OPTION(ALSOFT_REQUIRE_WINMM "Require Windows Multimedia backend" OFF)
- OPTION(ALSOFT_REQUIRE_DSOUND "Require DirectSound backend" OFF)
- OPTION(ALSOFT_REQUIRE_WASAPI "Require WASAPI backend" OFF)
- IF(HAVE_WINDOWS_H)
-+    SET(OLD_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS})
-+    SET(CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} -D_WIN32_WINNT=0x0502)
-+
-     # Check MMSystem backend
--    CHECK_INCLUDE_FILES("windows.h;mmsystem.h" HAVE_MMSYSTEM_H -D_WIN32_WINNT=0x0502)
-+    CHECK_INCLUDE_FILES("windows.h;mmsystem.h" HAVE_MMSYSTEM_H)
-     IF(HAVE_MMSYSTEM_H)
-         CHECK_SHARED_FUNCTION_EXISTS(waveOutOpen "windows.h;mmsystem.h" winmm "" HAVE_LIBWINMM)
-         IF(HAVE_LIBWINMM)
-@@ -1013,6 +1021,9 @@ IF(HAVE_WINDOWS_H)
-             SET(ALC_OBJS  ${ALC_OBJS} Alc/backends/wasapi.c)
-         ENDIF()
-     ENDIF()
-+
-+    SET(CMAKE_REQUIRED_DEFINITIONS ${OLD_REQUIRED_DEFINITIONS})
-+    UNSET(OLD_REQUIRED_DEFINITIONS)
- ENDIF()
- IF(ALSOFT_REQUIRE_WINMM AND NOT HAVE_WINMM)
-     MESSAGE(FATAL_ERROR "Failed to enabled required WinMM backend")
diff --git a/media-libs/openal/openal-1.18.2-r1.ebuild b/media-libs/openal/openal-1.18.2-r1.ebuild
deleted file mode 100644
index ccc0f0929a40..000000000000
--- a/media-libs/openal/openal-1.18.2-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib
-
-MY_P="${PN}-soft-${PV}"
-
-DESCRIPTION="A software implementation of the OpenAL 3D audio API"
-HOMEPAGE="https://www.openal-soft.org/"
-SRC_URI="https://www.openal-soft.org/openal-releases/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="
-	alsa coreaudio debug jack oss portaudio pulseaudio qt5
-	cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1
-	cpu_flags_arm_neon
-"
-
-RDEPEND="
-	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
-	portaudio? ( >=media-libs/portaudio-19_pre20111121-r1[${MULTILIB_USEDEP}] )
-	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-"
-DEPEND="${RDEPEND}
-	oss? ( virtual/os-headers )"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( alsoftrc.sample docs/env-vars.txt docs/hrtf.txt ChangeLog README )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.18.2-dont-specify-macros-as-arguments.patch
-)
-
-src_configure() {
-	# -DEXAMPLES=OFF to avoid FFmpeg dependency wrt #481670
-	my_configure() {
-		local mycmakeargs=(
-			-DALSOFT_REQUIRE_ALSA=$(usex alsa)
-			-DALSOFT_REQUIRE_COREAUDIO=$(usex coreaudio)
-			-DALSOFT_REQUIRE_JACK=$(usex jack)
-			-DALSOFT_REQUIRE_OSS=$(usex oss)
-			-DALSOFT_REQUIRE_PORTAUDIO=$(usex portaudio)
-			-DALSOFT_REQUIRE_PULSEAUDIO=$(usex pulseaudio)
-			-DALSOFT_CPUEXT_SSE=$(usex cpu_flags_x86_sse)
-			-DALSOFT_CPUEXT_SSE2=$(usex cpu_flags_x86_sse2)
-			-DALSOFT_CPUEXT_SSE4_1=$(usex cpu_flags_x86_sse4_1)
-			-DALSOFT_UTILS=$(multilib_is_native_abi && echo "ON" || echo "OFF")
-			-DALSOFT_NO_CONFIG_UTIL=$(usex qt5 "$(multilib_is_native_abi && echo "OFF" || echo "ON")" ON)
-			-DALSOFT_EXAMPLES=OFF
-		)
-
-		use cpu_flags_arm_neon && mycmakeargs+=( -DALSOFT_CPUEXT_NEON=$(usex cpu_flags_arm_neon) )
-
-		cmake-utils_src_configure
-	}
-
-	multilib_parallel_foreach_abi my_configure
-}
diff --git a/media-libs/openal/openal-1.19.1.ebuild b/media-libs/openal/openal-1.19.1.ebuild
index dfd436080f61..72d3436e0101 100644
--- a/media-libs/openal/openal-1.19.1.ebuild
+++ b/media-libs/openal/openal-1.19.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.openal-soft.org/openal-releases/${MY_P}.tar.bz2"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="
 	alsa coreaudio debug jack oss portaudio pulseaudio sdl qt5
 	cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1
diff --git a/media-libs/opencollada/Manifest b/media-libs/opencollada/Manifest
index ecf3b1392b48..e1f3a812fb2b 100644
--- a/media-libs/opencollada/Manifest
+++ b/media-libs/opencollada/Manifest
@@ -1,10 +1,8 @@
 AUX opencollada-1.6.62-cmake-fixes.patch 4823 BLAKE2B 84805e591bb8212e0cfce78fa8c7b6c03684d2d54dc16644b2211768ecdf0868fa77f4836f5a24280f9bd7f0fe47b7715f70f06f48db1c6bf90efb6a23e05632 SHA512 db5c2389aa45d0924371e93b0006052d6a83f1fba2727c86c23093fa2e21194586fcaaec361828343676cf170aea30a5bfefb7126f1f19fb1c966257165743eb
 AUX opencollada-1.6.63-pcre-fix.patch 530 BLAKE2B c0f96d1f3d93570f49670d5dc63f6faa4f164a21a8e1b840a0d54c596049f29a7e94cbe6297343fa323dacebc1831ed6871d7e82ac12fe3026ab75823d07670c SHA512 8ea88344ebc345e4a996ebe39852e5d52806cba76ce433253c67f8840de6ce082515d2bec571d49bddfe3ec620912b3de0674c522c10203bbc590bd6df80fc55
 AUX opencollada-build-fixes-v3.patch 2571 BLAKE2B 013f45412ced572d9fbc29764942d7dac7c2320aa661b567d34e76beaa46d57386898cedcb817458da20146a72d657ae0866acf70034bf3063210d742301be5d SHA512 6c92e1d442543116fee6b0031c0330c497cf69a7bb1efd9bb9dfd6b37a07761ac6e4eca7939514fb7c96774743d215fc0f9ef678e0c3e0fea903773d7666de01
-DIST opencollada-1.6.58.tar.gz 12088428 BLAKE2B ef5da3eae1c7f4ffd5abf4f93fd9ae1399d7eb3d470ebf4d3c042562d654b6dbcab3010d64250ff9701bd2b1e310178ab2430ed59b3f774a610619e723786961 SHA512 122b841de28f82408bc6fe9d363894ab8f9033cfed949f8028b7a35445e3361f0df583d8b18f7198eaa9dbf3ad33b52dbe5fe6a7e652494789850effcbbf22c9
 DIST opencollada-1.6.62.tar.gz 12094443 BLAKE2B 6cd0ec893fc212bf3e8f166ad9c51c894dc298a3627e65dd41ece850a5638d91b8839830d5456bf3ba072a0b23f8c01247d8c676cc79d98464cdf0c1b55fd3c5 SHA512 bd39406b9a833409303ef7cd4e93beee0675fa57c267af95a34699348a81650d50ae042dbb1837cd41c72433533a3a9b827a44e9775a5b06c7c4f1a351146574
 DIST opencollada-1.6.63.tar.gz 12094044 BLAKE2B dbe38ab2976f72d47a38bd147e05a58555acc2b70618d4d47d2beff87ace54f7fcd2f116b9ba9908cfb38b5699e547375e902128c2f378c295308f1601a18b17 SHA512 e1b92e932d0256224b026281fb5691219c5171f57b968307288b6e5481b5d6fee39825702e18017055bd0fb0e3d4c40b6ce526d3ce4defe2994138db54220d01
-EBUILD opencollada-1.6.58.ebuild 1756 BLAKE2B dd0eb47c8da3470ab5f7c7f4eaf94cb2f2405e587ba32e00f096c09138a8e15a31d0f5ddd45d5037a01fa6a972cf2ce7aa4e6dd2b63ad9113fca7cbbed7a0a1f SHA512 facbf116dfd17a324f4add1c008d5f48b677c0cd7a29a44831a283d0a44d982fa8b9aae53588ef352394b90611486fb66edd7d2c27c74a658e0334c587a39358
 EBUILD opencollada-1.6.62.ebuild 1628 BLAKE2B a29e1f0236cc8f4abc7a486b03b6e67e04e07022ea14e93e39b8835fe40da5d8b75c683264beb8b96158b114bcf33ee7ec9ee216f74e1cbed38e4e5325c4639c SHA512 0cb788227b1eb0581239463b7ce3af50c5bb4928a8377ae2bdeb37065535da5096fa35df67a3fda9f06e48d14ef232920dcdd22a758ed2cd4a7938372f036fae
 EBUILD opencollada-1.6.63.ebuild 1657 BLAKE2B a35b086ac9651e4360df3913b31aa8ff41ba7cdbabe325c1d712c561e93002b03989c6cd5c84d7f2bf0c9b227ede1313daa8da04485f44e97f6c92abed7cc040 SHA512 6719a2a2fcedd078474304a0aa357c6d09aa090a6ca50764e5b954c1b4afdae6262fc913d544020d7836d1cc03f2fac0690a5e108d6c21166070c2438cc28a1c
 MISC metadata.xml 340 BLAKE2B c4ce9d18d941b1c878c35600ec1323b21ee1d929210a9fa4c3121bac8b191a7c648933c5d7e50e4b5bfa88c99f73ffb7f43d5d47972de9f19402f68ee7e984eb SHA512 3e362593a8e284c0eb7ac86a3d7e8b2ba6ddc4a3c88478815517b1d12f1f03f05da4e8929ecad8f78bb7b8c40bc29020124f1ef1539302e3866fb7effe60fb75
diff --git a/media-libs/opencollada/opencollada-1.6.58.ebuild b/media-libs/opencollada/opencollada-1.6.58.ebuild
deleted file mode 100644
index 77649f9a6626..000000000000
--- a/media-libs/opencollada/opencollada-1.6.58.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils flag-o-matic versionator
-
-DESCRIPTION="Stream based read/write library for COLLADA files"
-HOMEPAGE="http://www.opencollada.org/"
-SRC_URI="https://github.com/KhronosGroup/OpenCOLLADA/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-IUSE="static-libs"
-
-# This is still needed to have so version numbers
-MY_SOVERSION="$(get_version_component_range 1-2)"
-
-RDEPEND="dev-libs/libpcre
-	dev-libs/zziplib
-	media-libs/lib3ds
-	sys-libs/zlib
-	dev-libs/libxml2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/OpenCOLLADA-${PV}"
-
-PATCHES=( "${FILESDIR}/${PN}-build-fixes-v3.patch" )
-
-src_prepare() {
-	edos2unix CMakeLists.txt
-
-	cmake-utils_src_prepare
-
-	# Remove bundled depends that have portage equivalents
-	rm -rv Externals/{expat,lib3ds,LibXML,pcre,zziplib} || die
-
-	# Remove unused build systems
-	rm -v Makefile scripts/{unixbuild.sh,vcproj2cmake.rb} || die
-	find "${S}" -name SConscript -delete || die
-}
-
-src_configure() {
-	# bug 619670
-	append-cxxflags -std=c++14
-
-	local mycmakeargs=(
-		-DUSE_SHARED=ON
-		-DUSE_STATIC=$(usex static-libs)
-		-DUSE_LIBXML=ON
-		-Dsoversion=${MY_SOVERSION}
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	echo "LDPATH=/usr/$(get_libdir)/opencollada" > "${T}"/99${PN} || die "echo failed"
-	doenvd "${T}"/99${PN}
-
-	dobin "${BUILD_DIR}/bin/DAEValidator"
-	dobin "${BUILD_DIR}/bin/OpenCOLLADAValidator"
-	# Need to be in same directory as above binaries
-	docinto "/usr/bin"
-	dodoc "${BUILD_DIR}/bin/COLLADAPhysX3Schema.xsd"
-	dodoc "${BUILD_DIR}/bin/collada_schema_1_4_1.xsd"
-	dodoc "${BUILD_DIR}/bin/collada_schema_1_5.xsd"
-}
diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest
index ab65cff772f0..db80e58ccecb 100644
--- a/media-libs/openexr/Manifest
+++ b/media-libs/openexr/Manifest
@@ -8,5 +8,5 @@ AUX openexr-2.3.0-skip-bogus-tests.patch 1429 BLAKE2B fe9dcafb4ea5990cfcf36b16f3
 AUX openexr-2.3.0-tests-32bits-2.patch 586 BLAKE2B 83d36040f751e07f30c5cc3be10f8ac43d62d91b87b87bc2735ecc22426401b3b671d0b397e6a9a1fba351ae66e022c9bb488f95d29a9fbcca479d3d70501eac SHA512 5ffc8bda7e476ce71ee103b519c76e630371e5cc005b04f99d2c054580e387cc2b3b9598cbe4442415c5dfe85b0de8ceedf87079c3f738b7ebb737ea23ea7729
 AUX openexr-2.3.0-tests-32bits.patch 1537 BLAKE2B 96cc98ef34a6c18102e5b96f4373f41b77d25aaf04f9a20d0d406eeae17988cc6f3eecf805f6bac1e42805b283f3123455ca1b069d7c0dc04628835ded2d8dec SHA512 58ad1d8f5dc28be60cdc290c7829d8b50708d26f3a769530e054c629170457f6b7e2b526455f6f86d2ee24931d8afdb61345ada99ae49897d926c0d50fb579f6
 DIST openexr-2.3.0.tar.gz 18412067 BLAKE2B c73c4db4e414010ed8cc9f9631f3e8b17f47edf89b4ecb459aa00ff54a316b3bb1489e332bc029e0917ac4ffe7e152082244102029fd375f183da6741788dab7 SHA512 003f5bb3bd010be1ad9ff1798643ef711c683c8191625fe9b59070c9cb0c649c277cd506d890c6b239d9cbab80e83e16f1c1d1d74117c916ee3a80e061953123
-EBUILD openexr-2.3.0.ebuild 2232 BLAKE2B e4fd31a280d2a1f7c02903178da0ebcf91ebfbde833d14847ed23a3d4ca3089d5945d7115409f7d317a41bf42856a3ee552ce30e3ec81369b9f6f2b7090b271f SHA512 7f6256cf42b8b69cc71ac4f22cb0f3524406dfad622123b129c0e4e7566d6c46e57e30e98e9f70a8cd1986f4f6865bf1488779394b6381ea74f750319876e7d6
+EBUILD openexr-2.3.0.ebuild 2231 BLAKE2B aafed485669a0df49d901b87d36ee5402ff34dc6a43913c6f53d5a9262b9f41d20d8b3a8f424c3885125c5cb1ac6393bdd3bb93f9e9b0b4c44c4b6bc38a57082 SHA512 c4e79e2f79a680faff20e31d45cb049eb08624eea6db9d00cb9124cc2c45352254ae5ce54ca1ab4ab78360ded4027aa28db19c0a053ccfc0d66cce24e4480ceb
 MISC metadata.xml 303 BLAKE2B 53fb5019bd6fe939d485f1eccb4a140ca9b7ce121b06744d8155842ccb6c5e1378ea39a9ae74c8d519be7b3926bd76040df4b8107137fcc2e25be97431e7a1be SHA512 0ab8d735dd7a8e0dc96b14cfde1ae06969d15cfbad956f4fda60b093660aee38fe98709376eedc9362a26858678d2f28eec795c1accb2560858fd804a11bb7ca
diff --git a/media-libs/openexr/openexr-2.3.0.ebuild b/media-libs/openexr/openexr-2.3.0.ebuild
index b573a649c33d..c09ccb9802a9 100644
--- a/media-libs/openexr/openexr-2.3.0.ebuild
+++ b/media-libs/openexr/openexr-2.3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/openexr/openexr/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0/24" # based on SONAME
-KEYWORDS="amd64 -arm arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 -arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE="cpu_flags_x86_avx examples static-libs"
 
 RDEPEND="
diff --git a/media-libs/openexr_ctl/Manifest b/media-libs/openexr_ctl/Manifest
index b76963eab676..bc6363ecb255 100644
--- a/media-libs/openexr_ctl/Manifest
+++ b/media-libs/openexr_ctl/Manifest
@@ -4,5 +4,5 @@ AUX openexr_ctl-1.0.1-gcc44.patch 457 BLAKE2B 574e0a606769c996ec8eeb556165a0327b
 AUX openexr_ctl-1.0.1-namespace.patch 348 BLAKE2B 4bb257667565106034c687efd5d142380c5e1bb662c9d552d8abca29f1e5d0bff96ce1fcbbf6aefc205c7921dd930b21e56a33ac1aef54e5868c8e6a838fde82 SHA512 28f3b0964ccb7ee81dfc4c4600f0747e28d11ada1fe3a3b5beec17c56bdd8d66c37f6d4974272d6a0c54a397445665eda06a81f5ada64cfd96f74c2461cb896f
 AUX openexr_ctl-1.0.1-pkgconfig.patch 632 BLAKE2B 2adfca932aed12a83634c917b5af224e5fceb3e404fc0c4aff3fd4ac225c21813d919d2d2d05902193cd9fb47532c7692deb5eb9b4c04a1641416691ce3973cd SHA512 38c683204ded3aa0c0e5d83506a2eb49cdf33dfa7b44f5dce1502783f18aa154f8f4b5357aa4a07932ccacafb3d8cf32b80ce288cbcf0e75ca917adc2ff5e271
 DIST openexr_ctl-1.0.1.tar.gz 362864 BLAKE2B 4ac3daaeeab91bbf9d8b1e23ade7934d5917b69df4e6b717a1b5a2b27a73b68d6e0fe06eb2b420d7fb5fe3e284c1615a56cc46973eb2de3604c2a321c5456cfb SHA512 831a06dc83ac53ae9b520629dbd24d3a7cd24f3ab5f484de37d1b232dd16fcf71392d163a7b9f9059bb8f30ff249f7f5a9fbc35730211ff98c8e13dcf386898a
-EBUILD openexr_ctl-1.0.1-r2.ebuild 860 BLAKE2B 3102272cfe46534bbf986870e26771fe7003b15e064798fbb05fa4c903ab9ace8b57113a19b50770c2b5f66a7258b53dacda04ae9441d29b75cbf35eee3eaac4 SHA512 a8e703006dd4ee0586ad583c1c7e9948fff4053930728e3a1013434b3975e6e1597293ea936646c136f51e47a1f923491db487bf1d0eaf5b99027fcd0b7df74d
+EBUILD openexr_ctl-1.0.1-r2.ebuild 858 BLAKE2B 6047594b81476e64413751b0a14f36c3fc9ecac4440abbcbb1fe7e20a9468b0d2f388b19fec2126bb147ed2cfc5e6fb9a74dbd0270894154b01c38df01ad9dda SHA512 f8e83e541c4fc5b66f6d4bc81eff9f1039412a06f50b0a29d00b3b9060c6a87025a1a3a77379db4b513cae6bffe6b23160d6d2a0f982f9cdbbbaec958630fb22
 MISC metadata.xml 301 BLAKE2B 149874bca2d8b5957909f8749f1b274cec115425510904811eebe3cf19b76b28924a060d86f57f3fb6953c8e8ea55da59dfd8c4d4f83fdc8ee0b7f23f9dbf264 SHA512 6df4d1d337a4c00e4a2415c19a46d07d1a151135fbf29a92de300b077de3ae4fb64277b639448edeb0e64bec87d120f67d829f569cce2368388f3b4478dcd1bf
diff --git a/media-libs/openexr_ctl/openexr_ctl-1.0.1-r2.ebuild b/media-libs/openexr_ctl/openexr_ctl-1.0.1-r2.ebuild
index 60adea1758a7..1c79c6eb84a4 100644
--- a/media-libs/openexr_ctl/openexr_ctl-1.0.1-r2.ebuild
+++ b/media-libs/openexr_ctl/openexr_ctl-1.0.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/ampasctl/${P}.tar.gz"
 
 LICENSE="AMPAS"
 SLOT="0"
-KEYWORDS="amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="static-libs"
 
 RDEPEND=">=media-libs/ilmbase-2.0.1:=
diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest
index ef03ecbfe098..0aa2cebc4566 100644
--- a/media-libs/openimageio/Manifest
+++ b/media-libs/openimageio/Manifest
@@ -1,15 +1,5 @@
-AUX openimageio-1.6.18-make-python-and-boost-detection-more-generic.patch 15826 BLAKE2B 7f1744321e4dd59264502ecbb9ec958a6d0ee26a0e1a53be3e0b31fa5e3cc7f0846c95af81b66796f1901378689fb5c217bfd9f991d44451a95de0716a1bcb78 SHA512 57fbd123445ea474609239bb54a2032f4f97fd686ce74479431a90e1b251d4cae1d7f740b14c8360dd498edcac9c51c1d84dece82b2f6b513e709c386bb9ad9e
-AUX openimageio-1.6.18-repair-breaks-after-boost-python-1.65-changes.patch 9877 BLAKE2B 0325e373bae367d3581343d49cda84ee27161a8a9a07e85ec00c81e6a0f11de5ce26d71ccc91153187ee79a97933d8307cbff84713524b3a5e40083dc075384c SHA512 e507ba714689a5da0f0a864804eaa0862b1aa4fc0e77f68934ae369c4de11ca566c9efd75ba5060d0294b42bf2bd7f20127eaf8e50efb4ff92497f1b60295f4c
-AUX openimageio-1.6.18-use-gnuinstalldirs.patch 11257 BLAKE2B 524d40a5ad4827743d20a259f2fd2ed094945439eef620473ff1097efb150cdfc80c66f4576b869aed6c7b9d086499d5d286c3dcaae4d891a37f6ae06f504a85 SHA512 3ca9e8474bc58b726686d1e87766d20f2cdcb2544b07b20a8a48594b442409f753c1e860219bfe948d19cdf0f5090bd04299ab6fdc6bf39f753d158d9f75a1e1
-AUX openimageio-1.7.17-make-python-and-boost-detection-more-generic.patch 15432 BLAKE2B 550a6aa0b962b6efc5c9fb01dcb781dc78bc26a42624c8d4f4be24925464d66e6cbc1a0a7d9dcececa5c5681a70e34d97bfd72ee3224158cffe8ca151a0750c9 SHA512 433dda4b999d60248fecffe0c5866c1214a2db68dedb0e63e36f9c5e0fbcd5c54d3faff3effd19d7b3bb57bce9016eca10f58ba6b3a4143391325838cb637227
-AUX openimageio-1.7.17-openexr-2.3.0.patch 2080 BLAKE2B 506b34419dd71bf68052bcbc1c8564925b8d3e490653ea265695ecf640116c4caedaf8b152fea9bc39905dd25e88c6b68ab34670aeec3da5541af686ffd7a24a SHA512 662a274c7a765cf453ac64c6c2aa614cf1cf3fff9ede7f56fc18d7646c81703c8db83f965b53c5e18233d30c1971873ebc436bf3d2c88bb79d7b09e86f5ad89a
-AUX openimageio-1.7.17-use-gnuinstalldirs.patch 11236 BLAKE2B f8adc11f949906bce9046fffb0074487962c8832b4b026a7c2a47b081d0c30ca813536462a685feb5e67b793b37cb5985c3cfc6766df65424c6921ec0bc28e60 SHA512 27d51f70406812efad10cc099a3c9cabb21f98db4bc718ec14269bea564059be40e691210537cb5609708e1ba318fb485a8e02317a34c20106b2b826200ad79f
 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.17.tar.gz 27835527 BLAKE2B e524d171bb918a46aed3c5f329bc8d10853d8b170c1e9b4a6edad72db66b3a03ea32eba4338577a667254e884daebf6b5b33a70090b953a5b5e269d874c91852 SHA512 e58cad9458d71a845c3214675a41e0cffe0509fd52a95ef5a44af0015ef25a1145f9ebb50ff1f5e7200ae0a46efb40e851855f53c55d058c0bc5654a072bdbf7
-EBUILD openimageio-1.6.13.ebuild 2374 BLAKE2B 673c04d398240d55fe684085300b47af5addea2ba60ae26538fa9af51ee7d3f5465a4155a29568b4eb3e33b260e89b48e4fcd9eea22f0e202b3e417b6f4ab729 SHA512 873b3a91ef4b5e521cf6b84daebb653854e589184ebbf12f3e6d9cd7bb43742bacdca3cd7b4b12cad3841c21435f0f6c7a04d8dfb848a78b94772b6641402cd2
-EBUILD openimageio-1.6.18.ebuild 2877 BLAKE2B 80de70165e8db192ef9749f2cdf305ea23d8bb902d8fb099ede3ccd9b7ebb02ced99f3e24262818ef0f9300459e3edc114bdb5472a4deab2af16d88ecea69a82 SHA512 bc90dddc03af90704d0c13f1f21db3825a0d20d0da1d01696313514ffbf1f846bf030a618fa22a4c11b6f79428ca0946ad2318d21039cd70f1c14c27294a87c2
-EBUILD openimageio-1.7.17.ebuild 2992 BLAKE2B db39f2b797e3b0ec9ffcc9825b5a854f1deedac007a25c5e1a3ed0de5ee976e777238975935a99f6d52e71f24634897bd0673da10f22d42588408c051f07ca8d SHA512 e80ec5440f7f9544d3ece54920d72a42bc751028c1b9ac7876e03012d0009a26612f1031e8dba5622fdef902591fe92872218f45c514f3b61b3c34eb9039d910
-EBUILD openimageio-1.8.17.ebuild 2933 BLAKE2B 20b7b4389878b57e1258d3bac400817bcc59103d0c951fc0ef29eda569ce87a976dd50814bcea1d40ff5f097480ab4102ef87ecb16a8a5ece001080c4f8d43ad SHA512 9389b99e3664d31ce57b20225fe8c3a26cb75e12b4f463f26da6bd2ac6b28562a8a78ef9974b3a06422b576b5fdee4c28c7e8085e7e6aca7b42c577c03408720
-MISC metadata.xml 940 BLAKE2B 540f2e00e2790b5e1ec7af2f9165d8a911151c9c9d2d6dbaa80f697ae91fcfe4889ec68141ed18a321550f7b9a3a14a306de5199e3cd603f4f6b5a019005f815 SHA512 ff5c1d96b3de7d144f2cd7bcf55c9953e7e385717ad49d009adef1e21ffa32843350a71f98210b724fb74af916be98eb4f5d2927c58b4a848efbffd85f39d933
+EBUILD openimageio-1.6.13.ebuild 2400 BLAKE2B 548b6e7df490f7ec13bbaeaf2da42b0806551342229cea39c61274acd7f0225d840b730d81a8b3233c55714f99f6c1b612373e3902e957fa28d19118bab76871 SHA512 88e37f6f647fff1feb647cdbd6dc5818aa1f4789f4d22689cb52668473f0cdfa254a3b12b25a50ed19fe4d185ffb05e34e0fea4e9ae473ea7ac718f99c5b966c
+EBUILD openimageio-1.8.17.ebuild 2960 BLAKE2B e37af0c59780f6217aebe3f918e661a1e80f019ae036c69a1f86bc974b870c1e3629c233983f309581dc33c397fc1ecb39c6f7bbd0a12d955a9187b3d339b066 SHA512 07324f5f8db3a697ed6f66659ccc1ab9275b492a200da659d0b69e022454293b540e979b147d743a9f4684a5c88e2d82437741bee7cb581c51b5f93f3d3cf653
+MISC metadata.xml 863 BLAKE2B 947029ba73f4ef5efdbf5a0c85e151483343136a5c3480f8670d7c189e20c9f9cbeb73f1d8bf4cec3c12515d1e053b250e726c4cd81cc5c51fd520b0a2bec1a7 SHA512 4544932bdd65125e8c026fed8c573ccfd5f4dfce47798629dc6550dd641de2918b2bf5c5c13f4e57c54d8a0d68d3627eb81f3707ba7d15a3688b42c725cf4d94
diff --git a/media-libs/openimageio/files/openimageio-1.6.18-make-python-and-boost-detection-more-generic.patch b/media-libs/openimageio/files/openimageio-1.6.18-make-python-and-boost-detection-more-generic.patch
deleted file mode 100644
index ad1a8aeb316d..000000000000
--- a/media-libs/openimageio/files/openimageio-1.6.18-make-python-and-boost-detection-more-generic.patch
+++ /dev/null
@@ -1,343 +0,0 @@
-From 2d62c7f5068f678317c506d108698a78a90e5ba0 Mon Sep 17 00:00:00 2001
-From: Jonathan Scruggs <j.scruggs@gmail.com>
-Date: Thu, 28 Sep 2017 15:20:24 +0100
-Subject: [PATCH 2/2] oiio/RB-1.6: Make python and boost detection more generic
-
-* Fix boost and python detection for certain systems.
-* Clean up boost and python detection.
-* Remove redundant code.
-
-Backported from:
-https://github.com/OpenImageIO/oiio/commit/fca7ed62bd679a8221147dcddb23a516796dab90
----
- CMakeLists.txt                   |  38 +------------
- src/cmake/externalpackages.cmake |  61 +-------------------
- src/python/CMakeLists.txt        | 119 ++++++++++++++++-----------------------
- 3 files changed, 53 insertions(+), 165 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b29efac6..dd314d07 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -180,7 +180,6 @@ set (USE_OPENGL ON CACHE BOOL "Include OpenGL support")
- set (USE_QT ON CACHE BOOL "Include Qt support")
- set (FORCE_OPENGL_1 OFF CACHE BOOL "Force iv to use OpenGL's fixed pipeline")
- set (USE_PYTHON ON CACHE BOOL "Build the Python bindings")
--set (USE_PYTHON3 OFF CACHE BOOL "Build the Python3 bindings")
- set (USE_FIELD3D ON CACHE BOOL "Use Field3D if found")
- set (USE_FFMPEG ON CACHE BOOL "Use FFmpeg if found")
- set (JPEG_PATH "" CACHE STRING "Custom JPEG path")
-@@ -197,8 +196,7 @@ set (USE_LIBRAW ON CACHE BOOL "Use LibRaw if found")
- set (LIBRAW_PATH "" CACHE STRING "Custom LibRaw path")
- set (NOTHREADS OFF CACHE BOOL "Compile with no threads or locking")
- set (OIIO_THREAD_ALLOW_DCLP ON CACHE BOOL "OIIO threads may use DCLP for speed")
--set (PYTHON_VERSION 2.6)
--set (PYTHON3_VERSION 3.2)
-+set (PYTHON_VERSION "2.7" CACHE STRING "Target version of python to find")
- set (USE_NUKE ON CACHE BOOL "Build Nuke plugins, if Nuke is found")
- set (Nuke_ROOT "" CACHE STRING "Where to find Nuke installation")
- set (NUKE_VERSION 7.0)
-@@ -321,32 +319,7 @@ include_directories (
- 
- 
- ###########################################################################
--# Set install paths for the python modules
--# TODO: Figure out how to get the correct python directory
--
--if (UNIX AND NOT SELF_CONTAINED_INSTALL_TREE)
--    # TODO: Figure out how to get the correct python directory
--    set (DEFAULT_PYLIB_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/python/site-packages")
--    set (DEFAULT_PYLIB3_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/python3/site-packages")
--else ()
--    # Here is the "self-contained install tree" case: the expectation here
--    # is that everything related to this project will go into its own
--    # directory, not into some standard system heirarchy.
--    set (DEFAULT_PYLIB_INSTALL_DIR "python")
--    set (DEFAULT_PYLIB3_INSTALL_DIR "python3")
--endif ()
--if (EXEC_INSTALL_PREFIX)
--    # Tack on an extra prefix to support multi-arch builds.
--    set (DEFAULT_PYLIB_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/${DEFAULT_PYLIB_INSTALL_DIR}")
--    set (DEFAULT_PYLIB3_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/${DEFAULT_PYLIB3_INSTALL_DIR}")
--endif ()
--# Set up cmake cache variables corresponding to the defaults deduced above, so
--# that the user can override them as desired:
--set (PYLIB_INSTALL_DIR ${DEFAULT_PYLIB_INSTALL_DIR} CACHE STRING
--     "Install location for python libraries (relative to CMAKE_INSTALL_PREFIX or absolute)")
--set (PYLIB3_INSTALL_DIR ${DEFAULT_PYLIB3_INSTALL_DIR} CACHE STRING
--     "Install location for python3 libraries (relative to CMAKE_INSTALL_PREFIX or absolute)")
--
-+# Set default install options
- set (PLUGIN_SEARCH_PATH "" CACHE STRING "Default plugin search path")
- 
- set (INSTALL_DOCS ON CACHE BOOL "Install documentation")
-@@ -442,14 +415,9 @@ if (NOT EMBEDPLUGINS)
-     add_subdirectory (src/zfile.imageio)
- endif ()
- 
--if (USE_PYTHON AND oiio_boost_PYTHON_FOUND AND NOT BUILD_OIIOUTIL_ONLY)
-+if (USE_PYTHON AND NOT BUILD_OIIOUTIL_ONLY)
-     add_subdirectory (src/python)
- endif ()
--if (USE_PYTHON3 AND NOT BUILD_OIIOUTIL_ONLY)
--    #build the python3 module in a different binary directory since it will
--    #have the same name as the python2 module (e.g. OpenImageIO.so)
--    add_subdirectory (src/python src/python3)
--endif ()
- 
- add_subdirectory (src/include)
- add_subdirectory (src/doc)
-diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake
-index 4799df22..2576dee5 100644
---- a/src/cmake/externalpackages.cmake
-+++ b/src/cmake/externalpackages.cmake
-@@ -102,10 +102,7 @@ if (NOT Boost_FIND_QUIETLY)
- endif ()
- 
- if (NOT DEFINED Boost_ADDITIONAL_VERSIONS)
--  set (Boost_ADDITIONAL_VERSIONS "1.60" "1.59" "1.58" "1.57" "1.56"
--                                 "1.55" "1.54" "1.53" "1.52" "1.51" "1.50"
--                                 "1.49" "1.48" "1.47" "1.46" "1.45" "1.44"
--                                 "1.43" "1.43.0" "1.42" "1.42.0")
-+  set (Boost_ADDITIONAL_VERSIONS "1.65.1" "1.65" "1.63" "1.62")
- endif ()
- if (LINKSTATIC)
-     set (Boost_USE_STATIC_LIBS   ON)
-@@ -117,51 +114,7 @@ if (BOOST_CUSTOM)
-     # Boost_VERSION, Boost_INCLUDE_DIRS, Boost_LIBRARY_DIRS, Boost_LIBRARIES.
- else ()
-     set (Boost_COMPONENTS filesystem regex system thread)
--    find_package (Boost 1.42 REQUIRED
--                  COMPONENTS ${Boost_COMPONENTS}
--                 )
--
--    # Try to figure out if this boost distro has Boost::python.  If we
--    # include python in the component list above, cmake will abort if
--    # it's not found.  So we resort to checking for the boost_python
--    # library's existance to get a soft failure.
--    find_library (oiio_boost_python_lib boost_python
--                  PATHS ${Boost_LIBRARY_DIRS} NO_DEFAULT_PATH)
--    mark_as_advanced (oiio_boost_python_lib)
--    if (NOT oiio_boost_python_lib AND Boost_SYSTEM_LIBRARY_RELEASE)
--        get_filename_component (oiio_boost_PYTHON_rel
--                                ${Boost_SYSTEM_LIBRARY_RELEASE} NAME
--                               )
--        string (REGEX REPLACE "^(lib)?(.+)_system(.+)$" "\\2_python\\3"
--                oiio_boost_PYTHON_rel ${oiio_boost_PYTHON_rel}
--               )
--        find_library (oiio_boost_PYTHON_LIBRARY_RELEASE
--                      NAMES ${oiio_boost_PYTHON_rel} lib${oiio_boost_PYTHON_rel}
--                      HINTS ${Boost_LIBRARY_DIRS}
--                      NO_DEFAULT_PATH
--                     )
--        mark_as_advanced (oiio_boost_PYTHON_LIBRARY_RELEASE)
--    endif ()
--    if (NOT oiio_boost_python_lib AND Boost_SYSTEM_LIBRARY_DEBUG)
--        get_filename_component (oiio_boost_PYTHON_dbg
--                                ${Boost_SYSTEM_LIBRARY_DEBUG} NAME
--                               )
--        string (REGEX REPLACE "^(lib)?(.+)_system(.+)$" "\\2_python\\3"
--                oiio_boost_PYTHON_dbg ${oiio_boost_PYTHON_dbg}
--               )
--        find_library (oiio_boost_PYTHON_LIBRARY_DEBUG
--                      NAMES ${oiio_boost_PYTHON_dbg} lib${oiio_boost_PYTHON_dbg}
--                      HINTS ${Boost_LIBRARY_DIRS}
--                      NO_DEFAULT_PATH
--                     )
--        mark_as_advanced (oiio_boost_PYTHON_LIBRARY_DEBUG)
--    endif ()
--    if (oiio_boost_python_lib OR
--        oiio_boost_PYTHON_LIBRARY_RELEASE OR oiio_boost_PYTHON_LIBRARY_DEBUG)
--        set (oiio_boost_PYTHON_FOUND ON)
--    else ()
--        set (oiio_boost_PYTHON_FOUND OFF)
--    endif ()
-+    find_package (Boost 1.62 REQUIRED COMPONENTS ${Boost_COMPONENTS})
- endif ()
- 
- # On Linux, Boost 1.55 and higher seems to need to link against -lrt
-@@ -176,16 +129,6 @@ if (NOT Boost_FIND_QUIETLY)
-     message (STATUS "Boost include dirs ${Boost_INCLUDE_DIRS}")
-     message (STATUS "Boost library dirs ${Boost_LIBRARY_DIRS}")
-     message (STATUS "Boost libraries    ${Boost_LIBRARIES}")
--    message (STATUS "Boost python found ${oiio_boost_PYTHON_FOUND}")
--endif ()
--if (NOT oiio_boost_PYTHON_FOUND)
--    # If Boost python components were not found, turn off all python support.
--    message (STATUS "Boost python support not found -- will not build python components!")
--    if (APPLE AND USE_PYTHON)
--        message (STATUS "   If your Boost is from Macports, you need the +python26 variant to get Python support.")
--    endif ()
--    set (USE_PYTHON OFF)
--    set (PYTHONLIBS_FOUND OFF)
- endif ()
- 
- include_directories (SYSTEM "${Boost_INCLUDE_DIRS}")
-diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt
-index 81a4a890..e58d372d 100644
---- a/src/python/CMakeLists.txt
-+++ b/src/python/CMakeLists.txt
-@@ -1,54 +1,30 @@
--#if the CMAKE_CURRENT_BINARY_DIR is python3, then build the python3 module,
--#otherwise the python2 module
--string (REGEX MATCH "python3\$" _py3_subdir ${CMAKE_CURRENT_BINARY_DIR})
-+# Attempt to find the desired version, but fall back to other
-+# additional versions.
-+find_package (PythonInterp ${PYTHON_VERSION} REQUIRED)
- 
--if (_py3_subdir)
--    set (BUILD_PY3 ON)
--else ()
--    set (BUILD_PY3 OFF)
--endif ()
--
--if (NOT BOOST_CUSTOM AND NOT BUILD_PY3)
--    #Unset those, otherwise find_package(PythonLibs) will pick up old stuff
--    #if it has been run before
--    unset(Python_ADDITIONAL_VERSIONS)
--    unset(PYTHON_LIBRARY)
--    unset(PYTHON_LIBRARY CACHE)
--    unset(PYTHON_INCLUDE_DIR)
--    unset(PYTHON_INCLUDE_DIR CACHE)
--    unset(PYTHON_INCLUDE_PATH)
--    unset(PYTHON_INCLUDE_PATH CACHE)
--    find_package (PythonLibs ${PYTHON_VERSION} REQUIRED)
--    find_package (Boost 1.42 REQUIRED COMPONENTS python)
--elseif (BOOST_CUSTOM AND NOT BUILD_PY3)
--    find_package (PythonLibs ${PYTHON_VERSION} REQUIRED)
--else ()
--    #BOOST_CUSTOM is ignored for python3
-+# The version that was found may not be the default or user
-+# defined one.
-+set (PYTHON_VERSION_FOUND ${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR})
- 
--    #Unset those, otherwise find_package(PythonLibs) will pick up old stuff
--    #if it has been run before
--    unset(PYTHON_LIBRARY)
--    unset(PYTHON_LIBRARY CACHE)
--    unset(PYTHON_INCLUDE_DIR)
--    unset(PYTHON_INCLUDE_DIR CACHE)
--    unset(PYTHON_INCLUDE_PATH)
--    unset(PYTHON_INCLUDE_PATH CACHE)
-+if (NOT ${PYTHON_VERSION} EQUAL ${PYTHON_VERSION_FOUND} )
-+    message (WARNING "The requested version ${PYTHON_VERSION} was not found.") 
-+    message (WARNING "Using ${PYTHON_VERSION_FOUND} instead.")
-+endif ()
- 
--    #cmake 2.8 does not look for python 3.4
--    set(Python_ADDITIONAL_VERSIONS 3.4)
--    find_package (PythonInterp ${PYTHON3_VERSION} REQUIRED)
--    find_package (PythonLibs ${PYTHON3_VERSION} REQUIRED)
-+find_package (PythonLibs ${PYTHON_VERSION_FOUND} REQUIRED)
- 
--    #Finding the python3 component for boost is a little tricky, since it has
--    #different names on different systems. Try the most common ones
--    #(boost_python3, boost_python-py34, …).
--    foreach (_boost_py3_lib python3 python-py34 python-py33 python-py32)
--        find_package (Boost 1.42 QUIET COMPONENTS ${_boost_py3_lib})
--        string (TOUPPER ${_boost_py3_lib} boost_py3_lib_name)
--        if (Boost_${boost_py3_lib_name}_FOUND)
--            #Not the most beautiful thing to do, but that gets them included in
--            #the target_link_libraries(…) call farther down
--            set (Boost_PYTHON_LIBRARIES ${Boost_${boost_py3_lib_name}_LIBRARIES})
-+if (NOT BOOST_CUSTOM)
-+    # Finding the python component for boost is a little tricky, since it has
-+    # different names on different systems. Try the most common ones.
-+    foreach (_py_lib python-${PYTHON_VERSION_FOUND} python
-+             python${PYTHON_VERSION_MAJOR}
-+             python-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR})
-+        find_package (Boost QUIET COMPONENTS ${_py_lib})
-+        string (TOUPPER ${_py_lib} _py_lib_name)
-+        if (Boost_${_py_lib_name}_FOUND)
-+            # Not the most beautiful thing to do, but that gets them included in
-+            # the target_link_libraries(…) call farther down
-+            set (Boost_PYTHON_LIBRARIES ${Boost_${_py_lib_name}_LIBRARIES})
-             break ()
-         endif ()
-     endforeach ()
-@@ -58,18 +34,19 @@ if (APPLE)
- #    set (PYTHON_LIBRARIES /opt/local/lib)
- endif ()
- 
-+if (NOT DEFINED PYTHON_SITE_DIR)
-+    set (PYTHON_SITE_DIR "${CMAKE_INSTALL_LIBDIR}/python${PYTHON_VERSION_FOUND}/site-packages")
-+endif ()
-+
- # Disable some warnings for Clang, it's a little too picky with boost
- if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-     add_definitions ("-Wno-array-bounds")
- endif ()
- 
--if (BUILD_PY3)
--    set (target_name Py3OpenImageIO)
--else ()
--    set (target_name PyOpenImageIO)
--endif ()
-+set (target_name PyOpenImageIO)
- 
--if (BOOST_CUSTOM OR Boost_FOUND AND PYTHONLIBS_FOUND)
-+# Test if automatically found or manually set with BOOST_CUSTOM
-+if (DEFINED Boost_PYTHON_LIBRARIES)
- 
-     set (python_srcs py_imageinput.cpp py_imageoutput.cpp
-          py_imagecache.cpp py_imagespec.cpp py_roi.cpp
-@@ -81,8 +58,12 @@ if (BOOST_CUSTOM OR Boost_FOUND AND PYTHONLIBS_FOUND)
-         message (STATUS "Python found ${PYTHONLIBS_FOUND} ")
-         message (STATUS "Python include dirs ${PYTHON_INCLUDE_PATH}")
-         message (STATUS "Python libraries    ${PYTHON_LIBRARIES}")
-+        message (STATUS "Python site packages dir ${PYTHON_SITE_DIR}")
-         message (STATUS "Python to include 'lib' prefix: ${PYLIB_LIB_PREFIX}")
-         message (STATUS "Python to include SO version: ${PYLIB_INCLUDE_SONAME}")
-+        message (STATUS "Python version ${PYTHON_VERSION_STRING}")
-+        message (STATUS "Python version major: ${PYTHON_VERSION_MAJOR} minor: ${PYTHON_VERSION_MINOR}")
-+        message (STATUS "Boost python libraries ${Boost_PYTHON_LIBRARIES}")
-     endif ()
- 
-     include_directories (${PYTHON_INCLUDE_PATH} ${Boost_INCLUDE_DIRS})
-@@ -91,7 +72,7 @@ if (BOOST_CUSTOM OR Boost_FOUND AND PYTHONLIBS_FOUND)
-         target_link_libraries (${target_name} OpenImageIO ${Boost_LIBRARIES} ${Boost_PYTHON_LIBRARIES} ${CMAKE_DL_LIBS})
-         set_target_properties (${target_name} PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
-     else ()
--        target_link_libraries (${target_name} OpenImageIO ${Boost_LIBRARIES} ${Boost_PYTHON_LIBRARIES} ${PYTHON_LIBRARIES} ${CMAKE_DL_LIBS})
-+        target_link_libraries (${target_name} OpenImageIO ${SANITIZE_LIBRARIES} ${Boost_LIBRARIES} ${Boost_PYTHON_LIBRARIES} ${PYTHON_LIBRARIES} ${CMAKE_DL_LIBS})
-     endif ()
- 
-     # Exclude the 'lib' prefix from the name
-@@ -123,21 +104,17 @@ if (BOOST_CUSTOM OR Boost_FOUND AND PYTHONLIBS_FOUND)
-                                SUFFIX ".pyd")
-     endif()
-     
--    if (BUILD_PY3)
--        install (TARGETS ${target_name}
--                 RUNTIME DESTINATION ${PYLIB3_INSTALL_DIR} COMPONENT user
--                 LIBRARY DESTINATION ${PYLIB3_INSTALL_DIR} COMPONENT user)
--    else ()
--        install (TARGETS ${target_name}
--                 RUNTIME DESTINATION ${PYLIB_INSTALL_DIR} COMPONENT user
--                 LIBRARY DESTINATION ${PYLIB_INSTALL_DIR} COMPONENT user)
--    endif ()
--elseif (BUILD_PY3)
--    if (NOT PYTHONLIBS_FOUND)
--        message (STATUS "Python3 libraries not found")
--    endif ()
--    if (NOT Boost_FOUND)
--        message (STATUS "Boost python3 component not found")
--    endif ()
--    set(USE_PYTHON3 OFF)
-+    install (TARGETS ${target_name}
-+             RUNTIME DESTINATION ${PYTHON_SITE_DIR} COMPONENT user
-+             LIBRARY DESTINATION ${PYTHON_SITE_DIR} COMPONENT user)
-+else ()
-+    # If Boost python components were not found, turn off all python support.
-+    message (STATUS "Boost python support not found!")
-+    if (APPLE AND USE_PYTHON)
-+        message (STATUS "   If your Boost is from Macports, you need the +python26 variant to get Python support.")
-+     endif ()
-+     if (BOOST_CUSTOM)
-+        message (STATUS "   Please set the variable Boost_PYTHON_LIBRARIES to the location of the boost python libraries.")
-+     endif ()
-+     message (FATAL_ERROR "Python module cannot be built. Either disable python support or check your boost installation.")
- endif ()
--- 
-2.14.2
-
diff --git a/media-libs/openimageio/files/openimageio-1.6.18-repair-breaks-after-boost-python-1.65-changes.patch b/media-libs/openimageio/files/openimageio-1.6.18-repair-breaks-after-boost-python-1.65-changes.patch
deleted file mode 100644
index 622890e981ef..000000000000
--- a/media-libs/openimageio/files/openimageio-1.6.18-repair-breaks-after-boost-python-1.65-changes.patch
+++ /dev/null
@@ -1,251 +0,0 @@
-From 03eca9df5082e97f3b157ce7d1d86ef76016e52b Mon Sep 17 00:00:00 2001
-From: Jonathan Scruggs <j.scruggs@gmail.com>
-Date: Thu, 28 Sep 2017 16:00:16 +0100
-Subject: [PATCH 3/3] oiio/RB-1.6: Repair breaks after boost python 1.65
- changes (#1753)
-
-Alas, the new Boost 1.65 moves some boost python material from one
-namespace to another in a way that breaks compatibility related to
-support for numpy arrays. This breaks the build, including all of
-our MacOS-based TravisCI tests, which of course pick up the latest
-Boost via Homebrew.
-
-Backported from:
-https://github.com/OpenImageIO/oiio/commit/57f294df7430a860c60612c28235730fd429ea0d
----
- src/python/py_imagebuf.cpp    | 22 +++++++++++++++-------
- src/python/py_imageoutput.cpp | 10 +++++-----
- src/python/py_oiio.cpp        | 22 +++++++++++++++++++---
- src/python/py_oiio.h          | 23 +++++++----------------
- 4 files changed, 46 insertions(+), 31 deletions(-)
-
-diff --git a/src/python/py_imagebuf.cpp b/src/python/py_imagebuf.cpp
-index 28a8c537..fa271fe2 100644
---- a/src/python/py_imagebuf.cpp
-+++ b/src/python/py_imagebuf.cpp
-@@ -329,7 +329,7 @@ BOOST_PYTHON_FUNCTION_OVERLOADS(ImageBuf_get_pixels_bt_overloads,
- 
- 
- bool
--ImageBuf_set_pixels_tuple (ImageBuf &buf, ROI roi, tuple data)
-+ImageBuf_set_pixels_tuple (ImageBuf &buf, ROI roi, const tuple& data)
- {
-     if (! roi.defined())
-         roi = buf.roi();
-@@ -347,8 +347,13 @@ ImageBuf_set_pixels_tuple (ImageBuf &buf, ROI roi, tuple data)
- 
- 
- bool
--ImageBuf_set_pixels_array (ImageBuf &buf, ROI roi, numeric::array data)
-+ImageBuf_set_pixels_array (ImageBuf &buf, ROI roi, const object& data)
- {
-+    // If it's a tuple, we handle that with the other function
-+    extract<tuple> tup (data);
-+    if (tup.check())
-+        return ImageBuf_set_pixels_tuple (buf, roi, tup());
-+
-     if (! roi.defined())
-         roi = buf.roi();
-     roi.chend = std::min (roi.chend, buf.nchannels()+1);
-@@ -356,13 +361,16 @@ ImageBuf_set_pixels_array (ImageBuf &buf, ROI roi, numeric::array data)
-     if (size == 0)
-         return true;   // done
- 
--    TypeDesc type;
--    size_t pylen = 0;
--    const void *addr = python_array_address (data, type, pylen);
--    if (!addr || size > pylen)
-+    TypeDesc elementtype;
-+    size_t numelements;
-+    const void* addr = python_array_address (data, elementtype, numelements);
-+    if (!addr || size > numelements)
-         return false;   // Not enough data to fill our ROI
- 
--    buf.set_pixels (roi, type, addr);
-+    std::vector<float> vals (numelements);
-+    convert_types (elementtype, addr, TypeDesc::TypeFloat, vals.data(),
-+                   int(numelements));
-+    buf.set_pixels (roi, TypeDesc::TypeFloat, &vals[0]);
-     return true;
- }
- 
-diff --git a/src/python/py_imageoutput.cpp b/src/python/py_imageoutput.cpp
-index 1c2e5f3c..2203aac4 100644
---- a/src/python/py_imageoutput.cpp
-+++ b/src/python/py_imageoutput.cpp
-@@ -112,7 +112,7 @@ ImageOutputWrap::make_read_buffer (object &buffer, imagesize_t size)
- 
- 
- bool
--ImageOutputWrap::write_scanline_array (int y, int z, numeric::array &buffer)
-+ImageOutputWrap::write_scanline_array (int y, int z, object &buffer)
- {
-     TypeDesc format;
-     size_t numelements = 0;
-@@ -154,7 +154,7 @@ ImageOutputWrap::write_scanline_bt (int y, int z, TypeDesc::BASETYPE format,
- 
- bool
- ImageOutputWrap::write_scanlines_array (int ybegin, int yend, int z,
--                                        numeric::array &buffer)
-+                                        object &buffer)
- {
-     TypeDesc format;
-     size_t numelements = 0;
-@@ -199,7 +199,7 @@ ImageOutputWrap::write_scanlines_bt (int ybegin, int yend, int z,
- 
- bool
- ImageOutputWrap::write_tile_array (int x, int y, int z,
--                                   numeric::array &buffer)
-+                                   object &buffer)
- {
-     TypeDesc format;
-     size_t numelements = 0;
-@@ -243,7 +243,7 @@ ImageOutputWrap::write_tile_bt (int x, int y, int z, TypeDesc::BASETYPE format,
- bool
- ImageOutputWrap::write_tiles_array (int xbegin, int xend, int ybegin, int yend,
-                                     int zbegin, int zend,
--                                    numeric::array &buffer)
-+                                    object &buffer)
- {
-     TypeDesc format;
-     size_t numelements = 0;
-@@ -290,7 +290,7 @@ ImageOutputWrap::write_tiles_bt (int xbegin, int xend, int ybegin, int yend,
- 
- 
- bool
--ImageOutputWrap::write_image_array (numeric::array &buffer)
-+ImageOutputWrap::write_image_array (object &buffer)
- {
-     TypeDesc format;
-     size_t numelements = 0;
-diff --git a/src/python/py_oiio.cpp b/src/python/py_oiio.cpp
-index bc10803c..5e965089 100644
---- a/src/python/py_oiio.cpp
-+++ b/src/python/py_oiio.cpp
-@@ -78,6 +78,13 @@ typedesc_from_python_array_code (char code)
- }
- 
- 
-+std::string
-+object_classname (const object& obj)
-+{
-+    return extract<std::string>(obj.attr("__class__").attr("__name__"));
-+}
-+
-+
- 
- object
- C_array_to_Python_array (const char *data, TypeDesc type, size_t size)
-@@ -313,11 +320,18 @@ oiio_get_string_attribute_d (const char *name, const char *defaultval)
- 
- 
- const void *
--python_array_address (numeric::array &data, TypeDesc &elementtype,
-+python_array_address (const object &data, TypeDesc &elementtype,
-                       size_t &numelements)
- {
-     // Figure out the type of the array
--    object tcobj = data.attr("typecode");
-+    object tcobj;
-+    try {
-+        tcobj = data.attr("typecode");
-+    } catch(...) {
-+        return NULL;
-+    }
-+    if (! tcobj)
-+        return NULL;
-     extract<char> tce (tcobj);
-     char typecode = tce.check() ? (char)tce : 0;
-     elementtype = typedesc_from_python_array_code (typecode);
-@@ -395,7 +409,9 @@ OIIO_DECLARE_PYMODULE(OIIO_PYMODULE_NAME) {
-     scope().attr("VERSION_PATCH") = OIIO_VERSION_PATCH;
-     scope().attr("INTRO_STRING") = OIIO_INTRO_STRING;
- 
--    boost::python::numeric::array::set_module_and_type("array", "array");
-+    #if BOOST_VERSION < 106500
-+        boost::python::numeric::array::set_module_and_type("array", "array");
-+    #endif
- }
- 
- } // namespace PyOpenImageIO
-diff --git a/src/python/py_oiio.h b/src/python/py_oiio.h
-index febe2f9e..9fc04d06 100644
---- a/src/python/py_oiio.h
-+++ b/src/python/py_oiio.h
-@@ -68,12 +68,13 @@ bool PyProgressCallback(void*, float);
- object C_array_to_Python_array (const char *data, TypeDesc type, size_t size);
- const char * python_array_code (TypeDesc format);
- TypeDesc typedesc_from_python_array_code (char code);
-+std::string object_classname (const object& obj);
- 
- 
- // Given python array 'data', figure out its element type and number of
- // elements, and return the memory address of its contents.  Return NULL as
- // the address for an error.
--const void * python_array_address (numeric::array &data, TypeDesc &elementtype,
-+const void * python_array_address (const object &data, TypeDesc &elementtype,
-                                    size_t &numelements);
- 
- 
-@@ -105,16 +106,6 @@ void py_to_stdvector (std::vector<T> &vals, const tuple &tup)
- 
- 
- 
--// Suck up a tuple of presumed T values into a vector<T>
--template<typename T>
--void py_to_stdvector (std::vector<T> &vals, const numeric::array &arr)
--{
--    for (int i = 0, e = len(arr); i < e; ++i)
--        vals.push_back (extract<T>(arr[i]));
--}
--
--
--
- // Convert an array of T values into either tuple. FUNC is a conversion
- // function such as PyInt_FromLong, PyFloat_FromDouble, or
- // PyString_FromString.
-@@ -312,12 +303,12 @@ public:
-                          stride_t xstride=AutoStride);
-     bool write_scanline_bt (int, int, TypeDesc::BASETYPE,
-                             boost::python::object&, stride_t xstride=AutoStride);
--    bool write_scanline_array (int, int, numeric::array&);
-+    bool write_scanline_array (int, int, object&);
-     bool write_scanlines (int, int, int, TypeDesc, boost::python::object&,
-                          stride_t xstride=AutoStride);
-     bool write_scanlines_bt (int, int, int, TypeDesc::BASETYPE,
-                             boost::python::object&, stride_t xstride=AutoStride);
--    bool write_scanlines_array (int, int, int, numeric::array&);
-+    bool write_scanlines_array (int, int, int, object&);
-     bool write_tile (int, int, int, TypeDesc, boost::python::object&,
-                      stride_t xstride=AutoStride, stride_t ystride=AutoStride,
-                      stride_t zstride=AutoStride);
-@@ -325,7 +316,7 @@ public:
-                         boost::python::object&, stride_t xstride=AutoStride,
-                         stride_t ystride=AutoStride,
-                         stride_t zstride=AutoStride);
--    bool write_tile_array (int, int, int, numeric::array&);
-+    bool write_tile_array (int, int, int, object&);
-     bool write_tiles (int, int, int, int, int, int,
-                       TypeDesc, boost::python::object&,
-                       stride_t xstride=AutoStride, stride_t ystride=AutoStride,
-@@ -335,7 +326,7 @@ public:
-                          stride_t xstride=AutoStride,
-                          stride_t ystride=AutoStride,
-                          stride_t zstride=AutoStride);
--    bool write_tiles_array (int, int, int, int, int, int, numeric::array&);
-+    bool write_tiles_array (int, int, int, int, int, int, object&);
-     bool write_image (TypeDesc format, object &buffer,
-                       stride_t xstride=AutoStride,
-                       stride_t ystride=AutoStride,
-@@ -344,7 +335,7 @@ public:
-                          stride_t xstride=AutoStride,
-                          stride_t ystride=AutoStride,
-                          stride_t zstride=AutoStride);
--    bool write_image_array (numeric::array &buffer);
-+    bool write_image_array (object &buffer);
-     bool write_deep_scanlines (int ybegin, int yend, int z,
-                                const DeepData &deepdata);
-     bool write_deep_tiles (int xbegin, int xend, int ybegin, int yend,
--- 
-2.14.2
-
diff --git a/media-libs/openimageio/files/openimageio-1.6.18-use-gnuinstalldirs.patch b/media-libs/openimageio/files/openimageio-1.6.18-use-gnuinstalldirs.patch
deleted file mode 100644
index eb6834d6b8fd..000000000000
--- a/media-libs/openimageio/files/openimageio-1.6.18-use-gnuinstalldirs.patch
+++ /dev/null
@@ -1,247 +0,0 @@
-From c078d90a6570d3cdf372f33f83057b21e44f40ad Mon Sep 17 00:00:00 2001
-From: Jonathan Scruggs <j.scruggs@gmail.com>
-Date: Thu, 28 Sep 2017 15:08:47 +0100
-Subject: [PATCH 1/2] oiio/RB-1.6: Use GNUInstallDirs for installation paths
- (#1747)
-
-* Change all hard coded paths to GNUInstallDirs varibles.
-* Remove variable setting in install.cmake file since
-  GNUInstallDirs does all this for you.
-* Added new search paths for fonts.
-
-Backported from:
-https://github.com/OpenImageIO/oiio/commit/1383ba314ec2522b4f0c7e9037bd546b68bc2d7d
----
- CMakeLists.txt                           | 51 ++++++++------------------------
- src/cmake/oiio_macros.cmake              |  6 ++--
- src/doc/CMakeLists.txt                   |  4 +--
- src/fonts/CMakeLists.txt                 |  2 +-
- src/include/CMakeLists.txt               |  2 +-
- src/libOpenImageIO/imagebufalgo_draw.cpp | 11 +++++++
- src/nuke/txReader/CMakeLists.txt         |  3 +-
- src/nuke/txWriter/CMakeLists.txt         |  3 +-
- 8 files changed, 32 insertions(+), 50 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index bcbcbf94..b29efac6 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -302,6 +302,8 @@ if (NOT OIIO_NAMESPACE)
- endif ()
- message(STATUS "Setting Namespace to: ${OIIO_NAMESPACE}")
- 
-+include (GNUInstallDirs)
-+
- set (CMAKE_MODULE_PATH
-      "${PROJECT_SOURCE_DIR}/src/cmake/modules"
-      "${PROJECT_SOURCE_DIR}/src/cmake")
-@@ -319,58 +321,32 @@ include_directories (
- 
- 
- ###########################################################################
--# Paths for install tree customization.  Note that relative paths are relative
--# to CMAKE_INSTALL_PREFIX.
--set (DEFAULT_BIN_INSTALL_DIR   "bin")
--set (DEFAULT_LIB_INSTALL_DIR   "lib")
--set (DEFAULT_INCLUDE_INSTALL_DIR "include/OpenImageIO")
-+# Set install paths for the python modules
-+# TODO: Figure out how to get the correct python directory
-+
- if (UNIX AND NOT SELF_CONTAINED_INSTALL_TREE)
--    # Try to be well-behaved and install into reasonable places according to
--    # the "standard" unix directory heirarchy
-     # TODO: Figure out how to get the correct python directory
--    set (DEFAULT_PYLIB_INSTALL_DIR "lib/python/site-packages")
--    set (DEFAULT_PYLIB3_INSTALL_DIR "lib/python3/site-packages")
--    set (DEFAULT_DOC_INSTALL_DIR "share/doc/OpenImageIO")
--    set (DEFAULT_MAN_INSTALL_DIR "share/man/man1")
--    set (DEFAULT_FONTS_INSTALL_DIR "share/fonts/oiio")
-+    set (DEFAULT_PYLIB_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/python/site-packages")
-+    set (DEFAULT_PYLIB3_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/python3/site-packages")
- else ()
--    # Here is the "self-contained install tree" case: the expectation here is
--    # that everything OIIO related will go into its own directory, not into
--    # some standard system heirarchy.
-+    # Here is the "self-contained install tree" case: the expectation here
-+    # is that everything related to this project will go into its own
-+    # directory, not into some standard system heirarchy.
-     set (DEFAULT_PYLIB_INSTALL_DIR "python")
-     set (DEFAULT_PYLIB3_INSTALL_DIR "python3")
--    set (DEFAULT_DOC_INSTALL_DIR "doc")
--    set (DEFAULT_MAN_INSTALL_DIR "doc/man")
--    set (DEFAULT_FONTS_INSTALL_DIR "fonts/oiio")
- endif ()
- if (EXEC_INSTALL_PREFIX)
-     # Tack on an extra prefix to support multi-arch builds.
--    set (DEFAULT_BIN_INSTALL_DIR   "${EXEC_INSTALL_PREFIX}/${DEFAULT_BIN_INSTALL_DIR}")
--    set (DEFAULT_LIB_INSTALL_DIR   "${EXEC_INSTALL_PREFIX}/${DEFAULT_LIB_INSTALL_DIR}")
-     set (DEFAULT_PYLIB_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/${DEFAULT_PYLIB_INSTALL_DIR}")
-     set (DEFAULT_PYLIB3_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/${DEFAULT_PYLIB3_INSTALL_DIR}")
--    set (DEFAULT_FONTS_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/${DEFAULT_FONTS_INSTALL_DIR}")
- endif ()
- # Set up cmake cache variables corresponding to the defaults deduced above, so
- # that the user can override them as desired:
--set (BIN_INSTALL_DIR ${DEFAULT_BIN_INSTALL_DIR} CACHE STRING
--     "Install location for binaries (relative to CMAKE_INSTALL_PREFIX or absolute)")
--set (LIB_INSTALL_DIR ${DEFAULT_LIB_INSTALL_DIR} CACHE STRING
--     "Install location for libraries (relative to CMAKE_INSTALL_PREFIX or absolute)")
- set (PYLIB_INSTALL_DIR ${DEFAULT_PYLIB_INSTALL_DIR} CACHE STRING
-      "Install location for python libraries (relative to CMAKE_INSTALL_PREFIX or absolute)")
- set (PYLIB3_INSTALL_DIR ${DEFAULT_PYLIB3_INSTALL_DIR} CACHE STRING
-      "Install location for python3 libraries (relative to CMAKE_INSTALL_PREFIX or absolute)")
--set (INCLUDE_INSTALL_DIR ${DEFAULT_INCLUDE_INSTALL_DIR} CACHE STRING
--     "Install location of header files (relative to CMAKE_INSTALL_PREFIX or absolute)")
--set (DOC_INSTALL_DIR ${DEFAULT_DOC_INSTALL_DIR} CACHE STRING
--     "Install location for documentation (relative to CMAKE_INSTALL_PREFIX or absolute)")
--set (FONTS_INSTALL_DIR ${DEFAULT_FONTS_INSTALL_DIR} CACHE STRING
--     "Install location for fonts (relative to CMAKE_INSTALL_PREFIX or absolute)")
--if (UNIX)
--    set (MAN_INSTALL_DIR ${DEFAULT_MAN_INSTALL_DIR} CACHE STRING
--         "Install location for manual pages (relative to CMAKE_INSTALL_PREFIX or absolute)")
--endif()
-+
- set (PLUGIN_SEARCH_PATH "" CACHE STRING "Default plugin search path")
- 
- set (INSTALL_DOCS ON CACHE BOOL "Install documentation")
-@@ -388,10 +364,7 @@ if (CMAKE_SKIP_RPATH)
-     set (CMAKE_SKIP_RPATH FALSE)
-     unset (CMAKE_INSTALL_RPATH)
- else ()
--    set (CMAKE_INSTALL_RPATH "${LIB_INSTALL_DIR}")
--    if (NOT IS_ABSOLUTE ${CMAKE_INSTALL_RPATH})
--        set (CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}")
--    endif ()
-+    set (CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}")
-     set (CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
- endif ()
- 
-diff --git a/src/cmake/oiio_macros.cmake b/src/cmake/oiio_macros.cmake
-index e65020bf..22d78ccd 100644
---- a/src/cmake/oiio_macros.cmake
-+++ b/src/cmake/oiio_macros.cmake
-@@ -7,9 +7,9 @@
- #
- macro (oiio_install_targets)
-     install (TARGETS ${ARGN}
--             RUNTIME DESTINATION "${BIN_INSTALL_DIR}" COMPONENT user
--             LIBRARY DESTINATION "${LIB_INSTALL_DIR}" COMPONENT user
--             ARCHIVE DESTINATION "${LIB_INSTALL_DIR}" COMPONENT developer)
-+             RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT user
-+             LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT user
-+             ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT developer)
- endmacro ()
- 
- # Macro to add a build target for an IO plugin.
-diff --git a/src/doc/CMakeLists.txt b/src/doc/CMakeLists.txt
-index 5e2e9866..170ff89c 100644
---- a/src/doc/CMakeLists.txt
-+++ b/src/doc/CMakeLists.txt
-@@ -7,7 +7,7 @@ set (public_docs
- )
- 
- if (INSTALL_DOCS)
--    install (FILES ${public_docs} DESTINATION ${DOC_INSTALL_DIR}
-+    install (FILES ${public_docs} DESTINATION ${CMAKE_INSTALL_DOCDIR}
-              COMPONENT documentation)
- endif ()
- 
-@@ -37,6 +37,6 @@ if (UNIX AND TXT2MAN AND PYTHONINTERP_FOUND)
- 
-     if (INSTALL_DOCS)
-         install (FILES ${manpage_files}
--                 DESTINATION ${MAN_INSTALL_DIR} COMPONENT documentation)
-+                 DESTINATION ${CMAKE_INSTALL_MANDIR} COMPONENT documentation)
-     endif ()
- endif()
-diff --git a/src/fonts/CMakeLists.txt b/src/fonts/CMakeLists.txt
-index 1e296da0..d1bd6409 100644
---- a/src/fonts/CMakeLists.txt
-+++ b/src/fonts/CMakeLists.txt
-@@ -1,7 +1,7 @@
- file (GLOB public_fonts "*/*.ttf")
- 
- if (INSTALL_FONTS AND USE_FREETYPE)
--    install (FILES ${public_fonts} DESTINATION ${FONTS_INSTALL_DIR}
-+    install (FILES ${public_fonts} DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/fonts/OpenImageIO
-              COMPONENT fonts)
- endif ()
- 
-diff --git a/src/include/CMakeLists.txt b/src/include/CMakeLists.txt
-index b605b53b..5cdc6542 100644
---- a/src/include/CMakeLists.txt
-+++ b/src/include/CMakeLists.txt
-@@ -17,5 +17,5 @@ set (OIIO_VERSION_NS "v${MANGLED_SOVERSION}")
- configure_file(OpenImageIO/oiioversion.h.in "${CMAKE_BINARY_DIR}/include/OpenImageIO/oiioversion.h" @ONLY)
- list(APPEND public_headers "${CMAKE_BINARY_DIR}/include/OpenImageIO/oiioversion.h")
- 
--install (FILES ${public_headers} DESTINATION ${INCLUDE_INSTALL_DIR}
-+install (FILES ${public_headers} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/OpenImageIO
-          COMPONENT developer)
-diff --git a/src/libOpenImageIO/imagebufalgo_draw.cpp b/src/libOpenImageIO/imagebufalgo_draw.cpp
-index fb4dcf4d..cb9ef095 100644
---- a/src/libOpenImageIO/imagebufalgo_draw.cpp
-+++ b/src/libOpenImageIO/imagebufalgo_draw.cpp
-@@ -441,27 +441,38 @@ ImageBufAlgo::render_text (ImageBuf &R, int x, int y, string_view text,
-     if (home && *home) {
-         std::string h (home);
-         search_dirs.push_back (h + "/fonts");
-+        search_dirs.push_back (h + "/fonts/OpenImageIO");
-         search_dirs.push_back (h + "/Fonts");
-+        search_dirs.push_back (h + "/Fonts/OpenImageIO");
-         search_dirs.push_back (h + "/Library/Fonts");
-+        search_dirs.push_back (h + "/Library/Fonts/OpenImageIO");
-     }
-     const char *systemRoot = getenv ("SystemRoot");
-     if (systemRoot && *systemRoot)
-         search_dirs.push_back (std::string(systemRoot) + "/Fonts");
-+        search_dirs.push_back (std::string(systemRoot) + "/Fonts/OpenImageIO");
-     search_dirs.push_back ("/usr/share/fonts");
-+
-     search_dirs.push_back ("/Library/Fonts");
-+    search_dirs.push_back ("/Library/Fonts/OpenImageIO");
-     search_dirs.push_back ("C:/Windows/Fonts");
-+    search_dirs.push_back ("C:/Windows/Fonts/OpenImageIO");
-     search_dirs.push_back ("/usr/local/share/fonts");
-+    search_dirs.push_back ("/usr/local/share/fonts/OpenImageIO");
-     search_dirs.push_back ("/opt/local/share/fonts");
-+    search_dirs.push_back ("/opt/local/share/fonts/OpenImageIO");
-     // Try $OPENIMAGEIOHOME/fonts
-     const char *oiiohomedir = getenv ("OPENIMAGEIOHOME");
-     if (oiiohomedir && *oiiohomedir)
-         search_dirs.push_back (std::string(oiiohomedir) + "/fonts");
-+        search_dirs.push_back (std::string(oiiohomedir) + "/fonts/OpenImageIO");
-     // Try ../fonts relative to where this executing binary came from
-     std::string this_program = OIIO::Sysutil::this_program_path ();
-     if (this_program.size()) {
-         std::string path = Filesystem::parent_path (this_program);
-         path = Filesystem::parent_path (path);
-         search_dirs.push_back (path+"/fonts");
-+        search_dirs.push_back (path+"/fonts/OpenImageIO");
-     }
- 
-     // Try to find the font.  Experiment with several extensions
-diff --git a/src/nuke/txReader/CMakeLists.txt b/src/nuke/txReader/CMakeLists.txt
-index 3e72b6d4..660a2ee1 100644
---- a/src/nuke/txReader/CMakeLists.txt
-+++ b/src/nuke/txReader/CMakeLists.txt
-@@ -28,5 +28,4 @@ else ()
-         COMPILE_FLAGS "-fPIC -msse")
- endif ()
- 
--install (TARGETS txReader
--    LIBRARY DESTINATION "${LIB_INSTALL_DIR}/nuke")
-+oiio_install_targets (txReader)
-diff --git a/src/nuke/txWriter/CMakeLists.txt b/src/nuke/txWriter/CMakeLists.txt
-index 66312bc4..0fb70a36 100644
---- a/src/nuke/txWriter/CMakeLists.txt
-+++ b/src/nuke/txWriter/CMakeLists.txt
-@@ -28,5 +28,4 @@ else ()
-         COMPILE_FLAGS "-fPIC -msse")
- endif ()
- 
--install (TARGETS txWriter
--    LIBRARY DESTINATION "${LIB_INSTALL_DIR}/nuke")
-+oiio_install_targets (txWriter)
--- 
-2.14.2
-
diff --git a/media-libs/openimageio/files/openimageio-1.7.17-make-python-and-boost-detection-more-generic.patch b/media-libs/openimageio/files/openimageio-1.7.17-make-python-and-boost-detection-more-generic.patch
deleted file mode 100644
index 06934ca0f069..000000000000
--- a/media-libs/openimageio/files/openimageio-1.7.17-make-python-and-boost-detection-more-generic.patch
+++ /dev/null
@@ -1,336 +0,0 @@
-From 0ec53b0e2cd0713fa3e0fbe538eb1c89fe4e59d2 Mon Sep 17 00:00:00 2001
-From: Jonathan Scruggs <j.scruggs@gmail.com>
-Date: Thu, 28 Sep 2017 16:42:25 +0100
-Subject: [PATCH 2/2] oiio/RB-1.7: Make python and boost detection more generic
-
-* Fix boost and python detection for certain systems.
-* Clean up boost and python detection.
-* Remove redundant code.
-
-Backported from:
-https://github.com/OpenImageIO/oiio/commit/fca7ed62bd679a8221147dcddb23a516796dab90
----
- CMakeLists.txt                   |  38 +------------
- src/cmake/externalpackages.cmake |  61 +-------------------
- src/python/CMakeLists.txt        | 119 ++++++++++++++++-----------------------
- 3 files changed, 53 insertions(+), 165 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 635c61f4..0f80959a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -181,9 +181,7 @@ set (USE_OPENGL ON CACHE BOOL "Include OpenGL support")
- set (USE_QT ON CACHE BOOL "Include Qt support")
- set (FORCE_OPENGL_1 OFF CACHE BOOL "Force iv to use OpenGL's fixed pipeline")
- set (USE_PYTHON ON CACHE BOOL "Build the Python bindings")
--set (USE_PYTHON3 OFF CACHE BOOL "Build the Python3 bindings")
--set (PYTHON_VERSION 2.6)
--set (PYTHON3_VERSION 3.2)
-+set (PYTHON_VERSION "2.7" CACHE STRING "Target version of python to find")
- set (PYLIB_INCLUDE_SONAME OFF CACHE BOOL "If ON, soname/soversion will be set for Python module library")
- set (PYLIB_LIB_PREFIX OFF CACHE BOOL "If ON, prefix the Python module with 'lib'")
- set (USE_FIELD3D ON CACHE BOOL "Use Field3D if found")
-@@ -373,32 +371,7 @@ include_directories (
- 
- 
- ###########################################################################
--# Set install paths for the python modules
--# TODO: Figure out how to get the correct python directory
--
--if (UNIX AND NOT SELF_CONTAINED_INSTALL_TREE)
--    # TODO: Figure out how to get the correct python directory
--    set (DEFAULT_PYLIB_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/python/site-packages")
--    set (DEFAULT_PYLIB3_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/python3/site-packages")
--else ()
--    # Here is the "self-contained install tree" case: the expectation here
--    # is that everything related to this project will go into its own
--    # directory, not into some standard system heirarchy.
--    set (DEFAULT_PYLIB_INSTALL_DIR "python")
--    set (DEFAULT_PYLIB3_INSTALL_DIR "python3")
--endif ()
--if (EXEC_INSTALL_PREFIX)
--    # Tack on an extra prefix to support multi-arch builds.
--    set (DEFAULT_PYLIB_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/${DEFAULT_PYLIB_INSTALL_DIR}")
--    set (DEFAULT_PYLIB3_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/${DEFAULT_PYLIB3_INSTALL_DIR}")
--endif ()
--# Set up cmake cache variables corresponding to the defaults deduced above, so
--# that the user can override them as desired:
--set (PYLIB_INSTALL_DIR ${DEFAULT_PYLIB_INSTALL_DIR} CACHE STRING
--     "Install location for python libraries (relative to CMAKE_INSTALL_PREFIX or absolute)")
--set (PYLIB3_INSTALL_DIR ${DEFAULT_PYLIB3_INSTALL_DIR} CACHE STRING
--     "Install location for python3 libraries (relative to CMAKE_INSTALL_PREFIX or absolute)")
--
-+# Set default install options
- set (PLUGIN_SEARCH_PATH "" CACHE STRING "Default plugin search path")
- 
- set (INSTALL_DOCS ON CACHE BOOL "Install documentation")
-@@ -494,14 +467,9 @@ if (NOT EMBEDPLUGINS AND NOT BUILD_OIIOUTIL_ONLY)
-     endforeach ()
- endif ()
- 
--if (USE_PYTHON AND boost_PYTHON_FOUND AND NOT BUILD_OIIOUTIL_ONLY)
-+if (USE_PYTHON AND NOT BUILD_OIIOUTIL_ONLY)
-     add_subdirectory (src/python)
- endif ()
--if (USE_PYTHON3 AND boost_PYTHON_FOUND AND NOT BUILD_OIIOUTIL_ONLY)
--    #build the python3 module in a different binary directory since it will
--    #have the same name as the python2 module (e.g. OpenImageIO.so)
--    add_subdirectory (src/python src/python3)
--endif ()
- 
- add_subdirectory (src/include)
- add_subdirectory (src/doc)
-diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake
-index 03faf7bd..b354cda0 100644
---- a/src/cmake/externalpackages.cmake
-+++ b/src/cmake/externalpackages.cmake
-@@ -116,10 +116,7 @@ if (NOT Boost_FIND_QUIETLY)
- endif ()
- 
- if (NOT DEFINED Boost_ADDITIONAL_VERSIONS)
--  set (Boost_ADDITIONAL_VERSIONS "1.60" "1.59" "1.58" "1.57" "1.56"
--                                 "1.55" "1.54" "1.53" "1.52" "1.51" "1.50"
--                                 "1.49" "1.48" "1.47" "1.46" "1.45" "1.44"
--                                 "1.43" "1.43.0" "1.42" "1.42.0")
-+  set (Boost_ADDITIONAL_VERSIONS "1.65.1" "1.65" "1.63" "1.62")
- endif ()
- if (LINKSTATIC)
-     set (Boost_USE_STATIC_LIBS   ON)
-@@ -131,51 +128,7 @@ if (BOOST_CUSTOM)
-     # Boost_VERSION, Boost_INCLUDE_DIRS, Boost_LIBRARY_DIRS, Boost_LIBRARIES.
- else ()
-     set (Boost_COMPONENTS filesystem regex system thread)
--    find_package (Boost 1.42 REQUIRED
--                  COMPONENTS ${Boost_COMPONENTS}
--                 )
--
--    # Try to figure out if this boost distro has Boost::python.  If we
--    # include python in the component list above, cmake will abort if
--    # it's not found.  So we resort to checking for the boost_python
--    # library's existance to get a soft failure.
--    find_library (my_boost_python_lib boost_python
--                  PATHS ${Boost_LIBRARY_DIRS} NO_DEFAULT_PATH)
--    mark_as_advanced (my_boost_python_lib)
--    if (NOT my_boost_python_lib AND Boost_SYSTEM_LIBRARY_RELEASE)
--        get_filename_component (my_boost_PYTHON_rel
--                                ${Boost_SYSTEM_LIBRARY_RELEASE} NAME
--                               )
--        string (REGEX REPLACE "^(lib)?(.+)_system(.+)$" "\\2_python\\3"
--                my_boost_PYTHON_rel ${my_boost_PYTHON_rel}
--               )
--        find_library (my_boost_PYTHON_LIBRARY_RELEASE
--                      NAMES ${my_boost_PYTHON_rel} lib${my_boost_PYTHON_rel}
--                      HINTS ${Boost_LIBRARY_DIRS}
--                      NO_DEFAULT_PATH
--                     )
--        mark_as_advanced (my_boost_PYTHON_LIBRARY_RELEASE)
--    endif ()
--    if (NOT my_boost_python_lib AND Boost_SYSTEM_LIBRARY_DEBUG)
--        get_filename_component (my_boost_PYTHON_dbg
--                                ${Boost_SYSTEM_LIBRARY_DEBUG} NAME
--                               )
--        string (REGEX REPLACE "^(lib)?(.+)_system(.+)$" "\\2_python\\3"
--                my_boost_PYTHON_dbg ${my_boost_PYTHON_dbg}
--               )
--        find_library (my_boost_PYTHON_LIBRARY_DEBUG
--                      NAMES ${my_boost_PYTHON_dbg} lib${my_boost_PYTHON_dbg}
--                      HINTS ${Boost_LIBRARY_DIRS}
--                      NO_DEFAULT_PATH
--                     )
--        mark_as_advanced (my_boost_PYTHON_LIBRARY_DEBUG)
--    endif ()
--    if (my_boost_python_lib OR
--        my_boost_PYTHON_LIBRARY_RELEASE OR my_boost_PYTHON_LIBRARY_DEBUG)
--        set (boost_PYTHON_FOUND ON)
--    else ()
--        set (boost_PYTHON_FOUND OFF)
--    endif ()
-+    find_package (Boost 1.62 REQUIRED COMPONENTS ${Boost_COMPONENTS})
- endif ()
- 
- # On Linux, Boost 1.55 and higher seems to need to link against -lrt
-@@ -190,16 +143,6 @@ if (NOT Boost_FIND_QUIETLY)
-     message (STATUS "Boost include dirs ${Boost_INCLUDE_DIRS}")
-     message (STATUS "Boost library dirs ${Boost_LIBRARY_DIRS}")
-     message (STATUS "Boost libraries    ${Boost_LIBRARIES}")
--    message (STATUS "Boost python found ${boost_PYTHON_FOUND}")
--endif ()
--if (NOT boost_PYTHON_FOUND)
--    # If Boost python components were not found, turn off all python support.
--    message (STATUS "Boost python support not found -- will not build python components!")
--    if (APPLE AND USE_PYTHON)
--        message (STATUS "   If your Boost is from Macports, you need the +python26 variant to get Python support.")
--    endif ()
--    set (USE_PYTHON OFF)
--    set (PYTHONLIBS_FOUND OFF)
- endif ()
- 
- include_directories (SYSTEM "${Boost_INCLUDE_DIRS}")
-diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt
-index 81a4a890..e58d372d 100644
---- a/src/python/CMakeLists.txt
-+++ b/src/python/CMakeLists.txt
-@@ -1,54 +1,30 @@
--#if the CMAKE_CURRENT_BINARY_DIR is python3, then build the python3 module,
--#otherwise the python2 module
--string (REGEX MATCH "python3\$" _py3_subdir ${CMAKE_CURRENT_BINARY_DIR})
-+# Attempt to find the desired version, but fall back to other
-+# additional versions.
-+find_package (PythonInterp ${PYTHON_VERSION} REQUIRED)
- 
--if (_py3_subdir)
--    set (BUILD_PY3 ON)
--else ()
--    set (BUILD_PY3 OFF)
--endif ()
--
--if (NOT BOOST_CUSTOM AND NOT BUILD_PY3)
--    #Unset those, otherwise find_package(PythonLibs) will pick up old stuff
--    #if it has been run before
--    unset(Python_ADDITIONAL_VERSIONS)
--    unset(PYTHON_LIBRARY)
--    unset(PYTHON_LIBRARY CACHE)
--    unset(PYTHON_INCLUDE_DIR)
--    unset(PYTHON_INCLUDE_DIR CACHE)
--    unset(PYTHON_INCLUDE_PATH)
--    unset(PYTHON_INCLUDE_PATH CACHE)
--    find_package (PythonLibs ${PYTHON_VERSION} REQUIRED)
--    find_package (Boost 1.42 REQUIRED COMPONENTS python)
--elseif (BOOST_CUSTOM AND NOT BUILD_PY3)
--    find_package (PythonLibs ${PYTHON_VERSION} REQUIRED)
--else ()
--    #BOOST_CUSTOM is ignored for python3
-+# The version that was found may not be the default or user
-+# defined one.
-+set (PYTHON_VERSION_FOUND ${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR})
- 
--    #Unset those, otherwise find_package(PythonLibs) will pick up old stuff
--    #if it has been run before
--    unset(PYTHON_LIBRARY)
--    unset(PYTHON_LIBRARY CACHE)
--    unset(PYTHON_INCLUDE_DIR)
--    unset(PYTHON_INCLUDE_DIR CACHE)
--    unset(PYTHON_INCLUDE_PATH)
--    unset(PYTHON_INCLUDE_PATH CACHE)
-+if (NOT ${PYTHON_VERSION} EQUAL ${PYTHON_VERSION_FOUND} )
-+    message (WARNING "The requested version ${PYTHON_VERSION} was not found.") 
-+    message (WARNING "Using ${PYTHON_VERSION_FOUND} instead.")
-+endif ()
- 
--    #cmake 2.8 does not look for python 3.4
--    set(Python_ADDITIONAL_VERSIONS 3.4)
--    find_package (PythonInterp ${PYTHON3_VERSION} REQUIRED)
--    find_package (PythonLibs ${PYTHON3_VERSION} REQUIRED)
-+find_package (PythonLibs ${PYTHON_VERSION_FOUND} REQUIRED)
- 
--    #Finding the python3 component for boost is a little tricky, since it has
--    #different names on different systems. Try the most common ones
--    #(boost_python3, boost_python-py34, …).
--    foreach (_boost_py3_lib python3 python-py34 python-py33 python-py32)
--        find_package (Boost 1.42 QUIET COMPONENTS ${_boost_py3_lib})
--        string (TOUPPER ${_boost_py3_lib} boost_py3_lib_name)
--        if (Boost_${boost_py3_lib_name}_FOUND)
--            #Not the most beautiful thing to do, but that gets them included in
--            #the target_link_libraries(…) call farther down
--            set (Boost_PYTHON_LIBRARIES ${Boost_${boost_py3_lib_name}_LIBRARIES})
-+if (NOT BOOST_CUSTOM)
-+    # Finding the python component for boost is a little tricky, since it has
-+    # different names on different systems. Try the most common ones.
-+    foreach (_py_lib python-${PYTHON_VERSION_FOUND} python
-+             python${PYTHON_VERSION_MAJOR}
-+             python-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR})
-+        find_package (Boost QUIET COMPONENTS ${_py_lib})
-+        string (TOUPPER ${_py_lib} _py_lib_name)
-+        if (Boost_${_py_lib_name}_FOUND)
-+            # Not the most beautiful thing to do, but that gets them included in
-+            # the target_link_libraries(…) call farther down
-+            set (Boost_PYTHON_LIBRARIES ${Boost_${_py_lib_name}_LIBRARIES})
-             break ()
-         endif ()
-     endforeach ()
-@@ -58,18 +34,19 @@ if (APPLE)
- #    set (PYTHON_LIBRARIES /opt/local/lib)
- endif ()
- 
-+if (NOT DEFINED PYTHON_SITE_DIR)
-+    set (PYTHON_SITE_DIR "${CMAKE_INSTALL_LIBDIR}/python${PYTHON_VERSION_FOUND}/site-packages")
-+endif ()
-+
- # Disable some warnings for Clang, it's a little too picky with boost
- if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-     add_definitions ("-Wno-array-bounds")
- endif ()
- 
--if (BUILD_PY3)
--    set (target_name Py3OpenImageIO)
--else ()
--    set (target_name PyOpenImageIO)
--endif ()
-+set (target_name PyOpenImageIO)
- 
--if (BOOST_CUSTOM OR Boost_FOUND AND PYTHONLIBS_FOUND)
-+# Test if automatically found or manually set with BOOST_CUSTOM
-+if (DEFINED Boost_PYTHON_LIBRARIES)
- 
-     set (python_srcs py_imageinput.cpp py_imageoutput.cpp
-          py_imagecache.cpp py_imagespec.cpp py_roi.cpp
-@@ -81,8 +58,12 @@ if (BOOST_CUSTOM OR Boost_FOUND AND PYTHONLIBS_FOUND)
-         message (STATUS "Python found ${PYTHONLIBS_FOUND} ")
-         message (STATUS "Python include dirs ${PYTHON_INCLUDE_PATH}")
-         message (STATUS "Python libraries    ${PYTHON_LIBRARIES}")
-+        message (STATUS "Python site packages dir ${PYTHON_SITE_DIR}")
-         message (STATUS "Python to include 'lib' prefix: ${PYLIB_LIB_PREFIX}")
-         message (STATUS "Python to include SO version: ${PYLIB_INCLUDE_SONAME}")
-+        message (STATUS "Python version ${PYTHON_VERSION_STRING}")
-+        message (STATUS "Python version major: ${PYTHON_VERSION_MAJOR} minor: ${PYTHON_VERSION_MINOR}")
-+        message (STATUS "Boost python libraries ${Boost_PYTHON_LIBRARIES}")
-     endif ()
- 
-     include_directories (${PYTHON_INCLUDE_PATH} ${Boost_INCLUDE_DIRS})
-@@ -91,7 +72,7 @@ if (BOOST_CUSTOM OR Boost_FOUND AND PYTHONLIBS_FOUND)
-         target_link_libraries (${target_name} OpenImageIO ${Boost_LIBRARIES} ${Boost_PYTHON_LIBRARIES} ${CMAKE_DL_LIBS})
-         set_target_properties (${target_name} PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
-     else ()
--        target_link_libraries (${target_name} OpenImageIO ${Boost_LIBRARIES} ${Boost_PYTHON_LIBRARIES} ${PYTHON_LIBRARIES} ${CMAKE_DL_LIBS})
-+        target_link_libraries (${target_name} OpenImageIO ${SANITIZE_LIBRARIES} ${Boost_LIBRARIES} ${Boost_PYTHON_LIBRARIES} ${PYTHON_LIBRARIES} ${CMAKE_DL_LIBS})
-     endif ()
- 
-     # Exclude the 'lib' prefix from the name
-@@ -123,21 +104,17 @@ if (BOOST_CUSTOM OR Boost_FOUND AND PYTHONLIBS_FOUND)
-                                SUFFIX ".pyd")
-     endif()
-     
--    if (BUILD_PY3)
--        install (TARGETS ${target_name}
--                 RUNTIME DESTINATION ${PYLIB3_INSTALL_DIR} COMPONENT user
--                 LIBRARY DESTINATION ${PYLIB3_INSTALL_DIR} COMPONENT user)
--    else ()
--        install (TARGETS ${target_name}
--                 RUNTIME DESTINATION ${PYLIB_INSTALL_DIR} COMPONENT user
--                 LIBRARY DESTINATION ${PYLIB_INSTALL_DIR} COMPONENT user)
--    endif ()
--elseif (BUILD_PY3)
--    if (NOT PYTHONLIBS_FOUND)
--        message (STATUS "Python3 libraries not found")
--    endif ()
--    if (NOT Boost_FOUND)
--        message (STATUS "Boost python3 component not found")
--    endif ()
--    set(USE_PYTHON3 OFF)
-+    install (TARGETS ${target_name}
-+             RUNTIME DESTINATION ${PYTHON_SITE_DIR} COMPONENT user
-+             LIBRARY DESTINATION ${PYTHON_SITE_DIR} COMPONENT user)
-+else ()
-+    # If Boost python components were not found, turn off all python support.
-+    message (STATUS "Boost python support not found!")
-+    if (APPLE AND USE_PYTHON)
-+        message (STATUS "   If your Boost is from Macports, you need the +python26 variant to get Python support.")
-+     endif ()
-+     if (BOOST_CUSTOM)
-+        message (STATUS "   Please set the variable Boost_PYTHON_LIBRARIES to the location of the boost python libraries.")
-+     endif ()
-+     message (FATAL_ERROR "Python module cannot be built. Either disable python support or check your boost installation.")
- endif ()
--- 
-2.14.2
-
diff --git a/media-libs/openimageio/files/openimageio-1.7.17-openexr-2.3.0.patch b/media-libs/openimageio/files/openimageio-1.7.17-openexr-2.3.0.patch
deleted file mode 100644
index e4bd3562adc2..000000000000
--- a/media-libs/openimageio/files/openimageio-1.7.17-openexr-2.3.0.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Use PkgConfig to find OpenEXR. Otherwise, the code fails
-when OpenEXR/OpenEXRConfig.h is a multilib wrapper.
-Changes taken from openimageio-1.8.17.
-
---- openimageio-1.7.17/src/cmake/modules/FindOpenEXR.cmake
-+++ openimageio-1.7.17/src/cmake/modules/FindOpenEXR.cmake
-@@ -27,6 +27,13 @@
-     set (ILMBASE_PTHREADS ${CMAKE_THREAD_LIBS_INIT})
- endif ()
- 
-+# Attempt to find OpenEXR with pkgconfig
-+find_package(PkgConfig)
-+if (PKG_CONFIG_FOUND)
-+    pkg_check_modules(_ILMBASE QUIET IlmBase)
-+    pkg_check_modules(_OPENEXR QUIET OpenEXR>=2.0.0)
-+endif (PKG_CONFIG_FOUND)
-+
- # List of likely places to find the headers -- note priority override of
- # OPENEXR_CUSTOM_INCLUDE_DIR and ${OPENEXR_HOME}/include.
- # ILMBASE is needed in case ilmbase an openexr are installed in separate
-@@ -35,6 +42,8 @@
-     ${OPENEXR_CUSTOM_INCLUDE_DIR}
-     ${OPENEXR_HOME}/include
-     ${ILMBASE_HOME}/include
-+    ${_ILMBASE_INCLUDEDIR}
-+    ${_OPENEXR_INCLUDEDIR}
-     /usr/local/include
-     /usr/include
-     /usr/include/${CMAKE_LIBRARY_ARCHITECTURE}
-@@ -53,7 +62,11 @@
- find_path (OPENEXR_INCLUDE_PATH OpenEXR/OpenEXRConfig.h)
- 
- # Try to figure out version number
--if (EXISTS "${OPENEXR_INCLUDE_PATH}/OpenEXR/ImfMultiPartInputFile.h")
-+if (DEFINED _OPENEXR_VERSION AND NOT "${_OPENEXR_VERSION}" STREQUAL "")
-+    set (OPENEXR_VERSION "${_OPENEXR_VERSION}")
-+    string (REGEX REPLACE "([0-9]+)\\.[0-9]+" "\\1" OPENEXR_VERSION_MAJOR "${_OPENEXR_VERSION}")
-+    string (REGEX REPLACE "[0-9]+\\.([0-9]+)" "\\1" OPENEXR_VERSION_MINOR "${_OPENEXR_VERSION}")
-+elseif (EXISTS "${OPENEXR_INCLUDE_PATH}/OpenEXR/ImfMultiPartInputFile.h")
-     # Must be at least 2.0
-     file(STRINGS "${OPENEXR_INCLUDE_PATH}/OpenEXR/OpenEXRConfig.h" TMP REGEX "^#define OPENEXR_VERSION_STRING .*$")
-     string (REGEX MATCHALL "[0-9]+[.0-9]+" OPENEXR_VERSION ${TMP})
-@@ -90,6 +103,8 @@
-     ${GENERIC_LIBRARY_PATHS}
-     ${OPENEXR_INCLUDE_PATH}/../lib
-     ${ILMBASE_INCLUDE_PATH}/../lib
-+    ${_ILMBASE_LIBDIR}
-+    ${_OPENEXR_LIBDIR}
-     /usr/local/lib
-     /usr/local/lib/${CMAKE_LIBRARY_ARCHITECTURE}
-     /usr/lib
diff --git a/media-libs/openimageio/files/openimageio-1.7.17-use-gnuinstalldirs.patch b/media-libs/openimageio/files/openimageio-1.7.17-use-gnuinstalldirs.patch
deleted file mode 100644
index e77b362be699..000000000000
--- a/media-libs/openimageio/files/openimageio-1.7.17-use-gnuinstalldirs.patch
+++ /dev/null
@@ -1,247 +0,0 @@
-From 603f85536982669f2618be061511c48c93e1c5e9 Mon Sep 17 00:00:00 2001
-From: Jonathan Scruggs <j.scruggs@gmail.com>
-Date: Thu, 28 Sep 2017 16:35:26 +0100
-Subject: [PATCH 1/2] oiio/RB-1.7: Use GNUInstallDirs for installation paths
- (#1747)
-
-* Change all hard coded paths to GNUInstallDirs varibles.
-* Remove variable setting in install.cmake file since
-  GNUInstallDirs does all this for you.
-* Added new search paths for fonts.
-
-Backported from:
-https://github.com/OpenImageIO/oiio/commit/1383ba314ec2522b4f0c7e9037bd546b68bc2d7d
----
- CMakeLists.txt                           | 51 ++++++++------------------------
- src/cmake/oiio_macros.cmake              |  6 ++--
- src/doc/CMakeLists.txt                   |  4 +--
- src/fonts/CMakeLists.txt                 |  2 +-
- src/include/CMakeLists.txt               |  2 +-
- src/libOpenImageIO/imagebufalgo_draw.cpp | 11 +++++++
- src/nuke/txReader/CMakeLists.txt         |  3 +-
- src/nuke/txWriter/CMakeLists.txt         |  3 +-
- 8 files changed, 32 insertions(+), 50 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ca8da565..635c61f4 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -353,6 +353,8 @@ if (LINKSTATIC)
-     set (Boost_USE_STATIC_LIBS 1)
- endif ()
- 
-+include (GNUInstallDirs)
-+
- set (CMAKE_MODULE_PATH
-      "${PROJECT_SOURCE_DIR}/src/cmake/modules"
-      "${PROJECT_SOURCE_DIR}/src/cmake")
-@@ -371,58 +373,32 @@ include_directories (
- 
- 
- ###########################################################################
--# Paths for install tree customization.  Note that relative paths are relative
--# to CMAKE_INSTALL_PREFIX.
--set (DEFAULT_BIN_INSTALL_DIR   "bin")
--set (DEFAULT_LIB_INSTALL_DIR   "lib")
--set (DEFAULT_INCLUDE_INSTALL_DIR "include/OpenImageIO")
-+# Set install paths for the python modules
-+# TODO: Figure out how to get the correct python directory
-+
- if (UNIX AND NOT SELF_CONTAINED_INSTALL_TREE)
--    # Try to be well-behaved and install into reasonable places according to
--    # the "standard" unix directory heirarchy
-     # TODO: Figure out how to get the correct python directory
--    set (DEFAULT_PYLIB_INSTALL_DIR "lib/python/site-packages")
--    set (DEFAULT_PYLIB3_INSTALL_DIR "lib/python3/site-packages")
--    set (DEFAULT_DOC_INSTALL_DIR "share/doc/OpenImageIO")
--    set (DEFAULT_MAN_INSTALL_DIR "share/man/man1")
--    set (DEFAULT_FONTS_INSTALL_DIR "share/fonts/oiio")
-+    set (DEFAULT_PYLIB_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/python/site-packages")
-+    set (DEFAULT_PYLIB3_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/python3/site-packages")
- else ()
--    # Here is the "self-contained install tree" case: the expectation here is
--    # that everything OIIO related will go into its own directory, not into
--    # some standard system heirarchy.
-+    # Here is the "self-contained install tree" case: the expectation here
-+    # is that everything related to this project will go into its own
-+    # directory, not into some standard system heirarchy.
-     set (DEFAULT_PYLIB_INSTALL_DIR "python")
-     set (DEFAULT_PYLIB3_INSTALL_DIR "python3")
--    set (DEFAULT_DOC_INSTALL_DIR "doc")
--    set (DEFAULT_MAN_INSTALL_DIR "doc/man")
--    set (DEFAULT_FONTS_INSTALL_DIR "fonts/oiio")
- endif ()
- if (EXEC_INSTALL_PREFIX)
-     # Tack on an extra prefix to support multi-arch builds.
--    set (DEFAULT_BIN_INSTALL_DIR   "${EXEC_INSTALL_PREFIX}/${DEFAULT_BIN_INSTALL_DIR}")
--    set (DEFAULT_LIB_INSTALL_DIR   "${EXEC_INSTALL_PREFIX}/${DEFAULT_LIB_INSTALL_DIR}")
-     set (DEFAULT_PYLIB_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/${DEFAULT_PYLIB_INSTALL_DIR}")
-     set (DEFAULT_PYLIB3_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/${DEFAULT_PYLIB3_INSTALL_DIR}")
--    set (DEFAULT_FONTS_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/${DEFAULT_FONTS_INSTALL_DIR}")
- endif ()
- # Set up cmake cache variables corresponding to the defaults deduced above, so
- # that the user can override them as desired:
--set (BIN_INSTALL_DIR ${DEFAULT_BIN_INSTALL_DIR} CACHE STRING
--     "Install location for binaries (relative to CMAKE_INSTALL_PREFIX or absolute)")
--set (LIB_INSTALL_DIR ${DEFAULT_LIB_INSTALL_DIR} CACHE STRING
--     "Install location for libraries (relative to CMAKE_INSTALL_PREFIX or absolute)")
- set (PYLIB_INSTALL_DIR ${DEFAULT_PYLIB_INSTALL_DIR} CACHE STRING
-      "Install location for python libraries (relative to CMAKE_INSTALL_PREFIX or absolute)")
- set (PYLIB3_INSTALL_DIR ${DEFAULT_PYLIB3_INSTALL_DIR} CACHE STRING
-      "Install location for python3 libraries (relative to CMAKE_INSTALL_PREFIX or absolute)")
--set (INCLUDE_INSTALL_DIR ${DEFAULT_INCLUDE_INSTALL_DIR} CACHE STRING
--     "Install location of header files (relative to CMAKE_INSTALL_PREFIX or absolute)")
--set (DOC_INSTALL_DIR ${DEFAULT_DOC_INSTALL_DIR} CACHE STRING
--     "Install location for documentation (relative to CMAKE_INSTALL_PREFIX or absolute)")
--set (FONTS_INSTALL_DIR ${DEFAULT_FONTS_INSTALL_DIR} CACHE STRING
--     "Install location for fonts (relative to CMAKE_INSTALL_PREFIX or absolute)")
--if (UNIX)
--    set (MAN_INSTALL_DIR ${DEFAULT_MAN_INSTALL_DIR} CACHE STRING
--         "Install location for manual pages (relative to CMAKE_INSTALL_PREFIX or absolute)")
--endif()
-+
- set (PLUGIN_SEARCH_PATH "" CACHE STRING "Default plugin search path")
- 
- set (INSTALL_DOCS ON CACHE BOOL "Install documentation")
-@@ -440,10 +416,7 @@ if (CMAKE_SKIP_RPATH)
-     set (CMAKE_SKIP_RPATH FALSE)
-     unset (CMAKE_INSTALL_RPATH)
- else ()
--    set (CMAKE_INSTALL_RPATH "${LIB_INSTALL_DIR}")
--    if (NOT IS_ABSOLUTE ${CMAKE_INSTALL_RPATH})
--        set (CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}")
--    endif ()
-+    set (CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}")
-     set (CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
- endif ()
- set (MACOSX_RPATH ON)
-diff --git a/src/cmake/oiio_macros.cmake b/src/cmake/oiio_macros.cmake
-index ee7be325..bfd07413 100644
---- a/src/cmake/oiio_macros.cmake
-+++ b/src/cmake/oiio_macros.cmake
-@@ -7,9 +7,9 @@
- #
- macro (oiio_install_targets)
-     install (TARGETS ${ARGN}
--             RUNTIME DESTINATION "${BIN_INSTALL_DIR}" COMPONENT user
--             LIBRARY DESTINATION "${LIB_INSTALL_DIR}" COMPONENT user
--             ARCHIVE DESTINATION "${LIB_INSTALL_DIR}" COMPONENT developer)
-+             RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT user
-+             LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT user
-+             ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT developer)
- endmacro ()
- 
- # Macro to add a build target for an IO plugin.
-diff --git a/src/doc/CMakeLists.txt b/src/doc/CMakeLists.txt
-index eea04340..a3dc1e71 100644
---- a/src/doc/CMakeLists.txt
-+++ b/src/doc/CMakeLists.txt
-@@ -7,7 +7,7 @@ set (public_docs
- )
- 
- if (INSTALL_DOCS)
--    install (FILES ${public_docs} DESTINATION ${DOC_INSTALL_DIR}
-+    install (FILES ${public_docs} DESTINATION ${CMAKE_INSTALL_DOCDIR}
-              COMPONENT documentation)
- endif ()
- 
-@@ -39,6 +39,6 @@ if (UNIX AND TXT2MAN AND PYTHONINTERP_FOUND)
- 
-     if (INSTALL_DOCS)
-         install (FILES ${manpage_files}
--                 DESTINATION ${MAN_INSTALL_DIR} COMPONENT documentation)
-+                 DESTINATION ${CMAKE_INSTALL_MANDIR} COMPONENT documentation)
-     endif ()
- endif()
-diff --git a/src/fonts/CMakeLists.txt b/src/fonts/CMakeLists.txt
-index 1e296da0..d1bd6409 100644
---- a/src/fonts/CMakeLists.txt
-+++ b/src/fonts/CMakeLists.txt
-@@ -1,7 +1,7 @@
- file (GLOB public_fonts "*/*.ttf")
- 
- if (INSTALL_FONTS AND USE_FREETYPE)
--    install (FILES ${public_fonts} DESTINATION ${FONTS_INSTALL_DIR}
-+    install (FILES ${public_fonts} DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/fonts/OpenImageIO
-              COMPONENT fonts)
- endif ()
- 
-diff --git a/src/include/CMakeLists.txt b/src/include/CMakeLists.txt
-index b063e6f3..3aa96877 100644
---- a/src/include/CMakeLists.txt
-+++ b/src/include/CMakeLists.txt
-@@ -19,5 +19,5 @@ set (OIIO_BUILD_CPP14 ${USE_CPP14})
- configure_file(OpenImageIO/oiioversion.h.in "${CMAKE_BINARY_DIR}/include/OpenImageIO/oiioversion.h" @ONLY)
- list(APPEND public_headers "${CMAKE_BINARY_DIR}/include/OpenImageIO/oiioversion.h")
- 
--install (FILES ${public_headers} DESTINATION ${INCLUDE_INSTALL_DIR}
-+install (FILES ${public_headers} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/OpenImageIO
-          COMPONENT developer)
-diff --git a/src/libOpenImageIO/imagebufalgo_draw.cpp b/src/libOpenImageIO/imagebufalgo_draw.cpp
-index 4e3cc985..a877ff6e 100644
---- a/src/libOpenImageIO/imagebufalgo_draw.cpp
-+++ b/src/libOpenImageIO/imagebufalgo_draw.cpp
-@@ -685,27 +685,38 @@ ImageBufAlgo::render_text (ImageBuf &R, int x, int y, string_view text,
-     if (home && *home) {
-         std::string h (home);
-         search_dirs.push_back (h + "/fonts");
-+        search_dirs.push_back (h + "/fonts/OpenImageIO");
-         search_dirs.push_back (h + "/Fonts");
-+        search_dirs.push_back (h + "/Fonts/OpenImageIO");
-         search_dirs.push_back (h + "/Library/Fonts");
-+        search_dirs.push_back (h + "/Library/Fonts/OpenImageIO");
-     }
-     const char *systemRoot = getenv ("SystemRoot");
-     if (systemRoot && *systemRoot)
-         search_dirs.push_back (std::string(systemRoot) + "/Fonts");
-+        search_dirs.push_back (std::string(systemRoot) + "/Fonts/OpenImageIO");
-     search_dirs.push_back ("/usr/share/fonts");
-+
-     search_dirs.push_back ("/Library/Fonts");
-+    search_dirs.push_back ("/Library/Fonts/OpenImageIO");
-     search_dirs.push_back ("C:/Windows/Fonts");
-+    search_dirs.push_back ("C:/Windows/Fonts/OpenImageIO");
-     search_dirs.push_back ("/usr/local/share/fonts");
-+    search_dirs.push_back ("/usr/local/share/fonts/OpenImageIO");
-     search_dirs.push_back ("/opt/local/share/fonts");
-+    search_dirs.push_back ("/opt/local/share/fonts/OpenImageIO");
-     // Try $OPENIMAGEIOHOME/fonts
-     const char *oiiohomedir = getenv ("OPENIMAGEIOHOME");
-     if (oiiohomedir && *oiiohomedir)
-         search_dirs.push_back (std::string(oiiohomedir) + "/fonts");
-+        search_dirs.push_back (std::string(oiiohomedir) + "/fonts/OpenImageIO");
-     // Try ../fonts relative to where this executing binary came from
-     std::string this_program = OIIO::Sysutil::this_program_path ();
-     if (this_program.size()) {
-         std::string path = Filesystem::parent_path (this_program);
-         path = Filesystem::parent_path (path);
-         search_dirs.push_back (path+"/fonts");
-+        search_dirs.push_back (path+"/fonts/OpenImageIO");
-     }
- 
-     // Try to find the font.  Experiment with several extensions
-diff --git a/src/nuke/txReader/CMakeLists.txt b/src/nuke/txReader/CMakeLists.txt
-index 3e72b6d4..660a2ee1 100644
---- a/src/nuke/txReader/CMakeLists.txt
-+++ b/src/nuke/txReader/CMakeLists.txt
-@@ -28,5 +28,4 @@ else ()
-         COMPILE_FLAGS "-fPIC -msse")
- endif ()
- 
--install (TARGETS txReader
--    LIBRARY DESTINATION "${LIB_INSTALL_DIR}/nuke")
-+oiio_install_targets (txReader)
-diff --git a/src/nuke/txWriter/CMakeLists.txt b/src/nuke/txWriter/CMakeLists.txt
-index 66312bc4..0fb70a36 100644
---- a/src/nuke/txWriter/CMakeLists.txt
-+++ b/src/nuke/txWriter/CMakeLists.txt
-@@ -28,5 +28,4 @@ else ()
-         COMPILE_FLAGS "-fPIC -msse")
- endif ()
- 
--install (TARGETS txWriter
--    LIBRARY DESTINATION "${LIB_INSTALL_DIR}/nuke")
-+oiio_install_targets (txWriter)
--- 
-2.14.2
-
diff --git a/media-libs/openimageio/metadata.xml b/media-libs/openimageio/metadata.xml
index 27cefe35ec56..51a8e3601b05 100644
--- a/media-libs/openimageio/metadata.xml
+++ b/media-libs/openimageio/metadata.xml
@@ -6,20 +6,12 @@
 		<name>Gentoo Graphics Project</name>
 	</maintainer>
 	<use>
-		<flag name="cpu_flags_x86_avx512f" restrict="&gt;=media-libs/openimageio-1.7.11">
-			SIMD Optimization
-		</flag>
-		<flag name="cpu_flags_x86_f16c" restrict="&gt;=media-libs/openimageio-1.7.11">
-			SIMD Optimization
-		</flag>
-		<flag name="colorio">Use <pkg>media-libs/opencolorio</pkg></flag>
-		<flag name="field3d" restrict="&gt;=media-libs/openimageio-1.6.18">
-			Use <pkg>media-libs/Field3D</pkg>
-		</flag>
-		<flag name="opencv">Use <pkg>media-libs/opencv</pkg></flag>
-		<flag name="ptex" restrict="&gt;=media-libs/openimageio-1.6.18">
-			Use <pkg>media-libs/ptex</pkg>
-		</flag>
+		<flag name="cpu_flags_x86_avx512f">SIMD Optimization</flag>
+		<flag name="cpu_flags_x86_f16c">SIMD Optimization</flag>
+		<flag name="color-management">Enable color management via <pkg>media-libs/opencolorio</pkg></flag>
+		<flag name="field3d">Enable f3d file (write) support via <pkg>media-libs/Field3D</pkg></flag>
+		<flag name="opencv">Enable OpenCV support via <pkg>media-libs/opencv</pkg></flag>
+		<flag name="ptex">Enable Ptex texture mapping system file support via <pkg>media-libs/ptex</pkg></flag>
 	</use>
 	<upstream>
 		<remote-id type="github">OpenImageIO/oiio</remote-id>
diff --git a/media-libs/openimageio/openimageio-1.6.13.ebuild b/media-libs/openimageio/openimageio-1.6.13.ebuild
index 80f7135f6bbc..09f2d8e5ed0d 100644
--- a/media-libs/openimageio/openimageio-1.6.13.ebuild
+++ b/media-libs/openimageio/openimageio-1.6.13.ebuild
@@ -4,7 +4,6 @@
 EAPI=6
 
 PYTHON_COMPAT=( python{2_7,3_5} )
-
 inherit cmake-utils python-single-r1 vcs-snapshot
 
 DESCRIPTION="A library for reading and writing images"
@@ -14,7 +13,7 @@ SRC_URI="https://github.com/OpenImageIO/oiio/archive/Release-${PV}.tar.gz -> ${P
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ~ppc64 x86"
-IUSE="colorio ffmpeg gif jpeg2k opencv opengl python raw ssl +truetype"
+IUSE="color-management ffmpeg gif jpeg2k opencv opengl python raw ssl +truetype"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RESTRICT="test" #431412
@@ -29,7 +28,7 @@ RDEPEND="
 	media-libs/tiff:0=
 	sys-libs/zlib:=
 	virtual/jpeg:0
-	colorio? ( >=media-libs/opencolorio-1.0.7:= )
+	color-management? ( >=media-libs/opencolorio-1.0.7:= )
 	ffmpeg? ( media-video/ffmpeg:= )
 	gif? ( media-libs/giflib:0= )
 	jpeg2k? ( >=media-libs/openjpeg-1.5:0= )
@@ -78,7 +77,7 @@ src_configure() {
 		-DUSE_FREETYPE=$(usex truetype)
 		-DUSE_FFMPEG=$(usex ffmpeg)
 		-DUSE_GIF=$(usex gif)
-		-DUSE_OCIO=$(usex colorio)
+		-DUSE_OCIO=$(usex color-management)
 		-DUSE_OPENCV=$(usex opencv)
 		-DUSE_OPENGL=$(usex opengl)
 		-DUSE_OPENJPEG=$(usex jpeg2k)
diff --git a/media-libs/openimageio/openimageio-1.6.18.ebuild b/media-libs/openimageio/openimageio-1.6.18.ebuild
deleted file mode 100644
index 30b8d9ae2d08..000000000000
--- a/media-libs/openimageio/openimageio-1.6.18.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit cmake-utils vcs-snapshot python-single-r1
-
-DESCRIPTION="A library for reading and writing images"
-HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
-SRC_URI="https://github.com/OpenImageIO/oiio/archive/Release-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-X86_CPU_FEATURES=( sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2 )
-CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
-
-IUSE="colorio doc ffmpeg field3d gif jpeg2k opencv opengl ptex python raw ssl +truetype ${CPU_FEATURES[@]%:*}"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RESTRICT="test" #431412
-
-RDEPEND="dev-libs/boost:=
-	dev-libs/pugixml:0=
-	media-libs/ilmbase:=
-	media-libs/libpng:0=
-	>=media-libs/libwebp-0.2.1:=
-	media-libs/openexr:=
-	media-libs/tiff:0=
-	sys-libs/zlib:=
-	virtual/jpeg:0
-	colorio? ( media-libs/opencolorio:0= )
-	ffmpeg? ( media-video/ffmpeg:0= )
-	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
-	)
-	ptex? ( media-libs/ptex )
-	python? (
-		${PYTHON_DEPS}
-		dev-libs/boost:=[python,${PYTHON_USEDEP}]
-	)
-	raw? ( media-libs/libraw:0= )
-	ssl? ( dev-libs/openssl:0= )
-	truetype? ( media-libs/freetype:2= )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-use-gnuinstalldirs.patch"
-	"${FILESDIR}/${P}-make-python-and-boost-detection-more-generic.patch"
-	"${FILESDIR}/${P}-repair-breaks-after-boost-python-1.65-changes.patch"
-)
-
-DOCS=( CHANGES CREDITS README.rst src/doc/${PN}.pdf )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	# Build with SIMD support (choices: 0, sse2, sse3,"
-	#	ssse3, sse4.1, sse4.2)"
-	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_CPP11=ON
-		-DOIIO_BUILD_TESTS=OFF # as they are RESTRICTed
-		-DSTOP_ON_WARNING=OFF
-		-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_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=OFF # Deprecated
-		-DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/media-libs/openimageio/openimageio-1.7.17.ebuild b/media-libs/openimageio/openimageio-1.7.17.ebuild
deleted file mode 100644
index 2e5bb080fb59..000000000000
--- a/media-libs/openimageio/openimageio-1.7.17.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit cmake-utils vcs-snapshot python-single-r1
-
-DESCRIPTION="A library for reading and writing images"
-HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
-SRC_URI="https://github.com/OpenImageIO/oiio/archive/Release-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~x86"
-
-X86_CPU_FEATURES=(
-	sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
-	avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
-)
-CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
-
-IUSE="colorio doc ffmpeg field3d gif jpeg2k libressl opencv opengl ptex python 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
-	)
-	ptex? ( media-libs/ptex:= )
-	python? (
-		${PYTHON_DEPS}
-		dev-libs/boost:=[python,${PYTHON_USEDEP}]
-	)
-	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] )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-use-gnuinstalldirs.patch"
-	"${FILESDIR}/${P}-make-python-and-boost-detection-more-generic.patch"
-	"${FILESDIR}/${P}-openexr-2.3.0.patch" # bug 683126
-)
-
-DOCS=( CHANGES.md CREDITS.md README.md src/doc/${PN}.pdf )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	# Build with SIMD support
-	local cpufeature
-	local mysimd=()
-	for cpufeature in "${CPU_FEATURES[@]}"; do
-		use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
-	done
-
-	# If no CPU SIMDs were used, completely disable them
-	[[ -z ${mysimd} ]] && mysimd=("0")
-
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
-		-DINSTALL_DOCS=$(usex doc)
-		-DOIIO_BUILD_TESTS=OFF # as they are RESTRICTed
-		-DSTOP_ON_WARNING=OFF
-		-DUSE_CPP14=ON
-		-DUSE_EXTERNAL_PUGIXML=ON
-		-DUSE_FFMPEG=$(usex ffmpeg)
-		-DUSE_FIELD3D=$(usex field3d)
-		-DUSE_FREETYPE=$(usex truetype)
-		-DUSE_GIF=$(usex gif)
-		-DUSE_JPEGTURBO=ON
-		-DUSE_LIBRAW=$(usex raw)
-		-DUSE_NUKE=NO # Missing in Gentoo
-		-DUSE_NUKE=OFF
-		-DUSE_OCIO=$(usex colorio)
-		-DUSE_OPENCV=$(usex opencv)
-		-DUSE_OPENGL=$(usex opengl)
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_OPENSSL=$(usex ssl)
-		-DUSE_PTEX=$(usex ptex)
-		-DUSE_PYTHON=$(usex python)
-		-DUSE_QT=OFF # Deprecated
-		-DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/media-libs/openimageio/openimageio-1.8.17.ebuild b/media-libs/openimageio/openimageio-1.8.17.ebuild
index f3c032132eb1..4261aca86c63 100644
--- a/media-libs/openimageio/openimageio-1.8.17.ebuild
+++ b/media-libs/openimageio/openimageio-1.8.17.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
 
+PYTHON_COMPAT=( python{2_7,3_{5,6}} )
 inherit cmake-utils python-single-r1
 
 DESCRIPTION="A library for reading and writing images"
@@ -20,7 +20,7 @@ X86_CPU_FEATURES=(
 )
 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[@]%:*}"
+IUSE="color-management 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
@@ -34,7 +34,7 @@ RDEPEND=">=dev-libs/boost-1.62:=
 	media-libs/tiff:0=
 	sys-libs/zlib:=
 	virtual/jpeg:0
-	colorio? ( media-libs/opencolorio:= )
+	color-management? ( media-libs/opencolorio:= )
 	ffmpeg? ( media-video/ffmpeg:= )
 	field3d? ( media-libs/Field3D:= )
 	gif? ( media-libs/giflib:0= )
@@ -98,7 +98,7 @@ src_configure() {
 		-DUSE_LIBRAW=$(usex raw)
 		-DUSE_NUKE=NO # Missing in Gentoo
 		-DUSE_NUKE=OFF
-		-DUSE_OCIO=$(usex colorio)
+		-DUSE_OCIO=$(usex color-management)
 		-DUSE_OPENCV=$(usex opencv)
 		-DUSE_OPENGL=$(usex opengl)
 		-DUSE_OPENJPEG=$(usex jpeg2k)
diff --git a/media-libs/openjpeg/Manifest b/media-libs/openjpeg/Manifest
index e2d0242a8eb5..4eadbd3ff539 100644
--- a/media-libs/openjpeg/Manifest
+++ b/media-libs/openjpeg/Manifest
@@ -8,5 +8,5 @@ DIST openjpeg-data_20170814.tar.gz 497454197 BLAKE2B ea27ab763e685724dfd5c2242a9
 DIST openjpeg-data_20180620.tar.gz 497894373 BLAKE2B 3a596f8f9ee56037bf567b6f2d3731b97299dba24e0c9d3562d38c15ddf58d352a918edaccb528f054cf288f87d6362d90d3450d4a5b968e9c8dfe05f54d89fe SHA512 32189a10c4d8cf00c23cda455f9e4353deb2175189d85f9b3aab1c4375a02a491ec2de89815725ebbcaea86c2c7ab274b89ee2583ffd8bf0dc32d4fc2d8f7507
 EBUILD openjpeg-1.5.2-r1.ebuild 1948 BLAKE2B 08ae38cae98a197e1bd980101b9e5938e8d29dc9a37421adb14f421a4df84b5cca4ed216d939d757e519684493b5b58c1f5273922e9fc335ee65a958ee898550 SHA512 8b18759b5eb0ca3e5446453f6f3e550a20519147af5026169b28eae43ff51a94c6522efbc07edc39438e3372b16452fce4f41f32b2ae848ec779a1ea25f6513b
 EBUILD openjpeg-2.3.0-r1.ebuild 4215 BLAKE2B 17350556cee3baf31e26d9f1bddf7a42879b088c84cf8fccad099b1316d3eb5fe469b3b7edb6d2828da3171105d873cf5f89285e2d04ea6b4c94bcde356a3b61 SHA512 3007c71e7ae8117f2ca934d0fc022646718d1f39a95fcaed671afe57092ecf40919c3f6fe913128ffee0b195c0f4d946ea319ab33485cae7fe099e21a9c2f12b
-EBUILD openjpeg-2.3.1.ebuild 4183 BLAKE2B ce5cff3e194e73672461d81da8d509ca85095fabd70cb624c2da6fe2cbd60afd7f06b94580000e98b818b6565886f5ec919d6591d108de1318536af5e6873da6 SHA512 df832956e633a48ff1f5b0d2d8423fb71bc3872451b1b655bb565dd2edff4feb3758bfa7628c35d0a9cc54c78f592f691dbe9b402f9d0ca6af1ae7710a1db283
+EBUILD openjpeg-2.3.1.ebuild 4173 BLAKE2B e2196932723ba8d1fe7f66f1088ab1f4afca941144eb21d05ee1c1dcaa0b0c450356138e796777da1e4872b0360bccc79ae22fa6ab401102458b96ea8db4ef9a SHA512 ade3bf12538f4ff7c06052871ebefb03425f29eca7f7982d60289e780a65aa28370055d98c6cf007041bfaeafe07b5b7621de0cc49463cf49519d1f63442f366
 MISC metadata.xml 455 BLAKE2B ee0da6c575d6fd05b1aa361cb11e09eaffc18f24f57010a66c31127bd1e55073262c1c0789f07779ef864d6cb27670e8653c6b1269681b5b6497185b5d0583aa SHA512 b956f115708b8afff16126117cacfa9bb51fb55660e19cb6b295081d81790c5c6e8858bc28193f3d9a5b0da66189490938c83c32124e33dedb37ea4a8c8ef99d
diff --git a/media-libs/openjpeg/openjpeg-2.3.1.ebuild b/media-libs/openjpeg/openjpeg-2.3.1.ebuild
index 9140607a0a34..fab3cb439ed8 100644
--- a/media-libs/openjpeg/openjpeg-2.3.1.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.3.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="2/7" # based on SONAME
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 
 RDEPEND="
diff --git a/media-libs/partio/Manifest b/media-libs/partio/Manifest
index 42fa45b9e3a4..fdbe2c973292 100644
--- a/media-libs/partio/Manifest
+++ b/media-libs/partio/Manifest
@@ -4,6 +4,6 @@ DIST partio-1.5.0.tar.gz 291604 BLAKE2B d0d6eab4ef541e61fe4498b4cdd8b9c60e62545a
 DIST partio-1.5.4.tar.gz 291617 BLAKE2B 638fae984d392e1e6c95862ad9a8dd8b8a0d80b2c83dfd03e887af36e420d15fd67f0b2c71e5e8c335668b512660bf14f03a1329ac0d7a48431674a51043585d SHA512 967da5b648b19c45bd0c3c8ff56f891e2d54a07b2cd113f18d5d0b646cbfabd968e31ee48c0e167bf9a911d8d5af42d5291b355da305a2b9134fa78fc23e5636
 EBUILD partio-1.1.0_p20170829.ebuild 1053 BLAKE2B 155ea504acb3b14457a34f151b190eb6b96e5ce0c4a1046fab08c0be80c6f32bf2abdda8c678c7e1010451b0c075d59ef53b48ff847cc51dd11c1b23745f08ed SHA512 9dfd4a750fa6cb158f7ebb3d010dfc1f820962aae514ffa7a91acd8b94aeda8b85c83ef809b7d958525dbe09779a9b9863714f99fd13be2a90d778fe40a853d8
 EBUILD partio-1.5.0.ebuild 903 BLAKE2B bafbecc4326402fc541260b2bee725c5b1df02ceb9d5971bcc0fa70ac892972960a9a63359d364fd138014818e9d9f447a3713f076a8dd801858ff869e057d56 SHA512 70862becc3eb0c58423fc2e772e5842cf6882ebda71fca823da4b024c4fcf56de5367b9dc2f7f3c0364025d9c45fefa5565de7ffbbfd3cad6b86a13a0f1c2ebd
-EBUILD partio-1.5.4.ebuild 903 BLAKE2B bafbecc4326402fc541260b2bee725c5b1df02ceb9d5971bcc0fa70ac892972960a9a63359d364fd138014818e9d9f447a3713f076a8dd801858ff869e057d56 SHA512 70862becc3eb0c58423fc2e772e5842cf6882ebda71fca823da4b024c4fcf56de5367b9dc2f7f3c0364025d9c45fefa5565de7ffbbfd3cad6b86a13a0f1c2ebd
-EBUILD partio-9999.ebuild 1113 BLAKE2B 349b80f261c629eda7d27396361e363e771512ac7ede54dfbe53c59b0dbcc6717518981f2e8bc27de87dad91719c765acca1a9d0eb7fee67d30840011420261e SHA512 4ee4db5b8ae843297c5def3c9e5540ee23b90011708924057b8c19f59face92c856ca14c9c07daeb8f2ba0b31dc0e574df3583c130f25668d57e39a29a885178
+EBUILD partio-1.5.4.ebuild 867 BLAKE2B 65f9802bd80a02087bb8cadf530908a165ed4c0b984b963862684e68839994db4dad20f3e7d57d97aa56a5b77c63bb168c1fde0a38eafa3d15c5c37f8239aad2 SHA512 827505c7b1f01db93722d4e7b5034d759d3ae880afcf6671bf46bf6c097fbc272e4e38d77f2880d8b1ee33e303612d674d400fa7844e2e718ea671894e5a87c1
+EBUILD partio-9999.ebuild 869 BLAKE2B fd5b476407d8454ff3941cd60754e9d421c589a9293431b092e471c39a32d07c9f79b716b0a637e0c9a25a6e9a3604819b4d20dc1d62ea32d94ba7ddcd18b1c7 SHA512 e2ed573172e87366a20bb36c1c30a28dc659cc5a7566bc7787f66d05d1a4d94ec55cbc629879bc54449bfdf1d28a7cadcb0bbbb0b29c55b46df864c8033a21d7
 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
index f8604288badc..84a164057290 100644
--- a/media-libs/partio/partio-1.5.4.ebuild
+++ b/media-libs/partio/partio-1.5.4.ebuild
@@ -1,11 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
 PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
 inherit cmake-utils python-single-r1
 
 if [[ ${PV} == *9999 ]]; then
@@ -13,10 +11,10 @@ if [[ ${PV} == *9999 ]]; then
 	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"
+	KEYWORDS="amd64 x86"
 fi
 
-DESCRIPTION="A library for particle IO and manipulation"
+DESCRIPTION="Library for particle IO and manipulation"
 HOMEPAGE="https://www.disneyanimation.com/technology/partio.html"
 
 LICENSE="BSD"
@@ -24,16 +22,16 @@ SLOT="0"
 IUSE="doc"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
+BDEPEND="
+	dev-lang/swig
+	doc? ( app-doc/doxygen[latex] )
+"
 RDEPEND="${PYTHON_DEPS}
 	media-libs/freeglut
-	sys-libs/zlib:=
+	sys-libs/zlib
 	virtual/opengl
 "
-
-DEPEND="${RDEPEND}
-	dev-lang/swig:*
-	doc? ( app-doc/doxygen[latex] )
-"
+DEPEND="${RDEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/media-libs/partio/partio-9999.ebuild b/media-libs/partio/partio-9999.ebuild
index 8c68311fbd9b..1b109fd6da7f 100644
--- a/media-libs/partio/partio-9999.ebuild
+++ b/media-libs/partio/partio-9999.ebuild
@@ -1,23 +1,20 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
 PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit cmake-utils vcs-snapshot python-single-r1
+inherit cmake-utils python-single-r1
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/wdas/partio.git"
 else
-	MY_GIT_COMMIT="2774ef3958da46d9f8a4230ebda9e04b1aa8f4e5"
-	SRC_URI="https://github.com/wdas/${PN}/archive/${MY_GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	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"
+DESCRIPTION="Library for particle IO and manipulation"
 HOMEPAGE="https://www.disneyanimation.com/technology/partio.html"
 
 LICENSE="BSD"
@@ -25,24 +22,20 @@ SLOT="0"
 IUSE="doc"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
+BDEPEND="
+	dev-lang/swig
+	doc? ( app-doc/doxygen[latex] )
+"
 RDEPEND="${PYTHON_DEPS}
 	media-libs/freeglut
+	sys-libs/zlib
 	virtual/opengl
-	sys-libs/zlib:="
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen[latex] )
-	dev-lang/swig:*"
-
-src_prepare() {
-	cmake-utils_src_prepare
-	cmake_comment_add_subdirectory "src/tests"
-}
+"
+DEPEND="${RDEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package doc Doxygen)
-		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
 	)
 	cmake-utils_src_configure
 }
diff --git a/media-libs/ptex/Manifest b/media-libs/ptex/Manifest
index 3d0d49f3ced3..e8250b8e9324 100644
--- a/media-libs/ptex/Manifest
+++ b/media-libs/ptex/Manifest
@@ -1,11 +1,4 @@
-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
 AUX ptex-2.3.2-cxx11.patch 828 BLAKE2B e445858c625de0c924a412690cbf2f1bed6ee4fd7efafd60765a4f43fa204ba474cdf2944acf3eb94b061df6c39cd9016413e6c5d73da3813144fa289746ceb4 SHA512 53d6e66dd4a35dc2e16e5f227a24ec90d3f7667c5f80dc3d7321086b4efb4d63451783450a02a389c09a3faa6808cd90e89e2097390ef9881ffe313fbfd8c6d1
-DIST ptex-2.1.28.tar.gz 305327 BLAKE2B 4a91b08ae326e8ed8d420022c693ea60cb21908380b8c49a7672771686f9dd2ef05151b7d43755bc63ab6624db772c2b53d1ffdcdea9c1dff7627cc3fe0f3b15 SHA512 ddce3c79f14d196e550c1e8a5b371482f88190cd667a2e2aa84601de1639f7cabb8571c1b3a49b48df46ce550d27088a00a67b1403c3bfec2ed73437c3dca3e8
-DIST ptex-2.3.0.tar.gz 306462 BLAKE2B 790e3623ce6ebae2dfd8884d8e19e62395c54432289d88bdcf3a01c8ae1ef752ca88869357ac1e4657d59f1ca73d311a3fb9a08efe4e145ca259eff93d8a3b6a SHA512 2d9d320e4205236a4eff05ec3c67d085624809ebefa89fa3b943d18a8b2b6a5f61c022a4cc4363a7c6ceccfb9eac4f8738dff2e90a3355814f2c4ff096c09992
 DIST ptex-2.3.2.tar.gz 308550 BLAKE2B 7b3145dbf9d2c13140c3f20ed606ee911deed3c38fd30adfbb01b58c3af5794dbd4e0fa1fbab6e8ae83556a0ffec725bf077271abf752f1271ed721ca200a1ff SHA512 dbc557dc5e1761204ee3483af9bf4ff1504cbd7955e0405dc27a51f7182e2445e41db086b2792c2491aa2cbaddc74e523170a4b3d25e44d332123d5b7081f4b9
-EBUILD ptex-2.1.28-r1.ebuild 575 BLAKE2B 5ec37846a07464082c8863b53e523f1b046151f14cccb7b19672028560072703b303feeaac156c78c6a7006d79bed649e9a24d5dac6f2e81985e57077595850e SHA512 0289b417671552ad7400b5784f985d1b3d405b07d10e2101a06289292249d67ab88ad1c041f5641ea724de59a0285797fc7435cc68ad9f3c550bbb30b55bb967
-EBUILD ptex-2.3.0.ebuild 659 BLAKE2B 22ebe67087dc4ce5549dd32b35becb3b2606ae7a9c86ea19b29bf6f9a2165c1648b10f7970b3be9fadf2449d71a78b24232155d038036e3cdbc91be27ab33ce8 SHA512 e6ba1ca758119dca0e886a7988dfdff81ea1dbed0a0e84fffeb13bdc1cc140781250f6515cb8a568f5000383b01b2435caf2907d8116e50034418c8108447ede
-EBUILD ptex-2.3.2.ebuild 793 BLAKE2B 4e038fb24bbe5c65fa973fde8d294a980fa4c04d9a73abdb5e6df43b55529ce7eb853a2fd6132b12324a2f634d7dde11aedb6a6fef0b0a228390d227ea343ef3 SHA512 0c88c278faaa06bd433b12a0e935a0faaad921b2b099b0b74cc811a947ffedf06bf13b1b3797f57ad056217984e6af5fd22dc4f41932f3cc53bd6bf734930a29
+EBUILD ptex-2.3.2.ebuild 791 BLAKE2B 503764f19394ed110997c6f3d0930b7fd75103a310277d566202b84a0b788cbd3f0dc57dddb492e21f845fc063ff6deedb1971c5ecc376e531d86ff9ad378255 SHA512 1e879f58054fff1f8eb94e4708b1e0d81be1734ea80821a0f146cbebe6f2a662d16925ef40925b8cea946cd24f21623c4518dc611e21944c5974a0478ed9f519
 MISC metadata.xml 646 BLAKE2B 443223f4b464d16d2e7b4ea692b080f49aeceb1ef4d599d5dccd5aab6223e8f3a562317f7dda0cddb79840f19270f65af948df153cb2064b903f80e00580ee8e SHA512 ec1b3e3f8b15023413723136125ad6a92b7a509532824fcc547bcfe147e63a60e072496cbfa2337bb180e9c718fbe9e49c198f469a9e41a252b1706cf6cd461f
diff --git a/media-libs/ptex/files/ptex-2.1.28-20170213.patch b/media-libs/ptex/files/ptex-2.1.28-20170213.patch
deleted file mode 100644
index 335d07788632..000000000000
--- a/media-libs/ptex/files/ptex-2.1.28-20170213.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-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")
-+    set(CMAKE_CXX_FLAGS "-std=c++11 -Wall -Wextra -pedantic ${CMAKE_CXX_FLAGS}")
- endif ()
- 
- if(MSVC)
-diff -purN a/Makefile b/Makefile
---- a/Makefile	2016-04-04 18:14:05.000000000 +0100
-+++ b/Makefile	2017-02-13 22:59:10.000000000 +0000
-@@ -17,6 +17,10 @@ ifdef PRMAN_15_COMPATIBLE_PTEX
-     CMAKE_FLAGS += -DPRMAN_15_COMPATIBLE_PTEX:BOOL=TRUE
- endif
- 
-+ifdef TOOLCHAIN
-+    CMAKE_FLAGS += -DCMAKE_TOOLCHAIN_FILE=$(TOOLCHAIN)
-+endif
-+
- # make V=1 shortcut for VERBOSE=1
- ifdef V
-     VERBOSE=1
-diff -purN a/src/ptex/PtexHashMap.h b/src/ptex/PtexHashMap.h
---- a/src/ptex/PtexHashMap.h	2016-04-04 18:14:05.000000000 +0100
-+++ b/src/ptex/PtexHashMap.h	2017-02-13 22:59:10.000000000 +0000
-@@ -284,14 +284,11 @@ private:
- 
-     Entry* lockEntriesAndGrowIfNeeded(size_t& newMemUsed)
-     {
--        while (_size*2 >= _numEntries) {
--            Entry* entries = lockEntries();
--            if (_size*2 >= _numEntries) {
--                entries = grow(entries, newMemUsed);
--            }
--            return entries;
-+        Entry* entries = lockEntries();
-+        if (_size*2 >= _numEntries) {
-+            entries = grow(entries, newMemUsed);
-         }
--        return lockEntries();
-+        return entries;
-     }
- 
-     Entry* grow(Entry* oldEntries, size_t& newMemUsed)
-diff -purN a/src/ptex/PtexIO.h b/src/ptex/PtexIO.h
---- a/src/ptex/PtexIO.h	2016-04-04 18:14:05.000000000 +0100
-+++ b/src/ptex/PtexIO.h	2017-02-13 22:59:10.000000000 +0000
-@@ -40,6 +40,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- 
- PTEX_NAMESPACE_BEGIN
- 
-+#pragma pack(push, 1)
- struct Header {
-     uint32_t magic;
-     uint32_t version;
-@@ -98,6 +99,7 @@ struct EditMetaDataHeader {
-     uint32_t metadatazipsize;
-     uint32_t metadatamemsize;
- };
-+#pragma pack(pop)
- 
- const uint32_t Magic = 'P' | ('t'<<8) | ('e'<<16) | ('x'<<24);
- const int HeaderSize = sizeof(Header);
-diff -purN a/.workonrc.products b/.workonrc.products
---- a/.workonrc.products	1970-01-01 01:00:00.000000000 +0100
-+++ b/.workonrc.products	2017-02-13 22:59:10.000000000 +0000
-@@ -0,0 +1 @@
-+Ptex
diff --git a/media-libs/ptex/files/ptex-2.1.28-allow-custom-build-type.patch b/media-libs/ptex/files/ptex-2.1.28-allow-custom-build-type.patch
deleted file mode 100644
index fd79759f7ed4..000000000000
--- a/media-libs/ptex/files/ptex-2.1.28-allow-custom-build-type.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -purN a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt	2017-02-13 22:59:10.000000000 +0000
-+++ b/CMakeLists.txt	2017-08-08 14:19:10.325817085 +0100
-@@ -8,11 +8,16 @@ include(FindThreads)
- 
- enable_testing()
- 
--# Detect the build type from the $FLAVOR environment variable
--if ("$ENV{FLAVOR}" MATCHES "debug")
--    set(CMAKE_BUILD_TYPE "Debug" CACHE STRING "type of build" FORCE)
--else ()
--    set(CMAKE_BUILD_TYPE "Release" CACHE STRING "type of build" FORCE)
-+if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
-+    # Detect the build type from the $FLAVOR environment variable
-+    # Default to optimized Release builds when unspecified.
-+    if ("$ENV{FLAVOR}" MATCHES "debug")
-+        set(CMAKE_BUILD_TYPE "Debug" CACHE STRING "type of build" FORCE)
-+    elseif ("$ENV{FLAVOR}" MATCHES "profile")
-+        set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING "type of build" FORCE)
-+    else ()
-+        set(CMAKE_BUILD_TYPE "Release" CACHE STRING "type of build" FORCE)
-+    endif ()
- endif ()
- 
- if (NOT WIN32)
-diff -purN a/Makefile b/Makefile
---- a/Makefile	2017-02-13 22:59:10.000000000 +0000
-+++ b/Makefile	2017-08-08 14:19:16.939829578 +0100
-@@ -21,6 +21,10 @@ ifdef TOOLCHAIN
-     CMAKE_FLAGS += -DCMAKE_TOOLCHAIN_FILE=$(TOOLCHAIN)
- endif
- 
-+ifdef BUILD_TYPE
-+    CMAKE_FLAGS += -DCMAKE_BUILD_TYPE=$(BUILD_TYPE)
-+endif
-+
- # make V=1 shortcut for VERBOSE=1
- ifdef V
-     VERBOSE=1
diff --git a/media-libs/ptex/files/ptex-2.3.0-cxx11.patch b/media-libs/ptex/files/ptex-2.3.0-cxx11.patch
deleted file mode 100644
index f0b600091377..000000000000
--- a/media-libs/ptex/files/ptex-2.3.0-cxx11.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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.1.28-r1.ebuild b/media-libs/ptex/ptex-2.1.28-r1.ebuild
deleted file mode 100644
index 6b688c975e60..000000000000
--- a/media-libs/ptex/ptex-2.1.28-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# 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"
-
-RDEPEND="sys-libs/zlib:="
-DEPEND="${RDEPEND}
-	app-doc/doxygen"
-
-PATCHES=(
-	"${FILESDIR}/${P}-20170213.patch"
-	"${FILESDIR}/${P}-allow-custom-build-type.patch"
-)
-
-mycmakeargs=( -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}/html" )
diff --git a/media-libs/ptex/ptex-2.3.0.ebuild b/media-libs/ptex/ptex-2.3.0.ebuild
deleted file mode 100644
index ce1f9fd9c98e..000000000000
--- a/media-libs/ptex/ptex-2.3.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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/ptex/ptex-2.3.2.ebuild b/media-libs/ptex/ptex-2.3.2.ebuild
index b9d0f650ba96..48580481fd2b 100644
--- a/media-libs/ptex/ptex-2.3.2.ebuild
+++ b/media-libs/ptex/ptex-2.3.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/wdas/ptex/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="static-libs"
 
 BDEPEND="app-doc/doxygen"
diff --git a/media-libs/theoraplay/Manifest b/media-libs/theoraplay/Manifest
new file mode 100644
index 000000000000..ba86630feb28
--- /dev/null
+++ b/media-libs/theoraplay/Manifest
@@ -0,0 +1,3 @@
+DIST theoraplay-0_pre20180524.tar.bz2 14504 BLAKE2B 99580d65574887c283c8d7d1a588783bdb91ea5570adb4e194919ed930be558d62ddbd10e451746aa47bd6996cc3102f0b1eee50308cc278c2c6368a2a76d244 SHA512 509815535f73efe3b1c602b425d4a0aa78ce744809e8242fdfdecbb74a3a765d80b8e565dbdd00cd2daaf122365ba5a8651d302c907c714eae97f64607b7d0b8
+EBUILD theoraplay-0_pre20180524.ebuild 982 BLAKE2B 243f8081623bb289008de66e5051ec01c47895c96e572ba70b0f3fc9533f37c6cd08d3da55591245bcdd4792a66ba3322bc8b1a4db9c78065cdf061287e57377 SHA512 74a900d1431d426b8b4f32da1e783a69ee748f355193455fa915f6cbe5550d8edb7cffb57adf2ce6f7f23fd9d80c2a6148079ed779031952602e69c061d89ffa
+MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/media-libs/theoraplay/metadata.xml b/media-libs/theoraplay/metadata.xml
new file mode 100644
index 000000000000..26079e608bed
--- /dev/null
+++ b/media-libs/theoraplay/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/media-libs/theoraplay/theoraplay-0_pre20180524.ebuild b/media-libs/theoraplay/theoraplay-0_pre20180524.ebuild
new file mode 100644
index 000000000000..487a8f89eb15
--- /dev/null
+++ b/media-libs/theoraplay/theoraplay-0_pre20180524.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib multilib-minimal toolchain-funcs
+
+COMMIT="7d8701876294"
+DESCRIPTION="Simple library to make decoding of Ogg Theora videos easier"
+HOMEPAGE="https://icculus.org/projects/theoraplay/"
+SRC_URI="https://hg.icculus.org/icculus/${PN}/archive/${COMMIT}.tar.bz2 -> ${P}.tar.bz2"
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	media-libs/libogg
+	media-libs/libtheora
+	media-libs/libvorbis
+"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+multilib_src_compile() {
+	libtool --tag=CC --mode=compile $(tc-getCC) -shared ${CFLAGS} -pthread -c "${S}"/${PN}.c || die
+	libtool --tag=CC --mode=link $(tc-getCC) -shared ${LDFLAGS} -pthread -Wl,-z,defs ${PN}.lo \
+			-logg -ltheoradec -lvorbis -o lib${PN}.la -rpath "${EPREFIX}/usr/$(get_libdir)" || die
+}
+
+multilib_src_install() {
+	dolib.so .libs/lib${PN}$(get_libname)*
+}
+
+multilib_src_install_all() {
+	doheader ${PN}.h
+}
diff --git a/media-libs/urt/Manifest b/media-libs/urt/Manifest
index 682f2e05c2b0..9f6b3d6ab15b 100644
--- a/media-libs/urt/Manifest
+++ b/media-libs/urt/Manifest
@@ -10,5 +10,5 @@ AUX urt-3.1b-solaris.patch 281 BLAKE2B 55cc8b4824624c5b9f6db6ff6e62c841950c22298
 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
-EBUILD urt-3.1b-r3.ebuild 2382 BLAKE2B fe5cfbefee4f10ffb4a23f0a1e2d768237cb9709fdc94dda0efdd199b8cce3503460cc240cc75a8c3f1d88fce97e56af237173b3c0d7056a4d0d78f790756bc1 SHA512 da5e6ff6fa96c2e2f4f5840df9c49ed0e87cecf1af78810b045f371cfc911a9ad2734c59e226e648edab621231d8ed724772646a978637507c5718d42f8f2624
+EBUILD urt-3.1b-r3.ebuild 2381 BLAKE2B 66b8a88be20f1e3e9d3503b752389c4492d4d27dd8574c9538a611d25c3ea6961f1dd2e3abc0b5a8c32a6f3b734dc9d0b5fac6628122531fc7d4fa4f8fca020d SHA512 004deb4647104d3ea53ced1bae6443e6bb693a8c086363f8df2b3b002bfc037b904fdf52edf590a227697c81fad1505762b5b78b08213ff0b5238e9f7e762e67
 MISC metadata.xml 308 BLAKE2B 6006038e97bc7af97fd7e4c95f87d19d2458452da5ba066df88aff58fd10bf0f29daef641aaf39ec14a102f4e23a0b3be30006a6aed3830322e2f148a13dc5b7 SHA512 1056a163d7f6c3f2e540e6f1b315ea23aa4e9664c14ba51d094e33ab8ac4e3888fc9b049b91e3f2596e9458efe6041a7e2c5c40979171f7fd473fa6994862ffd
diff --git a/media-libs/urt/urt-3.1b-r3.ebuild b/media-libs/urt/urt-3.1b-r3.ebuild
index 688cf52b1eee..c3e32304cf6a 100644
--- a/media-libs/urt/urt-3.1b-r3.ebuild
+++ b/media-libs/urt/urt-3.1b-r3.ebuild
@@ -10,7 +10,7 @@ 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"
+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="
diff --git a/media-libs/vo-aacenc/Manifest b/media-libs/vo-aacenc/Manifest
index 26c8e42858f2..b6cac37c21c7 100644
--- a/media-libs/vo-aacenc/Manifest
+++ b/media-libs/vo-aacenc/Manifest
@@ -1,4 +1,4 @@
 DIST vo-aacenc-0.1.3.tar.gz 612463 BLAKE2B d75f497c9e0c8b0b962593787c1a13ce2bba095d1ac15c49b6b55235219b22f7c8116da12c2f1fb0bf1cb7e175d2f0ca212ae50333c0d9e0a4a5b77c71698b89 SHA512 c8f00dfa758270ba9cad35dd6e24905dc7cf33d7717454b7c2c56c40dbf54f682450aa010a410a0350d70119d2aaa2e5ba4471b5bbe05ccec1f9d20ab3e57853
-EBUILD vo-aacenc-0.1.3.ebuild 1148 BLAKE2B fa75bee9b20d90c52cd6ac7b0667c3cff6c5ea2fad26a6294d0cc83278314b87055e6ff1c80a79123250a61a9f8a01f741d736b02a24fe38ecaab8b13dc05c5e SHA512 b5263cff4478db22f02a70023ee0902594a4f2cb1a70112a7dd66fcd8a1f5b4fe41f25f7b66e445b6393380e279eccd6c13e186e47fb16c27f153620f081463a
-EBUILD vo-aacenc-9999.ebuild 1161 BLAKE2B 84778c0185a1e9149a2077a1cabd779791d9b9d314094752b89a02c24f7697f45453ae33ae65d4fcd0f144f49db7de53b096d708b07f9b493bca8fbafb7d0576 SHA512 afa103980e411ca602c59774f40c38753834336f72171a61dcf738fb1d00cf35275896f4fac4f22786064dc596c0b3aacb0405aa643eac4f671414415f88f6e8
+EBUILD vo-aacenc-0.1.3.ebuild 1083 BLAKE2B 73b3386bcd1c930c26143302517d9011fe866fab96e0103633009e89eb549ce1513c3dc65d11a99cd21a157ddff46b3c05e3bff7153b7b0c123cec9381990cd4 SHA512 592211b501e13081d909325d3c87383f61c12ad16ab8cf7f4d8d685178eeafe7442138cc09a3c3fea3be249bb91379812d0242e5d9f295cc087f7f7de4777b28
+EBUILD vo-aacenc-9999.ebuild 1093 BLAKE2B a07a4c5b73e9f8d504b3dfc0b213d462cadcce610c3e22c924fb92d08e3a8300ba34a01ffb99e5047f82513d52d145ff6b391d77d80590f0c0ed46e2ff1ed007 SHA512 896f02554a72f2c5d0a136f4dff5c95caf78ee02773590038a0cb8cb3790bfe4d60cfd3a8c216a8f9b824a0c031156a7b5b853982763baaf3fa349dbc0f891ab
 MISC metadata.xml 633 BLAKE2B 965a7d171a4ced000c73cee40fc2b2c752ff988668f8906bfaa2c7721d5b328290184fc8f0c1c24a21775a5b0cc066df9457e747159b4c3ec5907d6cce4b47fa SHA512 13dcd74fb4a9f1f003a8031cbf70620871bf2e3487cff75df3ec5b413e859d541f8a336b062d8cbed561e88dac51cc19a19329c3383fa7687e047236729871d4
diff --git a/media-libs/vo-aacenc/vo-aacenc-0.1.3.ebuild b/media-libs/vo-aacenc/vo-aacenc-0.1.3.ebuild
index 20ed3fb06f70..7511d4823b83 100644
--- a/media-libs/vo-aacenc/vo-aacenc-0.1.3.ebuild
+++ b/media-libs/vo-aacenc/vo-aacenc-0.1.3.ebuild
@@ -1,42 +1,45 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-if [[ ${PV} == *9999 ]] ; then
-	SCM="git-2"
+inherit flag-o-matic multilib-minimal
+
+if [[ ${PV} == *9999 ]]; then
+	inherit autotools git-r3
 	EGIT_REPO_URI="https://github.com/mstorsjo/${PN}.git"
-	[[ ${PV%9999} != "" ]] && EGIT_BRANCH="release/${PV%.9999}"
-	AUTOTOOLS_AUTORECONF=yes
+else
+	SRC_URI="mirror://sourceforge/opencore-amr/${P}.tar.gz"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
 fi
 
-inherit autotools-multilib flag-o-matic ${SCM}
-
 DESCRIPTION="VisualOn AAC encoder library"
 HOMEPAGE="https://sourceforge.net/projects/opencore-amr/"
 
-if [[ ${PV} == *9999 ]] ; then
-	SRC_URI=""
-elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot
-	SRC_URI="mirror://gentoo/${P}.tar.xz"
-else # Official release
-	SRC_URI="mirror://sourceforge/opencore-amr/${P}.tar.gz"
-fi
-
 LICENSE="Apache-2.0"
 SLOT="0"
+IUSE="cpu_flags_arm_neon examples static-libs"
+
+src_prepare() {
+	default
+	[[ ${PV} == *9999 ]] && eautoreconf
+}
 
-[[ ${PV} == *9999 ]] || \
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="examples static-libs cpu_flags_arm_neon"
+multilib_src_configure() {
+	if use cpu_flags_arm_neon; then
+		local -x CFLAGS="${CFLAGS}"
+		append-cflags -mfpu=neon
+	fi
+
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable cpu_flags_arm_neon armv7neon) \
+		$(use_enable examples example) \
+		$(use_enable static-libs static)
+}
 
-AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
+multilib_src_install_all() {
+	einstalldocs
 
-src_configure() {
-	use cpu_flags_arm_neon && append-flags '-mfpu=neon'
-	local myeconfargs=(
-		"$(use_enable examples example)"
-		"$(use_enable cpu_flags_arm_neon armv7neon)"
-	)
-	autotools-multilib_src_configure
+	# package provides .pc files
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/media-libs/vo-aacenc/vo-aacenc-9999.ebuild b/media-libs/vo-aacenc/vo-aacenc-9999.ebuild
index 7d6b2869b056..022f13cf020f 100644
--- a/media-libs/vo-aacenc/vo-aacenc-9999.ebuild
+++ b/media-libs/vo-aacenc/vo-aacenc-9999.ebuild
@@ -1,42 +1,45 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-if [[ ${PV} == *9999 ]] ; then
-	SCM="git-2"
+inherit flag-o-matic multilib-minimal
+
+if [[ ${PV} == *9999 ]]; then
+	inherit autotools git-r3
 	EGIT_REPO_URI="https://github.com/mstorsjo/${PN}.git"
-	[[ ${PV%9999} != "" ]] && EGIT_BRANCH="release/${PV%.9999}"
-	AUTOTOOLS_AUTORECONF=yes
+else
+	SRC_URI="mirror://sourceforge/opencore-amr/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
 fi
 
-inherit autotools-multilib flag-o-matic ${SCM}
-
 DESCRIPTION="VisualOn AAC encoder library"
 HOMEPAGE="https://sourceforge.net/projects/opencore-amr/"
 
-if [[ ${PV} == *9999 ]] ; then
-	SRC_URI=""
-elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot
-	SRC_URI="mirror://gentoo/${P}.tar.xz"
-else # Official release
-	SRC_URI="mirror://sourceforge/opencore-amr/${P}.tar.gz"
-fi
-
 LICENSE="Apache-2.0"
 SLOT="0"
+IUSE="cpu_flags_arm_neon examples static-libs"
+
+src_prepare() {
+	default
+	[[ ${PV} == *9999 ]] && eautoreconf
+}
 
-[[ ${PV} == *9999 ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="examples static-libs cpu_flags_arm_neon"
+multilib_src_configure() {
+	if use cpu_flags_arm_neon; then
+		local -x CFLAGS="${CFLAGS}"
+		append-cflags -mfpu=neon
+	fi
+
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable cpu_flags_arm_neon armv7neon) \
+		$(use_enable examples example) \
+		$(use_enable static-libs static)
+}
 
-AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
+multilib_src_install_all() {
+	einstalldocs
 
-src_configure() {
-	use cpu_flags_arm_neon && append-flags '-mfpu=neon'
-	local myeconfargs=(
-		"$(use_enable examples example)"
-		"$(use_enable cpu_flags_arm_neon armv7neon)"
-	)
-	autotools-multilib_src_configure
+	# package provides .pc files
+	find "${D}" -name '*.la' -delete || die
 }
author	V3n3RiX <venerix@redcorelinux.org>	2019-06-16 21:23:20 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-06-16 21:23:20 +0100
commit	fab849d1daed0ba7f2ac497d07985c3dbb692543 (patch)
tree	10baa743a5340b42ad538dd19d48669ccac209b1 /media-libs
parent	73c318acdaf6f8309d68bd266051e6dd1f1bd787 (diff)