gentoo resync : 21.09.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-09-21 18:00:10 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-09-21 18:00:10 +0100
commit: 265dbe5dbc14c199299496c6db8fce3f76647015 (patch)
tree: ab18b5617d138f6684566b619405090989d55a2c /media-libs
parent: 586819755b4dbfdffdc8a725ab7c0f86095b8489 (diff)
118 files changed, 2309 insertions, 938 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index ef488c0f0195..63c3f3d2f791 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/allegro/Manifest b/media-libs/allegro/Manifest
index 0f2daa99e4e7..36da65c74eee 100644
--- a/media-libs/allegro/Manifest
+++ b/media-libs/allegro/Manifest
@@ -10,5 +10,5 @@ DIST allegro-5.0.11.tar.gz 3203777 BLAKE2B b8946e58cde38fdf52f42e041fb27ea92e958
 DIST allegro-5.2.4.0.tar.gz 7822903 BLAKE2B 50538e27276fbe1572a660b3f1396bdb9b542dc2aafaa819a4108e0e2771731cb6924cf1d0b7a7bfea1ff5c12b4772ff58dc571c81bb6a601d31a2083f5f9bea SHA512 c5f80191005165331635464ffd345369943d37dcb55345176a7171614e12826b25d9d74ab656333302d6682d404f1b46a5d94c0dd23d7873151e6e488d62c776
 EBUILD allegro-4.4.2-r1.ebuild 2527 BLAKE2B 232f6a17a76131b75fb9c5251504715a5bb74c084ef23cfe29fdceefe8927a3a5cacb5840f9767139b50b0a8a4842e13ef2a8226afbef096d61b5980cb917508 SHA512 af76323c8fb530e1140dcc20ac37138210634593a416e7dd45090f8641473b2b7e3aaf5cc3e068b5a74c92e8f0ef86aa04a92ed16213aa52486abf7643b9dd47
 EBUILD allegro-5.0.11.ebuild 2397 BLAKE2B 1477ed40dc61ac329d85893dca32fa4d9c805c7dc0254e22fbda6a25c9b84907634bf83a24aebb113fe28f548311b547a60be6a9a54f32560935f2b36927d851 SHA512 a4663c4c33f07b9f5b58ede35e369107d3585b9489150c50c3cc312a6ae61e12e0a023b19208c53c2dea2fbff4fdf285fd7962afa30d6ad1ba5c55b40e760719
-EBUILD allegro-5.2.4.0.ebuild 2711 BLAKE2B 79c85013e97894e1b1adfd9bc0d6ba144d62b682022b74efecbbb56b9309ba824675bac662096b615774cac439f00f9d675b50306838c75a00e5e945eafbb907 SHA512 fe644140fd2a5cc2dc4fc401eb4858cad32abd3be427d35d9e0c7101e4308ce150c572a5e309bef925774d07852ed6f2c4f7927a030c143d168b489f19ce17c9
+EBUILD allegro-5.2.4.0.ebuild 2709 BLAKE2B 93faa12ded4364cc4269d956ce418b418055e398048517f786fd440cd8ee70be3d5ba148b291378ba975d9075bdbc6ae087931490659488482188650f5de69a6 SHA512 9e93d3d2674b9b94d885744b6959881ef1095e710a86b32ca8f1d12e5954b25a4e46cc96e7c8bfbedce692ebb2b2c0543f2e1805ebc4af7fdfce435d94ceac6c
 MISC metadata.xml 1089 BLAKE2B 195c71477c57ae4e873d7abec9ab26e8047e88fc8d0ecc5977a9059f990dabcfdb2ea184f6fe873a96868e684936ee1926ab5a9d15b34a7885e5769c981c23b3 SHA512 55c72ad0b2a1f00004f676e8a603551aba34b8a6cbb491ddfde7938d18093e42e4610d3cf1154196625e92a25f3d08cddca19930a20df312c455d3338fe30a1a
diff --git a/media-libs/allegro/allegro-5.2.4.0.ebuild b/media-libs/allegro/allegro-5.2.4.0.ebuild
index 487d398bbadb..91e57245e2db 100644
--- a/media-libs/allegro/allegro-5.2.4.0.ebuild
+++ b/media-libs/allegro/allegro-5.2.4.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/liballeg/allegro5/releases/download/${PV}/${P}.tar.g
 
 LICENSE="BSD ZLIB"
 SLOT="5"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ppc ppc64 ~x86"
 IUSE="alsa dumb flac gtk jpeg openal opengl opus oss physfs png pulseaudio test truetype vorbis webp X xinerama"
 
 REQUIRED_USE="X? ( opengl ) xinerama? ( X )"
diff --git a/media-libs/faac/Manifest b/media-libs/faac/Manifest
index 05f3be0bcb25..e5c7db796ae0 100644
--- a/media-libs/faac/Manifest
+++ b/media-libs/faac/Manifest
@@ -7,5 +7,5 @@ DIST faac-1.29.8.3.tar.gz 483404 BLAKE2B b5301fe63da7a059d0d4cf298107585295a3f38
 DIST faac-1.29.9.2.tar.gz 483826 BLAKE2B f845e75ec640f2a6ac41ad10dfdf1dbc6a6ddef3cb8cc3fe63450515f888343126cb2ec1df4c4eaaefed3d7d5d56249078f14363fcb9d9484228e9b1754a8b99 SHA512 71aaf060d087e866700a3a7c7d447e85709f65709e148610c4b34f5a3e095fa4a5c19f49450610949fd7db12345422b8a116a1d061899c127ad9a1bc30e79c7c
 EBUILD faac-1.28-r4.ebuild 1587 BLAKE2B 177ab6d68bc3565cc7114d40af48c3c15fd6df223d104f4e657782947e970c86337e177910a582095fa3696dd5752684c9365e948aeaca75ef01ee78708b8482 SHA512 40f3b88d7a797cddafef3ee698c5a1442deeef525a14365407a3a7c6b93f9c0e3ea7b88ce5716a939d0dfeba0f69aae977e670299f07901660ee2946f3e32a93
 EBUILD faac-1.29.8.3.ebuild 1143 BLAKE2B 69f410d878a122a34370885786b1c4c842e96087afefb93205ebc6fcefef071932b9a5421dd13307146a13723e00fc4893ec2ca98f82d7021b9c1b620d55a4f1 SHA512 2c9f0d2767acdba0a5a99e19e741816fd49b01b16e4e49c13a910ea53171f84b165fa53219516fac9b661577a9616debbbd6885713a184dca424ee3ff23339b6
-EBUILD faac-1.29.9.2.ebuild 1143 BLAKE2B 69f410d878a122a34370885786b1c4c842e96087afefb93205ebc6fcefef071932b9a5421dd13307146a13723e00fc4893ec2ca98f82d7021b9c1b620d55a4f1 SHA512 2c9f0d2767acdba0a5a99e19e741816fd49b01b16e4e49c13a910ea53171f84b165fa53219516fac9b661577a9616debbbd6885713a184dca424ee3ff23339b6
+EBUILD faac-1.29.9.2.ebuild 1137 BLAKE2B 042d9ac0e5b51b87297ac042c559a0a3c8b648648e75e799708d7c904793795e8e44c4f0f3df48c241a47c369d8c9fdea293bdc651162a0f393c9e1189279971 SHA512 27da28a9bab06ff89feb56491bb94138b10bc403891b6321ea0b5c68871aa333841b3533a1830fc889358657660f91669f758d8b7be513d4eaeaa98108709194
 MISC metadata.xml 327 BLAKE2B 3c3eabbf763b0f521edb87c8d91f43a9e64c22c2ef6b86d4b95b997208a5d575f55575cc97d2c2caf3b759cbfbba7ce91377cba0121dca9f7b1a18cdab7e0162 SHA512 a323b91cffc6e960e52f3aac94763767ba428361b736e635ddc6eaee7dab9bacc36cee8bbd38c4887f3243f3f060707f3533b1c4e4be49d14ba1f602e7bf6f80
diff --git a/media-libs/faac/faac-1.29.9.2.ebuild b/media-libs/faac/faac-1.29.9.2.ebuild
index 384836d70d7c..bde8b30bf6b3 100644
--- a/media-libs/faac/faac-1.29.9.2.ebuild
+++ b/media-libs/faac/faac-1.29.9.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1 MPEG-4"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="static-libs"
 
 DEPEND="${RDEPEND}"
diff --git a/media-libs/faad2/Manifest b/media-libs/faad2/Manifest
index c9666954619a..9b7c5f7b3db6 100644
--- a/media-libs/faad2/Manifest
+++ b/media-libs/faad2/Manifest
@@ -7,5 +7,5 @@ DIST faad2-2.8.6.tar.gz 1025654 BLAKE2B 16d5e08ea8f0ecfff8d1f5eb17f219d481afd9bc
 DIST faad2-2.8.8.tar.gz 1069044 BLAKE2B 3e22e695d89cce0ecb673caec73dd3115b2249d18daf6d0c8cf2b5cc90086889c9da733e037bc8b58c0bdc145c66bd4218b9b5e237adb7ad1c6f0caf0d97d304 SHA512 3275d292b2a9fe984842962f4d81202894bddd17033f7cd6df95466554cc968dfcbf2890ae8b1df37da0cd25d645cca0a687f07e39b9fc37dd004fd5956a82af
 EBUILD faad2-2.7-r3.ebuild 1335 BLAKE2B 6d6aaa794e196cb3b9d1ba0b202284ef9b507020fca2e903b875d7e4bd9093ccbc990079b607c25d0cfbcd674e0553c4f9628e4e9a0bccf5188793c6f410842f SHA512 5eac5e8acd0e4d32784053fd5c3d5130037366687ea17161c77c79bb0a681ae60f673468ee1a38a79f19ec46aad049fe590f28747d87c9b834db4573c1c36901
 EBUILD faad2-2.8.6.ebuild 1246 BLAKE2B 0ed1c6985c411391db68a12c9cc74eb7a41e0c406a06086fb95fb9c0e2241b36eedca9f8df1119d3c2aee079ef3e9ed60e433fbd8c2ff64d6c29c66b0e299b9e SHA512 d9281740cd1aa9fd1bc609e6779f209b894909da092a2485b68cc5f57061a5dd202e77e3c9dddea21d69c64e44196996f1417620d729b9cc5a7ba8d5947ed284
-EBUILD faad2-2.8.8.ebuild 1246 BLAKE2B 0ed1c6985c411391db68a12c9cc74eb7a41e0c406a06086fb95fb9c0e2241b36eedca9f8df1119d3c2aee079ef3e9ed60e433fbd8c2ff64d6c29c66b0e299b9e SHA512 d9281740cd1aa9fd1bc609e6779f209b894909da092a2485b68cc5f57061a5dd202e77e3c9dddea21d69c64e44196996f1417620d729b9cc5a7ba8d5947ed284
+EBUILD faad2-2.8.8.ebuild 1248 BLAKE2B 9cc62096b11c41c673bb8ff9fcdc4f62fcf9b91438b710e4372210cb1b26bc1f620b9095d812b9b0603940d05294a50d77e69025be67d5facad34ade81b03475 SHA512 3be3b5de80705da75df87962251ffa09a46d9eea1037772c90fdfa30744b7e6c2a9b73b3f318d620c441af362a6659a3ff259add393b4e25b3e5e959c5b1d1bc
 MISC metadata.xml 619 BLAKE2B 3eb4a78c845f019f564e15c8aecc41bac00aa7a814f761a6f6b4b5810e245c4645149defb09c998a615c8e3ba551e569373475e7dd8ebb5f8656e6ac6b2992dc SHA512 b62370a9ce905bb0e96001422baee1b75af853080d9ef795148e56ed8c2b8dca9c7eae3a3ff29869dac4e9af5835327649eafa20bc7831b14bec07cb901960fd
diff --git a/media-libs/faad2/faad2-2.8.8.ebuild b/media-libs/faad2/faad2-2.8.8.ebuild
index 3429665fa71f..249a7fefcf3e 100644
--- a/media-libs/faad2/faad2-2.8.8.ebuild
+++ b/media-libs/faad2/faad2-2.8.8.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools ltprune multilib-minimal
+EAPI=7
+
+inherit autotools multilib-minimal
 
 DESCRIPTION="AAC audio decoding library"
 HOMEPAGE="http://www.audiocoding.com/faad2.html"
@@ -10,15 +11,15 @@ SRC_URI="mirror://sourceforge/faac/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="digitalradio static-libs"
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
+
 RDEPEND=""
 DEPEND=""
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.8.5-libmp4ff-shared-lib.patch
-)
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
+
+PATCHES=( "${FILESDIR}"/${PN}-2.8.5-libmp4ff-shared-lib.patch )
 
 src_prepare() {
 	default
@@ -47,6 +48,6 @@ multilib_src_configure() {
 }
 
 multilib_src_install_all() {
-	prune_libtool_files --all
+	find "${D}" -name '*.la' -delete || die
 	einstalldocs
 }
diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index c065d7a302b9..901896093a9f 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -3,8 +3,13 @@ AUX fontconfig-2.12.3-latin-update.patch 2049 BLAKE2B 5fdf036d307a09eaa3b475fc9b
 AUX fontconfig-2.13.0-add-missing-lintl.patch 1119 BLAKE2B 7b6b8deeb5b06ed3016add4e9e04c65ec7d8ef43223783950ea911c3544ec084c8ae78739be5eb79f4bcd91b91bdc943726d2d3d6dab46cabec69e2ce2b8338f SHA512 439470687be12c6cf3f9da21a5b0d1fac6c685296f740247aaf6cf1c1e22bf567ab2348408ed9fabe0c6f7b738e54b9813e562e9d762c861b61f70ee569ad754
 AUX fontconfig-2.13.0-locale.patch 4096 BLAKE2B 8ebb0d8b72af07053a0fb7ee5550558d530b874051c7cfe8abde7f504c643a8b52bdaf265d39205d9c9fd5375f464ddaed858c9b599e633d04b92f94873bf65f SHA512 845b2db1783840070a27de2f28ce8f9cc6968b5e07c89c91110248261e9977bf15edc886b5ed9badb2fa14efc1868c82c4ab0ee45aec8a0cfbc74b5ae459c939
 AUX fontconfig-2.13.0-names.patch 2421 BLAKE2B e8e922a445dee1d7bc77b72384cf3ab58b6fc7e1e1bc7b341d59bd1dcdfd818cd15071278fac69229e3f6b8b09d19a351390d76b7112ebf8d9749d2e1de29b8d SHA512 7c9bebf3eb76de05cfd1481e679715bebc5c429ea6976e96866c0e80b0021d3f00adae888e348897574193d7029e48409a0b73698dc2c8963e485992400192ad
+AUX fontconfig-2.13.1-proper_homedir.patch 8048 BLAKE2B 8735be09139f13f41eeccd6ec9b34ad5086ec6716053570b1368a0c8068bff6431e15d5c3ca0a0341958aa8801ceba422ceec012adeca7f0fe71e4bd1f9a5970 SHA512 ecd77822f9ee6ff2529cb3401c5f4e8cf105583f51b040ab160b8ee99c62762a9eb04f836a15b1f6186423c8180238d0379d55442088d2bab03d8abe817e6e22
+AUX fontconfig-2.13.1-revert_delete_.uuid_for_empty_directory.patch 1005 BLAKE2B 48d1ad733b7543a17f4917c81a7ca2df402f6fbc851d97edbb0d6e58d28446b532a9804db0af45eaf3b294158ad5377ed2dee95b2f66fe63b44312c39def5262 SHA512 b583cd21d11add33bc94ff624ba96ab8fe585beac2fa285b7b207bfdf199debe2496d8cf12ec406d84fcb46eaba4c9c5afd768002e2b35e0d569fc82d894947b
+AUX fontconfig-2.13.1-static_build.patch 2274 BLAKE2B 41dcaf492c8096d9d5d964f98fe4fed432afecfa2ee97c2a53f297cd7f674ca162aa01dcdadcc648c9cfb4cb8bd3f91714f1808322dd65c70308550c3a8e1b6c SHA512 c5a1a80cc99850d1ab197079ec629032310913d7756d86defcae5c721f3a50078c4059347b21cdc409b0de0d45c1466f038a9b5280bd7f772a966b43cbb3fe6e
 DIST fontconfig-2.12.6.tar.bz2 1624683 BLAKE2B 48432f3d3cc90240ec19dffb6714e7f780eb6b401693b40e2efa2bb593bc89c42b03c99fce8f2ceb7c108da254dc248d91a790849d22feaa50a725338b80fd1f SHA512 2a1d3e62cae2bfcae2e67e9cb75ab6534a35bda4215f1ad4b8bf757e77e7d9d609c016562f5288fd10046a0e94655a807f6dd044d7868ed81a146c4275c4dd06
 DIST fontconfig-2.13.0.tar.bz2 1700500 BLAKE2B bf137b27c9f73c5e2763b7a4a443a4aa5016bd3c0e35138249c2cf8841eb364c8e7bbea6495b53b88de26e3d5a429ebfb598a9f4fe7d875028a621df592ff35a SHA512 f0ad8f2542c8b1e900f5c3d213466a31dd3785da726d6eb455b6734c71c6e5751b28172203e2f9668e9c8e1512072235ea46a1a5e6a85ec54ccc332adb4e5fbc
+DIST fontconfig-2.13.1.tar.bz2 1723639 BLAKE2B 08b9a522a9d89bc5e5ed0f0898182359efb110f22b6b7010f6bdda0d6d516957ea74ebe0703d684d4724fd9f44a2eaf50d8329d4e0f4e45e79f50466d808b9e1 SHA512 f97f2a9db294fd72d416a7d76dd7db5934ade2cf76903764b09e7decc33e0e2eed1a1d35c5f1c7fd9ea39e2c7653b9e65365f0c6205e047e95e38ba5000dd100
 EBUILD fontconfig-2.12.6.ebuild 4914 BLAKE2B 0088f7ef6b497b086c5f90a42330f1727e404e9818b29d25e30340679ddddf3df222cab240ee09021d99660a4fac2a5f16f59faf5b4ff4e56fc6fd6f689aa72b SHA512 7f78420ed60f3b575965e5088cde35c346f6a54ee1ee0ee1321c028a00e60f9df52bf6fcc13b3da53b0c1714209f513e5d49b64e24b5a9a4b4920fa0fadc1e79
-EBUILD fontconfig-2.13.0-r4.ebuild 5188 BLAKE2B 5a3242a0e0c9c9542107436070781165d768cb9265378b2e6a4dc07b4b236c2fe6bf03f31a354768369fd61e3e86a8a3ce7f44756e76c2fbf237bfb7656d0ff1 SHA512 964c0c1ba8cd44bbda81a7cb589abc72108ed24bd3c090ca3f560365e77a12905e594edfd5ee75ae50d2c8e7682dfaa8301a603132a7cd72161fcef994e3be24
+EBUILD fontconfig-2.13.0-r4.ebuild 5185 BLAKE2B ca625b954af37fdd7baf5b763479f07eb455d9bb37bf57c911c548a9a49a42bc9e6b1d06b8bd190f516a2c253f6daa5f46b2128e724bb2913d2ab8835f20b6d8 SHA512 412465dc3d02634e98ee395d300d7fdacc555c1dfeea7ee35819f9f7628962f11b57b6e41750698e6e327fa4077dbb0ca89b6d73b900eefc791a791bd84794ad
+EBUILD fontconfig-2.13.1-r2.ebuild 5119 BLAKE2B 4f885e4714892210a8cce5e138ae83a9331df3193e2b72bcfde8c30ba2def370a64435ef63c5ef0a24d09fef9f09845ec14d67dc2893f458b9513b84f8060e10 SHA512 c60092f8fed0fe72dac37e4649945b7e0cd06ed22ef25b1871eb8d113e57e0fca446199368102f2708b61260c1bb020e3932706b7a87722f178a4a2ac7903565
 MISC metadata.xml 500 BLAKE2B 5326535fbf21d56868f15d3e5cda11bddba722762423b8831da99f9ff31bee71ed6d4e5ec62af46a7981c233c9d516068257413cb473c02657d3543619692b24 SHA512 bfc956b5196face33a60fa495b7948cd8f01802f23efd02da9da41146443b76f3d01ef5192a7541dd65e107df5e1935f73f5bfdb939c14fdde599919c7fde190
diff --git a/media-libs/fontconfig/files/fontconfig-2.13.1-proper_homedir.patch b/media-libs/fontconfig/files/fontconfig-2.13.1-proper_homedir.patch
new file mode 100644
index 000000000000..19aee94ba988
--- /dev/null
+++ b/media-libs/fontconfig/files/fontconfig-2.13.1-proper_homedir.patch
@@ -0,0 +1,323 @@
+From 806fd4c2c5164d66d978b0a4c579c157e5cbe766 Mon Sep 17 00:00:00 2001
+From: Akira TAGOH <akira@tagoh.org>
+Date: Tue, 4 Sep 2018 09:08:37 +0000
+Subject: [PATCH] Fix the issue that '~' wasn't extracted to the proper homedir
+
+'~' in the filename was extracted to the home directory name in FcConfigFilename() though,
+this behavior was broken by d1f48f11. this change fixes it back to the correct behavior.
+
+https://gitlab.freedesktop.org/fontconfig/fontconfig/issues/110
+diff --git a/src/fccfg.c b/src/fccfg.c
+index d7c48e8..4a53581 100644
+--- a/src/fccfg.c
++++ b/src/fccfg.c
+@@ -2207,17 +2207,19 @@ FcConfigFilename (const FcChar8 *url)
+ 	else
+ 	    file = 0;
+     }
+-
+-    path = FcConfigGetPath ();
+-    if (!path)
+-	return NULL;
+-    for (p = path; *p; p++)
++    else
+     {
+-	file = FcConfigFileExists (*p, url);
+-	if (file)
+-	    break;
++	path = FcConfigGetPath ();
++	if (!path)
++	    return NULL;
++	for (p = path; *p; p++)
++	{
++	    file = FcConfigFileExists (*p, url);
++	    if (file)
++		break;
++	}
++	FcConfigFreePath (path);
+     }
+-    FcConfigFreePath (path);
+     return file;
+ }
+ 
+diff --git a/test/Makefile.am b/test/Makefile.am
+index 79bcede..9f4d48a 100644
+--- a/test/Makefile.am
++++ b/test/Makefile.am
+@@ -91,6 +91,22 @@ test_bz106632_CFLAGS =					\
+ test_bz106632_LDADD = $(top_builddir)/src/libfontconfig.la
+ TESTS += test-bz106632
+ 
++if !ENABLE_SHARED
++check_PROGRAMS += test-issue110
++test_issue110_CFLAGS =					\
++	-I$(top_builddir)				\
++	-I$(top_builddir)/src				\
++	-I$(top_srcdir)					\
++	-I$(top_srcdir)/src				\
++	-DHAVE_CONFIG_H					\
++	-DFONTCONFIG_PATH='"$(BASECONFIGDIR)"'		\
++	$(NULL)
++test_issue110_LDADD =					\
++	$(top_builddir)/src/libfontconfig.la		\
++	$(NULL)
++TESTS += test-issue110
++endif
++
+ EXTRA_DIST=run-test.sh run-test-conf.sh $(TESTDATA) out.expected-long-family-names out.expected-no-long-family-names
+ 
+ CLEANFILES=out out1 out2 fonts.conf out.expected
+diff --git a/test/test-issue110.c b/test/test-issue110.c
+new file mode 100644
+index 0000000..28a3bd2
+--- /dev/null
++++ b/test/test-issue110.c
+@@ -0,0 +1,245 @@
++/*
++ * fontconfig/test/test-issue110.c
++ *
++ * Copyright © 2000 Keith Packard
++ * Copyright © 2018 Akira TAGOH
++ *
++ * Permission to use, copy, modify, distribute, and sell this software and its
++ * documentation for any purpose is hereby granted without fee, provided that
++ * the above copyright notice appear in all copies and that both that
++ * copyright notice and this permission notice appear in supporting
++ * documentation, and that the name of the author(s) not be used in
++ * advertising or publicity pertaining to distribution of the software without
++ * specific, written prior permission.  The authors make no
++ * representations about the suitability of this software for any purpose.  It
++ * is provided "as is" without express or implied warranty.
++ *
++ * THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
++ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
++ * EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR
++ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
++ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
++ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
++ * PERFORMANCE OF THIS SOFTWARE.
++ */
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include <dirent.h>
++#include <unistd.h>
++#include <errno.h>
++#ifndef HAVE_STRUCT_DIRENT_D_TYPE
++#include <sys/types.h>
++#include <sys/stat.h>
++#endif
++#include <fontconfig/fontconfig.h>
++
++#ifdef _WIN32
++#  define FC_DIR_SEPARATOR         '\\'
++#  define FC_DIR_SEPARATOR_S       "\\"
++#else
++#  define FC_DIR_SEPARATOR         '/'
++#  define FC_DIR_SEPARATOR_S       "/"
++#endif
++
++extern FcChar8 *FcConfigRealFilename (FcConfig *, FcChar8 *);
++
++#ifdef HAVE_MKDTEMP
++#define fc_mkdtemp	mkdtemp
++#else
++char *
++fc_mkdtemp (char *template)
++{
++    if (!mktemp (template) || mkdir (template, 0700))
++	return NULL;
++
++    return template;
++}
++#endif
++
++FcBool
++mkdir_p (const char *dir)
++{
++    char *parent;
++    FcBool ret;
++
++    if (strlen (dir) == 0)
++	return FcFalse;
++    parent = (char *) FcStrDirname ((const FcChar8 *) dir);
++    if (!parent)
++	return FcFalse;
++    if (access (parent, F_OK) == 0)
++	ret = mkdir (dir, 0755) == 0 && chmod (dir, 0755) == 0;
++    else if (access (parent, F_OK) == -1)
++	ret = mkdir_p (parent) && (mkdir (dir, 0755) == 0) && chmod (dir, 0755) == 0;
++    else
++	ret = FcFalse;
++    free (parent);
++
++    return ret;
++}
++
++FcBool
++unlink_dirs (const char *dir)
++{
++    DIR *d = opendir (dir);
++    struct dirent *e;
++    size_t len = strlen (dir);
++    char *n = NULL;
++    FcBool ret = FcTrue;
++#ifndef HAVE_STRUCT_DIRENT_D_TYPE
++    struct stat statb;
++#endif
++
++    if (!d)
++	return FcFalse;
++    while ((e = readdir (d)) != NULL)
++    {
++	size_t l;
++
++	if (strcmp (e->d_name, ".") == 0 ||
++	    strcmp (e->d_name, "..") == 0)
++	    continue;
++	l = strlen (e->d_name) + 1;
++	if (n)
++	    free (n);
++	n = malloc (l + len + 1);
++	if (!n)
++	{
++	    ret = FcFalse;
++	    break;
++	}
++	strcpy (n, dir);
++	n[len] = FC_DIR_SEPARATOR;
++	strcpy (&n[len + 1], e->d_name);
++#ifdef HAVE_STRUCT_DIRENT_D_TYPE
++	if (e->d_type == DT_DIR)
++#else
++	if (stat (n, &statb) == -1)
++	{
++	    fprintf (stderr, "E: %s\n", n);
++	    ret = FcFalse;
++	    break;
++	}
++	if (S_ISDIR (statb.st_mode))
++#endif
++	{
++	    if (!unlink_dirs (n))
++	    {
++		fprintf (stderr, "E: %s\n", n);
++		ret = FcFalse;
++		break;
++	    }
++	}
++	else
++	{
++	    if (unlink (n) == -1)
++	    {
++		fprintf (stderr, "E: %s\n", n);
++		ret = FcFalse;
++		break;
++	    }
++	}
++    }
++    if (n)
++	free (n);
++    closedir (d);
++
++    if (rmdir (dir) == -1)
++    {
++	fprintf (stderr, "E: %s\n", dir);
++	return FcFalse;
++    }
++
++    return ret;
++}
++
++int
++main(void)
++{
++    FcConfig *cfg = FcConfigCreate ();
++    char *basedir, template[512] = "/tmp/fc110-XXXXXX";
++    char *sysroot, systempl[512] = "/tmp/fc110-XXXXXX";
++    FcChar8 *d = NULL;
++    FcChar8 *ret = NULL;
++    FcChar8 *s = NULL;
++    FILE *fp;
++    int retval = 0;
++
++    retval++;
++    basedir = fc_mkdtemp (template);
++    if (!basedir)
++    {
++	fprintf (stderr, "%s: %s\n", template, strerror (errno));
++	goto bail;
++    }
++    retval++;
++    sysroot = fc_mkdtemp (systempl);
++    if (!sysroot)
++    {
++	fprintf (stderr, "%s: %s\n", systempl, strerror (errno));
++	goto bail;
++    }
++    fprintf (stderr, "D: Creating %s\n", basedir);
++    mkdir_p (basedir);
++    setenv ("HOME", basedir, 1);
++    retval++;
++    s = FcStrBuildFilename (basedir, ".fonts.conf", NULL);
++    if (!s)
++	goto bail;
++    retval++;
++    fprintf (stderr, "D: Creating %s\n", s);
++    if ((fp = fopen (s, "wb")) == NULL)
++	goto bail;
++    fprintf (fp, "%s", s);
++    fclose (fp);
++    retval++;
++    fprintf (stderr, "D: Checking file path\n");
++    ret = FcConfigRealFilename (cfg, "~/.fonts.conf");
++    if (!ret)
++	goto bail;
++    retval++;
++    if (strcmp ((const char *) s, (const char *) ret) != 0)
++	goto bail;
++    free (ret);
++    free (s);
++    setenv ("FONTCONFIG_SYSROOT", sysroot, 1);
++    fprintf (stderr, "D: Creating %s\n", sysroot);
++    mkdir_p (sysroot);
++    retval++;
++    d = FcStrBuildFilename (sysroot, basedir, NULL);
++    fprintf (stderr, "D: Creating %s\n", d);
++    mkdir_p (d);
++    free (d);
++    s = FcStrBuildFilename (sysroot, basedir, ".fonts.conf", NULL);
++    if (!s)
++	goto bail;
++    retval++;
++    fprintf (stderr, "D: Creating %s\n", s);
++    if ((fp = fopen (s, "wb")) == NULL)
++	goto bail;
++    fprintf (fp, "%s", s);
++    fclose (fp);
++    retval++;
++    fprintf (stderr, "D: Checking file path\n");
++    ret = FcConfigRealFilename (cfg, "~/.fonts.conf");
++    if (!ret)
++	goto bail;
++    retval++;
++    if (strcmp ((const char *) s, (const char *) ret) != 0)
++	goto bail;
++    retval = 0;
++bail:
++    fprintf (stderr, "Cleaning up\n");
++    unlink_dirs (basedir);
++    if (ret)
++	free (ret);
++    if (s)
++	free (s);
++
++    return retval;
++}
++
+-- 
+2.18.0
+
diff --git a/media-libs/fontconfig/files/fontconfig-2.13.1-revert_delete_.uuid_for_empty_directory.patch b/media-libs/fontconfig/files/fontconfig-2.13.1-revert_delete_.uuid_for_empty_directory.patch
new file mode 100644
index 000000000000..cd66082eedd8
--- /dev/null
+++ b/media-libs/fontconfig/files/fontconfig-2.13.1-revert_delete_.uuid_for_empty_directory.patch
@@ -0,0 +1,43 @@
+https://gitlab.freedesktop.org/fontconfig/fontconfig/issues/107
+
+Reversion of part of:
+https://gitlab.freedesktop.org/fontconfig/fontconfig/commit/f5dd8512bdf9fd8e01c30ae36f593758b29385cf
+
+--- /src/fcdir.c
++++ /src/fcdir.c
+@@ -421,13 +421,6 @@
+     /* Not using existing cache file, construct new cache */
+     if (!cache)
+ 	cache = FcDirCacheScan (dir, config);
+-    if (cache)
+-    {
+-	FcFontSet *fs = FcCacheSet (cache);
+-
+-	if (cache->dirs_count == 0 && (!fs || fs->nfont == 0))
+-	    FcDirCacheDeleteUUID (dir, config);
+-    }
+ 
+     return cache;
+ }
+--- /test/run-test.sh
++++ /test/run-test.sh
+@@ -239,19 +239,4 @@
+ 
+ rm -rf $MyPWD/sysroot
+ 
+-dotest "deleting .uuid file on empty dir"
+-prep
+-cp $FONT1 $FONT2 $FONTDIR
+-$FCCACHE $FONTDIR
+-sleep 1
+-rm -f $FONTDIR/*pcf
+-$FCCACHE $FONTDIR
+-rmdir $FONTDIR > /dev/null 2>&1
+-if [ $? != 0 ]; then
+-  echo "*** Test failed: $TEST"
+-  echo "$FONTDIR isn't empty"
+-  ls -al $FONTDIR
+-  exit 1
+-fi
+-
+ rm -rf $FONTDIR $CACHEFILE $CACHEDIR $FONTCONFIG_FILE out
diff --git a/media-libs/fontconfig/files/fontconfig-2.13.1-static_build.patch b/media-libs/fontconfig/files/fontconfig-2.13.1-static_build.patch
new file mode 100644
index 000000000000..7a0edfd849ab
--- /dev/null
+++ b/media-libs/fontconfig/files/fontconfig-2.13.1-static_build.patch
@@ -0,0 +1,101 @@
+From 8208f99fa1676c42bfd8d74de3e9dac5366c150c Mon Sep 17 00:00:00 2001
+From: Akira TAGOH <akira@tagoh.org>
+Date: Mon, 3 Sep 2018 04:56:16 +0000
+Subject: [PATCH] Fix the build issue with --enable-static
+
+Fixes https://gitlab.freedesktop.org/fontconfig/fontconfig/issues/109
+---
+diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h
+index bac1dda..af870d0 100644
+--- a/fontconfig/fontconfig.h
++++ b/fontconfig/fontconfig.h
+@@ -1076,6 +1076,10 @@ FcUtf16Len (const FcChar8   *string,
+ 	    int		    *nchar,
+ 	    int		    *wchar);
+ 
++FcPublic FcChar8 *
++FcStrBuildFilename (const FcChar8 *path,
++		    ...);
++
+ FcPublic FcChar8 *
+ FcStrDirname (const FcChar8 *file);
+ 
+diff --git a/src/fcint.h b/src/fcint.h
+index de78cd8..a9d075a 100644
+--- a/src/fcint.h
++++ b/src/fcint.h
+@@ -1282,10 +1282,6 @@ FcStrUsesHome (const FcChar8 *s);
+ FcPrivate FcBool
+ FcStrIsAbsoluteFilename (const FcChar8 *s);
+ 
+-FcPrivate FcChar8 *
+-FcStrBuildFilename (const FcChar8 *path,
+-		    ...);
+-
+ FcPrivate FcChar8 *
+ FcStrLastSlash (const FcChar8  *path);
+ 
+diff --git a/test/test-bz106632.c b/test/test-bz106632.c
+index daa0c1e..2d67c2e 100644
+--- a/test/test-bz106632.c
++++ b/test/test-bz106632.c
+@@ -25,25 +25,26 @@
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+ #endif
++#include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include <dirent.h>
++#include <unistd.h>
++#include <errno.h>
+ #ifndef HAVE_STRUCT_DIRENT_D_TYPE
+ #include <sys/types.h>
+ #include <sys/stat.h>
+-#include <unistd.h>
+ #endif
+-#include "fcstr.c"
+-#undef FcConfigBuildFonts
+-#undef FcConfigCreate
+-#undef FcConfigGetCurrent
+-#undef FcConfigParseAndLoadFromMemory
+-#undef FcConfigUptoDate
+-#undef FcFontList
+-#undef FcInitReinitialize
+-#undef FcPatternCreate
+-#undef FcPatternDestroy
+ #include <fontconfig/fontconfig.h>
+ 
++#ifdef _WIN32
++#  define FC_DIR_SEPARATOR         '\\'
++#  define FC_DIR_SEPARATOR_S       "\\"
++#else
++#  define FC_DIR_SEPARATOR         '/'
++#  define FC_DIR_SEPARATOR_S       "/"
++#endif
++
+ #ifdef HAVE_MKDTEMP
+ #define fc_mkdtemp	mkdtemp
+ #else
+@@ -154,18 +155,6 @@ unlink_dirs (const char *dir)
+     return ret;
+ }
+ 
+-FcChar8 *
+-FcLangNormalize (const FcChar8 *lang)
+-{
+-    return NULL;
+-}
+-
+-FcChar8 *
+-FcConfigHome (void)
+-{
+-    return NULL;
+-}
+-
+ int
+ main (void)
+ {
+-- 
+2.18.0
+
diff --git a/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild b/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
index b0fe597f6e5b..490263d1f590 100644
--- a/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://fontconfig.org/release/${P}.tar.bz2"
 LICENSE="MIT"
 SLOT="1.0"
 [[ $(ver_cut 3) -ge 90 ]] || \
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc static-libs"
 
 # Purposefully dropped the xml USE flag and libxml2 support.  Expat is the
diff --git a/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild b/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild
new file mode 100644
index 000000000000..0ba7f651fabb
--- /dev/null
+++ b/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal readme.gentoo-r1
+
+DESCRIPTION="A library for configuring and customizing font access"
+HOMEPAGE="https://fontconfig.org/"
+SRC_URI="https://fontconfig.org/release/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="1.0"
+[[ $(ver_cut 3) -ge 90 ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc static-libs"
+
+BDEPEND="dev-util/gperf
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	doc? (
+		=app-text/docbook-sgml-dtd-3.1*
+		app-text/docbook-sgml-utils[jadetex]
+	)"
+# Purposefully dropped the xml USE flag and libxml2 support.  Expat is the
+# default and used by every distro.  See bug #283191.
+RDEPEND=">=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
+	>=media-libs/freetype-2.9[${MULTILIB_USEDEP}]
+	!elibc_Darwin? ( sys-apps/util-linux[${MULTILIB_USEDEP}] )
+	elibc_Darwin? ( sys-libs/native-uuid )
+	virtual/libintl[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+PDEPEND="!x86-winnt? ( app-eselect/eselect-fontconfig )
+	virtual/ttf-fonts"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.10.2-docbook.patch # 310157
+	"${FILESDIR}"/${PN}-2.12.3-latin-update.patch # 130466 + make liberation default
+	"${FILESDIR}"/${P}-revert_delete_.uuid_for_empty_directory.patch # 666418
+
+	# Patches from upstream (can usually be removed with next version bump)
+	"${FILESDIR}"/${P}-static_build.patch
+	"${FILESDIR}"/${P}-proper_homedir.patch
+)
+
+MULTILIB_CHOST_TOOLS=( /usr/bin/fc-cache$(get_exeext) )
+
+pkg_setup() {
+	DOC_CONTENTS="Please make fontconfig configuration changes using
+	\`eselect fontconfig\`. Any changes made to /etc/fonts/fonts.conf will be
+	overwritten. If you need to reset your configuration to upstream defaults,
+	delete the directory ${EROOT}/etc/fonts/conf.d/ and re-emerge fontconfig."
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local addfonts
+	# harvest some font locations, such that users can benefit from the
+	# host OS's installed fonts
+	case ${CHOST} in
+		*-darwin*)
+			addfonts=",/Library/Fonts,/System/Library/Fonts"
+		;;
+		*-solaris*)
+			[[ -d /usr/X/lib/X11/fonts/TrueType ]] && \
+				addfonts=",/usr/X/lib/X11/fonts/TrueType"
+			[[ -d /usr/X/lib/X11/fonts/Type1 ]] && \
+				addfonts="${addfonts},/usr/X/lib/X11/fonts/Type1"
+		;;
+		*-linux-gnu)
+			use prefix && [[ -d /usr/share/fonts ]] && \
+				addfonts=",/usr/share/fonts"
+		;;
+	esac
+
+	local myeconfargs=(
+		$(use_enable doc docbook)
+		$(use_enable static-libs static)
+		--enable-docs
+		--localstatedir="${EPREFIX}"/var
+		--with-default-fonts="${EPREFIX}"/usr/share/fonts
+		--with-add-fonts="${EPREFIX}/usr/local/share/fonts${addfonts}"
+		--with-templatedir="${EPREFIX}"/etc/fonts/conf.avail
+	)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install() {
+	default
+
+	# avoid calling this multiple times, bug #459210
+	if multilib_is_native_abi; then
+		# stuff installed from build-dir
+		emake -C doc DESTDIR="${D}" install-man
+
+		insinto /etc/fonts
+		doins fonts.conf
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name "*.la" -delete || die
+
+	# fc-lang directory contains language coverage datafiles
+	# which are needed to test the coverage of fonts.
+	insinto /usr/share/fc-lang
+	doins fc-lang/*.orth
+
+	dodoc doc/fontconfig-user.{txt,pdf}
+
+	if [[ -e ${ED}/usr/share/doc/fontconfig/ ]];  then
+		mv "${ED}"/usr/share/doc/fontconfig/* "${ED}"/usr/share/doc/${P} || die
+		rm -rf "${ED}"/usr/share/doc/fontconfig
+	fi
+
+	# Changes should be made to /etc/fonts/local.conf, and as we had
+	# too much problems with broken fonts.conf we force update it ...
+	echo 'CONFIG_PROTECT_MASK="/etc/fonts/fonts.conf"' > "${T}"/37fontconfig
+	doenvd "${T}"/37fontconfig
+
+	# As of fontconfig 2.7, everything sticks their noses in here.
+	dodir /etc/sandbox.d
+	echo 'SANDBOX_PREDICT="/var/cache/fontconfig"' > "${ED}"/etc/sandbox.d/37fontconfig
+
+	readme.gentoo_create_doc
+
+	keepdir /var/cache/${PN}
+}
+
+pkg_preinst() {
+	# Bug #193476
+	# /etc/fonts/conf.d/ contains symlinks to ../conf.avail/ to include various
+	# config files.  If we install as-is, we'll blow away user settings.
+	ebegin "Syncing fontconfig configuration to system"
+	if [[ -e ${EROOT}/etc/fonts/conf.d ]]; then
+		for file in "${EROOT}"/etc/fonts/conf.avail/*; do
+			f=${file##*/}
+			if [[ -L ${EROOT}/etc/fonts/conf.d/${f} ]]; then
+				[[ -f ${ED}/etc/fonts/conf.avail/${f} ]] \
+					&& ln -sf ../conf.avail/"${f}" "${ED}"/etc/fonts/conf.d/ &>/dev/null
+			else
+				[[ -f ${ED}/etc/fonts/conf.avail/${f} ]] \
+					&& rm "${ED}"/etc/fonts/conf.d/"${f}" &>/dev/null
+			fi
+		done
+	fi
+	eend $?
+}
+
+pkg_postinst() {
+	einfo "Cleaning broken symlinks in ${EROOT}/etc/fonts/conf.d/"
+	find -L "${EROOT}"/etc/fonts/conf.d/ -type l -delete
+
+	readme.gentoo_print_elog
+
+	if [[ ${ROOT} == "" ]]; then
+		multilib_pkg_postinst() {
+			ebegin "Creating global font cache for ${ABI}"
+			"${EPREFIX}"/usr/bin/${CHOST}-fc-cache -srf
+			eend $?
+		}
+
+		multilib_parallel_foreach_abi multilib_pkg_postinst
+	fi
+}
diff --git a/media-libs/game-music-emu/Manifest b/media-libs/game-music-emu/Manifest
index 8786a572fb63..ac8c06ad1144 100644
--- a/media-libs/game-music-emu/Manifest
+++ b/media-libs/game-music-emu/Manifest
@@ -1,5 +1,5 @@
 DIST game-music-emu-0.6.1.tar.bz2 171140 BLAKE2B d42a34fa531cf5da8ddd5b1d72cf7735c9edaad67bf47733d75dd74c201652d4031bdc3d634a5f64317957791db0446e96e788c4c07cbdb1c908bfffd094fee0 SHA512 06b3544086fae51361706b0417ae1bc3769863c7d060ebabdd09b930d37df973314c43afff32aedaa9ebb74cdeafdeadaac4aa5d448700ee961d79d7fc9012b4
 DIST game-music-emu-0.6.2.tar.xz 163052 BLAKE2B 8bce2a5c09eef947f02cfc3521aa380564ddaad5f8a8f40ac38b645fc146332ba1cb6755592892dab00200c169a4d1f94978d80c52976c04e120d9d01c8db9dc SHA512 1808d28b54cbbd8dc5e3240eb27d2e546398fb62ab6577e59430a7543cfdaa06482f70b4750656b73a05f1c1bc0c0254db97d0940271ea2144724e1c44f5da10
 EBUILD game-music-emu-0.6.1.ebuild 490 BLAKE2B ca4d490aaeb4e4a55a45fc7f42d4dc84b761c15c0b14604edfa9d428d2312a24f070fe8bfbdc569935afd77a9f38e237ce4d04a1c0aa47d5acc87e355e80aeb5 SHA512 2a5134fc33a4c54aec96b33b8dc6e695eca618b9fdc853a54aa6c792ec40c511c1578a21704f4c8a5ffaaec2a3f4ba5ef06a31ac39f74298330ea2f9617bd721
-EBUILD game-music-emu-0.6.2.ebuild 491 BLAKE2B 6ba5a1a43e2587bb9823d601a01a0ab7a0f1c3c457fe9a9bccd17d6c5010a895f15e7edc167b5c80cc665e83dbdd2ebf6043dce61645b65a13e023720beefe5c SHA512 67d2f9a9ed66a368d8e51ba5ae6457e4e8a88aa6a5d3e97e8a82478d230936839bf04e832caf7a82550cde4f38c996406cdc40bddc6c109b377283b57fe43029
+EBUILD game-music-emu-0.6.2.ebuild 490 BLAKE2B 7339dd5fd75dbf29c6ce8573074e3cc79bd0a1a7adcdc2c760c734cf07b3d1d267e0c8750f83d25b24528a2803718f6fcbe718d8bb2a108108ac1e469453f07e SHA512 80ebf21a586f60e97935204c674baa75acb956c40306f70e4100ef62a6934ed3d7c0e215c94e4f24fa960b1c0f6bd2e216d76066aa753724c603841da394c9ea
 MISC metadata.xml 400 BLAKE2B 1dd7cab3e13a3364222e52dc2e4c3dcbeb12e4169aaaa4196bc8ab325e42e04aa7b8aaa6fccb64db1de7ed6163d3060fdddb6df21c7243c4c0b3a7b7f28bd3ed SHA512 2abd1362876b6019d1538a6cd6a5740c29c1920037db3f3c622fb7c533a64b6d559ef8cdead9e2fdecc9c64c799fd1d2f8fc5887d493354604e4a99ed77cbf1d
diff --git a/media-libs/game-music-emu/game-music-emu-0.6.2.ebuild b/media-libs/game-music-emu/game-music-emu-0.6.2.ebuild
index 85407c915122..a6d47dc95246 100644
--- a/media-libs/game-music-emu/game-music-emu-0.6.2.ebuild
+++ b/media-libs/game-music-emu/game-music-emu-0.6.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://bitbucket.org/mpyne/game-music-emu/downloads/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 DOCS=( changes.txt design.txt gme.txt readme.txt )
diff --git a/media-libs/gd/Manifest b/media-libs/gd/Manifest
index a97b90a55f9e..76f27ba177c0 100644
--- a/media-libs/gd/Manifest
+++ b/media-libs/gd/Manifest
@@ -1,5 +1,5 @@
 AUX gd-2.2.5-CVE-2018-1000222.patch 2491 BLAKE2B 492923989fe07fa6993fd9ac7d234d8777b944e45cbce5f92aaf5bc53bd1502039ff75937e829f1ad6bceac8813bf68704a42d3688401a3b55fdfcd19649a533 SHA512 d12462f1b159d50b9032435e9767a5d76e1797a88be950ed33dda7aa17005b7cb60560d04b9520e46d8111e1669d42ce28cb2c508f9c8825d545ac0335d2a10b
 DIST libgd-2.2.5.tar.xz 2594092 BLAKE2B 222a7e012fbf9924ac391ee96c7cd3dec96afd78c6d43dfb680b33e7143e7df87fe6be75bbfe8fb93e916302d7daf08271214c84da28712e93a36465566cb2bd SHA512 e4598e17a277a75e02255402182cab139cb3f2cffcd68ec05cc10bbeaf6bc7aa39162c3445cd4a7efc1a26b72b9152bbedb187351e3ed099ea51767319997a6b
-EBUILD gd-2.2.5-r1.ebuild 2112 BLAKE2B 656de4e9a96b42c564c02aa86571c3350a5ebb150ab294aa5fc8fbe856fe55ae6deda6cd09d7d2009ae86a86df3249f1dbd880968ec2c9c7d4cd52a3eb8d805e SHA512 59f19c94094173aa1702f7a918e9499dc9d5e412f14ff1150b22690f2192f035413f68ad3465f41b60e36ca7acd2a8c42b0cb6ee91733c3bd647c470fc290e88
+EBUILD gd-2.2.5-r1.ebuild 2109 BLAKE2B 472d70e4c7400fd2aad3ab2bf69f0633a53cea5944019a62b77f76677bb08f902a30ab091b8475e92f699de63eb657ffb2d34df2684bf810fa2471ebaf79c4a2 SHA512 37680ab19dc86f33d1b5f9aa2b9af136ded2585a4227751ba97bec091128c0d8688179e8209332df7db4f5314ceeadeac52b54abfcfbb9f1ff2fed602768b556
 EBUILD gd-2.2.5.ebuild 2036 BLAKE2B 642b02819339f66ece89a28aaaa68d1d07522b3477b36660bfbfe17f922ed67c3f923ae8a13b709f43d317c4ca30d39699482fbf8789408922314c681a9c5ab1 SHA512 88a1002d150a7e4063832ddd1773536355aab8b0f1af8ee3a3d2ec9804fcd6900292d63db467365830d5cded14c7741dce07c04e7038bbfb3712044372a1c02f
 MISC metadata.xml 1507 BLAKE2B 34dbcbc70165ebe74ea14e6394e2691bda7523e4c848b13a512de8f0707c194a7da3de41a8fe483d7a8b2aa1af8f0d164ea210605ae76480dbf22b976b53d2f5 SHA512 0ac3c1ca25c190333e7f97dbb05e197e62e76abeaa045966fa3024dbeb22d541d78794df08d450e887591909a25dfb6a4fef861ed62f7f055b129e17b1329919
diff --git a/media-libs/gd/gd-2.2.5-r1.ebuild b/media-libs/gd/gd-2.2.5-r1.ebuild
index 22a71924d8da..b0aec7a454a6 100644
--- a/media-libs/gd/gd-2.2.5-r1.ebuild
+++ b/media-libs/gd/gd-2.2.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libgd/libgd/releases/download/${P}/lib${P}.tar.xz"
 
 LICENSE="gd IJG HPND BSD"
 SLOT="2/3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="fontconfig jpeg png static-libs tiff truetype webp xpm zlib"
 
 # fontconfig has prefixed font paths, details see bug #518970
diff --git a/media-libs/glpng/Manifest b/media-libs/glpng/Manifest
index d310630ce944..b103213a0ab9 100644
--- a/media-libs/glpng/Manifest
+++ b/media-libs/glpng/Manifest
@@ -1,3 +1,3 @@
 DIST glpng-1.46.tar.gz 41024 BLAKE2B a0e521ec5ebd3d6b9d62e64b001dfa0aac97be6a72f44222816f5cb2dda3949d33261f66e96ecaa1fc6feaf7ece67721d3606440d760b305fbb7cb57462b24b3 SHA512 82fbd6154a0ca16102b4c31f7fbd907cf8c18b20c1693c60f8dcdd1fe42ebe579f98da2b36c00fc080b2880c720e8099dac0d460a8de1b2bf1145abbf05a20ae
-EBUILD glpng-1.46-r1.ebuild 690 BLAKE2B 4b4ebf5dcbf8c42093f08d6f16a6b34aca41862f89e902b6f1299fbf7c2a2eadc58842cca7a39082701c42c48a0bd8971182a56bfddc7f999159cf65e9cc590c SHA512 a44ab231ef634cba52d7982badf8774e014385ac49c4cfd9264409a92b01f5a2681ed9f7202dc18fd73352d280e77467d3a57aa727eb3340a431e36ba3da57a7
+EBUILD glpng-1.46-r1.ebuild 683 BLAKE2B 612011a97c4cbd80cf2238a0e164e8f8eb020f0cf658ebb72eb37b02f0ded0bed1019c6b164592335e059bc045019cbfd6ad960bc146f56a72a73bc03ec95ac4 SHA512 375c315de0723fd5568d3180317f739ac89175611c987a61228f4c94bc20d8f1d69d831cc356bdcf9802e1facff1bc47c625a4508126ebd71c3b3f458971e80c
 MISC metadata.xml 461 BLAKE2B e5bc7b8a1b80dd383a5187799bb3e43540ec0b26694fcc62c289e2df08544484b8aba3ef9e396512ffed6dfc9457358d4eb683dd27484b13d5c44def8a68063e SHA512 bc6e0802c3ca98c29fcef3b36d34d688b5249c0e9103fbe336653003c2142821a732d26a48a6052003fc2e6f82f42694fe8ba9a4b32e896f689b10ef186c30e1
diff --git a/media-libs/glpng/glpng-1.46-r1.ebuild b/media-libs/glpng/glpng-1.46-r1.ebuild
index 62312ed6df62..2753b6ec6853 100644
--- a/media-libs/glpng/glpng-1.46-r1.ebuild
+++ b/media-libs/glpng/glpng-1.46-r1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
+
 inherit cmake-multilib
 
 DESCRIPTION="An OpenGL PNG image library"
@@ -13,15 +14,17 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE="static-libs"
 
-RDEPEND="virtual/opengl[${MULTILIB_USEDEP}]
-	virtual/glu[${MULTILIB_USEDEP}]
+RDEPEND="
 	media-libs/libpng:0=[${MULTILIB_USEDEP}]
-	sys-libs/zlib:=[${MULTILIB_USEDEP}]"
+	sys-libs/zlib:=[${MULTILIB_USEDEP}]
+	virtual/glu[${MULTILIB_USEDEP}]
+	virtual/opengl[${MULTILIB_USEDEP}]
+"
 DEPEND=${RDEPEND}
 
 S=${WORKDIR}/${PN}
 
 src_configure() {
-	local mycmakeargs=( "$(cmake-utils_use_build static-libs STATIC_LIBS)" )
+	local mycmakeargs=( -DBUILD_STATIC_LIBS=$(usex static-libs) )
 	cmake-multilib_src_configure
 }
diff --git a/media-libs/gst-plugins-bad/Manifest b/media-libs/gst-plugins-bad/Manifest
index a354dbd7c418..5750f454536a 100644
--- a/media-libs/gst-plugins-bad/Manifest
+++ b/media-libs/gst-plugins-bad/Manifest
@@ -1,11 +1,11 @@
 AUX gst-plugins-bad-0.10.23-CVE-2015-0797.patch 1044 BLAKE2B fe60f1069711c17e8e14e7e08081ca4c97697bb866587be45c471a85539d8c161d425a92aa8f01565bfece5aad0f5a3cd835d711edab977e11c9e9355d7d795f SHA512 cbe01dd53450cffb4cddf9313e78f2b61b27a8e1c35da13ab9429fa0de6cfce2585a4bbe1d3a9f6aac503c79a5a9d661420001b0196683a3c8b778685844c969
 DIST gst-plugins-bad-0.10.23-h264-patches.tar.xz 5284 BLAKE2B 90ad2a742de6d6b3efedb1a2fc16a9f24cf0566fd455a27f113afa0fc2ceff5f2517a31e8db8ed6ed8b4c92595b333a29dbb451077975f3d726808976f4a8671 SHA512 528ed30edb544dd970047fd4b0f05bf75f9f49f07a8118f805430c56c3ec75643013799491aeba70c62cb0343cd3e72758bf5c167d00e90a6a3f13857e4860e1
 DIST gst-plugins-bad-0.10.23.tar.xz 3155044 BLAKE2B 86ed955fb5c73f2145b8f8ed2daaeffd9975362e81c3ca911be00d18f6b6d975381651071eb54514ef94a931f1fc89e673dc8c1d68e10de132bbe51accb6d165 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4
-DIST gst-plugins-bad-1.12.4.tar.xz 4709272 BLAKE2B a4d1fec48fdd67fc66eb5588dbee820c22b19a41dda4f5643b1ae326bfc827cd4796fc7a523fb0a9758605952377a2491f4e53ea74237ca7841659dea4ddcbc0 SHA512 a8e281aee1f1d0bb3f171fbe4242e997c661cbfd0be78da3913c0f55d68d6b7c3d34cabfcdd8c25728217ff885b86a7bedc0be34a7b14e2eb2a6c6236753231b
 DIST gst-plugins-bad-1.14.1.tar.xz 4651852 BLAKE2B 915798f9d07e18b445cae818978def1356299034d14ca2cba8f07df93d5dcf5ed257290bf111298c4f8063b32ceee38dd78c02eae508f6e88956b132740bfa36 SHA512 6969b6c91279fb96bc28acde0284ce980b3982ae0c77820284a903beee61dffa863554dcfadb55de1987404b59c3c7c421372e65dc7b4014fe64a0c91d4ce729
 DIST gst-plugins-bad-1.14.2.tar.xz 4664260 BLAKE2B 477c9a864088676ead3170dc11017ad997c4d0ef136845a7ad34d15745d5f1abf4486dda7a226feb5ff6c7c65c8788cd39eb5e9901f3f15a426d79bf2b81e78c SHA512 7282c8941f1eabf7141362bb8e61097b3b26ef39410ae767712c34d7e40779fc22f6ea97a950009fdb6d62175f9a153d435ead8f663cf66cc6af5aac7f2a73db
+DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
 EBUILD gst-plugins-bad-0.10.23-r4.ebuild 1565 BLAKE2B 8907f6548ae1d077342bf0f35280c9cd59c492bd8a2e23e9c176c1682e32cab561835123af61fc40067f55c43574e401aa16e418ede39a56786744f741f203f7 SHA512 6c68c102487868c23bc177aa65a9a734f7e2cd89bcca5af827d98dcfb61d26a84b09a07d4ec6d7397a17ffa57ab33fdbfc5fc290bb9eb397209150da86ebb492
-EBUILD gst-plugins-bad-1.12.4.ebuild 2819 BLAKE2B 19d7afaf0e34e98ffd67ac1dbb453ce8477cd719803560a445e0cf2c8829c07f8355780151cd2273ea36e4bf624c1bdb278507ab8aa0da44e42746037abab895 SHA512 3414136d383f5669e11edfee11732de39b5f4f1fe20f821e2add0cf0d66b675fc337bfeed392770d3beee2144b70505c067121a2b7381c67c347dec431986425
-EBUILD gst-plugins-bad-1.14.1-r1.ebuild 2609 BLAKE2B 721f749819d27e5a3f0ebca333c8f319c3515783b18d8b60e3512353917afcfd43b75db5139b55bbfb1baf5fa49c8ca07f38d3d75ce2849fbb9bf2ad02c7e78d SHA512 ec5c81a1d5dde75689cbcf11aafadb100fd7536cc74dc8deea5e7a90f210ca4acc165df844aac7946d2e17978cd36cea0ff05caddf51e0a6a564e87ebdf5a2b8
-EBUILD gst-plugins-bad-1.14.2.ebuild 2616 BLAKE2B b02623dc74e3d00029d03361886d00e45520d677eb600415c0a0c3343a5686f25c21c8706497f6516fef160f58207936460f842f9aafef42c37fc19c3db59ace SHA512 c335ce9e3f45831d1bbd8d84839d9a4093ff4e25f88eb855bd61dd5b80c5ae74c241b6fbc9649eb170bf3e6fb962d7c3cccef8a2342fbd95ea4bc1b19e93745d
+EBUILD gst-plugins-bad-1.14.1-r1.ebuild 2606 BLAKE2B 4d18489f73c95ae84fb95aa94e81abf98708e8d2188180557488f6f240f5a3940c001198c323ae5a2f6ec92bc24db006a4e44f27c3d02b8a0f7015e0393391a8 SHA512 82cf3f251494733a0b770deb0580c1977cfb84aa08846b9d5655a775cdd917d128522368f369cec6b5fd5fc82c95dfb7b90ad109fc9e08cdb8a4c85556318e36
+EBUILD gst-plugins-bad-1.14.2.ebuild 2637 BLAKE2B f08298066c2e0fb27822a8bf7c810139e942e74f9ccd1444827aa9f1409aa751ca8ba8082282831eb08ea464e236e318b12bde34ad96a7d4c1048948fcfbbd72 SHA512 e9d3a6893c4504d9e7bb6dca857650d289dba80188dbb8e67f68b9b2fe945dc39f2ce3e99042ced83c034ee21998225c03c6acc24cffee9aaaa12968c0361378
+EBUILD gst-plugins-bad-1.14.3.ebuild 2637 BLAKE2B f08298066c2e0fb27822a8bf7c810139e942e74f9ccd1444827aa9f1409aa751ca8ba8082282831eb08ea464e236e318b12bde34ad96a7d4c1048948fcfbbd72 SHA512 e9d3a6893c4504d9e7bb6dca857650d289dba80188dbb8e67f68b9b2fe945dc39f2ce3e99042ced83c034ee21998225c03c6acc24cffee9aaaa12968c0361378
 MISC metadata.xml 439 BLAKE2B 5a4a36ccf4bd485eaf1fa66650eec8fa592d4c5bbf9fa478f1645e1b39649b7115694bf55dee7aeb4a5c53b2ba3c4614591cdf4e7d745938397c304108e0aa7c SHA512 9bd27a1a513fc2d697f7d0f2ceb7fa0701c446fe21b597256afd4c2c1f44145e875323ed1ef6202bf7b85472ab4aab43a4b6db5795bb1d28ff53a2a7e484055e
diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.1-r1.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.1-r1.ebuild
index ee610b243d95..a911d06c1bfb 100644
--- a/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.1-r1.ebuild
+++ b/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.1-r1.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Less plugins for GStreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="LGPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 
 # TODO: egl and gtk IUSE only for transition
 IUSE="X bzip2 +egl gles2 gtk +introspection +opengl +orc vcd vnc wayland" # Keep default IUSE mirrored with gst-plugins-base where relevant
diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.2.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.2.ebuild
index ec03046828cd..c58d0a23e121 100644
--- a/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.2.ebuild
+++ b/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.2.ebuild
@@ -36,6 +36,7 @@ RDEPEND="
 "
 
 DEPEND="${RDEPEND}
+	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.12
 "
 
diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.12.4.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.3.ebuild
index 33a7e25a8878..c58d0a23e121 100644
--- a/media-libs/gst-plugins-bad/gst-plugins-bad-1.12.4.ebuild
+++ b/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.3.ebuild
@@ -4,46 +4,39 @@
 EAPI=6
 GST_ORG_MODULE="gst-plugins-bad"
 
-inherit eutils flag-o-matic gstreamer virtualx
+inherit flag-o-matic gstreamer virtualx
 
 DESCRIPTION="Less plugins for GStreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="LGPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-
-IUSE="X bzip2 +egl gles2 gtk +introspection +opengl +orc vcd vnc wayland"
-REQUIRED_USE="
-	gles2? ( !opengl )
-	opengl? ( X )
-	wayland? ( egl )
-	egl? ( || ( opengl gles2 ) )
-"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+
+# TODO: egl and gtk IUSE only for transition
+IUSE="X bzip2 +egl gles2 gtk +introspection +opengl +orc vcd vnc wayland" # Keep default IUSE mirrored with gst-plugins-base where relevant
 
-# X11 is automagic for now, upstream #709530
+# X11 is automagic for now, upstream #709530 - only used by librfb USE=vnc plugin
+# We mirror opengl/gles2 from -base to ensure no automagic openglmixers plugin (with "opengl?" it'd still get built with USE=-opengl here)
 RDEPEND="
 	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
 	>=media-libs/gstreamer-${PV}:${SLOT}[${MULTILIB_USEDEP},introspection?]
-	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP},introspection?]
+	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP},egl?,introspection?,gles2=,opengl=]
 	introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
 
 	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
-	egl? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] )
-	gles2? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] )
-	opengl? (
-		>=media-libs/mesa-9.1.6[${MULTILIB_USEDEP}]
-		virtual/glu[${MULTILIB_USEDEP}] )
-	X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
+	vnc? ( X? ( x11-libs/libX11[${MULTILIB_USEDEP}] ) )
 	wayland? (
 		>=dev-libs/wayland-1.4.0[${MULTILIB_USEDEP}]
 		>=x11-libs/libdrm-2.4.55[${MULTILIB_USEDEP}]
 		>=dev-libs/wayland-protocols-1.4
 	)
 
-	gtk? ( >=x11-libs/gtk+-3.15:3[X?,wayland?,${MULTILIB_USEDEP}] )
+	gtk? ( >=media-plugins/gst-plugins-gtk-${PV}:${SLOT}[${MULTILIB_USEDEP}] )
 	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
 "
+
 DEPEND="${RDEPEND}
+	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.12
 "
 
@@ -56,35 +49,26 @@ src_prepare() {
 
 multilib_src_configure() {
 	local myconf=()
-	if use opengl || use gles2 ; then
-		# Actually enable the gl element, not just libs
+	if use opengl || use gles2; then
 		myconf+=( --enable-gl )
+	else
+		myconf+=( --disable-gl )
 	fi
 
-	# Always enable gsettings (no extra dependency)
-	# and shm (need a switch for winnt ?)
+	# Always enable shm (shm_open) and ipcpipeline (sys/socket.h); no extra deps
 	gstreamer_multilib_src_configure \
 		$(multilib_native_use_enable introspection) \
 		$(use_enable bzip2 bz2) \
-		$(use_enable egl) \
-		$(use_enable gles2) \
-		$(use_enable gtk gtk3) \
-		$(use_enable opengl) \
-		$(use_enable opengl glx) \
 		$(use_enable orc) \
 		$(use_enable vcd) \
 		$(use_enable vnc librfb) \
 		$(use_enable wayland) \
-		$(use_enable X x11) \
 		--disable-examples \
 		--disable-debug \
-		--disable-cocoa \
 		--without-player-tests \
-		--disable-wgl \
 		--enable-shm \
-		${myconf[$@]}
-		# not ported
-		# --enable-gsettings
+		--enable-ipcpipeline \
+		"${myconf[@]}"
 
 	if multilib_is_native_abi; then
 		local x
@@ -103,5 +87,5 @@ multilib_src_test() {
 multilib_src_install_all() {
 	DOCS="AUTHORS ChangeLog NEWS README RELEASE"
 	einstalldocs
-	prune_libtool_files --modules
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/media-libs/gst-plugins-base/Manifest b/media-libs/gst-plugins-base/Manifest
index 2eb549aa5a02..fc5241ba32dd 100644
--- a/media-libs/gst-plugins-base/Manifest
+++ b/media-libs/gst-plugins-base/Manifest
@@ -4,9 +4,12 @@ DIST gst-plugins-base-0.10.36.tar.xz 2364108 BLAKE2B a71ef5d5c7462d60937602681c0
 DIST gst-plugins-base-1.12.4.tar.xz 3119468 BLAKE2B d5ac157618a25c8f0323d1922d5b26b0b5c49f56cb75df3ceeadd0566f873be1a06c863a1da6afff40901fbbbeb1ec6cd6ef4614309ca7f7ff988c0fa9040a10 SHA512 89a6e92cd294612cf1406eb156416ab4606643f6b43637e64a18f6f28ab789ca8d4cf1308434ed85e5fc679c79cc3ca115db48f37e0065a6ab3cdfdbaaad9f53
 DIST gst-plugins-base-1.14.1.tar.xz 3689184 BLAKE2B 17abcab2c84b113180de55d6c781ae11feec66c215febfffefe4a22353c56e82a585647688e2078603b6c3ece6f26afa99969091a72886880a2f8549dd9cb379 SHA512 bca9db8780fe24c19a2c4eae9a16dc0856cb38077580e4344bd4f7fa9a7a03079b92556ff35475a574f624a5a721d80ef925790670e4cc809361ed01108a141e
 DIST gst-plugins-base-1.14.2.tar.xz 3693856 BLAKE2B 7ed05718bfd1dcb15e05e5a2c8758ad409c4ad7f331146363f264aaf7123c8a14c1db81f482710d1069d33e5281087f66e2e38504e39b214befba73ffdd9295c SHA512 35e7eb5c42fe265d38c433575f88d3306f15ff927a989eb375ed5399cbf92af2e9bf553d6eee349dc13673540cee00e1f879595f25e58c188ea443d8a969682f
+DIST gst-plugins-base-1.14.3.tar.xz 3702184 BLAKE2B 8b13cdcb912968ed51bba91faf70060cced562f374d2b6987a9b9ff9a261b553836394cc4dc16df299c21cb303fd87bb0becb57225767c3502c8c16359430523 SHA512 3b5f0dc46d148dd9f162c651594be740f798c1d6272ecabced544f09900b6f2909a9fc705d42e4e98130d6f7cb1368458bfeee27444b5c43e62551defbc3838a
 EBUILD gst-plugins-base-0.10.36-r2.ebuild 2120 BLAKE2B 5e670a72e651af6a8ef1e4992fc42a7a444e9a77e708b86cdf5d373d96cc549c2953df5da5b001479938f77498eb09de861e89e705ce555618cd45227209a769 SHA512 bc9f491322b473f7ae2a55a7fab8315584b1ef3f71f94ec4968705fb1063d72e6dd2dd80342bd85b7abb29315abb26adbe3002c94c7a7ec27517c8edcf32eafb
 EBUILD gst-plugins-base-1.12.4.ebuild 2635 BLAKE2B 135ac9f8423f4d994fc90320871716c18bc37afef01fdd8fbadb25b1b37addd05aaf9efe915850a64d041f3d1cb52231cf64af87021cb4cc24205e4618d85536 SHA512 01ccfae2d189a9506ae1261f15126aee3967bf76e91808d88b0d2214083e19d628ceba84e44b6a1f47ef673137d42dcecf13ba7750e4f279dbc4a605948e3f76
-EBUILD gst-plugins-base-1.14.1.ebuild 6100 BLAKE2B 080dbc05e8d365f1d6637e56804ae52c7f2f5c15ed3e8061671cbd09419afafd1146c7868ddac357b3b5f9f241b9543d8d27d86d1e3eab5f1c93f7d8fbcbc03d SHA512 e9f2db66f46cdffadb8c2843d0c5e4045cb44d81bacf720d11f1fbeb4eaa2c04134a7ea2681c88ba4290e70d3647bf916a456e27826589563f64f6859486bb21
+EBUILD gst-plugins-base-1.14.1.ebuild 6097 BLAKE2B ffdd010523329417895d7bb0c084ae057085993389c43579e41099f585bac82ce832d2112a8989e7c7bf10a75441aaccaa469bec023552185acbb23ec8c19a91 SHA512 1c4cc400a46d6ae8cd327854aab74b032e6c8ea6eb0110f3e7f8ddc84f7fbae5305d87340a3c5c841c6cc497f7783f0ce67df3a0b17b91fabf055060d1b79cbf
 EBUILD gst-plugins-base-1.14.2-r1.ebuild 5883 BLAKE2B 3231c2ad0d014b9ef9cb0b5d83fa8dffc476aae306b748baa7e192a3f326eba64ec2e8878438d1e06bed2d0a0dbf77499e261189554d5b4ba8c3f70c26756c70 SHA512 74af429382915c4174a37d51c7a3a5187ceb4a67f24a96fc45463f2a799ec5498c28eb40ae321e9915237a5593b61ac80e056b9a3ea7061593803aada923d736
 EBUILD gst-plugins-base-1.14.2.ebuild 6045 BLAKE2B 2b3b0519874526c0780d01380259a0a4986e613af7a4491941e85e504134c505a343812086f128fe251ec912ff528926d96e9f845a524f73162b78b4682e626b SHA512 e88bab789aeedb188724faaa92f39364219b1e512ce1279c2ad617b8302bea1372bea4a1ff57060e12008e81e8627c3d102ed46b2f89b461fa8c01ecd3afcf3b
+EBUILD gst-plugins-base-1.14.3-r1.ebuild 5904 BLAKE2B e4fc6f05dd8a472965cf71ccce226510b337e4a7d486d44789ceb36e19dd75284109b0fe0fbfbb650c997bc85216dec84f27ecb93ef2bbb817208f28318d3ba2 SHA512 225cf77fc13e39acb95d314de785b9273c049ce71e9d22b373f4ab465e361fa41902d94a62fc13b31ad0c9972e9ef36e443aee21fc95000acae8c1ec9a465db3
+EBUILD gst-plugins-base-1.14.3.ebuild 6066 BLAKE2B 2d576249fd69de48586c6b7aba76e6d649ecb631e0a3c39defd4537f75588593914fbc2b0c71c50fcfcce0d1bf3a74b7b2c762d7e22251de326bf7ff56eca3ab SHA512 4e055b2f29096ab3db96c5ecdcf2b50fa867c2adc7698e5a00150514ce26044dbba480308c098ffc38f55d881ef09ff50f4932ba185028acb94b541873edbb8e
 MISC metadata.xml 1065 BLAKE2B 9736df3218c6157e5cc0f14e96a15ec6ab6140e8774c7361dd4fe9378efd37d1a3da593527313a81591818ad48a5585bd4395fbeb85d357449b00bf7e51bbb5c SHA512 520802b59fc6575e16edd765dacab4ff0ff6e51dd162f03fe7e4e07eb472aeb78f3974a32ba613939932e123179106a450c503234ed806a08416dc6b8dd534c2
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.14.1.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.14.1.ebuild
index f140744db6d8..f8ee12bf8f2a 100644
--- a/media-libs/gst-plugins-base/gst-plugins-base-1.14.1.ebuild
+++ b/media-libs/gst-plugins-base/gst-plugins-base-1.14.1.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Basepack of plugins for gstreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="GPL-2+ LGPL-2+"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 # For OpenGL we have three separate concepts, with a list of possibilities in each:
 #  * opengl APIs - opengl and/or gles2; USE=opengl and USE=gles2 enable these accordingly; if neither is enabled, OpenGL helper library and elements are not built at all and all the other options aren't relevant
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.14.3-r1.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.14.3-r1.ebuild
new file mode 100644
index 000000000000..73db5954b48b
--- /dev/null
+++ b/media-libs/gst-plugins-base/gst-plugins-base-1.14.3-r1.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE="gst-plugins-base"
+
+inherit flag-o-matic gstreamer
+
+DESCRIPTION="Basepack of plugins for gstreamer"
+HOMEPAGE="https://gstreamer.freedesktop.org/"
+
+LICENSE="GPL-2+ LGPL-2+"
+KEYWORDS="~amd64 ~arm ~ppc64 ~sparc ~x86"
+
+# For OpenGL we have three separate concepts, with a list of possibilities in each:
+#  * opengl APIs - opengl and/or gles2; USE=opengl and USE=gles2 enable these accordingly; if neither is enabled, OpenGL helper library and elements are not built at all and all the other options aren't relevant
+#  * opengl platforms - glx and/or egl; also cgl, wgl, eagl for non-linux; USE="X opengl" enables glx platform; USE="egl" enables egl platform. Rest is up for relevant prefix teams.
+#  * opengl windowing system - x11, wayland, win32, cocoa, android, viv_fb, gbm and/or dispmanx; USE=X enables x11 (but for WSI it's automagic - FIXME), USE=wayland enables wayland, USE=gbm enables gbm (automagic upstream - FIXME); rest is up for relevant prefix/arch teams/contributors to test and provide patches
+# With the following limitations:
+#  * If opengl and/or gles2 is enabled, a platform has to be enabled - x11 or egl in our case, but x11 (glx) is acceptable only with opengl
+#  * If opengl and/or gles2 is enabled, a windowing system has to be enabled - x11, wayland or gbm in our case
+#  * glx platform requires opengl API
+#  * wayland, gbm and most other non-glx WSIs require egl platform
+# Additionally there is optional dmabuf support with egl for additional dmabuf based upload/download/eglimage options;
+#  and optional graphene usage for gltransformation and glvideoflip elements and more GLSL Uniforms support in glshader;
+#  and libpng/jpeg are required for gloverlay element;
+
+# Keep default IUSE options for relevant ones mirrored with gst-plugins-gtk and gst-plugins-bad
+IUSE="alsa +egl gbm gles2 +introspection ivorbis +ogg +opengl +orc +pango theora +vorbis wayland +X"
+GL_REQUIRED_USE="
+	|| ( gbm wayland X )
+	wayland? ( egl )
+	gbm? ( egl )
+"
+REQUIRED_USE="
+	ivorbis? ( ogg )
+	theora? ( ogg )
+	vorbis? ( ogg )
+	opengl? ( || ( egl X ) ${GL_REQUIRED_USE} )
+	gles2? ( egl ${GL_REQUIRED_USE} )
+"
+
+# Dependencies needed by opengl library and plugin (enabled via USE gles2 and/or opengl)
+# dmabuf automagic from libdrm headers (drm_fourcc.h) and EGL, so ensure it with USE=egl (platform independent header used only, thus no MULTILIB_USEDEP); provides dmabuf based upload/download/eglimage options
+GL_DEPS="
+	>=media-libs/mesa-9.0[egl?,gbm?,gles2?,wayland?,${MULTILIB_USEDEP}]
+	egl? (
+		x11-libs/libdrm
+	)
+	gbm? (
+		>=dev-libs/libgudev-147[${MULTILIB_USEDEP}]
+		>=x11-libs/libdrm-2.4.55[${MULTILIB_USEDEP}]
+	)
+	wayland? (
+		dev-libs/wayland[${MULTILIB_USEDEP}]
+	)
+
+	>=media-libs/graphene-1.4.0[${MULTILIB_USEDEP}]
+	media-libs/libpng:0[${MULTILIB_USEDEP}]
+	virtual/jpeg:0[${MULTILIB_USEDEP}]
+" # graphene for optional gltransformation and glvideoflip elements and more GLSL Uniforms support in glshader; libpng/jpeg for gloverlay element
+
+RDEPEND="
+	app-text/iso-codes
+	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
+	>=media-libs/gstreamer-${PV}:1.0[introspection?,${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
+	ivorbis? ( >=media-libs/tremor-0_pre20130223[${MULTILIB_USEDEP}] )
+	ogg? ( >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )
+	orc? ( >=dev-lang/orc-0.4.24[${MULTILIB_USEDEP}] )
+	pango? ( >=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}] )
+	theora? ( >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}] )
+	vorbis? ( >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
+	)
+
+	gles2? ( ${GL_DEPS} )
+	opengl? ( ${GL_DEPS} )
+
+	!<media-libs/gst-plugins-bad-1.13.1:1.0
+"
+DEPEND="${RDEPEND}
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.12
+	X? ( x11-base/xorg-proto )
+"
+
+src_prepare() {
+	# Disable GL tests for now; prone to fail with EGL_NOT_INITIALIZED, etc
+	sed -i -e '/^@USE_GL_TRUE@/d' tests/check/Makefile.in
+	default
+}
+
+multilib_src_configure() {
+	filter-flags -mno-sse -mno-sse2 -mno-sse4.1 #610340
+
+	local myconf=()
+	# FIXME: Automagic gbm and x11 wsi
+	if use opengl || use gles2; then
+		myconf+=(
+			--enable-gl
+			$(use_enable egl)
+			$(use_enable gles2)
+			$(use_enable opengl)
+			$(use_enable wayland)
+			$(use_enable X x11)
+		)
+	else
+		myconf+=(
+			--disable-gl
+			--disable-egl
+			--disable-gles2
+			--disable-opengl
+			--disable-wayland
+			--disable-x11
+		)
+	fi
+
+	if use opengl && use X; then
+		# GLX requires desktop OpenGL and X
+		myconf+=( --enable-glx )
+	else
+		myconf+=( --disable-glx )
+	fi
+
+	myconf+=(
+		--disable-cocoa
+		--disable-dispmanx
+		--disable-wgl
+	)
+
+	gstreamer_multilib_src_configure \
+		$(use_enable alsa) \
+		$(multilib_native_use_enable introspection) \
+		$(use_enable ivorbis) \
+		$(use_enable ogg) \
+		$(use_enable orc) \
+		$(use_enable pango) \
+		$(use_enable theora) \
+		$(use_enable vorbis) \
+		$(use_enable X x) \
+		$(use_enable X xshm) \
+		$(use_enable X xvideo) \
+		--enable-iso-codes \
+		--enable-zlib \
+		--disable-debug \
+		--disable-examples \
+		--disable-static \
+		"${myconf[@]}"
+
+	# bug #366931, flag-o-matic for the whole thing is overkill
+	if [[ ${CHOST} == *86-*-darwin* ]] ; then
+		sed -i \
+			-e '/FLAGS = /s|-O[23]|-O1|g' \
+			gst/audioconvert/Makefile \
+			gst/volume/Makefile || die
+	fi
+
+	if multilib_is_native_abi; then
+		local x
+		for x in libs plugins; do
+			ln -s "${S}"/docs/${x}/html docs/${x}/html || die
+		done
+	fi
+}
+
+multilib_src_install_all() {
+	DOCS="AUTHORS NEWS README RELEASE"
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+}
+
+multilib_src_test() {
+	unset GSETTINGS_BACKEND
+	emake check
+}
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.14.3.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.14.3.ebuild
new file mode 100644
index 000000000000..8ba702826498
--- /dev/null
+++ b/media-libs/gst-plugins-base/gst-plugins-base-1.14.3.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE="gst-plugins-base"
+
+inherit flag-o-matic gstreamer
+
+DESCRIPTION="Basepack of plugins for gstreamer"
+HOMEPAGE="https://gstreamer.freedesktop.org/"
+
+LICENSE="GPL-2+ LGPL-2+"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+# For OpenGL we have three separate concepts, with a list of possibilities in each:
+#  * opengl APIs - opengl and/or gles2; USE=opengl and USE=gles2 enable these accordingly; if neither is enabled, OpenGL helper library and elements are not built at all and all the other options aren't relevant
+#  * opengl platforms - glx and/or egl; also cgl, wgl, eagl for non-linux; USE="X opengl" enables glx platform; USE="egl" enables egl platform. Rest is up for relevant prefix teams.
+#  * opengl windowing system - x11, wayland, win32, cocoa, android, viv_fb, gbm and/or dispmanx; USE=X enables x11 (but for WSI it's automagic - FIXME), USE=wayland enables wayland, USE=gbm enables gbm (automagic upstream - FIXME); rest is up for relevant prefix/arch teams/contributors to test and provide patches
+# With the following limitations:
+#  * If opengl and/or gles2 is enabled, a platform has to be enabled - x11 or egl in our case, but x11 (glx) is acceptable only with opengl
+#  * If opengl and/or gles2 is enabled, a windowing system has to be enabled - x11, wayland or gbm in our case
+#  * glx platform requires opengl API
+#  * wayland, gbm and most other non-glx WSIs require egl platform
+# Additionally there is optional dmabuf support with egl for additional dmabuf based upload/download/eglimage options;
+#  and optional graphene usage for gltransformation and glvideoflip elements and more GLSL Uniforms support in glshader;
+#  and libpng/jpeg are required for gloverlay element;
+
+# Keep default IUSE options for relevant ones mirrored with gst-plugins-gtk and gst-plugins-bad
+IUSE="alsa +egl gbm gles2 +introspection ivorbis +ogg +opengl +orc +pango theora +vorbis wayland +X"
+GL_REQUIRED_USE="
+	|| ( gbm wayland X )
+	wayland? ( egl )
+	gbm? ( egl )
+"
+REQUIRED_USE="
+	ivorbis? ( ogg )
+	theora? ( ogg )
+	vorbis? ( ogg )
+	opengl? ( || ( egl X ) ${GL_REQUIRED_USE} )
+	gles2? ( egl ${GL_REQUIRED_USE} )
+"
+
+# Dependencies needed by opengl library and plugin (enabled via USE gles2 and/or opengl)
+# dmabuf automagic from libdrm headers (drm_fourcc.h) and EGL, so ensure it with USE=egl (platform independent header used only, thus no MULTILIB_USEDEP); provides dmabuf based upload/download/eglimage options
+GL_DEPS="
+	>=media-libs/mesa-9.0[egl?,gbm?,gles2?,wayland?,${MULTILIB_USEDEP}]
+	egl? (
+		x11-libs/libdrm
+	)
+	gbm? (
+		>=dev-libs/libgudev-147[${MULTILIB_USEDEP}]
+		>=x11-libs/libdrm-2.4.55[${MULTILIB_USEDEP}]
+	)
+	wayland? (
+		dev-libs/wayland[${MULTILIB_USEDEP}]
+	)
+
+	media-libs/libpng:0[${MULTILIB_USEDEP}]
+	virtual/jpeg:0[${MULTILIB_USEDEP}]
+" # graphene for optional gltransformation and glvideoflip elements and more GLSL Uniforms support in glshader; libpng/jpeg for gloverlay element
+# >=media-libs/graphene-1.4.0[${MULTILIB_USEDEP}]
+
+RDEPEND="
+	app-text/iso-codes
+	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
+	>=media-libs/gstreamer-${PV}:1.0[introspection?,${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
+	ivorbis? ( >=media-libs/tremor-0_pre20130223[${MULTILIB_USEDEP}] )
+	ogg? ( >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )
+	orc? ( >=dev-lang/orc-0.4.24[${MULTILIB_USEDEP}] )
+	pango? ( >=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}] )
+	theora? ( >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}] )
+	vorbis? ( >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
+	)
+
+	gles2? ( ${GL_DEPS} )
+	opengl? ( ${GL_DEPS} )
+
+	!<media-libs/gst-plugins-bad-1.13.1:1.0
+"
+DEPEND="${RDEPEND}
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.12
+	X? ( x11-base/xorg-proto )
+"
+
+src_prepare() {
+	# Disable GL tests for now; prone to fail with EGL_NOT_INITIALIZED, etc
+	sed -i -e '/^@USE_GL_TRUE@/d' tests/check/Makefile.in
+	default
+}
+
+multilib_src_configure() {
+	filter-flags -mno-sse -mno-sse2 -mno-sse4.1 #610340
+
+	local myconf=()
+	# FIXME: Automagic gbm and x11 wsi
+	if use opengl || use gles2; then
+		myconf+=(
+			--enable-gl
+			$(use_enable egl)
+			$(use_enable gles2)
+			$(use_enable opengl)
+			$(use_enable wayland)
+			$(use_enable X x11)
+		)
+	else
+		myconf+=(
+			--disable-gl
+			--disable-egl
+			--disable-gles2
+			--disable-opengl
+			--disable-wayland
+			--disable-x11
+		)
+	fi
+
+	if use opengl && use X; then
+		# GLX requires desktop OpenGL and X
+		myconf+=( --enable-glx )
+	else
+		myconf+=( --disable-glx )
+	fi
+
+	myconf+=(
+		--disable-cocoa
+		--disable-dispmanx
+		--disable-wgl
+	)
+
+	gstreamer_multilib_src_configure \
+		$(use_enable alsa) \
+		$(multilib_native_use_enable introspection) \
+		$(use_enable ivorbis) \
+		$(use_enable ogg) \
+		$(use_enable orc) \
+		$(use_enable pango) \
+		$(use_enable theora) \
+		$(use_enable vorbis) \
+		$(use_enable X x) \
+		$(use_enable X xshm) \
+		$(use_enable X xvideo) \
+		--enable-iso-codes \
+		--enable-zlib \
+		--disable-debug \
+		--disable-examples \
+		--disable-static \
+		"${myconf[@]}"
+
+	# bug #366931, flag-o-matic for the whole thing is overkill
+	if [[ ${CHOST} == *86-*-darwin* ]] ; then
+		sed -i \
+			-e '/FLAGS = /s|-O[23]|-O1|g' \
+			gst/audioconvert/Makefile \
+			gst/volume/Makefile || die
+	fi
+
+	if multilib_is_native_abi; then
+		local x
+		for x in libs plugins; do
+			ln -s "${S}"/docs/${x}/html docs/${x}/html || die
+		done
+	fi
+}
+
+multilib_src_install_all() {
+	DOCS="AUTHORS NEWS README RELEASE"
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+}
+
+multilib_src_test() {
+	unset GSETTINGS_BACKEND
+	emake check
+}
diff --git a/media-libs/gst-plugins-good/Manifest b/media-libs/gst-plugins-good/Manifest
index 9374567c9e41..983b78385faa 100644
--- a/media-libs/gst-plugins-good/Manifest
+++ b/media-libs/gst-plugins-good/Manifest
@@ -4,8 +4,10 @@ DIST gst-plugins-good-0.10.31.tar.xz 2738016 BLAKE2B a015ef6993078f1c699badcc991
 DIST gst-plugins-good-1.12.4.tar.xz 3489992 BLAKE2B 41715d3e9bda183706d87085bc8cca546720f20e32fd5ecf6e284814745f2fe8ba4cfcd244e50d0734e57dde26944539b8273879608d3042262bfc10f82cc2b9 SHA512 18f270c01be80fe5b026e2c26db3ec200117ffd99c1dca55a8a78f0bd6dcc4701126836e52a410f179779e363f11218413c7b4d13e96ef5ee1bfa82e79a81178
 DIST gst-plugins-good-1.14.1.tar.xz 3776168 BLAKE2B 5b17ac49d5bae423ee887f1516ba8bfb542acb17e3f304f489dddbaa728761ee51a08e67bd10a9981f53b5b8424d8013d1723fcbbf6e06d34a39548868d34f85 SHA512 b52d3214f2d32f263637cb9f0838284483e15b8d20bf36d64c349e99b481095734a4dd2c2421176540dfe5129ecc1acc101b89cc898b4773f0f736e8e962b070
 DIST gst-plugins-good-1.14.2.tar.xz 3779912 BLAKE2B d49f82a6be7423d233ec15660470533d6bfc5da3d2ac5912ce7b3f97739b1540424c02593aff269aae3df7c6f15ca37b2d9d45fe85f3b36b910cdac4ba98f093 SHA512 26ff40d949ab95043ed717350fb344a616c72b049cd52c3e7debd9cc37f73eb9d4704b4f437ba257cecb9dba702ce451647279cb821e9405b36210b46ae9aa05
+DIST gst-plugins-good-1.14.3.tar.xz 3790052 BLAKE2B 14f4116ce3eeb20f1f2cc8e835e46a9444ef82291aad90b74e74d0e79c1974bb6f2373f79543a3a3235773c954bd9def67a9e6c64522035fa65e1541695d34e1 SHA512 1077d4ac7332a4bfd58fe5be53104e1404c3a688769520650c030488a184e64a43b301fc1f1d687de668143f849a23cb0ba2b417cf284d20710b9cf32d792e45
 EBUILD gst-plugins-good-0.10.31-r2.ebuild 1661 BLAKE2B 25c45ebacc5a0a532761dcfdf49cdd4dbd1b61a133dbf1845d293570bdc203b4e9b72b917e5e8833ad9fee0f8595d6371615ae5fb0a2d616ac2f0dc3bf31260e SHA512 a66cb0a552686b588d54a962e9888c29edcf49442aaefa665b753658e31a96b108b07b7fa8033eb4bd7f0535a2fd4b3a6fa8ecc1a91649fd3ab0456e91c01f0c
 EBUILD gst-plugins-good-1.12.4.ebuild 1431 BLAKE2B 464355f1ed004290395cb487a31d32c82a61e400cac1b0260c1e4254854db8d4414fda88d849502fcac10faab192018959a6d4386861300c391843d2dee23186 SHA512 1b7e52559dc1287bd8b9b1256464c21662f396f648cf50a66430f712bdcad6baf52c03e78c40153795df74586ab71f4f0cd219b38ab743f00c063a8546d1e568
-EBUILD gst-plugins-good-1.14.1.ebuild 1500 BLAKE2B 6e7190d3722375e120d6bf12495eedcf96967bcaadd851ad4404584db3565bb2766953e7a6977ba34d4a9493d4824b3265f5a60214c40e04b4987044c23ee13d SHA512 a42035a11bdd729a17ca569ec898ecd3785cb9042527458cd81dbcd20030d0d1687cdb138d24277bb3da31355e1bfd75e3b0e9a8e6f7becf3dbaa6459d1de6c8
+EBUILD gst-plugins-good-1.14.1.ebuild 1497 BLAKE2B e0f49de376e0f0da5099159b0c8999d5744995cf45fd5b413544062a112f9dd27667069735508b165acfa141fd10a998a9ddc90b909af6ed18339281be1a1223 SHA512 fc772a0d34287d7d3501820158a9c86c52a04863fd06b79f004cfe38d240195fa295cde407c70aefe379fbce7421af1d50f0598a680e7a7362867da6d988cf16
 EBUILD gst-plugins-good-1.14.2.ebuild 1442 BLAKE2B b2c006b4f5ea87049b61b3f24ff2c256eff3fd4281c640419e95e3a7745e7d92d7070399f4727fa0ab9f750b7964c2870c4aa5308736d45be241c14dc576bde7 SHA512 271bda64072634995858e6c3af499a77a87df4fa3fc60131b4e305058211686ca5a2516a4231725ed44f3dfc82d800c0992aae7f31061d662f616685b7e6e3d6
+EBUILD gst-plugins-good-1.14.3.ebuild 1442 BLAKE2B b2c006b4f5ea87049b61b3f24ff2c256eff3fd4281c640419e95e3a7745e7d92d7070399f4727fa0ab9f750b7964c2870c4aa5308736d45be241c14dc576bde7 SHA512 271bda64072634995858e6c3af499a77a87df4fa3fc60131b4e305058211686ca5a2516a4231725ed44f3dfc82d800c0992aae7f31061d662f616685b7e6e3d6
 MISC metadata.xml 266 BLAKE2B 3180109d2a1479e9436a76fb478dfb1b23db0daedbf0ef264a469fbbfecd858adf6ec01f3fdc5c56270d0a9e1e150ac947f4a1f893e967d6b1dc1f1b8f6d4ccb SHA512 aa2ce82fa0c848119ff309462722e1d7897da904f9e1dc9ae12dd61582823b69cf5a40faf8da0825ec397d2f01d44e82cb56730d9545abd619a17696091eca75
diff --git a/media-libs/gst-plugins-good/gst-plugins-good-1.14.1.ebuild b/media-libs/gst-plugins-good/gst-plugins-good-1.14.1.ebuild
index f231b4b18f7a..19e8d10a329d 100644
--- a/media-libs/gst-plugins-good/gst-plugins-good-1.14.1.ebuild
+++ b/media-libs/gst-plugins-good/gst-plugins-good-1.14.1.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Basepack of plugins for GStreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="LGPL-2.1+"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="+orc"
 
 RDEPEND="
diff --git a/media-libs/gst-plugins-good/gst-plugins-good-1.14.3.ebuild b/media-libs/gst-plugins-good/gst-plugins-good-1.14.3.ebuild
new file mode 100644
index 000000000000..daf9c7a0a3b6
--- /dev/null
+++ b/media-libs/gst-plugins-good/gst-plugins-good-1.14.3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE="gst-plugins-good"
+
+inherit flag-o-matic gstreamer
+
+DESCRIPTION="Basepack of plugins for GStreamer"
+HOMEPAGE="https://gstreamer.freedesktop.org/"
+
+LICENSE="LGPL-2.1+"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="+orc"
+
+RDEPEND="
+	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+	>=media-libs/gstreamer-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+	>=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.12
+"
+
+multilib_src_configure() {
+	# Always enable optional bz2 support for matroska
+	# Always enable optional zlib support for qtdemux and matroska
+	# Many media files require these to work, as some container headers are often
+	# compressed, bug #291154
+	gstreamer_multilib_src_configure \
+		--enable-bz2 \
+		--enable-zlib \
+		--disable-examples \
+		--with-default-audiosink=autoaudiosink \
+		--with-default-visualizer=goom
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/docs/plugins/html docs/plugins/html || die
+	fi
+
+}
+
+multilib_src_install_all() {
+	DOCS="AUTHORS ChangeLog NEWS README RELEASE"
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/gst-plugins-ugly/Manifest b/media-libs/gst-plugins-ugly/Manifest
index 8b29f9d63abd..933b226fdeb2 100644
--- a/media-libs/gst-plugins-ugly/Manifest
+++ b/media-libs/gst-plugins-ugly/Manifest
@@ -1,9 +1,9 @@
 DIST gst-plugins-ugly-0.10.19.tar.xz 882452 BLAKE2B df5319481ade22d7acdee6e22ca57a444e104c8540bc4b578cfe7554c79bb4ee33b23a8516940f6504c30d9403c4ced2434e11f3a48548c3721d3d3db2016757 SHA512 16d030998142f698f8ab7dbe55c0c6c8db05ade6b3c007a3aacb5491592e8c60e0a9d62f1a840eab4d57825b1beb9017e3f68f5a90288435216586d67040deda
-DIST gst-plugins-ugly-1.12.4.tar.xz 904592 BLAKE2B 6ec59cea23ba45e705fc3140530576232c758884cc7cdcc293022233f4aeb440918c147563706a7309253dab318190bd6484fe2ac21af4b54af61ede349a1e82 SHA512 920f5be5a060293319f4c45bf7f28e14953e897473a04e1c83bce61261365198a6dc2d7ad6cf5396b2bbdc35a5f77014741e902e67c00c3c6596680ab9924e8a
 DIST gst-plugins-ugly-1.14.1.tar.xz 884668 BLAKE2B 8e1cef0ebabac65ad2b1d6ac3fdc04fbb3ae0da0b9f4c0d18f03533ae12dda03d04763bbeab079aebe3637df664dc2e94adc36008cacfb6c00b9ac8b4a228241 SHA512 0eaa9435e93596cb2c2ed1d3540dd3c4f4de1dd18da8359ca5918b0fbdccda9d5b8f33e5aeb54186ed9d70518712aca92e8ffe7884fc13a3ca3174552c10a688
 DIST gst-plugins-ugly-1.14.2.tar.xz 887116 BLAKE2B f1dc5732ef6e9dc7909d1131d36429cf140c6861b07abc97818afbf180a9fc986914c23228328126d4a93f5da234238f95b96ad36e8a4ffdec76554a24ddd213 SHA512 7902a6ef6d207663eebf00d630aac9c20b1ae0c333890f1f6aba8544eff0ef4d349b4d1d0e481d8cbcd5b1800f900ea4e6a0cb6017b0727559ab5c5acc3d0ea5
+DIST gst-plugins-ugly-1.14.3.tar.xz 889492 BLAKE2B 0c76ca28e1f062d0eac438f1692d2af33536719913ec10229eb6bc64f1f957bc7f6afe45e1c528ab4015c25dec61b8b9d2c517fee78a8a992c76bd41ff9e75d1 SHA512 0866bbcc3f1d0d668e77b5ef83fa7469dc80c957d2c6526126e761db46e83ff18d941c247833d27336106d8ba043e9ad50cafbddbff241f95bb16f9b1a0fbacc
 EBUILD gst-plugins-ugly-0.10.19-r1.ebuild 1058 BLAKE2B 3e51a96a9cec4e7cb9d5ea36620fc7210b0efdf9fb9d4e88984eb492786c441a6bedf87a91133ec24e014a08bbe161e785cab0415bc6e0844d8a0db5d4be5d69 SHA512 32c32c59686f099e1e5a9c2b75aad193fdcff900734d8dee31129a00cbdf84e219ae86c89bc6e35f4c5fb54532183cbe24683c463ce45e92c26041267e5ee1d1
-EBUILD gst-plugins-ugly-1.12.4.ebuild 1029 BLAKE2B 552f9a5075bd61c3b8cfa6659fa834fef445a19059f9a10cf7c6ac0e72db070dfa807f02db3534a037eebf94c1effd3555f701d1131b2868f0694ec9dae3f81e SHA512 6c0815445be549b133012a5e1fe90fe798df27f4c55f73e8bf816db04f5871c4e12f5c8978ad117696a1afaf3202e5627f8a849b78e642d97a76543ccabdbdd2
-EBUILD gst-plugins-ugly-1.14.1.ebuild 969 BLAKE2B d75400c791e672aa2f68d4a83cbfdb75b1865c1863609cc95fb545a368d87a767897e3c4bd849adde8297d388ab7b49e8270a7be5d495f8340e0019bbd8d5d42 SHA512 5d53a244446d79f735a065c56a5c8c63766616ce213f25a89baafadf9735f8d1a1befe93bd414dc34f2b39fa33a2927e228d923079313508ba8fb250b184bb8a
+EBUILD gst-plugins-ugly-1.14.1.ebuild 966 BLAKE2B 4a3e01b2b17b00b16dbe8a80da288a653885086b572d15aa3a73013c00866554c2acadee04be48d19edc821c43257f54d3cc8ca060faaf92a4bb5217c98afc67 SHA512 8ea21c6090145be195c6b175e5370b35dc889ab57b55bedc1c621783a012e70ea3ae690cfa69b8a267cb899259d15cad94fe411f9a338bb9111cc21abb868277
 EBUILD gst-plugins-ugly-1.14.2.ebuild 976 BLAKE2B 7096ff1cd28e8ca267d014b6c5444ae3311410de4d2dcb194e008a2d33fb97181f6cf47a9a0f7be414afc2e76ce74abc2ba5bdba5bc1ebb572d71b77abb36c95 SHA512 ce35f48e6ce9378ea81c11b328c6de5c50b5bb3f2bfea435b4c085cb96a8e9612ddaf1de7e63a56be84fb9b19b64edc3ffc2edd49c1ec9e4c935850cacfd8ae3
+EBUILD gst-plugins-ugly-1.14.3.ebuild 976 BLAKE2B 7096ff1cd28e8ca267d014b6c5444ae3311410de4d2dcb194e008a2d33fb97181f6cf47a9a0f7be414afc2e76ce74abc2ba5bdba5bc1ebb572d71b77abb36c95 SHA512 ce35f48e6ce9378ea81c11b328c6de5c50b5bb3f2bfea435b4c085cb96a8e9612ddaf1de7e63a56be84fb9b19b64edc3ffc2edd49c1ec9e4c935850cacfd8ae3
 MISC metadata.xml 345 BLAKE2B c8af39d4811da5ca9cad30110ed9b2a090fd27a957bf32f831b4c3f5a22bb87fcc15957151ce9752521d2a92c667568d8ab002c8f4f9ba3363d9b7ca79655ce8 SHA512 c8c693633f2fdbf66f2308a2ee82880bf0cdd58b0c1e42a2d3b2733b3a7411769da60e8beb375def6473fe50303f1a68a0c7712e48abf88935b045f93103b206
diff --git a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.14.1.ebuild b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.14.1.ebuild
index d124d7e84d99..92ac40654297 100644
--- a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.14.1.ebuild
+++ b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.14.1.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Basepack of plugins for gstreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="LGPL-2+" # some split plugins are LGPL but combining with a GPL library
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 
 RDEPEND="
 	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
diff --git a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.12.4.ebuild b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.14.3.ebuild
index 9bc59ff9af16..1b31266066c2 100644
--- a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.12.4.ebuild
+++ b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.14.3.ebuild
@@ -4,20 +4,18 @@
 EAPI=6
 GST_ORG_MODULE="gst-plugins-ugly"
 
-inherit eutils gstreamer
+inherit gstreamer
 
 DESCRIPTION="Basepack of plugins for gstreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="LGPL-2+" # some split plugins are LGPL but combining with a GPL library
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="+orc"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 
 RDEPEND="
 	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
 	>=media-libs/gstreamer-${PV}:${SLOT}[${MULTILIB_USEDEP}]
 	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}]
-	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
 "
 DEPEND="${RDEPEND}
 	>=dev-util/gtk-doc-am-1.12
@@ -35,5 +33,5 @@ multilib_src_configure() {
 multilib_src_install_all() {
 	DOCS="AUTHORS ChangeLog NEWS README RELEASE"
 	einstalldocs
-	prune_libtool_files --modules
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/media-libs/gstreamer-editing-services/Manifest b/media-libs/gstreamer-editing-services/Manifest
index 34feb8c6b320..c74c1e2ebdca 100644
--- a/media-libs/gstreamer-editing-services/Manifest
+++ b/media-libs/gstreamer-editing-services/Manifest
@@ -1,5 +1,7 @@
 DIST gstreamer-editing-services-1.14.1.tar.xz 1059888 BLAKE2B d176c5d4341df208ee87d71f1838e5bb6c3bce7f072a3214d6907b91e75a81f5cd79cf424266205641281d525dea7e36423ffb98adef3cddd54814ea763a8d00 SHA512 3801769a515f248b923c50ad51961175094a66f2aa55184e82ecb948331c05b6e297a723d5443db11ec3274ee48f56d6dcc8af8a95cf9e701cc4e02615f8e6e4
 DIST gstreamer-editing-services-1.14.2.tar.xz 1063208 BLAKE2B b26db0c944e203026c1be242b80d3d16396d754c1883c07608f73f236d3e96979ef0eb5a7a0230fc360edd34caf22afa3d1e59eb4109ef17e60481b428703539 SHA512 74cd168d1308086e1b4c350eeec1757f790e05a8a762ebb7dd43c7ecdc0e747d7e5cfa2c3b0266eea18d98a369beb1fa544dafb4a1d22fe23af1d4e055322b29
+DIST gstreamer-editing-services-1.14.3.tar.xz 1066740 BLAKE2B c5511ca12eccb08d49733540e2d264290a6ca53ec0d5e9007d354e10808568727ed10bfb205c425fd56d334ef12e30324d67b0dcff8115b3c13d1123fe6026b9 SHA512 5dc4fc65c7ce9604b75516774c4481f3214ed703c0d3bb2a6fa348e5a8a09c963ac711e81e5c91f12f57ab3df63a94d7d178fcd4aab4d4d429f32e055c14a205
 EBUILD gstreamer-editing-services-1.14.1.ebuild 1521 BLAKE2B b23e91bb494035a3cb02dd6c2d08c0a6677fe335da13d762b858546c6269a25cdc9cbce7ed63ee756636c59ff09275456df9bc54bed37f5db51d899a1bc7a809 SHA512 54c99267dc65545802775d41c321d6a153d100d6e871a7fe0ebe39af22c5424578e7053b408d5d6fbe766db3d00858f9f5b8b29d7c148ae9d980fb4ecf52c920
 EBUILD gstreamer-editing-services-1.14.2.ebuild 1544 BLAKE2B 2365ef8069067e9ca2be479806b2ceab658ffd8cdcf969537030902c04bc312017d60f3e7674729e53ba8ca28f5dbc9b2fed4083c45b69ce16b6fe4e77c00ba6 SHA512 ef6ec043c85673d84a5f34536106b00f14da86027a3da7f53e3f5221ee594249c14704a9b4e53e73b1a61e8dadcfd6d91a53c222be4d7d1f9054b22096184270
+EBUILD gstreamer-editing-services-1.14.3.ebuild 1544 BLAKE2B 2365ef8069067e9ca2be479806b2ceab658ffd8cdcf969537030902c04bc312017d60f3e7674729e53ba8ca28f5dbc9b2fed4083c45b69ce16b6fe4e77c00ba6 SHA512 ef6ec043c85673d84a5f34536106b00f14da86027a3da7f53e3f5221ee594249c14704a9b4e53e73b1a61e8dadcfd6d91a53c222be4d7d1f9054b22096184270
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.14.3.ebuild b/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.14.3.ebuild
new file mode 100644
index 000000000000..0bb7fc8cf81d
--- /dev/null
+++ b/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.14.3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+GNOME2_LA_PUNT="yes"
+
+inherit bash-completion-r1 gnome2 python-r1
+
+DESCRIPTION="SDK for making video editors and more"
+HOMEPAGE="http://wiki.pitivi.org/wiki/GES"
+SRC_URI="https://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2+"
+SLOT="1.0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="+introspection"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=dev-libs/glib-2.40.0:2
+	dev-libs/libxml2:2
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	>=media-libs/gstreamer-${PV}:1.0[introspection?]
+	>=media-libs/gst-plugins-base-${PV}:1.0[introspection?]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.3
+	virtual/pkgconfig
+"
+# XXX: tests do pass but need g-e-s to be installed due to missing
+# AM_TEST_ENVIRONMENT setup.
+RESTRICT="test"
+
+src_configure() {
+	# gtk is only used for examples
+	gnome2_src_configure \
+		$(use_enable introspection) \
+		--disable-examples \
+		--without-gtk \
+		--with-bash-completion-dir="$(get_bashcompdir)" \
+		--with-package-name="GStreamer editing services ebuild for Gentoo" \
+		--with-package-origin="https://packages.gentoo.org/package/media-libs/gstreamer-editing-services"
+}
+
+src_compile() {
+	# Prevent sandbox violations, bug #538888
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744135
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744134
+	addpredict /dev
+	gnome2_src_compile
+}
diff --git a/media-libs/gstreamer/Manifest b/media-libs/gstreamer/Manifest
index 34274b9264a4..58d88b6cb857 100644
--- a/media-libs/gstreamer/Manifest
+++ b/media-libs/gstreamer/Manifest
@@ -1,11 +1,14 @@
+AUX 1.14.3-fix-gstsegment-test.patch 1659 BLAKE2B 432239af51fba7f3e0be9bebdb221923813e5a3a4087aa2878f8ec8bbbfbb87a0ccafb8754a34ee7ad636807583b97a5143b67192e1a4c40e617ed24fc48c749 SHA512 19f56c749162ae320eeff23b0057eb7ab0b443031c82730cc76cfc4f829769fab9399200369b859847e04c55f23689e4f0a37a7ff432e68e37fc4925e9a5b7b3
 AUX gstreamer-0.10.36-disable-test_fail_abstract_new.patch 1319 BLAKE2B 6b7fc64688f7b078d5018d0ec9b90dc8aa6c0c48bbdd19873a95fabd4da7ffed5b767ac1756ffa6b802d6dd2f261a9f2170a52c7a029732296d22b45999d5cda SHA512 6d2ef5d837551481c85b75edc9246049ca237d8b7efd462646a39ce5526a9b309a6390f2257930bfc54383c9b13447002b2c61f777d38e717995eee6030f5198
 AUX gstreamer-make-grammar.y-work-with-bison-3.patch 820 BLAKE2B 1809d190e37fde67c1e7108315e477ed05a3602e401013c26aff33dd0a74e2db8fc4e3d72d6e0b2d5fd79b3c4390c2ec5d2140fdcdb60530facc5e546c1dbe31 SHA512 8f5e904cc42be918c0a170c7227e22d0a31b5eb613a44294dbc03e5b1d7315d565f29d3de796ffbca822fe53b10b83bea54694b58ff2bf453af4b8859741ee21
 DIST gstreamer-0.10.36.tar.xz 3025876 BLAKE2B f0f70f483e8ccb2a294fb3bc8b51aac089f5e76522249b64e3e60e7b488a9e03b9300617e2c137bdcc0e3e61668b7b203e899f270f004e2dfcee0927fa7dfc3c SHA512 7468abb578398681d2adb0e9bbc9ee8ae25aaef72369d45a66ada6c67d1759afdce606cb32e68d9e30ae813196bdfef3d4d33202bc77839cc1fbf5fc436c1bd8
 DIST gstreamer-1.12.4.tar.xz 3177208 BLAKE2B cb859503edbe09cebbbfa70cb4edc5d433bbaa5b299e05921d30e6096f8765e17d449c45bd7d5ea3e4603ae46d337d4e3291b1d0456c7b72a7ebb41faad9e73a SHA512 849aa4ddf8ef465f2915e05d36fc0c31c2e31ae28be2fa38f8069a64a91b7347020fac5b881b7f3ee54c2198c3596138d49f27b09f258303834164a5d68b38a2
 DIST gstreamer-1.14.1.tar.xz 3252440 BLAKE2B c2142621b126926dd9ec886f0478154b3f0d9b7adebc6169200b8bc7e4cd089dfe77cab2b436bf3c74cbcae5f84c95afbd05ba282d0afe3e8e226e6bc0f33e33 SHA512 9cf16d79774293dd7fa10c08f6628b83f4e77f0386bebbfd47ded0498e4abd48eee1aee164af53d59fbea2d395e42eb5a12ef4b8f631bc4fd5d4f69545191f9b
 DIST gstreamer-1.14.2.tar.xz 3255404 BLAKE2B 290e8fec3eb6629a0e6e8f01c7c027fcc085f632afeac1ffe7bd4f1d8a9a3d3b78145334a11c91fcabea40b9f202a3b451ca55db13fd23be66c7167c76614932 SHA512 270dba318d15b54fff6e09d09d77dea13be55bbf82a5bb510efb43f954e234230505366cc6f19f5431e2dd24f5a7734daf5a89d9bd94de8302ed722df0e1eb84
+DIST gstreamer-1.14.3.tar.xz 3263036 BLAKE2B 20170b831064ea49565d7a4529563e4e9273def28d33eda779c7e3f4a60989b64844c271da529bdbbaebf80a8a86c37b97af4a18c4d0aae6182be608f3dcf345 SHA512 bfbf76219b5275b00253797323c4fc7b4edb8513d5441c80a8f778b418837c68e9ff37a72a78ac2431a051e813397fb01464bebddd1522b9e4a225ed505342b7
 EBUILD gstreamer-0.10.36-r2.ebuild 3843 BLAKE2B 5755f04502e3fd6bb5eafbba0710009fd0dba7f402c4a28c20c768ad6290201a900200a33f21b2d97bf6aa7596df06a0001530f001164eb2777a9f3b5cb0adfb SHA512 3a9be6924cb416b173297ff022edffb6a8c496607a4b5f88c1b81fb8489ec045e9f611a88a736fb67a84418d472e37fbdb078e9e9d8593a03418cb6658de6c67
 EBUILD gstreamer-1.12.4.ebuild 3310 BLAKE2B 3628c62235e16443c6cc95dcdbaaf51b8e5931f6b50553eaa786b21b98fac481bfa27bdec00bfcef0f8abc78f3be5f1652e9996a13d75d8dc2022da1d368f07f SHA512 04ee255b76d7aa2fb18c978baf51dd427586a8255449931165c7e327eb16387e640a1a0f5ff7354dc3080f19dda5610a430994dfbbb41397df43d3155c183133
-EBUILD gstreamer-1.14.1.ebuild 3378 BLAKE2B e55dd67b330a26f0c7551546d4309a4478bb80a7449247ff25345b98b2f4be37eebddd0e5acda5166758b9c3d9fc7d2d974b9fee8386187b11a08fa78cab645f SHA512 1ba3f2d90a8f87164c69543a405edbd67edbb2a03f35d8a734968a66d45a2f93b413923168e12a3ad336567596dac73b663ec36dbb7d845c950a2af9572461bb
-EBUILD gstreamer-1.14.2.ebuild 3385 BLAKE2B a6c6839a8aefebe90e187edb2ef84df743f4597979e5bd9403e0f64640b15dde702de7bd712171cb8ba1106a189e6b4c6f4b14313837be8757f2ec8f61496053 SHA512 16fdfc15e1ffa26aa270541fdb611fa0f5dfb6b92990b743b58b023f17fe16ead20229fe424e52a3d00305802a1fcdb62f3125af149214bd3a47a666a464d569
+EBUILD gstreamer-1.14.1.ebuild 3375 BLAKE2B 6064b6693e8749608990b0a4ca9e5e5c041c84a85c65ee99ce00a9000f67c93440436690b7553b5dc4538555a0c197d7a4c445b48db2d0536440fb5dc1a8862c SHA512 89e5eeefa7bf8389458998466c3eb278a7b5fd62786834ba59b271abd01eaebed407de1d9292f53d3bf9b26fae9310c05e408dc98fb1045f934719c9cc6b0276
+EBUILD gstreamer-1.14.2.ebuild 3406 BLAKE2B d43a2dbf9c0a707b6c03df95f7eb780246d3da03763f6917ebccc65fe5d05ac25b81be4f141aa4c87a62f375b69bc7460e7156831c00f90d8ec28d1b61f50d5f SHA512 88693dd7201ff60a460ce7f43792dc9118d08cfcb699075e99bfdc254276b7288f2296eb0a8444a75b4d3f55a5f9bc1695e7b7d5323397c99d30e02e0a49a887
+EBUILD gstreamer-1.14.3.ebuild 3466 BLAKE2B fcf6a510d66a0529be30d7d14ebe7d38e128bcd6efafb36d595290c595866ff341338b06602e070bb11bc25b30f36a5b0df7722767400069fc52d5b43a29387c SHA512 e0bc3ed6a303778658a05f0d1daa13da234f78d268ef458612be8799a748f80bd7ed3954da80bb38129e0289cd1236ba23caa94d986ac192eb329197bb85be98
 MISC metadata.xml 586 BLAKE2B 319df0c2c013f3018bdb31afddcd80b298f9b74d0a581981f30d483b0773339befe4dc62eb78a267b3a0f5a63a7e6462bd0ece4d4285c0ca91a1329c12ba1b93 SHA512 f7de0325f671119a5b787dcba9572d06d58375ba9d815854beffd668da55e4d4695f586365b3455e63cd56f4469fb8e1a92ab6de4e05847668f56c076dfdaf57
diff --git a/media-libs/gstreamer/files/1.14.3-fix-gstsegment-test.patch b/media-libs/gstreamer/files/1.14.3-fix-gstsegment-test.patch
new file mode 100644
index 000000000000..9b2fb2402e1b
--- /dev/null
+++ b/media-libs/gstreamer/files/1.14.3-fix-gstsegment-test.patch
@@ -0,0 +1,46 @@
+From 0a479c3cdc5d5745b6cc5084d5faf3b0ab8e604a Mon Sep 17 00:00:00 2001
+From: Jan Schmidt <jan@centricular.com>
+Date: Mon, 17 Sep 2018 22:13:22 +1000
+Subject: [PATCH] tests: Use a different rate in a segment test.
+
+Using a rate of 1.1 in the test is causing the test to
+fail on 32-bit because ceil(1.1 * 10) can round to 12.
+
+Instead use a rate 2.0 that can be expressed as floating
+point number and doesn't trigger the problem.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=797154
+---
+ tests/check/gst/gstsegment.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/tests/check/gst/gstsegment.c b/tests/check/gst/gstsegment.c
+index 17ad18c2f..751469d76 100644
+--- a/tests/check/gst/gstsegment.c
++++ b/tests/check/gst/gstsegment.c
+@@ -888,7 +888,7 @@ GST_START_TEST (segment_full)
+   fail_unless_equals_int (pos, 190);
+ 
+   /* Test a non-1.0 rate that lands right before the segment, but still +ve */
+-  segment.rate = 1.1;
++  segment.rate = 2.0;
+   segment.start = 100;
+   segment.offset = 0;
+   segment.stop = 500;
+@@ -897,11 +897,11 @@ GST_START_TEST (segment_full)
+   segment.time = 10000;
+   fail_unless (gst_segment_position_from_running_time_full (&segment,
+           GST_FORMAT_TIME, 140, &pos) == 1);
+-  fail_unless (pos == 89);
++  fail_unless (pos == 80);
+   /* And now one that should give a position < 0 */
+   fail_unless (gst_segment_position_from_running_time_full (&segment,
+           GST_FORMAT_TIME, 0, &pos) == -1);
+-  fail_unless (pos == 65);
++  fail_unless (pos == 200);
+ 
+   /* Test a non-1.0 negative rate that lands right after the (reversed) segment, but still +ve position */
+   segment.rate = -2.0;
+-- 
+2.17.0
+
diff --git a/media-libs/gstreamer/gstreamer-1.14.1.ebuild b/media-libs/gstreamer/gstreamer-1.14.1.ebuild
index 82abaebe4fa9..efe3f1a75fdd 100644
--- a/media-libs/gstreamer/gstreamer-1.14.1.ebuild
+++ b/media-libs/gstreamer/gstreamer-1.14.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://${PN}.freedesktop.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="1.0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+caps +introspection nls +orc test unwind"
 
 RDEPEND="
diff --git a/media-libs/gstreamer/gstreamer-1.14.2.ebuild b/media-libs/gstreamer/gstreamer-1.14.2.ebuild
index ed4c8f8861f2..fcdb78c174df 100644
--- a/media-libs/gstreamer/gstreamer-1.14.2.ebuild
+++ b/media-libs/gstreamer/gstreamer-1.14.2.ebuild
@@ -25,6 +25,7 @@ RDEPEND="
 	!<media-libs/gst-plugins-bad-1.13.1:1.0
 "
 DEPEND="${RDEPEND}
+	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.12
 	sys-devel/bison
 	sys-devel/flex
diff --git a/media-libs/gstreamer/gstreamer-1.14.3.ebuild b/media-libs/gstreamer/gstreamer-1.14.3.ebuild
new file mode 100644
index 000000000000..ff1a74c70a22
--- /dev/null
+++ b/media-libs/gstreamer/gstreamer-1.14.3.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1 multilib-minimal pax-utils
+
+DESCRIPTION="Open source multimedia framework"
+HOMEPAGE="https://gstreamer.freedesktop.org/"
+SRC_URI="https://${PN}.freedesktop.org/src/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2+"
+SLOT="1.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="+caps +introspection nls +orc test unwind"
+
+RDEPEND="
+	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
+	caps? ( sys-libs/libcap[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
+	unwind? (
+		>=sys-libs/libunwind-1.2_rc1[${MULTILIB_USEDEP}]
+		dev-libs/elfutils[${MULTILIB_USEDEP}]
+	)
+	!<media-libs/gst-plugins-bad-1.13.1:1.0
+"
+DEPEND="${RDEPEND}
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.12
+	sys-devel/bison
+	sys-devel/flex
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	nls? ( sys-devel/gettext )
+"
+# gtk-doc-am to install API docs
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-fix-gstsegment-test.patch
+)
+
+src_configure() {
+	if [[ ${CHOST} == *-interix* ]] ; then
+		export ac_cv_lib_dl_dladdr=no
+		export ac_cv_func_poll=no
+	fi
+	if [[ ${CHOST} == powerpc-apple-darwin* ]] ; then
+		# GCC groks this, but then refers to an implementation (___multi3,
+		# ___udivti3) that don't exist (at least I can't find it), so force
+		# this one to be off, such that we use 2x64bit emulation code.
+		export gst_cv_uint128_t=no
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local completiondir=$(get_bashcompdir)
+	# Set 'libexecdir' to ABI-specific location for the library spawns
+	# helpers from there.
+	# Disable static archives and examples to speed up build time
+	# Disable debug, as it only affects -g passing (debugging symbols), this must done through make.conf in gentoo
+	local myconf=(
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
+		--disable-benchmarks
+		--disable-debug
+		--disable-examples
+		--disable-static
+		--disable-valgrind
+		--enable-check
+		$(use_with unwind)
+		$(use_with unwind dw)
+		$(multilib_native_use_enable introspection)
+		$(use_enable nls)
+		$(use_enable test tests)
+		--with-bash-completion-dir="${completiondir%/*}"
+		--with-package-name="GStreamer ebuild for Gentoo"
+		--with-package-origin="https://packages.gentoo.org/package/media-libs/gstreamer"
+	)
+
+	if use caps ; then
+		myconf+=( --with-ptp-helper-permissions=capabilities )
+	else
+		myconf+=(
+			--with-ptp-helper-permissions=setuid-root
+			--with-ptp-helper-setuid-user=nobody
+			--with-ptp-helper-setuid-group=nobody
+		)
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+
+	if multilib_is_native_abi; then
+		local x
+		for x in gst libs plugins; do
+			ln -s "${S}"/docs/${x}/html docs/${x}/html || die
+		done
+	fi
+}
+
+multilib_src_install() {
+	# can't do "default", we want to install docs in multilib_src_install_all
+	emake DESTDIR="${D}" install
+
+	# Needed for orc-using gst plugins on hardened/PaX systems, bug #421579
+	use orc && pax-mark -m "${ED}usr/$(get_libdir)/gstreamer-${SLOT}/gst-plugin-scanner"
+}
+
+multilib_src_install_all() {
+	DOCS="AUTHORS ChangeLog NEWS MAINTAINERS README RELEASE"
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+
+	# Needed for orc-using gst plugins on hardened/PaX systems, bug #421579
+	use orc && pax-mark -m "${ED}usr/bin/gst-launch-${SLOT}"
+}
diff --git a/media-libs/jpeg/Manifest b/media-libs/jpeg/Manifest
index 0464282eaa50..178cc41d77f8 100644
--- a/media-libs/jpeg/Manifest
+++ b/media-libs/jpeg/Manifest
@@ -8,5 +8,5 @@ DIST libjpeg8_8d-1.debian.tar.gz 13676 BLAKE2B ac6fab3e52f91c9ece95ed809fc972afc
 EBUILD jpeg-6b-r12.ebuild 1126 BLAKE2B 8a161ddc45d213b874815518bbaf5d3b5f5053658153e60bdbf6c376c29d0964aff0f220e41135935d1276641fad69fd8f4ce042023a9d6e4460ca07c7929694 SHA512 97aa4b853ca53728cebf56da61468b0cba0c35f78ac37add53c403489c7c13df2530194f2876f0c49f13dd3ff2fe162c9472eca8ab87266c0b6aec38f6c9ff25
 EBUILD jpeg-8d-r1.ebuild 1942 BLAKE2B 05938a73c8013d923e450b189b9c7f746a928237810ec41a017ecad5924d92a61d6b6c887f4aa3f26231604b94526905b83e8e5215bb714a432d1402a7a2f5e4 SHA512 f4aab4bda823dc772d309cb96156ae60bdf4d8528a8117540e7b7d82e116cc11cd45bcf0abc0dfc4767cc782e24905792cae6f96b1a24eae4de40a338dc124cf
 EBUILD jpeg-8d-r2.ebuild 1405 BLAKE2B 5bea27ef13659ebfc7f4e3aa9605da42b49ba478f15abe9cf0aca65206641a89692f6b764d99df40e977299e4c233da8a481285768369dc5aefc03a472950afe SHA512 809b128963ac2a257d8eaf58e2df54c34fd42a7f1a8756552dd88758f572eb30edfa2378f49b765276fd0d83eda4bbf9682efcf6b739d34164687c0b0f9ed2cf
-EBUILD jpeg-9c.ebuild 1998 BLAKE2B ef1d626e18da1597331b4ebdf885008e28dc3d725e00aa9bba23877435a78a9a64bcf836cd53f4d4955fac205e2ef4ff788486d6edbefceb08926605a3b767d5 SHA512 00c596c65e6a1a9aaa0d4ec04cd63a7e7cf605f6ff895441ac3eb43e32104a487798a7170f2c1a94971cc68a97265765e37670a55ffbd85b5f5f713f56213b5f
+EBUILD jpeg-9c.ebuild 1996 BLAKE2B 551b1beaea68d26e51597259209c60cb2134cc4a2367ca30e8461b7b334362852771ccd190307ece3bf1c09c32ef8935391c69d21f27d5dc0480b453e215f4bd SHA512 1712e96882b6643520f2b40df62bcf03e8a01f89051b8890c7a2b320fae095ed7cd7e524326a52a602f2d699309a74b08626cc8d28c33b08819b8d6441916fc6
 MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
diff --git a/media-libs/jpeg/jpeg-9c.ebuild b/media-libs/jpeg/jpeg-9c.ebuild
index 4bad071b5db0..4620ec83b1bc 100644
--- a/media-libs/jpeg/jpeg-9c.ebuild
+++ b/media-libs/jpeg/jpeg-9c.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.ijg.org/files/${PN}src.v${PV}.tar.gz
 
 LICENSE="IJG"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 DEPEND=""
diff --git a/media-libs/lcms/Manifest b/media-libs/lcms/Manifest
index fba074a2989f..4861c714fef7 100644
--- a/media-libs/lcms/Manifest
+++ b/media-libs/lcms/Manifest
@@ -1,8 +1,4 @@
-AUX lcms-2.8-CVE-2016-10165.patch 772 BLAKE2B 3f0f47fd8a12ca0a8171090cf6ccec0be79e1c748b322aed81c31429040f1a148a6b672e1893d962ec2c81c2091c9f7ac1af8675082983ff78e994c54418dcbe SHA512 f7c53161564bad8fdf7cadff8b5ddec38f9acfd3f21a9569a9da43135529a4e6d504e4e9a2d8674ccf2e0fac33ecda09020ddc7c422e825047c17389c7abbc17
 AUX lcms-2.9-BE-test.patch 1367 BLAKE2B 5888ef7f7466c8a76c0b9ba1c87383e274fcfc0570ccc45f2a04c3409421415e7b466b93d9f3acb358ec16481c15cf2d466d0b5d9986f37f48d6fddf0e0be616 SHA512 17d4e612f4aeb6e62ac918aa5438e6ada16f456e4c740b4a13f4560956ff8ee7b6223360420c41de1d7284524460ebb1ba89784782671e258df19fc5a768f1e1
-DIST lcms2-2.8.tar.gz 6687005 BLAKE2B fb187eeb5ffbd5bc9c836fa75c26111605c582281edcdf27c91175248b8b71c69017b9bcd632b5a51360173777c87dff58cab51d209c0e8dda9f329f0d2e3eaf SHA512 a9478885b4892c79314a2ef9ab560e6655ac8f2d17abae0805e8b871138bb190e21f0e5c805398449f9dad528dc50baaf9e3cce8b8158eb8ff74179be5733f8f
 DIST lcms2-2.9.tar.gz 10953949 BLAKE2B 6f22a0a8901562e8a84a82c077f31b0155bf81d2b5023211059fa157061e78ebe170bd4744f6d15ab76c96ff9dae521a7560e9665a230337d149e1f0c9018788 SHA512 d91e320a97ef9d64cce31585b7df7c85accb52a0c46a10ed0f45a0ba46cc2ad6687de5151e59ac62170ea878ab48595c1493125f4afb1872824afe1c3f3c459b
-EBUILD lcms-2.8-r1.ebuild 1267 BLAKE2B 5c9a91d72bd60c968564d552552bf9df9b4b72720732debde418671cfe04d1ba233d90208171076322fdc150c4a3e4c468e759869adca1a024cf930aad74d859 SHA512 2300c3d9b5e6f9ce349893761896c572d7a179dab92af4f3082f695f2002f883518d64a12a57bd30e19fd4d216dc5dd1cb046b7fcba14b381b427e3e7bb2e0db
-EBUILD lcms-2.8-r2.ebuild 1255 BLAKE2B 6ff8f576ba64cb7beaeee3557817ecf1b472e52adeaa78d98063eaed8e65435fcd4973f3d4fd3ce0098b036f554f9dbd7b6038983f82f790a035d9cd7b3cd5a2 SHA512 f7b8fd8692bc72c1d3bf65a336c46ac820fb3750ab27c697f05b908e94494bc75f8bca27eb89c4f3bec20eb2845fecd627efba061d2d2027ba951cdbb704f074
 EBUILD lcms-2.9.ebuild 1235 BLAKE2B 133428eaf79d3afdf07bc8a002d306a5b0e5b0692e16192257678543af2ac11bcc394e3381e6f35ddc2848371b28587ce9db54c9e6e063f58deffdcdb1c1a56f SHA512 78642b5a48ea4f725711c2aed957c58c187ee4cad5fe52ebd527ba13832ae20eb852837f59c937a8900436306d4973fb84a64eaf98011742fc134d6d2481fab1
 MISC metadata.xml 333 BLAKE2B f6b3984af87fe88ac29f5728eb0b45a5e96e99e3647969adf3de68f8754dc85a23c6bc4eff61132c78f168db7e19694d94c087dc81f7bac6009d253a8bb0daa6 SHA512 d8fb0a9e8fb4073583431d2a9668c01fa87230e1f27672a66955c21c842701109d6ad75c50f9f88334849be3809339a4562a745549d79fdf7aad9c7cd1b0485e
diff --git a/media-libs/lcms/files/lcms-2.8-CVE-2016-10165.patch b/media-libs/lcms/files/lcms-2.8-CVE-2016-10165.patch
deleted file mode 100644
index b380cf40d5a7..000000000000
--- a/media-libs/lcms/files/lcms-2.8-CVE-2016-10165.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 5ca71a7bc18b6897ab21d815d15e218e204581e2 Mon Sep 17 00:00:00 2001
-From: Marti <marti.maria@tktbrainpower.com>
-Date: Mon, 15 Aug 2016 23:31:39 +0200
-Subject: [PATCH] Added an extra check to MLU bounds
-
-Thanks to Ibrahim el-sayed for spotting the bug
----
- src/cmstypes.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/cmstypes.c b/src/cmstypes.c
-index cb61860..c7328b9 100644
---- a/src/cmstypes.c
-+++ b/src/cmstypes.c
-@@ -1460,6 +1460,7 @@ void *Type_MLU_Read(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, cmsU
- 
-         // Check for overflow
-         if (Offset < (SizeOfHeader + 8)) goto Error;
-+        if ((Offset + Len) > SizeOfTag + 8) goto Error;
- 
-         // True begin of the string
-         BeginOfThisString = Offset - SizeOfHeader - 8;
diff --git a/media-libs/lcms/lcms-2.8-r1.ebuild b/media-libs/lcms/lcms-2.8-r1.ebuild
deleted file mode 100644
index df3cb1875562..000000000000
--- a/media-libs/lcms/lcms-2.8-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-AUTOTOOLS_PRUNE_LIBTOOL_FILES="modules"
-inherit eutils multilib-minimal
-
-DESCRIPTION="A lightweight, speed optimized color management engine"
-HOMEPAGE="http://www.littlecms.com/"
-SRC_URI="mirror://sourceforge/${PN}/lcms2-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc jpeg static-libs +threads test tiff zlib"
-
-RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
-	tiff? ( >=media-libs/tiff-4.0.3-r6:0=[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/lcms2-${PV}
-
-PATCHES=(
-	"${FILESDIR}/${P}-CVE-2016-10165.patch"
-)
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_with jpeg)
-		$(use_with tiff)
-		$(use_with zlib)
-		$(use_with threads)
-	)
-	ECONF_SOURCE="${S}" \
-	econf ${myeconfargs[@]}
-}
-
-multilib_src_install_all() {
-	find "${ED}" \( -name "*.la" -o -name "*.a" \) -delete || die
-
-	if use doc; then
-		docinto pdf
-		dodoc doc/*.pdf
-	fi
-}
diff --git a/media-libs/lcms/lcms-2.8-r2.ebuild b/media-libs/lcms/lcms-2.8-r2.ebuild
deleted file mode 100644
index e39e224c996c..000000000000
--- a/media-libs/lcms/lcms-2.8-r2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit libtool multilib-minimal
-
-DESCRIPTION="A lightweight, speed optimized color management engine"
-HOMEPAGE="http://www.littlecms.com/"
-SRC_URI="mirror://sourceforge/${PN}/lcms2-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc jpeg static-libs test +threads tiff"
-
-RDEPEND="
-	jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
-	tiff? ( >=media-libs/tiff-4.0.3-r6:0=[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/lcms2-${PV}"
-
-PATCHES=( "${FILESDIR}/${P}-CVE-2016-10165.patch" )
-
-src_prepare() {
-	default
-	elibtoolize  # for Prefix/Solaris
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_with jpeg)
-		$(use_enable static-libs static)
-		$(use_with threads)
-		$(use_with tiff)
-		--without-zlib
-	)
-	ECONF_SOURCE="${S}" \
-	econf ${myeconfargs[@]}
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name "*.la" -delete || die
-
-	if use doc; then
-		docinto pdf
-		dodoc doc/*.pdf
-	fi
-}
diff --git a/media-libs/libde265/Manifest b/media-libs/libde265/Manifest
index 6ee1616cf550..58dbf0690173 100644
--- a/media-libs/libde265/Manifest
+++ b/media-libs/libde265/Manifest
@@ -1,8 +1,6 @@
 AUX libde265-1.0.2-qtbindir.patch 1798 BLAKE2B 22e15a1d4dfe7f602c9b13611c17d4d6be396b1cb9d4d4690c43cb85cf6c21f64cde98e01b52551216612cf349f2fe74d59252b99a202cce7041d3c2b6a33dde SHA512 34b6efa56943e50d76c21e6911afff9c45e97d5608cfa5d3a53432bf2bf40f4fc6873d8c426b1a714542a6468670be2a710190191e5e1fe01c5e7dedf75f567c
 AUX libde265-1.0.3-use-new-FFMPEG-enum-names.patch 933 BLAKE2B 50f4f65a7c73365bd6f803c4fe85e029188a184dfe8dce5768e47af15cb489705129a5054aaf6bb12d8822de588c6ed10cf8384db7baeb2b4a6fee1a8a96494d SHA512 cf88bd2d40d9726dbe8bd8c3cddacccfef065635cf20751efd30dd30ac706d640be3b06a284a5bc11b457de63206d699405a6da8fb39cd0d5425371f5d538549
-DIST libde265-1.0.2.tar.gz 381737 BLAKE2B cea70a46193e4cb4a0beb1d0a86af17df13e70602c16c509b85acb918c0ddbdfa3e60bfa2b83922200fd9b1465c18edf20fe0939d7f78f3865a9d54b144de90b SHA512 714ce93f204bd034e3cccd9624d32ea6fcb31be25dbfd1a85f91814b33a01cc1515a3887a1ccabb9f0986686ecbcdd984b88e605190ff33d2bd75cc3b9f4bdd3
 DIST libde265-1.0.3.tar.gz 399996 BLAKE2B 988b21085f82d3b33b0480542677be96db5219c1b767aae3674f89862fdaf3355dcfea3fa99699798a4fcc6b72a63a3a6f61a3fd8d2ea8483231205cd6d87175 SHA512 0153632afcc9733950e8354997ccd93eddad90e8e0f7362bfe49b93b11cb1756cf803d0ba5c07042aee80e18227613af768ca82baf7891c687edf5e253a129c4
-EBUILD libde265-1.0.2.ebuild 1145 BLAKE2B 409cf24b55254fd24ea1412d4213c8e1273451b5edea43e5f76ed2ef3b9bffca7bc6962e2567c27b025a7b9daa0c1f76438205d6bb15b3191b0e4b4d64a9ce12 SHA512 0e272b944534f0f6cbd0c32849b90ba41122dbab3881927bb4b7f4e440a894acd8f85e6acef281b94834c4460b888ffff553b0bc340815fe07683912951e4cda
-EBUILD libde265-1.0.3.ebuild 1652 BLAKE2B 2c30663eb2530f6fb289142628587d4f5cb4aa2f7ba058bc29e8a90eec91a80dfdef4429e328ecda3e528546c20ba1929e220ebc9598c0f5dbabbdf8f7233483 SHA512 ff16256f7373448a88e983953836406e74bcafca4e791b504d3ef64d26fbc531be1768f35bf6b42e5d0617ba3b7d3149e9cef22ad0a5f90fe4a662994796abca
+EBUILD libde265-1.0.3.ebuild 1650 BLAKE2B 4e758d45444e1f7742b74182523299d0a58313327e39c3e042e8bf35983928f2fd151070398420692011d688444016eeb9ea8d5e877e91318d573c2461e07862 SHA512 bf6cff70ac0a626cb99ae10f84a849a67d7ac8d50e1e3fa1b9b9127a1fbc4574f5a478b6484669c3a4c42c1b4b46b22f6e8850ebc16318a80661f99d299168bb
 EBUILD libde265-9999.ebuild 1587 BLAKE2B bf6bdc557cdbf839934ab3424012b5cae2637d26992d2f87492fb5877dd8ae3884cf5d57d053d67e81d5cada2dc21d41df8c5541086298b36b51f711aca8e369 SHA512 d147237b24d3fabf9c172c5b2b4d2f29e9ae96244dcd0bb91d00074b1d20e0a87a3d4f1fff982170ae4015538f29af5e7cdc95d33a55cd654567982266189e75
 MISC metadata.xml 307 BLAKE2B 785344dd93b51d9103d01c68ba80c44821c36a1f61eeefb0dff56d708da5f6f1991ba142f44b6b652366e320410967deadcf537beaf256995a3a768fce7bee05 SHA512 27b883ff65471f49c87c1b21911172f82058a0492bec54290534fc5229f193a94675223a6b3064c84115eda4035fea6e6f5b5477f924adede2c2a72e55ece273
diff --git a/media-libs/libde265/libde265-1.0.2.ebuild b/media-libs/libde265/libde265-1.0.2.ebuild
deleted file mode 100644
index a4b6724cc51f..000000000000
--- a/media-libs/libde265/libde265-1.0.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-AUTOTOOLS_AUTORECONF=1
-inherit autotools-multilib
-
-DESCRIPTION="Open h.265 video codec implementation"
-HOMEPAGE="https://github.com/strukturag/libde265"
-SRC_URI="https://github.com/strukturag/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug qt5 static-libs cpu_flags_x86_sse"
-
-DEPEND="
-	media-libs/libsdl
-	virtual/ffmpeg
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-qtbindir.patch" )
-
-src_prepare() {
-	sed -ri 's/(PIX_FMT_)/AV_\1/g' sherlock265/VideoDecoder.cc || die
-	autotools-multilib_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable cpu_flags_x86_sse sse)
-		$(use_enable static-libs static)
-		$(use_enable debug log-info)
-		$(use_enable debug log-debug)
-		$(use_enable debug log-trace)
-		$(use_enable qt5 dec265)
-		$(use_enable qt5 sherlock265)
-		--disable-silent-rules
-		--enable-log-error
-	)
-	autotools-multilib_src_configure "${myeconfargs[@]}"
-}
diff --git a/media-libs/libde265/libde265-1.0.3.ebuild b/media-libs/libde265/libde265-1.0.3.ebuild
index 6af70da40898..987ec1c18c50 100644
--- a/media-libs/libde265/libde265-1.0.3.ebuild
+++ b/media-libs/libde265/libde265-1.0.3.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/strukturag/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Open h.265 video codec implementation"
diff --git a/media-libs/libexif/Manifest b/media-libs/libexif/Manifest
index e07e0029a5bb..b5284db34045 100644
--- a/media-libs/libexif/Manifest
+++ b/media-libs/libexif/Manifest
@@ -1,5 +1,7 @@
 AUX libexif-0.6.13-pkgconfig.patch 255 BLAKE2B 397c0e88f951628e697cdd749936b3e4e676bccac2fb2bff2553b12d5978f03719175b9d25fa66bc06dd459e0f6671af48276d449de9b029202dfe7a3622fc85 SHA512 859c6b5bf179f315184f5f34a986761f113786792ff2e13461cf64ccf394dd2d7bd97215db0651d52819533cb918652d7eae9f18b2a913dd9ccf390cdf3adb65
+AUX libexif-0.6.21-CVE-2017-7544.patch 1060 BLAKE2B 130b95e5f4f44402385bb6825e8728ad32b328dfe621957edcada1da351d8aa01f221c7de2bcc6242166a65a1edeef2e3babb1735909bc7d59594d379d5e325b SHA512 d529c6c5bd26dc21c0946702574184e1f61c2bfd4fb95b41e314f486a0dd55571963ff2cad566d2fb0804de3c0799bcd956c15a3dc10a520ce207728edad4e2d
 DIST libexif-0.6.21.tar.bz2 1368435 BLAKE2B 151e3ddcdd45759fd70be91db27511f48a9b7d5de72c8af510e5a231e2f053f8b5d62d1269a1206e419461b07fb723788492604f1f1142edcb5ab7a0876dd307 SHA512 4e0fe2abe85d1c95b41cb3abe1f6333dc3a9eb69dba106a674a78d74a4d5b9c5a19647118fa1cc2d72b98a29853394f1519eda9e2889eb28d3be26b21c7cfc35
 EBUILD libexif-0.6.21-r1.ebuild 1192 BLAKE2B d05e18b15894cc916eeb672b11636dd8f45cef93866a339115fff43b8193ee88d515c063aa31fbbbbda9e812b99509210a8964c31a057316ab5831c4379192f6 SHA512 25bfabdfceafc916f8a1cf162f875741f402a119d0ab4ff3008f805160e2ff5e5e556b4a229689a603546a528b5c7ea02f750fe972adacbb2d5af33c1e979b99
+EBUILD libexif-0.6.21-r2.ebuild 1277 BLAKE2B f4708d11cb02e00150d5acd6deb9cb819843e9d70e66052a895d7f958605e0b39e6d09e78142931743ac3c5946ff3dfcb411cd8f19e07d38b86c28767f0cb464 SHA512 05666b45bd226fecbc9fe3e962579f886ee95adf065c0c17b6ada36964ba3f6ce01f4fefd4b6c306b812d719f2920f43436d4b479deca86257a494af16d1663a
 EBUILD libexif-0.6.21.ebuild 1097 BLAKE2B 5d76f389fcca57a7ba7d1f650c6c268f0e65b3172dbd75a561611e590cd2cf4fda4648402ea6abf386be5d7f16bbd9928f80ecf1df2704094d8f2667c500c697 SHA512 99cf126b1d9b5076d5e835453264f1a9aa906254f84a331b452d5ad0cc62e74b7276370b12cf4f228abd275d0514a7d86ac204b2cbd60ca04f560effcdaca9d1
 MISC metadata.xml 336 BLAKE2B 7f77063db7c0cf51903da446071dff6d4dccf66e552dd1229f01b79ab7716d02adcb146f755971d0fe96c2a04bacbd082f606c4023e6e98f9c502a3f8eda7416 SHA512 8a6e3d7c973692a37f57ce34136c863e6ad14efd064c42ea0be6c14d93beec3c7ae36ed44afd6d2454ab29f4cb633c097a0c3b2ea5c019bf06df4f306dbfced0
diff --git a/media-libs/libexif/files/libexif-0.6.21-CVE-2017-7544.patch b/media-libs/libexif/files/libexif-0.6.21-CVE-2017-7544.patch
new file mode 100644
index 000000000000..534817417d84
--- /dev/null
+++ b/media-libs/libexif/files/libexif-0.6.21-CVE-2017-7544.patch
@@ -0,0 +1,30 @@
+From c39acd1692023b26290778a02a9232c873f9d71a Mon Sep 17 00:00:00 2001
+From: Marcus Meissner <marcus@jet.franken.de>
+Date: Tue, 25 Jul 2017 23:38:56 +0200
+Subject: [PATCH] On saving makernotes, make sure the makernote container tags
+ has a type with 1 byte components.
+
+Fixes (at least):
+	https://sourceforge.net/p/libexif/bugs/130
+	https://sourceforge.net/p/libexif/bugs/129
+---
+ libexif/exif-data.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/libexif/exif-data.c b/libexif/exif-data.c
+index 67df4db..91f4c33 100644
+--- a/libexif/exif-data.c
++++ b/libexif/exif-data.c
+@@ -255,6 +255,12 @@ exif_data_save_data_entry (ExifData *data, ExifEntry *e,
+ 			exif_mnote_data_set_offset (data->priv->md, *ds - 6);
+ 			exif_mnote_data_save (data->priv->md, &e->data, &e->size);
+ 			e->components = e->size;
++			if (exif_format_get_size (e->format) != 1) {
++				/* e->format is taken from input code,
++				 * but we need to make sure it is a 1 byte
++				 * entity due to the multiplication below. */
++				e->format = EXIF_FORMAT_UNDEFINED;
++			}
+ 		}
+ 	}
+ 
diff --git a/media-libs/libexif/libexif-0.6.21-r2.ebuild b/media-libs/libexif/libexif-0.6.21-r2.ebuild
new file mode 100644
index 000000000000..29570dbe4f9d
--- /dev/null
+++ b/media-libs/libexif/libexif-0.6.21-r2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit libtool multilib-minimal
+
+DESCRIPTION="Library for parsing, editing, and saving EXIF data"
+HOMEPAGE="https://libexif.github.io/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+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 ~x64-solaris ~x86-solaris"
+IUSE="doc nls static-libs"
+
+RDEPEND="nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	nls? ( sys-devel/gettext )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.6.13-pkgconfig.patch
+	"${FILESDIR}"/${P}-CVE-2017-7544.patch
+)
+
+src_prepare() {
+	default
+	sed -i -e '/FLAGS=/s:-g::' configure || die #390249
+	elibtoolize # For *-bsd
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} econf \
+		$(use_enable doc docs) \
+		$(use_enable nls) \
+		$(use_enable static-libs static) \
+		--with-doc-dir="${EPREFIX}"/usr/share/doc/${PF}
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+	find "${D}" -name '*.la' -delete || die
+	rm -f "${ED}"/usr/share/doc/${PF}/{ABOUT-NLS,COPYING} || die
+}
diff --git a/media-libs/libextractor/Manifest b/media-libs/libextractor/Manifest
index 91ce99b74563..7cec762e034f 100644
--- a/media-libs/libextractor/Manifest
+++ b/media-libs/libextractor/Manifest
@@ -1,4 +1,5 @@
 AUX libextractor-1.6-CVE-2017-17440.patch 3584 BLAKE2B a50d293c88c95c59d3399a2ca4fee6f6e935bee84d4f7c7a5a85e27f0f1e34edb0713f0e0010491015e0c792de5bbde64c2dc392a01ec3470ecec46ed8691a04 SHA512 defa28c0303028cdb8c2d08d15ff62a56a7548ed57d6b577bc61842e74b69b4da6d82ba48082e89341643db433b7f256423556ab482fd6a61936ecd18637796b
+AUX libextractor-1.6-ffmpeg-4.patch 873 BLAKE2B ebaec46a809c12252c7c6416a9376b86d6af353a74ae4779fb36af93465dee6654c3717a51df0a138ac70aa08ec3a790950e64602547e091eb2dfb3f209ebc7a SHA512 2931a1fe44f3a5d5d5307ef9ae33237e803a4afc6a47df3a465c1f502ed872391957cd81ac5154053cd4d2b6caf690335791b5ed0cede7227291450bb7dd4a9a
 DIST libextractor-1.6.tar.gz 8053454 BLAKE2B cf5e9d5fd1bc09e20495810e5a85280916632eb1c5e5c6c68aaf1cbccb8a5970465d3fd6b313e0cfc7e5c262a815996d7bec563c04b04faf7467ddbe987dfb4c SHA512 1e477450d89cc83030100fc9dc11734f39b1ccd1765f8cf4a4938f32253e2e19a48b5337328605451589865142b2d6bf6d7102198115985a1e0da22fca4bc2a8
-EBUILD libextractor-1.6.ebuild 2867 BLAKE2B 2c259b19317e034df96147d1f956f0d0d48b316b7c943b357c1153c711748f73a6ab83a6147e5a5c85a140ab5dcb57d35d0b26e8bc7211af2faf1cca241fece4 SHA512 251240960d8d6d886a90e866d699af211651645947edcb7d88d3023a932d2bc437003bac399d427ac931d0e0cb0bdce242a02b2ff7c07352f6e488757aa3e723
+EBUILD libextractor-1.6.ebuild 2903 BLAKE2B 8ede2d00e886629456ff76eff0d9dd0b4186d530eb833670ef4b29145f2428aad33505b1d341dddf1c2e28c64802593ed04fc85d76aa4e95e39bd8c34756f6c5 SHA512 be91cb7483cd04dcbee3b07d638da2b604b499389b355f2a6f43701e3c27b396d2f595ee0986c410e97f855bbbe47cb642a4b2f9a1fd0edbf39d4f07565e847e
 MISC metadata.xml 615 BLAKE2B eac56c7364e331eb2a0f0955318cfb0cf7c6fe4a95493899b489f755d18b4c4b1ced0e7f7ea0a7716c996ac7640d04a326cbd2230313e123c4b2de4fefbaccba SHA512 b4a4403dfccc02e61fa15f60a19ed23ce43374cc41d616ebbe385865618ae9392bd663fbdbdf01013f4203de2ee51dcbe1caf0974d720dac1be1f4ea029b4fc0
diff --git a/media-libs/libextractor/files/libextractor-1.6-ffmpeg-4.patch b/media-libs/libextractor/files/libextractor-1.6-ffmpeg-4.patch
new file mode 100644
index 000000000000..90360afd60a5
--- /dev/null
+++ b/media-libs/libextractor/files/libextractor-1.6-ffmpeg-4.patch
@@ -0,0 +1,20 @@
+--- a/src/plugins/thumbnailffmpeg_extractor.c     2018-05-09 23:14:02.721105141 +0200
++++ b/src/plugins/thumbnailffmpeg_extractor.c     2018-05-09 23:14:48.491629162 +0200
+@@ -107,7 +107,7 @@
+ /**
+  * Number of bytes to feed to libav in one go, with padding (padding is zeroed).
+  */
+-#define PADDED_BUFFER_SIZE (BUFFER_SIZE + FF_INPUT_BUFFER_PADDING_SIZE)
++#define PADDED_BUFFER_SIZE (BUFFER_SIZE + AV_INPUT_BUFFER_PADDING_SIZE)
+
+ /**
+  * Global handle to MAGIC data.
+@@ -355,7 +355,7 @@
+    encoder_codec_ctx->mb_lmin = encoder_codec_ctx->qmin * FF_QP2LAMBDA;
+    encoder_codec_ctx->mb_lmax = encoder_codec_ctx->qmax * FF_QP2LAMBDA;
+ #endif
+-   encoder_codec_ctx->flags          = CODEC_FLAG_QSCALE;
++   encoder_codec_ctx->flags          = AV_CODEC_FLAG_QSCALE;
+    encoder_codec_ctx->global_quality = encoder_codec_ctx->qmin * FF_QP2LAMBDA;
+
+    dst_frame->pts     = 1;
diff --git a/media-libs/libextractor/libextractor-1.6.ebuild b/media-libs/libextractor/libextractor-1.6.ebuild
index cf862f1f85c0..e870331de79e 100644
--- a/media-libs/libextractor/libextractor-1.6.ebuild
+++ b/media-libs/libextractor/libextractor-1.6.ebuild
@@ -57,7 +57,10 @@ RDEPEND="${COMMON_DEPEND}
 	!sci-biology/glimmer
 "
 
-PATCHES=( "${FILESDIR}/${P}-CVE-2017-17440.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-CVE-2017-17440.patch"
+	"${FILESDIR}/${P}-ffmpeg-4.patch"
+)
 
 src_prepare() {
 	default
diff --git a/media-libs/libgig/Manifest b/media-libs/libgig/Manifest
index c6cd01a13ed2..914c7cf9d63a 100644
--- a/media-libs/libgig/Manifest
+++ b/media-libs/libgig/Manifest
@@ -3,5 +3,5 @@ DIST libgig-4.0.0.tar.bz2 700905 BLAKE2B 909e4c88de0859be29ff52ed2dc366b05638825
 DIST libgig-4.1.0.tar.bz2 538345 BLAKE2B c05a1dfb5a7a3f358008cbde10dc081c9d8593a01bf4458585609cf5736eea3c8cdcedef85d3be6fc3208f27feb253174458f982b51e2e9c7f7b10a81da4c264 SHA512 e88500f5d60d597b383093f904a2356aba7505a3a22b4852fe3fbbe71723fddbfc81029a82edf3c18e46ade519343cdbe87c06c652f982ffd4cfb4c35d5a9a0a
 EBUILD libgig-3.3.0.ebuild 842 BLAKE2B 9350f27caeb6bff7d2d00e6068dbd135b562b07cdf5c1f9fa0a773e291b694a83a33475a535d799c075627ddcf6039d1d785d6121a5e9369631b356254aadb64 SHA512 0b75b80fa1d9f7fce2023ba070fb080a90f2904ca11c9578846adf66e7faaf617ffdcf7e11648a44255f2ffe6811800e517c52f4227d3aa0d8b3ee8783ae0c4e
 EBUILD libgig-4.0.0-r1.ebuild 886 BLAKE2B 0c34df713a7957acee0e4012f49d5ba5ca09d851e85300279500d1d014953e868c9d52e51961b6da4efac5fc395213a7db49dc3f37c781d37e7add85d3d3ce45 SHA512 9209535729cbf1cc17de3e536ea3f192e3d93619920ade383659c0bf8baef8951b607a00cbe874b37afee2023133532ec4cb0bce40f2713339bab828214018ab
-EBUILD libgig-4.1.0.ebuild 779 BLAKE2B 735c74fce2675f01c158ecb503ae6c6ac406fb62bf0c4cb1c584f5ceb12ee51857f8ff56bd9be54c0b9faa6641153e8017f57736924bc95b8f1187bc67cfd561 SHA512 eb2ef46705734945d728b588b02f803ca5742de48aeb0d7ca19fd43092d9174bf9b9703c3a5976a64dd5d222d61715d57a2eeac2fab361f25498a3c50b8742ec
+EBUILD libgig-4.1.0.ebuild 777 BLAKE2B 547355e946c1a24e97a6966f04fe1f69bed899ed0b52b187a6212e9700a9c82e6bca5bf14d33c64fd0279fb1c36e8fda7eb0ecb4bffd7b4190e5762704c381d4 SHA512 096d8e9f82f989d5dc8e892c7579328a288809636c171059f635953d237c36fbfc47559791c0d92537e8848a5181a582c954d85c90e789f9ffba29a905b5765b
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libgig/libgig-4.1.0.ebuild b/media-libs/libgig/libgig-4.1.0.ebuild
index 6072ead17393..247fece00552 100644
--- a/media-libs/libgig/libgig-4.1.0.ebuild
+++ b/media-libs/libgig/libgig-4.1.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://download.linuxsampler.org/packages/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/media-libs/libgroove/Manifest b/media-libs/libgroove/Manifest
index 6679c43a6606..037fc1536a49 100644
--- a/media-libs/libgroove/Manifest
+++ b/media-libs/libgroove/Manifest
@@ -1,6 +1,7 @@
 AUX libgroove-4.3.0_GNUInstallDirs.patch 4199 BLAKE2B bd9e58dad55660c24fd272af50b41bed8b427d3b6901e882dc2348e1b507b60369c8122e424d3e7ba982833807fc403fbf8ee9321016bd43b170a332306b0233 SHA512 e7e2458cfc10f41afe163fda4f54fd1c9a3305c0cbe351b2954c64b066eb8fe529e83a4c333c4eb54ebc24edb39fcda4127c7f60011cbcfa2926f55f29725dea
 AUX libgroove-4.3.0_cflags.patch 1872 BLAKE2B 87a696b844394659d29bf586231519064e5b79c772c93f8a7eeeeb91d9c892586434811ee9b675ec60970569a0318c9b4811b82b4d62b75dfd4753a5e2f9d98c SHA512 d0ab678d4bf0bac17493fbf7de51273bc918ef141a9951f6bae94362e8e142131e6098b68a2955b22e73b4c159940cd94630d5a6e6b6ae82e84bb18648770cc1
+AUX libgroove-4.3.0_ffmpeg4.patch 2037 BLAKE2B 851cf22e93e2e5700b30c023d24b00db0852b36dd30665d655cdb3402c9d0ee1e286bc1a19988f992d8913560f6f943890cb7c993e2fdb798b23df4a1b0801da SHA512 834f760a7c7b51abda55f65d6fad1ce771d293ace9c7e4e39aaf5bfbc6763f9e3750e0aa3e8e6548893593b5c776bce357d557080b946b3425339367f21f2790
 AUX libgroove-4.3.0_sdl2_include_dir.patch 507 BLAKE2B d96df15e5378f8ab7d2f473c0fe05a210959eeb0ec4548bf7b03b3be701cce263d3c5d91c85834b18b2426e1c3de7845abc5eb069e226429a4d7ae67809f156c SHA512 5c9954680369c9e90a5acda70da36a57ea64ce8f44fcb5a0f962636cbf710ddd968c7c7bff18819671b6b89dc68a0b9513b8223ac7ba9bedf8f005b4485272ac
 DIST libgroove-4.3.0.tar.gz 48857 BLAKE2B 40659e84a00245791746c570ba667cb97ba61de2bf9c1e746aaacb02db4ef5d15a00561aed7001f9a9a7b20ad8645f74c12a836b8bd59ebbc1abbda045d558d0 SHA512 30d75a3b1b3efa9b33687bb146648b66f8f4c718551c0db2c24c0259f09cf355a7c7bbac40d60d7a97bbbd7f83401d09464c6ac2b18cdfcd6198220cefc8a705
-EBUILD libgroove-4.3.0-r1.ebuild 1143 BLAKE2B 9e67a84f260ecefc8fdceb4091096a5c31331546c3a1f144de7b6bec87f511a8f45bd4e401830d7045f02012b7e4e080a3a572f16a2bcbf4442a269851919936 SHA512 5e233c525b3edc2d3eddfce680117a669d3a5352c4d633503a70c91012f8eaa15b4df6c0ce91e4d248a3d3b8ba99e246d5c87f3d8031fd1a8c7a0ffb3ebea349
-MISC metadata.xml 1135 BLAKE2B 9dd3c2b193626f4962c2e42016971ce4957c8a870fa0a1452fb153d8de5ff4fe5c1cc131a6f277cbcf78cd89367a7ffb9ee41a1f47d689b8c8e3ce39b619cf98 SHA512 bcc655913cb4929aa53f82a1296e86f43138407cee6a17af58e9c7869d498fa94029c7402f981d0b3301bf935f6940fd515a443f4ef5e97bc5f0ef15e8ad4a78
+EBUILD libgroove-4.3.0-r1.ebuild 1177 BLAKE2B 65a597cf4f2564f0fb9fb3800d90e82e6fd789e683e95a63fdc0de13b50dad1a7d71b6cdabfc3b79253bb962d4d07435d051b44e04a83675db355201d48dde12 SHA512 b254cab5750412e33291c7c129f8215533bdfc8a44c575d33302d66dd5c8bda55f4bcb5fac83f75e87db99dba3ca3d5cec5cc5cfb8a44dd44a350bc9c3e24618
+MISC metadata.xml 1202 BLAKE2B 4949a299d75c9e9d7bd40df94fbe3fd16c608d0110ddad43fb5717751bb0ed174c7be81b1913ad2313b7b7a8627a3c079bc125e5d50a8a0544ea961e7c89b0cf SHA512 1173c515ba13bec73cd60fc78b5b9936d47563c89cf2968ef49eefca4efa8c75badbc1cdb26cf8cea8c7737e7972f9d236009b829ce5fa9f07875bb7db003ed3
diff --git a/media-libs/libgroove/files/libgroove-4.3.0_ffmpeg4.patch b/media-libs/libgroove/files/libgroove-4.3.0_ffmpeg4.patch
new file mode 100644
index 000000000000..eadc4d98a913
--- /dev/null
+++ b/media-libs/libgroove/files/libgroove-4.3.0_ffmpeg4.patch
@@ -0,0 +1,47 @@
+Description: Fix FTBFS with FFmpeg 4.0
+Author: James Cowgill <jcowgill@debian.org>
+Bug-Debian: https://bugs.debian.org/888376
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/groove/encoder.c
++++ b/groove/encoder.c
+@@ -616,7 +616,7 @@ int groove_encoder_attach(struct GrooveE
+ 
+     e->sink->audio_format = encoder->actual_audio_format;
+     e->sink->buffer_size = encoder->sink_buffer_size;
+-    e->sink->buffer_sample_count = (codec->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE) ?
++    e->sink->buffer_sample_count = (codec->capabilities & AV_CODEC_CAP_VARIABLE_FRAME_SIZE) ?
+         0 : e->stream->codec->frame_size;
+     e->sink->gain = encoder->gain;
+ 
+--- a/groove/playlist.c
++++ b/groove/playlist.c
+@@ -186,7 +186,7 @@ static int audio_decode_frame(struct Gro
+ 
+         if (!got_frame) {
+             // stop sending empty packets if the decoder is finished
+-            if (!pkt_temp->data && dec->codec->capabilities & CODEC_CAP_DELAY)
++            if (!pkt_temp->data && dec->codec->capabilities & AV_CODEC_CAP_DELAY)
+                 return 0;
+             continue;
+         }
+@@ -571,7 +571,7 @@ static int decode_one_frame(struct Groov
+     pthread_mutex_unlock(&f->seek_mutex);
+ 
+     if (f->eof) {
+-        if (f->audio_st->codec->codec->capabilities & CODEC_CAP_DELAY) {
++        if (f->audio_st->codec->codec->capabilities & AV_CODEC_CAP_DELAY) {
+             av_init_packet(pkt);
+             pkt->data = NULL;
+             pkt->size = 0;
+--- a/groove/file.c
++++ b/groove/file.c
+@@ -281,7 +281,7 @@ int groove_file_save(struct GrooveFile *
+         ocodec->rc_buffer_size = icodec->rc_buffer_size;
+         ocodec->field_order    = icodec->field_order;
+ 
+-        uint64_t extra_size = (uint64_t)icodec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE;
++        uint64_t extra_size = (uint64_t)icodec->extradata_size + AV_INPUT_BUFFER_PADDING_SIZE;
+         if (extra_size > INT_MAX) {
+             cleanup_save(file);
+             av_log(NULL, AV_LOG_ERROR, "codec extra size too big\n");
diff --git a/media-libs/libgroove/libgroove-4.3.0-r1.ebuild b/media-libs/libgroove/libgroove-4.3.0-r1.ebuild
index 2cfafff6daef..9aac876f1dea 100644
--- a/media-libs/libgroove/libgroove-4.3.0-r1.ebuild
+++ b/media-libs/libgroove/libgroove-4.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -23,6 +23,7 @@ RDEPEND="${DEPEND}"
 
 PATCHES=( "${FILESDIR}/${P}_cflags.patch"
 	"${FILESDIR}/${P}_sdl2_include_dir.patch"
+	"${FILESDIR}/${P}_ffmpeg4.patch"
 	"${FILESDIR}/${P}_GNUInstallDirs.patch" )
 
 src_configure() {
diff --git a/media-libs/libgroove/metadata.xml b/media-libs/libgroove/metadata.xml
index 2d8c712dd3d1..b3286a1df8d5 100644
--- a/media-libs/libgroove/metadata.xml
+++ b/media-libs/libgroove/metadata.xml
@@ -18,10 +18,11 @@
 	<flag name="sound">Enable audio playing.</flag>
 </use>
 <upstream>
-	<maintainer status="active">
+	<maintainer status="inactive">
 		<email>superjoe30@gmail.com</email>
 		<name>Andrew Kelley</name>
 	</maintainer>
 	<remote-id type="github">andrewrk/libgroove</remote-id>
+	<bugs-to>https://github.com/andrewrk/libgroove/issues</bugs-to>
 </upstream>
 </pkgmetadata>
diff --git a/media-libs/libmpdclient/Manifest b/media-libs/libmpdclient/Manifest
index 30b49fa842ea..20574cf16264 100644
--- a/media-libs/libmpdclient/Manifest
+++ b/media-libs/libmpdclient/Manifest
@@ -1,11 +1,7 @@
-DIST libmpdclient-2.10.tar.xz 261792 BLAKE2B e8200d1a8db0370417924a92a83cd7c51d788d5c054decea8bd3b968d577f80cb63682017c3b52a6523bd4bcbf3c0d72c50ab6b48910d6456326237f3fe05e57 SHA512 f54fc3501643ece4eee2f63ddbf5f3d676f3843be0859f482d70cc142b6d9dfbdebd511ccc52a9c058a644e3b80c93a680e1de19f6f3ebfc46cb197f0ddddb5b
-DIST libmpdclient-2.11.tar.xz 274836 BLAKE2B 2a3cf2a5dddb6586edc9bf28752b8575dab51e37aa13aee138ef239ca741bba844c1ec6fdf09727f25be073b3909250bb22a34602a0bf8b0d61ab4bcf09a8566 SHA512 0503db31262acfb871578278d6526e12ee2ffbbe414425ab5ebac61f27da8ad4503d948b4d192421d301bd0a29b9b460f195e82a44608f984697a8aa47b2eb9b
 DIST libmpdclient-2.13.tar.xz 56964 BLAKE2B fdd393543ac3c15572a6f6d56ec0113dae301c90e852620ef4e17ac6bee1a26eb20580859ea59cb78d6ff7b5b9fc9e5374d407e017c35bf767a824fc7a6612df SHA512 a2aa4e1e4fcb4ab390a0a38e745e59a9764c40bfcd07d449fdc7fef7b0c5fc0c2e795ef545b6fa6d62c00861d306cab41ea43011510ad1e3a60603873a3c1b28
 DIST libmpdclient-2.14.tar.xz 58268 BLAKE2B 0152b34cc29e5c3c96136f00ea5ff3dc1d60f64ab6e8aab2b6ada0fa2d90742b32025be85e12703057a00014d72c035177de03345f9c16e151242a26eee9e314 SHA512 50bf27a739ca784d5f182cc90b24fad4dbc35752e455c1ce7c2fcda78342bac5480927af199c7f790feff136dc1fe16e4eb19803ba5760ec508ba65c9737e13a
 DIST libmpdclient-2.15.tar.xz 59212 BLAKE2B 35ca605681c98d1aa97fb9ef11b8a29244cab7ccb3d5743b5f7e49e4dc3ef28b8c14534ee793af4a76ea5dcb01487804d9f08d6ecaf6d7b80c5b37bf157408db SHA512 244b89f4976b62b41c95263479771162d9c059808aa143efc9fa0a092e110b9be98ce1ab2bb1ae100b15019df826b9a8e510e3819e3fd89f6d664deea3c6260a
-EBUILD libmpdclient-2.10.ebuild 831 BLAKE2B 3a08a426b6b1cf3e4649c9a7543378b32a8029422dffecfac1168d34e8a0e9262834ab0c18a2cd995f8baf63bb0dca35b4e30b701f1f1f5fb2be842b8d7bc870 SHA512 208fd408b71f171af2fd554098d237333cc12ba47708514435631f31e6176e9b672246aa75743ef06f80f74f6a68ef0236177fe198823738ddc3340a7d0b1b58
-EBUILD libmpdclient-2.11.ebuild 889 BLAKE2B ea93620dc8072273ec10a1e77c8f51cabea704e64718f0171d79e2b5453b3bb62637f9ad923f836cd878bc39695024d9b371c51112d64c2241223a1a41aa4e60 SHA512 30403bc13316be22370a183aceb28bc88ffe4187e797016b32958b6b445712a0507c2dd115b23fa1dab911f2984b52ef59406657b69bf84127dbcf95d401a443
-EBUILD libmpdclient-2.13.ebuild 1042 BLAKE2B 50e63e5d8bc338ff9879bf94557d89c3ced1330b77dce41ab91899a36a8a3624ba157692b8fb30dabb812f55b858428a61b442ccc2c751f753693d326f11ae82 SHA512 6cc67de1c8898bbf6d15442fa854c62dd2ab342f5aaf77f90ea7eb4053a268abf0c9e3a89846b1ba9b5871b174c36cf77035e2ffdb7a7c6b9acd6c5b0eed8bc3
-EBUILD libmpdclient-2.14.ebuild 1047 BLAKE2B 6c2b6b0a464ddc27e8362f7e9d3950de004e3f9c1d4c085a4d33582c495da2af7d9e157fad63bb897bd54991ead831c8fb3316cfd344d30cca866b7b88ba1ea4 SHA512 62d307c471460a79bf79564461debf8685504f4a02574ac373fb4db8a15f41711bc63c8211e305233770a8bcde32ec2b198460afb14d2e65617000b9f7554100
-EBUILD libmpdclient-2.15.ebuild 1047 BLAKE2B 6c2b6b0a464ddc27e8362f7e9d3950de004e3f9c1d4c085a4d33582c495da2af7d9e157fad63bb897bd54991ead831c8fb3316cfd344d30cca866b7b88ba1ea4 SHA512 62d307c471460a79bf79564461debf8685504f4a02574ac373fb4db8a15f41711bc63c8211e305233770a8bcde32ec2b198460afb14d2e65617000b9f7554100
+EBUILD libmpdclient-2.13.ebuild 1048 BLAKE2B 6339e52139ffea93ff33196139693a87dfa7ed2346dcf8e46be6eb161e77f9da1668f37a748acb0b8ff1004a22d28f917a0ba9f8276b0b1357ff95192b0f0132 SHA512 f72f00afc0e4adf5ce732c58f0da02d13e06b44433746d9b4882e269929ee8bc95484abb12fe0062f625c58931a8d365fbef4c61c7c5e6335798a1efaf703edb
+EBUILD libmpdclient-2.14.ebuild 1054 BLAKE2B afde1ee289bd6bcb7d8ecfee925d2fe1731305d9d6503645aa855c409e0580c3ef69eff7f026a02fe82e2b89389e50a03d17912538e2df01cf966987ebc11736 SHA512 f621f7c78b0127cca2afb53f94fd6a820aadf20f3ac357bd190cc3cda74bd24d647bf710b1ec1afe5f9c49b9cd113cae4efe914ea3d4c80c9d21999c7bb9b4c8
+EBUILD libmpdclient-2.15.ebuild 1054 BLAKE2B afde1ee289bd6bcb7d8ecfee925d2fe1731305d9d6503645aa855c409e0580c3ef69eff7f026a02fe82e2b89389e50a03d17912538e2df01cf966987ebc11736 SHA512 f621f7c78b0127cca2afb53f94fd6a820aadf20f3ac357bd190cc3cda74bd24d647bf710b1ec1afe5f9c49b9cd113cae4efe914ea3d4c80c9d21999c7bb9b4c8
 MISC metadata.xml 348 BLAKE2B 6c3a4f4924ca11d41c0c7fdcf062dbfd43f23f1181a83d4154a4a36a015999786962adb716f751e046127d37d2b88649b2ea9968330a85ae8f9307a96c7d9f96 SHA512 75efcb39f67cb2dfe31846b08e9daa02845a07006fe2002f43feabee680dcc57bd41a0fed3bbfe9e184892a5adad64efd3ed83931a91b924739355ec689f5b00
diff --git a/media-libs/libmpdclient/libmpdclient-2.10.ebuild b/media-libs/libmpdclient/libmpdclient-2.10.ebuild
deleted file mode 100644
index 24f71b810962..000000000000
--- a/media-libs/libmpdclient/libmpdclient-2.10.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A library for interfacing Music Player Daemon (media-sound/mpd)"
-HOMEPAGE="https://www.musicpd.org"
-SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ppc ppc64 sparc x86"
-IUSE="doc examples static-libs"
-
-RDEPEND=""
-DEPEND="doc? ( app-doc/doxygen )"
-
-src_prepare() {
-	default
-	sed -e "s:@top_srcdir@:.:" -i doc/doxygen.conf.in
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable doc documentation)
-}
-
-src_install() {
-	default
-	use examples && dodoc src/example.c
-	use doc || rm -rf "${ED}"/usr/share/doc/${PF}/html
-	find "${ED}" -name "*.la" -exec rm -rf {} + || die "failed to delete .la files"
-}
diff --git a/media-libs/libmpdclient/libmpdclient-2.11.ebuild b/media-libs/libmpdclient/libmpdclient-2.11.ebuild
deleted file mode 100644
index da7c5d42255c..000000000000
--- a/media-libs/libmpdclient/libmpdclient-2.11.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A library for interfacing Music Player Daemon (media-sound/mpd)"
-HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/libmpdclient"
-SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc examples static-libs"
-
-RDEPEND=""
-DEPEND="doc? ( app-doc/doxygen )"
-
-src_prepare() {
-	default
-	sed -e "s:@top_srcdir@:.:" -i doc/doxygen.conf.in
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable doc documentation)
-}
-
-src_install() {
-	default
-	use examples && dodoc src/example.c
-	use doc || rm -rf "${ED}"/usr/share/doc/${PF}/html
-	find "${ED}" -name "*.la" -exec rm -rf {} + || die "failed to delete .la files"
-}
diff --git a/media-libs/libmpdclient/libmpdclient-2.13.ebuild b/media-libs/libmpdclient/libmpdclient-2.13.ebuild
index a30b603a924d..64b9bcad80e6 100644
--- a/media-libs/libmpdclient/libmpdclient-2.13.ebuild
+++ b/media-libs/libmpdclient/libmpdclient-2.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ppc ppc64 x86"
+KEYWORDS="alpha amd64 arm ppc ppc64 ~sparc x86"
 IUSE="doc examples test"
 
 RDEPEND=""
diff --git a/media-libs/libmpdclient/libmpdclient-2.14.ebuild b/media-libs/libmpdclient/libmpdclient-2.14.ebuild
index 70d69fc459da..14dad2fc2ab4 100644
--- a/media-libs/libmpdclient/libmpdclient-2.14.ebuild
+++ b/media-libs/libmpdclient/libmpdclient-2.14.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc examples test"
 
 RDEPEND=""
diff --git a/media-libs/libmpdclient/libmpdclient-2.15.ebuild b/media-libs/libmpdclient/libmpdclient-2.15.ebuild
index 70d69fc459da..14dad2fc2ab4 100644
--- a/media-libs/libmpdclient/libmpdclient-2.15.ebuild
+++ b/media-libs/libmpdclient/libmpdclient-2.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc examples test"
 
 RDEPEND=""
diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest
index 5450cb1fc530..4dc6be307e96 100644
--- a/media-libs/libpng/Manifest
+++ b/media-libs/libpng/Manifest
@@ -13,5 +13,5 @@ EBUILD libpng-1.2.59.ebuild 878 BLAKE2B bcb170292ebf723944a3ebdcdabd0978d548778d
 EBUILD libpng-1.5.28.ebuild 1640 BLAKE2B d0af71276affd9ca437a019bd0a545f09bb7e9eed44db91ac8bea73171db75d3a5670a2b9dc12b4ef137e86bdb7eb97fe88cdf11f4914c218d20c25cb6274507 SHA512 4f57dc6dec6114934d60f09aa869f358e85df7bb1f8643e05f02846955f3c26c3f9518e46e6e0a9ae4da538dcc70960d687b0467953619f62f53fdc8cff68a94
 EBUILD libpng-1.5.30.ebuild 1649 BLAKE2B fe9dc31be254ff89e5f0cc9d002f61655cf5c3594b1a380140b4c84eeab55a15e5cc547165fbb53f531ed34553427c6bfa85e0311000a6203378e8c491315259 SHA512 42b7679c08624bdac87618ced85e862f4351cea55347908b3cb590f6f664bbb4dac8552dd42195049cc181a1e5314dcda7e33319ef235440ad84474b06859b3a
 EBUILD libpng-1.6.34.ebuild 1360 BLAKE2B 11d1403fff7fd1bba30a01824ec30a7753bcfefa033a06836d4002acd282af289b5ffe33e2b38e82f866043080671c965c605e46cc3ed059d3af9adbaf468a3a SHA512 666bb4b039a0c61289d9d2b37de6cfeabda2d44254b0a9a9d3c9a432abedf47371cf543ef9e5781dad8979b5fc77d83a26d36aa6ce15657230230e2307364256
-EBUILD libpng-1.6.35.ebuild 1399 BLAKE2B 895b2caf7ee980dcdd022d9d3f5cd16fe4b699c7c89a1e0e3ab7e01bdae10b712c79633f51fa59a2a6f2bde55ac10d34d618bbed2cc205bd128caee027661fe0 SHA512 67411f633cfc9883d1d9d3d7efddacba679cf370728290ffd563f7f7ff3c73c625c71ef9200c41b34215fb990218f60c87ad31fedb6abca07b65cdfd36f84881
+EBUILD libpng-1.6.35-r1.ebuild 1378 BLAKE2B 946496926a8643fd012aaa471b807cd9720b179b9454591cb402d2ef8a608732d2f477bf9537e1b7add740341319a1fc6003e9d3fb094204cb36f9c7b5bfe218 SHA512 f3aba236a38fd81c4f65bac2a0c44e1c52b21a787bd800d22db68ea44d27cffa68dd8e5b8327d77da520e73e5ea1ed661449c4fa0e31c4862bb53afea321b555
 MISC metadata.xml 843 BLAKE2B e8736137db2c0e06193b3bbc9d933b1b8e2b8609d050a93a5369a8de81acf02af1d7ff6eb3c1e1967d7dbd6fec38373e389011d290cda1577203075f2f679167 SHA512 43cd4bd8981c828f2de943bb5ee90958f6a4f555d824be1325a7663219b0386ebaeb99406697affa8086b5b50f3d185e01ed12ace030557aa66a8e7b9af006b3
diff --git a/media-libs/libpng/libpng-1.6.35.ebuild b/media-libs/libpng/libpng-1.6.35-r1.ebuild
index 7c2ae48621c8..1d52884457a2 100644
--- a/media-libs/libpng/libpng-1.6.35.ebuild
+++ b/media-libs/libpng/libpng-1.6.35-r1.ebuild
@@ -41,5 +41,5 @@ multilib_src_configure() {
 multilib_src_install_all() {
 	DOCS=( ANNOUNCE CHANGES libpng-manual.txt README TODO )
 	einstalldocs
-	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/media-libs/libquicktime/Manifest b/media-libs/libquicktime/Manifest
index 416ce7efdd95..846c53cfffff 100644
--- a/media-libs/libquicktime/Manifest
+++ b/media-libs/libquicktime/Manifest
@@ -1,8 +1,10 @@
-AUX CVE-2016-2399.patch 801 BLAKE2B 2794d13a0afa8a948f8f1335d7ee0a3d75691bbb9c619716707f533f52e8a8826c4a883b25db2ad8fb6544ce8b7c0fa883158b110c10b896e124b6ade9d18945 SHA512 759fee13bc96db036063efcd8288c0e467ce811b597cf6c0ceed1c8927593963174f4f3324512db0e773e936a4b9fe5c8d8fc9e0f00b2ce59110661175986f9c
 AUX libquicktime-1.2.4+libav-9.patch 464 BLAKE2B 0a29c9a3d1eae31731b76536a22aa23a4888b8ac55c3176c60a152330fce37e8031a4269fa28026133c7061cd769b1428bf24fe59fed574e39d52ea00b6e00a0 SHA512 691110dc18f6646e2e17f40c6a42911a6b8eaa8cea20b5595f20d218d51da11d11923a3001b7ad7c3ad6bd0d90e712b95ccee5526fa1bec176cd27813e4a775e
+AUX libquicktime-1.2.4-CVE-2016-2399.patch 801 BLAKE2B 2794d13a0afa8a948f8f1335d7ee0a3d75691bbb9c619716707f533f52e8a8826c4a883b25db2ad8fb6544ce8b7c0fa883158b110c10b896e124b6ade9d18945 SHA512 759fee13bc96db036063efcd8288c0e467ce811b597cf6c0ceed1c8927593963174f4f3324512db0e773e936a4b9fe5c8d8fc9e0f00b2ce59110661175986f9c
+AUX libquicktime-1.2.4-CVE-2017-9122_et_al.patch 4584 BLAKE2B 8d5be1d1a297d89da1256035042a9760227815b8e73cb994b04b3ac4a2d7b83f79625bb62dc89266ac2f3eebd4cb033c8eb66388aca6097f4dbcc86d919dbd72 SHA512 93639d3fe12eefddd1b457be702ec0a4a64a73c44fce6b3134e50bb9a4e7e5f25d256d3ace6ec5e774f2db4c0d68725f3e35e901f7d932a4be9cba566eab528e
 AUX libquicktime-1.2.4-ffmpeg2.patch 4046 BLAKE2B 1db6a761fa94a32741a05919d12d0211964647a61ffd32ba8619530ec089c980999aa1ded534c2652eb3baf15558bcb9842a23634eeef043a6ed3eb3f8e794ff SHA512 32ddf394aad4ed80e89ec72a534e0466268ab0061b991815e905b78eae55a7d935117b0915faf6f7f51bd7e2d9fbaa4b0e07bfcef1ef1e2f4a7e2061c489122d
 AUX libquicktime-1.2.4-ffmpeg29.patch 13436 BLAKE2B 8a1e7b5df65f5297f59aa17c4a52706413c1ffd88d8645de7359ec26f7059101ab81ac135cf7ef707a8acbeb709e1a6dae03d6a7e7f70c7e88185ebb271acbe4 SHA512 2a7e06c03b0f64f02b923c1a0e7121f4e1ea735f19a6df8ce8daf18177ead132d1ae921c64f3770042db3bbf29f15a7fcceece835d475e052c4c3bb7139c9e2e
 AUX libquicktime-1.2.4-ffmpeg4.patch 14723 BLAKE2B bd1299c24b738b3752e4d8d50ed1b2fa2f208c83e577876118d115fca22293e102614ae0cdc168060115f7145d951d290bccf21154fda4aabf55329d310b6aca SHA512 1b11a82d694654976a5f79cd8feb27eec3810e09a66dc58ca576eaf1f96e4948abd4dae7955a7da6cf99ae6ffef9e183b39090d96cc6b5fe216b4c4f4faff7a8
 DIST libquicktime-1.2.4.tar.gz 1028626 BLAKE2B 6c50965be5d19fb4c57ea6b36f2581ebd575d78a34f2df7029ce2c6ee560e8135a953a2e85d91d189e2c01b97c99804d0eab602866b88a5f07c36351174680f0 SHA512 6ab6cd62ae2361bb3ad73725e9e8baa2b03361bc23e9e34b24f90c0e2bec4337de950ed7f30a6a1d2e67ab33e8f0c43538369fd07e417f54b84583a3c331f8dd
-EBUILD libquicktime-1.2.4-r2.ebuild 3874 BLAKE2B a7f0b14e55deabcafe1ac0baa3648b6152b6f87e41adce1668f5170db9acee8507a91c53533304618f0bcf6abdd77d7eac7f487497fddbebcfbf6ce0ba983865 SHA512 a84ad63d5ccda95bb00833fbbbaff818693bd13c9a6036960f76ca4f4850737625a611d6c716bd649ec14c9e86a1dfa73553449a0b071b8cf0da8c9a33ea7ff5
+EBUILD libquicktime-1.2.4-r2.ebuild 3879 BLAKE2B b464fdd272c974633dec17eadd38dc0f295ba81a63f8233d55767b63e31e0bba7670f27a8e04f47ecb8f367702249621834eac6f4a7346b41fa188fd67908d86 SHA512 4c5c9bb52ad4826871f7acb45fb00c90e603465084dd375b85b07a412dd59c43b9aab791350d14579d1dd29476389fa49d4a98fb4a517a595aa396add5e0e529
+EBUILD libquicktime-1.2.4-r3.ebuild 3850 BLAKE2B 4acfafe0d7402076f9ff17f4c34ca5f2071224630d8421d61b12ab7cbb8876ceef48828d34a3d1bba7388578512cf20d65dd36daa6b938a07cbcc9412ebb4220 SHA512 023ce8db66f0ef222529fcace2e48e7efdcc0835200e7e3868bc7fc2786744a63e3fe69a89f76e14432426839332c1c2f0dfae70b518ef8aa20574d98252d172
 MISC metadata.xml 506 BLAKE2B 2b6f16d304beace7cb71ac32cc734ec4bf0e28c2b155068f9c5f83fc9a5a8731056ec1b3743da9f2b6add73f4b82d4fb797dad913451ea255ab5752557f7b2eb SHA512 80ee7f91a4fafe6a9f9380bab5236633672484dea9389ab5b391319fbcbe010607903b21c12c37211575f4e55251f1718c2000225226fd0a63183ac903817ce1
diff --git a/media-libs/libquicktime/files/CVE-2016-2399.patch b/media-libs/libquicktime/files/libquicktime-1.2.4-CVE-2016-2399.patch
index a1737c0dc0a9..a1737c0dc0a9 100644
--- a/media-libs/libquicktime/files/CVE-2016-2399.patch
+++ b/media-libs/libquicktime/files/libquicktime-1.2.4-CVE-2016-2399.patch
diff --git a/media-libs/libquicktime/files/libquicktime-1.2.4-CVE-2017-9122_et_al.patch b/media-libs/libquicktime/files/libquicktime-1.2.4-CVE-2017-9122_et_al.patch
new file mode 100644
index 000000000000..06fb7b33758b
--- /dev/null
+++ b/media-libs/libquicktime/files/libquicktime-1.2.4-CVE-2017-9122_et_al.patch
@@ -0,0 +1,151 @@
+From: Burkhard Plaum <plaum@ipf.uni-stuttgart.de>
+Origin: https://sourceforge.net/p/libquicktime/mailman/libquicktime-devel/?viewmonth=201706
+
+Hi,
+
+I committed some (mostly trivial) updates to CVS. The following CVE's
+are fixed and/or no longer reproducible:
+
+CVE-2017-9122
+CVE-2017-9123
+CVE-2017-9124
+CVE-2017-9125
+CVE-2017-9126
+CVE-2017-9127
+CVE-2017-9128
+
+I was a bit surprised that one simple sanity check fixes a whole bunch of files.
+
+So it could be, that the problems are still there, but better hidden since the
+critical code isn't executed anymore with the sample files I got.
+
+If someone encounters more crashes, feel free to report them.
+
+Burkhard
+
+--- a/include/lqt_funcprotos.h
++++ b/include/lqt_funcprotos.h
+@@ -1345,9 +1345,9 @@ int quicktime_write_int32_le(quicktime_t
+ int quicktime_write_char32(quicktime_t *file, char *string);
+ float quicktime_read_fixed16(quicktime_t *file);
+ int quicktime_write_fixed16(quicktime_t *file, float number);
+-unsigned long quicktime_read_uint32(quicktime_t *file);
+-long quicktime_read_int32(quicktime_t *file);
+-long quicktime_read_int32_le(quicktime_t *file);
++uint32_t quicktime_read_uint32(quicktime_t *file);
++int32_t quicktime_read_int32(quicktime_t *file);
++int32_t quicktime_read_int32_le(quicktime_t *file);
+ int64_t quicktime_read_int64(quicktime_t *file);
+ int64_t quicktime_read_int64_le(quicktime_t *file);
+ long quicktime_read_int24(quicktime_t *file);
+--- a/src/atom.c
++++ b/src/atom.c
+@@ -131,6 +131,9 @@ int quicktime_atom_read_header(quicktime
+ 			atom->size = read_size64(header);
+ 			atom->end = atom->start + atom->size;
+ 		}
++/* Avoid broken files */
++        if(atom->end > file->total_length)
++          result = 1;
+ 	}
+ 
+ 
+--- a/src/lqt_quicktime.c
++++ b/src/lqt_quicktime.c
+@@ -1788,8 +1788,8 @@ int quicktime_read_info(quicktime_t *fil
+                 quicktime_set_position(file, start_position);
+                 free(temp);
+ 
+-                quicktime_read_moov(file, &file->moov, &leaf_atom);
+-                got_header = 1;
++                if(!quicktime_read_moov(file, &file->moov, &leaf_atom))
++                  got_header = 1;
+                 }
+               else
+                 quicktime_atom_skip(file, &leaf_atom);
+--- a/src/moov.c
++++ b/src/moov.c
+@@ -218,7 +218,8 @@ int quicktime_read_moov(quicktime_t *fil
+ 		if(quicktime_atom_is(&leaf_atom, "trak"))
+ 		{
+ 			quicktime_trak_t *trak = quicktime_add_trak(file);
+-			quicktime_read_trak(file, trak, &leaf_atom);
++			if(quicktime_read_trak(file, trak, &leaf_atom))
++                          return 1;
+ 		}
+ 		else
+ 		if(quicktime_atom_is(&leaf_atom, "udta"))
+--- a/src/trak.c
++++ b/src/trak.c
+@@ -269,6 +269,14 @@ int quicktime_read_trak(quicktime_t *fil
+     else quicktime_atom_skip(file, &leaf_atom);
+     } while(quicktime_position(file) < trak_atom->end);
+ 
++  /* Do some sanity checks to prevent later crashes */
++  if(trak->mdia.minf.is_video || trak->mdia.minf.is_video)
++    {
++    if(!trak->mdia.minf.stbl.stsc.table ||
++       !trak->mdia.minf.stbl.stco.table)
++      return 1;
++    }
++
+ #if 1 
+   if(trak->mdia.minf.is_video &&
+      quicktime_match_32(trak->mdia.minf.stbl.stsd.table[0].format, "drac"))
+--- a/src/util.c
++++ b/src/util.c
+@@ -647,10 +647,10 @@ int quicktime_write_fixed16(quicktime_t
+ 	return quicktime_write_data(file, data, 2);
+ }
+ 
+-unsigned long quicktime_read_uint32(quicktime_t *file)
++uint32_t quicktime_read_uint32(quicktime_t *file)
+ {
+-	unsigned long result;
+-	unsigned long a, b, c, d;
++	uint32_t result;
++	uint32_t a, b, c, d;
+ 	uint8_t data[4];
+ 
+ 	quicktime_read_data(file, data, 4);
+@@ -663,10 +663,10 @@ unsigned long quicktime_read_uint32(quic
+ 	return result;
+ }
+ 
+-long quicktime_read_int32(quicktime_t *file)
++int32_t quicktime_read_int32(quicktime_t *file)
+ {
+-	unsigned long result;
+-	unsigned long a, b, c, d;
++	uint32_t result;
++	uint32_t a, b, c, d;
+ 	uint8_t data[4];
+ 
+ 	quicktime_read_data(file, data, 4);
+@@ -676,13 +676,13 @@ long quicktime_read_int32(quicktime_t *f
+ 	d = data[3];
+ 
+ 	result = (a << 24) | (b << 16) | (c << 8) | d;
+-	return (long)result;
++	return (int32_t)result;
+ }
+ 
+-long quicktime_read_int32_le(quicktime_t *file)
++int32_t quicktime_read_int32_le(quicktime_t *file)
+ {
+-	unsigned long result;
+-	unsigned long a, b, c, d;
++	uint32_t result;
++	uint32_t a, b, c, d;
+ 	uint8_t data[4];
+ 
+ 	quicktime_read_data(file, data, 4);
+@@ -692,7 +692,7 @@ long quicktime_read_int32_le(quicktime_t
+ 	d = data[3];
+ 
+ 	result = (d << 24) | (c << 16) | (b << 8) | a;
+-	return (long)result;
++	return (int32_t)result;
+ }
+ 
+ int64_t quicktime_read_int64(quicktime_t *file)
diff --git a/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild b/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild
index 7153bd3006a9..32f2d0f169e1 100644
--- a/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild
+++ b/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild
@@ -57,7 +57,7 @@ DOCS=( ChangeLog README TODO )
 PATCHES=(
 	"${FILESDIR}"/${P}+libav-9.patch
 	"${FILESDIR}"/${P}-ffmpeg2.patch
-	"${FILESDIR}"/CVE-2016-2399.patch
+	"${FILESDIR}"/${P}-CVE-2016-2399.patch
 )
 
 src_prepare() {
diff --git a/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild b/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
new file mode 100644
index 000000000000..e4c2bea89205
--- /dev/null
+++ b/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit libtool multilib-minimal
+
+DESCRIPTION="An enhanced version of the quicktime4linux library"
+HOMEPAGE="http://libquicktime.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="aac alsa doc dv encode ffmpeg gtk jpeg lame libav cpu_flags_x86_mmx opengl png schroedinger static-libs vorbis X x264"
+
+RDEPEND="
+	sys-libs/zlib
+	>=virtual/libintl-0-r1[${MULTILIB_USEDEP}]
+	aac? (
+		>=media-libs/faad2-2.7-r3[${MULTILIB_USEDEP}]
+		encode? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] )
+	)
+	alsa? ( >=media-libs/alsa-lib-1.0.20 )
+	dv? ( >=media-libs/libdv-1.0.0-r3[${MULTILIB_USEDEP}] )
+	ffmpeg? (
+		libav? ( >=media-video/libav-12:0=[${MULTILIB_USEDEP}] )
+		!libav? ( >=media-video/ffmpeg-3.2.6:0=[${MULTILIB_USEDEP}] )
+	)
+	gtk? ( x11-libs/gtk+:2 )
+	jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
+	lame? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
+	opengl? ( virtual/opengl )
+	png? ( >=media-libs/libpng-1.6.10:0[${MULTILIB_USEDEP}] )
+	schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
+	vorbis? (
+		>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+		>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
+	)
+	X? (
+		x11-libs/libX11
+		x11-libs/libXaw
+		x11-libs/libXext
+		x11-libs/libXt
+		x11-libs/libXv
+	)
+	x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	sys-devel/gettext
+	doc? ( app-doc/doxygen )
+	X? ( x11-base/xorg-proto )"
+
+REQUIRED_USE="opengl? ( X )"
+
+DOCS=( ChangeLog README TODO )
+
+PATCHES=(
+	"${FILESDIR}"/${P}+libav-9.patch
+	"${FILESDIR}"/${P}-ffmpeg2.patch
+	"${FILESDIR}"/${P}-ffmpeg29.patch
+	"${FILESDIR}"/${P}-CVE-2016-2399.patch
+	"${FILESDIR}"/${P}-CVE-2017-9122_et_al.patch
+)
+
+src_prepare() {
+	default
+
+	if has_version '>media-video/ffmpeg-3.5' ; then
+		eapply "${FILESDIR}/${P}-ffmpeg4.patch"
+	fi
+
+	local x
+	for x in lqt_ffmpeg.c video.c audio.c ; do
+		sed -i -e "s:CODEC_ID_:AV_&:g" "plugins/ffmpeg/${x}" || die
+	done
+
+	elibtoolize # Required for .so versioning on g/fbsd
+}
+
+multilib_src_configure() {
+	# utils use: alsa, opengl, gtk+, X
+
+	ECONF_SOURCE=${S} \
+	econf \
+		--enable-gpl \
+		$(use_enable static-libs static) \
+		$(use_enable cpu_flags_x86_mmx asm) \
+		$(multilib_native_use_with doc doxygen) \
+		$(use vorbis || echo --without-vorbis) \
+		$(use_with lame) \
+		$(multilib_native_use_with X x) \
+		$(multilib_native_use_with opengl) \
+		$(multilib_native_use_with alsa) \
+		$(multilib_native_use_with gtk) \
+		$(use_with dv libdv) \
+		$(use_with jpeg libjpeg) \
+		$(use_with ffmpeg) \
+		$(use_with png libpng) \
+		$(use_with schroedinger) \
+		$(use_with aac faac) \
+		$(use encode || echo --without-faac) \
+		$(use_with aac faad2) \
+		$(use_with x264) \
+		--without-cpuflags
+
+	if ! multilib_is_native_abi; then
+		# disable building utilities
+		sed -i -e '/SUBDIRS =/s:utils::' Makefile || die
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name '*.la' -delete || die
+
+	# Compatibility with software that uses quicktime prefix, but
+	# don't do that when building for Darwin/MacOS
+	[[ ${CHOST} != *-darwin* ]] && dosym /usr/include/lqt /usr/include/quicktime
+}
+
+pkg_preinst() {
+	if [[ -d /usr/include/quicktime && ! -L /usr/include/quicktime ]]; then
+		elog "For compatibility with other quicktime libraries, ${PN} was"
+		elog "going to create a /usr/include/quicktime symlink, but for some"
+		elog "reason that is a directory on your system."
+
+		elog "Please check that is empty, and remove it, or submit a bug"
+		elog "telling us which package owns the directory."
+		die "/usr/include/quicktime is a directory."
+	fi
+}
diff --git a/media-libs/libraw/Manifest b/media-libs/libraw/Manifest
index 9959fdb45890..39e0f39c8440 100644
--- a/media-libs/libraw/Manifest
+++ b/media-libs/libraw/Manifest
@@ -6,6 +6,6 @@ DIST LibRaw-demosaic-pack-GPL2-0.18.8.tar.gz 30868 BLAKE2B 30cef85c49e066fa4b1d8
 DIST LibRaw-demosaic-pack-GPL3-0.18.8.tar.gz 39002 BLAKE2B 544a1eab61c825c7f2202107d623a56e1f81ad3e5111b419bf12708e2d8a9903f192c23904ab8fb274636d9262d3d89f02fa5e05a0e70d7834782c2df8ec0548 SHA512 10e8cb6694159d04deb813a88e5c3195eed6e2e438f41533db91b17997af1b9d54f286303447ca6e3d1b377922e388f6fcc8a8370254011e11b85612c914d500
 EBUILD libraw-0.18.11.ebuild 1843 BLAKE2B fd6d9bd5537532bf7fdb2e2f2665b3cb9915dabf8f07677ead3c44e53418eb3440d1a86fb4983834d436316c25f3a854066511c66e7b7352274e73e0ef1d2fd1 SHA512 d2793037aea9672d99ea1d53f4b8b8a16c62b0a0aa74b8d470b207a1b2a196640ee93bd630a7b987fdfe34b49f9f63f514fb73adc7573764d16145784b9acf46
 EBUILD libraw-0.18.12.ebuild 1850 BLAKE2B 3ac45ea0a2adbd0e593bbe72ce9b2d8ced1a0dcda0bf327114f0a3e7c9d7158928e5de593e2150ce78bbd260d75cfdcf2c18d198ca882ef6516fabca0256813b SHA512 e2aa30b3a5acc40416f04aef1b15f74c9df5c3772e78844bf7f99706c244c6a1dcbc85b7d20895f48a7e12ed3abe47424333bb8dd5f9f19e827b8fa5192a5b1e
-EBUILD libraw-0.18.13.ebuild 1850 BLAKE2B 3ac45ea0a2adbd0e593bbe72ce9b2d8ced1a0dcda0bf327114f0a3e7c9d7158928e5de593e2150ce78bbd260d75cfdcf2c18d198ca882ef6516fabca0256813b SHA512 e2aa30b3a5acc40416f04aef1b15f74c9df5c3772e78844bf7f99706c244c6a1dcbc85b7d20895f48a7e12ed3abe47424333bb8dd5f9f19e827b8fa5192a5b1e
+EBUILD libraw-0.18.13.ebuild 1847 BLAKE2B 216dbd7530c7ad33fd593eddfda37f2656b083fca00a3ea11219fbeaf99e90ae9783356f07cadaef4dbcfbd8be96953e86f5225718a1aeb6723034744255b4e6 SHA512 4c86a04f6307130aba5f8cccca61bf5eba5f6c4a26429c1159799efd6c5614d68d3fe0f42f23e092e665ccea794051ebc6ad086051046fd7fb6c43cba521718c
 EBUILD libraw-0.19.0.ebuild 1448 BLAKE2B 4506ca95f728795307d7d18673569cf10e809ba4003247f3f017570d16aa8678953c8ff261315bb251d6d31a6e3d687b5f9537e33f404946fa78894365df0711 SHA512 bb628315cc48d486a336213c82a4e959910aa33acd5037dc00fb0f8674fdcd4ac9392759d53f345f13e50ce5eca162961ebb5cbcea9edfb97c601cd9fe613598
 MISC metadata.xml 437 BLAKE2B d43c89433ab4eff6a760dce4f7fc83253cb572ab048af7fb1df5bca74db8d7fde84cf147f5941e65407776d281edc4c0297006c75f83c285a5febc37625d6265 SHA512 b06d476afa85710b25dc7d1c1567ba30469ce6d08d278aaa64413611edf95433df315a5a77670d74ca5341be3b96fa0f4451e48f544783f031178b8cf73cd388
diff --git a/media-libs/libraw/libraw-0.18.13.ebuild b/media-libs/libraw/libraw-0.18.13.ebuild
index 6412dcbf97cf..e87d86831fa4 100644
--- a/media-libs/libraw/libraw-0.18.13.ebuild
+++ b/media-libs/libraw/libraw-0.18.13.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://www.libraw.org/data/${MY_P}.tar.gz
 
 LICENSE="LGPL-2.1 CDDL demosaic? ( GPL-2 GPL-3 )"
 SLOT="0/16" # subslot = libraw soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="demosaic examples jpeg jpeg2k +lcms openmp"
 
 RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest
index 1b9267842982..43c5dcd9bc91 100644
--- a/media-libs/libsdl2/Manifest
+++ b/media-libs/libsdl2/Manifest
@@ -2,5 +2,5 @@ AUX libsdl2-2.0.6-static-libs.patch 2373 BLAKE2B 4632bf1c0d841d148acfbdf4c0fc25e
 AUX libsdl2-2.0.8-rework-variables.patch 2061 BLAKE2B 8a64934ad09295442f6f63ffab50779e1975903449d3f47d70b42a5a82102ff0198ea0cd2b4766beb3844dee9f1d1539eb29a8abad7c12a10b6fa0789b1c80a6 SHA512 6d3f11a87d0a5eebbb7cd6e145075329f774f02ddfda227e211f0fdc5ac3d7c2d132a3cdc4b48baca9871ecd01b9a9e0c5b82ed727579e1b7eeb1d9fde48ae81
 DIST SDL2-2.0.8.tar.gz 4909017 BLAKE2B f6b365a6033e10ef0c5d56ee5e17cc1caada99a97b7ccc7b0eab4f7ca5fc513b78e71960a41a20319c5de1d9eb9eaeffb06b90d090e14e8d354a9b8315ab12f1 SHA512 673c6058b8692a36b4a3594456b10ef6051efe79e4fb644421fc5c76b11fd68b895840a2c8b72413418c378733e2993d33f19767d0d7ed101eda6310bd70c869
 EBUILD libsdl2-2.0.8-r1.ebuild 4742 BLAKE2B 333677b4ed0a69eb34ba2a6d2da4140e23009d9780bfa297e0c85f74da31fa68ae964b68423232bfad67d34c8dffee86ea5de2db88cf3135fd2631d029aa56aa SHA512 99400ab240ec25f85f5b0a549a0d56b6b96d600ad9705e68af99ddb717e542a140eec7211a5435b5a1169772efa169581f32a8f6b1c758cad0a8aa70c7268c24
-EBUILD libsdl2-2.0.8-r2.ebuild 5168 BLAKE2B de24853dc6291fa1a819ac09bd6e736979435accd568f4582704917ef634f4ad6f91689386cd33b744f126c28cef3fb9f071413102fab53a12304f0759db01b8 SHA512 ea0e00ed5ac5c5869b7de62ae6cbbde302af14292136da08066f6d76637aff4bbb31fc5e6b1f5579c9ac20111458f1c8ffecfd5b140335ec5312297d6952cb02
+EBUILD libsdl2-2.0.8-r2.ebuild 5167 BLAKE2B 49a9e004ceb6e8df5b6449183695e4103404c4314cd783b49bcecdddb3f4dd720edcbe3ebf0ae7998fa44d6f72ab5af515e9a420c695f26c21e59dc406904bfd SHA512 df0c20bf4909d5eb47c66f805b11e8f9ef31d2c5cc282ee0c40c6a8f7b7104b92d149a820916f8f38c4605ca97788f57c2df658c39186944e38a63fcf36ae499
 MISC metadata.xml 1602 BLAKE2B 600168481346aa4a72024f35a35640f8c415aa38f6c337a9995cd61c1f0c438fdd533dcf50b2506c7b3e638f9144295037df69bdcdcb3fcdd0821358caef2984 SHA512 c16d7e97a45a8897c806ef6087242710c95a0602f858947bf68c240075fbdc69ea1ae4c46eed567341f493868b94e1b63160a8b2cb1c1d44da232273c9f46001
diff --git a/media-libs/libsdl2/libsdl2-2.0.8-r2.ebuild b/media-libs/libsdl2/libsdl2-2.0.8-r2.ebuild
index 34dbe39b2886..59e84df973a0 100644
--- a/media-libs/libsdl2/libsdl2-2.0.8-r2.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.0.8-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.libsdl.org/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86"
 
 IUSE="cpu_flags_x86_3dnow alsa altivec aqua custom-cflags dbus gles haptic libsamplerate +joystick kms cpu_flags_x86_mmx nas opengl oss pulseaudio +sound cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs +threads tslib udev +video video_cards_vc4 wayland X xinerama xscreensaver"
 REQUIRED_USE="
diff --git a/media-libs/libsndfile/Manifest b/media-libs/libsndfile/Manifest
index baa3cd861d25..35426916dda2 100644
--- a/media-libs/libsndfile/Manifest
+++ b/media-libs/libsndfile/Manifest
@@ -1,5 +1,9 @@
+AUX libsndfile-1.0.28-CVE-2017-12562.patch 4360 BLAKE2B d668fa5c114e3510ff51e2331593d040e0a69476472d55d2a784ceccc71d880cdcc4cda53210d8e2c62abb2397f13d8129162567df8f5528489190ce7c102172 SHA512 8f07edf06652c56877dc5bc478daf494bcfaa45fa1d5a655719aaa8b363edffb749c4878ca11a7dac602ac5658b17eea9397ad824e2c3be38e9fe6c51cea0c63
+AUX libsndfile-1.0.28-CVE-2018-13139.patch 920 BLAKE2B ac10209a6fa2f0f28b5d36dae9bd4e1afde90ae4db55163c42ea99bd20292c1e2df74f3130030982da13a16df11a1fc10b0138ecebc304351efd1b7852084d72 SHA512 b6a04575730de5a9bf2d1b531d585961a4bb822fbb2441d1cebf75519aa3744eddb3a322fc3b4f8aaf92cbf6fafee24eab6b26fa97d49bd2cbc0e3aec1aea66a
 AUX libsndfile-1.0.28-arm-varargs-failure.patch 1329 BLAKE2B d8a995e6596db880d2188cfc3243b7aff2dc13ed617b0bf589e918c5a852d4fc1d69c00eec26ec8c8b258ab00eb860872e01b149254d554cd563fd6d7b532891 SHA512 4577282dc0b71d456a562d06d8b22958f24caf383c6c4c8aa2c9006614d3110b7d6bbf896ce393468455460cb8d466c09a48416cdf159e30de6d5ecaa0d4cf09
 DIST libsndfile-1.0.28.tar.gz 1202833 BLAKE2B 102735766e2c22b5278fde43feaaa664598c08fadb5264d5130e4bf1e354bd4202948db38e2912d7487bd7f8c0b9faf1616c0873eed886a56b1d7f49452bf488 SHA512 890731a6b8173f714155ce05eaf6d991b31632c8ab207fbae860968861a107552df26fcf85602df2e7f65502c7256c1b41735e1122485a3a07ddb580aa83b57f
 EBUILD libsndfile-1.0.28-r1.ebuild 1663 BLAKE2B 7c6a0c188b0ffba2b67b87c117ef186e0bbc12dadc61cd4d1e58e8f4d02be44bb63d1244fb41ec1520d66b230c66d7d4a466ada116e1cd3ce7551995353db113 SHA512 9ad9784b4dfddb8f4d1b3f70cc47965e35fa2e3b4469e3906dec6be2dc53841f102603f37cb078438148d6fdecace56696038f04c02ace9c14d0c26ec6a12825
+EBUILD libsndfile-1.0.28-r2.ebuild 1721 BLAKE2B 7239131284eae7494988647171fc30680de5a6d3a916c179f0c56818c1ce9adddf827089bae208c4f1d6aa2e1f42b0e74914756a30ad56653ac211e43e6f5cd7 SHA512 5aa47d7d321bd9b94c5c8f4f8b1cbf604f826bd0c3cd309310de2943711f869c7fc10218a9518bfacafcf78428e6ac915e4c3b3cf86156742ff6474eda8969d2
+EBUILD libsndfile-1.0.28-r3.ebuild 1761 BLAKE2B 86a94ad3f44738bd4de2543a32038f8ec1ac75269f1481fa7f4212449d8a77467abb63d4bd73fd94a3173782a6458333fa14ab66588ecac76a7cba8e1237257e SHA512 a248b4a09a4dafd07e4fd6fece2643a28c7efe93aa70a86c452a339ba085195e26425f98cb71acef14fe6410f25100c8cb6979fbdb5f4e9c0d777f856ea6cd50
 EBUILD libsndfile-9999.ebuild 1745 BLAKE2B 597955cb2733c8ba88cbea8c0b6a8539cc3e4cbf4360244cafe669c85068c9a4f5b7fb152ffaf390344629d12909a8d514b06372afb6bed01aa90247e5470ed6 SHA512 37a4087046ba8fe41abd09bc16f485e8ca9ce1938021281ff09a5b2b953ed88f935389d13a9b1f6286bd3d35ebf727b4708cb117c7510ef4067f6fb39758adc7
 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/media-libs/libsndfile/files/libsndfile-1.0.28-CVE-2017-12562.patch b/media-libs/libsndfile/files/libsndfile-1.0.28-CVE-2017-12562.patch
new file mode 100644
index 000000000000..0ff2b7ef4590
--- /dev/null
+++ b/media-libs/libsndfile/files/libsndfile-1.0.28-CVE-2017-12562.patch
@@ -0,0 +1,88 @@
+From b6a9d7e95888ffa77d8c75ce3f03e6c7165587cd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=B6rn=20Heusipp?= <osmanx@problemloesungsmaschine.de>
+Date: Wed, 14 Jun 2017 12:25:40 +0200
+Subject: [PATCH] src/common.c: Fix heap buffer overflows when writing strings
+ in binheader
+
+Fixes the following problems:
+ 1. Case 's' only enlarges the buffer by 16 bytes instead of size bytes.
+ 2. psf_binheader_writef() enlarges the header buffer (if needed) prior to the
+    big switch statement by an amount (16 bytes) which is enough for all cases
+    where only a single value gets added. Cases 's', 'S', 'p' however
+    additionally write an arbitrary length block of data and again enlarge the
+    buffer to the required amount. However, the required space calculation does
+    not take into account the size of the length field which gets output before
+    the data.
+ 3. Buffer size requirement calculation in case 'S' does not account for the
+    padding byte ("size += (size & 1) ;" happens after the calculation which
+    uses "size").
+ 4. Case 'S' can overrun the header buffer by 1 byte when no padding is
+    involved
+    ("memcpy (&(psf->header.ptr [psf->header.indx]), strptr, size + 1) ;" while
+    the buffer is only guaranteed to have "size" space available).
+ 5. "psf->header.ptr [psf->header.indx] = 0 ;" in case 'S' always writes 1 byte
+    beyond the space which is guaranteed to be allocated in the header buffer.
+ 6. Case 's' can overrun the provided source string by 1 byte if padding is
+    involved ("memcpy (&(psf->header.ptr [psf->header.indx]), strptr, size) ;"
+    where "size" is "strlen (strptr) + 1" (which includes the 0 terminator,
+    plus optionally another 1 which is padding and not guaranteed to be
+    readable via the source string pointer).
+
+Closes: https://github.com/erikd/libsndfile/issues/292
+---
+ src/common.c | 15 +++++++--------
+ 1 file changed, 7 insertions(+), 8 deletions(-)
+
+diff --git a/src/common.c b/src/common.c
+index 1a6204ca..6b2a2ee9 100644
+--- a/src/common.c
++++ b/src/common.c
+@@ -681,16 +681,16 @@ psf_binheader_writef (SF_PRIVATE *psf, const char *format, ...)
+ 					/* Write a C string (guaranteed to have a zero terminator). */
+ 					strptr = va_arg (argptr, char *) ;
+ 					size = strlen (strptr) + 1 ;
+-					size += (size & 1) ;
+ 
+-					if (psf->header.indx + (sf_count_t) size >= psf->header.len && psf_bump_header_allocation (psf, 16))
++					if (psf->header.indx + 4 + (sf_count_t) size + (sf_count_t) (size & 1) > psf->header.len && psf_bump_header_allocation (psf, 4 + size + (size & 1)))
+ 						return count ;
+ 
+ 					if (psf->rwf_endian == SF_ENDIAN_BIG)
+-						header_put_be_int (psf, size) ;
++						header_put_be_int (psf, size + (size & 1)) ;
+ 					else
+-						header_put_le_int (psf, size) ;
++						header_put_le_int (psf, size + (size & 1)) ;
+ 					memcpy (&(psf->header.ptr [psf->header.indx]), strptr, size) ;
++					size += (size & 1) ;
+ 					psf->header.indx += size ;
+ 					psf->header.ptr [psf->header.indx - 1] = 0 ;
+ 					count += 4 + size ;
+@@ -703,16 +703,15 @@ psf_binheader_writef (SF_PRIVATE *psf, const char *format, ...)
+ 					*/
+ 					strptr = va_arg (argptr, char *) ;
+ 					size = strlen (strptr) ;
+-					if (psf->header.indx + (sf_count_t) size > psf->header.len && psf_bump_header_allocation (psf, size))
++					if (psf->header.indx + 4 + (sf_count_t) size + (sf_count_t) (size & 1) > psf->header.len && psf_bump_header_allocation (psf, 4 + size + (size & 1)))
+ 						return count ;
+ 					if (psf->rwf_endian == SF_ENDIAN_BIG)
+ 						header_put_be_int (psf, size) ;
+ 					else
+ 						header_put_le_int (psf, size) ;
+-					memcpy (&(psf->header.ptr [psf->header.indx]), strptr, size + 1) ;
++					memcpy (&(psf->header.ptr [psf->header.indx]), strptr, size + (size & 1)) ;
+ 					size += (size & 1) ;
+ 					psf->header.indx += size ;
+-					psf->header.ptr [psf->header.indx] = 0 ;
+ 					count += 4 + size ;
+ 					break ;
+ 
+@@ -724,7 +723,7 @@ psf_binheader_writef (SF_PRIVATE *psf, const char *format, ...)
+ 					size = (size & 1) ? size : size + 1 ;
+ 					size = (size > 254) ? 254 : size ;
+ 
+-					if (psf->header.indx + (sf_count_t) size > psf->header.len && psf_bump_header_allocation (psf, size))
++					if (psf->header.indx + 1 + (sf_count_t) size > psf->header.len && psf_bump_header_allocation (psf, 1 + size))
+ 						return count ;
+ 
+ 					header_put_byte (psf, size) ;
diff --git a/media-libs/libsndfile/files/libsndfile-1.0.28-CVE-2018-13139.patch b/media-libs/libsndfile/files/libsndfile-1.0.28-CVE-2018-13139.patch
new file mode 100644
index 000000000000..18e6ae76e62c
--- /dev/null
+++ b/media-libs/libsndfile/files/libsndfile-1.0.28-CVE-2018-13139.patch
@@ -0,0 +1,31 @@
+From df18323c622b54221ee7ace74b177cdcccc152d7 Mon Sep 17 00:00:00 2001
+From: "Brett T. Warden" <brett.t.warden@intel.com>
+Date: Tue, 28 Aug 2018 12:01:17 -0700
+Subject: [PATCH] Check MAX_CHANNELS in sndfile-deinterleave
+
+Allocated buffer has space for only 16 channels. Verify that input file
+meets this limit.
+
+Fixes #397
+---
+ programs/sndfile-deinterleave.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/programs/sndfile-deinterleave.c b/programs/sndfile-deinterleave.c
+index 53660310..225b4d54 100644
+--- a/programs/sndfile-deinterleave.c
++++ b/programs/sndfile-deinterleave.c
+@@ -89,6 +89,13 @@ main (int argc, char **argv)
+ 		exit (1) ;
+ 		} ;
+ 
++	if (sfinfo.channels > MAX_CHANNELS)
++	{	printf ("\nError : Input file '%s' has too many (%d) channels. Limit is %d.\n",
++			argv [1], sfinfo.channels, MAX_CHANNELS) ;
++		exit (1) ;
++		} ;
++
++
+ 	state.channels = sfinfo.channels ;
+ 	sfinfo.channels = 1 ;
+ 
+\ No newline at end of file
diff --git a/media-libs/libsndfile/libsndfile-1.0.28-r2.ebuild b/media-libs/libsndfile/libsndfile-1.0.28-r2.ebuild
new file mode 100644
index 000000000000..fb59074ec723
--- /dev/null
+++ b/media-libs/libsndfile/libsndfile-1.0.28-r2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+
+inherit python-any-r1 multilib-minimal
+
+MY_P=${P/_pre/pre}
+
+DESCRIPTION="C library for reading and writing files containing sampled sound"
+HOMEPAGE="http://www.mega-nerd.com/libsndfile"
+if [[ ${MY_P} == ${P} ]]; then
+	SRC_URI="http://www.mega-nerd.com/libsndfile/files/${P}.tar.gz"
+else
+	SRC_URI="http://www.mega-nerd.com/tmp/${MY_P}b.tar.gz"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="alsa minimal sqlite static-libs test"
+
+RDEPEND="
+	!minimal? (
+		>=media-libs/flac-1.2.1-r5[${MULTILIB_USEDEP}]
+		>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+		>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
+	)
+	alsa? ( media-libs/alsa-lib )
+	sqlite? ( >=dev-db/sqlite-3.2 )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	test? ( ${PYTHON_DEPS} )"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-arm-varargs-failure.patch
+	"${FILESDIR}"/${P}-CVE-2017-12562.patch
+)
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		--disable-octave \
+		--enable-gcc-pipe \
+		--enable-gcc-opt \
+		$(use_enable static-libs static) \
+		$(use_enable !minimal external-libs) \
+		$(multilib_native_enable full-suite) \
+		$(multilib_native_use_enable alsa) \
+		$(multilib_native_use_enable sqlite)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# package provides .pc files
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libsndfile/libsndfile-1.0.28-r3.ebuild b/media-libs/libsndfile/libsndfile-1.0.28-r3.ebuild
new file mode 100644
index 000000000000..ea62ff850c7b
--- /dev/null
+++ b/media-libs/libsndfile/libsndfile-1.0.28-r3.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+
+inherit python-any-r1 multilib-minimal
+
+MY_P=${P/_pre/pre}
+
+DESCRIPTION="C library for reading and writing files containing sampled sound"
+HOMEPAGE="http://www.mega-nerd.com/libsndfile"
+if [[ ${MY_P} == ${P} ]]; then
+	SRC_URI="http://www.mega-nerd.com/libsndfile/files/${P}.tar.gz"
+else
+	SRC_URI="http://www.mega-nerd.com/tmp/${MY_P}b.tar.gz"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="alsa minimal sqlite static-libs test"
+
+RDEPEND="
+	!minimal? (
+		>=media-libs/flac-1.2.1-r5[${MULTILIB_USEDEP}]
+		>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+		>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
+	)
+	alsa? ( media-libs/alsa-lib )
+	sqlite? ( >=dev-db/sqlite-3.2 )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	test? ( ${PYTHON_DEPS} )"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-arm-varargs-failure.patch
+	"${FILESDIR}"/${P}-CVE-2017-12562.patch
+	"${FILESDIR}"/${P}-CVE-2018-13139.patch
+)
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		--disable-octave \
+		--enable-gcc-pipe \
+		--enable-gcc-opt \
+		$(use_enable static-libs static) \
+		$(use_enable !minimal external-libs) \
+		$(multilib_native_enable full-suite) \
+		$(multilib_native_use_enable alsa) \
+		$(multilib_native_use_enable sqlite)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# package provides .pc files
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libzmf/Manifest b/media-libs/libzmf/Manifest
index 80a8b9299e50..6fdb6ef43b1f 100644
--- a/media-libs/libzmf/Manifest
+++ b/media-libs/libzmf/Manifest
@@ -1,4 +1,4 @@
 DIST libzmf-0.0.2.tar.xz 320952 BLAKE2B 0fb3a88da7e37f32c46a8c5d388e235ffdb61edaa9dfbd810fe88160c5a19be78a32c537d4953f8b86dd250d4f753c3d7c472bb74613291873f6dee452d546f6 SHA512 ad4a8e65e85434e43caa239ff2a3f358c6db6411235c4bb73d8d2aa1527a4f411433370706db391f8f8110a36759249ee19b27be75bae5f361c491006d1b9aa2
-EBUILD libzmf-0.0.2.ebuild 1012 BLAKE2B 6dd35c6a9ffdf01090a0a5d0ce12ac29919fa59b958c7cce998ef5c0f483fcb367c0c34d1807b02e42b1bbb03319f05ed565b0a90f9e1f92c7f6a01eae2a804e SHA512 e23298a34a8134bf9e93c62e17b3da185b015656da4cce1eaeae2505b9e3f8ddfce2e65434cbbc5ed489ef40e7a36a5f757499a36e63ac4707859fc06726aaae
+EBUILD libzmf-0.0.2.ebuild 1019 BLAKE2B 37f04d254c06d8ceccb70b2a29b1f4d46f81bc1b87fba7ba36ead8b9bd78147445c778ca16db5c7c33ea522a06bd780a48e366556ae7669cb4e867f077b6e9af SHA512 b55c96ce5ab47f3550fdb28952e10c7c45b91965a835bd15f5a53a19dbe66d323a7a03243fdaab03ca31431bb05aa930e93a5d9922e6b5f26ddcf8effddc2461
 EBUILD libzmf-9999.ebuild 1014 BLAKE2B 255a8b8d4297d17e4ebc7040156a964bf9b474d7c1bcc140d2331aff5b2018815d1e2bdb4a81a6b779a7525294055de52d59422fd1d19837f7822cb78522e0ba SHA512 19d2c912737d51cffd1a1908316ccb2a3784e3c2f5ebc3c5c7fe212fe6fd3d08ef7b226cd72a74000554bb9b6ca84e4618ced4c7463b97da34148bcc486f532b
 MISC metadata.xml 321 BLAKE2B 845e098f8136b178e62b70bb06d8ce26ed7e2b9aec93358180d36cc8de5d4436501fa13521dcc7b4a7f8e311603b25c9d30d23db216008d3d96af5e462611a9a SHA512 a9d2208bf93a05e3406aee66412b46e731ce5a858e3e5e4a6668568b3ccba863d540f3e6224bc7e5ed8c6ad22d330fc0e30ecc90df2f8a866280bb138040fc12
diff --git a/media-libs/libzmf/libzmf-0.0.2.ebuild b/media-libs/libzmf/libzmf-0.0.2.ebuild
index ae76eab316e4..987ad03573c1 100644
--- a/media-libs/libzmf/libzmf-0.0.2.ebuild
+++ b/media-libs/libzmf/libzmf-0.0.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libzmf"
 LICENSE="MPL-2.0"
 SLOT="0"
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 IUSE="debug doc test tools"
 
diff --git a/media-libs/musicbrainz/Manifest b/media-libs/musicbrainz/Manifest
index 6fea2beab661..dd421d56e021 100644
--- a/media-libs/musicbrainz/Manifest
+++ b/media-libs/musicbrainz/Manifest
@@ -1,6 +1,3 @@
-AUX musicbrainz-3.0.2-gcc44.patch 270 BLAKE2B c0dba98c4ce671bd1b8921104af1004abbde8ed356e5cf3e311d822612168d56229d54b1d88785b9d61f9761272b451ce539896d8908644b9d6b1054872278ea SHA512 3837a5c0940a730107ae56a9c388994dad060353e0fa02f8be6ac54928c82d34b6c8143e790e87f2066073874adcb7efb3a391a1868e3bb16da26436ef5bb00d
-DIST libmusicbrainz-3.0.3.tar.gz 105837 BLAKE2B cf5114e1658eee02132d49bb4a3414da9325badf40125885319ceab44661426ea037ff88a22c1ea743632fff07bceca191d34cff4aac9fc0728048d4b16ad998 SHA512 b4c76a0c056480c74eec36c4419f7f696f945b5a4b29dd0a5c61ab3a8b076f48b803ca7af60fb9cfa5eb5344f9ae5d566aaafea6e8eae498ed6aed2169f70480
 DIST libmusicbrainz-5.1.0.tar.gz 77220 BLAKE2B c655ae4a9a11adb15de559a1e518b5c5aab47ce3c36e3a264faddda36112d9caccc42d2013e451ffdf200147ffca4cbba883affa1a6465f6071fa14e1d67fbe5 SHA512 daa7ccb94e517e90f7d88a0659c84b00f04c6a73ef7771b7e3bd9101fa6569b1935a68a3689502ed0cc8c0d71ba9d2d0ebd9c074dd5eed9f75a3db390b222e03
-EBUILD musicbrainz-3.0.3.ebuild 800 BLAKE2B c8fa917b0e34c134d480d4408135847384ae805eaebac8e2749f5188b54af7c68ff5f519461adf4bb8c1ccb86c3da4b079a6bf1edac0adb406af96282e652c8e SHA512 c285d507c89c40e881a42bb1baf7e1910600e55573847109e04b302e44abdd317a57dbec2d45aa25db35c40b7ec6e3989677edb66ec0a4325ee23290c4b30fdf
 EBUILD musicbrainz-5.1.0.ebuild 1041 BLAKE2B 7c8a431fec44f4abecd7ed524f00f9c3069b4e9ed5f7f66458a4371a6bfba84834d2dc343ba87b0ecbd62c2aa2f2e18f6865b73e86c8502002477c325161b649 SHA512 38fc34bed25dfc580b10f317d70cfcc1f40dbd4292ac2e2ba44d581ff9ec43f5565d0cada5c55558f81a1955069ea438041c8f444e50c25304a88c3c83fd933c
 MISC metadata.xml 416 BLAKE2B 07504a54a7396e2213d1a031ed5c2aef46c3d321da8aee0dad87ca63c4d257574c3a06bfc57116557ec4a81017eca9a193e236f5119f504fafd6752250368511 SHA512 c2517eaf706a3672812c02189fc33a866b4a27950010c5d1d3e957cab1097d2bb011a6958342f5a840af7b787089bfccde5e7c044873c0dd2d4247ff9b294a6b
diff --git a/media-libs/musicbrainz/files/musicbrainz-3.0.2-gcc44.patch b/media-libs/musicbrainz/files/musicbrainz-3.0.2-gcc44.patch
deleted file mode 100644
index 76f0068f4216..000000000000
--- a/media-libs/musicbrainz/files/musicbrainz-3.0.2-gcc44.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/utils_private.cpp	2009-05-03 08:55:04.000000000 -0400
-+++ src/utils_private.cpp	2009-05-03 08:55:52.000000000 -0400
-@@ -25,6 +25,7 @@
- #include <cstdarg>
- #include <iostream>
- #include <map>
-+#include <cstdio>
- #include <ne_uri.h> 
- #include "utils_private.h"
- 
diff --git a/media-libs/musicbrainz/musicbrainz-3.0.3.ebuild b/media-libs/musicbrainz/musicbrainz-3.0.3.ebuild
deleted file mode 100644
index 5f40ac9a32c4..000000000000
--- a/media-libs/musicbrainz/musicbrainz-3.0.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="Client library to access metadata of mp3/vorbis/CD media"
-HOMEPAGE="https://musicbrainz.org/"
-SRC_URI="http://ftp.musicbrainz.org/pub/musicbrainz/lib${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="3"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="net-libs/neon
-	media-libs/libdiscid"
-
-DEPEND="${RDEPEND}
-	test? ( dev-util/cppunit )"
-
-S=${WORKDIR}/lib${P}
-
-CMAKE_IN_SOURCE_BUILD=true
-
-DOCS="README.txt NEWS.txt AUTHORS.txt"
-
-PATCHES=( "${FILESDIR}/${PN}-3.0.2-gcc44.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package test CppUnit)
-	)
-	cmake-utils_src_configure
-}
diff --git a/media-libs/qtav/Manifest b/media-libs/qtav/Manifest
index c15af65ddf60..66d3a0efa9e0 100644
--- a/media-libs/qtav/Manifest
+++ b/media-libs/qtav/Manifest
@@ -1,5 +1,6 @@
+AUX qtav-1.12.0-ffmpeg-4.patch 1225 BLAKE2B 392c7290067aef2132e7024e268af250221b4138942c882b3c6955616f66561a067520f389731b53cc689e96cbbd43d1294a25efcdb4bdd61275f5d067a92014 SHA512 a46d37f00f92860d0b4e9d7c0bb2ec2aabf9517b39876b0ade58081955005eb8be7b4c18d16abcdaf98441c6179924b0bd1974041ede04467e7b7f5953a4fe8b
 AUX qtav-1.12.0-multilib.patch 716 BLAKE2B 4cb5518cb14e91963e5371eafdf3f02452fb32add562a54e9d5eb17d3da603e6bdbcf2544ef60667390de0a44475d9b0457c8664f40b982162a569846b511adf SHA512 0b9db739ab6b4a23d653de56d993f44a6e8d108df3a635a2ebc822bdcc2ac1006643f31ceda8a94626a84aa8556b45ab5aa72aec20d990cf09e7396191bac3bb
 DIST qtav-1.12.0-capi.h-b43aa93.xz 6120 BLAKE2B b2aca6c4ae70e227728bf908a7b5b9ad9fcb4ba52a254362eaaefaa9480c6a1c551bf47f02f8a44273952bf2816d2dbc7dc92142264892547d4fe602184b5fba SHA512 f5e458b157a5f343bc5d4133cfe45ffefb5c6cbb902b41ae6b9d9349e31ca7ac5a2746addc4fef89fb74856f5db7691cf174d82e88b51cc0b7a356c4fdab5aa7
 DIST qtav-1.12.0.tar.gz 998117 BLAKE2B 85f8a470333e683353c305b06cec10f65b553c26b05fad4824d8f05f6aeb1fc2622ab8b60ba42a35260402a950bf41458e90342be6c53cbdb8400642c2d09741 SHA512 f273d10a4fe9126cd7d7b1293c087527bf898513e8add7958d905b6039b0c9c3891ea751c40e4c13ba683febff73912322953b151a131726ef8b44db199e0f32
-EBUILD qtav-1.12.0.ebuild 1392 BLAKE2B 61b0aaf2f6896050dc408170f8324109c24bab44f382c312a4a87ccb1c8734ebf3ee1ca6f4eae8dd505f0a90db48ec8512eede83ed92e88e088eebcce5ddf321 SHA512 00e7eb1480445bcc4ace81f7dc38efecfd945737e0a3799c0f63ab0399dd619ae4b45364dec2940c1af3c7284adc736b85795703edcba4a2fdbae7a99abe39aa
+EBUILD qtav-1.12.0.ebuild 1428 BLAKE2B 55e9e1529bebd86adf2057136b57dfdcabe810694367d0f63e1be2587f514e0db38a61c7c0525f9e0e9ba92a1570e88cc818ad80ce774252a88e8cf46ae377e1 SHA512 4c12d4182ae82c3da68cd8c01b57d10defded1d41f17045638737d9633c3e7928ded02eeae083349bb5ccf350da5c34018f801461e32a99876d1b670e167c870
 MISC metadata.xml 389 BLAKE2B 6f4c10122acf9e5b30236f531b433ffc9cc46f9ddd6e6322bb5e17c70f60ba6ad0966eb93af1946a1df67e03cde1921ef24bad93fc115d5af84be848cbb04585 SHA512 145488dd0015ae2b014509610c33cf28e4e46e966bd37073d1199230297e66df520f3ac0afedd63c8eac20a7aa02ee492e5ad0658aa3b6fd660bd685b984161c
diff --git a/media-libs/qtav/files/qtav-1.12.0-ffmpeg-4.patch b/media-libs/qtav/files/qtav-1.12.0-ffmpeg-4.patch
new file mode 100644
index 000000000000..cb77e9adebb2
--- /dev/null
+++ b/media-libs/qtav/files/qtav-1.12.0-ffmpeg-4.patch
@@ -0,0 +1,36 @@
+From 1633f2962e195eb2a013072e694a2e1c701613a8 Mon Sep 17 00:00:00 2001
+From: 0xFelix <evostar@gmx.de>
+Date: Tue, 12 Dec 2017 13:24:34 +0100
+Subject: [PATCH] Remove usage of deprecated avfiltergraph.h header
+
+avfiltergraph.h was replaced by avfilter.h in libavfilter version
+3.8.0+ so only include it when the used libavfilter version
+is older than 3.8.0
+---
+ src/QtAV/private/AVCompat.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/QtAV/private/AVCompat.h b/src/QtAV/private/AVCompat.h
+index 6c38596d1..944cfd7de 100644
+--- a/src/QtAV/private/AVCompat.h
++++ b/src/QtAV/private/AVCompat.h
+@@ -59,6 +59,7 @@ extern "C"
+ #include <libavutil/parseutils.h>
+ #include <libavutil/pixdesc.h>
+ #include <libavutil/avstring.h>
++#include <libavfilter/version.h>
+ 
+ #if !FFMPEG_MODULE_CHECK(LIBAVUTIL, 51, 73, 101)
+ #include <libavutil/channel_layout.h>
+@@ -79,8 +80,11 @@ extern "C"
+ #endif //QTAV_HAVE(AVRESAMPLE)
+ 
+ #if QTAV_HAVE(AVFILTER)
++#if LIBAVFILTER_VERSION_INT < AV_VERSION_INT(3,8,0)
+ #include <libavfilter/avfiltergraph.h> /*code is here for old version*/
++#else
+ #include <libavfilter/avfilter.h>
++#endif
+ #include <libavfilter/buffersink.h>
+ #include <libavfilter/buffersrc.h>
+ #endif //QTAV_HAVE(AVFILTER)
diff --git a/media-libs/qtav/qtav-1.12.0.ebuild b/media-libs/qtav/qtav-1.12.0.ebuild
index 62a4f6419592..f3e1ff02cc1d 100644
--- a/media-libs/qtav/qtav-1.12.0.ebuild
+++ b/media-libs/qtav/qtav-1.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -37,7 +37,10 @@ RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_PN}-${PV}"
 
-PATCHES=( "${FILESDIR}/${P}-multilib.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-multilib.patch"
+	"${FILESDIR}/${P}-ffmpeg-4.patch"
+)
 
 src_prepare() {
 	cmake-utils_src_prepare
diff --git a/media-libs/sdl-mixer/Manifest b/media-libs/sdl-mixer/Manifest
index 13e90fd632ab..2859fea782de 100644
--- a/media-libs/sdl-mixer/Manifest
+++ b/media-libs/sdl-mixer/Manifest
@@ -4,5 +4,5 @@ AUX sdl-mixer-1.2.12-mikmod-r587.patch 1416 BLAKE2B b353de5432714f3968c5f69ff439
 AUX sdl-mixer-1.2.12-mikmod-r588.patch 1128 BLAKE2B cc6ff884b3e157064a583d64adf978a091c7786a3c5417c5efd911f80407d30c866c527400122866bcffea25ab645533ae8e972834a2085a4bd8563ef5e8607b SHA512 36bbc5d10a63a73b7860a6f381a88849cc465dcabbfe3db21d6bd156110eb01e03e8369f0ed234f72f0227566919f5f823d0350d431575f0ae0f2a4b244cf704
 AUX sdl-mixer-1.2.12-wav.patch 796 BLAKE2B a0b310db2b789d24fd60927d23859582a8ab1449ba0934e10abdd1361a0d92fb5925625d9c3a0885f812dde12af9931cbae06c652b51e76d18759db03cacfc2a SHA512 9fed330d6bcae546752434a0ea29168e2a8fa432c8670d7290e70905f3431746b15126e5ce05820e4dd4dd09c982c880a6ce901ab9b3cff298e7f2c8d6a8b491
 DIST SDL_mixer-1.2.12.tar.gz 3707781 BLAKE2B b2fa822204fdaad860ff30307120bff7badbcc042d0b891563973794f715099aa961983e0dbf7e3d936179cbc615517c268f01f4619fcdcd48f18ff66dc49bd1 SHA512 230f6c5a73f4bea364f8aa3d75f76694305571dea45f357def742b2b50849b2d896af71e08689981207edc99a9836088bee2d0bd98d92c7f4ca52b12b3d8cf96
-EBUILD sdl-mixer-1.2.12-r4.ebuild 3258 BLAKE2B 58fea0bdaa21847ac2be6da24cb131e0374468943ba0c015a2bbde26586483edbc3388b8391400351e4349c0ed145dbf5cd3e17153c1352d0be9205dd6bb83ba SHA512 d71014e002a319529d2b3fbd1b8b6d8aa0a68ac257313ad41c20b65bfe1caf1e4d3a0c42a88f37d981e651dc9833bf1b56e4e3426c77638d6f144d008eee780f
+EBUILD sdl-mixer-1.2.12-r4.ebuild 3259 BLAKE2B 8a134c5b13b0566088dde102c4b3040f88be7b0aa878893461ce5256604d01c4d24a3e5549184855ced2655b34a9dd21e0fb646a257295b925c5776aae3a8ff6 SHA512 837ed770e2c9004f20a0af0294296b5a97fbfe96d62e0841cb0a9866c919d89d08736e8bdbb7c511920a9f37ca7603e016e65a1b794115166868c402ff134d64
 MISC metadata.xml 663 BLAKE2B 5d86fe5c016f831f870da2f9b3d0192b6719bc6a98c0101c06c382d62e6100af314f46980ad5c246c8bea9db8ea99e9cd47afe2e5aee5b7887f5f6d529dddee2 SHA512 16a16403ac93fe964330da05038a0e904d0c6e895413994db9ef587170eaf7161f3cc2ce7fb0fe13ded675306b489837d96e837c1002f216b8ffe72d6fd49591
diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild
index d1394db134ec..789b33486221 100644
--- a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild
+++ b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.libsdl.org/projects/SDL_mixer/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="flac fluidsynth mad midi mikmod mod modplug mp3 playtools smpeg static-libs timidity vorbis +wav"
 REQUIRED_USE="
 	midi? ( || ( timidity fluidsynth ) )
diff --git a/media-libs/sdl2-gfx/Manifest b/media-libs/sdl2-gfx/Manifest
index 8bf823cbdee6..2f03d59ad9d5 100644
--- a/media-libs/sdl2-gfx/Manifest
+++ b/media-libs/sdl2-gfx/Manifest
@@ -1,7 +1,3 @@
-DIST SDL2_gfx-1.0.1.tar.gz 1078780 BLAKE2B 4d6430b2cda1b0d7b9556cba0f6084ce80747f75e89fbd6e55cdec194ebf6c73e397571463261a4113cdd8f79baa433d42c0e80dd6083d07331064c3c2203125 SHA512 413f0ac8a60b6c4c91f154dd72a512f410e134642fefb80cd3482646c9aab7dd56d2cc9015e78ee59b5bc89adc7397a248fe2132077c004114ad6505ca4194de
-DIST SDL2_gfx-1.0.3.tar.gz 1271457 BLAKE2B 9f264a89e07a6a6ded6eb93c5d37310259e25624d8eb129368de6335c7d81e3b3976e641f84caba6f1e66a6cc90545f62d07538638f7547568ca35bafdc3b4de SHA512 4efb48501d635492efcfe06b1d4691911ce58ffc34e3b622f2124ac6d8aa6994196ffb52f16ced4325db3ef6d93719516deab2bcf1ce934df9af06c2fecbdce5
 DIST SDL2_gfx-1.0.4.tar.gz 1230588 BLAKE2B a14cf8433aa171b8185aab765c934262fd4ecde4e45e9c8bdfb4aa7feb97676cd8fb5274ad0452bcf77fcc8f268254184fedc73f1c791ff42305d518d01a8cc7 SHA512 81a100d3c8c3a7c6bd37a23f1290ff10685f8e62fbecd83b0086aae4edc721483e2153cd4219fbd9168f115eea0ea6b25f9be375faf5761f0babdfb1b52fe482
-EBUILD sdl2-gfx-1.0.1.ebuild 906 BLAKE2B d6710b74e45fe57a6a18450232f29e2c07ab16fc88d8540f91345afc88a5c60c137e6395ca05fcb2b4a10b066806b00a7af8ab1aedc5e9f4a70a212ec0149a3d SHA512 01444251cadbdfa513c766afaba299f806a4a16a52a39392ec8bb4a4b7a5389ac0bcd2914303de50a24d30e214e92e19f86d2c648038bfe57fe20c6353764897
-EBUILD sdl2-gfx-1.0.3.ebuild 1028 BLAKE2B 9c5757708b108ef66609f009c8011d0313006f9a0534242ef77ab7425f2698cfa6d9660008827e8d38abe4da9404ba615dadb1179878ca79e773f8ee22309d62 SHA512 c02be52f8abac5d7c383cae09c225ed17c106df90a085661dd62b5546081dcdee7f83461ddf49f0586a55aaade2f6e170e614f754a274e470068bd8a34ffbe58
-EBUILD sdl2-gfx-1.0.4.ebuild 1067 BLAKE2B 4ee4d59a955ed8592b42f10f7ada36fdb264fa3dad059bfbf13b5f5876c44d71530899246e53279888085ea70137bb5692b6a37133755b4978e66bde8104521e SHA512 99f6ff4407f67704ee5441f0b756e273231b11f08fb4e8b46a1db5d0098da7a0be4a9fb3d853a7128da9f6103f88795f3ca4f0e5a97c5c04893396e6f4c82ac3
+EBUILD sdl2-gfx-1.0.4.ebuild 1066 BLAKE2B 368a13387d99a6a3076fc939b08d0a75666b7e82e42f35576491ca2301be51f8dc2a873d47ee0a546aaed8e0dacd5bc7734abef83790cffeca59b1651a4acfd1 SHA512 b5518be0697813b18a2585cf02b9ec681b7339f79a53f5fbd16106f8ed0a7228bb4d742a1dcf0391a39dbd55b43bbff73e6c114094d30b84c4baf3eae9d1955b
 MISC metadata.xml 801 BLAKE2B f50f493cdd14251d398a3cd92dc0b282fb7cfeb631998e70654c8c2132a698b375be5bd778cce89944b1ddf98161961e54dcf7db0442ba0b09b61c675a36c9d6 SHA512 9ea5f88ee86ff482c56e86b0e83d4f7c56ec17c46824eac8273981c7f6988df4f83299c98972036551a2bfe96b9b099a9f943de77f3586e9db99dd99909085d4
diff --git a/media-libs/sdl2-gfx/sdl2-gfx-1.0.1.ebuild b/media-libs/sdl2-gfx/sdl2-gfx-1.0.1.ebuild
deleted file mode 100644
index bab6489cad40..000000000000
--- a/media-libs/sdl2-gfx/sdl2-gfx-1.0.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils multilib-minimal
-
-MY_P="${P/sdl2-/SDL2_}"
-DESCRIPTION="Graphics drawing primitives library for SDL2"
-HOMEPAGE="http://www.ferzkopp.net/joomla/content/view/19/14/"
-SRC_URI="http://www.ferzkopp.net/Software/SDL2_gfx/${MY_P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc cpu_flags_x86_mmx static-libs"
-
-DEPEND=">=media-libs/libsdl2-2.0.1-r1[video,${MULTILIB_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	sed -i \
-		-e 's/ -O / /' \
-		configure.in || die
-	mv configure.in configure.ac || die
-	eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable cpu_flags_x86_mmx mmx) \
-		$(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
-	use doc && dohtml -r Docs/html/*
-	prune_libtool_files
-}
diff --git a/media-libs/sdl2-gfx/sdl2-gfx-1.0.3.ebuild b/media-libs/sdl2-gfx/sdl2-gfx-1.0.3.ebuild
deleted file mode 100644
index 290097e34aa9..000000000000
--- a/media-libs/sdl2-gfx/sdl2-gfx-1.0.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools multilib-minimal
-
-MY_P="${P/sdl2-/SDL2_}"
-DESCRIPTION="Graphics drawing primitives library for SDL2"
-HOMEPAGE="http://www.ferzkopp.net/joomla/content/view/19/14/"
-SRC_URI="http://www.ferzkopp.net/Software/SDL2_gfx/${MY_P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc cpu_flags_x86_mmx static-libs"
-
-DEPEND=">=media-libs/libsdl2-2.0.1-r1[video,${MULTILIB_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS ChangeLog README )
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	default
-	sed -i \
-		-e 's/ -O / /' \
-		configure.in || die
-	mv configure.in configure.ac || die
-	eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable cpu_flags_x86_mmx mmx) \
-		$(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	if use doc ; then
-		docinto html
-		dodoc -r Docs/html/*
-	fi
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-}
diff --git a/media-libs/sdl2-gfx/sdl2-gfx-1.0.4.ebuild b/media-libs/sdl2-gfx/sdl2-gfx-1.0.4.ebuild
index 495efb82a36a..b4e1c4ee1c0e 100644
--- a/media-libs/sdl2-gfx/sdl2-gfx-1.0.4.ebuild
+++ b/media-libs/sdl2-gfx/sdl2-gfx-1.0.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.ferzkopp.net/Software/SDL2_gfx/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="doc cpu_flags_x86_mmx static-libs"
 
 DEPEND=">=media-libs/libsdl2-2.0.1-r1[video,${MULTILIB_USEDEP}]"
diff --git a/media-libs/sdl2-image/Manifest b/media-libs/sdl2-image/Manifest
index 6f7c6977ad88..9a748e3f39d7 100644
--- a/media-libs/sdl2-image/Manifest
+++ b/media-libs/sdl2-image/Manifest
@@ -1,7 +1,3 @@
-DIST SDL2_image-2.0.1.tar.gz 7797848 BLAKE2B 2be5fd9714c56040987a66107b49cac60659811fd95bc5b8f9e47196905870793bd258a75b8dad3a83bab50294a8ff5eac0f2132118d9f154019d884ce9cb184 SHA512 99ed5f7b69966cea5fcf9173e7270167c24b55ab459774f10dbf90f26dcb9d5f118971ffd4e583a83148976f44ca166474669398a561169d24ffba80f852306f
-DIST SDL2_image-2.0.2.tar.gz 8680980 BLAKE2B e8930872b572f296744a7a90cb61ee6d8b708b99cde19c2c354f5a3f8a16c3ec7669e21f54632fc4cd69d926e7e18066c89e3099061289999e6ed96c56a2bda0 SHA512 468f1a5aaee0b6920adb80df21aaaa41bfc5c642b4a00ac60244a90c5e9f27b092b73bcdd2c5520aa1de2759e8b174686b186a51f2d07e7e188ce2cd10519724
 DIST SDL2_image-2.0.3.tar.gz 8685512 BLAKE2B c54114f6573632561443bc57af8fe3ddbccc0bfcf027939685add7b06cb6999a5bc41119c474481047a7216ce6110a58a08571fefa6b5c80322f15f0c528ad6f SHA512 869cf3485cc850a91dc1d7f0023f0497bc7bbfd63e721365358b19d19d4da850e52667731d0e5ec80f4a11d7687aa6cfbdd5ceaec956af0e7f5567e87535977a
-EBUILD sdl2-image-2.0.1.ebuild 1513 BLAKE2B 22829c449c686770ea9f7dff2dd32d50db973dc202598008eb83acd9c4c72cd12e8490e8ea4ddba0c996ddac5c127de54007226165fcbfc8fe497e4b25c0b814 SHA512 f3da0090838a632b6a6999671e1c89b907f601d80f7c9e09c98480ed117d7f8c5e210c3febb492cb0df9e47c5b5beae01d0bcee60aaef3e53a31588f959d5266
-EBUILD sdl2-image-2.0.2.ebuild 1526 BLAKE2B ef48f1bb77814177af8a4274b0e7af969077b5b167c4368475635e868b831e748347c0c7b68f27126b15981eab39c9ed789ced0fa3df065be73f81c4af792de9 SHA512 23bce8ebe254a12f4b10b71c8b1429d7b7c58225f5b59d8dd69e90be51d73ee9c8406066909601e0a802d4be14c0792d5ab6254f59def37da6f1d524fccfa8ea
-EBUILD sdl2-image-2.0.3.ebuild 1525 BLAKE2B 917b40753c8b6385895642470a3d2b289a7f9a3cca8cd726ef7aef8f1aa867c543f19e264850464ce5e2bb5b55b3d99ac8ef5860217bd567563b6e84f0261526 SHA512 c84decf93016f1be8390682978712039aea59ff016cc72d26a8d9b7309e9c2a7fdbafa0dd7c45e2cd5c1580c4e9a905f1828c56e691f93b56b8be63248d9f93a
+EBUILD sdl2-image-2.0.3.ebuild 1524 BLAKE2B 3bd4371703ad10beca949c54d87094e52ff1d6a0a0c5423d75eefa355e9bb0700082c5df94dcba93a5fe497efbbba6239eea4932c4e40dceec4d206d8c80e010 SHA512 316594122cb65267148c7478bdd40a52af21021992a6335a8b030152f24320b1f1a096aec5c0e5c23e446c1adeea62d51432a9f5d7ccb63255a07d2af2607439
 MISC metadata.xml 323 BLAKE2B 7d9dc08cddd37155dbaada0cf585700675350e874677346366807037987e1329fa141585f64101bd844d2ffb7bb6e80d0f53793af223f7a9a716f2e2b80bd245 SHA512 5502470417abb179d755e9d913a30e654bc961aeadcf91747b72b0be3823137ea0f344454744b7e3c450ef4923bce844f8281c85b6019f8decd63a50ea307089
diff --git a/media-libs/sdl2-image/sdl2-image-2.0.1.ebuild b/media-libs/sdl2-image/sdl2-image-2.0.1.ebuild
deleted file mode 100644
index 2a8330c5f9d1..000000000000
--- a/media-libs/sdl2-image/sdl2-image-2.0.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils multilib multilib-minimal
-
-MY_P=SDL2_image-${PV}
-DESCRIPTION="Image file loading library"
-HOMEPAGE="http://www.libsdl.org/projects/SDL_image/"
-SRC_URI="http://www.libsdl.org/projects/SDL_image/release/${MY_P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gif jpeg png static-libs tiff webp"
-
-RDEPEND="
-	>=media-libs/libsdl2-2.0.1-r1[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	png? ( >=media-libs/libpng-1.6.10:0[${MULTILIB_USEDEP}] )
-	jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
-	tiff? ( >=media-libs/tiff-3.9.7-r1:0[${MULTILIB_USEDEP}] )
-	webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )"
-DEPEND=${RDEPEND}
-
-S=${WORKDIR}/${MY_P}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable static-libs static) \
-		--disable-sdltest \
-		--enable-bmp \
-		$(use_enable gif) \
-		$(use_enable jpeg jpg) \
-		--disable-jpg-shared \
-		--enable-lbm \
-		--enable-pcx \
-		$(use_enable png) \
-		--disable-png-shared \
-		--enable-pnm \
-		--enable-tga \
-		$(use_enable tiff tif) \
-		--disable-tif-shared \
-		--enable-xcf \
-		--enable-xpm \
-		--enable-xv \
-		$(use_enable webp) \
-		--disable-webp-shared
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-	multilib_is_native_abi && newbin .libs/showimage$(get_exeext) showimage2$(get_exeext)
-}
-
-multilib_src_install_all() {
-	dodoc {CHANGES,README}.txt
-	prune_libtool_files
-}
diff --git a/media-libs/sdl2-image/sdl2-image-2.0.2.ebuild b/media-libs/sdl2-image/sdl2-image-2.0.2.ebuild
deleted file mode 100644
index c3b1db990775..000000000000
--- a/media-libs/sdl2-image/sdl2-image-2.0.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit ltprune multilib multilib-minimal
-
-MY_P="SDL2_image-${PV}"
-DESCRIPTION="Image file loading library"
-HOMEPAGE="http://www.libsdl.org/projects/SDL_image/"
-SRC_URI="http://www.libsdl.org/projects/SDL_image/release/${MY_P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gif jpeg png static-libs tiff webp"
-
-RDEPEND="
-	>=media-libs/libsdl2-2.0.1-r1[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	png? ( >=media-libs/libpng-1.6.10:0[${MULTILIB_USEDEP}] )
-	jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
-	tiff? ( >=media-libs/tiff-3.9.7-r1:0[${MULTILIB_USEDEP}] )
-	webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )"
-DEPEND=${RDEPEND}
-
-S="${WORKDIR}/${MY_P}"
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		--disable-sdltest
-		--enable-bmp
-		$(use_enable gif)
-		$(use_enable jpeg jpg)
-		--disable-jpg-shared
-		--enable-lbm
-		--enable-pcx
-		$(use_enable png)
-		--disable-png-shared
-		--enable-pnm
-		--enable-tga
-		$(use_enable tiff tif)
-		--disable-tif-shared
-		--enable-xcf
-		--enable-xpm
-		--enable-xv
-		$(use_enable webp)
-		--disable-webp-shared
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-	multilib_is_native_abi && newbin .libs/showimage$(get_exeext) showimage2$(get_exeext)
-}
-
-multilib_src_install_all() {
-	dodoc {CHANGES,README}.txt
-	prune_libtool_files
-}
diff --git a/media-libs/sdl2-image/sdl2-image-2.0.3.ebuild b/media-libs/sdl2-image/sdl2-image-2.0.3.ebuild
index 6a2f4bd02d22..f3a5ccfcb4bb 100644
--- a/media-libs/sdl2-image/sdl2-image-2.0.3.ebuild
+++ b/media-libs/sdl2-image/sdl2-image-2.0.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.libsdl.org/projects/SDL_image/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="gif jpeg png static-libs tiff webp"
 
 RDEPEND="
diff --git a/media-libs/sdl2-mixer/Manifest b/media-libs/sdl2-mixer/Manifest
index 0a849c566678..65e3e0d5dee1 100644
--- a/media-libs/sdl2-mixer/Manifest
+++ b/media-libs/sdl2-mixer/Manifest
@@ -1,7 +1,4 @@
-AUX sdl2-mixer-2.0.1-mp3.patch 1169 BLAKE2B d6d4a30fe303adb71de29e297ea8ea2f250b3eaf3cb8285566ec061fcc2d2a737a461aac1df21cb870ab57f5cf43eaf65bac2148724bddc55449e0b5ba7229a2 SHA512 1c649be61ece8715b2a426a041fa548a8cf0d34cf75d3a0e0b37cec40b71637de954b12f0dcadf3cf632fa2897a2b91223ddca89dd863fadecc8ed055546933e
 AUX sdl2-mixer-2.0.2-smpeg.patch 698 BLAKE2B 04f58b64a190c22636c8d0f8218e3070707d9ce75e3be7846baafcbcc36223784c367da111f481377a319562c622d27a3b67b27a32bffc515a32c4e119e65f79 SHA512 78c02a15384e98f846ff9448205da3a43c1e1e39ae9ae33c14651076d5659a83ccd840d67b1044dc19a0da66a07fb98793a78044ae0afa089a26cfbf8951db82
-DIST SDL2_mixer-2.0.1.tar.gz 10213891 BLAKE2B 3f6889e7cf8e4e159bdf18f1e4e9543ffc9160d325c8011fa3b4e7e1903b2b8aa013ef180847c878fe71a8639a069af440c41ae165aeb67d5259338795347a30 SHA512 bdf2b4fc302f9c3b41d40bfdd5132081439e6021e915f191e478235b7b6565e7b4c43e1172d2055066ad505e2bc70876123c58f5a67218b207c829ee66a84b9d
 DIST SDL2_mixer-2.0.2.tar.gz 9620763 BLAKE2B 9257f7f3dc3453b600075011f1879391c4a4def2c67709a883a8803f752928d3883fbe11371609cd5e690647a33b43bfd38f152aa620f63af12e1b7b72fa0ec4 SHA512 c40b5ac93933df1cc932e7afe796ad6765aafb24077601a23f98ac625a83341079ad903c164eafd022aff6011872e7a7956eebd8e3d3edad1bf5dc7eb9c306b7
-EBUILD sdl2-mixer-2.0.1.ebuild 3516 BLAKE2B c70450723d7ad51c24d386a1dd449ec8d3831a59b9c463c6dc57c284c4ace645b85fffc047270e2c4dc74f668206f10a1ab1f8601abf0317138294f0a03c60a4 SHA512 3a2b2b35717f83e4ee71b3c7c204529e3a76f37d39bc5413b5a852d9497cf619dec2b7be90405ef0200dedcb45f6bf95fe6b465aa42ba583f667e25feeec3cbd
-EBUILD sdl2-mixer-2.0.2-r1.ebuild 3259 BLAKE2B 08d851567897ddb597fd461f986f2fd5ef8258fad4827509962a4e583517e7069164c3fae0e4764bc306bb5e66a9d48e38a068f27f3259806affbb99044a74e1 SHA512 05944b81d37837b18ef9b166948ee970ff243e60ca7028d1a93bd42fa262fb5aaa8dc2c0f8afc2c6e1a8c9ce6a8d69e43d8bb9870ec12ae1171bea353646d359
+EBUILD sdl2-mixer-2.0.2-r1.ebuild 3258 BLAKE2B d5962eba570d4b2a42589d498118977cbfdb7baf83c1422c3614920612a7cc6fdb5c3d0623fc74c9a24b5120beffd3ee2409cf8b19380cee0f13c54f879f3fe4 SHA512 5de83350d6b84e8b2cc6db63a786a9495b6d5b4b864634916b69c18ecbb0c2b46dfd14d881a14755c4483f3b1eae5f0b15f5e2a420a7b4cef69d8f6115c4124a
 MISC metadata.xml 751 BLAKE2B 7bc41a1afbb031953f9621d7f9059fc27bb588fc813c4dc68fbc760824a0a1c301997803712b6bc96d9814439fd8274ad388d18d54c2b125b71002247253ea7e SHA512 2376560d848b86e6d3b1728f581cd43bd812b8bfa4e89eb839f2505dfd3f75cfbc3c82bd9a91e571f6021e6ce7ea39df99d964fd29d0159f241539e86d65ce4b
diff --git a/media-libs/sdl2-mixer/files/sdl2-mixer-2.0.1-mp3.patch b/media-libs/sdl2-mixer/files/sdl2-mixer-2.0.1-mp3.patch
deleted file mode 100644
index 6d617e046cb1..000000000000
--- a/media-libs/sdl2-mixer/files/sdl2-mixer-2.0.1-mp3.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-
-diff -r f095b3477c8e -r 6afe73e1e74b configure.in
---- a/configure.in	Sun Jan 03 09:25:52 2016 -0800
-+++ b/configure.in	Mon Jan 04 21:40:14 2016 -0800
-@@ -609,7 +609,6 @@
-                 smpeg_lib=[`find_lib "libsmpeg2*.so.*"`]
-                 ;;
-         esac
--        SOURCES="$SOURCES $srcdir/*_mp3.c"
-         EXTRA_CFLAGS="$EXTRA_CFLAGS -DMP3_MUSIC $SMPEG_CFLAGS"
-         if test x$enable_music_mp3_smpeg_shared = xyes && test x$smpeg_lib != x; then
-             echo "-- dynamic libsmpeg -> $smpeg_lib"
-@@ -637,11 +636,6 @@
-     AC_MSG_RESULT($have_libmad)
-     if test x$have_libmad = xyes; then
-         SOURCES="$SOURCES $srcdir/music_mad.c"
--        if echo "$SOURCES" | grep "load_mp3.c" >/dev/null; then
--            :
--        else
--            SOURCES="$SOURCES $srcdir/load_mp3.c"
--        fi
-         EXTRA_CFLAGS="$EXTRA_CFLAGS -DMP3_MAD_MUSIC"
-         EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lmad"
-     else
-@@ -649,7 +643,9 @@
-     fi
- fi
- 
--if test x$have_smpeg != xyes -a x$have_libmad != xyes; then
-+if test x$have_smpeg = xyes -o x$have_libmad = xyes; then
-+	SOURCES="$SOURCES $srcdir/*_mp3.c"
-+else
-     AC_MSG_WARN([MP3 support disabled])
- fi
- 
-
-
-
-
diff --git a/media-libs/sdl2-mixer/sdl2-mixer-2.0.1.ebuild b/media-libs/sdl2-mixer/sdl2-mixer-2.0.1.ebuild
deleted file mode 100644
index 8fbeeb1f303a..000000000000
--- a/media-libs/sdl2-mixer/sdl2-mixer-2.0.1.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils multilib-minimal
-
-MY_P=SDL2_mixer-${PV}
-DESCRIPTION="Simple Direct Media Layer Mixer Library"
-HOMEPAGE="http://www.libsdl.org/projects/SDL_mixer/"
-SRC_URI="http://www.libsdl.org/projects/SDL_mixer/release/${MY_P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="amd64 ~hppa x86"
-IUSE="flac fluidsynth mad midi mikmod mod modplug mp3 playtools smpeg static-libs timidity tremor vorbis +wav"
-REQUIRED_USE="
-	midi? ( || ( timidity fluidsynth ) )
-	timidity? ( midi )
-	fluidsynth? ( midi )
-	mp3? ( || ( smpeg mad ) )
-	smpeg? ( mp3 )
-	mad? ( mp3 )
-	mod? ( || ( mikmod modplug ) )
-	mikmod? ( mod )
-	modplug? ( mod )
-	tremor? ( vorbis )
-	"
-
-RDEPEND=">=media-libs/libsdl2-2.0.1-r1[${MULTILIB_USEDEP}]
-	flac? ( >=media-libs/flac-1.2.1-r5[${MULTILIB_USEDEP}] )
-	midi? (
-		fluidsynth? ( >=media-sound/fluidsynth-1.1.6-r1[${MULTILIB_USEDEP}] )
-		timidity? ( media-sound/timidity++ )
-	)
-	mp3? (
-		mad? ( >=media-libs/libmad-0.15.1b-r8[${MULTILIB_USEDEP}] )
-		smpeg? ( >=media-libs/smpeg2-2.0.0-r1[${MULTILIB_USEDEP}] )
-	)
-	mod? (
-		modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
-		mikmod? ( >=media-libs/libmikmod-3.3.6-r1[${MULTILIB_USEDEP}] )
-	)
-	vorbis? (
-		tremor? ( >=media-libs/tremor-0_pre20130223[${MULTILIB_USEDEP}] )
-		!tremor? (
-			>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
-			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )
-	)"
-DEPEND=${RDEPEND}
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	# upstream patch to fix building with both smpeg and mad mp3 support (bug #570804)
-	epatch "${FILESDIR}"/${P}-mp3.patch
-	sed -i -e 's/configure.in/configure.ac/' Makefile.in || die
-	mv configure.{in,ac} || die
-	rm acinclude/l*.m4 || die
-	AT_M4DIR=acinclude eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	econf \
-		$(use_enable static-libs static) \
-		--disable-sdltest \
-		--enable-music-cmd \
-		$(use_enable wav music-wave) \
-		$(use_enable mod music-mod) \
-		$(use_enable modplug music-mod-modplug) \
-		--disable-music-mod-modplug-shared \
-		$(use_enable mikmod music-mod-mikmod) \
-		--disable-music-mod-mikmod-shared \
-		$(use_enable midi music-midi) \
-		$(use_enable timidity music-midi-timidity) \
-		$(use_enable fluidsynth music-midi-fluidsynth) \
-		--disable-music-midi-fluidsynth-shared \
-		$(use_enable vorbis music-ogg) \
-		$(use_enable tremor music-ogg-tremor) \
-		--disable-music-ogg-shared \
-		$(use_enable flac music-flac) \
-		--disable-music-flac-shared \
-		$(use_enable mp3 music-mp3) \
-		$(use_enable smpeg music-mp3-smpeg) \
-		--disable-music-mp3-smpeg-shared \
-		--disable-smpegtest \
-		$(use_enable mad music-mp3-mad-gpl) \
-		LIBMIKMOD_CONFIG=${EPREFIX}/usr/bin/${CHOST}-libmikmod-config
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-	if multilib_is_native_abi && use playtools; then
-		emake DESTDIR="${D}" install-bin
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc {CHANGES,README}.txt
-	prune_libtool_files
-}
-
-pkg_postinst() {
-	# bug 412035
-	# https://bugs.gentoo.org/show_bug.cgi?id=412035
-	if use midi ; then
-		if use fluidsynth; then
-			ewarn "FluidSynth support requires you to set the SDL_SOUNDFONTS"
-			ewarn "environment variable to the location of a SoundFont file"
-			ewarn "unless the game or application happens to do this for you."
-
-			if use timidity; then
-				ewarn "Failing to do so will result in Timidity being used instead."
-			else
-				ewarn "Failing to do so will result in silence."
-			fi
-		fi
-	fi
-}
diff --git a/media-libs/sdl2-mixer/sdl2-mixer-2.0.2-r1.ebuild b/media-libs/sdl2-mixer/sdl2-mixer-2.0.2-r1.ebuild
index b2506f31b7c3..727a9d409ddf 100644
--- a/media-libs/sdl2-mixer/sdl2-mixer-2.0.2-r1.ebuild
+++ b/media-libs/sdl2-mixer/sdl2-mixer-2.0.2-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.libsdl.org/projects/SDL_mixer/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa x86"
+KEYWORDS="amd64 ~arm ~hppa x86"
 IUSE="flac fluidsynth mad midi mikmod mod modplug mp3 playtools smpeg static-libs timidity tremor vorbis +wav"
 REQUIRED_USE="
 	midi? ( || ( timidity fluidsynth ) )
diff --git a/media-libs/tiff/Manifest b/media-libs/tiff/Manifest
index 0ca9a04c3619..511c99efaa65 100644
--- a/media-libs/tiff/Manifest
+++ b/media-libs/tiff/Manifest
@@ -13,5 +13,5 @@ DIST tiff-3.9.7.tar.gz 1468097 BLAKE2B 303339acf9bb48558695b13fcc2b41acacbbf2ce6
 DIST tiff-4.0.9.tar.gz 2305681 BLAKE2B 3de03408d2974b9f9f5f2444029cc3018ef43beb67e9fd21be68ee400cdcc6deca1247f055d880841a18b92284ce81f112682c8b5f083ddc61e5255d73a7de3f SHA512 04f3d5eefccf9c1a0393659fe27f3dddd31108c401ba0dc587bca152a1c1f6bc844ba41622ff5572da8cc278593eff8c402b44e7af0a0090e91d326c2d79f6cd
 EBUILD tiff-3.9.7-r1.ebuild 1941 BLAKE2B 38e7fc7b06adec30d32dce66390c5174fa8ca514d8fdc12d6486ed3b8a78b95ea2efb3e083c959892ea65e46853b4c5b7236508c9812736ff0bebce26961d64f SHA512 659c879ae594501bb3a88dde00797d67fd004cbbefbb4403a2374876a6c909cb38f4a7d56256325c5d53fd7ed107849e7c2862f9de777ab6b6d996ec279fe997
 EBUILD tiff-4.0.9-r3.ebuild 2253 BLAKE2B e22e677bf03b5ff4ee7e3e074bb6a3c8f86aa636f3f0700326fd4a4552c4ea524711f954e32729240b43206fb2bd318de3e91d2217e730bbb85653b286c8a12a SHA512 b32c074d598f94498ee81e59e347e75dcbbf4ea7ef2b456c2e98c219b960f42e8d36cce85f8ee2e71010f8fb260ba3a86b5b993e22c1cef041a9729febc643af
-EBUILD tiff-4.0.9-r4.ebuild 2317 BLAKE2B 7552997a6fcfbd84c8a31b52700bacfcf26d6864938b15a4c8e3dff78e789112b98b7e95a41c23505761591083da57eac6c6ae68afc83c771529e0c675a94795 SHA512 1395a5972048bc8229fb484ff9280899ab2c46fd98b899e250891f2837dffa8d7fda0a8056cfcce82c7d245ca3b85c0869150ef8b6bf597e3e8d15721bf12356
+EBUILD tiff-4.0.9-r4.ebuild 2351 BLAKE2B bbd4cdb3ac1b4bdde6c10d7bb80a3b3adcefc7d299156fb3281d4ca5e0dac3e71e0b5c6803d1628ce7b825a76b960a5ab302009760c8244d6f069616219ee5ac SHA512 ea52004b135360c68182ac0582e2812d1e21edc5c2d3af7cd396a66fad46743932a16eab26c25359443a3d63134561fe3c587db7cab70435c8fb362b8aafbf0e
 MISC metadata.xml 565 BLAKE2B 3d487835599974795ba6007439bf1d08756ab1c5dbe191509832b302f3199e4ffc05be64df3e26b4d4a1c11d1292c48cbb59ffa6e412831d16d7415e076f1062 SHA512 289043206dbb512c97e4bb703b32549ac4a77f40e212548b80ea865052b80fed9d4562f9fc94638fda54da9bc3e0c19ba303c027e66e7b75c772aeec91aebe6f
diff --git a/media-libs/tiff/tiff-4.0.9-r4.ebuild b/media-libs/tiff/tiff-4.0.9-r4.ebuild
index f0f7306f5cbf..3daa512c929c 100644
--- a/media-libs/tiff/tiff-4.0.9-r4.ebuild
+++ b/media-libs/tiff/tiff-4.0.9-r4.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
-inherit autotools libtool ltprune multilib-minimal
+inherit autotools libtool multilib-minimal
 
 DESCRIPTION="Tag Image File Format (TIFF) library"
 HOMEPAGE="http://libtiff.maptools.org"
@@ -12,13 +12,14 @@ SRC_URI="http://download.osgeo.org/libtiff/${P}.tar.gz
 
 LICENSE="libtiff"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cxx jbig jpeg lzma static-libs test zlib"
 
-RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
+RDEPEND="
+	jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
 	jbig? ( >=media-libs/jbigkit-2.1:=[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] )"
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}"
 
 REQUIRED_USE="test? ( jpeg )" #483132
@@ -48,6 +49,7 @@ src_prepare() {
 multilib_src_configure() {
 	local myeconfargs=(
 		--without-x
+		--with-docdir=/usr/share/doc/${PF}
 		$(use_enable cxx)
 		$(use_enable jbig)
 		$(use_enable jpeg)
@@ -76,6 +78,6 @@ multilib_src_test() {
 }
 
 multilib_src_install_all() {
-	prune_libtool_files --all
-	rm -f "${ED%/}"/usr/share/doc/${PF}/{COPYRIGHT,README*,RELEASE-DATE,TODO,VERSION}
+	find "${D}" -name '*.la' -delete || die
+	rm "${ED}"/usr/share/doc/${PF}/{COPYRIGHT,README*,RELEASE-DATE,TODO,VERSION} || die
 }
diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index 806183ec0ffc..f4fd6ff2b0c9 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -1,6 +1,8 @@
 AUX vulkan-layers-1.1.77.0-layers-Rework-include-dependencies.patch 2441 BLAKE2B 445a3c6a453c9f08b8b58ac7ccb55fbbb61a942372dc2eebea7cb6552fe071334fd940ecf3e222a2319662b74c11e001ee0d1460720659cd2fdc00cfa9d269c5 SHA512 7582d2e7e3a65598f9a4b559d3c647f0824575c00f3415b1e54a8d3211cf6087f0cb7b95c2c4034888321ff12342817668c09eb0b5b91d2327c1f34cc37eccae
 AUX vulkan-layers-Use-a-file-to-get-the-spirv-tools-commit-ID.patch 1622 BLAKE2B 573fe7c005fa7ff2930b0809071346f6b1fc40a2b6334abefc05c5a1a40e81f370c2b3dd58b7e4ff130195df4b761f4c6cee6af083ac302506c0a677af6f2dd8 SHA512 e3e3963532c100dd08109e74f49d14d073b19647493ad674f6e671a34c9fabb197c85f7c1e8497f2201d004bb1a2f9d56bfda4f4c53377d5c2db56dc46159f4b
 DIST vulkan-layers-1.1.77.0.tar.gz 1099507 BLAKE2B b23efed4b99f3d7ca6a5938467b80fd0e7afed281a44eb5fd24b2e6f1340dd9bcc05d9e4a45ce936a4c90db9d3b8269ae4f4b4a786fefb16f28a0b58df5e265d SHA512 0c7f3cdcf99dafa6ea8d169ef5627c5ee392844bb0e95647faa14998fc3fd121e34ec035ce17567dff61f4efa2d88738e45eda2827b6048ae8ade25adea1a411
+DIST vulkan-layers-1.1.82.0.tar.gz 962993 BLAKE2B 6fe541116f8d4d4370cb5a0b2a98c07139577edf20653359f9f149b503c3d2e9aa98e95af14582c80033b535cc4cec5cc5f148396f472aaf75a8767579978a61 SHA512 c34b691a340830462b917890c97dd86c66eac097ba284183d8bf148267b1a881c909b89c6f9ab78ddd03a60cc884c982bc578cc67e4fbaf37d044004b006a65a
 EBUILD vulkan-layers-1.1.77.0.ebuild 1660 BLAKE2B 866aab2a228bc43e226f1b48ce8ddb9e7149c334cd03ed124f8cabab619aec2b04771e07995855451b3d84cafed3175ae84dcc5aff59d75b3de992ea384ddc9b SHA512 ac65f13a924f4a75c4fa6730e59c9a35c2fb48eeb329cdbb109c973df4c4aa388ac5afb135bfaad9e095bac678780c5550ce46d645d88b1e81fdae44d5846b1f
-EBUILD vulkan-layers-9999.ebuild 1589 BLAKE2B 18735830fd91904282c3e7f38d1dcd095f96541fb41b4f504dc4fdc9f6d4d5daf0ec1c7cd207c07d96421dcd9e4d51656c3d847ad1845c1d0b1976a1222edee3 SHA512 b461f270d7cb92a6c9da25e737388899b122fd7b7d603b2da3a44e3e0e609d0e955903b0f3c279b92c7d04a7479c846ed11c3946bbb637ec6dd5aa3f41085b65
+EBUILD vulkan-layers-1.1.82.0.ebuild 1586 BLAKE2B 875710c4f836f2dd5b056949ea466befbb4bf1eb082b8109ebc4e9be9d91fef2ca5fe8d3dc9f11091aee89eb8242755c773558b6a4493880873e5a79db3cb9cc SHA512 025c48e29741c67f1a683120cb75f39425ed68496d5c49c27ab0d29f907ba1a299a6e231a1e7335c36505123130201d7e54ae7bfe855190aa304989299a3cb79
+EBUILD vulkan-layers-9999.ebuild 1586 BLAKE2B 875710c4f836f2dd5b056949ea466befbb4bf1eb082b8109ebc4e9be9d91fef2ca5fe8d3dc9f11091aee89eb8242755c773558b6a4493880873e5a79db3cb9cc SHA512 025c48e29741c67f1a683120cb75f39425ed68496d5c49c27ab0d29f907ba1a299a6e231a1e7335c36505123130201d7e54ae7bfe855190aa304989299a3cb79
 MISC metadata.xml 441 BLAKE2B a617b1a3cace9597f2f0511c097a775a07469de769cf02d25fbbe82c7354f4f8356c046966f2e7cd577ebb8cbcef07580caedf5c6a68e88973af26e0e257eb12 SHA512 eafe2376c7a220e3f84a287df232ce249e2e80d45dd4402d5b58ab5c2e7faaa6f2d8afc982f767dff2ae2d05ab2df31611b637820a56061d61aba10ccb07a4f2
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.1.82.0.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.1.82.0.ebuild
new file mode 100644
index 000000000000..c1a86b1bc3aa
--- /dev/null
+++ b/media-libs/vulkan-layers/vulkan-layers-1.1.82.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-ValidationLayers.git"
+	EGIT_SUBMODULES=()
+	inherit git-r3
+else
+	EGIT_COMMIT="89bbac497742d48c3d483f78b1bba99101784746"
+	KEYWORDS="~amd64"
+	SRC_URI="https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/Vulkan-ValidationLayers-${EGIT_COMMIT}"
+fi
+
+inherit python-any-r1 cmake-multilib
+
+DESCRIPTION="Vulkan Validation Layers"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-ValidationLayers"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="X wayland"
+
+# Old packaging will cause file collisions
+RDEPEND="!<=media-libs/vulkan-loader-1.1.70.0-r999"
+DEPEND="${PYTHON_DEPS}
+		dev-util/glslang:=[${MULTILIB_USEDEP}]
+		>=dev-util/spirv-tools-2018.2-r1:=[${MULTILIB_USEDEP}]
+		>=dev-util/vulkan-headers-1.1.82.0
+		wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
+		X? (
+		   x11-libs/libX11:=[${MULTILIB_USEDEP}]
+		   x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
+		   )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-Use-a-file-to-get-the-spirv-tools-commit-ID.patch"
+	 )
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=True
+		-DBUILD_WSI_MIR_SUPPORT=False
+		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
+		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
+		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
+		-DBUILD_TESTS=False
+		-DGLSLANG_INSTALL_DIR="/usr"
+		-DVULKAN_HEADERS_INSTALL_DIR="/usr"
+	)
+	cmake-utils_src_configure
+}
diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
index b2e238baddb1..c1a86b1bc3aa 100644
--- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
@@ -9,7 +9,7 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_SUBMODULES=()
 	inherit git-r3
 else
-	EGIT_COMMIT="0ec7ce985fba34d5303f84f09fab79cd2b9874a8"
+	EGIT_COMMIT="89bbac497742d48c3d483f78b1bba99101784746"
 	KEYWORDS="~amd64"
 	SRC_URI="https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/Vulkan-ValidationLayers-${EGIT_COMMIT}"
@@ -29,7 +29,7 @@ RDEPEND="!<=media-libs/vulkan-loader-1.1.70.0-r999"
 DEPEND="${PYTHON_DEPS}
 		dev-util/glslang:=[${MULTILIB_USEDEP}]
 		>=dev-util/spirv-tools-2018.2-r1:=[${MULTILIB_USEDEP}]
-		>=dev-util/vulkan-headers-1.1.77.0-r1
+		>=dev-util/vulkan-headers-1.1.82.0
 		wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
 		X? (
 		   x11-libs/libX11:=[${MULTILIB_USEDEP}]
diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest
index 519e56f451d6..255b20098cdc 100644
--- a/media-libs/vulkan-loader/Manifest
+++ b/media-libs/vulkan-loader/Manifest
@@ -2,9 +2,9 @@ AUX vulkan-loader-1.1.70.0-Dont-require-glslang-if-not-building-layers.patch 173
 AUX vulkan-loader-1.1.77.0-loader-Rework-include-dependencies.patch 2018 BLAKE2B 354a11d423eabf14ce340117adee3e61e9402997b1894e35661e9c5ef88e85dbe97d65579304359e8484302c69e1bbf0bef22bd98f50ffa74ce1fe6c0355f51e SHA512 91045102cd2b53f2469748b398667d27a23d0a8c56f2a82e454a5634b3a05152af370797eae1153317ec9cf0c854dc9c7547265adf162be2e51f6134fbfa7c58
 AUX vulkan-loader-Fix-layers-install-directory.patch 1021 BLAKE2B deb7ed63d90f67afce300caa421f4a9760bf182caa4e4f4fe1b70bb4a0216f793dab2af2c1ec197f0bd12a55dc413376f500598c48932cf3bcf58bf35433e6fa SHA512 faaf9bb15bc6930655289db77a75494de996e3aa9bbda359794d942546bdd350480137fc43f2c0152ee0b0f25797920e7ada74eaaf70d98c212e83dcf607820f
 AUX vulkan-loader-Use-a-file-to-get-the-spirv-tools-commit-ID.patch 1608 BLAKE2B eadbe49f109ce32c7ad75739ba43f7629a3955fb5a9fdf03ac6e16f890394b13b95c979ee456b75964ff421e016dd7a0c47acbe6c79f3a5f28813dbbad61e874 SHA512 d371cde49a630b7530b25a5fa6ccc2324885048320db0a140f9ba09b490a40edf460602ffc156767b1773a88d642d6917d73cb13ac869f811c68b00cfc00d297
-DIST vulkan-loader-1.1.70.0.tar.gz 4107351 BLAKE2B 86859e74839a0a7c667476db62a1bc73d89f22e6bb951f2742bc6990ed498e9201bd17973e887f360b2eec610e29d547e79d5323ed74fd5618cb0fc75dbba063 SHA512 ae57e6890225b6e4607fde04a296a14bc54fd6b61b360b771bd24f00607dcb6fff06b3ec38a761173c92c90628a139f1424445e174c21adad4af6f445b91ed26
 DIST vulkan-loader-1.1.77.0.tar.gz 1512876 BLAKE2B bf5fbf3623f0ca2b2473d496edd23ce388313d7dbeb8e3f95549da5726a1ab25fcce673d5dd3df094d3abdd2c5ecc4a87759a80e7d05d7b34abf30ee325895f2 SHA512 95fe179c93df1ea36cee8123588b232433c988e9a5889a606e7adbc4192d6a4bc8809f9936cf11ae953090392d0c9e4265697b608adacc7eb7cf6479baf49f48
-EBUILD vulkan-loader-1.1.70.0-r1.ebuild 1785 BLAKE2B b14e7913fb9590f0d4aff705ddd0e70120be563b7e37a33418807b58c99fbf2aef17598a60bb1a3d5b6155c797a69065cf34e42035ed34093d9f66d303c82d7b SHA512 3be5109ba59fa832a27b159354a07a115811f45949c74fde265c8753a3fdaa61ded474584fedd62b5c28e859b39796be1fa3e8021ca3e95b6800747596ddfbf0
+DIST vulkan-loader-1.1.82.0.tar.gz 1342427 BLAKE2B 4b2c589e2c1edaa29e13e892cc839f2d7af5bbadf7dda3f50eca2543c1877af175e9640545b886ffe3e8b1c51373502ee272829ddb15c07629ea08ece697e5b9 SHA512 624e493454e622e29bc0de5fdf1c425691b3c98f317660847e95aee6bc42dafa0b4d8caa9de52e8f3229b7e743afa475485cd3affbdb295e16ba49d30d1eb19e
 EBUILD vulkan-loader-1.1.77.0.ebuild 1673 BLAKE2B df999944df1c2192ad1d523e4c1d5273333818ce12efabf5f4ed18c4e48ebc0c7c538e0708b6fea13b5fc95e7f5fb8c586737a645113049e083cf15606884965 SHA512 375e9482d951f3866ca079a7e4a5205ac71fbf3519a91a21b84dd749abea8a6e6b2441b0d0bccbc14f21e3d786aa0ddc6ffc383f63be2054e25e93847b6a4f78
-EBUILD vulkan-loader-9999.ebuild 1582 BLAKE2B 66c19b3c7d53aeb752606921a61504a4298d6d714c36b27d809aadda683552fd19ab7640578b0a62466dc50651e4f0fea205587d81bfb99e2d0e5e5f3ad13624 SHA512 ac1ee088a9887eb45b8d26106b0e55cf84d14260dc251ba84e1f05be22320745207b2ae1cf32107e99a9d9d2ea86a324a4b636af5e9a28b0190429c56705bf30
-MISC metadata.xml 474 BLAKE2B a6924616c2d59914dc11c4e8ad4f0f5bfbdaa923d3bf4c6488cc9b52b6319b285d3470d7d724ee38b4bfc27ff442d103209b6681c634bd0770ced3d907597e87 SHA512 8122c1adabb7b4d2128a2885a816f348c5c34e22a14a63f0f7452ce74ff646bd7a4496d730c465740143dbd6b2aeb63fa4a212cea6414dc99d13a26044a29574
+EBUILD vulkan-loader-1.1.82.0.ebuild 1579 BLAKE2B 05f92e8a778677a99ae5779bb6081a210502e39040705b5223365d4b6757d4f72de9a79017173181039b2c7dd096fe827b782dfe2cc673b3491f987f06536941 SHA512 a2f86faefe1870778c5232c50451dedf5e4b959f4cf9c1983ffb0a42065fcbd74429a06c12832325ab318cfa3dabd235a5680c6d34d5cdf982e8642826e543ab
+EBUILD vulkan-loader-9999.ebuild 1579 BLAKE2B 05f92e8a778677a99ae5779bb6081a210502e39040705b5223365d4b6757d4f72de9a79017173181039b2c7dd096fe827b782dfe2cc673b3491f987f06536941 SHA512 a2f86faefe1870778c5232c50451dedf5e4b959f4cf9c1983ffb0a42065fcbd74429a06c12832325ab318cfa3dabd235a5680c6d34d5cdf982e8642826e543ab
+MISC metadata.xml 414 BLAKE2B 53100d7021d8350e960e2b087bba612ee99f6ce960b63964aa2ba50b1172f5b9fe13fb9addb069ae74cc03292b92fc88838b41eac1083c8779dcb8e0e480d1dc SHA512 6328c52f607ed4ea3ba31430f63df84e942ea3e6726b5107c8840e3869725bd7407b446d4f905765a0c6d6dd04fda643bd2b5e06681f6ac771bbb4fbc8d4c417
diff --git a/media-libs/vulkan-loader/metadata.xml b/media-libs/vulkan-loader/metadata.xml
index 5896567b6cb5..6d56c31a9fe5 100644
--- a/media-libs/vulkan-loader/metadata.xml
+++ b/media-libs/vulkan-loader/metadata.xml
@@ -9,7 +9,6 @@
 		<remote-id type="github">KhronosGroup/Vulkan-LoaderAndValidationLayers</remote-id>
 	</upstream>
 	<use>
-		<flag name="demos">Build vulkan demos and vulkaninfo</flag>
-		<flag name="layers">Build the vulkan layers</flag>
+		<flag name="layers">Include the vulkan layers</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.1.70.0-r1.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.1.70.0-r1.ebuild
deleted file mode 100644
index 3f8fd8e41b38..000000000000
--- a/media-libs/vulkan-loader/vulkan-loader-1.1.70.0-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/archive/sdk-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/Vulkan-LoaderAndValidationLayers-sdk-${PV}"
-fi
-
-inherit python-any-r1 cmake-multilib
-
-DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="demos layers wayland X"
-REQUIRED_USE="demos? ( X )"
-
-RDEPEND=""
-DEPEND="${PYTHON_DEPS}
-	demos? ( dev-util/glslang:=[${MULTILIB_USEDEP}] )
-	layers? (
-			dev-util/glslang:=[${MULTILIB_USEDEP}]
-			>=dev-util/spirv-tools-2018.2-r1:=[${MULTILIB_USEDEP}]
-		)
-	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
-	X? (
-		x11-libs/libX11:=[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
-	)"
-
-PATCHES=(
-		"${FILESDIR}/${P}-Dont-require-glslang-if-not-building-layers.patch"
-		"${FILESDIR}/${PN}-Fix-layers-install-directory.patch"
-		"${FILESDIR}/${PN}-Use-a-file-to-get-the-spirv-tools-commit-ID.patch"
-	)
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=True
-		-DBUILD_TESTS=False
-		-DBUILD_LAYERS=$(usex layers)
-		-DBUILD_DEMOS=$(usex demos)
-		-DBUILD_VKJSON=False
-		-DBUILD_LOADER=True
-		-DBUILD_WSI_MIR_SUPPORT=False
-		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
-		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
-		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
-	)
-	cmake-utils_src_configure
-}
-
-multilib_src_install() {
-	keepdir /etc/vulkan/icd.d
-
-	cmake-utils_src_install
-}
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.1.82.0.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.1.82.0.ebuild
new file mode 100644
index 000000000000..8fdb1e92bdf8
--- /dev/null
+++ b/media-libs/vulkan-loader/vulkan-loader-1.1.82.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Loader.git"
+	EGIT_SUBMODULES=()
+	inherit git-r3
+else
+	KEYWORDS="~amd64"
+	EGIT_COMMIT="979f925d939e4daa3c823bd2b9d46ca479481fe9"
+	SRC_URI="https://github.com/KhronosGroup/Vulkan-Loader/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/Vulkan-Loader-${EGIT_COMMIT}"
+fi
+
+inherit python-any-r1 cmake-multilib
+
+DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Loader"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="layers wayland X"
+
+PDEPEND="layers? ( media-libs/vulkan-layers:=[${MULTILIB_USEDEP}] )"
+DEPEND="${PYTHON_DEPS}
+	>=dev-util/vulkan-headers-1.1.82.0
+	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
+	X? (
+		x11-libs/libX11:=[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
+	)"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=True
+		-DBUILD_TESTS=False
+		-DBUILD_LOADER=True
+		-DBUILD_WSI_MIR_SUPPORT=False
+		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
+		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
+		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
+		-DVULKAN_HEADERS_INSTALL_DIR="/usr"
+	)
+	cmake-utils_src_configure
+}
+
+multilib_src_install() {
+	keepdir /etc/vulkan/icd.d
+
+	cmake-utils_src_install
+}
+
+pkg_postinst() {
+	einfo "USE=demos has been dropped as per upstream packaging"
+	einfo "vulkaninfo is now available in the dev-util/vulkan-tools package"
+}
diff --git a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
index 0331bbbe2b69..8fdb1e92bdf8 100644
--- a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
@@ -10,7 +10,7 @@ if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 else
 	KEYWORDS="~amd64"
-	EGIT_COMMIT="c71d5027a9d7fe4b170c0ff69bad67efd1d530cf"
+	EGIT_COMMIT="979f925d939e4daa3c823bd2b9d46ca479481fe9"
 	SRC_URI="https://github.com/KhronosGroup/Vulkan-Loader/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/Vulkan-Loader-${EGIT_COMMIT}"
 fi
@@ -26,7 +26,7 @@ IUSE="layers wayland X"
 
 PDEPEND="layers? ( media-libs/vulkan-layers:=[${MULTILIB_USEDEP}] )"
 DEPEND="${PYTHON_DEPS}
-	>=dev-util/vulkan-headers-1.1.77.0-r1
+	>=dev-util/vulkan-headers-1.1.82.0
 	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
 	X? (
 		x11-libs/libX11:=[${MULTILIB_USEDEP}]
diff --git a/media-libs/waffle/Manifest b/media-libs/waffle/Manifest
index 02345c166e05..5a64d89d9c27 100644
--- a/media-libs/waffle/Manifest
+++ b/media-libs/waffle/Manifest
@@ -1,4 +1,4 @@
 DIST waffle-1.5.2.tar.xz 179284 BLAKE2B 40befb3e4463605e303b404677268d4758f6a43f5d83bee5e74222e2e2bf949f51444c0df68291ef0edc76be313363eca3e59e642b0356451c10703e66d96e56 SHA512 04f90f70421c88418d1d98175b552de9e036ea36b6c870a6c968c7fcc2d4cb2fa4ce08b0adcdd50f4853a7503558eae7a05ef75b292cf85d3c9796e7b342ca62
-EBUILD waffle-1.5.2.ebuild 1588 BLAKE2B 31f81f4134cd77403add1e283875fd9f54bb04df770bf50b83af8b2169eee2ccf7fd77ff412c37838882615d0e97d69ec31161517d838e23479dd4f364cd98fc SHA512 cf7dadaf9b902ecd6c1afdb0d0169514ada5962557cb9f2b55fda83e8b9050affc9d904529dacd0fb0adeab5bcdc86a646c41ec857a9d1fdeb7c3f63686493c6
-EBUILD waffle-9999.ebuild 1568 BLAKE2B 0b0d86df3b63730d185c115e7ea0cefa2a2b3a632e1002b84dbe31cfaf2871591385eca2fc66e556dac660e08b3be591f2b84be2675774fd42b9b11a2b7303fd SHA512 d4cad6393e0bbcf2c91dbb8811629e523495f12c5951cd7b70b1a8351fee0ed72528a1364500201e94777215b1402038fe188e24951ced3f7827bedbe24a6395
+EBUILD waffle-1.5.2.ebuild 1414 BLAKE2B a88cd403d6173d0af963f2534d9df66a1b4ff184de9fcc98f88981eaea50bb338e58c12f165d5c320eb2071e6716d1dee3b6155c6367b13586e42b6cd8b9e1f2 SHA512 d0fca799279802a5deb3e8f32e85d3d63058f96ac78c8839c91f8bd2644f0fd35ea7bba647d24a57c6723f1f36340a63c5be6de264db71b8231a3ed692f85feb
+EBUILD waffle-9999.ebuild 1417 BLAKE2B c31f5b83990c3a8ef7ae90106bbf39fc508731fded1909fbb508beb3eede5ff5cf987f97602ecaf3e22e2d37348cebe1af472d26f345a85b89cae82073721606 SHA512 4f6ecbeaf8b830dcef8d57511ff8f1856f78c75b8186c9fecd194653b0a5f4184fbce7de7cfadc84b9868324fbd995bbae78fb7215cfab7db4587b3b21619a96
 MISC metadata.xml 416 BLAKE2B 961afc9a4ed531bd3816c8e7b1c37a9f6be25b912d94b6f79811da67cecd8476964934b9ff943fc98be6177feee1c2eacd3295777a1d873ec1cf3cd58cf20e82 SHA512 850db93f3892afdb36d471b55e911c9cdfc114bcd69b4ce9e59246eb688b145ab5916d9529ded4b913f0cfb6da5fd2d64b7854c9501abec9fd9d860e1953100d
diff --git a/media-libs/waffle/waffle-1.5.2.ebuild b/media-libs/waffle/waffle-1.5.2.ebuild
index ec71eacc2bfe..2be51a342803 100644
--- a/media-libs/waffle/waffle-1.5.2.ebuild
+++ b/media-libs/waffle/waffle-1.5.2.ebuild
@@ -1,25 +1,19 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-EGIT_REPO_URI="https://github.com/waffle-gl/${PN}.git"
-
-if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git-2"
-fi
-
-inherit cmake-utils cmake-multilib ${GIT_ECLASS}
-
-DESCRIPTION="Library that allows selection of GL API and of window system at runtime"
-HOMEPAGE="https://people.freedesktop.org/~chadversary/waffle/"
-
-if [[ $PV = 9999* ]]; then
-	KEYWORDS="~ppc ~ppc64"
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/waffle-gl/${PN}.git"
+	GIT_ECLASS="git-r3"
 else
 	SRC_URI="https://people.freedesktop.org/~chadversary/${PN}/files/release/${P}/${P}.tar.xz"
 	KEYWORDS="amd64 arm ~ppc ~ppc64 x86"
 fi
+inherit cmake-multilib ${GIT_ECLASS}
+
+DESCRIPTION="Library that allows selection of GL API and of window system at runtime"
+HOMEPAGE="https://people.freedesktop.org/~chadversary/waffle/"
 
 LICENSE="BSD-2"
 SLOT="0"
@@ -28,31 +22,28 @@ IUSE="doc egl gbm test wayland"
 RDEPEND="
 	>=media-libs/mesa-9.1.6[egl?,gbm?,${MULTILIB_USEDEP}]
 	>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
-	wayland? ( >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )
-	gbm? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )
 	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]"
+	>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
+	gbm? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )
+	wayland? ( >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )
+"
 DEPEND="${RDEPEND}
 	>=x11-base/xcb-proto-1.8-r3[${MULTILIB_USEDEP}]
 	doc? (
 		dev-libs/libxslt
 		app-text/docbook-xml-dtd:4.2
-	)"
-
-src_unpack() {
-	default
-	[[ $PV = 9999* ]] && git-2_src_unpack
-}
+	)
+"
 
 src_configure() {
 	local mycmakeargs=(
 		-Dwaffle_has_glx=ON
 		-Dwaffle_build_examples=OFF
-		$(cmake-utils_use doc waffle_build_manpages)
-		$(cmake-utils_use egl waffle_has_x11_egl)
-		$(cmake-utils_use gbm waffle_has_gbm)
-		$(cmake-utils_use test waffle_build_tests)
-		$(cmake-utils_use wayland waffle_has_wayland)
+		-Dwaffle_build_manpages=$(usex doc )
+		-Dwaffle_has_x11_egl=$(usex egl)
+		-Dwaffle_has_gbm=$(usex gbm)
+		-Dwaffle_build_tests=$(usex test)
+		-Dwaffle_has_wayland=$(usex wayland)
 	)
 
 	cmake-multilib_src_configure
diff --git a/media-libs/waffle/waffle-9999.ebuild b/media-libs/waffle/waffle-9999.ebuild
index 23384f2ecadf..dc2a60608875 100644
--- a/media-libs/waffle/waffle-9999.ebuild
+++ b/media-libs/waffle/waffle-9999.ebuild
@@ -1,26 +1,20 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-EGIT_REPO_URI="https://github.com/waffle-gl/${PN}.git"
-
-if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git-2"
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/waffle-gl/${PN}.git"
+	GIT_ECLASS="git-r3"
+else
+	SRC_URI="https://people.freedesktop.org/~chadversary/${PN}/files/release/${P}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 fi
-
-inherit cmake-utils cmake-multilib ${GIT_ECLASS}
+inherit cmake-multilib ${GIT_ECLASS}
 
 DESCRIPTION="Library that allows selection of GL API and of window system at runtime"
 HOMEPAGE="https://people.freedesktop.org/~chadversary/waffle/"
 
-if [[ $PV = 9999* ]]; then
-	KEYWORDS=""
-else
-	SRC_URI="https://people.freedesktop.org/~chadversary/${PN}/files/release/${P}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
 LICENSE="BSD-2"
 SLOT="0"
 IUSE="doc egl gbm test wayland"
@@ -28,31 +22,28 @@ IUSE="doc egl gbm test wayland"
 RDEPEND="
 	>=media-libs/mesa-9.1.6[egl?,gbm?,${MULTILIB_USEDEP}]
 	>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
-	wayland? ( >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )
-	gbm? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )
 	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]"
+	>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
+	gbm? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )
+	wayland? ( >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )
+"
 DEPEND="${RDEPEND}
 	>=x11-base/xcb-proto-1.8-r3[${MULTILIB_USEDEP}]
 	doc? (
 		dev-libs/libxslt
 		app-text/docbook-xml-dtd:4.2
-	)"
-
-src_unpack() {
-	default
-	[[ $PV = 9999* ]] && git-2_src_unpack
-}
+	)
+"
 
 src_configure() {
 	local mycmakeargs=(
 		-Dwaffle_has_glx=ON
 		-Dwaffle_build_examples=OFF
-		$(cmake-utils_use doc waffle_build_manpages)
-		$(cmake-utils_use egl waffle_has_x11_egl)
-		$(cmake-utils_use gbm waffle_has_gbm)
-		$(cmake-utils_use test waffle_build_tests)
-		$(cmake-utils_use wayland waffle_has_wayland)
+		-Dwaffle_build_manpages=$(usex doc )
+		-Dwaffle_has_x11_egl=$(usex egl)
+		-Dwaffle_has_gbm=$(usex gbm)
+		-Dwaffle_build_tests=$(usex test)
+		-Dwaffle_has_wayland=$(usex wayland)
 	)
 
 	cmake-multilib_src_configure
author	V3n3RiX <venerix@redcorelinux.org>	2018-09-21 18:00:10 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-09-21 18:00:10 +0100
commit	265dbe5dbc14c199299496c6db8fce3f76647015 (patch)
tree	ab18b5617d138f6684566b619405090989d55a2c /media-libs
parent	586819755b4dbfdffdc8a725ab7c0f86095b8489 (diff)