gentoo resync : 03.11.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-11-03 16:06:58 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-11-03 16:06:58 +0000
commit: bd4aeefe33e63f613512604e47bfca7b2187697d (patch)
tree: adb35b5a9a00ee7ea591ab0c987f70167c23b597 /media-libs
parent: 48ece6662cbd443015f5a57ae6d8cbdbd69ef37c (diff)
118 files changed, 2085 insertions, 1050 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index e7ddef744665..bcbc7154dbc1 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/babl/Manifest b/media-libs/babl/Manifest
index 09805939ce87..eadeb1510564 100644
--- a/media-libs/babl/Manifest
+++ b/media-libs/babl/Manifest
@@ -3,10 +3,12 @@ DIST babl-0.1.38.tar.bz2 653047 BLAKE2B 8bc43a7e0b7265f72122743ff4b3e25825e4bbe6
 DIST babl-0.1.62.tar.bz2 698161 BLAKE2B 21fdc009e56d40a8ee08509161dcad10c3f5b41c42ab7f2d64f888762a15b3dd4b6723a4caa4aea7c977179007db4b6e39b6ab9fde4c68bb24ea170ccf29dbd3 SHA512 4d2ba25e39b8dcb122913731861fa04cafd97388a1c354afb2188e8582ac78e9e32f838e2be8e9f41ee9ac582081fdee1d79accb60e824b8b2c12995f96a8293
 DIST babl-0.1.64.tar.bz2 705991 BLAKE2B a22522f3c9ce73b4a0d29f2dddae870e7d241c4456295cab8b3a1d6441dcc7221c510ace57ba22a86ad8aff605734430396b65dbad3a51d306344d0a230034bc SHA512 b728c2973f80b62e2ee62307880e00a95a90839e778644dd6ab4076e43708e4939c8162b9a6a474dc3c3c4c087475d51eb64d2effd6dcdf969696060cc22a8aa
 DIST babl-0.1.66.tar.bz2 706100 BLAKE2B 0de443dd4ea32cd025c8b121f042c24528677f32a6c201f3abedd13fb3a2ce2636d03f4b45eefce2c9f7a86426355af9b584602ca9ebb1a2140ee88f500c2843 SHA512 41534eea6cad21eae704af3fdce4857e9dc2b0efa48a7cfd7f98b23428198e95fc9ca2f30e522abf2fa06e907eaf4f7bbafc048b356cb5890fabcb9be21001b3
+DIST babl-0.1.72.tar.xz 293660 BLAKE2B 454b663753597c9b626f8fd1f6604e50cd0e9f5e4a62c8646b6904e97f79ed29a3e151a70593f191bed098192b3993e7f05049b3d6533ece0ac901cf00515cd0 SHA512 55425688467d565acecbe3657ed4191971fe70d0da0f69c348eec8a6db9807f3e27f5101cade2d886d017b5156e4ef56382df93f26cc335acb4ce33bbef23d6b
 EBUILD babl-0.1.12.ebuild 1328 BLAKE2B 800e1330f71eaffac72e111a35fa226b478051694f2cb6684f2f98c47b33511faf4f47d35d7e50ad8647c5caa06b961d12d53930ee32ea0139d9ed336753d59d SHA512 e8b6f06d0fe455b312f5cd1687d2f7eb50dcc4dadf8b7e38e49f91123aa3193ce3b663577e887c2356c400030c256ac30eb120cf5c06de863e7924c8bebf2d59
 EBUILD babl-0.1.38.ebuild 1451 BLAKE2B 9813a49605fae9ca6e5ff3a57205511a3e82ab6091e147a108398aff74ef260193df9306f7b67ccd67442d88f8811870a85ff512635e9cc6e6dcdcf4f3374a0c SHA512 b971cb3d4f1a1bf6d18482a1244eee5d566d02da0f9e683b8ce9420a9f0ca3446239ff7fee20900994efc2e515a02cc3fa0e3b2cc307d823e53efdcfe0b60a98
 EBUILD babl-0.1.62.ebuild 1524 BLAKE2B 534897c0657474eb7bc11e7936beae3b70885ee9f424bf87337b8a1f69c51112a564e45515036031e3f44d612de3558e81ad4990c0bb008a49d02013eefee359 SHA512 7d2b17d83e5b67602444ac9872756d91b17051747eb689b0bd0c32875d166cfb96f90ba084100aeed0085b95e2c2dbe4f76c359bce193ec9d009a732972a42b6
 EBUILD babl-0.1.64.ebuild 1533 BLAKE2B 04b78ca906fc77ca656bc43e246abb57e8f7643c703006ec013e9fca06084a0569b94f8f426b9d0923001f16bc8eb6058b6877cf055a302ec5c3d41994c2ef52 SHA512 0ba6b80c0d0540734a7789520794f3ebf6dbfab1f8ba992fbe921ad5d65ac9be201ebcab0e7bea145ab7d85b00d26ca0ab04ffe77b873ef1628c5eb61097f380
 EBUILD babl-0.1.66.ebuild 1533 BLAKE2B 04b78ca906fc77ca656bc43e246abb57e8f7643c703006ec013e9fca06084a0569b94f8f426b9d0923001f16bc8eb6058b6877cf055a302ec5c3d41994c2ef52 SHA512 0ba6b80c0d0540734a7789520794f3ebf6dbfab1f8ba992fbe921ad5d65ac9be201ebcab0e7bea145ab7d85b00d26ca0ab04ffe77b873ef1628c5eb61097f380
-EBUILD babl-9999.ebuild 1533 BLAKE2B 04b78ca906fc77ca656bc43e246abb57e8f7643c703006ec013e9fca06084a0569b94f8f426b9d0923001f16bc8eb6058b6877cf055a302ec5c3d41994c2ef52 SHA512 0ba6b80c0d0540734a7789520794f3ebf6dbfab1f8ba992fbe921ad5d65ac9be201ebcab0e7bea145ab7d85b00d26ca0ab04ffe77b873ef1628c5eb61097f380
-MISC metadata.xml 216 BLAKE2B a7f17874d9514cafd0bbab739d143a00ac66ad8446bce8e05932d122c1631d29ad8077c2bcda021bc92b7e89b77c03d55e8997cf250f3bb55f8a1aca046bb2a7 SHA512 1de1c9f4b223876125a0321126f2d7b1b564a113d24ae86b380c4d67bdf58ed4f2ae1a1f5d686211ccf4851eea8e970c20109977abbc79d0cd855164b6474e23
+EBUILD babl-0.1.72.ebuild 1527 BLAKE2B 65dd29d72fcc54fa330811d76371ff74c185d0a82b942ee2fc6166ca4e2cd910bb4f8bbbf8e9df70e255514f7381e49d2cfc2a4e8bec5c7ece5583d58e31f8a3 SHA512 fced31549369fd47471f87147e24b9c27730d1afdc0f093fdd092213d969cb3d4b372e17dc4f2bcf9824ea3efa43a5e2d06e4e8f2a761248e4e23d7fafc46ca0
+EBUILD babl-9999.ebuild 1527 BLAKE2B 65dd29d72fcc54fa330811d76371ff74c185d0a82b942ee2fc6166ca4e2cd910bb4f8bbbf8e9df70e255514f7381e49d2cfc2a4e8bec5c7ece5583d58e31f8a3 SHA512 fced31549369fd47471f87147e24b9c27730d1afdc0f093fdd092213d969cb3d4b372e17dc4f2bcf9824ea3efa43a5e2d06e4e8f2a761248e4e23d7fafc46ca0
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/media-libs/babl/babl-0.1.72.ebuild b/media-libs/babl/babl-0.1.72.ebuild
new file mode 100644
index 000000000000..7aeda229c138
--- /dev/null
+++ b/media-libs/babl/babl-0.1.72.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/babl.git"
+	SRC_URI=""
+else
+	SRC_URI="http://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="A dynamic, any to any, pixel format conversion library"
+HOMEPAGE="http://www.gegl.org/babl/"
+
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE="cpu_flags_x86_avx2 cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_mmx cpu_flags_x86_f16c introspection lcms"
+
+RDEPEND="lcms? ( media-libs/lcms:2 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_configure() {
+	# Automagic rsvg support is just for website generation we do not call,
+	#     so we don't need to fix it
+	# w3m is used for dist target thus no issue for us that it is automagically
+	#     detected
+	local emesonargs=(
+		$(meson_use cpu_flags_x86_mmx enable-mmx)
+		$(meson_use cpu_flags_x86_sse enable-sse)
+		$(meson_use cpu_flags_x86_sse2 enable-sse2)
+		$(meson_use cpu_flags_x86_sse3 enable-sse3)
+		$(meson_use cpu_flags_x86_sse4_1 enable-sse4_1)
+		$(meson_use cpu_flags_x86_avx2 enable-avx2)
+		$(meson_use cpu_flags_x86_f16c enable-f16c)
+		$(meson_use introspection enable-gir)
+		-Dwith-docs=false
+		$(meson_use lcms with-lcms)
+	)
+	meson_src_configure
+}
diff --git a/media-libs/babl/babl-9999.ebuild b/media-libs/babl/babl-9999.ebuild
index 634e2a1ade64..7aeda229c138 100644
--- a/media-libs/babl/babl-9999.ebuild
+++ b/media-libs/babl/babl-9999.ebuild
@@ -3,12 +3,14 @@
 
 EAPI=7
 
+inherit meson
+
 if [[ ${PV} == *9999* ]]; then
-	inherit autotools git-r3
+	inherit git-r3
 	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/babl.git"
 	SRC_URI=""
 else
-	SRC_URI="http://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
+	SRC_URI="http://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
@@ -17,38 +19,29 @@ HOMEPAGE="http://www.gegl.org/babl/"
 
 LICENSE="LGPL-3"
 SLOT="0"
-IUSE="altivec cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_mmx cpu_flags_x86_f16c"
+IUSE="cpu_flags_x86_avx2 cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_mmx cpu_flags_x86_f16c introspection lcms"
 
-RDEPEND=""
+RDEPEND="lcms? ( media-libs/lcms:2 )"
 DEPEND="${RDEPEND}
-	>=sys-devel/libtool-2.2
 	virtual/pkgconfig
 "
 
-src_prepare() {
-	default
-	[[ ${PV} == *9999* ]] && eautoreconf
-}
-
 src_configure() {
 	# Automagic rsvg support is just for website generation we do not call,
 	#     so we don't need to fix it
 	# w3m is used for dist target thus no issue for us that it is automagically
 	#     detected
-	econf \
-		--disable-docs \
-		--disable-static \
-		--disable-maintainer-mode \
-		$(use_enable altivec) \
-		$(use_enable cpu_flags_x86_f16c f16c) \
-		$(use_enable cpu_flags_x86_mmx mmx) \
-		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_enable cpu_flags_x86_sse2 sse2) \
-		$(use_enable cpu_flags_x86_sse3 sse3) \
-		$(use_enable cpu_flags_x86_sse4_1 sse4_1)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -type f -delete || die
+	local emesonargs=(
+		$(meson_use cpu_flags_x86_mmx enable-mmx)
+		$(meson_use cpu_flags_x86_sse enable-sse)
+		$(meson_use cpu_flags_x86_sse2 enable-sse2)
+		$(meson_use cpu_flags_x86_sse3 enable-sse3)
+		$(meson_use cpu_flags_x86_sse4_1 enable-sse4_1)
+		$(meson_use cpu_flags_x86_avx2 enable-avx2)
+		$(meson_use cpu_flags_x86_f16c enable-f16c)
+		$(meson_use introspection enable-gir)
+		-Dwith-docs=false
+		$(meson_use lcms with-lcms)
+	)
+	meson_src_configure
 }
diff --git a/media-libs/babl/metadata.xml b/media-libs/babl/metadata.xml
index 82b7b7953794..7a38bb900964 100644
--- a/media-libs/babl/metadata.xml
+++ b/media-libs/babl/metadata.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>sping@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/media-libs/clutter-gst/Manifest b/media-libs/clutter-gst/Manifest
index ae5b2c8bb662..2758ff67a649 100644
--- a/media-libs/clutter-gst/Manifest
+++ b/media-libs/clutter-gst/Manifest
@@ -1,3 +1,3 @@
 DIST clutter-gst-3.0.27.tar.xz 404972 BLAKE2B 6861e6a0e8770b1d0c1a1d3ca593b2f8b5ea381614d063c040ee92e4099d8b4e43d25fa6058f7d1c146fdf94766b20e7aa69fa6fc6725b46af4a3ed976aa05cc SHA512 27271d9b2241a35cf7f61c4e9e25126d578494843c947cbeac6b5ad1dc8726c7a2a056239617ec39b04a7671a45dcbe2a65c364b10ed470f7c857647f8c36cac
-EBUILD clutter-gst-3.0.27.ebuild 1467 BLAKE2B 5433ba13390dafccc72989838ee5a991f935e473e932e1a045536ef7a79518b5cb40dea9411fa321088054974a132e85d214e6b3e223f764b5830f8c366c6120 SHA512 a6df80f8d18e661ff98aaa715c961beb57f0f7815e4a7750eb7aa2311568745c8d2b59673a6eb7f0cc6df7abb1c7e34928228af755f9fc06398ccc4ab858bd1f
+EBUILD clutter-gst-3.0.27.ebuild 1468 BLAKE2B f210609ab87331fadc2aa9140ed4075716b4a137003dfaf212ac35f7da3320d29a74f7f673496844dfdabd4d2f74d8ee3edff2a278e366d4e8d09125ceef8773 SHA512 60a1e06663a54bf046a028aa52312b7d27cd0591da399616659759e29ad19a822737782a44c97227adf0c999c8acb193a2bd151a047cc588eab243bddc2995d3
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-libs/clutter-gst/clutter-gst-3.0.27.ebuild b/media-libs/clutter-gst/clutter-gst-3.0.27.ebuild
index 0de022907bbd..8b174001efcc 100644
--- a/media-libs/clutter-gst/clutter-gst-3.0.27.ebuild
+++ b/media-libs/clutter-gst/clutter-gst-3.0.27.ebuild
@@ -24,7 +24,7 @@ COMMON_DEPEND="
 	>=media-libs/gst-plugins-bad-1.4:1.0
 	>=media-libs/gst-plugins-base-1.4:1.0[introspection?]
 	introspection? ( >=dev-libs/gobject-introspection-0.6.8:= )
-	udev? ( virtual/libgudev )
+	udev? ( dev-libs/libgudev )
 "
 # uses goom from gst-plugins-good
 RDEPEND="${COMMON_DEPEND}
diff --git a/media-libs/clutter/Manifest b/media-libs/clutter/Manifest
index 2dfa44df8f3f..c90b1099f169 100644
--- a/media-libs/clutter/Manifest
+++ b/media-libs/clutter/Manifest
@@ -1,3 +1,3 @@
 DIST clutter-1.26.2.tar.xz 5353736 BLAKE2B ac30cee3c5a8ed786c38820b7afb86e80929c2a797b737b35650ae6dd856576d72cc7f5407a984f418e255d6ab43c8d3ca9d7efd6f50650b2e0c733ecca19114 SHA512 c8008a1a1f111313d9abaff8d4415f112ddc32a02e08845f3735d33bb25b72b082f133daba06749bb9595eaf1ba83b308d30a413fbbe8dcdc1afdd7077a30937
-EBUILD clutter-1.26.2-r1.ebuild 2890 BLAKE2B 0eefb220f318931a44ecd99c25299ac3f9a47dc6e3571461818ec4154b2477373d5c1c02c0e5dc181a727a484431f938e588ea255cb775abc5866d2c05a36f04 SHA512 49a79f799cf375effcb727f15dacfb53f233164af11e0c9931fee48a3aead50baf71311d3c0eecd166fa91e15b3de106d60fdc465d558f32f8d77f80dcc2b15f
+EBUILD clutter-1.26.2-r1.ebuild 2891 BLAKE2B 5e6885b83331bb942c1af62ef1faa9d0f916105c11d9135122da4701d29b731b0ba689546bce08883c2d1e7587ec0cfa9e32ac61eef30b3dd4f97631a94b0f04 SHA512 a903e737aa572dc376c4b7009d8424c1fb6eb11e45afe85fd15b237a1c7a0ad5893b13679bb2d60f572c7f0aeb1f9787f6c1f4cb6fe1339d6aa7530bfce9d340
 MISC metadata.xml 404 BLAKE2B 45f5b28d9e612464ad5f56c016adae7466e549403a3939fddc433f9f428476db7b4e5a2436a436b0f9c46176bf849938c4c8895ae8f464115ea6ffeedac0f19d SHA512 c6e268f9e2fd4400fd0e7c265b6c64b738a22005ea9af7d792c45a8bd1de8fe81ac1d534cbfc2988cf55bd810aa84bdddf45d3ce33c3bf60e5030fc48d467db6
diff --git a/media-libs/clutter/clutter-1.26.2-r1.ebuild b/media-libs/clutter/clutter-1.26.2-r1.ebuild
index 19a339b3ea84..6727c1dea6c1 100644
--- a/media-libs/clutter/clutter-1.26.2-r1.ebuild
+++ b/media-libs/clutter/clutter-1.26.2-r1.ebuild
@@ -37,7 +37,7 @@ RDEPEND="
 	egl? (
 		>=dev-libs/libinput-0.19.0
 		media-libs/cogl[gles2,kms]
-		>=virtual/libgudev-136
+		>=dev-libs/libgudev-136
 		x11-libs/libxkbcommon
 	)
 	gtk? ( >=x11-libs/gtk+-3.22.6:3[aqua?] )
diff --git a/media-libs/dav1d/Manifest b/media-libs/dav1d/Manifest
index 79300a60d550..d5be30b4f675 100644
--- a/media-libs/dav1d/Manifest
+++ b/media-libs/dav1d/Manifest
@@ -4,11 +4,13 @@ DIST dav1d-0.2.1.tar.bz2 412003 BLAKE2B 51520f355f51f7fdc8c6e7981fd29f8d5339c2c7
 DIST dav1d-0.3.0.tar.bz2 435690 BLAKE2B 57124b2a5bcde8a2de8e4ee8155ec736d2f4c13dc7347029c517d70495de1943feef7f0c7ce1d1051304fe9f3141775fbe07ceec0733fdca3dca166cbab6c417 SHA512 bc0933bbc7064555e8973c82390e414aca8f52a14c5de7ee3ff92c263722d5c9cc472ba5f1f8d1dd60c4ce9ab0ed880c8b4a53b3d33d3aff24bc8e7fb18b0b84
 DIST dav1d-0.3.1.tar.bz2 438676 BLAKE2B f51c997fb95abc5b2721d67feb2023daf6bdab8d725b2b52b6c25440dcfab637b8543b8622c18da678eff20bbed155e86da9c9040a98160e5b9381ba7ab5ecf8 SHA512 b810c993a2a262f75ea0d4404428bc5660ac0d4c4d41aa311bc2180abecc40b36e73858f436b27372f4a1a0b7c700df4f8cc535130c663d6bfba2206d549e0f2
 DIST dav1d-0.4.0.tar.bz2 493854 BLAKE2B 8ae022054ab9827306f6e8501e0bfbc03a04e280a3e155c12ae2dfef474eab976097ce3ed990bd5cdbc3ac79018138a156f0701973ac40357224feb75149332a SHA512 7d2ad9959649321e86f9d0dcf44b274251c103fce9f02964d898b6d9da69e38e93bbed86a7ea217c93e0ee89e1ad43bc31dc217535c4b1cc37761191a6585fc1
+DIST dav1d-0.5.1.tar.bz2 548584 BLAKE2B 407188a57c469124db4863bc78dbca8b31879ed8836503ba584d4781e5f956c9f0a4661a4f47729bde74f1dd393c08db98a4cb49103f99c0f76720bc148b53a9 SHA512 2d1e7888fa9c138903b4209647e907803d2444fc2afb219b9a45dcc4c75098128b299950750bd68970004ea413ad88933d4d651a3e4e0e1557506598a15cee3b
 EBUILD dav1d-0.1.0.ebuild 1128 BLAKE2B 20202e1f79289bf576003933bfae0e417974df92f810c2a6ed873e1143af297c2af37918fed3ead030206a4d96fe22722a943b11f2b66a8e1dce210256f7f2c1 SHA512 d25a735d98e03391640d290669a69fe225d28ec3a8a3a1137919d4cd47e97e11f03e1c30f0f2123153b4c0a34f6e8539da94b100a05c0c42e98247b1aabb2d38
 EBUILD dav1d-0.2.0-r1.ebuild 1135 BLAKE2B 081253071832f93fd96b216169ea0a1f29a2608ec058eebb41c1eb47922ae64134c3c027005abb56549d7b8e66d0831defc07eb95d963c37de07e730384c42d6 SHA512 35a638950d61cb3a79391f959fc8da3240dbf191f6db0ec55b8d80f08287a8ec1eefc9a611196e70449a89b0ec87aca4f304cd4ed46d6911d72e9343ec612ed4
 EBUILD dav1d-0.2.1.ebuild 1135 BLAKE2B 081253071832f93fd96b216169ea0a1f29a2608ec058eebb41c1eb47922ae64134c3c027005abb56549d7b8e66d0831defc07eb95d963c37de07e730384c42d6 SHA512 35a638950d61cb3a79391f959fc8da3240dbf191f6db0ec55b8d80f08287a8ec1eefc9a611196e70449a89b0ec87aca4f304cd4ed46d6911d72e9343ec612ed4
 EBUILD dav1d-0.3.0.ebuild 1147 BLAKE2B fbceacf787e296094352daa0382eba35447e6c09aa5fa087cc25102a846537f08852fb86f1592fb06aa23a36acfab93ac6b40fd0af86f305663322076d4b1016 SHA512 50524008230f23b520ae3401af3ce65822b238c3300a4a3715034ac5f584bf76a3f1fd4e1591a539ca07f4f3005564b22bcbe07c30b4ce809ef928bfa00d6a82
 EBUILD dav1d-0.3.1.ebuild 1161 BLAKE2B 102cd9d3e438f66ad960b9542650acf2f1171d47c9c321d16dec7a6ffee4662820ced2732087a50b2faf706e891e7c707f8c3f4d163442bddb94db45848faa05 SHA512 610cfdd81df7f852c5fcbe0691e0274a11e1fabd37d51eea85c875ae36905eb54991b8bcf930378b2c640f93e6c175543d8d68ab3ed4e866ddac8cd6331dd05a
 EBUILD dav1d-0.4.0.ebuild 1166 BLAKE2B 69a6f25017ffe6e5869ba5faa36b5da6dcb291030979ac12229f475eabfaa7897aa54aed926958b728a16097155ccaf4d7d9b11d1932715dedc42e8e78f18369 SHA512 4e2187506d4db679a03663ef28f10cff9e671ac196e40d5804f63e960e71ff79a1906f85528c0bffe2062da2e50f92469064c428fd72811e156dbb421589d920
-EBUILD dav1d-9999.ebuild 1166 BLAKE2B 908c968bb2e73b3ea76ab81a3a97de29473702a19b6a2e307f56b5653166ecde40f74e1044a065695816960c24639f1a864893ead89783824861fae7c63976ba SHA512 f18fb9963abde1bef4caa291641084c59b6a53531826f5c7773159668b33fcdab0c3cfb1b44fff897125bb40fc7905d607edfeaf256582caec384d5ad4ff8806
+EBUILD dav1d-0.5.1.ebuild 1157 BLAKE2B 3ccc5357cef3f4dfe37f3b9229f0eee9bcc12c5acee48adafc8d1e1ad136b1093a422fe1005c03bb63f8b5f1b34dfe0a690cc0ba8692a967c1af62372327ce07 SHA512 7de035cbb7469d57847afb1c49a27d247a06eabed6e86b265698a6b83844c7b33f28b530b3ac8bbc30336ee73ef1acd0cdc89b1d51e709d883d63aa083681645
+EBUILD dav1d-9999.ebuild 1157 BLAKE2B 3ccc5357cef3f4dfe37f3b9229f0eee9bcc12c5acee48adafc8d1e1ad136b1093a422fe1005c03bb63f8b5f1b34dfe0a690cc0ba8692a967c1af62372327ce07 SHA512 7de035cbb7469d57847afb1c49a27d247a06eabed6e86b265698a6b83844c7b33f28b530b3ac8bbc30336ee73ef1acd0cdc89b1d51e709d883d63aa083681645
 MISC metadata.xml 536 BLAKE2B 40ec2224aed078ad4748d3182defb6813cdd34a614d40db2fbbbeb8b63e24a59ba1cbe9d458fec17516c328a89f77927d9fbeb9a1e4a2b8c296b7de7235b1af4 SHA512 74e6595ce441bb313364f375a8afa9b2a0179f350e30d075ecf99e058874450e15f4005a0712e20a4feb047d57799dffacb3903af00a3c5a8d059f7025e49de6
diff --git a/media-libs/dav1d/dav1d-0.5.1.ebuild b/media-libs/dav1d/dav1d-0.5.1.ebuild
new file mode 100644
index 000000000000..69a1a98df066
--- /dev/null
+++ b/media-libs/dav1d/dav1d-0.5.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SCM=""
+if [[ "${PV}" == "9999" ]]; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://code.videolan.org/videolan/dav1d"
+else
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+	SRC_URI="https://code.videolan.org/videolan/dav1d/-/archive/${PV}/${P}.tar.bz2"
+fi
+
+inherit ${SCM} meson ninja-utils multilib-minimal
+
+DESCRIPTION="dav1d is an AV1 Decoder :)"
+HOMEPAGE="https://code.videolan.org/videolan/dav1d"
+
+LICENSE="BSD-2"
+SLOT="0/3"
+IUSE="+8bit +10bit +asm"
+
+ASM_DEPEND=">=dev-lang/nasm-2.13.02"
+BDEPEND="asm? (
+		abi_x86_32? ( ${ASM_DEPEND} )
+		abi_x86_64? ( ${ASM_DEPEND} )
+	)"
+
+DOCS=( README.md doc/PATENTS THANKS.md )
+
+multilib_src_configure() {
+	local -a bits=()
+	use 8bit  && bits+=( 8 )
+	use 10bit && bits+=( 16 )
+
+	if [[ ${MULTILIB_ABI_FLAG} == abi_x86_x32 ]]; then
+		build_asm=false
+	else
+		build_asm=$(usex asm true false)
+	fi
+
+	local emesonargs=(
+		-D bitdepths=$(IFS=,; echo "${bits[*]}")
+		-D build_asm=$build_asm
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	eninja
+}
+
+multilib_src_install() {
+	DESTDIR="${D}" eninja install
+}
diff --git a/media-libs/dav1d/dav1d-9999.ebuild b/media-libs/dav1d/dav1d-9999.ebuild
index c9ccd1968db6..69a1a98df066 100644
--- a/media-libs/dav1d/dav1d-9999.ebuild
+++ b/media-libs/dav1d/dav1d-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 SCM=""
 if [[ "${PV}" == "9999" ]]; then
@@ -21,15 +21,13 @@ LICENSE="BSD-2"
 SLOT="0/3"
 IUSE="+8bit +10bit +asm"
 
-ASM_DEPEND=">=dev-lang/nasm-2.13"
-RDEPEND=""
-DEPEND="${RDEPEND}
-	asm? (
+ASM_DEPEND=">=dev-lang/nasm-2.13.02"
+BDEPEND="asm? (
 		abi_x86_32? ( ${ASM_DEPEND} )
 		abi_x86_64? ( ${ASM_DEPEND} )
 	)"
 
-DOCS=( README.md doc/PATENTS )
+DOCS=( README.md doc/PATENTS THANKS.md )
 
 multilib_src_configure() {
 	local -a bits=()
diff --git a/media-libs/faad2/Manifest b/media-libs/faad2/Manifest
index 89e20ac9f600..025ad558fe08 100644
--- a/media-libs/faad2/Manifest
+++ b/media-libs/faad2/Manifest
@@ -1,4 +1,6 @@
 AUX faad2-2.8.5-libmp4ff-shared-lib.patch 539 BLAKE2B 3ee6b86534612e6c96bc884e71559521c0ed464a66a07217caef0959eca0e2a0bdc5ef28367340d07d5ca1ab1686408b4c98c7ef718d4bcb0fa3d827c11074d3 SHA512 b5889dec7850ffcffa707a8594ef74f1e33848c22d2eb5e1a397ca57884b984633610f37f111b534724f2d8f0331e40ed90b01c9acf22c34053f740703e33fa4
 DIST faad2-2.8.8.tar.gz 1069044 BLAKE2B 3e22e695d89cce0ecb673caec73dd3115b2249d18daf6d0c8cf2b5cc90086889c9da733e037bc8b58c0bdc145c66bd4218b9b5e237adb7ad1c6f0caf0d97d304 SHA512 3275d292b2a9fe984842962f4d81202894bddd17033f7cd6df95466554cc968dfcbf2890ae8b1df37da0cd25d645cca0a687f07e39b9fc37dd004fd5956a82af
+DIST faad2-2.9.0.tar.gz 802390 BLAKE2B 8cd68f96a48fefcc4d75901ae67607ec4cc4c4a76efae490dcfb3330b384ff91049894af9fccae0b41ca9fd4ef22cdff35c36f11cea1baab4cc96fe1e54749ae SHA512 1756b2672f9e438a56b11160ddc77fc721d85860eaa325a3ff01b51a2524baf4c1c61068a97cbc4e99d47e7643f10e1d6afb997eede3295b44551fe4661fb5dc
 EBUILD faad2-2.8.8.ebuild 1220 BLAKE2B 6e18f84904d1d61e00dc5e9a8a5f70781061c860ce612c3b1ca370e8585532100150c545b7f3bb775e124150bf0d7fc4688fec7f98de3e60e146ad276af610da SHA512 f7daff248e4808ce217263390ef04ceeab68b4ef7ac4a8bc39d8e71fdbb6af1980773975c4cfabef0e7aadcddf50b6830b772f90e33f0db41d3cb4079a1ae251
+EBUILD faad2-2.9.0.ebuild 1245 BLAKE2B a853514ebbc10258723a3fa9f3bec49aed91e907d09988c909595592901f6f26ac053d2b01d925c9de447f8a2c13ce765e32b514e81de7d1ab0cd44ffd19f4e4 SHA512 cf8eb04775566cd44c195a6c4e70e6ca8511ba9ec507a57672ce98ef3c7adccf3e4dbce29a18f2c29535a641b7f5c554ef79ac87f3643d3199e2e9644f1dcb4a
 MISC metadata.xml 619 BLAKE2B 3eb4a78c845f019f564e15c8aecc41bac00aa7a814f761a6f6b4b5810e245c4645149defb09c998a615c8e3ba551e569373475e7dd8ebb5f8656e6ac6b2992dc SHA512 b62370a9ce905bb0e96001422baee1b75af853080d9ef795148e56ed8c2b8dca9c7eae3a3ff29869dac4e9af5835327649eafa20bc7831b14bec07cb901960fd
diff --git a/media-libs/faad2/faad2-2.9.0.ebuild b/media-libs/faad2/faad2-2.9.0.ebuild
new file mode 100644
index 000000000000..4a198441f888
--- /dev/null
+++ b/media-libs/faad2/faad2-2.9.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal
+
+MY_PV=$(ver_rs 1- _)
+
+DESCRIPTION="AAC audio decoding library"
+HOMEPAGE="https://www.audiocoding.com/faad2.html"
+SRC_URI="https://github.com/knik0/faad2/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="digitalradio static-libs"
+
+RDEPEND=""
+DEPEND=""
+
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_prepare() {
+	default
+
+	sed -i -e 's:iquote :I:' libfaad/Makefile.am || die
+
+	# bug 466986
+	sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--without-xmms
+		$(use_with digitalradio drm)
+		$(use_enable static-libs static)
+	)
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+
+	# do not build the frontend for non default abis
+	if [ "${ABI}" != "${DEFAULT_ABI}" ] ; then
+		sed -i -e 's/frontend//' Makefile || die
+	fi
+}
+
+multilib_src_install_all() {
+	find "${D}" -name '*.la' -delete || die
+	einstalldocs
+}
diff --git a/media-libs/fdk-aac/Manifest b/media-libs/fdk-aac/Manifest
index be21e3474adc..6613e299c6a1 100644
--- a/media-libs/fdk-aac/Manifest
+++ b/media-libs/fdk-aac/Manifest
@@ -1,7 +1,5 @@
-DIST fdk-aac-0.1.5.tar.gz 2091081 BLAKE2B 16dd8606f87480fbf13d06b9628ff8c4fef418b5c55fbf99931d25ee9de6c1dd710760be8766af995d0d678e8c94b2d3b17aa6cd0f5b2512ae9d4478d985d72a SHA512 579e96dae5638cfe2d3d5e84ab24a72ed50ed3b5a9d3c6eb2f434d3a5f4c575877a2ecf6cd7cf7a528eb2811b2014a861eaaac9ea5fc617c6423587525766f00
-DIST fdk-aac-0.1.6.tar.gz 2091618 BLAKE2B e3036879e21677ea0ba6d6a030aff0568572e420217479b19312bc64daf0a4e94c1a0a6de561baa79f362186777f1414a4a1eb89bf80c1268767564f1a82708b SHA512 d4d14debeb6e424f4e2a1458ed7bebaa2c45ce54170c6e679286fd965f52286b6a6c1e944edbb4ea2302c3bb789c0f3cdab9c0d89618014ba4250b2f04d71d12
 DIST fdk-aac-2.0.0.tar.gz 2864593 BLAKE2B beaefd5186a6253496a656ccea514e764e6c6515b46ea0fa324f66985af8374f3813afddb29018da12d28d1672ebe10821f5e4e98d131ad4fb77a3d01ffab234 SHA512 40b02a9e42e17015fa6531c7b7eb51098ab43224c11c1c85e981d950642ffc6884146367cb423062b1da11679020ee5c5779dce5f4dc62175c8bf471831ed918
-EBUILD fdk-aac-0.1.5.ebuild 1307 BLAKE2B a802ea00113afa73b8e4c4178248f9ff21c810898226547fa55ff2b9e281c3af926137e90d5a22b1ad2ccc906fdbbbdc7e4f09db7bfaa0621c37f85d7411506d SHA512 9d1c91074e55a8181798a77e2b8bb790e5158aaecb3a25a55305c2667f017bdf5f3640982c2193389fc24a18461990ebdea724f513ac80f5665e486caeb2bdbc
-EBUILD fdk-aac-0.1.6.ebuild 1338 BLAKE2B 87627d786f70e811f549544522e802211050d6a150cc57b49784f814de88ff171529d89e2f88a54127912a14e7de7cfd26680d631800c25e969ec4cb68f69494 SHA512 165da2c688e835db2121fa0bc23b17db6e1cc0c13c64b8caae696b10499a77db3928e73b9e70321a8dfb27a0ee84d37d1daa2cfd64fbb5fb03094a0dec3b0797
+DIST fdk-aac-2.0.1.tar.gz 2865456 BLAKE2B 79c66956b3c43138fb34448398cf104a021757332b2af6d4493bce8c4f9dfdf97a38d1f00c3f1a3f91ffb3b2ce2bb0bdc982e3f92a1ffe7e5f0d1c2f0ef8ca99 SHA512 08209bbd060edafe7b607c9e1394cd03df4f98df6f32b4be21d34d1ab491a7447ed592785546c040126767bd31980121ca6a31aba06eaf90558b14228e302d82
 EBUILD fdk-aac-2.0.0.ebuild 1328 BLAKE2B 2115fac8a61dd82aadfb945f302986063c5acd153a35a7db0bee3da0ffab34ea82a3d604429c3b33d3262f1392a6bf55e3cd905bcc08aaf70b1c7e4e0712a9d9 SHA512 7022b77587d04fc0be13e2cf4d44900e1e18c19e34fab152180b96e1b13b6dade6e3295d9c13859d2f8645011965b1caa91cfb1ccb8287d5f508ada38eff0537
+EBUILD fdk-aac-2.0.1.ebuild 1334 BLAKE2B 24b35ce67bf82d20e2a1c38e3104120647798eeb5e499de206249d9c501c77e80a2b1a50aa0cdc813dbdf2914e263e061b46ef978fda44f37cb544a9926176f9 SHA512 5d59c5b50d172f65261ea501c4530e08af44003ee2e265a646b194a0c9f294320fd4a9fbf184b949e6fe45f1f1ed52f4f229d60f253dd6703138fd5b9e67e7ae
 MISC metadata.xml 426 BLAKE2B 701e014c8a2fb5649fc546c205d705e8c13e0b3acf2bd445c4058ffc96e607743c5e6c8c21e3c0f0941421064a169b18b3736bf5f34b979f36fedabdf0fe318d SHA512 217c0f757ba4c8bd4e649aab097900eebaa9097d6f56ea373e78de2f3a392d25401c8dbb654b80219bceaea7db7ff616f532174f4a5119bd1b3c093e9fc89da1
diff --git a/media-libs/fdk-aac/fdk-aac-0.1.5.ebuild b/media-libs/fdk-aac/fdk-aac-0.1.5.ebuild
deleted file mode 100644
index 3f58741c9d26..000000000000
--- a/media-libs/fdk-aac/fdk-aac-0.1.5.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == *9999* ]]; then
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/mstorsjo/${PN}.git"
-	[[ ${PV%9999} != "" ]] && EGIT_BRANCH="release/${PV%.9999}"
-	inherit autotools git-r3
-else
-	KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86 ~x64-macos"
-	if [[ ${PV%_p*} != ${PV} ]]; then # Gentoo snapshot
-		SRC_URI="mirror://gentoo/${P}.tar.xz"
-	else # Official release
-		SRC_URI="mirror://sourceforge/opencore-amr/${P}.tar.gz"
-	fi
-fi
-
-inherit multilib-minimal
-
-DESCRIPTION="Fraunhofer AAC codec library"
-HOMEPAGE="https://sourceforge.net/projects/opencore-amr/"
-LICENSE="FraunhoferFDK"
-# subslot == N where N is libfdk-aac.so.N
-SLOT="0/1"
-
-IUSE="static-libs examples"
-
-src_prepare() {
-	default
-	[[ ${PV} == *9999* ]] && eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} econf \
-		--enable-shared \
-		$(use_enable static-libs static) \
-		$(use_enable examples example)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	if use examples; then
-		mv "${ED%/}/usr/bin/"{,fdk-}aac-enc || die
-	fi
-
-	# package provides .pc files
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	use examples && einfo "aac-enc was renamed to fdk-aac-enc to prevent file collision with other packages"
-}
diff --git a/media-libs/fdk-aac/fdk-aac-0.1.6.ebuild b/media-libs/fdk-aac/fdk-aac-2.0.1.ebuild
index b8197f01d0af..4faac04a34d3 100644
--- a/media-libs/fdk-aac/fdk-aac-0.1.6.ebuild
+++ b/media-libs/fdk-aac/fdk-aac-2.0.1.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
+inherit multilib-minimal
 
 if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/mstorsjo/${PN}.git"
@@ -16,13 +18,11 @@ else
 	fi
 fi
 
-inherit multilib-minimal
-
 DESCRIPTION="Fraunhofer AAC codec library"
 HOMEPAGE="https://sourceforge.net/projects/opencore-amr/"
 LICENSE="FraunhoferFDK"
 # subslot == N where N is libfdk-aac.so.N
-SLOT="0/1"
+SLOT="0/2"
 
 IUSE="static-libs examples"
 
@@ -44,11 +44,11 @@ multilib_src_install_all() {
 	einstalldocs
 
 	if use examples; then
-		mv "${ED%/}/usr/bin/"{,fdk-}aac-enc || die
+		mv "${ED}/usr/bin/"{,fdk-}aac-enc || die
 	fi
 
 	# package provides .pc files
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {
diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest
index 2dcfeaa977e5..015d3df5d65a 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -11,16 +11,21 @@ AUX gegl-0.2.0-underlinking.patch 1638 BLAKE2B c8118a47b9d83d9737a2ec1deb25d23b9
 AUX gegl-0.3.12-failing-tests.patch 888 BLAKE2B 548933991347ac397b98ac044d5524d0ae8e5307d52e8b48eb0168d30eda8b73350cec57bc5233abde708184c152ee94ec5c2b3213161ffff93b2a6494a2d36f SHA512 a7b8f58ff9057e086412ec5b12694ffc4e30e2a7b3a8bfa72ef34bc230d0d91c80aa45de94f8e48496844c96e257cee6d3791db0e520abc7cbcc2691d1a5ce84
 AUX gegl-0.4.0-ffmpeg-4-0-compat-1.patch 2181 BLAKE2B 8bf1c46395ee4981fad7c5518c9091043374b54c9c4a684e6decc376e8b57e2a60b7ff5c5b21e07f24d7835f92f62a7aebf976122391d206450cc1d5a52bcb30 SHA512 1edf86549a0a91b7e66ad1b59373b141c20e7f63fff981aaa5a0ba535b38e89b593c60a4a4573cf6fa723181cb38a10c6ac4a0838fc947bb54713a3bde299e4f
 AUX gegl-0.4.0-ffmpeg-4-0-compat-2.patch 786 BLAKE2B c2ee0da954aa16c755f76058c54ca9d19ceb70667aff40e126d52bb10b7ecaa6e346667fa9cf7f96605b87a1d41e511d4787a33b004409708d8e3496de391745 SHA512 1084d1cd802eebdeacc536115d4808ce310a85063110bfc06627c8836b86e65396d175a4c3bc6b2083a9a486b7fb21d0210e42fcc8ef3c404b6b930797ecc83a
+AUX gegl-0.4.18-arch.patch 282 BLAKE2B 110c1bfec14a27c1d5fab8021673ee981769f4ad301bf5fe5bfa23bd95fee5610765e4e0e491d05a84586457612e7014202642e86ad6cfb71ca5091060679c5f SHA512 85244dc8747c52ed7135bceef3f12cb9c27dc9f801aa564d80feb0705972b782ce153e762648ebe777abfe42e8e0be079a88f34c1ae38f8fc195350d8e9cdafd
+AUX gegl-0.4.18-drop-failing-tests.patch 1040 BLAKE2B 5f747ad8bffa2a11a2275a2773d4835f13d8ff0d271fe83ca5da93ad83da7f5e808b8be3858b6812b4e102d0086fcb55270157b6fd3a568882537d4ddf33d298 SHA512 efeb64b100e2e5d548fdcfe49be3ee5fe208e90b8655b16f0dcfe08821d1ea792501ad372d7ae0029552ffe762bb5408543e573f9d7977d238afb8f261f521f5
+AUX gegl-0.4.18-program-suffix.patch 1071 BLAKE2B c529fe0cea80688201dfd4064fc54ca66ff26a322c877bb1cf9d83a436f8a455bf05e68a33cd6415f76337d98997e5e0ed38aba1db4c5ae3c84eb0905c5ccef2 SHA512 e47f32c9f3c82b50320759dca08dbc31c5db838252d4fc43be10a75eee469a17f91c92aefcfd01711d9628fac16ed2d612f037fc9509e7fc823ed77086edc417
 DIST gegl-0.2.0.tar.bz2 7502040 BLAKE2B 29b33bf6aa878b74461e929a96570fca9a56e52931ee66356ca9c3c4cec7cdc0668330aa25756d0baf531d0b90c4830c1f244e8327b238a63d68cb74d486e961 SHA512 16ef3f6852fd8efef2b6468a754342a2d003f2c2bef468d9465a448e6c89dedb8e791570f073a9faed05218a7c94c6c418eaa0f3abeadfb3e6b88d766ab792c8
 DIST gegl-0.3.0.tar.bz2 5463571 BLAKE2B 7ac52fb22bab3b84068e10610d8681a5bcf56f6cdf39dae4374d2749823f3a1af62995382a1247427dde1921e0b11304adb800a2157ca6e7e773fdd97fee47f5 SHA512 ff758df4689b0fa8f5e16ebcea32a7fe77bccfef70efc20d10669ce5139a70ec3533e78227fd4798812b31ac1ca5081b9d1d701a7449bf75356f879ece5fadd6
 DIST gegl-0.3.34.tar.bz2 6707964 BLAKE2B 4424a2c218067bd0a77d79c2334528da393350db3062019f3889b8cdb8d222f6e436ccfc845b61fdf425a1634698a7a6963702a29bb1666f515b1395c50dc99f SHA512 a7a394dcce4137d5224163ca324f1585e64d1cc797e77d452ba444afe2bff39aa2e2d5d040d07b394697b75162bc310bc51490a5af80240b26aac14b6e7abe02
 DIST gegl-0.4.14.tar.bz2 7209142 BLAKE2B a056f02c3fa9e075aa62cb8cb0d8183560ac66ffed68072add3ea6afc9da3b47c9854eb4e1799c61f451287b244bee4dfc8942365f556a0e820dd7485b9fc305 SHA512 1fcec83a961c0b9c98487de99d26893f98a5401816fa6d7238af4c645672d0eb0474cdb7251b8ebcd344aff589e8979bee0304b50fcfae9513fdbf8a02068e3b
 DIST gegl-0.4.16.tar.bz2 7304904 BLAKE2B a3f6021ed7b9d8b784b909057fcdc39e73b6b8b811009adae3c4a6805263e9a887e874ad662d8cd5c673ae324fe39e8f0299651139783fd3ece08675b70896fd SHA512 38eacbd53d9993ca99d061bf6f80553a86ff06bf42d1710403ac5f15629ccc9b1f4395ee7700a04cebc954ed7fe8745c5bef85453c9c56d89681dd53a1552b27
+DIST gegl-0.4.18.tar.xz 4812756 BLAKE2B b8e5902b62c3549f57dd0ce52a0a406974bf8664d5b85389b79f7d698bcf2643d19861add3d8a9bd5c99036aba4da97b70884dcaacf2cb89170b995f1d1497a0 SHA512 e79874cd50e9f0c27c7dc9d9b952545c31d0a48e2b158aa54b92c3e933267877222f86ede7256f2528f18985dc85d6eadbcd809f7a3563efc4449ec7634f15fd
 EBUILD gegl-0.2.0-r2.ebuild 4703 BLAKE2B e9dcbc55e332b3484435f1739b305f672f1af489c2b7bae9801529b765c8f12feabef63d64f828c059bc3510b792a6f5a2561c1517e79c6819860dfd7ec3a87d SHA512 443632d54bb065e465e9ff2b3b693cac33c49d4c6c9d14dbb4c45b1fade07adf79cac3841d1b63120912e6cc863e5f7eae9403c71bac3c973e4fca980fb1bbf9
 EBUILD gegl-0.2.0-r6.ebuild 4965 BLAKE2B 12066b7a2edc729653570a433bad8993d30dc24cd820ae24c6b3bc4f734f79a1206f29f3a1190883f094ed46c5516e6d976005cde91ff6050c90dcb90ede0216 SHA512 72bf6368f6e046a591956f65d249331d539902e6cba90c12e2f8939ec6910c869d1638f918820c68d92bbc8e0d1b7e72543a908cf4dbc6626cf78c7556f69285
 EBUILD gegl-0.3.0.ebuild 5228 BLAKE2B 04a228c189e9fdf2619cfc1467eae37ecd01ef35ad8c9a1a87c0e7a93a9e493c0aad4dbf2a7a8053bb47dbd6965f41c3ab032171c013ebca6405f543abcb0f12 SHA512 7cac050e006f38082e3093b3553774d70837ed632bfed6a5f2f1dd97297e8dc603256ec967e8fd898a0dfd0108ea23773e1f0d516c08f4b371b16b3a02cd427d
 EBUILD gegl-0.3.34.ebuild 5295 BLAKE2B f468df5f492a5cb4079ab021d10833a6d75ab97c28bb03a8091df0bb80f284171fe04476e522632264a795ae4f198d7a69d412eb378d25225b7f345a5bfd013b SHA512 376186430d951aced6ef210eee6f7ff7dc8f7f1fb7087083bb86ee6b12d46170df6293db136acfb3f696348b33e84c2657d0679f968b1dbca79291a232d6e1b0
 EBUILD gegl-0.4.14.ebuild 4963 BLAKE2B 155fd64e71878d62960a1beaf50b8e2b4fec41a8884b916319b498adc6393449d41f6a2fbff128e68eebcf688046bcca540c9e10382f805e8df536d28fa04244 SHA512 ed2796b93ef55352f51a8eace6ccb97e5352a203d6fa33d178307c0f215279d337efabd9aa2c0d41faa6757c5a0f34dda1f1907eced0712979413d03980b9de0
-EBUILD gegl-0.4.16.ebuild 4850 BLAKE2B 66b4108f521bc2e40f1789802ea618eab0dab0addae3dfdddd39b1b5b1d9fd845bd28df7e1d9d1bce7c45773a9e93b695cdaf6dd9b456da3e47de6f63278998c SHA512 c4bb2821ffcdddd8d8a42b11018e25873b622719eb94c0e8f12a949d1836d4921bc63817a6431f4a51655485021bdfaa24b09f0993c37feff954d3d961c4aca6
-EBUILD gegl-9999.ebuild 4789 BLAKE2B cdff77d21246229c50e307138c9de6883cdc801625fa65eeb57cbae2ea911c8b98c339f580e7dcc7787bb132b935a536b100399712bd392e0d3be6b14b2371e6 SHA512 948cf9c4eb70b506d6990f30d4c4a6aef8c030be937dfd4adc9c12ebb6f3ae42896d53d75415c4bb3d921543d016c850bf40da6c06d66e9fc7e60281ab0aaa1b
-MISC metadata.xml 396 BLAKE2B aeb29a940e3747b4ea2418e3723c549291cbfd49d8152c75fcc9116b46892eac29338b36875b32c7f3968deecf142296b0f9725d02a80a0380dfba6fba17d810 SHA512 7530e0bc7d86a57334d1dc6fc75b6acc1eb3512c2618d1ed47bbc025aa95f72fa1d41b78765ae53721ea794538d22df1be22189dd54e30fa4bf94e7f0cdced1a
+EBUILD gegl-0.4.16.ebuild 4849 BLAKE2B 0ddc711066dc3430b2dfdd3f97edf9accca4feda969ed3534a9f5ce62e8470780f6cb488582b3d7c18edb9d3888df234ef0aeac218a5be08ed5d1182ca4aa1ba SHA512 2bec113e795760a92f09b481f5220fa3b2db96fb3239fb7d3b7db83e5f06319f9ffd9220d0ef509c5cf4fa77315e9600521a7beb63d069e27b0c6726f3aca967
+EBUILD gegl-0.4.18.ebuild 4416 BLAKE2B 117874fa6d9abc38104b93e73e7a225b21b647a52fc78c0599adfb77a4645adf3cfa6fb254880c42a523e3a121a71bdeb3c3ca13cc5dac7b2650e32383686d71 SHA512 c1fcfba56c0cdb9aa500886017d45bececbea9d2ac2f808bd52ec75399de11b8918283525c48516fdc0e37977e9368d03d1f52aea215efa25b624acc123f9fe6
+EBUILD gegl-9999.ebuild 4377 BLAKE2B 340ec7416904d1273b193b5449ea97b1104121ae0f6c2b11d39f92bc77adfe231b06101307af8948925c952bbb6db67958b54f68dbf25d775019b09ce66e2608 SHA512 0bfed5bf968d6d7bd5b111a8fd7f51ee27a9c500a5fd49ec40242558fe0c98c42387c28f8259ea7b5bede089b08553e5f16e26bbb4ecb69feedaf46c2dc43173
+MISC metadata.xml 347 BLAKE2B 3cf9993960788f9caef109afbc99045affa49f771e4b5c1afc8d7f1ad438eaa3ffaf062e6c3056f8228ea4d745a807517875bc82ae13a8f2dc776f7bee01f465 SHA512 c893f262197b33a5ce7c4df6da4f0b761bae4a12082b1f263ed3878eadb388a4c785a1117033d52854a7bbcc102f505946f6e7bfb7449126634d8730ef7d61b2
diff --git a/media-libs/gegl/files/gegl-0.4.18-arch.patch b/media-libs/gegl/files/gegl-0.4.18-arch.patch
new file mode 100644
index 000000000000..57bfaf4a6c73
--- /dev/null
+++ b/media-libs/gegl/files/gegl-0.4.18-arch.patch
@@ -0,0 +1,11 @@
+--- a/meson.build
++++ b/meson.build
+@@ -88,8 +88,6 @@
+   have_ppc = true
+   config.set10('ARCH_PPC',    true)
+   config.set10('ARCH_PPC64',  true)
+-else
+-  error('Unknown host architecture')
+ endif
+ 
+ ################################################################################
diff --git a/media-libs/gegl/files/gegl-0.4.18-drop-failing-tests.patch b/media-libs/gegl/files/gegl-0.4.18-drop-failing-tests.patch
new file mode 100644
index 000000000000..4be09057d896
--- /dev/null
+++ b/media-libs/gegl/files/gegl-0.4.18-drop-failing-tests.patch
@@ -0,0 +1,43 @@
+From a1dd28e7e7c022c4e887006311c916fe5d9e4c0e Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sun, 27 Oct 2019 21:55:03 +0100
+Subject: [PATCH] Drop failing tests
+
+---
+ tests/compositions/meson.build | 2 ++
+ tests/python/meson.build       | 2 --
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/compositions/meson.build b/tests/compositions/meson.build
+index 8699e7c..5e76e8c 100644
+--- a/tests/compositions/meson.build
++++ b/tests/compositions/meson.build
+@@ -87,6 +87,7 @@ test('compositions_with_opencl',
+ )
+ endif
+ 
++if false
+ test('compositions_without_opencl',
+   python,
+   args: [
+@@ -100,3 +101,4 @@ test('compositions_without_opencl',
+   suite: 'compositions',
+   is_parallel: false,
+ )
++endif
+diff --git a/tests/python/meson.build b/tests/python/meson.build
+index c6782e6..47a160b 100644
+--- a/tests/python/meson.build
++++ b/tests/python/meson.build
+@@ -2,8 +2,6 @@
+ testnames = [
+   'gegl-buffer',
+   'gegl-color',
+-  'gegl-format',
+-  'gegl-node',
+   'gegl',
+ ]
+ 
+-- 
+2.23.0
+
diff --git a/media-libs/gegl/files/gegl-0.4.18-program-suffix.patch b/media-libs/gegl/files/gegl-0.4.18-program-suffix.patch
new file mode 100644
index 000000000000..be4498ccee4a
--- /dev/null
+++ b/media-libs/gegl/files/gegl-0.4.18-program-suffix.patch
@@ -0,0 +1,39 @@
+From eeecf286efb312709e43341eaadc64eb006bc6bf Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sun, 27 Oct 2019 22:05:58 +0100
+Subject: [PATCH] Add suffix "-0.4" to installed programs
+
+---
+ bin/meson.build   | 2 +-
+ tools/meson.build | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/bin/meson.build b/bin/meson.build
+index 4daf6cb..b77b692 100644
+--- a/bin/meson.build
++++ b/bin/meson.build
+@@ -42,7 +42,7 @@ if libspiro.found()
+   gegl_deps += [ libspiro, ]
+ endif
+ 
+-gegl_bin = executable('gegl',
++gegl_bin = executable('gegl-0.4',
+   gegl_sources,
+   include_directories: [ rootInclude, geglInclude, ],
+   dependencies: gegl_deps,
+diff --git a/tools/meson.build b/tools/meson.build
+index 43c5495..c1b0d63 100644
+--- a/tools/meson.build
++++ b/tools/meson.build
+@@ -19,7 +19,7 @@ detect_opencl = executable(
+   install: false,
+ )
+ gegl_imgcmp = executable(
+-  'gegl-imgcmp',
++  'gegl-imgcmp-0.4',
+   'gegl-imgcmp.c',
+   include_directories: [ rootInclude, geglInclude, ],
+   dependencies: [ tools_deps, ],
+-- 
+2.23.0
+
diff --git a/media-libs/gegl/gegl-0.4.16.ebuild b/media-libs/gegl/gegl-0.4.16.ebuild
index 12651446e600..c76de89fa31b 100644
--- a/media-libs/gegl/gegl-0.4.16.ebuild
+++ b/media-libs/gegl/gegl-0.4.16.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="http://www.gegl.org/"
 LICENSE="|| ( GPL-3+ LGPL-3 )"
 SLOT="0.4"
 
-IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection lcms lensfun libav openexr pdf raw sdl svg test tiff umfpack vala v4l webp zlib"
+IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg introspection lcms lensfun libav openexr pdf raw sdl svg test tiff umfpack vala v4l webp zlib"
 REQUIRED_USE="
 	svg? ( cairo )
 	vala? ( introspection )
diff --git a/media-libs/gegl/gegl-0.4.18.ebuild b/media-libs/gegl/gegl-0.4.18.ebuild
new file mode 100644
index 000000000000..7de01528fc40
--- /dev/null
+++ b/media-libs/gegl/gegl-0.4.18.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+
+# vala and introspection support is broken, bug #468208
+VALA_USE_DEPEND=vapigen
+
+inherit meson gnome2-utils python-any-r1 vala
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gegl.git"
+	SRC_URI=""
+else
+	SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="A graph based image processing framework"
+HOMEPAGE="http://www.gegl.org/"
+
+LICENSE="|| ( GPL-3+ LGPL-3 )"
+SLOT="0.4"
+
+IUSE="cairo debug ffmpeg introspection lcms lensfun libav openexr pdf raw sdl svg test tiff umfpack vala v4l webp"
+REQUIRED_USE="
+	svg? ( cairo )
+	vala? ( introspection )
+"
+
+# NOTE: Even current libav 11.4 does not have AV_CODEC_CAP_VARIABLE_FRAME_SIZE
+#       so there is no chance to support libav right now (Gentoo bug #567638)
+#       If it returns, please check prior GEGL ebuilds for how libav was integrated.  Thanks!
+RDEPEND="
+	>=dev-libs/glib-2.44:2
+	>=dev-libs/json-glib-1.2.6
+	>=media-libs/babl-0.1.72[introspection?]
+	media-libs/libnsgif
+	>=media-libs/libpng-1.6.0:0=
+	virtual/jpeg:0=
+	>=x11-libs/gdk-pixbuf-2.32:2
+	>=x11-libs/pango-1.38.0
+	cairo? ( >=x11-libs/cairo-1.12.2 )
+	ffmpeg? (
+		libav? ( media-video/libav:0= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
+	introspection? ( >=dev-libs/gobject-introspection-1.32:= )
+	lcms? ( >=media-libs/lcms-2.8:2 )
+	lensfun? ( >=media-libs/lensfun-0.2.5 )
+	openexr? ( >=media-libs/openexr-1.6.1:= )
+	pdf? ( >=app-text/poppler-0.71.0[cairo] )
+	raw? ( >=media-libs/libraw-0.15.4:0= )
+	sdl? ( >=media-libs/libsdl-1.2.0 )
+	svg? ( >=gnome-base/librsvg-2.40.6:2 )
+	tiff? ( >=media-libs/tiff-4:0 )
+	umfpack? ( sci-libs/umfpack )
+	v4l? ( >=media-libs/libv4l-1.0.1 )
+	webp? ( >=media-libs/libwebp-0.5.0:= )
+	>=sys-libs/zlib-1.2.0
+"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	>=dev-util/gtk-doc-am-1
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	>=sys-devel/libtool-2.2
+	test? ( ffmpeg? ( media-libs/gexiv2 )
+		introspection? (
+			$(python_gen_any_dep '>=dev-python/pygobject-3.2[${PYTHON_USEDEP}]')
+		)
+	)
+	vala? ( $(vala_depend) )
+"
+
+DOCS=( AUTHORS docs/ChangeLog docs/NEWS.txt )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.4.18-drop-failing-tests.patch
+	"${FILESDIR}"/${PN}-0.4.18-program-suffix.patch
+	"${FILESDIR}"/${PN}-0.4.18-arch.patch
+)
+
+pkg_setup() {
+	use test && use introspection && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# don't require Apple's OpenCL on versions of OSX that don't have it
+	if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then
+		sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die
+	fi
+
+	# commit 7c78497b : tests that use gegl.png are broken on non-amd64
+	sed -e '/clones.xml/d' \
+		-e '/composite-transform.xml/d' \
+		-i tests/compositions/meson.build || die
+
+	gnome2_environment_reset
+
+	use vala && vala_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		# disable documentation as the generating is bit automagic
+		#    if anyone wants to work on it just create bug with patch
+		-Ddocs=false
+		#  - Parameter -Dworkshop=false disables any use of Lua, effectivly
+		-Dworkshop=false
+		$(meson_use introspection)
+
+		-Dexiv2=disabled
+		-Dgdk-pixbuf=enabled
+		-Dgexiv2=disabled
+		#  - There are two checks for dot, one controllable by --with(out)-graphviz
+		#    which toggles HAVE_GRAPHVIZ that is not used anywhere.  Yes.
+		-Dgraphviz=disabled
+		-Djasper=disabled
+		$(meson_feature lcms)
+		$(meson_feature lensfun)
+		$(meson_feature ffmpeg libav)
+		-Dlibjpeg=enabled
+		-Dlibpng=enabled
+		$(meson_feature raw libraw)
+		$(meson_feature svg librsvg)
+		# libspiro: not in portage main tree
+		-Dlibspiro=disabled
+		$(meson_feature tiff libtiff)
+		#  - v4l support does not work with our media-libs/libv4l-0.8.9,
+		#    upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675
+		$(meson_feature v4l libv4l)
+		$(meson_feature v4l libv4l2)
+		-Dlua=disabled
+		-Dmrg=disabled
+		$(meson_feature openexr)
+		$(meson_feature cairo)
+		-Dpango=enabled
+		$(meson_feature cairo pangocairo)
+		$(meson_feature introspection pygobject)
+		$(meson_feature sdl sdl1)
+		-Dsdl2=disabled
+		$(meson_feature umfpack)
+		$(meson_feature vala vapigen)
+		$(meson_feature webp)
+	)
+	meson_src_configure
+}
diff --git a/media-libs/gegl/gegl-9999.ebuild b/media-libs/gegl/gegl-9999.ebuild
index ec1e63cf3a00..015343c90de2 100644
--- a/media-libs/gegl/gegl-9999.ebuild
+++ b/media-libs/gegl/gegl-9999.ebuild
@@ -2,20 +2,20 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
 
 # vala and introspection support is broken, bug #468208
 VALA_USE_DEPEND=vapigen
 
-inherit autotools gnome2-utils python-any-r1 vala
+inherit meson gnome2-utils python-any-r1 vala
 
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gegl.git"
 	SRC_URI=""
 else
-	SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A graph based image processing framework"
@@ -24,7 +24,7 @@ HOMEPAGE="http://www.gegl.org/"
 LICENSE="|| ( GPL-3+ LGPL-3 )"
 SLOT="0.4"
 
-IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection lcms lensfun libav openexr pdf raw sdl svg test tiff umfpack vala v4l webp zlib"
+IUSE="cairo debug ffmpeg introspection lcms lensfun libav openexr pdf raw sdl svg test tiff umfpack vala v4l webp"
 REQUIRED_USE="
 	svg? ( cairo )
 	vala? ( introspection )
@@ -35,12 +35,13 @@ REQUIRED_USE="
 #       If it returns, please check prior GEGL ebuilds for how libav was integrated.  Thanks!
 RDEPEND="
 	>=dev-libs/glib-2.44:2
-	dev-libs/json-glib
-	>=media-libs/babl-0.1.62
+	>=dev-libs/json-glib-1.2.6
+	>=media-libs/babl-0.1.72[introspection?]
+	media-libs/libnsgif
 	>=media-libs/libpng-1.6.0:0=
 	virtual/jpeg:0=
 	>=x11-libs/gdk-pixbuf-2.32:2
-	x11-libs/pango
+	>=x11-libs/pango-1.38.0
 	cairo? ( >=x11-libs/cairo-1.12.2 )
 	ffmpeg? (
 		libav? ( media-video/libav:0= )
@@ -49,7 +50,7 @@ RDEPEND="
 	introspection? ( >=dev-libs/gobject-introspection-1.32:= )
 	lcms? ( >=media-libs/lcms-2.8:2 )
 	lensfun? ( >=media-libs/lensfun-0.2.5 )
-	openexr? ( >=media-libs/openexr-2.2.0:= )
+	openexr? ( >=media-libs/openexr-1.6.1:= )
 	pdf? ( >=app-text/poppler-0.71.0[cairo] )
 	raw? ( >=media-libs/libraw-0.15.4:0= )
 	sdl? ( >=media-libs/libsdl-1.2.0 )
@@ -58,7 +59,7 @@ RDEPEND="
 	umfpack? ( sci-libs/umfpack )
 	v4l? ( >=media-libs/libv4l-1.0.1 )
 	webp? ( >=media-libs/libwebp-0.5.0:= )
-	zlib? ( >=sys-libs/zlib-1.2.0 )
+	>=sys-libs/zlib-1.2.0
 "
 DEPEND="${RDEPEND}
 	dev-lang/perl
@@ -74,6 +75,13 @@ DEPEND="${RDEPEND}
 	vala? ( $(vala_depend) )
 "
 
+DOCS=( AUTHORS docs/ChangeLog docs/NEWS.txt )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.4.18-drop-failing-tests.patch
+	"${FILESDIR}"/${PN}-0.4.18-program-suffix.patch
+)
+
 pkg_setup() {
 	use test && use introspection && python-any-r1_pkg_setup
 }
@@ -81,9 +89,6 @@ pkg_setup() {
 src_prepare() {
 	default
 
-	# FIXME: the following should be proper patch sent to upstream
-	# fix OSX loadable module filename extension
-	sed -i -e 's/\.dylib/.bundle/' configure.ac || die
 	# don't require Apple's OpenCL on versions of OSX that don't have it
 	if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then
 		sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die
@@ -92,9 +97,7 @@ src_prepare() {
 	# commit 7c78497b : tests that use gegl.png are broken on non-amd64
 	sed -e '/clones.xml/d' \
 		-e '/composite-transform.xml/d' \
-		-i tests/compositions/Makefile.am || die
-
-	eautoreconf
+		-i tests/compositions/meson.build || die
 
 	gnome2_environment_reset
 
@@ -102,67 +105,47 @@ src_prepare() {
 }
 
 src_configure() {
-	local myeconfargs=(
+	local emesonargs=(
 		# disable documentation as the generating is bit automagic
 		#    if anyone wants to work on it just create bug with patch
-		--disable-docs
-		# never enable altering of CFLAGS via profile option
-		--disable-profile
-		--disable-silent-rules
-		#  - Parameter --disable-workshop disables any use of Lua, effectivly
-		--disable-workshop
-		--program-suffix=-${SLOT}
-		--with-gdk-pixbuf
-		--with-pango
+		-Ddocs=false
+		#  - Parameter -Dworkshop=false disables any use of Lua, effectivly
+		-Dworkshop=false
+		$(meson_use introspection)
+
+		-Dexiv2=disabled
+		-Dgdk-pixbuf=enabled
+		-Dgexiv2=disabled
 		#  - There are two checks for dot, one controllable by --with(out)-graphviz
 		#    which toggles HAVE_GRAPHVIZ that is not used anywhere.  Yes.
-		--without-graphviz
+		-Dgraphviz=disabled
+		-Djasper=disabled
+		$(meson_feature lcms)
+		$(meson_feature lensfun)
+		$(meson_feature ffmpeg libav)
+		-Dlibjpeg=enabled
+		-Dlibpng=enabled
+		$(meson_feature raw libraw)
+		$(meson_feature svg librsvg)
 		# libspiro: not in portage main tree
-		--without-libspiro
-		--without-lua
-		--without-mrg
-		$(use_enable cpu_flags_x86_mmx mmx)
-		$(use_enable cpu_flags_x86_sse sse)
-		$(use_enable debug)
-		$(use_enable introspection)
-		$(use_with cairo)
-		$(use_with cairo pangocairo)
-		$(use_with ffmpeg libavformat)
-		--without-jasper
-		$(use_with lcms)
-		$(use_with lensfun)
-		$(use_with openexr)
-		$(use_with pdf popplerglib)
-		$(use_with raw libraw)
-		$(use_with sdl)
-		$(use_with svg librsvg)
-		$(use_with tiff libtiff)
-		$(use_with umfpack)
+		-Dlibspiro=disabled
+		$(meson_feature tiff libtiff)
 		#  - v4l support does not work with our media-libs/libv4l-0.8.9,
 		#    upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675
-		$(use_with v4l libv4l)
-		$(use_with v4l libv4l2)
-		$(use_with vala)
-		$(use_with webp)
-		$(use_with zlib)
+		$(meson_feature v4l libv4l)
+		$(meson_feature v4l libv4l2)
+		-Dlua=disabled
+		-Dmrg=disabled
+		$(meson_feature openexr)
+		$(meson_feature cairo)
+		-Dpango=enabled
+		$(meson_feature cairo pangocairo)
+		$(meson_feature introspection pygobject)
+		$(meson_feature sdl sdl1)
+		-Dsdl2=disabled
+		$(meson_feature umfpack)
+		$(meson_feature vala vapigen)
+		$(meson_feature webp)
 	)
-
-	if use test; then
-		myeconfargs+=( $(use_with ffmpeg gexiv2) )
-	else
-		myeconfargs+=( --without-gexiv2 )
-	fi
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	[[ ${PV} == *9999* ]] && emake ./ChangeLog  # "./" prevents "Circular ChangeLog <- ChangeLog dependency dropped."
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
+	meson_src_configure
 }
diff --git a/media-libs/gegl/metadata.xml b/media-libs/gegl/metadata.xml
index dd62df7fdb4d..edfb95da5b0c 100644
--- a/media-libs/gegl/metadata.xml
+++ b/media-libs/gegl/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>sping@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="lensfun">Enable support for <pkg>media-libs/lensfun</pkg>.</flag>
 		<flag name="umfpack">Enable sparse solving via <pkg>sci-libs/umfpack</pkg>.</flag>
diff --git a/media-libs/glm/Manifest b/media-libs/glm/Manifest
index a8906b664ce3..beea10de7993 100644
--- a/media-libs/glm/Manifest
+++ b/media-libs/glm/Manifest
@@ -1,12 +1,12 @@
 AUX glm-0.9.9.2-avx.patch 1124 BLAKE2B d7cf404b222d98ea4771c354ad3afa712e217be0a4e917c026f79cfb7262e1be9faa2efe85c5bf2cae8df446b421b5f3c1c5545fcc8f6cf3181f6b50425dd680 SHA512 a6a67dccfd9eeecf3ddf083de89da2fd48498a1d815e58d82a9f53feab164d46450c8a41978fcb131b9517e468bdc0949ce4c15b1b24ffe9c0dd6e94516c7874
 AUX glm-0.9.9.6-simd.patch 427 BLAKE2B 9f6e4637ff526497ba9a77247125d1fe5f06eda9bb689b5c42661deb72703b004e2c18f7236503f0673b354ba0e6fa7b13361606ea64fc0e7b9e55eccead91a2 SHA512 72f46827cd6651dd6fddc7ba548f8d9132fd74b9799a8eca6e94435141e96f752917b4343d4c3f37536bbc7713e978e4d85842da6d262c086019eb85f351a431
-AUX glm.pc.in 149 BLAKE2B 9a34ca2590ef006315e004fa6ba0b08469c9da348d8354d0ab6a7e602da1d49126cffbd28c2aab2e2dbe711d047d482b4aead45d1e8770ab571e23e895201b4d SHA512 c875971c208bac82c1a326ebcd327ec9dd92a5b86981d26bf759516107204876a401ac9c57ca6c9965021364678ebbffcaaca6a3b4ee0e532d468d7b03b3ab9b
 DIST glm-0.9.9.2.tar.gz 4572279 BLAKE2B 8b9ade542989b3f73f1a80403b73b5c04c5d64ae259891a6b41564eb7b4417876d527ea8440352f2feec6480ec926ca877a4849c4e75c6ece3692d24d87c942a SHA512 80a5fbeaaea5f1034cd6f8ad3f4daf8b5fa8d9410ccce15ced20f37e24c0f6083332fde82b1fa7357399b3e37c1a31dd3a14f257b7847a5f1ddefa627b50351a
 DIST glm-0.9.9.4.tar.gz 4578404 BLAKE2B 4c0bb64bb477ca46d45b4d25d7d992a39a82a7d745d4564dfac04c7f6e31ea0741b33d2d6c7832580e6f51f62a2efe269a9601c10d87f1e68b333e71e20c3d02 SHA512 50e4784fcd5f1da4ae27830948ffe4b412ec53447b89d30c6dcc2b4e0f9ec05cca4b07461d3d8a339eb103fae8dac325fabc87607b5397122ce2021d6e15a1a1
 DIST glm-0.9.9.5.tar.gz 4578601 BLAKE2B 9ce4dc7e638a651f958e2e0e1bfa0da121aefc382579838bfd810952bb8f4253e17caa6d743de713c86a4e8bd5f1afa38f8162e5f2d98ab141d94574d1103d40 SHA512 3b329acf5144aab1c0f47f8045d34e097699bd6685118ad8322c5ce23afdcb44ba2bb07e49301db06355b8eef7d4340b72251d55e113b533740d1e6ef6609911
+DIST glm-0.9.9.6-install.patch.gz 7594 BLAKE2B a273e1e2adc6bdcaab2a3b66457b59e42384215c19b12ce6d27706d74c4d0ec5f010912c295dff4300a44ebc16cabc09c381df5dede01daf7ebe60cf8b95d060 SHA512 bf489673077dcfc821264cbda55d63cf7a01f4e27cdcadf3f6e0d73f016a24fe590142144e2fa5d074cbc518acf34164653c31a346ab6909cfbd7af6c294e79f
 DIST glm-0.9.9.6.tar.gz 4354114 BLAKE2B e62af8d4fe22eced565a2703f5d02ad935a18a4c9352302fdb203c85149b9374066684246f940e417882d2700d13b93fc0232921151680ec58c9df80ee0be1fd SHA512 1bc8fc1da21e19f95d4a24259993c7932db328fdd2d0db68dbf60c07f372e19003a8df094fb4e153bb7f50df584c17cf0a540d3d3c38b7a287f3b55314ec2d70
 EBUILD glm-0.9.9.2.ebuild 901 BLAKE2B 1c30f2fc621753312f50d87ec0d30f52ad3b9a7398eac0d2a9616ea7da8e0e64910df8e62906ccb177066ad6bf8c4ba5b0b9e60a1c7ab18f589785fa74fb59fc SHA512 609b1bf19b416890cbfc4be4e2a44dede933227d8c41e766a29a4ca8466432598f9a7a4f8c1f7c43d8a5f84f2adb37f31ea5e4292a853a7765cf46828cbaaf68
 EBUILD glm-0.9.9.4.ebuild 862 BLAKE2B c61eb288647c2a83103c8a86c7b252b4c13a7585ecde28683df41561eb652a0a3cc9eb3ad31041110f55398ecc467ef7e77f41545f340bd2526d80338bb9c1cb SHA512 ccc3cc2e8c95d6b31aa5ebadd3f7c5c5418e3e1060bfd92cb8b2cf595a6c0b03ffea9c837985a60c2c022d17077b18586e492841df8bb18922f3715aa6f70b73
 EBUILD glm-0.9.9.5.ebuild 861 BLAKE2B c26fed064cd65b6f4a56b5c52c6938a6f4035690e5c31931ee316cca499088792dd157ac6f2ea68bcfe54d0fd5c482f293e817acedf339e979b8cedcc9fe2982 SHA512 22779553f39a41a0153ecd14a54d0995194615dde016ff2bfd2a7bc579812631585692a89565f05b05d474cdf88a4c06bea4d088bbad2ad6f18b0958b1670bc9
-EBUILD glm-0.9.9.6.ebuild 1188 BLAKE2B a9e4dae62e1da284caa285fd4d7fc9b36468f0401e4e06a3969eddbb04278939bec0f13265603885f672cd809b56d565ac3398e918548f0df5e678b26f36b190 SHA512 8ab394f2f0ec3c9129889bfb069251ccbf57849b09a68188abba5fa8a4af69dca4bb72e696a4b0a65b563e7baee29d140dfe2fd59d2157d4383ca231fb76831b
+EBUILD glm-0.9.9.6-r1.ebuild 1003 BLAKE2B d2bc8e26da5780c096d224140f22291ac8df60e2506a130aff3d7f7849d33e9db66b4d1b925f2f31972c3d746979bbc1b52a4eda7a272afddb27181f48b105d3 SHA512 f2051f5cfbdb84d03a3a69608dcc6bc4beef2a80843670ecd53ea68271c8d37e2883767004afff2ef50798147f720938ae9749497812f0775b0824eadf196dcb
 MISC metadata.xml 545 BLAKE2B 842701f1a6d1483b75f14aa99f546975b4c7de1a84d36b1e15a882d17662d98d37b491e236da73d9457706b667f0499405b5717af3ccfed73ad0518f34167c72 SHA512 637114ed9721e6d1c8f1d1ce56e9b9c208ca4dfe5f3a0c2b844d90bcdbab8344c00682c9647f7323eec7c485abcd841ef37300a8fe0bc8a5f5c12cfbb1da4971
diff --git a/media-libs/glm/files/glm.pc.in b/media-libs/glm/files/glm.pc.in
deleted file mode 100644
index fc5c7bb7f90c..000000000000
--- a/media-libs/glm/files/glm.pc.in
+++ /dev/null
@@ -1,7 +0,0 @@
-prefix=@CMAKE_INSTALL_PREFIX@
-includedir=${prefix}/include
-
-Name: GLM
-Description: OpenGL Mathematics
-Version: @GLM_VERSION@
-Cflags: -I${includedir}
diff --git a/media-libs/glm/glm-0.9.9.6.ebuild b/media-libs/glm/glm-0.9.9.6-r1.ebuild
index 7049a117fce1..196d3f431fc8 100644
--- a/media-libs/glm/glm-0.9.9.6.ebuild
+++ b/media-libs/glm/glm-0.9.9.6-r1.ebuild
@@ -7,7 +7,8 @@ inherit cmake-utils
 
 DESCRIPTION="OpenGL Mathematics"
 HOMEPAGE="http://glm.g-truc.net/"
-SRC_URI="https://github.com/g-truc/glm/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/g-truc/glm/archive/${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~tupone/distfiles/${P}-install.patch.gz"
 
 LICENSE="|| ( HappyBunny MIT )"
 SLOT="0"
@@ -16,15 +17,10 @@ IUSE="test cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_avx cpu_flags_x86
 
 RDEPEND="virtual/opengl"
 
-PATCHES=( "${FILESDIR}"/${P}-simd.patch )
-
-src_prepare() {
-	cmake-utils_src_prepare
-	sed \
-		-e "s:@CMAKE_INSTALL_PREFIX@:${EPREFIX}/usr:" \
-		-e "s:@GLM_VERSION@:0.9.9:" \
-		"${FILESDIR}"/glm.pc.in > glm.pc || die
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-simd.patch
+	"${WORKDIR}"/${P}-install.patch
+)
 
 src_configure() {
 	if use test; then
@@ -39,10 +35,3 @@ src_configure() {
 
 	cmake-utils_src_configure
 }
-
-src_install() {
-	doheader -r glm
-	dodoc -r *md doc/*
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins glm.pc
-}
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index 16055dd66f75..eb1a50b72659 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,12 +1,10 @@
-DIST harfbuzz-2.3.1.tar.bz2 17942960 BLAKE2B b1a29144b608463fa668bb66572c1530e90338ac1968b0747011637a91bed4030d77e8fa22e5a229374a0bc1976922e2e8de452e9017917f7c09ae94c3a52570 SHA512 78a8f05bfcc95cfe3fc0f1a595bdc7298c9c1456db6c7ef70914051fda43f37aaff15eac75aa6922eca82d2291baeb8385e02e6aacb44ca05b4873c311a662ac
-DIST harfbuzz-2.5.3.tar.xz 5685712 BLAKE2B a9d8a46b6a0667c598ea011f020b09d8fd795105483a8b307ee2a9399de2b84bf3b29659f9a3f7500250879bbb412003ee6f68aaba01b68824bd489615f737e6 SHA512 a2e6cedbe0e505fa31b540e0d0bc6c0b07080bd39879c27e04d351103e21201d75a809dd2fad559bf994b82b311f67ad85778cbbfb670d7e2580beafa09e93ff
-DIST harfbuzz-2.6.0.tar.xz 5736808 BLAKE2B 3dcdf71cce8cdb4596d6e622f6fbaeae1a36cf17c219a1bafe077a472f9d25f0a8b8ea7eb36a1e20558d982b36479ce5d3e19f022a5b7dadd563a017b5037767 SHA512 ab055183ae248710f7baee7ef45ac1a6cbd3522eb1e26b78248ac7bc9e421f5495b8fbbd19a339a26bd119f33624eb8742c15c2053407fbb74cce8dcf6c4b3a2
 DIST harfbuzz-2.6.1.tar.xz 5741372 BLAKE2B bb763eba23a37bd20d0ddb39824d5a0c655d6e098aea2e44b6943e7bd5cb1f9a5cd94e3de5520d962e3c476defac43af58f98d0a5b80e5c1506d00bc716ec876 SHA512 cea531ab9db0ae1b188ac56c3ea6e0344192c4321b97d4425f4a53e6bb34c88463a7453fd69fcadccb8574506c1fb5505422019e41a7938a04e7823e3f484c06
 DIST harfbuzz-2.6.2.tar.xz 5769792 BLAKE2B 8ab4f76e858cb6d120b59c62fcda783fb331ec750ed9e4a74ceea448cafab9aff814d8599442d8939d41d0b5cc176724753b16c7cd42d6d314a08ce27d6856f5 SHA512 0a98c2b49650d66cf11f3395504cba3b18aaca43482924d9b58babd2ccb986b74ed7478bef5c4c1937d7782b7b278504854eaa04a62b329df08d91d30fc879d5
-EBUILD harfbuzz-2.3.1.ebuild 3001 BLAKE2B 3e7f72d1fb68244813bfa7f575d8de02686a9a6f1a2ab93037f8ba34fddb2640a2592e78d931add449b2f9abbe487475f313f22256fd88cfac422539f9b3c72d SHA512 ee10be52b3b28892838e3b1ef0cd0a67c19bdac897f3600b7734ca82305275a58eaf31e5e487ed3b34f7aa1fc0e70b7437a14f20cccfe17720af6945b852a753
-EBUILD harfbuzz-2.5.3.ebuild 3011 BLAKE2B 34b919439695f4fd803de3d5cb5dd0e359243458ff371406b3e893fc096c6bbba41de9b040a970a1b03e94eea26aa4b98075f0043c261a4bab18bbf8c1bd469e SHA512 aaff2444906f005c5a5203614c63ea186ea7d9d432d1c8a3fe5756a9f4ed045469f3671c05008b7158aca8a7f97b0f7a1d8ca4b5b9e06ec2af1b0c26e7ae08a5
-EBUILD harfbuzz-2.6.0.ebuild 3011 BLAKE2B 34b919439695f4fd803de3d5cb5dd0e359243458ff371406b3e893fc096c6bbba41de9b040a970a1b03e94eea26aa4b98075f0043c261a4bab18bbf8c1bd469e SHA512 aaff2444906f005c5a5203614c63ea186ea7d9d432d1c8a3fe5756a9f4ed045469f3671c05008b7158aca8a7f97b0f7a1d8ca4b5b9e06ec2af1b0c26e7ae08a5
+DIST harfbuzz-2.6.3.tar.xz 5811320 BLAKE2B 84f6f8346574c881b41c47561b983d0714d2754a40955cbb8fb9687cfa0cd2dea965aad1eac417ad1cb5270cd5ced27225c710f0743a408f367902e7c326b24e SHA512 ed387c551c01305d419dab186e3760959ac31abec761dde407142ad3619db918a5b79cc1e0737004f5da3437f7eabb8d796f770f0e7eba60d3a4496995453444
+DIST harfbuzz-2.6.4.tar.xz 5967468 BLAKE2B 24d215324a408a724f47a901c4a56605144d15373518bd52643ece83705d0c63582a80635ecef6a6d8d2f5f39c750076d553fb39aaa8c0dd41702ee910c32f24 SHA512 d8664bb64fda11ff7646693070637e3827f8b3d1de50e11ecf108ce4d19c878b26b2ba4cff278da6e6cc0cb431e1630d9eaa7c32a9bebb9655a7aa8dabf7114f
 EBUILD harfbuzz-2.6.1.ebuild 3000 BLAKE2B 97049127af537a9041db8b3b0fb2eb5317acf7b2f79bf8c69f94ee6ca2c843826ccd1d1748d3bdf03d3ff6e872d4493e8f9961d768e7fe5a0f7601b5c2fce13d SHA512 1e5207a9e6c666ba2eb7a2e3d6742640b0d90766e9fc397c2f54eccdf9436f18d24a7dd2ab6f638ceb46e744eb8e98f7f3e2dbc28ba0fecc9baa0cb0a7de3438
 EBUILD harfbuzz-2.6.2.ebuild 3011 BLAKE2B 34b919439695f4fd803de3d5cb5dd0e359243458ff371406b3e893fc096c6bbba41de9b040a970a1b03e94eea26aa4b98075f0043c261a4bab18bbf8c1bd469e SHA512 aaff2444906f005c5a5203614c63ea186ea7d9d432d1c8a3fe5756a9f4ed045469f3671c05008b7158aca8a7f97b0f7a1d8ca4b5b9e06ec2af1b0c26e7ae08a5
+EBUILD harfbuzz-2.6.3.ebuild 3011 BLAKE2B 34b919439695f4fd803de3d5cb5dd0e359243458ff371406b3e893fc096c6bbba41de9b040a970a1b03e94eea26aa4b98075f0043c261a4bab18bbf8c1bd469e SHA512 aaff2444906f005c5a5203614c63ea186ea7d9d432d1c8a3fe5756a9f4ed045469f3671c05008b7158aca8a7f97b0f7a1d8ca4b5b9e06ec2af1b0c26e7ae08a5
+EBUILD harfbuzz-2.6.4.ebuild 3011 BLAKE2B 34b919439695f4fd803de3d5cb5dd0e359243458ff371406b3e893fc096c6bbba41de9b040a970a1b03e94eea26aa4b98075f0043c261a4bab18bbf8c1bd469e SHA512 aaff2444906f005c5a5203614c63ea186ea7d9d432d1c8a3fe5756a9f4ed045469f3671c05008b7158aca8a7f97b0f7a1d8ca4b5b9e06ec2af1b0c26e7ae08a5
 EBUILD harfbuzz-9999.ebuild 3011 BLAKE2B 34b919439695f4fd803de3d5cb5dd0e359243458ff371406b3e893fc096c6bbba41de9b040a970a1b03e94eea26aa4b98075f0043c261a4bab18bbf8c1bd469e SHA512 aaff2444906f005c5a5203614c63ea186ea7d9d432d1c8a3fe5756a9f4ed045469f3671c05008b7158aca8a7f97b0f7a1d8ca4b5b9e06ec2af1b0c26e7ae08a5
 MISC metadata.xml 739 BLAKE2B df7724d5cef26b569f76d41c808f99a1ecf44631f0bae96fbc2a9b4f5981061b55c60d69b1b64d966897f223a3d3b5cc4325a3ac780599ed76591fc2044b4988 SHA512 192f7abc191044f267bddb4db7d91f9b78926f4a361802f607bfe4635d7cf63398c289bc52009ad4d3bc6f92684cafd8b40e48f1e0f8cdaef9a4e27f538e7dbd
diff --git a/media-libs/harfbuzz/harfbuzz-2.3.1.ebuild b/media-libs/harfbuzz/harfbuzz-2.3.1.ebuild
deleted file mode 100644
index 79639b9b885e..000000000000
--- a/media-libs/harfbuzz/harfbuzz-2.3.1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit flag-o-matic libtool multilib-minimal python-any-r1 xdg-utils
-
-DESCRIPTION="An OpenType text shaping engine"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
-
-if [[ ${PV} = 9999 ]] ; then
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/harfbuzz.git"
-	inherit git-r3 autotools
-else
-	SRC_URI="https://www.freedesktop.org/software/${PN}/release/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="Old-MIT ISC icu"
-SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
-
-IUSE="+cairo debug +glib +graphite icu +introspection static-libs test +truetype"
-REQUIRED_USE="introspection? ( glib )"
-
-RDEPEND="
-	cairo? ( x11-libs/cairo:= )
-	glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] )
-	graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
-	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.34:= )
-	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	test? ( ${PYTHON_DEPS} )
-"
-BDEPEND="
-	dev-util/gtk-doc-am
-	virtual/pkgconfig
-"
-# eautoreconf requires gobject-introspection-common
-# ragel needed if regenerating *.hh files from *.rl
-if [[ ${PV} = 9999 ]] ; then
-	DEPEND+="
-		>=dev-libs/gobject-introspection-common-1.34
-		dev-util/ragel
-	"
-fi
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-	if ! use debug ; then
-		append-cppflags -DHB_NDEBUG
-	fi
-}
-
-src_prepare() {
-	default
-
-	xdg_environment_reset
-
-	if [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] ; then
-		# on Darwin/Solaris we need to link with g++, like automake defaults
-		# to, but overridden by upstream because on Linux this is not
-		# necessary, bug #449126
-		sed -i \
-			-e 's/\<LINK\>/CXXLINK/' \
-			src/Makefile.am || die
-		sed -i \
-			-e '/libharfbuzz_la_LINK = /s/\<LINK\>/CXXLINK/' \
-			src/Makefile.in || die
-		sed -i \
-			-e '/AM_V_CCLD/s/\<LINK\>/CXXLINK/' \
-			test/api/Makefile.in || die
-	fi
-
-	[[ ${PV} == 9999 ]] && eautoreconf
-	elibtoolize # for Solaris
-
-	# bug 618772
-	append-cxxflags -std=c++14
-}
-
-multilib_src_configure() {
-	# harfbuzz-gobject only used for instrospection, bug #535852
-	local myeconfargs=(
-		--without-coretext
-		--without-fontconfig #609300
-		--without-uniscribe
-		$(use_enable static-libs static)
-		$(multilib_native_use_with cairo)
-		$(use_with glib)
-		$(use_with introspection gobject)
-		$(use_with graphite graphite2)
-		$(use_with icu)
-		$(multilib_native_use_enable introspection)
-		$(use_with truetype freetype)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-
-	if multilib_is_native_abi; then
-		ln -s "${S}"/docs/html docs/html || die
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/media-libs/harfbuzz/harfbuzz-2.5.3.ebuild b/media-libs/harfbuzz/harfbuzz-2.6.3.ebuild
index 8f3d354b0b08..8f3d354b0b08 100644
--- a/media-libs/harfbuzz/harfbuzz-2.5.3.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.6.3.ebuild
diff --git a/media-libs/harfbuzz/harfbuzz-2.6.0.ebuild b/media-libs/harfbuzz/harfbuzz-2.6.4.ebuild
index 8f3d354b0b08..8f3d354b0b08 100644
--- a/media-libs/harfbuzz/harfbuzz-2.6.0.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.6.4.ebuild
diff --git a/media-libs/jbig2dec/Manifest b/media-libs/jbig2dec/Manifest
index 81e5b12ab0bb..fbc268148e70 100644
--- a/media-libs/jbig2dec/Manifest
+++ b/media-libs/jbig2dec/Manifest
@@ -3,5 +3,5 @@ DIST jb2streams.zip 1285838 BLAKE2B 9a2b6047a7b970439693d6f5fdefb9488019a562e7f8
 DIST jbig2dec-0.14.tar.gz 463572 BLAKE2B 91351a3879bd1906fabe2620cf5379fbbc32eaae808a8c2754c661d6dc592d3c9da13c558c8f7ced30c48b73fbd9ed4631f2817298f959b59ad4dff5fce9ac1a SHA512 066bd880ac0665fc1e42b0ae0e481008b125aab6e173b7f82d61a2a30e72c90085cbded9b2a68c6836f92dea3d8d8d5c2228dba76e0d99c79c922197d215705b
 DIST jbig2dec-0.17.tar.gz 141195 BLAKE2B 858befb59c0b943cddbc4ae2e9ffc6cdb7e1dd2185cedbffb577f0152f27a548f565548b4b0a4867e3973692b8b019a565eabe2cf672334a6b2994fd7988dcaf SHA512 79b3957186a30fc304ecd571d31c5cc421364921eb4eba242c3ea941ea111f461773f86c975657fa2ce91f2f79ff9abf760ef9bed404c7a4f35c036e5642ba0f
 EBUILD jbig2dec-0.14.ebuild 1143 BLAKE2B ff3484d4768f8b7e0f2e744732e8a82a9bd6c4630b55469b9a8da428603cfcf68e6d7cb5a1d5257936aed687fa1db52b10741783dca78ff55ae9bf6e8434d5cb SHA512 719e7b390c4f9572d2d08192468bfd3a868a2bdcaa7ce30b2aaeb169c1c012cc041990148b33d92d1128bc394788c7aee01d5bcfe717bf5054c9d2397ea876ef
-EBUILD jbig2dec-0.17.ebuild 1590 BLAKE2B f1e7607a3b5ba05ea92a1b7420a2b247c67665f4f5f3747c2b3a6ffb060d7b3c538a9e831bfa852ee9ff3b4a72051012664d8fabc8f2090b3ca6a31adfff3383 SHA512 40a6e503f715d5ed0446757edb7119c7fe28cfabbf144972c3a40b1902730eec8cf08eac3952223c710d697ddee9670e2e0c541a1948190b14d316feab52ad2a
+EBUILD jbig2dec-0.17-r1.ebuild 1606 BLAKE2B 904c8caa04262fccf7e6e92ad4ea8c2dc973499e311d86f070ac5dea29e77f036171a63643977efd134620e3812778a863486c3a14170346e36c87aa69eb4f09 SHA512 bee52b7ca9cd1952d38ed147e08accde4bfbcdbb6fde65a23eaafd2c92d32cd5b7f496c34062916a699ee59487b15ced897797c56819bf64b43200d13472e1c5
 MISC metadata.xml 473 BLAKE2B 6d374023a106375c7f5500968ed4ea2f4dd5584fb0db8f85b042844d08afb6196b7d7c019ae69b35917f43e496c9a25212aec328f0c3cf78aaa94b963de65c15 SHA512 501077ac27f5c6f8a616fa32cec23d28cb16dc0e0c19ce933cbc067494117c9c55fc3e00dfc21270892d57478a9e268f99215c8d074d6cc4114916f55a571a6f
diff --git a/media-libs/jbig2dec/jbig2dec-0.17.ebuild b/media-libs/jbig2dec/jbig2dec-0.17-r1.ebuild
index 0a030167ed52..4f69bb657ba9 100644
--- a/media-libs/jbig2dec/jbig2dec-0.17.ebuild
+++ b/media-libs/jbig2dec/jbig2dec-0.17-r1.ebuild
@@ -13,8 +13,8 @@ SRC_URI="https://github.com/ArtifexSoftware/${PN}/archive/${PV}.tar.gz -> ${P}.t
 	test? ( http://jbig2dec.sourceforge.net/ubc/jb2streams.zip )"
 
 LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0/$(ver_cut 1-2)" #698428
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="png static-libs test"
 
 BDEPEND="
diff --git a/media-libs/libdvdnav/Manifest b/media-libs/libdvdnav/Manifest
index c2102749f32e..c5416a080f61 100644
--- a/media-libs/libdvdnav/Manifest
+++ b/media-libs/libdvdnav/Manifest
@@ -1,4 +1,6 @@
 DIST libdvdnav-6.0.0.tar.bz2 369605 BLAKE2B 911b786f1cf37d32b0516df9f3ae3c388ad352206e67f73f758984795459ced7507f1454747a205b64c2d1f42922ee26ee9d434499ceaf05053dfbeb4d7e52c7 SHA512 89d1e976d8f1cc92692e86e793403759b4d705682ba7418dcfd7dd3c38861238cead303fe4baa2059ebd7e9b82a77bbdbf32e50b20848e78939ee9e75d1b96d4
+DIST libdvdnav-6.0.1.tar.bz2 378491 BLAKE2B 1baccf42bab3185584d1abc455f5b972115f1cf74a2b465b41c4858ccb26b351168b565b2dcdd5a15532fbbc090a233ab8e7fa5a3f7f77cbe9de5b22b4d31e11 SHA512 83a015821dacea702eb34abb7a940b9a263918a66fe711fe9a817754f25c2aa0afae3543b4d93673d1c93d3e7914e1b776c10ce50465516f4e3a3d419c15ad9f
 EBUILD libdvdnav-6.0.0.ebuild 1152 BLAKE2B ca9f9bb335f5a44da1d2c5f638de98bbd65bba728f00d2c2f59e0364b378d31e8033dd2b0755719e40e8d8aa3a7c3b7cc37591957f784ac8e8f7dbf062f3b97a SHA512 53cb3c91f6b4db337b006ad90845154cfe2c268adef9c939e2d9220c0fc04bdc6a354ca61b470464c210f84ccdc3f1a22b95070cb3d673bd8e87f24e1d276fa6
-EBUILD libdvdnav-9999.ebuild 1164 BLAKE2B 46fde7ad092a80fec8fee0fa06303391f4d7b97120daf33950eaed76ef7bc0a32077ed2dbfb9f67905af947d0b1bcf61438c64f957f06a43c19d29bbbfa4e798 SHA512 94191cee0081cc3b732c6148fbdb4333f7616de40f0b96091f343828c6c5530d10d7eb597cc0bfd9f2f0865816ce6d26c65e7b58d3c01206d9055c0e63740a3e
+EBUILD libdvdnav-6.0.1.ebuild 1181 BLAKE2B c5488583c282225cef8eddeebb4e64ad80141c6a9f7e666f51033c3821ee4db39142e3d640fcd80b738754179872296ee3d5eb2366444e74b2c6c81cc0e7c4cf SHA512 58a58476431d65b0e554109d5072112e5f36c22b6593a2507ee7bed8e49746d45050f8125104c0c0c82b8f57dc1d9710eeffc835ebbfb1fae84e601b5760da20
+EBUILD libdvdnav-9999.ebuild 1181 BLAKE2B c5488583c282225cef8eddeebb4e64ad80141c6a9f7e666f51033c3821ee4db39142e3d640fcd80b738754179872296ee3d5eb2366444e74b2c6c81cc0e7c4cf SHA512 58a58476431d65b0e554109d5072112e5f36c22b6593a2507ee7bed8e49746d45050f8125104c0c0c82b8f57dc1d9710eeffc835ebbfb1fae84e601b5760da20
 MISC metadata.xml 221 BLAKE2B dbd3c4ca4e95a1ad33f79e707799593ad704252f4f1c17e08c7e42ede0e4ad153eb659fc130717823dad18cab485c7b941a7089d2d964b96d2e2f7c5f1ba8df2 SHA512 e5a88aac41d38b1bdf0becef8d0a08d1875eb803fac3f791524a7810c8068cfd2239a42717bddf9835daf6c0b2c5d5592b12669882bbc2abaab39955d7de7fb4
diff --git a/media-libs/libdvdnav/libdvdnav-6.0.1.ebuild b/media-libs/libdvdnav/libdvdnav-6.0.1.ebuild
new file mode 100644
index 000000000000..ec07e6a8c918
--- /dev/null
+++ b/media-libs/libdvdnav/libdvdnav-6.0.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="Library for DVD navigation tools"
+HOMEPAGE="https://www.videolan.org/developers/libdvdnav.html"
+if [[ ${PV} = 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://code.videolan.org/videolan/libdvdnav.git"
+else
+	SRC_URI="https://downloads.videolan.org/pub/videolan/libdvdnav/${PV}/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="static-libs"
+
+RDEPEND=">=media-libs/libdvdread-6.0.0[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+# To get pkg.m4 for eautoreconf #414391
+BDEPEND="
+	virtual/pkgconfig
+"
+
+DOCS=( AUTHORS ChangeLog doc/dvd_structures doc/library_layout README TODO )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--enable-shared
+		$(use_enable static-libs static)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/media-libs/libdvdnav/libdvdnav-9999.ebuild b/media-libs/libdvdnav/libdvdnav-9999.ebuild
index 4207a036e75a..ec07e6a8c918 100644
--- a/media-libs/libdvdnav/libdvdnav-9999.ebuild
+++ b/media-libs/libdvdnav/libdvdnav-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools multilib-minimal
 
@@ -19,9 +19,12 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="static-libs"
 
-RDEPEND=">=media-libs/libdvdread-5.0.3[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig" # To get pkg.m4 for eautoreconf #414391
+RDEPEND=">=media-libs/libdvdread-6.0.0[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+# To get pkg.m4 for eautoreconf #414391
+BDEPEND="
+	virtual/pkgconfig
+"
 
 DOCS=( AUTHORS ChangeLog doc/dvd_structures doc/library_layout README TODO )
 
@@ -39,5 +42,5 @@ multilib_src_configure() {
 }
 
 multilib_src_install_all() {
-	find "${ED}" -name "*.la" -delete || die
+	find "${ED}" -type f -name "*.la" -delete || die
 }
diff --git a/media-libs/libdvdread/Manifest b/media-libs/libdvdread/Manifest
index 05982600fa8f..bd037d000a9d 100644
--- a/media-libs/libdvdread/Manifest
+++ b/media-libs/libdvdread/Manifest
@@ -1,6 +1,8 @@
 DIST libdvdread-6.0.0.tar.bz2 394627 BLAKE2B 08007113d726f96d2b179aadd2e5737ab9eeee2a52864eeaab3d2633993c66ca076559c920bd291033de794f2037d7480e4ad6f704822303f5c5b29db6b8d7cd SHA512 b07179f2f665adf6ddd7bf8b7c48cd279f3f413c5719b8ca8467e53c7cd0cac02a40101f3717186dc0e4e69e5d9c7ac6bf98a76901412d74150b9fc7bfdd2479
 DIST libdvdread-6.0.1.tar.bz2 404512 BLAKE2B 7db1d9ef6b728ba732d9f3c9e5aef6da5b8a70ee0ef95902c8de231ad64c7ad39a9ff1d01169688d197094b2755e34b1416b9f2d063566cc89984cfd86483a26 SHA512 550c01f6afcaca217d8852fdd9f4a54790239b674a45bb7c1c23a58fb5dec009e3028049a54f0904c08f15f5ad994e66bd6bea9cc8d5a8808e8b638ff8e27c4b
+DIST libdvdread-6.0.2.tar.bz2 405298 BLAKE2B 912e9a6731b142efc11a8814163061d3aeb7620aa955a822a505ac3556f82b0cf065a996ed9fab23ba95e6dcde27077ae6439ca259e712219969fb3108b10368 SHA512 e8831a67bbf1a144e9298b59e5462889c8b0197592a3c169523b5d84d9b9c1aaa719ccde2aa98c490e04f2a94c3fa7244b286e8faed674ae8c70400a0ece9c6c
 EBUILD libdvdread-6.0.0.ebuild 1122 BLAKE2B 6bc501bf80770c0bdeae63ed4b76a3830589fc075aef0187440d74757a7ad1ba2e176fa8dedc1adf0425ff80bfa20b6a8ade603d10496dfb407bd4049d7d603d SHA512 75d43691f52f8390a7b02526e19a7db4778c1e5a7c253991d6acb6d236c839cb5d45723f1c7e620af58a1e6771deedd7b9b0bcf4e085a8d386e3a6eea12cb36c
 EBUILD libdvdread-6.0.1.ebuild 1140 BLAKE2B 2cac89f2021da851293465fa777221bd33f8ddcb7d18859cab977ee9f4131df788f913fb89801c5a73c1e363d90d500d621fba1a7f3bebc28396a13139c15029 SHA512 e8952f27f3670929240aa4c8809fefa6d318b4cdb3b5670c35c23d79a6cd6456fe2e8a3870c7439a8cf11fe82f7d7d9b8de81404127b52ce082094c6edd89833
-EBUILD libdvdread-9999.ebuild 1166 BLAKE2B c307b564a1cd1be0f21f7a8c84dc0938753b5b4de9687d810f417b51d3c6fa268d7462e02531feeb06d61d28d7b070ebeb7bc684e259277e4f3c8fa28e8fff30 SHA512 c2cd4357ac1e05080869356d8166d393fd9a1f1c5aeeb504b5c457179490ff68583ab78054a048ee02c860b49181b92a6b6b2812d4c8791284dbe2ad4b917163
+EBUILD libdvdread-6.0.2.ebuild 1174 BLAKE2B 50d3e108498d418d779ea9563135fd1f61da0a181670bc0c9834aa59c10e5026546529c4722c0fe32111116ba1db42a054c396f191c5362c4c47bd5d24d95a10 SHA512 49d7f02a69607d24b79f8d36da43307072c2c6c07563b2c92dc948a646b8761d86e246913bb525a7f3e54ce493b21ce0e145b206191bb547021b67afb0b90d28
+EBUILD libdvdread-9999.ebuild 1174 BLAKE2B 50d3e108498d418d779ea9563135fd1f61da0a181670bc0c9834aa59c10e5026546529c4722c0fe32111116ba1db42a054c396f191c5362c4c47bd5d24d95a10 SHA512 49d7f02a69607d24b79f8d36da43307072c2c6c07563b2c92dc948a646b8761d86e246913bb525a7f3e54ce493b21ce0e145b206191bb547021b67afb0b90d28
 MISC metadata.xml 221 BLAKE2B dbd3c4ca4e95a1ad33f79e707799593ad704252f4f1c17e08c7e42ede0e4ad153eb659fc130717823dad18cab485c7b941a7089d2d964b96d2e2f7c5f1ba8df2 SHA512 e5a88aac41d38b1bdf0becef8d0a08d1875eb803fac3f791524a7810c8068cfd2239a42717bddf9835daf6c0b2c5d5592b12669882bbc2abaab39955d7de7fb4
diff --git a/media-libs/libdvdread/libdvdread-6.0.2.ebuild b/media-libs/libdvdread/libdvdread-6.0.2.ebuild
new file mode 100644
index 000000000000..37061f73c69f
--- /dev/null
+++ b/media-libs/libdvdread/libdvdread-6.0.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="Library for DVD navigation tools"
+HOMEPAGE="https://www.videolan.org/developers/libdvdnav.html"
+if [[ ${PV} = 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://code.videolan.org/videolan/libdvdread.git"
+else
+	SRC_URI="https://downloads.videolan.org/pub/videolan/libdvdread/${PV}/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0/7" # libdvdread.so.VERSION
+IUSE="+css static-libs"
+
+RDEPEND="css? ( >=media-libs/libdvdcss-1.3.0[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog NEWS TODO README )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--enable-shared
+		$(use_enable static-libs static)
+		$(use_with css libdvdcss)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/media-libs/libdvdread/libdvdread-9999.ebuild b/media-libs/libdvdread/libdvdread-9999.ebuild
index 25adfbb2701d..37061f73c69f 100644
--- a/media-libs/libdvdread/libdvdread-9999.ebuild
+++ b/media-libs/libdvdread/libdvdread-9999.ebuild
@@ -40,5 +40,5 @@ multilib_src_configure() {
 }
 
 multilib_src_install_all() {
-	find "${ED}" -name "*.la" -delete || die
+	find "${ED}" -type f -name "*.la" -delete || die
 }
diff --git a/media-libs/libextractor/Manifest b/media-libs/libextractor/Manifest
index feabad8accfb..d3b7c7b5baee 100644
--- a/media-libs/libextractor/Manifest
+++ b/media-libs/libextractor/Manifest
@@ -1,6 +1,9 @@
 AUX libextractor-1.8-CVE-2018-20430.patch 1405 BLAKE2B be8819430f6a608fe90a16f928d041399932202feb0e0c39885ed197e2f33728bfbaa05257e0b8dbab06866b9d03f413eff2d539e09d3be58135074fbbe3e167 SHA512 c2a4ef23dc856c03c885631be27f108337aa5e4d74f8aa1d4010ad9959694ae8d30896102b6c4067dc6ac3719177d4a7e453ef84c54bad37c5f988990f39be12
 AUX libextractor-1.8-CVE-2018-20431.patch 998 BLAKE2B 44e77c7f53c8ea2b134af14aa0810eb3b2ad1abfd689d1261de4bebd4586b9dd6c7c49f3b51f9d01c0bb6cc5c5bf224f668ed689db1b81fe71a8c144502a309d SHA512 3754ce52998329b70e7220efcdf855ac795010b145278c35c86ae558a50533854c06ad83c8f2b1a3e466a1649ce6a293afbbcbe7fded560cd319158387b1296b
 AUX libextractor-1.8-exiv2-0.27.patch 3364 BLAKE2B da55735ccab9a3cf868f274b82951cf548a2f1340ee24c180244f8ba2bbd85c7002c963d06257aac0b0457c2afeda755d0aaacb501280b995001f7bbd49d6de9 SHA512 6411df1498fd3594088b3488e490b25009e9243684b777d35fa26189c20f410b42496b5fb42f762c468df746a9bdcd6a310f645db5ab0bbe3bd121e82aa9d48c
+AUX libextractor-1.9-CVE-2019-15531.patch 518 BLAKE2B 2310c4863dcce5324706a96fb86cff7b72473d0027027bf8f40453cc863296a5c1880577af8a95f0875522da4d5251690c77cd8571e87d5c048f18240b8aee03 SHA512 5b50c20ce0e77f664578e1383e481694388e6200f01e3eef0029296deb3cc35cc76b2277d4a1f879f3f1d1b4d24235d2e17f26eacf0a5b963f1c1433a615eaa2
 DIST libextractor-1.8.tar.gz 8315688 BLAKE2B 2c617cfa667f79faef33e5f445f8d1f38dac61a7d1abd064165f0171b2fcdd812b42f1a5ee78def075383ab74b686f5de6864ce9b9a1983262a3d251ea271dc0 SHA512 770a0f1711964657ffb570c0509996b0a109886bfa0652c3a9ca63aa645f495fe5919215cf17da68e8a81a09de54bc937b61c82ec03c9e3998149c780f93451a
+DIST libextractor-1.9.tar.gz 8323852 BLAKE2B 71e81e57ce7857b7b7f0180a7b130b0808573d71384c61a1a079b0ce9c02bc4f1386d3b27c68d668b555a692e523a7998d6fbc675d15f8ee26b487b0b5b31927 SHA512 c2539b144d026fb0e871c5776aee4deaad4a987a730350744a7e5e74fbe98a4abb635dbe206b93c3aa9cd676b8797ea0b97271de0c903dfb035e245ab42ea149
 EBUILD libextractor-1.8-r1.ebuild 2838 BLAKE2B c3d9688ded6bb3803d3e06d1ba82959e9965b2ff488cebd0c7314428bb042514bddb88c1911170c31faef4e1b7434903e891d57692d7a80af1b92aa1739785de SHA512 fd100d837c2f31f3e87607d9216a05537edaf1f095f83b3948b980bea18e0b80b4bbc4b2477231fa6c012280b0ce6a2e4655dd2ad8be1c5c67de4bb08a93e3b2
+EBUILD libextractor-1.9.ebuild 2825 BLAKE2B 2305da642eacc530b6dedf24ca4dc9b3459f5d1d4f2027b45ff8f615af11ccd97ba84c6dc5d466d6ef56d8a7ac3b1bc0debc4a255b788ca5ee95533779554acc SHA512 ce1bb5f376670968bf39b768a2a88e76f1dbc8e0038ea5ae3200c360ba3b30b276a682e15861b5d834cf4ef4b8a69ea3d54aef0b6ec248b74e88dec296233eb8
 MISC metadata.xml 560 BLAKE2B dc882ee2f4322f67c307f2ed919fd25d64505185f8046d94ca2680b060a01ee81a774aba5a96eb86f2a449c503683a2a92b4668e414149ffd109721d3bb7666c SHA512 9a290ce121dfa7d5a96cc3337e936b4cd21755d7becd2ae8fa0ddac07a536c9c05aa2501c5adf136ae454b4a85ded6e0e523fd4be248feec729bbc09f7f7749b
diff --git a/media-libs/libextractor/files/libextractor-1.9-CVE-2019-15531.patch b/media-libs/libextractor/files/libextractor-1.9-CVE-2019-15531.patch
new file mode 100644
index 000000000000..11344d3946af
--- /dev/null
+++ b/media-libs/libextractor/files/libextractor-1.9-CVE-2019-15531.patch
@@ -0,0 +1,15 @@
+Description: fix heap-based buffer over-read.
+Origin: upstream, commit: d2b032452241708bee68d02aa02092cfbfba951a
+Author: Christian Grothoff <christian@grothoff.org>
+
+--- a/src/plugins/dvi_extractor.c
++++ b/src/plugins/dvi_extractor.c
+@@ -182,6 +182,8 @@
+   size = ec->get_size (ec->cls);
+   if (size > 16 * 1024 * 1024)
+     return; /* too large */
++  if (klen + 15 > size)
++    return; /* malformed klen */
+   if (NULL == (data = malloc ((size_t) size)))
+     return; /* out of memory */
+   memcpy (data, buf, iret);
diff --git a/media-libs/libextractor/libextractor-1.9.ebuild b/media-libs/libextractor/libextractor-1.9.ebuild
new file mode 100644
index 000000000000..6e14cb63b61a
--- /dev/null
+++ b/media-libs/libextractor/libextractor-1.9.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Library to extract metadata from files of arbitrary type"
+HOMEPAGE="https://www.gnu.org/software/libextractor/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~arm ppc ppc64 x86"
+IUSE="apparmor +archive +bzip2 ffmpeg flac gif gsf gstreamer gtk jpeg +magic midi mp4 mpeg tidy tiff vorbis +zlib" # test
+
+RESTRICT="test"
+
+DEPEND="
+	app-text/iso-codes
+	dev-libs/glib:2
+	media-gfx/exiv2:=
+	sys-devel/libtool
+	virtual/libiconv
+	virtual/libintl
+	apparmor? ( sys-libs/libapparmor )
+	archive? ( app-arch/libarchive:= )
+	bzip2? ( app-arch/bzip2 )
+	ffmpeg? ( virtual/ffmpeg )
+	flac? (
+		media-libs/flac
+		media-libs/libogg
+	)
+	gif? ( media-libs/giflib:= )
+	gsf? ( gnome-extra/libgsf:= )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	gtk? ( x11-libs/gtk+:3 )
+	jpeg? ( virtual/jpeg:0 )
+	magic? ( sys-apps/file )
+	midi? ( media-libs/libsmf )
+	mp4? ( media-libs/libmp4v2:0 )
+	mpeg? ( media-libs/libmpeg2 )
+	tidy? ( app-text/tidy-html5 )
+	tiff? ( media-libs/tiff:0 )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+	zlib? ( sys-libs/zlib )
+"
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+# test? ( app-forensics/zzuf )
+RDEPEND="${DEPEND}
+	!sci-biology/glimmer
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.8-exiv2-0.27.patch # bug #674046
+	"${FILESDIR}"/${P}-CVE-2019-15531.patch
+)
+
+src_prepare() {
+	default
+
+	# m4/ax_create_pkgconfig_info.m4 is passing environment LDFLAGS to Libs:
+	sed -i \
+		-e '/^ax_create_pkgconfig_ldflags=/s:$LDFLAGS ::' \
+		configure src/plugins/html_extractor.c || die
+
+	if ! use tidy; then
+		sed -i -e 's:tidy.h:dIsAbLe&:' configure || die
+	fi
+}
+
+src_configure() {
+	e_ac_cv() {
+		export ac_cv_"$@"
+	}
+
+	e_ac_cv {lib_rpm_rpmReadPackageFile,prog_HAVE_ZZUF}=no
+
+	e_ac_cv header_FLAC_all_h=$(usex flac)
+	e_ac_cv lib_FLAC_FLAC__stream_decoder_init_stream=$(usex flac)
+	e_ac_cv lib_FLAC_FLAC__stream_decoder_init_ogg_stream=$(usex flac)
+
+	e_ac_cv header_sys_apparmor_h=$(usex apparmor)
+	e_ac_cv header_archive_h=$(usex archive)
+	e_ac_cv header_bzlib_h=$(usex bzip2)
+	e_ac_cv header_gif_lib_h=$(usex gif)
+	e_ac_cv header_jpeglib_h=$(usex jpeg)
+	e_ac_cv header_magic_h=$(usex magic)
+	e_ac_cv header_mpeg2dec_mpeg2_h=$(usex mpeg)
+	e_ac_cv header_tiffio_h=$(usex tiff)
+	e_ac_cv header_vorbis_vorbisfile_h=$(usex vorbis)
+	e_ac_cv header_zlib_h=$(usex zlib)
+	e_ac_cv lib_mp4v2_MP4ReadProvider=$(usex mp4)
+	e_ac_cv lib_smf_smf_load_from_memory=$(usex midi)
+
+	local myeconfargs=(
+		--disable-static
+		--enable-experimental
+		--enable-glib
+		--disable-gsf-gnome
+		$(use_enable ffmpeg)
+		$(use_enable gsf)
+		$(use_with gstreamer)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libfreehand/Manifest b/media-libs/libfreehand/Manifest
index e01399307e7f..9652b2e45336 100644
--- a/media-libs/libfreehand/Manifest
+++ b/media-libs/libfreehand/Manifest
@@ -1,4 +1,5 @@
+AUX libfreehand-0.1.2-icu-65.patch 993 BLAKE2B 80699fd1393f3234b2041eb0c15fe53cbb3fec9c0911b21fc4a4b9834be5dba781b68ea506c18ed34982f588b243c6df0757bdd720f71bb9927b2fda8a6211fa SHA512 ff271f6132417940c1269a4df76c956960014e44b15284f5b03e90ed2668517fdd864cd281ceda1d7cc02df46c194c9cefcfd52e71fd7ae6398a81684b976d71
 DIST libfreehand-0.1.2.tar.xz 516132 BLAKE2B 7c2dc629fd2a84f23dcd721ed6f9d4644e3bf7a160be9ca5ec0f15a72ae63b3cf861f80fafa12ef1f99b02e0fbc1c806bc37c466010a420bb425f4f9e2757928 SHA512 4112a76ac99999801d97d1b282596d631d8496a5bf65778ab26aa06da86637b1e2b630648a67ea01bf3316ecec9f2715546baff27af090b900267c87a011b963
-EBUILD libfreehand-0.1.2.ebuild 1188 BLAKE2B 3a8bb50e8609ad253f17b3e7eaaaba8d07ece4273de198aafe7cf526fc644cda20e747241c007449bcfea6a23822c583e3abd2bcc8cb05a6ee7d5d7e04bd7e37 SHA512 b03c5417960418c4d0227597ca42b11b68135dcdfaf984a77db8527dbae2b9e6375bd52e2bd380d22dbe7543d992788730e92f63e18ca81c7bebdd310ceb12e1
+EBUILD libfreehand-0.1.2.ebuild 1233 BLAKE2B 4647efda1f1deacc37803685100f3be57f295c340b7a6b5f600a9eb10c86ddd644130190ce1451f9ea078c2c62a4bb7949a53dafc38e04195d9ccd4dc725a404 SHA512 1335465da62d7eba078160509d4ff6e89171614142b102e8a38843fc78cae34fbe096072324f24f88582c6e3acc548e3fd5caa8b33f40e6b2122a924073f3cb9
 EBUILD libfreehand-9999.ebuild 1219 BLAKE2B 1492965e949240027d702e3d1dcae52ba2d2f755969db240321375ab465229b31ecf1bb020305e3c8e5adf96b032fd88a0260f679639c9135dcca39f69ddfa5b SHA512 e4999e91f63a9767373d46bacac7e5617f2544838261c37d6f84332fb37b6bcc78f94eee5e3cdebe20b228685803e9b8377ff7b96bc2b674e76b9ae886607ce9
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/media-libs/libfreehand/files/libfreehand-0.1.2-icu-65.patch b/media-libs/libfreehand/files/libfreehand-0.1.2-icu-65.patch
new file mode 100644
index 000000000000..a24664952252
--- /dev/null
+++ b/media-libs/libfreehand/files/libfreehand-0.1.2-icu-65.patch
@@ -0,0 +1,26 @@
+From af3197f795625f5188602073205a34369698b6df Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heirecka@exherbo.org>
+Date: Fri, 4 Oct 2019 01:46:12 +0200
+Subject: [PATCH] Add missing semicolon to fix build with icu 65.1
+
+Change-Id: I7a0b0d600e9f7770245a7485813a944bfac4f088
+Reviewed-on: https://gerrit.libreoffice.org/80224
+Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
+Tested-by: Miklos Vajna <vmiklos@collabora.com>
+---
+ src/lib/libfreehand_utils.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/lib/libfreehand_utils.cpp b/src/lib/libfreehand_utils.cpp
+index 439c457..32f23e0 100644
+--- a/src/lib/libfreehand_utils.cpp
++++ b/src/lib/libfreehand_utils.cpp
+@@ -162,7 +162,7 @@ void libfreehand::_appendUTF16(librevenge::RVNGString &text, std::vector<unsigne
+   while (j < length)
+   {
+     UChar32 c;
+-    U16_NEXT(s, j, length, c)
++    U16_NEXT(s, j, length, c);
+     unsigned char outbuf[U8_MAX_LENGTH+1];
+     int i = 0;
+     U8_APPEND_UNSAFE(&outbuf[0], i, c);
diff --git a/media-libs/libfreehand/libfreehand-0.1.2.ebuild b/media-libs/libfreehand/libfreehand-0.1.2.ebuild
index f27b47bb1398..ac35aa0e43ab 100644
--- a/media-libs/libfreehand/libfreehand-0.1.2.ebuild
+++ b/media-libs/libfreehand/libfreehand-0.1.2.ebuild
@@ -33,6 +33,8 @@ DEPEND="${RDEPEND}
 	test? ( dev-util/cppunit )
 "
 
+PATCHES=( "${FILESDIR}/${P}-icu-65.patch" )
+
 src_prepare() {
 	default
 	[[ -d m4 ]] || mkdir "m4"
diff --git a/media-libs/libglvnd/Manifest b/media-libs/libglvnd/Manifest
index bf4434decf83..b60248d3efa6 100644
--- a/media-libs/libglvnd/Manifest
+++ b/media-libs/libglvnd/Manifest
@@ -1,4 +1,4 @@
 DIST libglvnd-1.2.0.tar.gz 2030275 BLAKE2B b6b147f431ba9a177be9eada7af0e4ffc05c412e29f3a257746d74ff99078ecf87f7e66a97f7c1ce2779b3224bf3e7d1c4ab57c437074ae754e646c9275dae7f SHA512 f09a3ab3f1ba7397616cf2b0baf4385bd2127abb06817f8b383549cb21f36802be24a29598d7bfdd4c410b9ea95335b4ffc52529824dc88a719af52432c6b74c
-EBUILD libglvnd-1.2.0.ebuild 1155 BLAKE2B 9d48e9c1637a31fb33d99cf674c22c73f7e2b7d8a746d3644c8b6113fe982b9848f3936f4900aa312d30c89dc4b1898da4daba6ccfaab694fee37a728f63ef2f SHA512 40c9c5e70595266c6835bece0765191767b5e3811fe49e86e94821cb44914351f812c7f4e9c7619ec8892f165b669fc9001e29a9c866304a081d81a33313d455
-EBUILD libglvnd-9999.ebuild 1199 BLAKE2B 029902c0c826c0ee71314c1a9c24fe022a04327bf5addd80bc937e9007bcd4e043a29dd94de5810b4d385ecbb68229d27ac05aa51d9c7a1417a61076f77dda74 SHA512 9b84a3b424481d5c069444bb76e2d2c9572b058e245ef4145a6833ad891b6aac3e95417e5c844da7ee7ec2fc8471871bba4dc4441f02c2e21308482def70169d
+EBUILD libglvnd-1.2.0-r1.ebuild 1131 BLAKE2B 68103807f3f8628064fed57b7c95537b9daf1a2959a06fb6ff2a92037395397e88a5a6dc75140b1bb6d6166ea9719eb42c52dd2a14e0b342622e2b676931c21b SHA512 45a7e3ead4a35a2799b4495b2ab0cf9a5b77560c4d01209bb27ee60dce06a72fdfd590fccbd6cd24d5d3f4e4688d59c10ac95a0d971698496da3c4267981744d
+EBUILD libglvnd-9999.ebuild 1200 BLAKE2B c166dab6fd8fd1f0ab5adab02e9f3e701c1eee437c69fc8f15aadc54fd6edc90384a06dae0414361f0a65ccf9055a0c2db68ddb75f339071988acf64c66ebe5d SHA512 360491fd36d068ab479b8d9d597f802a72c97751d20d354ecf6c1292059b08c7aa8bf9105d23c756dc1adf499c1fce1e8a0277dd643a6324d58d2473bc2c4be1
 MISC metadata.xml 314 BLAKE2B 34c95a3e321c3059bca39c7beb5b7b15e8085b54affb267947fb3676018fa183040a157716e979c5e0381acdea6e738294b37841e75da308c3632fb3587dec33 SHA512 fa12f7fa880b0721baf2eb40b9fd8a68e51c143dd8ede7a199c5afcd5a208f84c51a80fc1f4bc68b266338bac8bf4137b2443d88567150f2c54b2f11913df89c
diff --git a/media-libs/libglvnd/libglvnd-1.2.0.ebuild b/media-libs/libglvnd/libglvnd-1.2.0-r1.ebuild
index c7d45b570081..42b0789af3bf 100644
--- a/media-libs/libglvnd/libglvnd-1.2.0.ebuild
+++ b/media-libs/libglvnd/libglvnd-1.2.0-r1.ebuild
@@ -27,7 +27,7 @@ IUSE="X"
 
 RDEPEND="
 	!media-libs/mesa[-libglvnd(-)]
-	!<media-libs/mesa-19.2.0_rc1
+	!<media-libs/mesa-19.2.2
 	X? (
 		x11-libs/libX11[${MULTILIB_USEDEP}]
 		x11-libs/libXext[${MULTILIB_USEDEP}]
@@ -43,7 +43,6 @@ src_prepare() {
 
 multilib_src_configure() {
 	myconf=(
-		--disable-headers
 		$(use_enable X x11)
 		$(use_enable X glx)
 	)
diff --git a/media-libs/libglvnd/libglvnd-9999.ebuild b/media-libs/libglvnd/libglvnd-9999.ebuild
index 846bfd27931f..877b89fb3094 100644
--- a/media-libs/libglvnd/libglvnd-9999.ebuild
+++ b/media-libs/libglvnd/libglvnd-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-EGIT_REPO_URI="https://github.com/NVIDIA/${PN}.git"
+EGIT_REPO_URI="https://gitlab.freedesktop.org/glvnd/libglvnd.git"
 
 if [[ ${PV} = 9999* ]]; then
 	GIT_ECLASS="git-r3"
@@ -13,7 +13,7 @@ PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 inherit autotools ${GIT_ECLASS} multilib-minimal python-any-r1
 
 DESCRIPTION="The GL Vendor-Neutral Dispatch library"
-HOMEPAGE="https://github.com/NVIDIA/libglvnd"
+HOMEPAGE="https://gitlab.freedesktop.org/glvnd/libglvnd"
 if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
@@ -29,7 +29,7 @@ IUSE="X"
 
 RDEPEND="
 	!media-libs/mesa[-libglvnd(-)]
-	!<media-libs/mesa-19.2.0_rc1
+	!<media-libs/mesa-19.2.2
 	X? (
 		x11-libs/libX11[${MULTILIB_USEDEP}]
 		x11-libs/libXext[${MULTILIB_USEDEP}]
@@ -45,7 +45,6 @@ src_prepare() {
 
 multilib_src_configure() {
 	myconf=(
-		--disable-headers
 		$(use_enable X x11)
 		$(use_enable X glx)
 	)
diff --git a/media-libs/libheif/Manifest b/media-libs/libheif/Manifest
index c57158c93da5..e3fb1b74ef3a 100644
--- a/media-libs/libheif/Manifest
+++ b/media-libs/libheif/Manifest
@@ -1,11 +1,4 @@
-AUX libheif-1.3.2-openjpeg-2.patch 2512 BLAKE2B 165576cb3da35534a9e628f3dfb3c47b52718109ffb3582acfde093a22284053fd1e7986216f670491652f1362011409888084b37a79777e393002b1d9ea7237 SHA512 c8bb96ef7091d2f0e46bbe61e05a30e8a3e93f7b5925d45a30a045cac39e26000c04166d5ea0417ebf530b8bff5992de0b46ca112041e1aa87ecf7eb5928e844
-DIST libheif-1.3.2.tar.gz 1328174 BLAKE2B 4c0f82bb90d48f89a4ce9aed525c5823bb5d008e54e580e761f6fa4f5493f265929a0607e7b81046ba7c249bd2ca21a0c5ab91da83b7e7f3a2a63e8f24df88ed SHA512 bcc8b4b2522ef6fe68f5a9ffd5312c2c8f6bc3718394eef1860e199c30fb735bb214f665ed6480b5f5fe5d578b3ed77a4301af93775ae2349ba5038b3f3ef63a
-DIST libheif-1.4.0.tar.gz 1366030 BLAKE2B a93b3b59a4f89e0aa5a5069fdebc54b9d09adeeff05ebf28b9535baa2fb26e4122b4c5d96b7015fdd181720f10e3dd0887038f0c5567c94509aa76d2ef119dd9 SHA512 fc48caaadb71ffa87227de75c9e13d5006c66f1c966ce454552defb8947999f5242a9bbd1413f58be1ccbf61df7f118defe96d67376e3b4e7b12fe5dfa0fe0c7
-DIST libheif-1.4.1.tar.gz 950721 BLAKE2B 39793dbf4334b7ca93993ba518f9c935eb6d29a2debea12a3f1727d245572945e456b7997d79403da53bb5701ee62af8235a9815221402e5b901d9c07aa015a0 SHA512 c6e7d00c040885c506dde40469ba51b0346126689ed238abce123b471f748431cb29914015b3ca97749855a0f1f7c8e9a58388d4468da3c2d17c7a3a15270af0
 DIST libheif-1.5.1.tar.gz 1510087 BLAKE2B 1dd5e913c8913c6b62b770653585f8ccf7cda14c4dd79ff2073bf085da4d730accaef8d0f8008ac941238a7e3e131add1a218e0c78a886847b3bcf253d66c9b6 SHA512 05e32ebff08d5f0e82e9b1107253c27882ae1694150033fe7b3ca07db8c64567f09002081276e92a3b490a63022a1522d577b094a7f489742139758d17f484b8
-EBUILD libheif-1.3.2-r1.ebuild 1253 BLAKE2B 2c16caae78c6ae8858ea3c9db14ca532768b10b7c748804c8e79705eb9f61cf59c2d8a4b40f633b2cdface010bdaa411370c057a541affb644f7d796d993bb8b SHA512 5851eeaf4b4f45414cf5c61c4a62685c40298e490353df573818f3467832c5bf712a82822e8c339234e15edd774b239d352dab0d8ca7ee7f2fcae55fb1e47d41
-EBUILD libheif-1.4.0.ebuild 1325 BLAKE2B 727a9fa06e8be8dba18699868d68dc454052ba1d7d23fe700b0aebd8673801800e2656aa68955bdfd945533d72cf30ce9c927a11b814aec3e41c22ccbc6fe9e1 SHA512 7c2b033ca4906b9a913ee6d8954355caad882371e1cc65dfe6b2f5f1e376b1e3e2461c3cb9079655c22c1292f6c5666c0d602bd21efb8438c20139c2ae0e1f86
-EBUILD libheif-1.4.1.ebuild 1433 BLAKE2B c7b2773058f3158b8b41f71fd814eab2b72e1a59ecd14630c65a5932a65c4b50c1fe961d16e4a4586a97064273779aeb1665390085fc9250376193587f2543de SHA512 8aedeee2697ac95d078df28e575ad2b032443e72b4d92bb8aaca601f1d85dad5795106ee235ac94a02a6e2b0a7300fd25d461a5843f89b81f24065de4776eb75
 EBUILD libheif-1.5.1.ebuild 1430 BLAKE2B 22f4dc1704f359e3f8dbba6365a9c7c228a959ff59957a96f3a3cf99827bbec8355ef6b9e6f12d8e5f819272cd3233158ce4379965ca54ef01c229a547e3d24a SHA512 ec9eb1aa4c8e071bc237668e50400658059939cfb3bf081dc44686c84cf7a8dcd195bb1ff9ae2ee172e48a44f6b400f60921ea63ce054337e9b48d8587fbd178
 EBUILD libheif-9999.ebuild 1433 BLAKE2B d081d416eda7b42dc78e5d14b25cd4587b9c9052a5ea16f9d5a9d865f7b8e1e88cdbc615f4520ffa7a475e5e5db0ffd2f336b1129ad32e5d8374fc867832fcaa SHA512 c58157d6add0a2160e3b05e4f170706b8b3758a904bc798a1256d5b12c264a66dd94ba01cfa2789e0d35b7315add323d0cbc9781e470590838ba7db5a3998857
 MISC metadata.xml 369 BLAKE2B e85296d149b4ebfe852a79ed951dff87e3586617cac09f2e81bc501f2739599e7fda1835f1d677cd923a1324e4f6d85e4f1552eb0589511372dd603d239880c5 SHA512 70bbaa03beb93f3649271be35d4c90e7d79395efefd0cfb9915525a5c736629bcf56bd66e2d1bbf2a746c62a5f21ddb8874cdf28f61180fe9abc3ad22ab51fc8
diff --git a/media-libs/libheif/files/libheif-1.3.2-openjpeg-2.patch b/media-libs/libheif/files/libheif-1.3.2-openjpeg-2.patch
deleted file mode 100644
index 138295965b4c..000000000000
--- a/media-libs/libheif/files/libheif-1.3.2-openjpeg-2.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-Support building against libjpeg-turbo 2.0.
-
-Backport of https://github.com/strukturag/libheif/pull/85
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -95,6 +95,22 @@ AC_CHECK_LIB([jpeg], [jpeg_destroy_compress], [
- ], [have_libjpeg="no"])
- fi
- AM_CONDITIONAL([HAVE_LIBJPEG], [test "x$have_libjpeg" = "xyes"])
-+if eval "test x$have_libjpeg = xyes"; then
-+AC_MSG_CHECKING([for jpeg_write_icc_profile])
-+AC_LANG_PUSH(C++)
-+AC_TRY_COMPILE([
-+    #include <stddef.h>
-+    #include <stdio.h>
-+    #include <jpeglib.h>
-+],[
-+    jpeg_write_icc_profile(NULL, NULL, 0);
-+],[has_jpeg_write_icc_profile=yes],[has_jpeg_write_icc_profile=no]);
-+AC_LANG_POP(C++)
-+AC_MSG_RESULT([$has_jpeg_write_icc_profile])
-+if eval "test x$has_jpeg_write_icc_profile = xyes"; then
-+    AC_DEFINE(HAVE_JPEG_WRITE_ICC_PROFILE, 1, [Define to 1 if jpeg_write_icc_profile is available in libjpeg.])
-+fi
-+fi
- 
- PKG_CHECK_MODULES([libpng], [libpng], [
-     AC_DEFINE([HAVE_LIBPNG], [1], [Whether libpng was found.])
---- a/examples/CMakeLists.txt
-+++ b/examples/CMakeLists.txt
-@@ -8,6 +8,24 @@ include (${CMAKE_ROOT}/Modules/FindJPEG.cmake)
- 
- if(JPEG_FOUND)
- add_definitions(-DHAVE_LIBJPEG=1)
-+
-+include (${CMAKE_ROOT}/Modules/CheckCXXSourceCompiles.cmake)
-+
-+set(CMAKE_REQUIRED_LIBRARIES ${JPEG_LIBRARIES})
-+check_cxx_source_compiles("
-+#include <stddef.h>
-+#include <stdio.h>
-+#include <jpeglib.h>
-+
-+int main() {
-+  jpeg_write_icc_profile(NULL, NULL, 0);
-+  return 0;
-+}
-+" HAVE_JPEG_WRITE_ICC_PROFILE)
-+if(HAVE_JPEG_WRITE_ICC_PROFILE)
-+  add_definitions(-DHAVE_JPEG_WRITE_ICC_PROFILE=1)
-+endif()
-+
- set (heif_convert_sources
-   ${heif_convert_sources}
-   encoder_jpeg.cc
---- a/examples/encoder_jpeg.cc
-+++ b/examples/encoder_jpeg.cc
-@@ -17,6 +17,10 @@
-  * You should have received a copy of the GNU General Public License
-  * along with convert.  If not, see <http://www.gnu.org/licenses/>.
-  */
-+#if defined(HAVE_CONFIG_H)
-+#include "config.h"
-+#endif
-+
- #include <assert.h>
- #include <errno.h>
- #include <string.h>
---- a/examples/encoder_jpeg.h
-+++ b/examples/encoder_jpeg.h
-@@ -24,6 +24,9 @@
- #include <stddef.h>
- #include <stdio.h>
- 
-+// Prevent duplicate definition for newer versions of libjpeg-turbo.
-+#undef HAVE_STDDEF_H
-+#undef HAVE_STDLIB_H
- #include <jpeglib.h>
- 
- #include <string>
---- a/examples/heif_enc.cc
-+++ b/examples/heif_enc.cc
-@@ -35,6 +35,9 @@
- 
- #if HAVE_LIBJPEG
- extern "C" {
-+// Prevent duplicate definition for newer versions of libjpeg-turbo.
-+#undef HAVE_STDDEF_H
-+#undef HAVE_STDLIB_H
- #include <jpeglib.h>
- }
- #endif
diff --git a/media-libs/libheif/libheif-1.3.2-r1.ebuild b/media-libs/libheif/libheif-1.3.2-r1.ebuild
deleted file mode 100644
index f65ef1de3e8b..000000000000
--- a/media-libs/libheif/libheif-1.3.2-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools multilib-minimal
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/strukturag/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/strukturag/${PN}/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 arm64 x86"
-
-	PATCHES=( "${FILESDIR}"/${P}-openjpeg-2.patch )
-fi
-
-DESCRIPTION="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder"
-HOMEPAGE="https://github.com/strukturag/libheif"
-
-LICENSE="GPL-3"
-SLOT="0/1.3"
-IUSE="static-libs +threads"
-
-DEPEND="
-	media-libs/libde265:=[${MULTILIB_USEDEP}]
-	media-libs/libpng:0=[${MULTILIB_USEDEP}]
-	media-libs/x265:=[${MULTILIB_USEDEP}]
-	sys-libs/zlib:=[${MULTILIB_USEDEP}]
-	virtual/jpeg:0=[${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-
-	sed -i -e 's:-Werror::' \
-		configure.ac || die
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable threads multithreading)
-		$(use_enable static-libs static)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name '*.la' -delete || die
-	if ! use static-libs ; then
-		find "${ED}" -name "*.a" -delete || die
-	fi
-}
diff --git a/media-libs/libheif/libheif-1.4.0.ebuild b/media-libs/libheif/libheif-1.4.0.ebuild
deleted file mode 100644
index 4950607eb42b..000000000000
--- a/media-libs/libheif/libheif-1.4.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools multilib-minimal
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/strukturag/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/strukturag/${PN}/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-DESCRIPTION="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder"
-HOMEPAGE="https://github.com/strukturag/libheif"
-
-LICENSE="GPL-3"
-SLOT="0/1.4"
-IUSE="static-libs test +threads"
-
-BDEPEND="test? ( dev-lang/go )"
-DEPEND="
-	media-libs/libde265:=[${MULTILIB_USEDEP}]
-	media-libs/libpng:0=[${MULTILIB_USEDEP}]
-	media-libs/x265:=[${MULTILIB_USEDEP}]
-	sys-libs/zlib:=[${MULTILIB_USEDEP}]
-	virtual/jpeg:0=[${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-
-	sed -i -e 's:-Werror::' \
-		configure.ac || die
-
-	eautoreconf
-
-	# prevent "stat heif-test.go: no such file or directory"
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable threads multithreading)
-		$(use_enable static-libs static)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name '*.la' -delete || die
-	if ! use static-libs ; then
-		find "${ED}" -name "*.a" -delete || die
-	fi
-}
diff --git a/media-libs/libheif/libheif-1.4.1.ebuild b/media-libs/libheif/libheif-1.4.1.ebuild
deleted file mode 100644
index cdb69afd0939..000000000000
--- a/media-libs/libheif/libheif-1.4.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools xdg-utils multilib-minimal
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/strukturag/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/strukturag/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-DESCRIPTION="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder"
-HOMEPAGE="https://github.com/strukturag/libheif"
-
-LICENSE="GPL-3"
-SLOT="0/1.4"
-IUSE="static-libs test +threads"
-
-BDEPEND="test? ( dev-lang/go )"
-DEPEND="
-	media-libs/libde265:=[${MULTILIB_USEDEP}]
-	media-libs/libpng:0=[${MULTILIB_USEDEP}]
-	media-libs/x265:=[${MULTILIB_USEDEP}]
-	sys-libs/zlib:=[${MULTILIB_USEDEP}]
-	virtual/jpeg:0=[${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-
-	sed -i -e 's:-Werror::' \
-		configure.ac || die
-
-	eautoreconf
-
-	# prevent "stat heif-test.go: no such file or directory"
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable threads multithreading)
-		$(use_enable static-libs static)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name '*.la' -delete || die
-	if ! use static-libs ; then
-		find "${ED}" -name "*.a" -delete || die
-	fi
-}
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-}
diff --git a/media-libs/libinsane/Manifest b/media-libs/libinsane/Manifest
index d41f5ba02bf2..b0ef144a6697 100644
--- a/media-libs/libinsane/Manifest
+++ b/media-libs/libinsane/Manifest
@@ -1,4 +1,6 @@
 AUX libinsane-1.0.1-meson_options.patch 2038 BLAKE2B b14ba254604f214c2cd1a15e705ea361b635bac7faae4995811477456ea8a8d8bf969fefb4330b3b6f05cd498cd2f01b8b065c2f8f3c88e21e62ea6ef204de15 SHA512 c0d5d3ce5d763d04327ea500229c9f26d989aa8072dec569adb3766c70e0cab9e00629e3099c5ab8bd4e3c84b86925ad108fe78eeae9066164de1302e2226572
 DIST libinsane-1.0.1.tar.gz 706575 BLAKE2B 32ae63c275e6e9c709aefd0c6ed2237df70ad027626cf6ded2009071c74ce925d50ab730bd36b677915d2bd6e606d6337e890cfcc3e8bf4a1f281e026140537a SHA512 1b7091b207b8ea559f21084aa8231c62f34dfa6043e9f358d55708006989c50ee131011dbe5bd03bcd1212cd0219ae9d65a544e57cf3a71c4c2f65e5d89257bc
+DIST libinsane-1.0.2.tar.gz 712366 BLAKE2B 5be68792b3a89718308a180b1ca9383e7aebbd2f4e3420376ffecbc7d9b32d16b2fdcf060760708f8ef8f125c4d4caf2f41c6c15da53506e46302dc4155038be SHA512 d65c3fdcc8f64be473a7ff8078b5c9cbfa65ebbf44184fb76c12b40eedc87742167c8fa720683d83d5d29292664c6e311a2c12f45dff35306f60ac7612e63d97
 EBUILD libinsane-1.0.1.ebuild 901 BLAKE2B a2f67af896828a3526f5494b508148d16ebef09c42afe67253fa40533bdba236ed0e34d069977994cef1953ff99ce2148ef85accf3498b86fc62481c877a76b9 SHA512 8c10f60d79fa4852442545c5b16ac7c240875dddd7e7ac0b0dda162cf8194976f7c7b2581d817324a32525e0327509b7f0cc0e096104fa786611693f27e0ab9e
+EBUILD libinsane-1.0.2.ebuild 907 BLAKE2B c7aaead31e64e3c4803c3984668ee8ebd35623092bb232b55cf3304a001231cc8eb9912b35c23b4b31b507eb0dd186754825f7e989b6610e0ec14772f0a3aa8f SHA512 4bbb9a14eefbbffec2e9a759919cc7c72f65785690b5d7c0ab22a03cff71266ffd4c9434473bd4e9acb7917aeff8cbae9cb8cc331c636eac73d4ca316fca39f0
 MISC metadata.xml 1015 BLAKE2B 2e8221fd55bcf22db23935d2150a4832c32c8e7b7703b7305797da9f63eda012261a8dbd25a00a92964a2b4e3fc22b9e2252133431582ae27964f091161d1176 SHA512 2de5a23ff82cc957941ac4e21d1261743a7f4f36a13ff6402224989eb613fa3a5138b3a464b79017e1c17cc4b7bd553e16e3cb5d9f575b57a362ab4c7d2d1fc9
diff --git a/media-libs/libinsane/libinsane-1.0.2.ebuild b/media-libs/libinsane/libinsane-1.0.2.ebuild
new file mode 100644
index 000000000000..5fa12b107f72
--- /dev/null
+++ b/media-libs/libinsane/libinsane-1.0.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit meson vala
+
+DESCRIPTION="Crossplatform access to image scanners"
+HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork/libinsane"
+SRC_URI="https://gitlab.gnome.org/World/OpenPaperwork/libinsane/-/archive/${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc gtk-doc test"
+
+RDEPEND="media-gfx/sane-backends"
+DEPEND="${RDEPEND}
+	doc? (
+		app-doc/doxygen
+		dev-util/gtk-doc
+	)
+	test? (
+		dev-util/cunit
+		dev-util/valgrind
+	)"
+
+BDEPEND="virtual/pkgconfig
+	$(vala_depend)"
+
+# Tests require an operational valgrind
+# https://wiki.gentoo.org/wiki/Debugging
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.0.1-meson_options.patch )
+
+src_prepare() {
+	vala_src_prepare
+	default
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use doc doc)
+	)
+	meson_src_configure
+}
diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest
index 984260a876f2..31e978577141 100644
--- a/media-libs/libjpeg-turbo/Manifest
+++ b/media-libs/libjpeg-turbo/Manifest
@@ -8,4 +8,4 @@ DIST libjpeg8_8d-2.debian.tar.gz 14764 BLAKE2B e93d12afa062da28b717b540492221f70
 EBUILD libjpeg-turbo-1.5.3-r2.ebuild 2977 BLAKE2B 1cf872b7308510e14eb9c55cf60287cf297f71275d0d0aababbae34c260d903ec9d6337b9e6b63bf18ca25458a9f5ad46fd773d82a99b70d26552f6fbdf0296d SHA512 fe0954fb131f32a783501e58c094329429c34580a649a911f01030ef1d99af0fe1fbbd1d5f2fadc2db34be6e16097d3ffa9d66184f0dcbecb3a3bbe5e71eb00e
 EBUILD libjpeg-turbo-2.0.2.ebuild 2659 BLAKE2B 071d9d2d4464716dabf134e987c04db6f9f38c70ebb72a64273eef88f6da32c14f055dbce351b2f9e02ed445b6b9c38397aa80295308dc78f46c2f20db1f03d1 SHA512 a712aa0f7a869f7a7fe45a77db8833b632143845a541cb6ad772688f04872342e2e2b48ac39d65c2e3318f068f6cb620146853b99fcbde892f1778ab64062fbf
 EBUILD libjpeg-turbo-2.0.3.ebuild 2657 BLAKE2B 24547c8a01104a4b07e930572dc9d94f4636150d2d8c024d8f2f7a7ce4380c18b20474b94c90f8ec653260c54916cfb441dcb5f1cfb724267ba0354e2bf4d88b SHA512 16748399592d749b628586fdd17bbf91456e0cdb4975f44f31f493df2194cc82ad9fb28d9f697c7bc26ff9d6460a48c975725b95caa96135f4b5d151d4b3a552
-MISC metadata.xml 539 BLAKE2B 6daa06f2aab2c89c5519369550061055eb37612bd8696ca44dc7c3658f81bb38dcd3715419559fc580b0d62d5e54b4aee2c126aadb6845315a3bcf2ca413f76a SHA512 b47273474a5ab74e5b10ec672b326043f5c3699bd6531cea33ac1ba9f38a42f42bda960360f01314bca5461c3b40ee74470c78e6562aebd93ec54944908a2932
+MISC metadata.xml 425 BLAKE2B 675a25f38cc91c2d60d54acf1b07e58c682415b14f2a4fc61f363b743b8d00c8c7f0f8c763f8c6d3199afd2980a834b6a2acf587f6a6f94a6afeeae0d1d3ac25 SHA512 36f6245075da1d9925e7816a0014244e18c4cf5e2e634e7dedeb1aeba6f944449017a98bfa37f0724e1a04d30173533c81f770eca7a332191df7af8afab80959
diff --git a/media-libs/libjpeg-turbo/metadata.xml b/media-libs/libjpeg-turbo/metadata.xml
index 107c5f70700b..8f62c78fd6c6 100644
--- a/media-libs/libjpeg-turbo/metadata.xml
+++ b/media-libs/libjpeg-turbo/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>anarchy@gentoo.org</email>
-    <name>Jory A. Pratt</name>
-  </maintainer>
   <maintainer type="project">
     <email>graphics@gentoo.org</email>
     <name>Gentoo Graphics Project</name>
diff --git a/media-libs/libmypaint/Manifest b/media-libs/libmypaint/Manifest
index 464e5447fc68..1860006ddd59 100644
--- a/media-libs/libmypaint/Manifest
+++ b/media-libs/libmypaint/Manifest
@@ -1,9 +1,14 @@
 AUX libmypaint-1.3.0-gegl-0.4.14.patch 4368 BLAKE2B f4094718153e1cf08a173f2a350fc63e0993de839763b1e733214c1966c00f14e8c5e760b0ccc113401d82078af92b19938f9bd6ea96ca3caf41883eef82d548 SHA512 cb0cf38330d820681d6b089884ac8af13ac24c0600807a5c301bd03a5387df9e1a17caf3519985deb188a28b4a9c8d6c5f9d19cf2a481a4a696c871f997244d2
 AUX libmypaint-1.3.0_beta1-as-needed.patch 804 BLAKE2B 8aa4f9215651b540cb9517851f13bea57df56b4ad9cacfe7d2e176060773a6ae4f0e7506cc4325b72cdb8b99e1c4bd0bb274dd1956262909a33d66834cdce618 SHA512 49853d92f723690d67edb35b01e0907c314b07f99f468e73256faaaa49d4d3a7a35fd4b7b0d897223c14f4567d2f8d33689a21deee80d82413f72e840fea888c
+AUX libmypaint-1.4.0-drop-libmypaint-gegl-versioning.patch 2841 BLAKE2B ae03c291a4d0bc46e9e9daeea2760937273e910edf233a32ff257a10f10d81dbf7b91922bcfcd9c472b0c5190dbc1a51b313f092140a89e963702e1981f65291 SHA512 8034b0a332a5adf3c922009262d7cc602e0d16dc3050e967190b69fcec2d77b57378ebff674a058fe8d7ccece4cf74e61c82b54c823d1f75c5501c82e658798b
+AUX libmypaint-1.4.0-gegl-0.4.14.patch 4198 BLAKE2B dad2b852ed3c8a68cba650993fa923491aecf31ff28784cd26f58486f62b1a66ee27c51320ba225489be66ad222389fabff819eaec1065e42f958bdd4f9b8a92 SHA512 100b0a6b3f2de32b6cee35924904e75a2c8c6ebd1483a8e02087945144ff078d6a570ebef8160c06194eb0965ebc78cd1d16232a85778414a8552926405bc783
 DIST libmypaint-1.3.0-beta.1.tar.xz 421424 BLAKE2B 3ca1718035de301ffe037ab25b5e6e7c48f92a31ba337b6652977cae71d94e2fa11f01f81b87598e71392d51e13747e82d813d35e981753c85674f0f8b5bb167 SHA512 ae98ec8947d521749d82bc1e683efcace2da7e3c8b8453e79e5191d65225f0963394344628d646947f79b141503d268277d26ce2eeaf482bbe24f1bfb1d103fa
 DIST libmypaint-1.3.0.tar.xz 438160 BLAKE2B a018ba2dc2b2cf2f771e871a0cb769887d962c18f83315d1c77864f567ae69aa16a1d55b770f46527990995f0dc940516371485d6f3d4f3cc332623fc408c248 SHA512 553eeb3439ffd0c013e33254a16334242583b8bab76d1a3e937f3ed1d7e05a832c6eb26acd7220dce20c6a7d997c32afe828202ce48e25a5fe57b67efd853fcf
+DIST libmypaint-1.4.0.tar.xz 441596 BLAKE2B d8c55f8dfedbb5cc07abe5c38c935abecf38f8e626b7fec83d7f7a29acdc722ededcd729f31e13e655242250f1d46cf44ca0473899b0de9510b062b123a711cb SHA512 c549a0b8f02976f7863c5ff49d5f16b5c3eae3e6e9e8803fef833edf78cc2a7413dd8dd751ed560c79d2527e0a54b462a92bb8059bcf69271654b2629f583c19
 EBUILD libmypaint-1.3.0-r1.ebuild 1379 BLAKE2B e3603b7a33c563d63cae697e8bca9f1c4dbb94d6872f96207db9867a53108ca78270e637c6063a747158ecffcfedabb687c6a06b6a3c897f5679c32c45326635 SHA512 4343dc01b4d811b94f5b735a6b42a4ce11330c3f62675d5a0e06b68adf9b2ab49b3103f6189874f0c1a5fc5ede3b2a7de4547f47fa91dca90bcc0f0588e3ecc9
 EBUILD libmypaint-1.3.0-r2.ebuild 1461 BLAKE2B 2f6429f2b99c144dba254bce0f20d8110f553d6007c23b8d933090d2adbfe749249415ac42bcea68f4d0cd874fab7cc2b1c3791e899b05f85ed2689e5314cb8b SHA512 e21750363fc23262d7614ee879bd9580e95cfa0bf10cef555eea73a39f52edbe4cb8db7f71b5e755dca05170245326b244f8509111c7a87a31128ee39b0a1189
+EBUILD libmypaint-1.3.0-r3.ebuild 1460 BLAKE2B 2c7f85266a13d2111b3c22203e179f238b61afcd7b97a330be8c434ea2c0701cef33f0cb8d9b64cdb9f6182c55617f070be0a5481a8d09df3387430ab1532d80 SHA512 7e415ad9f8eada7da6e30f8a8bf45ecf2fc0c73286f8f01183d259383b7c4a36c58fa79042a75d96feb2a02c6283554da88031d938d661bab51a22bb9f4755bf
 EBUILD libmypaint-1.3.0.ebuild 1308 BLAKE2B 3687ae2f158f53afe6768ae4db384098f0f34a606562224831bfc6a44f6aef8921067a93b8fad5678413abe6de328aed787ba8d5069d32c3e7ea5ba9622adca3 SHA512 b7efa95bd8315bedf22a8415e742507569ee38243c167d4f09668cc6477878f25642a4947867e550030f244b1c97f16647f0e90ebf8c8b52daa163608c200c9b
 EBUILD libmypaint-1.3.0_beta1.ebuild 1346 BLAKE2B 84a0e4528d9ce0096f39d2f3f495f1809d1e49f20230f06f9411aec57097197a7aae94724807e85879eee30a1692dbf6b843c2b24f1aef96279aca4f81119bf1 SHA512 4ff1f158d528fac42e70c268a89884ff23b46810fcba8452a7426657537fd246c65e45e8e0e75280f8d0e03b863b2c5552b1c16164cfa97bf6d7a7096b0257e8
-MISC metadata.xml 417 BLAKE2B 475b260c1300908d836d6ab22ac6d302b28502a817c5e0bd2cd3be2d4331b91db0d4579b4a38c78d81b02e37549fad8511f2b964f9020719bee38f531c627798 SHA512 2e106cc8c3dc9249aa34eefedefb2dbc72e9992e19f6bfef425393629d3e676ebfbaadba9c8fcc13014158d98fa463ff49c812103b11524c851cb0b457ad0f7a
+EBUILD libmypaint-1.4.0.ebuild 1557 BLAKE2B b8b263f5e1b4b21b626935e804c7bb52fef66ee317fbb0a471037012600155a4ec0879aa3d145dd937d05aa208f416a4305b7ef66822ead7338f12a250e7e1e0 SHA512 8a1203f1af30c0d9ef23fc504ff7eef02f2d468bbe5001185c82b05e73226dddbd8a27af1b117b04135bb93d624338e81e9eb9f5d3eb63f3bd0b9792ee9bd40f
+MISC metadata.xml 335 BLAKE2B 9147fdc98c832807587c5435133f971898c59c5adc5bb17a49a4632c5eb051d1e7e43d7fbefb15f80763771c58faef55e505b8441309c5676130c3e0dd18eee3 SHA512 fd20f4baaf0a494c651b433e3c7a0a75d82db0264ce4ba0d8e34f965f7389bbc5ad27e222b3dcaab307042338993a2761765f217c87d80a83f53a909caadfbdc
diff --git a/media-libs/libmypaint/files/libmypaint-1.4.0-drop-libmypaint-gegl-versioning.patch b/media-libs/libmypaint/files/libmypaint-1.4.0-drop-libmypaint-gegl-versioning.patch
new file mode 100644
index 000000000000..d41079c4b316
--- /dev/null
+++ b/media-libs/libmypaint/files/libmypaint-1.4.0-drop-libmypaint-gegl-versioning.patch
@@ -0,0 +1,58 @@
+From 1b41e786dc0772528b873b6f5bcee64147bfec04 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Thu, 17 Oct 2019 14:44:34 +0200
+Subject: [PATCH] Revert "Not all of libmypaint-gegl was versionned."
+
+This reverts commit 5e0290c5fb8a175a9f0dd4c6897ff234361c321f.
+
+See https://github.com/mypaint/libmypaint/issues/144
+---
+ gegl/Makefile.am | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/gegl/Makefile.am b/gegl/Makefile.am
+index 79f66fa..b45707d 100644
+--- a/gegl/Makefile.am
++++ b/gegl/Makefile.am
+@@ -37,10 +37,10 @@ introspection_sources = \
+ 	../glib/mypaint-gegl-glib.c	\
+ 	mypaint-gegl-surface.c
+ 
+-MyPaintGegl-@LIBMYPAINT_MAJOR_VERSION@.@LIBMYPAINT_MINOR_VERSION@.gir: libmypaint-gegl-@LIBMYPAINT_API_PLATFORM_VERSION@.la Makefile
++MyPaintGegl-@LIBMYPAINT_MAJOR_VERSION@.@LIBMYPAINT_MINOR_VERSION@.gir: libmypaint-gegl.la Makefile
+ MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_INCLUDES = GObject-2.0 MyPaint-$(LIBMYPAINT_MAJOR_VERSION).$(LIBMYPAINT_MINOR_VERSION) Gegl-0.3
+ MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_CFLAGS = $(AM_CFLAGS) $(AM_CPPFLAGS) -I. -I..
+-MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_LIBS = libmypaint-gegl-@LIBMYPAINT_API_PLATFORM_VERSION@.la ../libmypaint-@LIBMYPAINT_API_PLATFORM_VERSION@.la
++MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_LIBS = libmypaint-gegl.la ../libmypaint.la
+ MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_FILES = $(introspection_sources)
+ INTROSPECTION_GIRS += MyPaintGegl-@LIBMYPAINT_MAJOR_VERSION@.@LIBMYPAINT_MINOR_VERSION@.gir
+ 
+@@ -56,10 +56,10 @@ endif # HAVE_INTROSPECTION
+ 
+ ## pkg-config file ##
+ pkgconfigdir = $(libdir)/pkgconfig
+-pkgconfig_DATA = libmypaint-gegl-@LIBMYPAINT_API_PLATFORM_VERSION@.pc
++pkgconfig_DATA = libmypaint-gegl.pc
+ 
+ ## libmypaint-gegl ##
+-lib_LTLIBRARIES = libmypaint-gegl-@LIBMYPAINT_API_PLATFORM_VERSION@.la
++lib_LTLIBRARIES = libmypaint-gegl.la
+ 
+ libmypaint_gegl_publicdir = $(includedir)/libmypaint-gegl
+ 
+@@ -70,9 +70,9 @@ LIBMYPAINT_GEGL_SOURCES = \
+ 	../glib/mypaint-gegl-glib.c	\
+ 	mypaint-gegl-surface.c
+ 
+-libmypaint_gegl_@LIBMYPAINT_API_PLATFORM_VERSION@_la_SOURCES = $(libmypaint_gegl_public_HEADERS) $(LIBMYPAINT_GEGL_SOURCES)
++libmypaint_gegl_la_SOURCES = $(libmypaint_gegl_public_HEADERS) $(LIBMYPAINT_GEGL_SOURCES)
+ 
+-libmypaint_gegl_@LIBMYPAINT_API_PLATFORM_VERSION@_la_CFLAGS = $(JSON_CFLAGS) $(GLIB_CFLAGS) $(GEGL_CFLAGS)
+-libmypaint_gegl_@LIBMYPAINT_API_PLATFORM_VERSION@_la_LIBADD = $(top_builddir)/libmypaint-@LIBMYPAINT_API_PLATFORM_VERSION@.la $(GEGL_LIBS)
++libmypaint_gegl_la_CFLAGS = $(JSON_CFLAGS) $(GLIB_CFLAGS) $(GEGL_CFLAGS)
++libmypaint_gegl_la_LIBADD = $(top_builddir)/libmypaint.la $(GEGL_LIBS)
+ 
+ endif # enable_gegl
+-- 
+2.23.0
+
diff --git a/media-libs/libmypaint/files/libmypaint-1.4.0-gegl-0.4.14.patch b/media-libs/libmypaint/files/libmypaint-1.4.0-gegl-0.4.14.patch
new file mode 100644
index 000000000000..6855d80e5458
--- /dev/null
+++ b/media-libs/libmypaint/files/libmypaint-1.4.0-gegl-0.4.14.patch
@@ -0,0 +1,99 @@
+From 9e091ea6f3d818748898a9c7a3d6660f5c807027 Mon Sep 17 00:00:00 2001
+From: rezso <rezso@rezso.net>
+Date: Thu, 17 Oct 2019 14:32:46 +0200
+Subject: [PATCH] Require gegl >=0.4.14 rather than 0.3.x
+
+---
+ configure.ac                | 4 ++--
+ gegl/Makefile.am            | 4 ++--
+ gegl/libmypaint-gegl.pc.in  | 2 +-
+ gegl/mypaint-gegl-surface.c | 8 ++++++++
+ 4 files changed, 13 insertions(+), 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index a17c0a0..22c2e3e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -22,7 +22,7 @@ m4_define([libmypaint_version_full],
+           [libmypaint_api_major().libmypaint_api_minor().libmypaint_api_micro()m4_bpatsubst(libmypaint_api_prerelease(), [^\(.\)], [-\1])])
+ 
+ # Dependencies.
+-m4_define([gegl_required_version], [0.3])
++m4_define([gegl_required_version], [0.4.14])
+ m4_define([introspection_required_version], [1.32.0])
+ 
+ AC_INIT([libmypaint],
+@@ -249,7 +249,7 @@ AC_ARG_ENABLE(gegl,
+ )
+ 
+ if eval "test x$enable_gegl = xyes"; then
+-  PKG_CHECK_MODULES(GEGL, gegl-0.3 >= gegl_required_version)
++  PKG_CHECK_MODULES(GEGL, gegl-0.4 >= gegl_required_version)
+ fi
+ AM_CONDITIONAL(ENABLE_GEGL, test "x$enable_gegl" = "xyes")
+ 
+diff --git a/gegl/Makefile.am b/gegl/Makefile.am
+index b45707d..5ef22c1 100644
+--- a/gegl/Makefile.am
++++ b/gegl/Makefile.am
+@@ -11,7 +11,7 @@ AM_CPPFLAGS = \
+ INTROSPECTION_GIRS =
+ INTROSPECTION_SCANNER_ARGS = \
+     --warn-all \
+-    --pkg="gegl-0.3" \
++    --pkg="gegl-0.4" \
+     --pkg="glib-2.0" \
+     --namespace="MyPaintGegl" \
+     --nsversion="$(LIBMYPAINT_MAJOR_VERSION).$(LIBMYPAINT_MINOR_VERSION)" \
+@@ -38,7 +38,7 @@ introspection_sources = \
+ 	mypaint-gegl-surface.c
+ 
+ MyPaintGegl-@LIBMYPAINT_MAJOR_VERSION@.@LIBMYPAINT_MINOR_VERSION@.gir: libmypaint-gegl.la Makefile
+-MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_INCLUDES = GObject-2.0 MyPaint-$(LIBMYPAINT_MAJOR_VERSION).$(LIBMYPAINT_MINOR_VERSION) Gegl-0.3
++MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_INCLUDES = GObject-2.0 MyPaint-$(LIBMYPAINT_MAJOR_VERSION).$(LIBMYPAINT_MINOR_VERSION) Gegl-0.4
+ MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_CFLAGS = $(AM_CFLAGS) $(AM_CPPFLAGS) -I. -I..
+ MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_LIBS = libmypaint-gegl.la ../libmypaint.la
+ MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_FILES = $(introspection_sources)
+diff --git a/gegl/libmypaint-gegl.pc.in b/gegl/libmypaint-gegl.pc.in
+index 75aa729..9184980 100644
+--- a/gegl/libmypaint-gegl.pc.in
++++ b/gegl/libmypaint-gegl.pc.in
+@@ -6,6 +6,6 @@ includedir=@includedir@
+ Name: libmypaint
+ Description: MyPaint brush engine library, with GEGL integration.
+ Version: @LIBMYPAINT_VERSION@
+-Requires: gegl-0.3 libmypaint
++Requires: gegl-0.4 libmypaint
+ Cflags: -I${includedir}/libmypaint-gegl
+ Libs: -L${libdir} -lmypaint-gegl
+diff --git a/gegl/mypaint-gegl-surface.c b/gegl/mypaint-gegl-surface.c
+index 5c86d3c..d58ccc9 100644
+--- a/gegl/mypaint-gegl-surface.c
++++ b/gegl/mypaint-gegl-surface.c
+@@ -78,7 +78,11 @@ tile_request_start(MyPaintTiledSurface *tiled_surface, MyPaintTileRequest *reque
+ 
+     if (buffer_is_native(self)) {
+         GeglBufferIterator *iterator = gegl_buffer_iterator_new(self->buffer, &tile_bbox, 0, self->format,
++#if GEGL_MAJOR_VERSION == 0 && GEGL_MINOR_VERSION == 4 && GEGL_MICRO_VERSION >= 14
++                                      read_write_flags, GEGL_ABYSS_NONE, 8);
++#else
+                                       read_write_flags, GEGL_ABYSS_NONE);
++#endif
+ 
+         // Read out
+         gboolean completed = gegl_buffer_iterator_next(iterator);
+@@ -88,7 +92,11 @@ tile_request_start(MyPaintTiledSurface *tiled_surface, MyPaintTileRequest *reque
+             g_critical("Unable to get tile aligned access to GeglBuffer");
+             request->buffer = NULL;
+         } else {
++#if GEGL_MAJOR_VERSION == 0 && GEGL_MINOR_VERSION == 4 && GEGL_MICRO_VERSION >= 14
++            request->buffer = (uint16_t *)(iterator->items[0].data);
++#else
+             request->buffer = (uint16_t *)(iterator->data[0]);
++#endif
+         }
+ 
+         // So we can finish the iterator in tile_request_end()
+-- 
+2.23.0
+
diff --git a/media-libs/libmypaint/libmypaint-1.3.0-r3.ebuild b/media-libs/libmypaint/libmypaint-1.3.0-r3.ebuild
new file mode 100644
index 000000000000..00461e581877
--- /dev/null
+++ b/media-libs/libmypaint/libmypaint-1.3.0-r3.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools python-any-r1 xdg-utils toolchain-funcs
+
+MY_PV=${PV/_beta/-beta.}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Library for making brushstrokes"
+HOMEPAGE="https://github.com/mypaint/libmypaint"
+SRC_URI="https://github.com/mypaint/libmypaint/releases/download/v${MY_PV}/${MY_P}.tar.xz"
+
+LICENSE="ISC"
+SLOT="0/0"  # first soname component for subslot
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="gegl introspection nls openmp"
+
+CDEPEND="
+	dev-libs/glib:2
+	dev-libs/json-c:=
+	gegl? (
+		media-libs/babl
+		>=media-libs/gegl-0.4.14:0.4[introspection?]
+	)
+	introspection? ( >=dev-libs/gobject-introspection-1.32 )
+	openmp? ( sys-devel/gcc:*[openmp] )
+	nls? ( sys-devel/gettext )
+	"
+DEPEND="${CDEPEND}
+	${PYTHON_DEPS}
+	nls? ( dev-util/intltool )
+	"
+RDEPEND="${CDEPEND}
+	!<media-gfx/mypaint-1.2.1
+	"
+
+S="${WORKDIR}"/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.0-gegl-0.4.14.patch
+)
+
+src_prepare() {
+	xdg_environment_reset
+	default
+	eautoreconf
+}
+
+src_configure() {
+	tc-ld-disable-gold  # bug 589266
+	econf \
+			--disable-debug \
+			--disable-docs \
+			$(use_enable gegl) \
+			--disable-gperftools \
+			$(use_enable nls i18n) \
+			$(use_enable introspection) \
+			$(use_enable openmp) \
+			--disable-profiling
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/media-libs/libmypaint/libmypaint-1.4.0.ebuild b/media-libs/libmypaint/libmypaint-1.4.0.ebuild
new file mode 100644
index 000000000000..c4f735c48773
--- /dev/null
+++ b/media-libs/libmypaint/libmypaint-1.4.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools python-any-r1 xdg-utils toolchain-funcs
+
+MY_PV=${PV/_beta/-beta.}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Library for making brushstrokes"
+HOMEPAGE="https://github.com/mypaint/libmypaint"
+SRC_URI="https://github.com/mypaint/libmypaint/releases/download/v${MY_PV}/${MY_P}.tar.xz"
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"  # https://github.com/mypaint/libmypaint/wiki/Versioning
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="gegl introspection nls openmp"
+
+CDEPEND="
+	dev-libs/glib:2
+	dev-libs/json-c:=
+	gegl? (
+		media-libs/babl
+		>=media-libs/gegl-0.4.14:0.4[introspection?]
+	)
+	introspection? ( >=dev-libs/gobject-introspection-1.32 )
+	openmp? ( sys-devel/gcc:*[openmp] )
+	nls? ( sys-devel/gettext )
+	"
+DEPEND="${CDEPEND}
+	${PYTHON_DEPS}
+	nls? ( dev-util/intltool )
+	"
+RDEPEND="${CDEPEND}
+	!<media-gfx/mypaint-1.2.1
+	"
+
+S="${WORKDIR}"/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.0-drop-libmypaint-gegl-versioning.patch
+	"${FILESDIR}"/${PN}-1.4.0-gegl-0.4.14.patch
+)
+
+src_prepare() {
+	xdg_environment_reset
+	default
+	eautoreconf
+}
+
+src_configure() {
+	tc-ld-disable-gold  # bug 589266
+	econf \
+			--disable-debug \
+			--disable-docs \
+			$(use_enable gegl) \
+			--disable-gperftools \
+			$(use_enable nls i18n) \
+			$(use_enable introspection) \
+			$(use_enable openmp) \
+			--disable-profiling
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/media-libs/libmypaint/metadata.xml b/media-libs/libmypaint/metadata.xml
index 8315ba3f24bb..e8f550b6768b 100644
--- a/media-libs/libmypaint/metadata.xml
+++ b/media-libs/libmypaint/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>sping@gentoo.org</email>
-		<name>Sebastian Pipping</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="gegl">Add support for <pkg>media-libs/gegl</pkg></flag>
 	</use>
diff --git a/media-libs/libnsgif/Manifest b/media-libs/libnsgif/Manifest
index 6bb405813fe5..71077576de20 100644
--- a/media-libs/libnsgif/Manifest
+++ b/media-libs/libnsgif/Manifest
@@ -1,3 +1,3 @@
 DIST libnsgif-0.2.1-src.tar.gz 268328 BLAKE2B ccebd1830db1caa016ebc0c1f2c421523963df16e38cdf85c5300d2a9a325dc9c52c89c79ccbddbc315535a20607458bbfedcde8df02b5e2977d383cd6603220 SHA512 29affce6de38574103a9777e741a44b448145d96ef63e4b86056f268c5d1389f6c5f25240a9f3ef2208fab229eabef2542f3d7ce7b37a0137071f204fbd736af
-EBUILD libnsgif-0.2.1-r1.ebuild 853 BLAKE2B d2db76251f8a20d415a9bded286c4d8429eca2bff24e2949046452f56a064932848892db8f406529bc4ec60372c59792c7aee94705962b7beddda858a5a324d8 SHA512 05554c5ce896ad4e73b5da41dd2ce73816bf995ecdfb2c9cd3999514aa39bd1117dd0eea2dda477a9601dfeb3c463a80367e4e86d32c6a1035b047aec3d5dfee
+EBUILD libnsgif-0.2.1-r1.ebuild 859 BLAKE2B e50d0ef08cdcac469a4aa11db553c2caf885487abff7e58a6c2118563909d3a8d135033f4ea17f435ed31f8ae4ffa2c98703a3db90975ed248d2d13e6c1fcb59 SHA512 486306c94afd6e4ecfa77426c3bcc625d560b77cf3a191275d70e1055cd8b86551a621cba14a8c1ee2bd5df66781323eb2e333ed073146f2589f9d2bcc668719
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/media-libs/libnsgif/libnsgif-0.2.1-r1.ebuild b/media-libs/libnsgif/libnsgif-0.2.1-r1.ebuild
index 3fbda440ad6b..0a28574ae3ee 100644
--- a/media-libs/libnsgif/libnsgif-0.2.1-r1.ebuild
+++ b/media-libs/libnsgif/libnsgif-0.2.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~m68k-mint"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~m68k-mint"
 IUSE=""
 
 DEPEND="
diff --git a/media-libs/libplacebo/Manifest b/media-libs/libplacebo/Manifest
index 8fdc6d1e5b69..9b5d4fa59757 100644
--- a/media-libs/libplacebo/Manifest
+++ b/media-libs/libplacebo/Manifest
@@ -1,4 +1,6 @@
 DIST libplacebo-v1.18.0.tar.gz 322963 BLAKE2B 640accaa64b1a5abdcc60f89c1b80ccc880ed060799a48cb9d41c7b891648913b05d06c62fa6dd21ccce07ac61b7c89e1702ac26013c596dc4a4d71c7b10721f SHA512 a2ca4a8b2bf9e5242c39c704e579575ccbfd0a7dadc4f73fe1994abb6e3f132d19f6d95415704a62e285e3f94e7b0ab8aeed14b4fce466df1ba34952f7127686
+DIST libplacebo-v1.21.0.tar.gz 326918 BLAKE2B fe9500de23487d7d5dfc51d9f94dd3d33d22bdac3005fc3334814c53a76a46cebd40655675b5172f058d02dd865385a993b3c52a863b9e9b32ac0bc4801e0126 SHA512 5de95b8cc48ba4ec9bc3afb8c8f2c4fae0d53ce6e69ffb53884c3a3ee2580998bae46b8934e462740b6c9c2e66e3c5d5f009f9b0f8ad2cb7b4fba829891cf333
 EBUILD libplacebo-1.18.0.ebuild 1293 BLAKE2B b828eb4507eb436162fcfd64ed3a5f57674536d22f60336087ab94e99855f7d0554499cba67299aee32a7b98c160d84623d2cd5b32965c2fa6022e041cd01492 SHA512 4271adfb5341966ec1c37a9abbb8be3e599d2e21414b270572e1608174d3db07480be443cc3bc5f2943b37edceec0180a8e29114c877f2d0ba84b2c92788b8f4
+EBUILD libplacebo-1.21.0.ebuild 1293 BLAKE2B b828eb4507eb436162fcfd64ed3a5f57674536d22f60336087ab94e99855f7d0554499cba67299aee32a7b98c160d84623d2cd5b32965c2fa6022e041cd01492 SHA512 4271adfb5341966ec1c37a9abbb8be3e599d2e21414b270572e1608174d3db07480be443cc3bc5f2943b37edceec0180a8e29114c877f2d0ba84b2c92788b8f4
 EBUILD libplacebo-9999.ebuild 1288 BLAKE2B 283c89aeebb758473d5c9db5d84e774e6962a80b0cc625c08d3d0b4a07a459bc415c291e541b2cea07510268661336667f2a37cb6710f12e9d78d564e7a4746e SHA512 ed38e53a0d8f7ae09aa543f8a600047958f0cd1c716e75352c2a7e12a1db83db30e3687fc669c2df357b0a26f2c241bd9f756ed02aea614bc4e9c654e40d44a4
 MISC metadata.xml 807 BLAKE2B f04df70a40523ad668bfa7dda7c841ce098f2105d2bc94ab6291bb194bf1fec18445b779952db33614d685ee0964c7ac6b7666b3d8cf89f8bd9391b1ccd2c553 SHA512 48d5e93ca7e964d80dc579789c6f626f9590d102b451c4f0fced538aed1301e0cb7f93fce4d03deaddb72dcad22489aa3846d8fa8ac443fcdbc4fcb90ef19040
diff --git a/media-libs/libplacebo/libplacebo-1.21.0.ebuild b/media-libs/libplacebo/libplacebo-1.21.0.ebuild
new file mode 100644
index 000000000000..ab132357b85c
--- /dev/null
+++ b/media-libs/libplacebo/libplacebo-1.21.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://code.videolan.org/videolan/libplacebo.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://code.videolan.org/videolan/libplacebo/-/archive/v${PV}/libplacebo-v${PV}.tar.gz"
+	S="${WORKDIR}/${PN}-v${PV}"
+fi
+
+inherit meson multilib-minimal
+
+DESCRIPTION="Reusable library for GPU-accelerated image processing primitives"
+HOMEPAGE="https://github.com/haasn/libplacebo"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+IUSE="glslang lcms +shaderc test +vulkan"
+REQUIRED_USE="vulkan? ( || ( glslang shaderc ) )"
+
+RDEPEND="glslang? ( <dev-util/glslang-7.10[${MULTILIB_USEDEP}] )
+	lcms? ( media-libs/lcms:2[${MULTILIB_USEDEP}] )
+	shaderc? ( >=media-libs/shaderc-2017.2[${MULTILIB_USEDEP}] )
+	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+multilib_src_configure() {
+	local emesonargs=(
+		$(meson_feature glslang)
+		$(meson_feature lcms)
+		$(meson_feature shaderc)
+		$(meson_feature vulkan)
+		$(meson_use test tests)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_test() {
+	meson_src_test
+}
+
+multilib_src_install() {
+	meson_src_install
+}
diff --git a/media-libs/libsndfile/Manifest b/media-libs/libsndfile/Manifest
index 34d101a0a411..fe2b05b7be12 100644
--- a/media-libs/libsndfile/Manifest
+++ b/media-libs/libsndfile/Manifest
@@ -7,6 +7,8 @@ AUX libsndfile-1.0.28-CVE-2017-8365.patch 2577 BLAKE2B 3e9af3996f9e859717281b1e5
 AUX libsndfile-1.0.28-CVE-2018-13139.patch 921 BLAKE2B 4fe567555b1c6e5a0c8098eee40441671a623f4ba91a03c059babc4a7a49eb4903bde38d52333335749fd6a0f6501bf524add119658226f6b169565a579b8f2d SHA512 33817e7c85180635fa239e4ea38973b18312878522639f43071188a995f0e1a35dbca6d133555fb0875292b4b609950ae38e747a6b1949f8ae840db9dc3a2805
 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
+DIST libsndfile-1.0.29_pre2_p20191024.tar.gz 720981 BLAKE2B 9f1dcf3d3669b66d8582d50b62ff863facd7125432a84a3e1e3fb0f817554f260f42948b4479371fb0967dcc75bedc6c49afffc6bee3f973a875d72d2e508210 SHA512 e37b385b90cadc97348db03b6c5ae7a8fcee17ded60f54d1508adddb8e2dc604ea44b60a0fe08627e81c0faa83997cdafb0b0ecf8574f901bf5e8a1819a63998
 EBUILD libsndfile-1.0.28-r4.ebuild 1857 BLAKE2B b6ad10928efd8a8fd049a95e5e9e61b9ae0ecd3b788deebdb304f7a84ee8ee786d06075480eb4ca3f67a6ab845321f568b85323a2eac8fdb665f00bf63df315a SHA512 2320d8655dd167f4f3cfc73b7a030d7387c411cd1c3aafb9887187508c67674f23c3008122bd836762d8209f2e252b7837fbeaea95c221527b029b46ffb0aaf3
-EBUILD libsndfile-9999.ebuild 1759 BLAKE2B 18e141b3625b8ee1569159637abdf1459a9921d23887291fd3804f9829dd20545393eeba72f16d79cf647859cb6a3648d89a043a5bd8795e12c1391f27297352 SHA512 d4411f4ce5486001d7cc15897fab5cf934ca57d7e9d29478416ccbc3985e54c7166a1d1b1cdd2caeb3bac1bc76e41b8d7eb3b45661eefb92e76d8fa430a4c35f
+EBUILD libsndfile-1.0.29_pre2_p20191024.ebuild 1660 BLAKE2B 5d70825b18caaa238ae76db2d9238c90ebbfe1419c09c1c46f5b2b3fa547165bf3ddb5b781af4b944097f83a5b6f8e4be301d9f26df5eae7deea72423080c543 SHA512 a50ae28b06f7b943fc5e3cb0aad153f96b47b6dba9b7875b761e82a49df1d80b3a68ddd7dcb525600f7e022dd1ff4217452d5a6aa42e0616289835a6db10c2c1
+EBUILD libsndfile-9999.ebuild 1805 BLAKE2B d8af12140bfb970339b05477c28e6bbc5b0fa5a21f2971571f83626132688fb0cce471696ee783f99e7f2e5494bf1a80483f54319833cd713d6fa99a0f7a7518 SHA512 f3f8d1a89a5eac2dbacabac750123e0b55eb4d7f26e1c0d982efecdbc3853a70ed3953356b6ff9460ffab7daee2befc34d7f21d38a29510c5f27533e65d479fa
 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/media-libs/libsndfile/libsndfile-1.0.29_pre2_p20191024.ebuild b/media-libs/libsndfile/libsndfile-1.0.29_pre2_p20191024.ebuild
new file mode 100644
index 000000000000..c4cf210ec2ce
--- /dev/null
+++ b/media-libs/libsndfile/libsndfile-1.0.29_pre2_p20191024.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy{,3} )
+
+inherit autotools python-any-r1 multilib-minimal
+
+MY_COMMIT="97a361afc24202b16489d8c06910277c06b18b53"
+
+SRC_URI="https://github.com/erikd/libsndfile/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+DESCRIPTION="C library for reading and writing files containing sampled sound"
+HOMEPAGE="http://www.mega-nerd.com/libsndfile"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+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}]
+		>=media-libs/opus-1.1:=[${MULTILIB_USEDEP}]
+	)
+	alsa? ( media-libs/alsa-lib:= )
+	sqlite? ( >=dev-db/sqlite-3.2 )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	${PYTHON_DEPS}
+	sys-devel/autogen
+	"
+
+S="${WORKDIR}/${PN}-${MY_COMMIT}"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		--disable-octave \
+		$(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) \
+		PYTHON="${EPYTHON}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# package provides .pc files
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libsndfile/libsndfile-9999.ebuild b/media-libs/libsndfile/libsndfile-9999.ebuild
index aa94640fb8f2..d618e1668362 100644
--- a/media-libs/libsndfile/libsndfile-9999.ebuild
+++ b/media-libs/libsndfile/libsndfile-9999.ebuild
@@ -26,6 +26,7 @@ RDEPEND="
 		>=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}]
+		>=media-libs/opus-1.1:=[${MULTILIB_USEDEP}]
 	)
 	alsa? ( media-libs/alsa-lib:= )
 	sqlite? ( >=dev-db/sqlite-3.2 )"
diff --git a/media-libs/libtxc_dxtn/Manifest b/media-libs/libtxc_dxtn/Manifest
deleted file mode 100644
index 425a83073a6f..000000000000
--- a/media-libs/libtxc_dxtn/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST libtxc_dxtn-1.0.1.tar.bz2 214038 BLAKE2B a342bda7375dcbd4001adb5469c90a043fa039bc2505c9cf717613054b494fea9054136b25ac80b016c62aec248085a60ab5e71190cd5c2d90941bdda6408d16 SHA512 56714a8c947d9b1f47e3ccb23cff9e4e57bd131907a82968de521d094a000275b3aaeecff28e9184bcc4f3932baa1a8bfbbefbc970fcd034ff953d0617148479
-EBUILD libtxc_dxtn-1.0.1-r4.ebuild 633 BLAKE2B 4358733b08ef1ce6602181a12f308e7b1b2719f2db7e3f07b6fa160c52c4ce207c0c1c7188ee3881a0ad10ba0e3e2d47d91ea23f196425f5dca935fd6ee7b575 SHA512 bfe27812486322690fd926587e69d6d3e7668c30350546f854d3ee982d9961da6ffb9c651b375703db3da9608db2bd607cd5adca78f542438d0321e1ef654c03
-MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-libs/libtxc_dxtn/libtxc_dxtn-1.0.1-r4.ebuild b/media-libs/libtxc_dxtn/libtxc_dxtn-1.0.1-r4.ebuild
deleted file mode 100644
index f520acc99906..000000000000
--- a/media-libs/libtxc_dxtn/libtxc_dxtn-1.0.1-r4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal
-
-DESCRIPTION="Helper library for	S3TC texture (de)compression"
-HOMEPAGE="https://cgit.freedesktop.org/~mareko/libtxc_dxtn/"
-SRC_URI="https://people.freedesktop.org/~cbrill/${PN}/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-IUSE=""
-
-DEPEND="media-libs/mesa"
-RDEPEND=""
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf
-}
-
-multilib_src_install_all() {
-	default
-
-	# libtxc_dxtn is installed as a module (plugin)
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libvisio/Manifest b/media-libs/libvisio/Manifest
index 40cf0f6622f2..00127772e012 100644
--- a/media-libs/libvisio/Manifest
+++ b/media-libs/libvisio/Manifest
@@ -1,6 +1,6 @@
 DIST libvisio-0.1.6.tar.xz 676396 BLAKE2B dbd96b64a3789e275a47fe59cd939620787937e31ee11b7af7977575c183ade233afdb952d4c2e362312ae400d23726cbd01e3ccb644c9a413abc84ddbe0f161 SHA512 58cee8cfe4205b2cad2f11dbe17882e57ebf0d10500116ca9d8d120e138f8eb0c65a5fea3bd7d2746bf8140377ee9deb34258597e028f9fdc8d21f270606cce1
 DIST libvisio-0.1.7.tar.xz 854296 BLAKE2B db5dd96d769c237bc2926d52a43c2496adca50b74133ea3c81df7ba5a61824891623eb33b4801b463b27f5c03946ea7ffcf827b98c95139c9659b0a1b0f7b604 SHA512 c26f67a09fa6a6d0bf6f3fff5590d5cf16983630d4f7cfcf86d9461baec58dbdf7989fd934be6db0639ca043c160aac2d008275afb9e047766bc878ac579a9ea
 EBUILD libvisio-0.1.6.ebuild 1210 BLAKE2B d2ea49d29ab3c84b415849c7434fd249e2d2d133c6e68db5f01b6bdb561aec6197ebbe3798a7112ca0c41a307fe3f08ba6e176b0f2ac6a43f7c8984f2a54c136 SHA512 b64ee3644f2eb32d2d9cf7eee267f04e4f60b49015ea7014b341d1643b7a3757d45ee93c6a8eb1ba580991ae5becfeeceefc0cef382a0d63c0239bff229f5530
-EBUILD libvisio-0.1.7.ebuild 1251 BLAKE2B 2bc8acf7656e4a83c5de89d5a33d0bbc39d50865786eb10c3966ec2ec306e7ba00cfb93717aba30aaea9cdaff6b56fd9265bb606c21cb891b37f9ba9ec2b9a5e SHA512 4857277b54992988cf485cc82bbaefbe05504a73e87817dca51e79bb1b1f51b79fac81f0b6775b3552e5f60d4f4b1a31d6449f25ae66bc66babf5d7c184d4471
+EBUILD libvisio-0.1.7.ebuild 1249 BLAKE2B ae231185eafe87157c32c0a1e7f2f2f8179afe89de5790edd1453fed04cb3f09378481e4363098ec195a75692be7d7d5ea2ae654573332635b527984e83efd85 SHA512 0909a790edb191c366672b5e5548150dd43baf3ce82846a1f23226d46f6705e4c015ed8ba8703bc5eb971929ce2cb586d07c7671be7b10dfec34e0c095266cc0
 EBUILD libvisio-9999.ebuild 1251 BLAKE2B 2bc8acf7656e4a83c5de89d5a33d0bbc39d50865786eb10c3966ec2ec306e7ba00cfb93717aba30aaea9cdaff6b56fd9265bb606c21cb891b37f9ba9ec2b9a5e SHA512 4857277b54992988cf485cc82bbaefbe05504a73e87817dca51e79bb1b1f51b79fac81f0b6775b3552e5f60d4f4b1a31d6449f25ae66bc66babf5d7c184d4471
 MISC metadata.xml 321 BLAKE2B 845e098f8136b178e62b70bb06d8ce26ed7e2b9aec93358180d36cc8de5d4436501fa13521dcc7b4a7f8e311603b25c9d30d23db216008d3d96af5e462611a9a SHA512 a9d2208bf93a05e3406aee66412b46e731ce5a858e3e5e4a6668568b3ccba863d540f3e6224bc7e5ed8c6ad22d330fc0e30ecc90df2f8a866280bb138040fc12
diff --git a/media-libs/libvisio/libvisio-0.1.7.ebuild b/media-libs/libvisio/libvisio-0.1.7.ebuild
index e4147a14c125..3ad00f6e2da4 100644
--- a/media-libs/libvisio/libvisio-0.1.7.ebuild
+++ b/media-libs/libvisio/libvisio-0.1.7.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://dev-www.libreoffice.org/src/libvisio/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
 fi
 
 DESCRIPTION="Library parsing the file format of MS Visio documents"
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 819165747574..57c22919a7b7 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,8 +1,8 @@
 DIST mesa-19.1.7.tar.xz 10941152 BLAKE2B 6be14ddac404668bdd8b7b8756388019c3610ac41b65a7723a419b97b7eccbca666ad6d904f4cde186c4b171e056636a8a6a5727e30963c8fa177d7861bd6cfb SHA512 0865b5f91e5daa00e1da2b3d8b65fe5d2ff6332372bf8fec7d671d05d8d64ec5a7abea1858cdfc506c76b7226d2bea0af3426565f156b796d8e0f949ea33dc15
-DIST mesa-19.2.0.tar.xz 11464180 BLAKE2B f2f260e9efb928532501ff4f1c0137621f954991ef6d30fbdc61c28fb95e3ddb9e81276d345bc7bff6871e603dcbb29073b788427d0dea565dfa9b7f8b88966d SHA512 7278bbfba9c29fe91d1959ff1a48422e917db85287460523d12ae8c6d7f49f76e9636bf4c0d8d7d89e5569b3c67135f1b23b8f6c9d52d39413d8ec22e3bb40f0
-DIST mesa-19.2.1.tar.xz 11468492 BLAKE2B 9f6a1a5426343213a19dccb07917326b887ddc6ec02426b0604bea35a529f33c18ca46e2db09eb44c5b4a3b6e70da5f8fc7e049b1a0febd35d0de8f2ec4d2641 SHA512 decd74976fe866bf67fac4ae55a62d8e33ad24278dd58effe533e7d258b249f0ead848360e7e71444265184c6d9d9b04361caf0c6df99504e33599e7a0cd6c5d
+DIST mesa-19.1.8.tar.xz 10945480 BLAKE2B df2ce0561cd0a61f0f35a406a5a9b2384c0c5869efadabfa40b07cf96a592214aa5c6d03423598c531f117075c3b59aa5af6f9b1c5dfa5914aabe41f60b592a0 SHA512 3bcc90c17cf966ce3399434ca2d4f363c5778e52c56b8184d6cdf22ef2e4a4fdb9c3fbff5c98efc856e3535f81259608a6daa74af1f3bdce30ea251d86435c74
+DIST mesa-19.2.2.tar.xz 11456352 BLAKE2B b0900a486d5883759dc395a25195c46fbc90d0388840099d515713a3c1e27560ea6cf9f6bfc5987c9704593b174e26f49a4cd08ff1260b1c1b2197b56c6919b6 SHA512 a3269052c2dfb5404180d1aebd68f5b9b0cc136d634ba89fed3f60fcc9b279072e09ee2db9b485375d39e886209053841df920c9d0b975e0de2825e3da4164a5
 EBUILD mesa-19.1.7.ebuild 14241 BLAKE2B dbdd629eb1f7ec6ad67de25e693e5a05217e425f107ced5cae65e8410112b686cbd1f71098eda8943ba728f0e038860e347c147fa75b1e6e67e7420d2421576f SHA512 b5b86b2f9866bcc8494493bd38bc9cdba20596f129fafcb37804758a387d4d2d61ca17d2f06876029b59619ce2699f0334d6ec7198b2758924f5d4c1c26c8d45
-EBUILD mesa-19.2.0.ebuild 14526 BLAKE2B 8ca920ff157fed73f06017bf652f6198b1bc3e15eb61b14bd5913db2229102c71e059c49548916c6f74c8f2b970b6e2e150ea1457ba505afc742f21b878916f7 SHA512 b55adfd15be011702608b1d02c04633bb31de958db3dd971fb9594d5411a8a3dfaed38de96325c7754c598202b436f9c0cb994345b055d0857c5804181041ced
-EBUILD mesa-19.2.1.ebuild 14526 BLAKE2B 8ca920ff157fed73f06017bf652f6198b1bc3e15eb61b14bd5913db2229102c71e059c49548916c6f74c8f2b970b6e2e150ea1457ba505afc742f21b878916f7 SHA512 b55adfd15be011702608b1d02c04633bb31de958db3dd971fb9594d5411a8a3dfaed38de96325c7754c598202b436f9c0cb994345b055d0857c5804181041ced
-EBUILD mesa-9999.ebuild 14526 BLAKE2B 8ca920ff157fed73f06017bf652f6198b1bc3e15eb61b14bd5913db2229102c71e059c49548916c6f74c8f2b970b6e2e150ea1457ba505afc742f21b878916f7 SHA512 b55adfd15be011702608b1d02c04633bb31de958db3dd971fb9594d5411a8a3dfaed38de96325c7754c598202b436f9c0cb994345b055d0857c5804181041ced
+EBUILD mesa-19.1.8.ebuild 14252 BLAKE2B 54705ada2d5498b384b907345c3c3a0f5585c0e35c0e1939491f500effbbcfaa6ffe7d65476e08bb2122724bc637f91dfed56a70cc86c38db2c2a75c43f7326a SHA512 65db524a107262eb682363172d23178e341a26adb8f4d5b33f69900ecdf9083427c19126180a54b356061494eb6d3d7af45e776a8ddf60f116a055317b7b5f34
+EBUILD mesa-19.2.2.ebuild 14529 BLAKE2B 32f66c7981c79569b03e561fad1dff4a6bc2cef2ab895732f354d60c25e61df34ee045e782f5f0151f13f1dd348824367b0ed6b6d6b81e21a8d959dda3df9e7a SHA512 ba0d797949a1b1be41cf1436dac3ff41d5708148a3c3647c8ce91ef1a22a78a44e418306aec62bac72fd23b534764de78bdf53e9de8173f7fd3fd53dbe05fdb9
+EBUILD mesa-9999.ebuild 14594 BLAKE2B ca59d90c807441c8f556dde89a06f8fe2e2c8dec78bc85caa78ae1e046448940c5ae5efbf654b57bb95e23415970e379ca31530ec9496c66525aa2e5cd35de7c SHA512 9e49ac1228c6002d1ad5855c4eef6097cedcd35589207c95282ef42a7c7d1201323b88417d8d5809ea8cacff5c1983037532df9c429273392dab5ca478da40a5
 MISC metadata.xml 2000 BLAKE2B c38c6f85a08bdb71f3921847d03c8a2849a43def253c200cb3f21d68142f3a5065cb2e1a2170093d91f3aba34c99fdd9bab840f2bc62ce05f11484b2edb3cb40 SHA512 d55b9c0ff6a97d995a150ee10643c869359370222ab29712da25f69c5671a4e6988e2d508c956082cc7165db96f42289d25daecf230d36efe2240e4f377d1c72
diff --git a/media-libs/mesa/mesa-19.2.1.ebuild b/media-libs/mesa/mesa-19.1.8.ebuild
index cad8a11cea0e..da2c1a3b3255 100644
--- a/media-libs/mesa/mesa-19.2.1.ebuild
+++ b/media-libs/mesa/mesa-19.1.8.ebuild
@@ -16,6 +16,7 @@ HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
 
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
+	EXPERIMENTAL="true"
 	inherit git-r3
 else
 	SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
@@ -29,15 +30,15 @@ RESTRICT="
 "
 
 RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris lima nouveau panfrost vc4 virgl vivante vmware"
+VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris nouveau vc4 virgl vivante vmware"
 for card in ${VIDEO_CARDS}; do
 	IUSE_VIDEO_CARDS+=" video_cards_${card}"
 done
 
 IUSE="${IUSE_VIDEO_CARDS}
-	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 libglvnd +llvm
-	lm-sensors opencl osmesa pax_kernel selinux test unwind vaapi valgrind
-	vdpau vulkan vulkan-overlay wayland +X xa xvmc"
+	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm
+	lm-sensors opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind
+	vdpau vulkan vulkan-overlay wayland xa xvmc"
 
 REQUIRED_USE="
 	d3d9?   ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
@@ -53,9 +54,7 @@ REQUIRED_USE="
 	video_cards_i915?   ( || ( classic gallium ) )
 	video_cards_i965?   ( classic )
 	video_cards_iris?   ( gallium )
-	video_cards_lima?   ( gallium )
 	video_cards_nouveau? ( || ( classic gallium ) )
-	video_cards_panfrost? ( gallium )
 	video_cards_radeon? ( || ( classic gallium )
 						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
 	video_cards_r100?   ( classic )
@@ -67,17 +66,22 @@ REQUIRED_USE="
 	video_cards_virgl? ( gallium )
 	video_cards_vivante? ( gallium gbm )
 	video_cards_vmware? ( gallium )
-	xa? ( X )
-	xvmc? ( X )
 "
 
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.99"
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.97"
 RDEPEND="
 	!app-eselect/eselect-mesa
 	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
 	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
+	>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
+	x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
 	libglvnd? (
-		>=media-libs/libglvnd-1.2.0[${MULTILIB_USEDEP}]
+		media-libs/libglvnd[${MULTILIB_USEDEP}]
 		!app-eselect/eselect-opengl
 	)
 	!libglvnd? (
@@ -120,15 +124,6 @@ RDEPEND="
 	)
 	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
 	vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
-	)
 "
 for card in ${RADEON_CARDS}; do
 	RDEPEND="${RDEPEND}
@@ -147,10 +142,9 @@ RDEPEND="${RDEPEND}
 # 1. List all the working slots (with min versions) in ||, newest first.
 # 2. Update the := to specify *max* version, e.g. < 10.
 # 3. Specify LLVM_MAX_SLOT, e.g. 9.
-LLVM_MAX_SLOT="10"
+LLVM_MAX_SLOT="9"
 LLVM_DEPSTR="
 	|| (
-		sys-devel/llvm:10[${MULTILIB_USEDEP}]
 		sys-devel/llvm:9[${MULTILIB_USEDEP}]
 		sys-devel/llvm:8[${MULTILIB_USEDEP}]
 		sys-devel/llvm:7[${MULTILIB_USEDEP}]
@@ -216,10 +210,8 @@ unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
 
 DEPEND="${RDEPEND}
 	valgrind? ( dev-util/valgrind )
-	X? (
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-base/xorg-proto
-	)
+	x11-libs/libXrandr[${MULTILIB_USEDEP}]
+	x11-base/xorg-proto
 "
 BDEPEND="
 	${PYTHON_DEPS}
@@ -238,12 +230,13 @@ EGIT_CHECKOUT_DIR=${S}
 
 QA_WX_LOAD="
 x86? (
-	usr/lib*/libglapi.so.0.0.0
-	usr/lib*/libGLESv1_CM.so.1.1.0
-	usr/lib*/libGLESv2.so.2.0.0
-	usr/lib*/libGL.so.1.2.0
-	usr/lib*/libOSMesa.so.8.0.0
-	libglvnd? ( usr/lib/libGLX_mesa.so.0.0.0 )
+	!pic? (
+		usr/lib*/libglapi.so.0.0.0
+		usr/lib*/libGLESv1_CM.so.1.0.0
+		usr/lib*/libGLESv2.so.2.0.0
+		usr/lib*/libGL.so.1.2.0
+		usr/lib*/libOSMesa.so.8.0.0
+	)
 )"
 
 llvm_check_deps() {
@@ -356,7 +349,7 @@ multilib_src_configure() {
 		fi
 	fi
 
-	emesonargs+=( -Dplatforms=surfaceless$(use X && echo ",x11")$(use wayland && echo ",wayland")$(use gbm && echo ",drm") )
+	emesonargs+=( -Dplatforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm") )
 
 	if use gallium; then
 		emesonargs+=(
@@ -410,15 +403,11 @@ multilib_src_configure() {
 		fi
 
 		if use video_cards_freedreno ||
-		   use video_cards_lima ||
-		   use video_cards_panfrost ||
 		   use video_cards_vc4 ||
 		   use video_cards_vivante; then
 			gallium_enable -- kmsro
 		fi
 
-		gallium_enable video_cards_lima lima
-		gallium_enable video_cards_panfrost panfrost
 		gallium_enable video_cards_vc4 vc4
 		gallium_enable video_cards_vivante etnaviv
 		gallium_enable video_cards_vmware svga
@@ -463,6 +452,11 @@ multilib_src_configure() {
 		emesonargs+=( $(meson_use pax_kernel glx-read-only-text) )
 	fi
 
+	# on abi_x86_32 hardened we need to have asm disable
+	if [[ ${ABI} == x86* ]] && use pic; then
+		emesonargs+=( -Dasm=false )
+	fi
+
 	if use gallium; then
 		gallium_enable -- swrast
 		emesonargs+=( -Dosmesa=$(usex osmesa gallium none) )
@@ -478,7 +472,7 @@ multilib_src_configure() {
 
 	emesonargs+=(
 		$(meson_use test build-tests)
-		-Dglx=$(usex X dri disabled)
+		-Dglx=dri
 		-Dshared-glapi=true
 		$(meson_use dri3)
 		$(meson_use egl)
@@ -505,7 +499,7 @@ multilib_src_compile() {
 multilib_src_install() {
 	meson_src_install
 
-	use libglvnd && rm -f "${D}"/usr/$(get_libdir)/pkgconfig/{egl,gl}.pc
+	use libglvnd && rm -f "${D}"/usr/$(get_libdir)/libGLESv{1_CM,2}.so*
 }
 
 multilib_src_install_all() {
@@ -517,11 +511,9 @@ multilib_src_test() {
 }
 
 pkg_postinst() {
-	if ! use libglvnd; then
-		# Switch to the xorg implementation.
-		echo
-		eselect opengl set --use-old ${OPENGL_DIR}
-	fi
+	# Switch to the xorg implementation.
+	echo
+	eselect opengl set --use-old ${OPENGL_DIR}
 }
 
 # $1 - VIDEO_CARDS flag (check skipped for "--")
diff --git a/media-libs/mesa/mesa-19.2.0.ebuild b/media-libs/mesa/mesa-19.2.2.ebuild
index cad8a11cea0e..9fb49167ff44 100644
--- a/media-libs/mesa/mesa-19.2.0.ebuild
+++ b/media-libs/mesa/mesa-19.2.2.ebuild
@@ -77,7 +77,7 @@ RDEPEND="
 	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
 	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
 	libglvnd? (
-		>=media-libs/libglvnd-1.2.0[${MULTILIB_USEDEP}]
+		>=media-libs/libglvnd-1.2.0-r1[${MULTILIB_USEDEP}]
 		!app-eselect/eselect-opengl
 	)
 	!libglvnd? (
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index cad8a11cea0e..8f593918a1ac 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -71,13 +71,13 @@ REQUIRED_USE="
 	xvmc? ( X )
 "
 
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.99"
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.100"
 RDEPEND="
 	!app-eselect/eselect-mesa
 	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
 	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
 	libglvnd? (
-		>=media-libs/libglvnd-1.2.0[${MULTILIB_USEDEP}]
+		>=media-libs/libglvnd-1.2.0-r1[${MULTILIB_USEDEP}]
 		!app-eselect/eselect-opengl
 	)
 	!libglvnd? (
@@ -114,7 +114,6 @@ RDEPEND="
 		>=dev-libs/wayland-protocols-1.8
 	)
 	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
-
 	video_cards_intel? (
 		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
 	)
@@ -161,51 +160,53 @@ LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
 CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
 CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
 RDEPEND="${RDEPEND}
-	llvm? (
-		opencl? (
-			video_cards_r600? (
-				${CLANG_DEPSTR_AMDGPU}
-			)
-			!video_cards_r600? (
-				video_cards_radeonsi? (
+	gallium? (
+		llvm? (
+			opencl? (
+				video_cards_r600? (
 					${CLANG_DEPSTR_AMDGPU}
 				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeonsi? (
-					video_cards_radeon? (
+				!video_cards_r600? (
+					video_cards_radeonsi? (
 						${CLANG_DEPSTR_AMDGPU}
 					)
 				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeon? (
+				!video_cards_r600? (
 					!video_cards_radeonsi? (
-						${CLANG_DEPSTR}
+						video_cards_radeon? (
+							${CLANG_DEPSTR_AMDGPU}
+						)
+					)
+				)
+				!video_cards_r600? (
+					!video_cards_radeon? (
+						!video_cards_radeonsi? (
+							${CLANG_DEPSTR}
+						)
 					)
 				)
 			)
-		)
-		!opencl? (
-			video_cards_r600? (
-				${LLVM_DEPSTR_AMDGPU}
-			)
-			!video_cards_r600? (
-				video_cards_radeonsi? (
+			!opencl? (
+				video_cards_r600? (
 					${LLVM_DEPSTR_AMDGPU}
 				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeonsi? (
-					video_cards_radeon? (
+				!video_cards_r600? (
+					video_cards_radeonsi? (
 						${LLVM_DEPSTR_AMDGPU}
 					)
 				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeon? (
+				!video_cards_r600? (
 					!video_cards_radeonsi? (
-						${LLVM_DEPSTR}
+						video_cards_radeon? (
+							${LLVM_DEPSTR_AMDGPU}
+						)
+					)
+				)
+				!video_cards_r600? (
+					!video_cards_radeon? (
+						!video_cards_radeonsi? (
+							${LLVM_DEPSTR}
+						)
 					)
 				)
 			)
diff --git a/media-libs/qt-gstreamer/Manifest b/media-libs/qt-gstreamer/Manifest
index 002d37722a33..e14fa78b0a80 100644
--- a/media-libs/qt-gstreamer/Manifest
+++ b/media-libs/qt-gstreamer/Manifest
@@ -1,6 +1,8 @@
 AUX qt-gstreamer-1.2.0-boost157.patch 5474 BLAKE2B 72827e5a70e9d204271450f3cdfbe4b400c748e4b0722301de6de3c62cd0ef8ac68e2986732238cf0e5767fb398b73c7c3acd904d7a3aa3e24305012dddc354d SHA512 81f0ff93cf66635283114c35c1e8b0299c9f0f29b2d5c0cbf4e493b0e1895069a813aa898d7a2c1d2110661feffc512f8c91fef1e4e63a83d1d0e807c77b0c28
+AUX qt-gstreamer-1.2.0-clang-38.patch 3455 BLAKE2B ff525007a8c04605cf21e0c14259367b53aa74af761183a22b0103f986b4721c91c2cd3b0570b3582395f3741d0cea44e95fef7a9790adac0f2b225d19be3ff0 SHA512 9678fb9e9502c055be9f0875d4d33bf7c8d852228009ad1ef5b85b41b009eb43fc3b946b3ffaaaf1b79a90e6e20c4940f46946655f07d533214ef76473cd7dc1
 AUX qt-gstreamer-1.2.0-gstreamer15.patch 1494 BLAKE2B 1be10fb02d4a68406b17ccc758bb1bc79ad85fbde217de7ac12dd5c306326e68cddcdda82b55eebb24c6befb929008c85150b99d7bc6040e7b91984260287d3e SHA512 999ccdd8d9772887e5d302a43e14c2400519306332facc1e4a1c4a65d941ca278a473c84816e4a5358f08df2b42675e7ec9285e1616f77f755562942acaaa4a3
+AUX qt-gstreamer-1.2.0-gstreamer16.patch 853 BLAKE2B c25bd3018d1c20b601e9490a665014795114931158ef5cecb9ed3c27e9704483ab5a16fa89058d2cf87b7a63b0ec4644379861991bdb659b840494af1be7091d SHA512 118d8e3c4253f458206615b9b70dff839e492c4628275dfa2dd49705d1ca85dee16a2878d7af84ee8709c88b89d78b41afab65ea72786bce07d446142bbd4128
 AUX qt-gstreamer-1.2.0-qt-5.11b3.patch 1834 BLAKE2B 9869694e31a546d1c31bc965c7e0f44de28f5566076cee8d1bb36f274f42757256d5c77e4bf7be23e12260d235eb72868252a5b920a293adc71520bd91c70e3c SHA512 235418641f23e5bbbceef53f561bdfd3b06b5d247c8d81cfb5b72388f494142458bb0171e5b146f8be9613d22a5c286eec6730414d7cbd35b62744dcfc87e667
 DIST qt-gstreamer-1.2.0.tar.xz 313632 BLAKE2B e41fd7073e223a06b0115025dcfcd637f4803f953b4fe175f5b05713bd5282c7fa12039d5a5b4c98eff5a181bbb7cd4140a0f1de32a8aadeef5d7217b339eadf SHA512 ae58c72765d590b84fa8709b45934ac464d7e00dba862783a2c4fe9d41afd09c6e5f95523cdf465fcfd2c6fa705335071b101912c42cd6c1fd15ae207b0864c7
-EBUILD qt-gstreamer-1.2.0-r4.ebuild 1198 BLAKE2B 8e92d575a36881192af8570977e8b2f1fa7b626bb25f81c2e6633b908378e6de48e7efbe3722849345d8fb89727695aa21f4a0a8db3417f9e937246b32fd0c06 SHA512 d755cb4883768ae9e6ad4b7ee0638ae9b41b436d8d35bb7f47b72ad8687ec3616776173c4c7174e52f717166a58e82e2b1e7700a47b56cd333662a67cc2aec13
+EBUILD qt-gstreamer-1.2.0-r4.ebuild 1135 BLAKE2B 158fb805fd8339a456f4b978d9e55ff86adc3ba496da0265543e63fc0bcf672a3118fe4466816c0ef4d4d23035f0c4cfcce4e2efd2b825b7419757b1a7a4252e SHA512 670dbd2d811fd2f6361fb7a89814d0c15fb46285d73fb7866ec5825905c7e2c62116dfe517afb0c504835558fa1ed09075fbc6d9d2b409d68435375732a81c9a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-libs/qt-gstreamer/files/qt-gstreamer-1.2.0-clang-38.patch b/media-libs/qt-gstreamer/files/qt-gstreamer-1.2.0-clang-38.patch
new file mode 100644
index 000000000000..977a09d7f6ce
--- /dev/null
+++ b/media-libs/qt-gstreamer/files/qt-gstreamer-1.2.0-clang-38.patch
@@ -0,0 +1,67 @@
+From fc159e5c4c8ffeabdc7319514c6bb19c9c9e1d3b Mon Sep 17 00:00:00 2001
+From: Aleix Pol <aleixpol@kde.org>
+Date: Mon, 13 Jun 2016 10:36:34 +0200
+Subject: [PATCH] Fix build with Clang 3.8
+
+error: invalid suffix on literal; C++11 requires a space between literal and identifier
+
+https://bugzilla.gnome.org/show_bug.cgi?id=767578
+---
+ elements/gstqtvideosink/delegates/basedelegate.cpp             | 2 +-
+ elements/gstqtvideosink/delegates/qwidgetvideosinkdelegate.cpp | 2 +-
+ elements/gstqtvideosink/gstqtquick2videosink.cpp               | 2 +-
+ elements/gstqtvideosink/gstqtvideosinkbase.cpp                 | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/elements/gstqtvideosink/delegates/basedelegate.cpp b/elements/gstqtvideosink/delegates/basedelegate.cpp
+index 7dde59c..65f364c 100644
+--- a/elements/gstqtvideosink/delegates/basedelegate.cpp
++++ b/elements/gstqtvideosink/delegates/basedelegate.cpp
+@@ -155,7 +155,7 @@ bool BaseDelegate::event(QEvent *event)
+         BufferEvent *bufEvent = dynamic_cast<BufferEvent*>(event);
+         Q_ASSERT(bufEvent);
+ 
+-        GST_TRACE_OBJECT(m_sink, "Received buffer %"GST_PTR_FORMAT, bufEvent->buffer);
++        GST_TRACE_OBJECT(m_sink, "Received buffer %" GST_PTR_FORMAT, bufEvent->buffer);
+ 
+         if (isActive()) {
+             gst_buffer_replace (&m_buffer, bufEvent->buffer);
+diff --git a/elements/gstqtvideosink/delegates/qwidgetvideosinkdelegate.cpp b/elements/gstqtvideosink/delegates/qwidgetvideosinkdelegate.cpp
+index 8f23dc2..c42513f 100644
+--- a/elements/gstqtvideosink/delegates/qwidgetvideosinkdelegate.cpp
++++ b/elements/gstqtvideosink/delegates/qwidgetvideosinkdelegate.cpp
+@@ -36,7 +36,7 @@ QWidget *QWidgetVideoSinkDelegate::widget() const
+ 
+ void QWidgetVideoSinkDelegate::setWidget(QWidget *widget)
+ {
+-    GST_LOG_OBJECT(m_sink, "Setting \"widget\" property to %"GST_PTR_FORMAT, widget);
++    GST_LOG_OBJECT(m_sink, "Setting \"widget\" property to %" GST_PTR_FORMAT, widget);
+ 
+     if (m_widget) {
+         m_widget.data()->removeEventFilter(this);
+diff --git a/elements/gstqtvideosink/gstqtquick2videosink.cpp b/elements/gstqtvideosink/gstqtquick2videosink.cpp
+index 7889fbf..bedc074 100644
+--- a/elements/gstqtvideosink/gstqtquick2videosink.cpp
++++ b/elements/gstqtvideosink/gstqtquick2videosink.cpp
+@@ -248,7 +248,7 @@ gst_qt_quick2_video_sink_show_frame(GstVideoSink *sink, GstBuffer *buffer)
+ {
+     GstQtQuick2VideoSink *self = GST_QT_QUICK2_VIDEO_SINK (sink);
+ 
+-    GST_TRACE_OBJECT(self, "Posting new buffer (%"GST_PTR_FORMAT") for rendering.", buffer);
++    GST_TRACE_OBJECT(self, "Posting new buffer (%" GST_PTR_FORMAT ") for rendering.", buffer);
+ 
+     QCoreApplication::postEvent(self->priv->delegate, new BaseDelegate::BufferEvent(buffer));
+ 
+diff --git a/elements/gstqtvideosink/gstqtvideosinkbase.cpp b/elements/gstqtvideosink/gstqtvideosinkbase.cpp
+index 118d0a2..a707e02 100644
+--- a/elements/gstqtvideosink/gstqtvideosinkbase.cpp
++++ b/elements/gstqtvideosink/gstqtvideosinkbase.cpp
+@@ -207,7 +207,7 @@ GstFlowReturn GstQtVideoSinkBase::show_frame(GstVideoSink *video_sink, GstBuffer
+ {
+     GstQtVideoSinkBase *sink = GST_QT_VIDEO_SINK_BASE(video_sink);
+ 
+-    GST_TRACE_OBJECT(sink, "Posting new buffer (%"GST_PTR_FORMAT") for rendering.", buffer);
++    GST_TRACE_OBJECT(sink, "Posting new buffer (%" GST_PTR_FORMAT ") for rendering.", buffer);
+ 
+     QCoreApplication::postEvent(sink->delegate, new BaseDelegate::BufferEvent(buffer));
+ 
diff --git a/media-libs/qt-gstreamer/files/qt-gstreamer-1.2.0-gstreamer16.patch b/media-libs/qt-gstreamer/files/qt-gstreamer-1.2.0-gstreamer16.patch
new file mode 100644
index 000000000000..6bb24048f6c1
--- /dev/null
+++ b/media-libs/qt-gstreamer/files/qt-gstreamer-1.2.0-gstreamer16.patch
@@ -0,0 +1,25 @@
+From 6e4fb2f3fcfb453c5522c66457ac5ed8c3b1b05c Mon Sep 17 00:00:00 2001
+From: George Kiagiadakis <george.kiagiadakis@collabora.com>
+Date: Sat, 7 Sep 2019 10:49:38 +0300
+Subject: [PATCH] QGst/caps: compilation fix from
+ https://bugs.kde.org/show_bug.cgi?id=406676#c2
+
+Because the macro version of gst_caps_copy() confuses the C++ compiler
+---
+ src/QGst/caps.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/QGst/caps.cpp b/src/QGst/caps.cpp
+index 3824d82..a15b701 100644
+--- a/src/QGst/caps.cpp
++++ b/src/QGst/caps.cpp
+@@ -54,7 +54,8 @@ QString Caps::toString() const
+ 
+ void Caps::append(const CapsPtr & caps2)
+ {
+-    gst_caps_append(object<GstCaps>(), gst_caps_copy(caps2));
++    const GstCaps * caps2ptr = caps2;
++    gst_caps_append(object<GstCaps>(), gst_caps_copy(caps2ptr));
+ }
+ 
+ CapsPtr Caps::merge(CapsPtr & caps2)
diff --git a/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r4.ebuild b/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r4.ebuild
index 72741f9402e7..4adb838f82d5 100644
--- a/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r4.ebuild
+++ b/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r4.ebuild
@@ -3,22 +3,20 @@
 
 EAPI=7
 
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="https://gstreamer.freedesktop.org/src/qt-gstreamer/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
-else
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/gstreamer/qt-gstreamer.git"
-	inherit git-r3
-fi
 inherit cmake-utils
 
 DESCRIPTION="C++ bindings for GStreamer with a Qt-style API"
 HOMEPAGE="https://gstreamer.freedesktop.org/modules/qt-gstreamer.html"
+SRC_URI="https://gstreamer.freedesktop.org/src/qt-gstreamer/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
 IUSE="test"
 
+BDEPEND="
+	dev-util/glib-utils
+"
 RDEPEND="
 	dev-libs/boost:=
 	dev-libs/glib:2
@@ -30,16 +28,16 @@ RDEPEND="
 	media-libs/gstreamer:1.0
 	media-libs/gst-plugins-base:1.0
 "
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
+DEPEND="${RDEPEND}
 	test? ( dev-qt/qttest:5 )
 "
 
 PATCHES=(
 	"${FILESDIR}/${P}-gstreamer15.patch"
+	"${FILESDIR}/${P}-gstreamer16.patch"
 	"${FILESDIR}/${P}-boost157.patch"
 	"${FILESDIR}/${P}-qt-5.11b3.patch"
+	"${FILESDIR}/${P}-clang-38.patch"
 )
 
 # bug 497880
diff --git a/media-libs/rlottie/Manifest b/media-libs/rlottie/Manifest
new file mode 100644
index 000000000000..3dfef1c549f8
--- /dev/null
+++ b/media-libs/rlottie/Manifest
@@ -0,0 +1,6 @@
+AUX rlottie-0.0.1_pre20190920-disable-werror.patch 420 BLAKE2B 3b3173c4514227de44f1f953678dcce871b3df07ccbb617d0f8a18763f66dadf584fdacd8eeb31a8391a5b8a8a1c00a05137790ad09662e093eb7888f8f0bb4d SHA512 893b5a658a63e8fe4f62e72e967d9e89eaef8184680c1b753fbc0c0893078bbf963967dd4dadff6a94150b7b15c0b6c7ee7cd54631b6874aa3cf3d21989746ed
+DIST rlottie-0.0.1_pre20190920.tar.gz 7891127 BLAKE2B bc9e37e74f21f681fffae3e6140662782ebce7bee58c4205cdb9f927f5246aedc83efc516adecf6c61fb5fc06aff58d1c65bfe3cca18d02bf4e9f2d71890869e SHA512 8d903e877cb83fd0af8cb7b6dd96e09a423201c0b88b2c8c733e54bb873a7b48377e5eb8eeefa620e284c2d1b61fcfe0aa309d180c88428aaccdb0f1ac4a48ed
+DIST rlottie-0.0.1_pre20191101.tar.gz 7896379 BLAKE2B 2361415074af71340c80b91595edab0b53e85ce704400ba5574e1efc19e6bc2cd7dff8b0e2d32b9f0666889c4d8bd2abbffa943f551b4ee3e4787aa94cfbbe01 SHA512 c4c4dae0f0da4d0bd4b3ea63066335794111f1bd4a33f8844494b9b9e79de46cd994b5e9d185b175cba19d1665ef1fdb0d89babfd71cf7dd0fbf0535ba83ab96
+EBUILD rlottie-0.0.1_pre20190920.ebuild 899 BLAKE2B cb6da55fdaa1014b73c7ceec7e4f2f858efcc9d6b401dc632ed1ab6dbf2b38b77c56238b7c89685a4c84970b5d65cab269c34040b47156baf2d0b89a74e5a13c SHA512 a30d55d15b1091aeaa4fa574246375fa12e3d59964c2d2c6aec07bfa9d7c34458c3dfbdb8484af35e65b6c96eb7ff4c8f55a3b3088c319a52727b0cf9a0beef8
+EBUILD rlottie-0.0.1_pre20191101.ebuild 899 BLAKE2B 2a1c3304841d9df0b47a5c384294a1d29d7558b552133558f1558e31071536b24c7da01097885f8815030af7043261ac6a78a7e3004a11af52edfbe6838e2dea SHA512 b9f3e3731a5c2f1df4b9a00d9fea4b6a2c6abff1bc259e1fb6067d13de6053e419e9852f73d9b016daa4eddeb58ee766daed02c55334c02c41ccdd979c98a9a9
+MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/media-libs/rlottie/files/rlottie-0.0.1_pre20190920-disable-werror.patch b/media-libs/rlottie/files/rlottie-0.0.1_pre20190920-disable-werror.patch
new file mode 100644
index 000000000000..60676f7f8e32
--- /dev/null
+++ b/media-libs/rlottie/files/rlottie-0.0.1_pre20190920-disable-werror.patch
@@ -0,0 +1,11 @@
+diff -Naur a/meson.build b/meson.build
+--- a/meson.build	2019-09-28 08:38:12.810010842 +0300
++++ b/meson.build	2019-09-28 08:38:47.812649483 +0300
+@@ -1,6 +1,6 @@
+ project('rlottie',
+         'cpp',
+-        default_options : ['warning_level=3', 'werror=true', 'cpp_std=c++14', 'optimization=s'],
++        default_options : ['cpp_std=c++14', 'optimization=s'],
+         version : '0.0.1',
+         license : 'Apache')
+ 
diff --git a/media-libs/libtxc_dxtn/metadata.xml b/media-libs/rlottie/metadata.xml
index e943b72b8a48..6b0a0fb3a729 100644
--- a/media-libs/libtxc_dxtn/metadata.xml
+++ b/media-libs/rlottie/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="person">
+    <email>juippis@gentoo.org</email>
+    <name>Joonas Niilola</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-libs/rlottie/rlottie-0.0.1_pre20190920.ebuild b/media-libs/rlottie/rlottie-0.0.1_pre20190920.ebuild
new file mode 100644
index 000000000000..dd1e038fbc48
--- /dev/null
+++ b/media-libs/rlottie/rlottie-0.0.1_pre20190920.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+MY_COMMIT="93dd5305d9f5d2270a873c9c565b6931439fd11f"
+
+DESCRIPTION="A platform independent standalone library that plays Lottie Animations"
+HOMEPAGE="https://www.tizen.org/ https://github.com/Samsung/rlottie"
+SRC_URI="https://github.com/Samsung/rlottie/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD FTL LGPL-2.1 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( dev-cpp/gtest )"
+
+S="${WORKDIR}/rlottie-${MY_COMMIT}"
+
+PATCHES=( "${FILESDIR}"/rlottie-0.0.1_pre20190920-disable-werror.patch )
+
+src_configure() {
+	local emesonargs=(
+		-D example=false
+		$(meson_use test)
+	)
+
+	meson_src_configure
+}
+
+src_test() {
+	cd "${BUILD_DIR}" || die "Failed to switch into BUILD_DIR."
+	eninja test
+}
diff --git a/media-libs/rlottie/rlottie-0.0.1_pre20191101.ebuild b/media-libs/rlottie/rlottie-0.0.1_pre20191101.ebuild
new file mode 100644
index 000000000000..37f6c9638e02
--- /dev/null
+++ b/media-libs/rlottie/rlottie-0.0.1_pre20191101.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+MY_COMMIT="ddf0f149aaee7625f8cde1ae15f0605e57274445"
+
+DESCRIPTION="A platform independent standalone library that plays Lottie Animations"
+HOMEPAGE="https://www.tizen.org/ https://github.com/Samsung/rlottie"
+SRC_URI="https://github.com/Samsung/rlottie/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD FTL LGPL-2.1 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( dev-cpp/gtest )"
+
+S="${WORKDIR}/rlottie-${MY_COMMIT}"
+
+PATCHES=( "${FILESDIR}"/rlottie-0.0.1_pre20190920-disable-werror.patch )
+
+src_configure() {
+	local emesonargs=(
+		-D example=false
+		$(meson_use test)
+	)
+
+	meson_src_configure
+}
+
+src_test() {
+	cd "${BUILD_DIR}" || die "Failed to switch into BUILD_DIR."
+	eninja test
+}
diff --git a/media-libs/shaderc/Manifest b/media-libs/shaderc/Manifest
index f37ce44ad894..b739d91798ae 100644
--- a/media-libs/shaderc/Manifest
+++ b/media-libs/shaderc/Manifest
@@ -1,4 +1,8 @@
 AUX shaderc-2018.0-fix-glslang-link-order.patch 1059 BLAKE2B e8985d1de7f6e425eabbd05201aeff854304fe227f2a83878ed41e5494e71742d46c49b86aa97c3a9b364909f5d6adcc2a3aed21128935febbc7765b90b2f2b3 SHA512 09a61e04dd68674d159c69a497ce412b924967d595526a54693e1999345fd45c88999b5e793b5bfd21a0a555b535d89d1611c44a76f81e1ce308bff821c86f87
+AUX shaderc-2019.0-fix-build-against-new-glslang.patch 2158 BLAKE2B df0c6cc0067ca6b8e2a10e890b7b006680856fa3df2565df3da97759c45445606530e81eee46b1d576d8cdb43b4a84c3241fcd14828c769d418c72f880402c25 SHA512 96d2e6a67a8c38e374b56b16936574e374592eec6b38b2a4fd35ae80419298196a849bfbacc5bf7f1b6175c417ead469b18d2c196147119e490556d49eebc89f
+AUX shaderc-2019.0-fix-glslang-link-order.patch 1030 BLAKE2B 281fc55196762ffbc08daa63a401e13330719c50f9e0f5f30199f9fc96c3c00148eb3a6efb0f4e083eea0a53a19a3f65e0f3e52d995356279a18cf8596029bb3 SHA512 c4fbc5db2a40adc45cdb470c1fc09f65bee38b1f46da84a47c60db3ba081b536539f40567c28111fb598fe6a6ba47602cff3b2835247460d08bab5d5e3ea28c4
 DIST shaderc-2018.0.tar.gz 206013 BLAKE2B b45fb6e959f621566817f8e31b1947e479b6ea392eb64f334dca9ad24cc4e8b736dd236e634de3f96342f48d8138722a2b769efb9db65025def5ed59bf5b911b SHA512 7a420fde73c9f2aae3f13558d538a1f4ae43bba19e2b4d2da8fbbd017e9e4f328ece5f330f1bbcb9fe84c91b7eb84b9158dc2e3d144c82939090a0fa6f5b4ef0
+DIST shaderc-2019.0.tar.gz 232620 BLAKE2B 53fd0967fe22e5a89783fccb485dc07c31a18eb328c6cf7244349714c6774d1877c1fbae0b8ffcf47d189f1e0c5f2d501f027ff3aa05bdd59950d49a4084e9b5 SHA512 c76887ad0a96145211b6550b0dfe63091df9e1463f9a3140aba2d1982c33e98ad14fb4bcf9ce2281433fc77626fc892c268d0636b9f348a159dd06e3f41b461a
 EBUILD shaderc-2018.0.ebuild 1982 BLAKE2B 65f9c467b19222fc0d74454ae5564fe9f807cf4ec03f204b1dea7cef0c3898146b690771787953be671b9adcd4d77624a56ab209cd91055edf89b54914af202f SHA512 89ec6b3a50cff8021cf51eea7c11ac6c106f6e6a9bf0fae44ef881749ece590660947a86bd358089c87ea3c623f4f5268602241f16ccd9885fef10e3caf7af20
-MISC metadata.xml 246 BLAKE2B 1b5ed67f52168f632fd290d848b5cff1b99d79ce844a73d99fec57c671b0788d9e7c83b9e657a8a7172f89cbf0728bb7f3d8016db2e3575f686e60dabafef941 SHA512 ed75da45f240a95d52b0b1d6164e68c174c8083997636a3ddae0ee8c7b1921b18d09a8da0e7fe289b829e076f4d914828e830428aebe82d3274ee83aa44e98dc
+EBUILD shaderc-2019.0-r1.ebuild 2091 BLAKE2B 02f511ed0dbc836471ce55ffa74b72bd299e3f26a8322168f4c385de47f9329be32ddf2f14c4dda11411c43e70ac4e8be69a85e86de602d0c8c1fbc03b26244b SHA512 51353ec7681d2e4a1c85a6cdb2adc428b885ad49faf9ccdb85b0ec478218cbb3e203669235567baa34f97550e4c1bd2d9d00bd9a375099866c2f5be4b2a21fbf
+MISC metadata.xml 335 BLAKE2B 295aaacdd867834ddc93fd5f52a7d5c50b14a63936e4f97f5cba62d7ddc47fda07dc620203f6e27adf01d8df13b5d9c2b0f5621a0d21bb53f8b846b78023ddfa SHA512 f9b82e65002f90c0e253b712ac3a11c483a3d7bb1750d46f3d8bf4de577927421e6e1cb3c3403afb89a8168e02e9b3736cc21adf6994827a17a82b237a8973a5
diff --git a/media-libs/shaderc/files/shaderc-2019.0-fix-build-against-new-glslang.patch b/media-libs/shaderc/files/shaderc-2019.0-fix-build-against-new-glslang.patch
new file mode 100644
index 000000000000..807540cf62a2
--- /dev/null
+++ b/media-libs/shaderc/files/shaderc-2019.0-fix-build-against-new-glslang.patch
@@ -0,0 +1,54 @@
+diff --git a/libshaderc/src/shaderc.cc b/libshaderc/src/shaderc.cc
+index 3c3c3de..b5fc6cb 100644
+--- a/libshaderc/src/shaderc.cc
++++ b/libshaderc/src/shaderc.cc
+@@ -20,7 +20,7 @@
+ #include <sstream>
+ #include <vector>
+ 
+-#include "SPIRV/spirv.hpp"
++#include "glslang/SPIRV/spirv.hpp"
+ 
+ #include "libshaderc_util/compiler.h"
+ #include "libshaderc_util/counting_includer.h"
+diff --git a/libshaderc_util/src/compiler.cc b/libshaderc_util/src/compiler.cc
+index ef7867f..acc172b 100644
+--- a/libshaderc_util/src/compiler.cc
++++ b/libshaderc_util/src/compiler.cc
+@@ -26,7 +26,7 @@
+ #include "libshaderc_util/string_piece.h"
+ #include "libshaderc_util/version_profile.h"
+ 
+-#include "SPIRV/GlslangToSpv.h"
++#include "glslang/SPIRV/GlslangToSpv.h"
+ 
+ namespace {
+ using shaderc_util::string_piece;
+@@ -291,17 +291,12 @@ std::tuple<bool, std::vector<uint32_t>, size_t> Compiler::Compile(
+       bases[static_cast<int>(UniformKind::StorageBuffer)]);
+   shader.setShiftUavBinding(
+       bases[static_cast<int>(UniformKind::UnorderedAccessView)]);
+-  shader.setHlslIoMapping(hlsl_iomap_);
+   shader.setResourceSetBinding(
+       hlsl_explicit_bindings_[static_cast<int>(used_shader_stage)]);
+   shader.setEnvClient(target_client_info.client,
+                       target_client_info.client_version);
+   shader.setEnvTarget(target_client_info.target_language,
+                       target_client_info.target_language_version);
+-  if (hlsl_functionality1_enabled_) {
+-    shader.setEnvTargetHlslFunctionality1();
+-  }
+-
+   const EShMessages rules = GetMessageRules(target_env_, source_language_,
+                                             hlsl_offsets_,
+                                             generate_debug_info_);
+@@ -478,9 +473,6 @@ std::tuple<bool, std::string, std::string> Compiler::PreprocessShader(
+   }
+   shader.setEnvClient(target_client_info.client,
+                       target_client_info.client_version);
+-  if (hlsl_functionality1_enabled_) {
+-    shader.setEnvTargetHlslFunctionality1();
+-  }
+ 
+   // The preprocessor might be sensitive to the target environment.
+   // So combine the existing rules with the just-give-me-preprocessor-output
diff --git a/media-libs/shaderc/files/shaderc-2019.0-fix-glslang-link-order.patch b/media-libs/shaderc/files/shaderc-2019.0-fix-glslang-link-order.patch
new file mode 100644
index 000000000000..660d1bf8dfd3
--- /dev/null
+++ b/media-libs/shaderc/files/shaderc-2019.0-fix-glslang-link-order.patch
@@ -0,0 +1,26 @@
+diff --git a/glslc/CMakeLists.txt b/glslc/CMakeLists.txt
+index acf6fb0..0f5d888 100644
+--- a/glslc/CMakeLists.txt
++++ b/glslc/CMakeLists.txt
+@@ -18,7 +18,7 @@ add_library(glslc STATIC
+ shaderc_default_compile_options(glslc)
+ target_include_directories(glslc PUBLIC ${glslang_SOURCE_DIR})
+ target_link_libraries(glslc PRIVATE glslang OSDependent OGLCompiler
+-  HLSL glslang SPIRV ${CMAKE_THREAD_LIBS_INIT})
++  glslang SPIRV HLSL ${CMAKE_THREAD_LIBS_INIT})
+ target_link_libraries(glslc PRIVATE shaderc_util shaderc)
+ 
+ add_executable(glslc_exe src/main.cc)
+diff --git a/libshaderc_util/CMakeLists.txt b/libshaderc_util/CMakeLists.txt
+index f8ae95d..069c48a 100644
+--- a/libshaderc_util/CMakeLists.txt
++++ b/libshaderc_util/CMakeLists.txt
+@@ -32,7 +32,7 @@ add_definitions(-DENABLE_HLSL)
+ 
+ find_package(Threads)
+ target_link_libraries(shaderc_util PRIVATE
+-  glslang OSDependent OGLCompiler HLSL glslang SPIRV
++  glslang OSDependent OGLCompiler glslang SPIRV HLSL
+   SPIRV-Tools-opt ${CMAKE_THREAD_LIBS_INIT})
+ 
+ shaderc_add_tests(
diff --git a/media-libs/shaderc/metadata.xml b/media-libs/shaderc/metadata.xml
index d71aaf4a995a..b63343c6be5b 100644
--- a/media-libs/shaderc/metadata.xml
+++ b/media-libs/shaderc/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">google/shaderc</remote-id>
-	</upstream>
+  <maintainer type="person">
+    <email>sarnex@gentoo.org</email>
+    <name>Nick Sarnie</name>
+  </maintainer>  
+  <upstream>
+    <remote-id type="github">google/shaderc</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-libs/shaderc/shaderc-2019.0-r1.ebuild b/media-libs/shaderc/shaderc-2019.0-r1.ebuild
new file mode 100644
index 000000000000..a1cb035a3150
--- /dev/null
+++ b/media-libs/shaderc/shaderc-2019.0-r1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+
+inherit cmake-multilib python-any-r1
+
+DESCRIPTION="Collection of tools, libraries and tests for shader compilation"
+HOMEPAGE="https://github.com/google/shaderc"
+SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-util/glslang-7.12.3353_pre20191027-r1[${MULTILIB_USEDEP}]
+	>=dev-util/spirv-tools-2019.10_pre20191027[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	>=dev-util/spirv-headers-1.5.1
+	doc? ( dev-ruby/asciidoctor )
+	test? (
+		dev-cpp/gtest
+		$(python_gen_any_dep 'dev-python/nose[${PYTHON_USEDEP}]')
+	)
+"
+
+# https://github.com/google/shaderc/issues/470
+RESTRICT=test
+
+PATCHES=("${FILESDIR}/${P}-fix-glslang-link-order.patch"
+		 "${FILESDIR}/${P}-fix-build-against-new-glslang.patch" )
+
+python_check_deps() {
+	if use test; then
+		has_version --host-root "dev-python/nose[${PYTHON_USEDEP}]"
+	fi
+}
+
+src_prepare() {
+	cmake_comment_add_subdirectory examples
+
+	# Unbundle glslang, spirv-headers, spirv-tools
+	cmake_comment_add_subdirectory third_party
+	sed -i \
+		-e "s|\$<TARGET_FILE:spirv-dis>|${EPREFIX}/usr/bin/spirv-dis|" \
+		glslc/test/CMakeLists.txt || die
+
+	# Disable git versioning
+	sed -i -e '/build-version/d' glslc/CMakeLists.txt || die
+
+	# Manually create build-version.inc as we disabled git versioning
+	cat <<- EOF > glslc/src/build-version.inc || die
+		"${P}\n"
+		"$(best_version dev-util/spirv-tools)\n"
+		"$(best_version dev-util/glslang)\n"
+	EOF
+
+	cmake-utils_src_prepare
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DSHADERC_SKIP_TESTS="$(usex !test)"
+	)
+	cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi && use doc; then
+		cmake-utils_src_make glslc_doc_README
+	fi
+	cmake-utils_src_compile
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		use doc && local HTML_DOCS=( "${BUILD_DIR}/glslc/README.html" )
+	fi
+	cmake-utils_src_install
+}
diff --git a/media-libs/taglib/Manifest b/media-libs/taglib/Manifest
index 59604aeb463b..281ed175174e 100644
--- a/media-libs/taglib/Manifest
+++ b/media-libs/taglib/Manifest
@@ -1,7 +1,8 @@
 AUX taglib-1.11-install-examples.patch 371 BLAKE2B ee42b80e8c6093dbfc4c89c25bcb6bd25e2f5152c14743fa49c6c44a14f93a961f08a4d53337efe0800d98126a8aa58627a330e19386283cc16d8f20c9637262 SHA512 149ce1256ec557ee1e896b56e361f2fcf69633424f9b125666827eda610e84c35bf28e5c3fe5f38d4d87f1eacf977fc5b8b8c2d9c6634997bfe4e4bac122fc37
+AUX taglib-1.11.1_p20181028-libdir.patch 721 BLAKE2B de84d157b6da665c6e2dee504bfd68409500fa00366d83adc67735bfb7962cdadcfa6e3ff838115521f66db12ae2d8ef9963981f452944b100e475653fb9064c SHA512 fa9082f58257a3250a54eba49dc1b0d6f25e59f2fa500a7d41571b7c5fa8b2e8e5a7d4426ee2046dbe556c3dd2cf1c271cb4e0e1e9b78b8733a84de9420974ab
 AUX taglib-1.11.1_p20181028-version-1.11.2.patch 486 BLAKE2B a0b9021a01268eaeb32cb7a6b333b54df522aaf9d07d9b89870f0dbc38a9648ab9173a916bd8a29537b454631be5cd32c2dfb256ebf2f2b86000fec8d2f32bb6 SHA512 e5c3d814ae7c4b2cb84eded86e909d2db985ec21409767a9bdd502d562b55edf30c74834e2829199f1fd20ca8b1dab832a78b05246ae82fe6ff94cb1266d98d0
 DIST taglib-1.11.1_p20181028.tar.gz 1299993 BLAKE2B d281873a87742ba417ea764bb01f9a4c5553a4624d2c257dd82bbb2f0b7e3103ab6ca253f78c0167908f449aac833873ca1cce6f24b1eb5f608131382833262a SHA512 e26439b65ab579455f79e87a94c33a98e17209b31a19b531e5964a2c0ded395c35067655e31ad22b6205149e2e920d7bd145993f064d3ad13e1de8a9f7e37256
 DIST taglib-1.11.1_p20190920.tar.gz 1290100 BLAKE2B 38f65450b5e7c33b14187ab461bfd18d77f93d1ecab5ccf0c898ca6e67fd05aebac09318d4e1cabf1fdbca38800332ef9d0d5d1317087e69672734d1dec1dfe2 SHA512 4f7ad2a0713d38e8885b10d08041abdfb6c669369edd16e8345d7d679c16c15f191ca378e6690e06347f29e0e9cadebcb95ba26dc583c1127c4531558df27173
 EBUILD taglib-1.11.1_p20181028.ebuild 1406 BLAKE2B 830c53acc2e2f09b53908c5d287a8cb1c7c0ea0d7e7a5c1cd1a63a7c25f6c45082194619ad251eac83adb27d9120612ba615352516b96b942e040f031db96ace SHA512 9c8432a4579e5b55a9b5a825bc6503e4b3cf43cecce312e34f00a8e0b0bd106ec46f6815f3f92126d56895eaa07325df23138546bec09759472f974af6426448
-EBUILD taglib-1.11.1_p20190920.ebuild 1360 BLAKE2B ae2e8cf63660bc931c791643af8f112ed80d6338416ddcdd1b4b1081f4710a0af4a2e6527a9eb932cf2a685cae8ed51b33c103d770d43b18c86ffc616a5283aa SHA512 68abddc56f79988a583f451fcc83d91d2c6ce82eb720977d82fdc250d45b9841afc78148fae2df8a4eeeac82b84aae463c9de380f3f4d8531d086cb2797e9e77
+EBUILD taglib-1.11.1_p20190920-r1.ebuild 1411 BLAKE2B eb6049f0b1608541f722be838efaf0cf4d51d89b301163ee00bbf199c77b69010bcac8504f95572f3ec92a440f150629f203c19ad993548b0b20d7bb8b57aeaf SHA512 78e0a9f445ef9ac5f699b425b52a9f9f4f9731c971ccd66a1c516272172940dc91e7ae511848e57d919ed2f883fd68be271231517c65572842d5c3180dbe26c4
 MISC metadata.xml 327 BLAKE2B 3972cb6de796dc7ba0d48715a30f265c10bfebe2e192d634267ffa0dc2323283b16c38f9bd891dbd1b7c646929e41116a5924d426fb1df46e63f3a4b4f5920be SHA512 05909165d6fff2283a6d55d1c454d97541e4e5ac35a6997123f548b3a86d108231928a4136cea35a323c942a82d50072f66840347fd1b651d4c1f3a53928c721
diff --git a/media-libs/taglib/files/taglib-1.11.1_p20181028-libdir.patch b/media-libs/taglib/files/taglib-1.11.1_p20181028-libdir.patch
new file mode 100644
index 000000000000..0ae6b1cfb9af
--- /dev/null
+++ b/media-libs/taglib/files/taglib-1.11.1_p20181028-libdir.patch
@@ -0,0 +1,25 @@
+From cd9e6b750206417f155574c78d2551242a779a97 Mon Sep 17 00:00:00 2001
+From: jiblime <47689567+jiblime@users.noreply.github.com>
+Date: Sat, 19 Oct 2019 15:12:03 -0700
+Subject: [PATCH] Changed libdir/includedir variables to change based on a
+ user's system and match syntax
+
+---
+ taglib-config.cmake | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/taglib-config.cmake b/taglib-config.cmake
+index 2a5c19f90..e613fa226 100644
+--- a/taglib-config.cmake
++++ b/taglib-config.cmake
+@@ -16,8 +16,8 @@ EOH
+ 
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=@CMAKE_INSTALL_PREFIX@
+-libdir=${exec_prefix}/lib
+-includedir=${prefix}/include
++libdir=@LIB_INSTALL_DIR@
++includedir=@INCLUDE_INSTALL_DIR@
+ 
+ flags=""
+ 
diff --git a/media-libs/taglib/taglib-1.11.1_p20190920.ebuild b/media-libs/taglib/taglib-1.11.1_p20190920-r1.ebuild
index b83996484d65..163dcdf23ea2 100644
--- a/media-libs/taglib/taglib-1.11.1_p20190920.ebuild
+++ b/media-libs/taglib/taglib-1.11.1_p20190920-r1.ebuild
@@ -24,6 +24,7 @@ DEPEND="${RDEPEND}
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.11-install-examples.patch
 	"${FILESDIR}"/${PN}-1.11.1_p20181028-version-1.11.2.patch
+	"${FILESDIR}"/${PN}-1.11.1_p20181028-libdir.patch
 )
 
 MULTILIB_CHOST_TOOLS=(
diff --git a/media-libs/tiff/Manifest b/media-libs/tiff/Manifest
index 7b224a1e1872..7b772a886384 100644
--- a/media-libs/tiff/Manifest
+++ b/media-libs/tiff/Manifest
@@ -2,10 +2,6 @@ AUX tiff-4.0.10-CVE-2018-17000-tif_dirwrite-null-dereference.patch 1301 BLAKE2B
 AUX tiff-4.0.10-CVE-2019-14973-fix-integer-overflow.patch 12754 BLAKE2B c2f6c8964b493e1d9965a95dea7463b1052809ec9fa529502f976ebe396195010b5cc132318c68b1e8f34695831006f5764ef7f40f42ead031b9263c83e7d395 SHA512 803dc0dfc139dac9e25163dc4b592a6158dfa076788840cbfd1abba85af6571e15cb7f6444d23abb70c738db835fb7412a9b200b2b3cea9ef5a86f4e2b97f9d0
 AUX tiff-4.0.10-CVE-2019-6128-pal2rgb-leak.patch 1427 BLAKE2B e2c392cd2bfe6f90dc510403d5cc1c383a8ee77e5ce2c1435acdbb9f9bb4c9010e85f19b9f2329f14fb82d0dab4cacdc2e6a5367ff95f940b5535eefd1b24903 SHA512 0a3103dae94b3362da1c5ebf087926ec82bf4e16ba7b5bc13e998fad1e9a970604dd80554f5b0a45d2d4f55a4b6e68dfb180b032f83b4b1335d011e25eb754b5
 AUX tiff-4.0.10-CVE-2019-7663-tiffcpIntegerOverflow.patch 1996 BLAKE2B 1e654cc81d66b050e17a1234016b103332dcfcf03f3d7670d35942efc56fbeff0d66d9b6cc71a059ff6602a7c7cef1a3644ae7ea4ca59e88e9004914bea1be32 SHA512 93d386c62d29715b7e84177c7caaba0a9e284f8b9c730db93cf8fbc76faab2e798c81aab20b1210f0342fa6651e56fcbd07655205957b06bf9236ed0903f00a4
-AUX tiff-4.0.7-pdfium-0006-HeapBufferOverflow-ChopUpSingleUncompressedStrip.patch 930 BLAKE2B 52d77fcdd773ce52232257da2c60f8b90417f102238df2039262e3afa7275908c74817ddd6958e430d7cfcff58d2d04ebd6ddd49f553f0f261883b67f557c599 SHA512 822ccc22304d23b4f50efe1f0fb7890fda8b9edf2075b8add814c0bac0a153fa0ed5d7ee5f47e23799b24f11678c8e0bf9c90ad59c5cc61fd9546b2dca4714a9
-AUX tiff-4.0.7-pdfium-0008-HeapBufferOverflow-ChopUpSingleUncompressedStrip.patch 924 BLAKE2B 03160ce33639620b1deb918d358f559b8bc6296d28530b440d0d770438453c25aecc393b8cfcc582ed2d0ec1decd557a212c91f43f7923c9e94387e235680021 SHA512 43973cc5512eb8fe2e0beab1a98ff0d3bd999ed1adbf7c08c344b3442559cc2cdc99a9f2e9c1bb2bffa4be027945b12b120fa27ec6c8006367932039b8d8dd37
 DIST tiff-4.0.10.tar.gz 2402867 BLAKE2B 0305453f22150c31d00d2de756736f58c49a288e19b2a66bdd01319ce4688742f6eab4009eaf1817125d41f53a23de17eb6265a3ebae458ec24f5dbb3d49764e SHA512 d213e5db09fd56b8977b187c5a756f60d6e3e998be172550c2892dbdb4b2a8e8c750202bc863fe27d0d1c577ab9de1710d15e9f6ed665aadbfd857525a81eea8
-EBUILD tiff-4.0.10-r1.ebuild 2469 BLAKE2B 874a6d3fdb27330736a8ba1a68bcd59b89c25470adcfcc46c8bcc24f579f049082a4ce0c35ba3ad994a833652e7ef1c09e8b093d09c235d45f4235cbb147994d SHA512 f587188f959f6ca380e703c8534222ee6e6479671d990f209663aeafc058b117fefbf2cd6571ef022e485b53782c8c98fdcf3e7c2202ce4a6d06fd5e87f16172
-EBUILD tiff-4.0.10-r2.ebuild 2343 BLAKE2B 8ccd4ca01e86c20d58ab562f4ae9672b2e31586fb12a0296c60e67873cdacca1d14fdb72e02aab03abd59fe9e98763282f1f650a788f313d3dbc5fe6ec551581 SHA512 41f07eea415bd89520633882030192081ae2ea1363b6ad0ed0b23e1f98294a20fd8b433d1c28da6a8495bf71c92924abfd068b9a5439356100ea6ba21cfc30b9
-EBUILD tiff-4.0.10.ebuild 2256 BLAKE2B 1006b6d3e946aabb232e1b17e1d041a4b21d3256863635c44c81771b9a941bd227ca7dbcf265d5e7583b6cbfe06a282e92a6f14da1284cfb3b5519e77ff111fd SHA512 4c1d1da4cd11fc9cf0566cfcf5f764c82abc96cf93736066db7947b0af7ad1368990fbca4a08779ae5a4162110bdedf0614a1276621c01ad664180e9487838b5
+EBUILD tiff-4.0.10-r2.ebuild 2340 BLAKE2B f9a6c9987bb58960077e7e202041ca80b55cf11985e78bb5fec489d3c0554675ba7a5c62fc97d6ea2392e99e9d813340feca3f4b353f22411ce005b7599ec0eb SHA512 fc394130ab882c5a116fde976b1e9a7e35d79198574af18984039220d82c5b3de8d069a9f080d07b72f0efe4733fdaf4b1ddc08fe99fcc96ad0983dd2e18a374
 MISC metadata.xml 565 BLAKE2B 3d487835599974795ba6007439bf1d08756ab1c5dbe191509832b302f3199e4ffc05be64df3e26b4d4a1c11d1292c48cbb59ffa6e412831d16d7415e076f1062 SHA512 289043206dbb512c97e4bb703b32549ac4a77f40e212548b80ea865052b80fed9d4562f9fc94638fda54da9bc3e0c19ba303c027e66e7b75c772aeec91aebe6f
diff --git a/media-libs/tiff/files/tiff-4.0.7-pdfium-0006-HeapBufferOverflow-ChopUpSingleUncompressedStrip.patch b/media-libs/tiff/files/tiff-4.0.7-pdfium-0006-HeapBufferOverflow-ChopUpSingleUncompressedStrip.patch
deleted file mode 100644
index a45ee342f779..000000000000
--- a/media-libs/tiff/files/tiff-4.0.7-pdfium-0006-HeapBufferOverflow-ChopUpSingleUncompressedStrip.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-https://codereview.chromium.org/2284063002
-https://crbug.com/618267
-https://pdfium.googlesource.com/pdfium/+/master/libtiff/
-
-Author: tracy_jiang <tracy_jiang@foxitsoftware.com>
-Date:   Mon Aug 29 13:42:56 2016 -0700
-
-Fix for #618267. Adding a method to determine if multiplication has
-overflow.
-
---- a/libtiff/tif_aux.c
-+++ b/libtiff/tif_aux.c
-@@ -69,7 +69,7 @@ _TIFFCheckRealloc(TIFF* tif, void* buffer,
- 	/*
- 	 * XXX: Check for integer overflow.
- 	 */
--	if (nmemb && elem_size && bytes / elem_size == nmemb)
-+	if (nmemb && elem_size && !_TIFFIfMultiplicationOverflow(nmemb, elem_size))
- 		cp = _TIFFrealloc(buffer, bytes);
- 
- 	if (cp == NULL) {
---- a/libtiff/tiffiop.h
-+++ b/libtiff/tiffiop.h
-@@ -315,6 +315,9 @@ typedef size_t TIFFIOSize_t;
- #define _TIFF_off_t off_t
- #endif
- 
-+#include <limits.h>
-+#define _TIFFIfMultiplicationOverflow(op1, op2) ((op1) > SSIZE_MAX / (op2))
-+
- #if defined(__cplusplus)
- extern "C" {
- #endif
diff --git a/media-libs/tiff/files/tiff-4.0.7-pdfium-0008-HeapBufferOverflow-ChopUpSingleUncompressedStrip.patch b/media-libs/tiff/files/tiff-4.0.7-pdfium-0008-HeapBufferOverflow-ChopUpSingleUncompressedStrip.patch
deleted file mode 100644
index 35f59b9bffd9..000000000000
--- a/media-libs/tiff/files/tiff-4.0.7-pdfium-0008-HeapBufferOverflow-ChopUpSingleUncompressedStrip.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-https://codereview.chromium.org/2405693002
-https://crbug.com/654169
-https://pdfium.googlesource.com/pdfium/+/master/libtiff/
-
-Author: stackexploit <stackexploit@gmail.com>
-Date:   Mon Oct 10 10:58:25 2016 -0700
-
-libtiff: Prevent a buffer overflow in function ChopUpSingleUncompressedStrip.
-
-The patch (https://codereview.chromium.org/2284063002) for Issue 618267
-was insufficient. The integer overflow still could be triggered and could
-lead to heap buffer overflow.
-
-This CL strengthens integer overflow check in function _TIFFCheckRealloc.
-
---- a/libtiff/tif_aux.c
-+++ b/libtiff/tif_aux.c
-@@ -69,7 +69,7 @@ _TIFFCheckRealloc(TIFF* tif, void* buffer,
- 	/*
- 	 * XXX: Check for integer overflow.
- 	 */
--	if (nmemb && elem_size && !_TIFFIfMultiplicationOverflow(nmemb, elem_size))
-+	if (nmemb > 0 && elem_size > 0 && !_TIFFIfMultiplicationOverflow(nmemb, elem_size))
- 		cp = _TIFFrealloc(buffer, bytes);
- 
- 	if (cp == NULL) {
diff --git a/media-libs/tiff/tiff-4.0.10-r1.ebuild b/media-libs/tiff/tiff-4.0.10-r1.ebuild
deleted file mode 100644
index 3a79093c5f7f..000000000000
--- a/media-libs/tiff/tiff-4.0.10-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools libtool multilib-minimal
-
-DESCRIPTION="Tag Image File Format (TIFF) library"
-HOMEPAGE="http://libtiff.maptools.org"
-SRC_URI="https://download.osgeo.org/libtiff/${P}.tar.gz"
-
-LICENSE="libtiff"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+cxx jbig jpeg lzma static-libs test webp zlib zstd"
-
-RDEPEND="
-	jbig? ( >=media-libs/jbigkit-2.1:=[${MULTILIB_USEDEP}] )
-	jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
-	webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-	zstd? ( >=app-arch/zstd-1.3.7-r1:=[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="test? ( jpeg )" #483132
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.0.7-pdfium-0006-HeapBufferOverflow-ChopUpSingleUncompressedStrip.patch
-	"${FILESDIR}"/${PN}-4.0.7-pdfium-0008-HeapBufferOverflow-ChopUpSingleUncompressedStrip.patch
-	"${FILESDIR}"/${PN}-4.0.10-CVE-2018-17000-tif_dirwrite-null-dereference.patch
-	"${FILESDIR}"/${PN}-4.0.10-CVE-2019-6128-pal2rgb-leak.patch
-	"${FILESDIR}"/${PN}-4.0.10-CVE-2019-7663-tiffcpIntegerOverflow.patch
-)
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/tiffconf.h
-)
-
-src_prepare() {
-	default
-
-	# tiffcp-thumbnail.sh fails as thumbnail binary doesn't get built anymore since tiff-4.0.7
-	sed '/tiffcp-thumbnail\.sh/d' -i test/Makefile.am || die
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--without-x
-		--with-docdir="${EPREFIX}"/usr/share/doc/${PF}
-		$(use_enable cxx)
-		$(use_enable jbig)
-		$(use_enable jpeg)
-		$(use_enable lzma)
-		$(use_enable static-libs static)
-		$(use_enable webp)
-		$(use_enable zlib)
-		$(use_enable zstd)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-
-	# remove useless subdirs
-	if ! multilib_is_native_abi ; then
-		sed -i \
-			-e 's/ tools//' \
-			-e 's/ contrib//' \
-			-e 's/ man//' \
-			-e 's/ html//' \
-			Makefile || die
-	fi
-}
-
-multilib_src_test() {
-	if ! multilib_is_native_abi ; then
-		emake -C tools
-	fi
-	emake check
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name '*.la' -delete || die
-	rm "${ED}"/usr/share/doc/${PF}/{COPYRIGHT,README*,RELEASE-DATE,TODO,VERSION} || die
-}
diff --git a/media-libs/tiff/tiff-4.0.10-r2.ebuild b/media-libs/tiff/tiff-4.0.10-r2.ebuild
index 6aceef3241c3..c2da1f35e406 100644
--- a/media-libs/tiff/tiff-4.0.10-r2.ebuild
+++ b/media-libs/tiff/tiff-4.0.10-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.osgeo.org/libtiff/${P}.tar.gz"
 
 LICENSE="libtiff"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~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 ~riscv s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cxx jbig jpeg lzma static-libs test webp zlib zstd"
 
 RDEPEND="
diff --git a/media-libs/tiff/tiff-4.0.10.ebuild b/media-libs/tiff/tiff-4.0.10.ebuild
deleted file mode 100644
index afe7c58676b3..000000000000
--- a/media-libs/tiff/tiff-4.0.10.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools libtool multilib-minimal
-
-DESCRIPTION="Tag Image File Format (TIFF) library"
-HOMEPAGE="http://libtiff.maptools.org"
-SRC_URI="https://download.osgeo.org/libtiff/${P}.tar.gz"
-
-LICENSE="libtiff"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+cxx jbig jpeg lzma static-libs test webp zlib zstd"
-
-RDEPEND="
-	jbig? ( >=media-libs/jbigkit-2.1:=[${MULTILIB_USEDEP}] )
-	jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
-	webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-	zstd? ( >=app-arch/zstd-1.3.7-r1:=[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="test? ( jpeg )" #483132
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.0.7-pdfium-0006-HeapBufferOverflow-ChopUpSingleUncompressedStrip.patch
-	"${FILESDIR}"/${PN}-4.0.7-pdfium-0008-HeapBufferOverflow-ChopUpSingleUncompressedStrip.patch
-)
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/tiffconf.h
-)
-
-src_prepare() {
-	default
-
-	# tiffcp-thumbnail.sh fails as thumbnail binary doesn't get built anymore since tiff-4.0.7
-	sed '/tiffcp-thumbnail\.sh/d' -i test/Makefile.am || die
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--without-x
-		--with-docdir="${EPREFIX}"/usr/share/doc/${PF}
-		$(use_enable cxx)
-		$(use_enable jbig)
-		$(use_enable jpeg)
-		$(use_enable lzma)
-		$(use_enable static-libs static)
-		$(use_enable webp)
-		$(use_enable zlib)
-		$(use_enable zstd)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-
-	# remove useless subdirs
-	if ! multilib_is_native_abi ; then
-		sed -i \
-			-e 's/ tools//' \
-			-e 's/ contrib//' \
-			-e 's/ man//' \
-			-e 's/ html//' \
-			Makefile || die
-	fi
-}
-
-multilib_src_test() {
-	if ! multilib_is_native_abi ; then
-		emake -C tools
-	fi
-	emake check
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name '*.la' -delete || die
-	rm "${ED}"/usr/share/doc/${PF}/{COPYRIGHT,README*,RELEASE-DATE,TODO,VERSION} || die
-}
diff --git a/media-libs/vamp-plugin-sdk/Manifest b/media-libs/vamp-plugin-sdk/Manifest
index ab73a6c25ac9..924874310987 100644
--- a/media-libs/vamp-plugin-sdk/Manifest
+++ b/media-libs/vamp-plugin-sdk/Manifest
@@ -1,3 +1,3 @@
 DIST vamp-plugin-sdk-2.7.1.tar.gz 306956 BLAKE2B d8e765f54cb3544efcca4b08241afc070026adeaa4c0273cc01dae26e0ad60a976bc443184cc83413c6e32f4cf6fbee6590954e7ab12872993abb78c2541653f SHA512 91dd7cae72334718dcbdac06b1ffa3f3ba76e977b82b928ab634d9982aa15ca4e30978a7778215753c61e56831077d7634d24e65e468ab6a8a87a5957fb09bf3
-EBUILD vamp-plugin-sdk-2.7.1.ebuild 1511 BLAKE2B e26bc1b9ce527c5c6379b04eda826f5ea06a0e84b291754f7e55fc67456759dd1d80b56812da0f951e10bc3ce9f297313942b2bc2dafa1699c69eca830e696b5 SHA512 8170a4622e564a57234b2389ce57a7a6d11c5f2cec436ad59078e55d72454cacb6e19b75af3a86a2c642a8b7dc0adfbb12987ac23e4ca86296146ed3dad11d0b
+EBUILD vamp-plugin-sdk-2.7.1.ebuild 1553 BLAKE2B 62df79b925fe276627a82162b38026dec4a67fef48588c628b9bcf00954147c9cf430891464ae5ee3a259ec7065143b07e183b8ed43eb838f2bc0be9bc6b5af5 SHA512 26147c3e06dec88acb9a6fbcbec83f5a92602179ffc3d735ce60c90dbe4669f00ae6d2bd263188577b2334780da7d003869dbb89c3ab2fe267ef49baf9e1a1ef
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.7.1.ebuild b/media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.7.1.ebuild
index 0791dd534036..7351cdb0de32 100644
--- a/media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.7.1.ebuild
+++ b/media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.7.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit toolchain-funcs eutils multilib multilib-minimal
+inherit toolchain-funcs multilib-minimal
 
 DESCRIPTION="Audio processing system for plugins to extract information from audio data"
 HOMEPAGE="https://www.vamp-plugins.org"
@@ -12,44 +12,55 @@ SRC_URI="https://code.soundsoftware.ac.uk/attachments/download/2206/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86"
-IUSE="doc static-libs"
+IUSE="doc"
 
-RDEPEND="media-libs/libsndfile"
-DEPEND="${RDEPEND}
-	media-libs/libsndfile[${MULTILIB_USEDEP}]
-	doc? ( app-doc/doxygen )"
+RDEPEND="media-libs/libsndfile:0=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( app-doc/doxygen )"
 
 src_prepare() {
+	default
 	multilib_copy_sources
 }
 
 multilib_src_configure() {
 	# multilib for default search paths
-	sed -i -e "s:/usr/lib/vamp:${EPREFIX}/usr/$(get_libdir)/vamp:" src/vamp-hostsdk/PluginHostAdapter.cpp || die "sed failed"
+	sed -i -e "s:/usr/lib/vamp:${EPREFIX}/usr/$(get_libdir)/vamp:" \
+		src/vamp-hostsdk/PluginHostAdapter.cpp || die
 	econf
 }
 
 multilib_src_compile() {
-	emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
+	emake \
+		AR="$(tc-getAR)" \
+		RANLIB="$(tc-getRANLIB)"
 
 	if multilib_is_native_abi && use doc; then
-		cd build
+		cd build || die
 		doxygen || die "creating doxygen doc failed"
+		HTML_DOCS=( "${BUILD_DIR}"/build/doc/html/. )
 	fi
 }
 
 multilib_src_install() {
-	emake DESTDIR="${D}" INSTALL_SDK_LIBS="${EPREFIX}/usr/$(get_libdir)" INSTALL_PKGCONFIG="${EPREFIX}/usr/$(get_libdir)/pkgconfig" INSTALL_PLUGINS="${EPREFIX}/usr/$(get_libdir)/vamp" install
-	multilib_is_native_abi && use doc && dohtml -r build/doc/html/*
+	emake \
+		DESTDIR="${D}" \
+		INSTALL_SDK_LIBS="${EPREFIX}"/usr/$(get_libdir) \
+		INSTALL_PKGCONFIG="${EPREFIX}"/usr/$(get_libdir)/pkgconfig \
+		INSTALL_PLUGINS="${EPREFIX}"/usr/$(get_libdir)/vamp \
+		install
 }
 
 multilib_src_install_all() {
-	dodoc README* CHANGELOG
+	einstalldocs
+
+	# don't want static archives, #474768
+	find "${D}" -name '*.a' -delete || die
 }
 
 pkg_postinst() {
-	elog ""
+	elog
 	elog "You might also want to install some Vamp plugins."
 	elog "See media-plugins/vamp-*"
-	elog ""
+	elog
 }
diff --git a/media-libs/vitamtp/Manifest b/media-libs/vitamtp/Manifest
new file mode 100644
index 000000000000..8ac84ebb6b63
--- /dev/null
+++ b/media-libs/vitamtp/Manifest
@@ -0,0 +1,4 @@
+DIST vitamtp-2.5.9_pre20160829.tar.gz 201289 BLAKE2B 1ef7d55afd32ac27cc7f4ce233644ab54d760c906e4073a77b3e0b0d2d5c90289d5bba22d54448effe675e28275068f9c20cd15c7b6223e6d6f42950dd5c6da8 SHA512 fae1c509d30610191e20ed12426118599feb95b7a3aa0e31b43f6c0ac72a3dc9d72407ccb4f14818574c313548f521c35ad0a3264b861b745ec991b5cfda4c97
+EBUILD vitamtp-2.5.9_pre20160829.ebuild 967 BLAKE2B cef74cffdd354a2479727aa860ca60eae417bdb7f9eb068f6737f559a023a2a5eefb0d4c9c715df42d06a66dc33775e1045f63751e8f8bf5f43fe973f7b4525f SHA512 c3fadc97df73049a9ae0c67b91ad3ba328a05f359e3ce294f190b13e9ea16a73ad4d26eedc357e58d1a321bef4d716104c84652d01d6c66e3c1b84298ef73714
+EBUILD vitamtp-9999.ebuild 836 BLAKE2B a8a314cc2d8a72be178f684290fc67e528bdf7f9191a9160a18c5839183c341f85d2becab37a8e8716289d43d4be08d97fdafe7da661968d758d49a73672801e SHA512 7dc9291a8455143897ce721b777e271fc8ef3b421a788c8879da06187a9585a6ea7777d5a7e6f03deed93a2f02b49d2568f80b16034dbef4a06b57510c19e3a9
+MISC metadata.xml 440 BLAKE2B f117271aa70b3ee130fd1591ec0b56b6d26b1afa9acfb36eacea9b2614847b254b45edc4fc47b0dcdc6c8a3e8841bc25cca211495e7be2171ef380cbf9067420 SHA512 366c6d1eb6db3ea47bea67d2dd6a3494909a03adfc4bebb5a38e8a2f1f2c2fecfb786a114ef8429fde613199886554af6a3d47febd542d376013ce8ec36b87ac
diff --git a/media-libs/vitamtp/metadata.xml b/media-libs/vitamtp/metadata.xml
new file mode 100644
index 000000000000..d0e6873b4866
--- /dev/null
+++ b/media-libs/vitamtp/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mva@gentoo.org</email>
+		<name>Vadim Misbakh-Soloviov</name>
+	</maintainer>
+	<longdescription lang="en">
+		Library to interact with PS Vita's USB MTP protocol.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">codestation/vitamtp</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-libs/vitamtp/vitamtp-2.5.9_pre20160829.ebuild b/media-libs/vitamtp/vitamtp-2.5.9_pre20160829.ebuild
new file mode 100644
index 000000000000..daed23602791
--- /dev/null
+++ b/media-libs/vitamtp/vitamtp-2.5.9_pre20160829.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools vcs-snapshot
+
+GIT_COMMIT="7ab537a4f45e34984cbeb9cf1b1af543a75a3dc0"
+
+DESCRIPTION="Library to interact with PS Vita's USB MTP protocol"
+HOMEPAGE="https://github.com/codestation/vitamtp"
+SRC_URI="https://github.com/codestation/${PN}/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+DEPEND="
+	virtual/libusb:1
+	dev-libs/libxml2
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	rm ChangeLog || die "Failed to rm changelog" # Triggers QA warn (symlink to nowhere)
+
+	sed -r \
+		-e 's@vitamtp@usb@' \
+		-i debian/libvitamtp5.udev
+	# ^ ease console management for users
+	# (we don't really need extra group for this)
+
+	default
+	eautoreconf
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -type f -delete || die
+	insinto /lib/udev/rules.d
+	newins debian/libvitamtp5.udev 10-vitamtp.rules
+}
diff --git a/media-libs/vitamtp/vitamtp-9999.ebuild b/media-libs/vitamtp/vitamtp-9999.ebuild
new file mode 100644
index 000000000000..03249b880bcf
--- /dev/null
+++ b/media-libs/vitamtp/vitamtp-9999.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools git-r3
+
+DESCRIPTION="Library to interact with PS Vita's USB MTP protocol"
+HOMEPAGE="https://github.com/codestation/vitamtp"
+LICENSE="GPL-3"
+SLOT="0"
+EGIT_REPO_URI="https://github.com/codestation/vitamtp"
+
+DEPEND="
+	virtual/libusb:1
+	dev-libs/libxml2:2
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	rm ChangeLog || die "Failed to rm changelog" # Triggers QA warn (symlink to nowhere)
+
+	sed -r \
+		-e 's@vitamtp@usb@' \
+		-i debian/libvitamtp5.udev
+	# ^ ease console management for users
+	# (we don't really need extra group for this)
+
+	default
+	eautoreconf
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -type f -delete || die
+	insinto /lib/udev/rules.d
+	newins debian/libvitamtp5.udev 10-vitamtp.rules
+}
diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index ca612b056441..657b063c9219 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -1,4 +1,6 @@
 DIST vulkan-layers-1.1.106.tar.gz 1151285 BLAKE2B 763654d76c0c9d139ab922b2319df8becef5357c140ade3ba5d99cdbf6c7440b156048970202c2735bed4cb7de213d6647e492fa608023c91cf94a4b0353b4b9 SHA512 caf2c54c89aee2760747fc03f6d3e7742687f86aed5f05e1e8beffac35b114fd61af761bf95593f7cbdb3f9dbc92f570916af1225c7cdce3c16ba81024dc2027
+DIST vulkan-layers-1.1.125.tar.gz 1763589 BLAKE2B e6db1c8b2469afcc9565a55e3977443952cf8a176b6b2b2f5747fbfdb887074e014138b4626f58ddb5c24f87260af32c0c589aef237366aee5acfd3b31ad06ee SHA512 07fcfa9737711671a1a537285f69b63b1a14cf9201dcc169fbe99e19febe612ba8a1e7b448d18bfd01a35d90fb99a261ada0ae9b8facb36d04079bcf3c5c72e0
 EBUILD vulkan-layers-1.1.106.ebuild 1408 BLAKE2B deba604fcd8171d7ea1b27f496bab561659073d3405e655561570ff11d74a92b091a8eb78b19eb8335b5a32cb2466f609b0750c873ed981afac71245aa866a82 SHA512 ffb87f7a8a1843b60b28218ad413d51e9673a5d659ce9e6eb5c1b197d7a395b991561d109ba62413b9188b902e61503080095c0251b749289d02aaece92abd7e
-EBUILD vulkan-layers-9999.ebuild 1410 BLAKE2B 79c5abc89ee6e21e80d89ddc58d1bba03f233a381802b06096dea9997f4eaa262e1545da91c696e840409f1ae2cefc106a1cf7994e6905e9e64e785d541be573 SHA512 b44ee188f0bb8af2bb61ad4adabda57e8bd45396346f809d750cb801b1158989a958932bf2e6e8433ddc854d7541d6596767a8fffc3533d77246ae85205c6835
+EBUILD vulkan-layers-1.1.125-r1.ebuild 1424 BLAKE2B c3e78366c44853e84d6347a5f5d89b8e28eecbcbeb0d34caf1776e21a0577d1ab0c7c5126240de22915d3ca60cba5d607d5835078bfbe324af7979f1e1e79a2f SHA512 9148b3e286138839528ef63a13b29c5390a0c614065686e074698d70c138dd80400947b2c92a3368655e659417598afdd990aaa09b0757accc84786cfcab34a3
+EBUILD vulkan-layers-9999.ebuild 1406 BLAKE2B 6027b825492aca21c1262e040b0ea520816cb2de2dcaabb178c6dab2f8d73086e9838ae5d8a1e11618144588b1d5ad0c9ecf17c19ccaa9d9a62c572a9fc667a0 SHA512 9cf301d1901756c4d2c4e97978e87cc4a02df2fe23d464fb08b266596e72bb6f2c43ac0b59d5ff8471b7bc1ba54c7216616950384e0390e646460d97ab3d0224
 MISC metadata.xml 441 BLAKE2B a617b1a3cace9597f2f0511c097a775a07469de769cf02d25fbbe82c7354f4f8356c046966f2e7cd577ebb8cbcef07580caedf5c6a68e88973af26e0e257eb12 SHA512 eafe2376c7a220e3f84a287df232ce249e2e80d45dd4402d5b58ab5c2e7faaa6f2d8afc982f767dff2ae2d05ab2df31611b637820a56061d61aba10ccb07a4f2
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.1.125-r1.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.1.125-r1.ebuild
new file mode 100644
index 000000000000..9814252061d4
--- /dev/null
+++ b/media-libs/vulkan-layers/vulkan-layers-1.1.125-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-ValidationLayers.git"
+	EGIT_SUBMODULES=()
+	inherit git-r3
+else
+	EGIT_COMMIT="237d818e81fbffa073d29d94f53a2cbac4f25b9f"
+	KEYWORDS="~amd64 ~x86"
+	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"
+
+DEPEND="${PYTHON_DEPS}
+		>=dev-util/glslang-7.12.3353_pre20191027-r1:=[${MULTILIB_USEDEP}]
+		~dev-util/spirv-tools-2019.10_pre20191027:=[${MULTILIB_USEDEP}]
+		>=dev-util/vulkan-headers-1.1.125
+		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_WSI_WAYLAND_SUPPORT=$(usex wayland)
+		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
+		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
+		-DBUILD_TESTS=False
+		-DGLSLANG_INSTALL_DIR="/usr"
+		-DCMAKE_INSTALL_INCLUDEDIR="/usr/include/vulkan/"
+	)
+	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 0858c0d8f899..787e1d87acf1 100644
--- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6,7} )
 
 if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-ValidationLayers.git"
 	EGIT_SUBMODULES=()
 	inherit git-r3
 else
-	EGIT_COMMIT="89bbac497742d48c3d483f78b1bba99101784746"
+	EGIT_COMMIT="237d818e81fbffa073d29d94f53a2cbac4f25b9f"
 	KEYWORDS="~amd64 ~x86"
 	SRC_URI="https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/Vulkan-ValidationLayers-${EGIT_COMMIT}"
@@ -25,9 +25,9 @@ SLOT="0"
 IUSE="X wayland"
 
 DEPEND="${PYTHON_DEPS}
-		>=dev-util/glslang-7.11.3114_pre20190415:=[${MULTILIB_USEDEP}]
-		>=dev-util/spirv-tools-2019.1-r1:=[${MULTILIB_USEDEP}]
-		>=dev-util/vulkan-headers-1.1.106
+		>=dev-util/glslang-7.12.3353_pre20191027:=[${MULTILIB_USEDEP}]
+		~dev-util/spirv-tools-9999:=[${MULTILIB_USEDEP}]
+		>=dev-util/vulkan-headers-1.1.125
 		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 bd14e328d009..d77a29a68a98 100644
--- a/media-libs/vulkan-loader/Manifest
+++ b/media-libs/vulkan-loader/Manifest
@@ -1,4 +1,6 @@
 DIST vulkan-loader-1.1.114.tar.gz 1343624 BLAKE2B 1212c837d86f29160b19bbc14a82564d57722d0d8b540e9360af0a470db59d8c5ad76a1f9f5f892a09b7f43ae62792262b1713c8cabace087c37c2cbb103215b SHA512 90fe8fa7b0a0028faaf8e3aea0724799eb57989a0297e416b3b651a81e0de99b0506eb6b17f84bfc1a6ed33edcc806a5b6c1b187d0d49ea0c8d99ae9dcb5338c
+DIST vulkan-loader-1.1.125.tar.gz 1398802 BLAKE2B 7cf1f99f60b4b37bfad12580fc8809012a0540d928366b465a532fbf90e7d87bf42eeeff70b1a46efeadef9c599cad6009b122ed9c5c7298973207f05acc1032 SHA512 40e1e5c16491f0549eae3efc065c375c258b475d81e1c781a756c71ec329f390e2aba55ced5ed2005e938f9d074dffc1692e7e1e330a35f55460cae1606fdf2e
 EBUILD vulkan-loader-1.1.114.ebuild 1544 BLAKE2B 54d59237e53fc6da87c6c1f4acee474354b382cfc3416cb702514d34ea7db1df59329e18fed9f954137610db2b64dff25ea901c3754d83f5e49de266661554b1 SHA512 b3b3dca31fe3b43d1a09312f0590679d026126f3e34d01659ee144d2bad4bcef651ff15b6be824cb731e1c740cc716ec97195094693a2c5e7c927174850449e6
-EBUILD vulkan-loader-9999.ebuild 1541 BLAKE2B 203234a07960cfd576212095173a1ac3e8b94d7db8aa06a16b5e63ca2b35c8c0a21d942bbef73b75ca7337a99a7611e384a41d6d4b365b9b398fbfac55c38458 SHA512 d15c216c8346e7c3efa5864deb8d0a586b9a2b4b5929ce7a34e149cf30e01fc93ce4433b1b8dfaab3032e07cc8716d2d2254ac4708ce215af98783099ecb04bc
+EBUILD vulkan-loader-1.1.125.ebuild 1787 BLAKE2B 3859eeb424f8240a057c8630e172f07152bedc2df69b0282a0fb5521f92dece37e95ba6b3ccc8d99261442bf51f4065071eb09ed478b0a677de4d83cc69f7e3b SHA512 54e9105d0d3c7f09c28e366a3eb05a8ba97b99e03be6f920dfb6e9de94285d849eedb4b210bf0ac265f6a0e98d5b854e0a8816308a5081a57abdfd74c42c3afe
+EBUILD vulkan-loader-9999.ebuild 1787 BLAKE2B 3859eeb424f8240a057c8630e172f07152bedc2df69b0282a0fb5521f92dece37e95ba6b3ccc8d99261442bf51f4065071eb09ed478b0a677de4d83cc69f7e3b SHA512 54e9105d0d3c7f09c28e366a3eb05a8ba97b99e03be6f920dfb6e9de94285d849eedb4b210bf0ac265f6a0e98d5b854e0a8816308a5081a57abdfd74c42c3afe
 MISC metadata.xml 414 BLAKE2B 53100d7021d8350e960e2b087bba612ee99f6ce960b63964aa2ba50b1172f5b9fe13fb9addb069ae74cc03292b92fc88838b41eac1083c8779dcb8e0e480d1dc SHA512 6328c52f607ed4ea3ba31430f63df84e942ea3e6726b5107c8840e3869725bd7407b446d4f905765a0c6d6dd04fda643bd2b5e06681f6ac771bbb4fbc8d4c417
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.1.125.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.1.125.ebuild
new file mode 100644
index 000000000000..2d672fe1761d
--- /dev/null
+++ b/media-libs/vulkan-loader/vulkan-loader-1.1.125.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Loader.git"
+	EGIT_SUBMODULES=()
+	inherit git-r3
+else
+	if [[ -z ${SNAPSHOT_COMMIT} ]]; then
+		MY_PV=v${PV}
+		MY_P=Vulkan-Loader-${PV}
+	else
+		MY_PV=${SNAPSHOT_COMMIT}
+		MY_P=Vulkan-Loader-${SNAPSHOT_COMMIT}
+	fi
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/KhronosGroup/Vulkan-Loader/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}"/${MY_P}
+fi
+
+inherit toolchain-funcs 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-${PV}
+	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
+	X? (
+		x11-libs/libX11:=[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
+	)"
+
+multilib_src_configure() {
+	# Integrated clang assembler doesn't work with x86 - Bug #698164
+	if tc-is-clang && [[ ${ABI} == x86 ]]; then
+		append-cflags -fno-integrated-as
+	fi
+
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=True
+		-DBUILD_TESTS=False
+		-DBUILD_LOADER=True
+		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
+		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
+		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
+		-DVULKAN_HEADERS_INSTALL_DIR="/usr"
+	)
+	cmake-utils_src_configure
+}
+
+multilib_src_install() {
+	keepdir /etc/vulkan/icd.d
+
+	cmake-utils_src_install
+}
+
+pkg_postinst() {
+	einfo "USE=demos has been dropped as per upstream packaging"
+	einfo "vulkaninfo is now available in the dev-util/vulkan-tools package"
+}
diff --git a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
index e1b75cb13198..2d672fe1761d 100644
--- a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
@@ -1,21 +1,27 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6,7} )
 
 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}"
+	if [[ -z ${SNAPSHOT_COMMIT} ]]; then
+		MY_PV=v${PV}
+		MY_P=Vulkan-Loader-${PV}
+	else
+		MY_PV=${SNAPSHOT_COMMIT}
+		MY_P=Vulkan-Loader-${SNAPSHOT_COMMIT}
+	fi
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/KhronosGroup/Vulkan-Loader/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}"/${MY_P}
 fi
 
-inherit python-any-r1 cmake-multilib
+inherit toolchain-funcs python-any-r1 cmake-multilib
 
 DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader"
 HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Loader"
@@ -26,7 +32,7 @@ IUSE="layers wayland X"
 
 PDEPEND="layers? ( media-libs/vulkan-layers:=[${MULTILIB_USEDEP}] )"
 DEPEND="${PYTHON_DEPS}
-	>=dev-util/vulkan-headers-1.1.114
+	>=dev-util/vulkan-headers-${PV}
 	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
 	X? (
 		x11-libs/libX11:=[${MULTILIB_USEDEP}]
@@ -34,6 +40,11 @@ DEPEND="${PYTHON_DEPS}
 	)"
 
 multilib_src_configure() {
+	# Integrated clang assembler doesn't work with x86 - Bug #698164
+	if tc-is-clang && [[ ${ABI} == x86 ]]; then
+		append-cflags -fno-integrated-as
+	fi
+
 	local mycmakeargs=(
 		-DCMAKE_SKIP_RPATH=True
 		-DBUILD_TESTS=False
diff --git a/media-libs/zimg/Manifest b/media-libs/zimg/Manifest
index 594f2326c711..ad28a2c8411d 100644
--- a/media-libs/zimg/Manifest
+++ b/media-libs/zimg/Manifest
@@ -1,4 +1,6 @@
 DIST zimg-2.8.tar.gz 265363 BLAKE2B a8982c64325e0089617136fcd5d6ee429ab861e3b9445b9cc0292bd3bbd3abb5783e94983e3e802fd9e59c2c7089eeea176d1eda4f3a850379cfc4fb36cbc408 SHA512 1e89087a756798a7ae3bfae3bc8244b29ae8ae7f04f53bdf6c4d4de3cb11412dc1eecd95a4a121bb9077437e633f8fbb665522ff8112ade806d9191ea4b5f7bf
-EBUILD zimg-2.8.ebuild 768 BLAKE2B 3d2689c9a337f20018731922a2dfd0ec8b761987c3694c660a72c1f2de954a20889a2e280c203da12fc5c260c4e094108b9d48d7164c3c2bb44af684f26335d9 SHA512 d5fd7567920aa819a0ea21b93b9e2a570c1d0b97d8e81793448fbfe7735919143bf381431f38f87a96d64bb3de9c84c46e58b365e637d5a5cc7044388689a7f7
-EBUILD zimg-9999.ebuild 778 BLAKE2B c272141d31c5e83e6a467c93804a25c78a40bfce9f0ebb57fe4205d049d1cab1216428a012a46f4a05010901236668c6c8441228345acb1cab7102a98b035f77 SHA512 d13477c97f3c807ea8ef7f3aa88d007dc818b851f9affc81ff204e96d07caa5953169b6bcb5f0ffca9466cb9eade87d5cd544ca298faf406173751a817c9d017
+DIST zimg-2.9.2.tar.gz 266049 BLAKE2B 214a6afec061dc7cc7c751f2a57e56951e44b78fea6a0c0dc71235d3dd286fb811303b0a5198ab82165ee78d993caabaf39d7ec17db4c4e5ffca9a3475b49781 SHA512 b688f8e93a2e4549f2c844cd58c6e0714e6494d6fc8c800dc1b0cdf2278fb9925a646fc332350c1b5d77cef2134bf35e18a873c24ea1979c1adce57bfef68ebe
+EBUILD zimg-2.8.ebuild 777 BLAKE2B 4d602fb564c63ce60390c22b32fd528fb15b8bb1da34ba59dab12bde8ce5bed22af81013caa7cf91da5f9de461bb9f5c61b5b9ca2da8f47771a568103873e01b SHA512 3eb6b7514c5c93b611fb7992b0c174e705492a26366bf18b1adf2484ba3580d4fd3515956f51426dcac93e7ceb6bac18b587532c7ae7efa731aff2d610bb76a3
+EBUILD zimg-2.9.2.ebuild 845 BLAKE2B 7610be50c9ae4d842cbed4ba71371bad69a83875f6649d0fabb9ab72affab557a0e078e784096622777101d149bc4771e2ccd9ee7318bd25e31792e96b68809f SHA512 80806f48183a73c0c01c84baeef298f676d00beb03ed1e16ddbb7ec41bbf8ea3bbbd7c57bb52d0a6bdfec725758652c77775a7e84b3b87c58564f53951c019ee
+EBUILD zimg-9999.ebuild 845 BLAKE2B 7610be50c9ae4d842cbed4ba71371bad69a83875f6649d0fabb9ab72affab557a0e078e784096622777101d149bc4771e2ccd9ee7318bd25e31792e96b68809f SHA512 80806f48183a73c0c01c84baeef298f676d00beb03ed1e16ddbb7ec41bbf8ea3bbbd7c57bb52d0a6bdfec725758652c77775a7e84b3b87c58564f53951c019ee
 MISC metadata.xml 311 BLAKE2B 35db707f7a5c1e20c662525b306a018a6cc2a5cfec6e6f316c5d532566e85710d8223f9a7478569e78c476dce30f357986a66ffde04112113c389b6198de59f3 SHA512 a46022cde358c89be1d423501630b15ea56d2012e022ba8e91800d834bae267bff5a79c115e0fcfd632da6b9031d3c68948f1cd83e3f27699895b7de548f95b2
diff --git a/media-libs/zimg/zimg-2.8.ebuild b/media-libs/zimg/zimg-2.8.ebuild
index 5108ffad5122..7207d7463442 100644
--- a/media-libs/zimg/zimg-2.8.ebuild
+++ b/media-libs/zimg/zimg-2.8.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/sekrit-twc/zimg"
 
 LICENSE="WTFPL-2"
 SLOT="0"
-IUSE="static-libs cpu_flags_x86_sse"
+IUSE="cpu_flags_x86_sse"
 
 src_prepare() {
 	default
@@ -27,5 +27,6 @@ src_prepare() {
 
 multilib_src_configure() {
 	ECONF_SOURCE="${S}" econf \
+		--disable-static \
 		$(use_enable cpu_flags_x86_sse x86simd)
 }
diff --git a/media-libs/zimg/zimg-2.9.2.ebuild b/media-libs/zimg/zimg-2.9.2.ebuild
new file mode 100644
index 000000000000..4e92e0eec814
--- /dev/null
+++ b/media-libs/zimg/zimg-2.9.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} = *9999* ]] ; then
+	EGIT_REPO_URI="https://github.com/sekrit-twc/zimg"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/sekrit-twc/zimg/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	S="${WORKDIR}/${PN}-release-${PV}/"
+fi
+inherit autotools multilib-minimal
+
+DESCRIPTION="Scaling, colorspace conversion, and dithering library"
+HOMEPAGE="https://github.com/sekrit-twc/zimg"
+
+LICENSE="WTFPL-2"
+SLOT="0"
+IUSE="cpu_flags_x86_sse debug static-libs"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable debug) \
+		$(use_enable cpu_flags_x86_sse x86simd) \
+		$(use_enable static-libs static)
+}
diff --git a/media-libs/zimg/zimg-9999.ebuild b/media-libs/zimg/zimg-9999.ebuild
index d20d4bf58406..4e92e0eec814 100644
--- a/media-libs/zimg/zimg-9999.ebuild
+++ b/media-libs/zimg/zimg-9999.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/sekrit-twc/zimg"
 
 LICENSE="WTFPL-2"
 SLOT="0"
-IUSE="static-libs cpu_flags_x86_sse"
+IUSE="cpu_flags_x86_sse debug static-libs"
 
 src_prepare() {
 	default
@@ -27,5 +27,7 @@ src_prepare() {
 
 multilib_src_configure() {
 	ECONF_SOURCE="${S}" econf \
-		$(use_enable cpu_flags_x86_sse x86simd)
+		$(use_enable debug) \
+		$(use_enable cpu_flags_x86_sse x86simd) \
+		$(use_enable static-libs static)
 }
author	V3n3RiX <venerix@redcorelinux.org>	2019-11-03 16:06:58 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-11-03 16:06:58 +0000
commit	bd4aeefe33e63f613512604e47bfca7b2187697d (patch)
tree	adb35b5a9a00ee7ea591ab0c987f70167c23b597 /media-libs
parent	48ece6662cbd443015f5a57ae6d8cbdbd69ef37c (diff)