gentoo resync : 11.02.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-02-11 16:09:52 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2018-02-11 16:09:52 +0000
commit: f78108598211053d41752a83e0345441bb9014ae (patch)
tree: dd2fc7ae0a1aea7bda4942ab0c453d1e55284b37 /media-libs
parent: dc45b83b28fb83e9659492066e347b8dc60bc9e3 (diff)
57 files changed, 445 insertions, 1533 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index da23781d28c8..c6509129b5fa 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/bcg729/Manifest b/media-libs/bcg729/Manifest
new file mode 100644
index 000000000000..d906bcec3128
--- /dev/null
+++ b/media-libs/bcg729/Manifest
@@ -0,0 +1,3 @@
+DIST bcg729-1.0.4.tar.gz 115641 BLAKE2B 5240fc10f8c4c32d9c9a6fc527a198fc896a8ff5ea12aa8a692808877582ac25b3fee122799cb7f6cea58db2f07cc07348da36d9f526e62f0bf62d61ef33bcfa SHA512 fdbbd2c9a807ed832ac3976301843bae854368ab281d16f792550bbda921d226fc6003c0a499561529f22eae08bc0d78b8826c2d06c859ab706d999a96967ffb
+EBUILD bcg729-1.0.4.ebuild 615 BLAKE2B 7bc1186e7bc05557d8b449df6bbf5349320edb1e860ce12065ec4322788b4a047aaba81617aabbe095e0473b8eab1ff9ce06ecedd2d1c492694596672d442f0c SHA512 80da4a8184cca876d99114b1858af1af0841d79361134ce8458cf1b2bdb8f266ade4b449c87a6c9f4ce1de42994f24264cfb9fd0749f0e0d5633e7a6602bd8a8
+MISC metadata.xml 213 BLAKE2B be9f4b06d7567b80dc4d16cb47551ef3e825a84f13897115ef207911582b9062e23181c5d7583fbe1a8299e563eefc7cdeee4114d36ab911f685fd27b294d23e SHA512 b2ac78c6617cda0ce08982f7a56bbedd709df884c5ac51b5ae4fdbc36eee2690a177afa507206d8e3914c0e1b80d96291a329164a1883b7c76e5e4eae376b667
diff --git a/media-libs/bcg729/bcg729-1.0.4.ebuild b/media-libs/bcg729/bcg729-1.0.4.ebuild
new file mode 100644
index 000000000000..703eb5fcb662
--- /dev/null
+++ b/media-libs/bcg729/bcg729-1.0.4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools ltprune
+
+DESCRIPTION="encoder and decoder of the ITU G729 Annex A/B speech codec"
+HOMEPAGE="https://github.com/BelledonneCommunications/bcg729"
+SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ia64 ~x86"
+IUSE="static-libs"
+RDEPEND="
+	!media-plugins/mediastreamer-bcg729
+"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
diff --git a/media-libs/bcg729/metadata.xml b/media-libs/bcg729/metadata.xml
new file mode 100644
index 000000000000..e971bf9d9b71
--- /dev/null
+++ b/media-libs/bcg729/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+<email>netmon@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/media-libs/fontconfig-ultimate/Manifest b/media-libs/fontconfig-ultimate/Manifest
index a16965433dc8..677444a5f292 100644
--- a/media-libs/fontconfig-ultimate/Manifest
+++ b/media-libs/fontconfig-ultimate/Manifest
@@ -2,4 +2,4 @@ DIST fontconfig-ultimate-2015.04.tar.gz 455899 BLAKE2B 5b9395da2c9091965ddbd65d5
 DIST fontconfig-ultimate-2015.08.01.tar.gz 1241997 BLAKE2B 291a2cefb793dda5b5d5c826dd720cb9eee311d67a8268554911a4581b6e2bd3389079f4383eb32d350c57f9eb854af04734adaac40e3da134a819c77456c03e SHA512 2c1e8c522c94f6db45c63cde610bd2abf95ae913241ebda275d40cda0c0b62a489047749eaefa78fcf25d802ebad442f32f2bbf5629d4fa8ee0c6dbc9f105de9
 EBUILD fontconfig-ultimate-2015.04.ebuild 3127 BLAKE2B 385beabc5a08cf353b70ab6a5dc4bc56fd9477df102b10cad73a234cb66848df5342d9febfebfd761e17b823a23160b6a2b7fcbeec1a026fa9ad179b1239e598 SHA512 4675d001e27b22c6e47c78d7c5db867eccfa9790b2f4c46c4623b790ef2ff4f7d6e05e9e7fbe43e84c0ae85f37651a7a5b824795e60af04447885ad33cbf07a6
 EBUILD fontconfig-ultimate-2015.08.01.ebuild 3127 BLAKE2B 385beabc5a08cf353b70ab6a5dc4bc56fd9477df102b10cad73a234cb66848df5342d9febfebfd761e17b823a23160b6a2b7fcbeec1a026fa9ad179b1239e598 SHA512 4675d001e27b22c6e47c78d7c5db867eccfa9790b2f4c46c4623b790ef2ff4f7d6e05e9e7fbe43e84c0ae85f37651a7a5b824795e60af04447885ad33cbf07a6
-MISC metadata.xml 648 BLAKE2B 0c3aac398ed4555275da0b9364ff5ff11a0a2f0dcec57ced866f0cc1d0a9d37a2e119d21fe580f7f50a467eb55acfc0f1af364e38e44798f54dacdd6f06bef89 SHA512 87af2bc6684a792381a77eb575e90281f4ee3f6d688cb1c40b312f27bd9c7db106921aad9aed0b9204d1d5c8ca77fb0323fecad618f0b24e46ed424bfb9ad490
+MISC metadata.xml 582 BLAKE2B ece087d6bd0ed8d4e34faf1406b848265e440c5aafff7c23615631a78aa64d077229098a21615be8066e2291eddbae12b3c8a7ec934e55b8322652c0be5b88d8 SHA512 877483040071a375128c1bf42442c63ca971c2d79c1dc447325c8abe42e5de18b26615a7ddceaedb3a1fb1985679a74709bfc17721ebe4e906aad107d2942512
diff --git a/media-libs/fontconfig-ultimate/metadata.xml b/media-libs/fontconfig-ultimate/metadata.xml
index cfbeebe1dd77..111ebab7512a 100644
--- a/media-libs/fontconfig-ultimate/metadata.xml
+++ b/media-libs/fontconfig-ultimate/metadata.xml
@@ -12,7 +12,6 @@
   <maintainer type="person">
     <email>witold.pilat@gmail.com</email>
     <name>Witold Piłat</name>
-    <description>Proxied/co-maintainer. CC on bugs.</description>
   </maintainer>
   <upstream>
     <remote-id type="github">bohoomil/fontconfig-ultimate</remote-id>
diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index 290ab1e83663..e972e9826d8a 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -11,4 +11,4 @@ EBUILD fontconfig-2.11.1-r2.ebuild 4770 BLAKE2B f1cc240f9fd3631a484c33cc078c505d
 EBUILD fontconfig-2.12.4.ebuild 4930 BLAKE2B 40ea1f8710e43736d7da02b1a30df092818cc5ac8d513ec2f09958d0ed6cad7a1446b143279779643229e473b1fadc206387820c8b31755974b5f1d76594ed95 SHA512 46110903d927e176a8346527503431ca66b4a1b08aa3a441e0621ea9c7eec5429b21191c18156c8782013cc0e8dfe7a0ba55acd1d6c9dd92ddee23fe3562d11d
 EBUILD fontconfig-2.12.6.ebuild 5008 BLAKE2B 681b60673d02536732261e444b8f00b8178f43a6408dc2990644152b2d3d9971f2d7cca9c88ce7b5fe1aa356cca6c1f47b6a2425af0668aba1d0bdfbda0b3c08 SHA512 2aef38239990fa98e967696681f68fed5644ff3acb43d14810ee61505907de091491ea53a7b311ca2c28452eac60a1227b3196f15d0d58aa14c86b618980ee1b
 EBUILD fontconfig-2.12.91.ebuild 5009 BLAKE2B 316c388b65625ae9be41c8a79f48dfcd94cfeabf3fa962edd5aa2ed32d3e9489fc420b2dfdb17b061b64536a90651b6698e23957758a31d55ff82e01315f4682 SHA512 c2b552485c90827698bc12a2b32fff0703262d65360e8cabee78dce071b6fca9cbdf8360d2814ceee760d0195fa0ba252442dd7176f8856cd5e77bc0adb274f9
-MISC metadata.xml 729 BLAKE2B 31b153dd3c6706c13959ad9f2c90a627ea4adc18531c4cf60f9459f040ee915286a303936e53b49cc07e1bfaf800c80f38cbd62105aec88c0329e251a4dd3f47 SHA512 1564dd34d88ce11248bfd5ea6b508eafbc30a4e6ff47f3b9076fbc9f900cf8fe4722a2095512bf7bb659e83fc690d4dbc6b82746a8a38e862577dd09ce7b4a7b
+MISC metadata.xml 729 BLAKE2B 3af0a9c7963c02bf886eb9d7522c2f1776b9b241afc05ae8e71f93ed08bfc937061f5ee9402232f317a207db84e4ee0ad0f9b7c8ba4b72b8600ab30c90822197 SHA512 997967959d02a36cf5187ab42649e7fb581331141fb92aa0aeee622a996959553824424837c56ea0a3abd44cc0abc40cca04abe819c0a4261944072f681260bb
diff --git a/media-libs/fontconfig/metadata.xml b/media-libs/fontconfig/metadata.xml
index 799bd650c046..658d3c9dacd9 100644
--- a/media-libs/fontconfig/metadata.xml
+++ b/media-libs/fontconfig/metadata.xml
@@ -2,13 +2,13 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
+	<maintainer type="project">
 		<email>multilib@gentoo.org</email>
 		<name>gx86-multilib project</name>
 		<description>Handling the bugs related to multilib support in the package and related changes.</description>
 	</maintainer>
-	<maintainer type="project">
-		<email>fonts@gentoo.org</email>
-		<name>Fonts</name>
-	</maintainer>
 	<longdescription>Fontconfig is a font configuration and customization library, which does not depend on the X Window System. It is designed to locate fonts within the system and select them according to requirements specified by applications.</longdescription>
 </pkgmetadata>
diff --git a/media-libs/gexiv2/Manifest b/media-libs/gexiv2/Manifest
index 85c6c3f25807..a6715bc13d30 100644
--- a/media-libs/gexiv2/Manifest
+++ b/media-libs/gexiv2/Manifest
@@ -3,7 +3,9 @@ AUX gexiv2-0.10.5-stdexcept.patch 461 BLAKE2B 8e46f805285bc979712be4f97012cc71c6
 DIST gexiv2-0.10.3.tar.xz 244816 BLAKE2B 79177a679c0d10c90a266c023930e27318f2e784e599b8f84a7356534045695e4ca44890b87eb0da4c16673e6e58c3ad77c80e404df2e76662f5a9250fc58e85 SHA512 a258a95e3e9dddc6636430d8a2bc222b6605e5d0d122ea1b951f97568cecd04b2d3cbc522625918faf3b5a3e670b01db81a45c2c5c5d65e6eb4b4f4a2ac69e8f
 DIST gexiv2-0.10.5.tar.xz 591752 BLAKE2B 2fe5beaec7a6c2c9c55e8669c1cd8077cb5636f9b188b1ae64212582a23b514ece68108dbd3d4369417af6901579a28b69beb1a44013b51a3517f7fcf4f3e409 SHA512 350e9db388d0aa1c106f3e5bf8862206977d650be0223229c61c6a3ee20642890fbfd7681a215b9c85c10d0787a00a25bc05a639e19a5f39be27cb6d1bb0fc06
 DIST gexiv2-0.10.6.tar.xz 629872 BLAKE2B 9a0f0b98eb1f19d4642cd0fb692b8ec539d3aa98f5c47f04317466877c404955d86c7fb4b2399fee30191555340fbc7701e19132d707f57d123cb16771507570 SHA512 4b15b33af9266a69babd902d379edefe7afd3d2eef11aa3c144f9ddf9c645b697bae16b8d89f50e9b3da884f1ba32f505e118c5fef5204f5630e3a9c6fee7fca
+DIST gexiv2-0.10.8.tar.xz 634696 BLAKE2B 182cda3bac5b3211e5ef8267628a86cc496c0242f25c5cd94ed9eab81c7460022373f3bb794c976fd0b9a10e49f9ca7109521ac6f99bbe7a4e0306a31db899da SHA512 4c25cf6884495151947a70e62a096f3279223673bece4d4ff02720b2820aaad9e80c8715e02bf46c3f5598f582fdf07b4b3ddabd017d53001245e3381a4cc286
 EBUILD gexiv2-0.10.3.ebuild 1263 BLAKE2B 499afbb8cb30cf2f3a6b536fe378c24bacec6e073e4c66005d8432f845c964a8460bd204ae386c2596da04be2973b8529032c42f288e7194c5d088992beb0dac SHA512 8e482c48e8d590633c518b4bfc50b1d38a6996e5f58af84bb60fe1d72d3dd94ac1fc1b1bf06b2dd508088ade154f903350fd38a3b9460f9c26fcd2616504ab9f
 EBUILD gexiv2-0.10.5-r1.ebuild 1388 BLAKE2B f45b369b735e07a3561856d4fbaa86fec086a02dd24841ed5d4d81a081a5ad4663eac1f2c9ed916b0cf387d3c546c991ae6ba90dc001b67c7a29f07786530130 SHA512 7e8c345bbbab1698c845c2c3f30ec66235cb0b80f32b6841ca186c68f50b8ddaef848bec6c75075b649731063e4315ee726edfe589e118cf930b7dba01a4a451
 EBUILD gexiv2-0.10.6.ebuild 1287 BLAKE2B 105b3830f92130d6a0f80de4d851722578540a2a4203eeaa7ee630d2d84ee9bdf69a08e5aac58571a4f02f0a7141f336d1765b1d63fd07cb33b32e67be8fbbff SHA512 e63a5e7c7928913f8ee1ad51c2a48133fedb6d78e784c02ad21135f657fed85135e290a09a28955e89fc4ed7bba19d54f97e7ec0be84d03661a14b7923c306dd
+EBUILD gexiv2-0.10.8.ebuild 1402 BLAKE2B 9bd3d8681eb074f05890202ec3a29f6e29c7ce8ef93faa075062afff72f893fac913c55af3020bdca8ec00ce77275d23711ecd20baa7d1ec92ffccdb2fa49441 SHA512 f3679506189cf3bb8eab1561212a0ad34a6f4ae77b564cc7e93c3b38dea9ba630bb87dd1fe8b51a51cff4768e4dc17fe1c594b220cc3010e4df7beb28e60b4e9
 MISC metadata.xml 265 BLAKE2B 5e9da641ca1949fb00cecaed654cfc3cad540c14b19043c2032e2c6593d47793d6ad7ee461667575ee51a919890ff1ec63195a43c2a35c8b56c12257668fa2b5 SHA512 65fd64249e8dde8eb2ddcb67c58c05b36b10e51956e2237f60dd3ae50872492f3d5872b64106acb13e453a41960f4f817161be3c8b89e6b9a2367b8f1403ffaf
diff --git a/media-libs/gexiv2/gexiv2-0.10.8.ebuild b/media-libs/gexiv2/gexiv2-0.10.8.ebuild
new file mode 100644
index 000000000000..1ace566e3332
--- /dev/null
+++ b/media-libs/gexiv2/gexiv2-0.10.8.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit autotools eutils multilib python-r1 toolchain-funcs versionator vala xdg-utils
+
+MY_PV=$(get_version_component_range 1-2)
+
+DESCRIPTION="GObject-based wrapper around the Exiv2 library"
+HOMEPAGE="https://wiki.gnome.org/Projects/gexiv2"
+SRC_URI="mirror://gnome/sources/${PN}/${MY_PV}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="introspection python static-libs test vala"
+
+REQUIRED_USE="
+	python? ( introspection ${PYTHON_REQUIRED_USE} )
+	test? ( python )
+	vala? ( introspection )
+"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.26.1:2
+	>=media-gfx/exiv2-0.21:0=
+	introspection? ( dev-libs/gobject-introspection:= )
+	vala? ( $(vala_depend) )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	xdg_environment_reset
+	tc-export CXX
+	use vala && vala_src_prepare
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable introspection) \
+		$(use_enable static-libs static) \
+		$(use_enable vala)
+}
+
+src_install() {
+	emake DESTDIR="${D}" LIB="$(get_libdir)" install
+	dodoc AUTHORS NEWS README THANKS
+
+	if use python ; then
+		python_moduleinto gi/overrides/
+		python_foreach_impl python_domodule GExiv2.py
+	fi
+
+	use static-libs || prune_libtool_files --modules
+}
diff --git a/media-libs/glm/Manifest b/media-libs/glm/Manifest
index f6c147fa5ac4..201db7268e36 100644
--- a/media-libs/glm/Manifest
+++ b/media-libs/glm/Manifest
@@ -6,5 +6,5 @@ DIST glm-0.9.8.5.tar.gz 3756809 BLAKE2B 41abc10e1c41c40ad68b7148a8ccbe9d2f4fc8a8
 EBUILD glm-0.9.6.1.ebuild 524 BLAKE2B 470804896aa3430cb812a7db1adc89c461ed7c2ef1428f63b92c88e6587c0e73f8730d32a454bbc6b63454506a18eabdaacb3a0ccf63dedca833efd3f2b40efe SHA512 c5c46d8dcad501804adbd4b75d852e3df36e93df2f453c862c0b344df5be9a9993dd9c938badb26cad1787ac70a70d33fb1f006d44d6b777f216dc10b4030a4c
 EBUILD glm-0.9.7.6.ebuild 884 BLAKE2B e916a774258380213b4beafd015105cc76592c512d373519d4a67c57d1ac8ceaf199189164270ab78a7d103d59b7c6ac7d60f9d416433cd3d08abf34cd98d660 SHA512 88038c4a32d943061db4879ea6d173b4a8ee8fc9a1574c18f7359ccf106704b70a5f532afc6f68e780ae3f94eebce08e802861b7d240a6ee87d5ba61a1d02ec5
 EBUILD glm-0.9.8.4.ebuild 884 BLAKE2B dff985eff3489d2436afb02b3d3e65f06814e0b78c7690aeac19ec6028b60be37aa3209c8bf8bee0227bd46b9a9928ec959625bbf79e38cbe85ee1b6876c958a SHA512 4404107395ac1389e2c85757eb1c7aa60f75f7c4a4b57fcb9b0de816891d6675df9aa8269dac68008645e535814dda51401e68264741d159ba0602361f177541
-EBUILD glm-0.9.8.5.ebuild 902 BLAKE2B 2330311f439fb6d7f6d24a279926ed79f7332720018ac2995fb13d6008ed3a417cc141925ea3e5e222bba60c68f37c1d9ef507d69ed5a5fcc8972a41355637df SHA512 c685f2175a2543675d5f074d189319a01ad473593cd3ed7ae123aea295471bbd7518a0880c5bb47069d7708767a35dff6b70ee5f07a97efe72091b9b7d49c521
+EBUILD glm-0.9.8.5-r1.ebuild 902 BLAKE2B 2330311f439fb6d7f6d24a279926ed79f7332720018ac2995fb13d6008ed3a417cc141925ea3e5e222bba60c68f37c1d9ef507d69ed5a5fcc8972a41355637df SHA512 c685f2175a2543675d5f074d189319a01ad473593cd3ed7ae123aea295471bbd7518a0880c5bb47069d7708767a35dff6b70ee5f07a97efe72091b9b7d49c521
 MISC metadata.xml 545 BLAKE2B 842701f1a6d1483b75f14aa99f546975b4c7de1a84d36b1e15a882d17662d98d37b491e236da73d9457706b667f0499405b5717af3ccfed73ad0518f34167c72 SHA512 637114ed9721e6d1c8f1d1ce56e9b9c208ca4dfe5f3a0c2b844d90bcdbab8344c00682c9647f7323eec7c485abcd841ef37300a8fe0bc8a5f5c12cfbb1da4971
diff --git a/media-libs/glm/glm-0.9.8.5.ebuild b/media-libs/glm/glm-0.9.8.5-r1.ebuild
index 073f3bee1e27..073f3bee1e27 100644
--- a/media-libs/glm/glm-0.9.8.5.ebuild
+++ b/media-libs/glm/glm-0.9.8.5-r1.ebuild
diff --git a/media-libs/gst-plugins-ugly/Manifest b/media-libs/gst-plugins-ugly/Manifest
index 1368e1ce36a8..035d63ec1aa8 100644
--- a/media-libs/gst-plugins-ugly/Manifest
+++ b/media-libs/gst-plugins-ugly/Manifest
@@ -1,5 +1,7 @@
 DIST gst-plugins-ugly-0.10.19.tar.xz 882452 BLAKE2B df5319481ade22d7acdee6e22ca57a444e104c8540bc4b578cfe7554c79bb4ee33b23a8516940f6504c30d9403c4ced2434e11f3a48548c3721d3d3db2016757 SHA512 16d030998142f698f8ab7dbe55c0c6c8db05ade6b3c007a3aacb5491592e8c60e0a9d62f1a840eab4d57825b1beb9017e3f68f5a90288435216586d67040deda
 DIST gst-plugins-ugly-1.12.3.tar.xz 903784 BLAKE2B f0a9538f8d3c2500470a721a998d385af3611aaa003e1f0f315747f8df1680529c4c0332c5b4130eadfbcbd57d18b7fa1deb794e07cc9b0d8db22b98e27d9cee SHA512 9ca5769c325df3d2d97ba83d785fab08da5119f6d26c4ac4db72853af143477ea8fb7087464a8614b6e59f384463ac01087ee76cec2af8acd80a4dc15e392e34
+DIST gst-plugins-ugly-1.12.4.tar.xz 904592 BLAKE2B 6ec59cea23ba45e705fc3140530576232c758884cc7cdcc293022233f4aeb440918c147563706a7309253dab318190bd6484fe2ac21af4b54af61ede349a1e82 SHA512 920f5be5a060293319f4c45bf7f28e14953e897473a04e1c83bce61261365198a6dc2d7ad6cf5396b2bbdc35a5f77014741e902e67c00c3c6596680ab9924e8a
 EBUILD gst-plugins-ugly-0.10.19-r1.ebuild 1058 BLAKE2B 3e51a96a9cec4e7cb9d5ea36620fc7210b0efdf9fb9d4e88984eb492786c441a6bedf87a91133ec24e014a08bbe161e785cab0415bc6e0844d8a0db5d4be5d69 SHA512 32c32c59686f099e1e5a9c2b75aad193fdcff900734d8dee31129a00cbdf84e219ae86c89bc6e35f4c5fb54532183cbe24683c463ce45e92c26041267e5ee1d1
 EBUILD gst-plugins-ugly-1.12.3.ebuild 963 BLAKE2B 82203025bcece6b6566b2a29bdb2bcd3fc460ac02b9d3be42cdad13aeb62510d1c3739ff72856bec86c7b7bbd6645b365d9528b5cd68cb35965a687f8ab0bdd9 SHA512 ba2965acd379fa1d93681c93317c09ea8db6c48d482d905955b54b1e4d471ffc45c893066dc7633654c2ab52d7447cd44c3394dd78cd5a596d91e2177a004fa7
+EBUILD gst-plugins-ugly-1.12.4.ebuild 971 BLAKE2B 6d4d149d739eb3fd51f0f01ba9df1e7e1f0550749197bc7cef83dd57fb7df91fa93abb183e2245edea91951b4432c3945c8a2af4a12e8613fdcba16c7059ee9f SHA512 738c04f33ec5e9272fdd582fd6035045cbf021e6308a1bf04bd6771e21bc8d08895e124c00207fd33a173aa94f7a862c9c2251c5d9c596a5e20c3d9f7b07d73c
 MISC metadata.xml 345 BLAKE2B c8af39d4811da5ca9cad30110ed9b2a090fd27a957bf32f831b4c3f5a22bb87fcc15957151ce9752521d2a92c667568d8ab002c8f4f9ba3363d9b7ca79655ce8 SHA512 c8c693633f2fdbf66f2308a2ee82880bf0cdd58b0c1e42a2d3b2733b3a7411769da60e8beb375def6473fe50303f1a68a0c7712e48abf88935b045f93103b206
diff --git a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.12.4.ebuild b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.12.4.ebuild
new file mode 100644
index 000000000000..29c9993e647c
--- /dev/null
+++ b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.12.4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE="gst-plugins-ugly"
+
+inherit eutils gstreamer
+
+DESCRIPTION="Basepack of plugins for gstreamer"
+HOMEPAGE="https://gstreamer.freedesktop.org/"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="+orc"
+
+RDEPEND="
+	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
+	>=media-libs/gstreamer-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.12
+"
+
+multilib_src_configure() {
+	gstreamer_multilib_src_configure
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/docs/plugins/html docs/plugins/html || die
+	fi
+
+}
+
+multilib_src_install_all() {
+	DOCS="AUTHORS ChangeLog NEWS README RELEASE"
+	einstalldocs
+	prune_libtool_files --modules
+}
diff --git a/media-libs/jasper/Manifest b/media-libs/jasper/Manifest
index 70921f8a4f9f..443a992ded72 100644
--- a/media-libs/jasper/Manifest
+++ b/media-libs/jasper/Manifest
@@ -1,4 +1,7 @@
+AUX jasper-2.0.14-fix-test-suite.patch 1097 BLAKE2B 050311299ad9e247663b045f87b022d290f30c58595c1f0b163175ef4d755e09aa956a2ec810b2239aeb1a7d9c85eadd3057c9157515e7681e6836389644c4a7 SHA512 667aa54ddd6b76af225b32c9d1cf0bb3f0d8a00c7a83695f12179778d8f08b9c910717ded58f7368384f0d925ae90ac42e91344966d01716d722625b25e90d30
 DIST jasper-2.0.12.tar.gz 1311323 BLAKE2B bc9922bfc4765ea4630f9a504c9e5a1c0992f78c2ef68cd077ba0c8a36332debd5db9fc5c639accc7eaa0eda64e478c1e615da9f2eaf363446635dd94a253fa0 SHA512 a308983511119d85e6580772f5164c188e2e170500fa4b98c8831aa63aa87cb661b88952b278e390497571f9ebf9286855a8aa946037692309ba5f41cffe265a
+DIST jasper-2.0.14.tar.gz 1311825 BLAKE2B 0cd2feb5a73aaa2da6f1d105fefe98f57c6a5ecf92f6449891f49eca0b5926bc683a03bf933b920cad95883134cf292405f244f10b3bbe7867a41f2dde80337e SHA512 6b270cb1eb55f777f30016f3258e5e2297627e7d086334814c308464f5a4552c23241b0fdbc81ea715a6f4746294657f96c1cb6ceb320629ce57db7e81d84940
 EBUILD jasper-2.0.12.ebuild 1807 BLAKE2B 724d504c046501904f8da136be0042665b453f02320574ec807f069b1b6f246b3ec11d53908ab03681f456d10888f35dabcf6c9e771975837336799d773974e9 SHA512 7fd349ca1e0f5f8c3bbded01685dbc8dd699811f98f3d781e32ef42e94c4c3c2c08af9b6b1ef8988e6c4b4b84a4f0c11d647bdb4aca1239b38000efe90fc84e1
+EBUILD jasper-2.0.14.ebuild 1921 BLAKE2B 5246b38b5898402360f4aef7e3d2a286d22e1de9269c27d83f6d9e95b549b4f5654194ab53eeca451848e34fceea741dc1f1c4e32f75c24b3222ad66cf171175 SHA512 bca07a2881fa17d1f883202099b52223111b80e125df30752e09656b6fdfec9ffd0016d52a1b9fcac1ae9a03226c781b8e39c0016e3439f412d5f182baebbbad
 EBUILD jasper-9999.ebuild 1814 BLAKE2B ff6b0d726b1988d0b1fbbf8e737808839f29fbd253c18d9a0c1b2b451b8ff8e7966672d45f04963c5c104dbcf3f2b9656d2c3ecc939b871a4210fd061c1126ab SHA512 3d137d1caac04177169b847a5fc1b8ae3148f8dc215fcfb51881d7a793c6d889ac818f03bf670b97999a461ec4810eb6ec19d1a34a58aa915e4aedb15a00e5f2
 MISC metadata.xml 342 BLAKE2B 4260ac1403a844c48b72bd62c04073de06da73cecca8bbab9fdd7de36b4a462feabee08d933b0098c451691b17aa3ff7d7e3eb25052461381a37198b12225c55 SHA512 a01344f985dc6b7a24ca568fe859f2a593b55df39ba7b711c4db62eb7df5389007cb6c8dd1ab399f70bf8cb221a22681a9eab279ce8ab1ea6b198fa65f1b8a20
diff --git a/media-libs/jasper/files/jasper-2.0.14-fix-test-suite.patch b/media-libs/jasper/files/jasper-2.0.14-fix-test-suite.patch
new file mode 100644
index 000000000000..9af83c67c6f6
--- /dev/null
+++ b/media-libs/jasper/files/jasper-2.0.14-fix-test-suite.patch
@@ -0,0 +1,28 @@
+Disable tests which will require LIBJPEG when Jasper was
+built without LIBJPEG.
+
+Bug: https://bugs.gentoo.org/629898
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -393,12 +393,14 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/test/bin/wrapper.in"
+   "${CMAKE_CURRENT_BINARY_DIR}/test/bin/wrapper" @ONLY)
+ 
+ if (BASH_PROGRAM)
+-	add_test(run_test_1
+-	  "${BASH_PROGRAM}" "${CMAKE_CURRENT_BINARY_DIR}/test/bin/wrapper"
+-	  "${CMAKE_CURRENT_SOURCE_DIR}/test/bin/run_test_1")
+-	add_test(run_test_2
+-	  "${BASH_PROGRAM}" "${CMAKE_CURRENT_BINARY_DIR}/test/bin/wrapper"
+-	  "${CMAKE_CURRENT_SOURCE_DIR}/test/bin/run_test_2")
++	if (JAS_ENABLE_LIBJPEG)
++		add_test(run_test_1
++		  "${BASH_PROGRAM}" "${CMAKE_CURRENT_BINARY_DIR}/test/bin/wrapper"
++		  "${CMAKE_CURRENT_SOURCE_DIR}/test/bin/run_test_1")
++		add_test(run_test_2
++		  "${BASH_PROGRAM}" "${CMAKE_CURRENT_BINARY_DIR}/test/bin/wrapper"
++		  "${CMAKE_CURRENT_SOURCE_DIR}/test/bin/run_test_2")
++	endif()
+ 	add_test(run_test_3
+ 	  "${BASH_PROGRAM}" "${CMAKE_CURRENT_BINARY_DIR}/test/bin/wrapper"
+ 	  "${CMAKE_CURRENT_SOURCE_DIR}/test/bin/run_test_3")
diff --git a/media-libs/jasper/jasper-2.0.14.ebuild b/media-libs/jasper/jasper-2.0.14.ebuild
new file mode 100644
index 000000000000..1639b4bca269
--- /dev/null
+++ b/media-libs/jasper/jasper-2.0.14.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-multilib
+
+DESCRIPTION="Implementation of the codec specified in the JPEG-2000 Part-1 standard"
+HOMEPAGE="https://www.ece.uvic.ca/~mdadams/jasper/"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/mdadams/jasper.git"
+else
+	inherit vcs-snapshot
+	SRC_URI="https://github.com/mdadams/${PN}/archive/version-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+fi
+
+# We limit memory usage to 128 MiB by default, specified in bytes
+: ${JASPER_MEM_LIMIT:=134217728}
+
+LICENSE="JasPer2.0"
+SLOT="0/4"
+IUSE="doc jpeg opengl test"
+
+RDEPEND="
+	jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
+	opengl? (
+		>=virtual/opengl-7.0-r1:0[${MULTILIB_USEDEP}]
+		>=media-libs/freeglut-2.8.1:0[${MULTILIB_USEDEP}]
+		virtual/glu[${MULTILIB_USEDEP}]
+		x11-libs/libXi[${MULTILIB_USEDEP}]
+		x11-libs/libXmu[${MULTILIB_USEDEP}]
+	)"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.0.14-fix-test-suite.patch )
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DALLOW_IN_SOURCE_BUILD=OFF
+		-DBASH_PROGRAM="${EPREFIX}"/bin/bash
+		-DJAS_ENABLE_ASAN=OFF
+		-DJAS_ENABLE_LSAN=OFF
+		-DJAS_ENABLE_MSAN=OFF
+		-DJAS_ENABLE_SHARED=ON
+		-DJAS_ENABLE_STRICT=ON
+		-DJAS_ENABLE_USAN=OFF
+		-DCMAKE_INSTALL_DOCDIR=share/doc/${PF}
+
+		# JPEG
+		-DJAS_ENABLE_LIBJPEG=$(usex jpeg)
+		-DCMAKE_DISABLE_FIND_PACKAGE_JPEG=$(usex !jpeg)
+
+		# OpenGL
+		-DJAS_ENABLE_OPENGL=$(usex opengl)
+		-DCMAKE_DISABLE_FIND_PACKAGE_OpenGL=$(usex !opengl)
+
+		# Doxygen
+		-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=$(multilib_native_usex doc OFF ON)
+
+		#-DJAS_ENABLE_PROGRAMS=$(usex test)
+	)
+	cmake-utils_src_configure
+}
diff --git a/media-libs/libebur128/Manifest b/media-libs/libebur128/Manifest
index 63f29cb3ddc4..a67cdf9b41ae 100644
--- a/media-libs/libebur128/Manifest
+++ b/media-libs/libebur128/Manifest
@@ -14,5 +14,5 @@ EBUILD libebur128-1.0.3.ebuild 1159 BLAKE2B a284d1752c4c0d780c24d8c4ef6a291f824c
 EBUILD libebur128-1.1.0.ebuild 1069 BLAKE2B 44f6662374f5799fe69bc3a301b78b78f30eb02746e08395a5a4f755a1cb460989120981824a3eb9a582488a88d972604648b7a0f8767262951c588a9a8dc491 SHA512 897b218e80356300bcf6494816db7dc487591a21ca35764b34ee7237377b4f9c37b4e3c2eef522ac4469061fc2429db07a016e30ca498b3ffe92763ee85cf5d0
 EBUILD libebur128-1.2.0-r1.ebuild 953 BLAKE2B b25cb6ba208c8db3e762982e16b661e1d4ed82299065be01a59a82dfc1d149b64275290ee630b4cac80ff46173511f3c9cacea8d3f0c1cc8a92d602e16bb6d40 SHA512 a7b1ae3173dd6ce3ced5f947750b4fe223f4d468746f77df471a20753439534269ec3b8b6fc9288cffb80f60d15e84debe165a9a3f8fb7d631d3ce4e7e73889b
 EBUILD libebur128-1.2.2.ebuild 1042 BLAKE2B 134d30fcf7c5df32823c76d719fd0ee6ed74529c87461fc662110c705ddbb572132d0757ca5b5db8a9e5cbb0cadbff0230213212e1a41a50fb0b12bc4c1266d7 SHA512 306c3e3fc377c252b347a9acc2a3376bc1e7ad152272863dba45b508fb32a1dcb9faf9cbbe3e482cfd174ed4e71cf990499d8b277321d53287be9bdbb74c4d57
-EBUILD libebur128-1.2.3.ebuild 968 BLAKE2B 5810cd8e7c7cfd59f4ea494c2823d7257b1152079275c2209c6e7230e94455bf667215a459c9a2128df4f4bf8709a730ab6043ece6e02d2562cd0314eecb6be4 SHA512 d9912a58b4958829d1ba53f5f61a27ee0d325349e13b966aefbc5a61322fd68e0f21db18c17d165efdd1cb817fdd28ffe6af11d44fffa0218e960f74b597159d
+EBUILD libebur128-1.2.3.ebuild 967 BLAKE2B 750a7b1895b30d4de47821d9dc4a7245293df55c3a78cb03397b2843a7e76dd91db85dd2953c16be811c78347a9cf78840da23c29c4a05556bd400ce61db7f87 SHA512 fb2f4f70264a495e17d8808d062750ab6f0bd5287a6be69aa1e7afa00eb20c47124430f214ce7eab863b3fdcf46f8f32931f6f76e51a840b2ce15821b37d9682
 MISC metadata.xml 752 BLAKE2B fd4288cd3e104741b109ce1bfaa4562ec9258940a3b43d58d6a6427a6ded2a762c56907012811e2fd9de363ba87f3978aed62c0b1c9c79e1f9eac4134d1c6552 SHA512 d0117447e87d367f45438b1b2ebd3f238b8ddf97491d8d742bb0f6609e6da4cb155249f86f95a330545c89b6433badd93ff2d26b55a3417990d63612e26b6218
diff --git a/media-libs/libebur128/libebur128-1.2.3.ebuild b/media-libs/libebur128/libebur128-1.2.3.ebuild
index 78247354eae7..77ae54e811ee 100644
--- a/media-libs/libebur128/libebur128-1.2.3.ebuild
+++ b/media-libs/libebur128/libebur128-1.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/jiixyj/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~x86"
 IUSE="static-libs test"
 
 DEPEND="test? ( app-arch/unzip
diff --git a/media-libs/libextractor/Manifest b/media-libs/libextractor/Manifest
index bf538c016334..1abba2ba1aa7 100644
--- a/media-libs/libextractor/Manifest
+++ b/media-libs/libextractor/Manifest
@@ -5,5 +5,5 @@ AUX libextractor-1.6-CVE-2017-17440.patch 3584 BLAKE2B a50d293c88c95c59d3399a2ca
 DIST libextractor-1.3.tar.gz 7942021 BLAKE2B 76856cd70b1981b95db55b7070d5e82574e8842f49dc3ee7cfc6f35f71b66f7b8e642b82cbbaa8446488ab29ca39c9792e4153f3cd9624dde731b3daefe2e86f SHA512 38ed47e5e5f50ddf216408f698a104900baa3b03cc8a81a14e63afd30b3e3922acda17363d88d9ba1356ebf70287c8a5152ff6933a36ec1042ca0d832218d45d
 DIST libextractor-1.6.tar.gz 8053454 BLAKE2B cf5e9d5fd1bc09e20495810e5a85280916632eb1c5e5c6c68aaf1cbccb8a5970465d3fd6b313e0cfc7e5c262a815996d7bec563c04b04faf7467ddbe987dfb4c SHA512 1e477450d89cc83030100fc9dc11734f39b1ccd1765f8cf4a4938f32253e2e19a48b5337328605451589865142b2d6bf6d7102198115985a1e0da22fca4bc2a8
 EBUILD libextractor-1.3-r1.ebuild 2891 BLAKE2B 3a81d0ea12b6ef517466bd8606e3b79a797ff3c6e74196b46bdc250a186b300e42c41986d660c401fb1dde29eebb671be7223cfc3cc4b431ab4875fdf0c19f4c SHA512 be168b3a46046e3a3186f29523ab82de17e350a77ab4cfb01c70ba4cb89c1fcc13495ad6afbe1e6d6ed43d8c94d4ee9f61f575a2298650f983f76673430e0183
-EBUILD libextractor-1.6.ebuild 2871 BLAKE2B 8e55e69fcc2b2db0f86c4647465cb9db2934f447c63743e1080b916bbb34267dfebc0156dcc298ba3531316af28dc7dd6e8cc5f23f745ff7c5627da114f80949 SHA512 3e22f744bd950817e1a816a020c0439b611ad81b9ea04aa0a48192ad6cb6e92b78aa87c24bc9b53233350d852e237a8e93e64b61f9585e7cfbc800fa24bae618
+EBUILD libextractor-1.6.ebuild 2869 BLAKE2B 4b3f965e184c491a0f5f74dc4195b9e795840f3c411835f830a2d9bf5ec679144d22dc76e88fd8c705ff7020afef0d61ccfd943ef4551129410ce1c5fc46b970 SHA512 08e5a075461c8c8707b49e87336547d65c224d6f02720d6410b2074f8b888973e5898c9c3aa509f8bfca098af95511e0fcde5ac3b0731a26df7ff8951e8ceee4
 MISC metadata.xml 615 BLAKE2B eac56c7364e331eb2a0f0955318cfb0cf7c6fe4a95493899b489f755d18b4c4b1ced0e7f7ea0a7716c996ac7640d04a326cbd2230313e123c4b2de4fefbaccba SHA512 b4a4403dfccc02e61fa15f60a19ed23ce43374cc41d616ebbe385865618ae9392bd663fbdbdf01013f4203de2ee51dcbe1caf0974d720dac1be1f4ea029b4fc0
diff --git a/media-libs/libextractor/libextractor-1.6.ebuild b/media-libs/libextractor/libextractor-1.6.ebuild
index db1013736cfd..d58d7c9b37dd 100644
--- a/media-libs/libextractor/libextractor-1.6.ebuild
+++ b/media-libs/libextractor/libextractor-1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+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"
diff --git a/media-libs/libfreehand/Manifest b/media-libs/libfreehand/Manifest
index 7b2a5ac45568..6fdecde5790b 100644
--- a/media-libs/libfreehand/Manifest
+++ b/media-libs/libfreehand/Manifest
@@ -1,4 +1,4 @@
 DIST libfreehand-0.1.2.tar.xz 516132 BLAKE2B 7c2dc629fd2a84f23dcd721ed6f9d4644e3bf7a160be9ca5ec0f15a72ae63b3cf861f80fafa12ef1f99b02e0fbc1c806bc37c466010a420bb425f4f9e2757928 SHA512 4112a76ac99999801d97d1b282596d631d8496a5bf65778ab26aa06da86637b1e2b630648a67ea01bf3316ecec9f2715546baff27af090b900267c87a011b963
-EBUILD libfreehand-0.1.2.ebuild 1108 BLAKE2B 4399cde62e293eaafd33252a94b7e360b8d5381c57e3570c82252879f1ac62dd464af4b1258f073ccce4ac2944679a774e3aec02a18b4764bba9329b26401407 SHA512 0eeb84eb319579ef7fca948311236ad4ac95fc19a2de17c7505084d50063ee13dede733ff0a1a9e58e7782424d5c12560c904b4787559d486ff8ec5f7bf4deb5
-EBUILD libfreehand-9999.ebuild 1092 BLAKE2B 78a78b69979a1b5eedf307918edd61dc9d7f2bfe347d8a638b40c7a0bfbbe70946e4faa7c646ffaa1d6681922e90e4c6ad53078bfecda74ce74e6f165b6de43f SHA512 d21d085e44c862de43052f1431bd8e730e9d1044f392bd3dec48b69b917867c74b80d681dc0e3d8a51c4d6c04bfa2be501e735de8b04993a3122f7e749e452d0
+EBUILD libfreehand-0.1.2.ebuild 1122 BLAKE2B c4c239359597cd1fe0d889fcb6a30ba2c34815af19c41063f405c4d69026dc9ba455cdb6e5b5d9b16b42448b86f1d47a6e627458041ebf64b400674f3d625b65 SHA512 de63b3369ca097e3067eb36e3494982ee8ee6786384b265f8b7288a8c5b0e5aa3ee1f925abf46edb4c6a632d197cd2908c39b8fb1b612ecc9f09a6fea8bdddfd
+EBUILD libfreehand-9999.ebuild 1106 BLAKE2B d8a55a0a4b7076f90859784c8a91876cf26eb701acf372f73a6fdb38c21795b1a5b5d1fd72328a7a960c3473052cb2097181052b4422a3dd448e90cdc8de57e7 SHA512 7c7c220a032284e46ca6b5b7f92c5cbea3be344d1e9eb0694fae911f96a6d41ab2473cf364cf000cca894cb8d5911277402e9f25a10d8125cf14ff9f5013299d
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/media-libs/libfreehand/libfreehand-0.1.2.ebuild b/media-libs/libfreehand/libfreehand-0.1.2.ebuild
index 2955a7e02a4d..78a1c569ac26 100644
--- a/media-libs/libfreehand/libfreehand-0.1.2.ebuild
+++ b/media-libs/libfreehand/libfreehand-0.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,7 +21,8 @@ RDEPEND="
 	sys-libs/zlib
 "
 DEPEND="${RDEPEND}
-	dev-libs/icu:=
+	dev-libs/boost
+	dev-libs/icu
 	dev-util/gperf
 	media-libs/lcms
 	sys-devel/libtool
diff --git a/media-libs/libfreehand/libfreehand-9999.ebuild b/media-libs/libfreehand/libfreehand-9999.ebuild
index c2a85de892e6..5625e30a8c73 100644
--- a/media-libs/libfreehand/libfreehand-9999.ebuild
+++ b/media-libs/libfreehand/libfreehand-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,7 +21,8 @@ RDEPEND="
 	sys-libs/zlib
 "
 DEPEND="${RDEPEND}
-	dev-libs/icu:=
+	dev-libs/boost
+	dev-libs/icu
 	dev-util/gperf
 	media-libs/lcms
 	sys-devel/libtool
diff --git a/media-libs/libgroove/Manifest b/media-libs/libgroove/Manifest
index 73ba1ae388ed..6679c43a6606 100644
--- a/media-libs/libgroove/Manifest
+++ b/media-libs/libgroove/Manifest
@@ -3,4 +3,4 @@ AUX libgroove-4.3.0_cflags.patch 1872 BLAKE2B 87a696b844394659d29bf586231519064e
 AUX libgroove-4.3.0_sdl2_include_dir.patch 507 BLAKE2B d96df15e5378f8ab7d2f473c0fe05a210959eeb0ec4548bf7b03b3be701cce263d3c5d91c85834b18b2426e1c3de7845abc5eb069e226429a4d7ae67809f156c SHA512 5c9954680369c9e90a5acda70da36a57ea64ce8f44fcb5a0f962636cbf710ddd968c7c7bff18819671b6b89dc68a0b9513b8223ac7ba9bedf8f005b4485272ac
 DIST libgroove-4.3.0.tar.gz 48857 BLAKE2B 40659e84a00245791746c570ba667cb97ba61de2bf9c1e746aaacb02db4ef5d15a00561aed7001f9a9a7b20ad8645f74c12a836b8bd59ebbc1abbda045d558d0 SHA512 30d75a3b1b3efa9b33687bb146648b66f8f4c718551c0db2c24c0259f09cf355a7c7bbac40d60d7a97bbbd7f83401d09464c6ac2b18cdfcd6198220cefc8a705
 EBUILD libgroove-4.3.0-r1.ebuild 1143 BLAKE2B 9e67a84f260ecefc8fdceb4091096a5c31331546c3a1f144de7b6bec87f511a8f45bd4e401830d7045f02012b7e4e080a3a572f16a2bcbf4442a269851919936 SHA512 5e233c525b3edc2d3eddfce680117a669d3a5352c4d633503a70c91012f8eaa15b4df6c0ce91e4d248a3d3b8ba99e246d5c87f3d8031fd1a8c7a0ffb3ebea349
-MISC metadata.xml 1201 BLAKE2B f021422953a3948a5ae18075d85bdc9b7c11ad6a4f045b9c2bacdd5155a9624e105cbeac359ac2ec2d46306e10f45d024f6099c8b89269b6b3f9684342158973 SHA512 e1bd4fdaeb9c023eb75fcd90751ab28a92c083046fd4f1258db9588d5dbc46696b718db7ba2e754a276440438995c99f8d566b64d3600415e1691d02cb58650c
+MISC metadata.xml 1135 BLAKE2B 9dd3c2b193626f4962c2e42016971ce4957c8a870fa0a1452fb153d8de5ff4fe5c1cc131a6f277cbcf78cd89367a7ffb9ee41a1f47d689b8c8e3ce39b619cf98 SHA512 bcc655913cb4929aa53f82a1296e86f43138407cee6a17af58e9c7869d498fa94029c7402f981d0b3301bf935f6940fd515a443f4ef5e97bc5f0ef15e8ad4a78
diff --git a/media-libs/libgroove/metadata.xml b/media-libs/libgroove/metadata.xml
index 7ee925645b2a..2d8c712dd3d1 100644
--- a/media-libs/libgroove/metadata.xml
+++ b/media-libs/libgroove/metadata.xml
@@ -4,7 +4,6 @@
 <maintainer type="person">
 	<email>sir.suriv@gmail.com</email>
 	<name>Diogo Pereira</name>
-	<description>Proxy maintainer. Assign bugs to him.</description>
 </maintainer>
 <maintainer type="project">
 	<email>proxy-maint@gentoo.org</email>
diff --git a/media-libs/libopenraw/Manifest b/media-libs/libopenraw/Manifest
index 562eecbda2ed..68a5c2871ec8 100644
--- a/media-libs/libopenraw/Manifest
+++ b/media-libs/libopenraw/Manifest
@@ -4,8 +4,8 @@ DIST libopenraw-0.0.9.tar.bz2 478687 BLAKE2B d51410aa2a4ce297c660f80f99c912374fa
 DIST libopenraw-0.1.0.tar.bz2 525449 BLAKE2B b2ad6cbeb13bb2ece2c782e404c8ad75a3e0906a6ae7c6dfeee706c0b6adf1df7f0e094c6da129405f06837bfb61ec0d9ca0c4492fa1c876e661a646e46c5d70 SHA512 f3b867d831d03350e487a98f08cadf6a24d5e4296129a401c0066cfdf0e628663e821ed0b7e42613d1533513a9c36a1693d6c3cbbd918246dbdfbb111b5a470a
 DIST libopenraw-0.1.1.tar.bz2 561718 BLAKE2B 90ddf5f3d195954418291251aee52d04c7bb4011c8ed20599c5149c056a41f55df8022ed88d9da97aa4884da4114ee7bcc9226c85a5cda0194d42bc99056503c SHA512 ac8195fddc165d32337f518cc89297b91a8c2805132e380a261e9855f88ecbe074d6090f1f7b547c18fd2016b313a19e04e0428f9ba85b18928115b9dc0c1bc2
 DIST libopenraw-0.1.2.tar.bz2 563981 BLAKE2B 60332274c72602e5b3eea3e41dfee8c62303a2f09028df4a637cea6f07391d912f354752cb6f354e06dd9e223dfabe5dbed1d50e0f325d85be42fb5012ecede6 SHA512 edd7e5a71feecbce1d5a20622bd3c7111acd2d4792038fd19920367ebb55d2cc7614627b9739512bbe34d6b5ae2eb65a4da9cee70c400b5cb846bf5fff08efc8
-EBUILD libopenraw-0.0.9.ebuild 1170 BLAKE2B 35efa92d7c0d355d08df75448e491abb8b93ac437ead9128c396757f849ce89b624e9b3c3563bde8dd60cb63b170c07bc5d9b337419dd92f4d36f16ee9c1e827 SHA512 a93aeb33eaa9568f8d8b1451fcba4492c66a29380e28a09653e535ca870856b432524405bffec6b0bdb007503bfded6b4e931bfeed1fe56675c60bae6f819785
+EBUILD libopenraw-0.0.9.ebuild 1169 BLAKE2B 6548945f67fed5f9ed96341a1e6f37af9d3e61655a95f23dbe5fdc68fa35c92e913e2e5cb51c744e1ca8dccc7efed3e7cd7776f65e58056349f67fa8854fc755 SHA512 8ed478f8438c0d278b40aaed32831e0b70a591ff426d48fd82015838f1a3cb1bea5cc153d85c36d81d3605069e11812487821a9afb084c36b3f3c41235adc03d
 EBUILD libopenraw-0.1.0.ebuild 1221 BLAKE2B fcdbbbff7ac8fef777a9366ff255f36296fbcd86d2750d581bec1b5fddf3af0da45628591b6afc849d09893f774b69e4ddd1d415f898ea196ff66abb6732584b SHA512 a2b73e4e3d407bd4e06e8e077027109ad395e9720dc8b8f49e957b68cde7139a274fda5e98be5a5ecfdef19f5f569b3412a443e64363053cada2c22799d1e986
 EBUILD libopenraw-0.1.1.ebuild 1113 BLAKE2B f307eb191171c2dc977c7f87c57396470d4b6951406fb9cbb3c244395503865e67f74e1d577491878732de43a4e8789cb6b436da07b104ef0c5a7d528abbee61 SHA512 92c0ea3a04232eba0f796bc94ffb2f76d47a26b0f18f0571bd85625c0dc8a64078cb203d20fb8116258bfd9e16dc6349f5c31737453ec23ad888e6168a006af6
-EBUILD libopenraw-0.1.2.ebuild 1113 BLAKE2B f307eb191171c2dc977c7f87c57396470d4b6951406fb9cbb3c244395503865e67f74e1d577491878732de43a4e8789cb6b436da07b104ef0c5a7d528abbee61 SHA512 92c0ea3a04232eba0f796bc94ffb2f76d47a26b0f18f0571bd85625c0dc8a64078cb203d20fb8116258bfd9e16dc6349f5c31737453ec23ad888e6168a006af6
+EBUILD libopenraw-0.1.2.ebuild 1112 BLAKE2B 529912efa1a990147cf2b8756375a51cc962852342f50f34e9243562f17de88c479dc674a8f09141e7624534647fb08cf88de71c1dc4ef87e4815554f79f3a0f SHA512 c72b8e3823781b0dc818da24181570d2bc71efdd29e0e9040abd726ea806f02d1e058364599e5fc0129b0627b2732e6f7e3bec906c47a7b6ea6e9927eb2f07de
 MISC metadata.xml 224 BLAKE2B 50a08713f8b792454787823dd56f1dcc1a1970ded78fa6ddffc6fb7301e0de75018e1e7a8c7ed890b4910f2716d2588ad21c7ae88ad8013b51cab7ba401c46c9 SHA512 12da46d8052565f62c482e6bcc714d8c00cac256f85dc1602579c8d61e0b61af95da149d1a446e56b2eba918ab9d78b556f77c6fe034a2e578f57a9dbe62fc44
diff --git a/media-libs/libopenraw/libopenraw-0.0.9.ebuild b/media-libs/libopenraw/libopenraw-0.0.9.ebuild
index 8a3b8e0888c5..ca34be7debba 100644
--- a/media-libs/libopenraw/libopenraw-0.0.9.ebuild
+++ b/media-libs/libopenraw/libopenraw-0.0.9.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://${PN}.freedesktop.org/download/${P}.tar.bz2"
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE="gtk static-libs test"
 
 RDEPEND="virtual/jpeg:0
diff --git a/media-libs/libopenraw/libopenraw-0.1.2.ebuild b/media-libs/libopenraw/libopenraw-0.1.2.ebuild
index 8e68d515706c..9d86a2868956 100644
--- a/media-libs/libopenraw/libopenraw-0.1.2.ebuild
+++ b/media-libs/libopenraw/libopenraw-0.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="https://${PN}.freedesktop.org/download/${P}.tar.bz2"
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0/7"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE="gtk static-libs test"
 
 RDEPEND="
diff --git a/media-libs/libopenshot-audio/Manifest b/media-libs/libopenshot-audio/Manifest
index ea270be29b83..89cb997ebf98 100644
--- a/media-libs/libopenshot-audio/Manifest
+++ b/media-libs/libopenshot-audio/Manifest
@@ -2,5 +2,5 @@ AUX libopenshot-audio-0.1.4-fix-under-linking.patch 642 BLAKE2B d4ff9256d49efb3b
 DIST libopenshot-audio-0.1.2.tar.gz 2964758 BLAKE2B a8407bcb14a24195e48adae0e575a2cabc6e864a4e9a439966e7c6af55549a220f8c4536e642e7dcf2ed76f7c9f204ce42607b861bc7adde6f78b99cd18aa23c SHA512 955f9c20ebf06474702208845fe49d031e29b0614fd15c0e1784c52d1c406fb7a980940bba1f297543305a9611fefd6b9232328cd39c5edbc8908018c5b12f1c
 DIST libopenshot-audio-0.1.4.tar.gz 2959997 BLAKE2B 0736d9f4877f46ac90fd236cbdcfce8c1f66f5ac5d5e9762672a4eaeb668eb61a5f1e45996f0feea604d2c30891198fa58fc89f360815336ea18311d019fed2c SHA512 5605164a8c66c33ac893cc2b42cdacffff03eb156a61740c1b2c00dd7e7602a802fa1dc3795c620810e3ee29a290aa6bae8b62bc17eab3f4dd2d8052e0481824
 EBUILD libopenshot-audio-0.1.2-r1.ebuild 768 BLAKE2B 1c62ffbf7edec59fa17454cd543d146b4e2a91f91b08825745089e71cb9350713b5716aceda65b13a100cf2278d98f573e813bae9216fbd835959ed84e6f387a SHA512 b8b66c01a8194e7846bce3c3b7518160abee23d518ce842b0b7a64185837f7a73d3cf556360d11f533a383d68918c31c384e22405d0f9244da5a3ef2cd1a59f9
-EBUILD libopenshot-audio-0.1.4.ebuild 665 BLAKE2B af46925eb87e0d86a8d76f70e8a7c87dbfa23231d5753f23a3560aa7e9f53c96df5820ff660f091860517c7cf0899a7cfde5ffd0e5debbe12cc66a828d5df03d SHA512 067866c48d3ac152946ca600d229ae7a619f41f310f0fff7bb78ff2dd49ab0ad507c44d23e42e8295ba654003a3dabb254e4e6b23286856ec3b494422507eb22
+EBUILD libopenshot-audio-0.1.4.ebuild 664 BLAKE2B ae8bc5afc6899c7d990d9ac58e79d844f59f90d6bd74219d4b1a52326302e3b82a04d1679635a6965bb5f1fd1ec659664e7daa408a0b184bb83fc202faa16248 SHA512 074236fb99029f9ad9e197ca554f5eb28283c680970bb514a5d2452bb8757ab7ad8b2525101d9d7f76e5fb0e80f3755b19c62303e2f69f3804ece9e5583683a7
 MISC metadata.xml 386 BLAKE2B 152c514030a3927ea9779da2cccb6ab74a68aa6f8dbc01cf05dc0ed521d9afaa04783cc7a0c877154a57431da71eb64886ac9c2030eba905de29c32fba58d86e SHA512 65064e6f488f977b5dd7f16ee9b58c43a5ea0aa15193dbfe79f145e0da8f145d4ff8e0968524c2c6962311ee10d8e4ccd157f5710a00a922b3e1c42dfedc8491
diff --git a/media-libs/libopenshot-audio/libopenshot-audio-0.1.4.ebuild b/media-libs/libopenshot-audio/libopenshot-audio-0.1.4.ebuild
index 70287194f6e6..fc0d8bdf5087 100644
--- a/media-libs/libopenshot-audio/libopenshot-audio-0.1.4.ebuild
+++ b/media-libs/libopenshot-audio/libopenshot-audio-0.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/OpenShot/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	media-libs/alsa-lib
diff --git a/media-libs/libopenshot/Manifest b/media-libs/libopenshot/Manifest
index 28f3bdfb91ab..514b42e2d353 100644
--- a/media-libs/libopenshot/Manifest
+++ b/media-libs/libopenshot/Manifest
@@ -5,5 +5,5 @@ DIST libopenshot-0.1.7.tar.gz 11022594 BLAKE2B f3e0836ebb6dd89ce42085dc9d18dd3bc
 DIST libopenshot-0.1.8.tar.gz 11019495 BLAKE2B a86994a09328e24705fe06ec3c47cbedb89815e6ec1440237dc58babfc066655f1c7dacc19257b02b645a9415c63cd4e0c1191fa452b7632cf531d98a1b073c3 SHA512 02630d7ce9fd378ad648d034622d4f971728a2074691d7facc8a36dcd52b87c1372dd5a9588c0ba852589105bdbf78941083fd6b1eb1bcc0a33d4ca49634162c
 EBUILD libopenshot-0.1.3.ebuild 2138 BLAKE2B 97297a5c170ad398c4c9df91ba503493f2c335beadf2414595fa29f2bba80e4ab9e229d7b0bb71271e8ed52b5ecccecb9a49d3c326b22baba82baa38193667fa SHA512 7b6b6ae56d2a89d4fc899a989ae567f91269566e8c979a1763a351bd149747d2e45b93b5ef6b429cef9d57eb09830883d6b45e552d8b479e3f9f692b98ccf73c
 EBUILD libopenshot-0.1.7.ebuild 2139 BLAKE2B 1a68511d4bcfe9d0ee5d55a7ebec2ddc36c7ff6d43e527cfc256ad6af6bd5e26203a7de738d797de17fbea0245f67b104a5360b550fd945d24e7930eef5ba48a SHA512 2d6b2ff9d9818b2b59cb55411ab430fe0bb6b56a03bbfbe671f7dc6455ef787807677545534a3c601ce38a18d0cee46ee8a8bc951c0734f5e75dfc3bf9f40a3d
-EBUILD libopenshot-0.1.8.ebuild 2186 BLAKE2B 02e2d504e1aa72f028277496ba1072e2618e9e978034e0d5494c2b71f2e8e448f0b5ab993c4777b6f3ff9fa175ca32ce4f3c48825f765f57a61b4e2ef87eeca1 SHA512 2407d38331aefe2d1f6a38063af64c955d6fa3db3a8305cb66e8f7ae1b18259a8e6216db3d4bca5576c37d58c9d490c2e1f1de6ad787f9a8aef0c337fe191b6a
+EBUILD libopenshot-0.1.8.ebuild 2185 BLAKE2B 34b9556926c8f76c570a470b34dd66d2e722e712a557536b6d7c01a45493eb5e0401962d03ebb9a4633e232330d3c621ba42718fd968f58d2ce755e76bb42f98 SHA512 1c0d40239e19214ac3a0162f75e07180aebb94bf79da82e6f3752a2d5a9cf794a4babeab17fdd2160899a2a60bf46d36292b3f305502238a954adf4872fcdae5
 MISC metadata.xml 374 BLAKE2B cc763fd4cda8c70fc654d85ebaa8a3b748499308a4633c6f70aeef1cbb767f5b5eaad0f6c4402a74862e8ebe392b6862722835e92cb53ef4b88a9cc87b2315db SHA512 2a1810910f38b67624eea2d8778c095bbe884cf8a06ababaf595a295d8fbb904e13a809ccc888b8d5956e87a2ddf1295982133741596a08e713f9cbb6a6347ba
diff --git a/media-libs/libopenshot/libopenshot-0.1.8.ebuild b/media-libs/libopenshot/libopenshot-0.1.8.ebuild
index 1a47168871bf..91aa0166e29d 100644
--- a/media-libs/libopenshot/libopenshot-0.1.8.ebuild
+++ b/media-libs/libopenshot/libopenshot-0.1.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/OpenShot/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+imagemagick libav +python test"
 # https://github.com/OpenShot/libopenshot/issues/43
 RESTRICT="test"
diff --git a/media-libs/libvpx/Manifest b/media-libs/libvpx/Manifest
index 6ccbef71a05a..45112e33ed31 100644
--- a/media-libs/libvpx/Manifest
+++ b/media-libs/libvpx/Manifest
@@ -2,10 +2,13 @@ AUX libvpx-1.3.0-sparc-configure.patch 406 BLAKE2B 02b1f0484a9659fdc90eb567db517
 DIST libvpx-1.5.0.tar.bz2 1906571 BLAKE2B 1e4e2d7ac6ae046d733361d644a9c36b84f03353fd55bc938b064bcba565d943affa6866df4e9c23b3a1120bf34ad660932bad8c9d8e480d42cdf96b4b937d49 SHA512 5a952aa53e539a130d316723d424fa02a8f42a450950d74a16d8abc5df569ba5559b3b09a32140b638d7a0cd54be1c7b0f8306ad286825bc1281f513bb665fc5
 DIST libvpx-1.6.0.tar.bz2 1943026 BLAKE2B 1fbea27d73b2120ed807108b8ba09c4118e2d8381fdcbbf8661c5fd664e6272d6c14b73c7b8317b97fa51b212d3ea2429819e0e17adf6afcb8d0f5fb6dd9a68a SHA512 dd753372a156bbf7ceb4090276e5fb32b4c8581c93925dded93efee74153b5eb24ee8c3d8ee6339a6878482f0ecf178a2befeeb36e17eada6c440b48c60e9162
 DIST libvpx-1.6.1.tar.bz2 1959534 BLAKE2B 67f73ffd2569bde46db98e7fcb36f7b37d33927fad8c3916ebe1810e63e7aae963bd39ba1f399be079ea4c9f52736f98a603c810f9412643a91166dfb09ed895 SHA512 1a4b009fe1737715c6563a79848126a5859394a5074b1e9cca9bc2e213df90890c15e708040d5f2c96c7c21e268f51e1352ac6911514bf891a4bf3eea154159d
+DIST libvpx-1.7.0.tar.gz 2679797 BLAKE2B de7992adb517e375c5be2a9facf2b4a73174adcaef11185ed6d3102c2f6b73f378b0d415c5e3a4d915b3a6889bd8b31ba3e8c007a87a433a345ef7696a1dd899 SHA512 8b3b766b550f8d86907628d7ed88035f9a2612aac21542e0fd5ad35b905eb82cbe1be02a1a24afce7a3bcc4766f62611971f72724761996b392136c40a1e7ff0
 DIST libvpx-testdata-1.5.0.tar.bz2 117022525 BLAKE2B d0b5e96694d84d825b874df208dc3b3156ab0d5e9d567e1e05cdc7b88f47126917b84178748f0971ce14d58ee031906b72070bec622983ec56244159b8b759ee SHA512 58abcea159d1f709c2b9b52e8ae381481ed0ee1f43972f5e52d628754844ed23f5f77180a9c3f950a19fd8e2eaec406288d9ec65a42c9d6d080a6948827698bb
 DIST libvpx-testdata-1.6.0.tar.bz2 121020858 BLAKE2B 93bbaa4514e46b762fbf86d66394b228d62c19906dc79c5c661feedf088d09d4b6c2ac908dc8b1ac4236a801047d5d608b17a8bc0fa5bd5ca0c992cd0729fc7a SHA512 639e229bd97e7a92a29e636f548234a87dbe63673d968cdfbec1faf9ccb0ee2087ad00b0a5bfb1581bea6b17e70bb449e9a046da4d9891f59ec79773ece4294e
 DIST libvpx-testdata-1.6.1.tar.bz2 158774682 BLAKE2B 0ba1897e015c69cbf98b645cc634f98fdaf58aa814ad2cf93ee1812a38d279a570b856017822db0b21215c0e6d2d069c3f40692317c885ffbc3b59c236a754ba SHA512 9038774a6955cb6664ea664b4d8e08b0e7a2acba85429da9fd84f522bc7a03d57f6d9f1302481136a718507113babbe4786ff7a648130298ad2c0b3cbe8e82ab
+DIST libvpx-testdata-1.7.0.tar.xz 238790100 BLAKE2B 1d14e794341d35402eaf54d398ebed56b0983908e397ae677737e0f313ea0bfc9c4a39be91765b02a07a8eb9b55529d5f998efcc87b1b493b0e326e02193d982 SHA512 1556345e41674f0846a7419828972ec27c3c37fe270fa1deb45e03665f60ec088d79134aee0d2e27003b130636eeed4a15ea3f701c9d7014f3ca2785467767a8
 EBUILD libvpx-1.5.0.ebuild 4016 BLAKE2B 0a3aca166cb06bbffdcf982fdcdbde1d272b4382589fdda9e93444edb4bd5ff72f40ac7112ff53fb2c78b051ef5d8554aa86ae977161b965fd03490ad79d552b SHA512 1eda896a677035c2fd910285fa16700c5f7a45ddecc830a24e485e1ad2d960b765ea749f002f407429405e64ba553ccf0e8447ddf416ff30a894248d352f1f7a
 EBUILD libvpx-1.6.0-r1.ebuild 3632 BLAKE2B d4f74805b41f2a26659956ac82136db944c3536203e09d7dc2113fd0a42a445c1b251e48b79e37565263daefd146f83a87dbac6d345b6ef12e0e59a88500c31c SHA512 5e9891fe658f7c72f82561bdd5bc89466ede4d015af7ad6f30c9f799ffefb3843c8331ed8929a41c445afaee4b3f5b5bfdd0b6a25468c21e33ab033138915627
 EBUILD libvpx-1.6.1.ebuild 3986 BLAKE2B 5a9699efac1f72bbb251d8102801f3cc05b1c23b0384d73b72ef1b878d51db0b144a8e747f0bc17e2451b2136f95506d1de7a6d2c0c9aa7be3cb700dd6791dc4 SHA512 bd03ad543362fd58ef23250c306547578d91615b2d7632f884fcbc2434057b3ec9e4c0370f9bea705727aec03eaca0fabe3623eb67d4564335a3118b89e48352
+EBUILD libvpx-1.7.0.ebuild 3951 BLAKE2B 6d5e3aaeb878ca2edc30df9d8af3047d3def2a12d767c3d0a16e5cbba6f243ae6c43e0e93b007d5c2992ac70ad7ba656065d6ccf91b8530149db3c6e9974789b SHA512 54820f8ff382b750b86114a1bba7671dc5afb9b6302ea08911127612e38a778504decf2d5c146c0d2083061ab4be29c3d557a78ed2c98872c1e85ca4aede7ef7
 MISC metadata.xml 575 BLAKE2B f8e5f9a2663a651155da3bde8284ace9c5c9394842c279a83b58e61f5bbdbcb279b71609b1129c7e1ebd61b02ca6d6f7374313815ea33d98d60affda0144c54f SHA512 748b5a315632723c78b1db5eaa0f62e331d28874a9dbc42ebc66089eee1e2e54fc19f33c7188c4b84977b35762c94c2319787cb7528f7c22382bccd715b247a5
diff --git a/media-libs/libvpx/libvpx-1.7.0.ebuild b/media-libs/libvpx/libvpx-1.7.0.ebuild
new file mode 100644
index 000000000000..edd1717a2230
--- /dev/null
+++ b/media-libs/libvpx/libvpx-1.7.0.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs multilib-minimal
+
+# To create a new testdata tarball:
+# 1. Unpack source tarbll or checkout git tag
+# 2. export LIBVPX_TEST_DATA_PATH=libvpx-testdata
+# 3. configure --enable-unit-tests --enable-vp9-highbitdepth
+# 4. make testdata
+# 5. tar -cjf libvpx-testdata-${MY_PV}.tar.bz2 libvpx-testdata
+
+LIBVPX_TESTDATA_VER=1.7.0
+
+DESCRIPTION="WebM VP8 and VP9 Codec SDK"
+HOMEPAGE="http://www.webmproject.org"
+SRC_URI="https://github.com/webmproject/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	test? ( mirror://gentoo/${PN}-testdata-${LIBVPX_TESTDATA_VER}.tar.xz )"
+
+LICENSE="BSD"
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="cpu_flags_x86_avx cpu_flags_x86_avx2 doc cpu_flags_x86_mmx postproc cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 +highbitdepth static-libs svc test +threads"
+
+REQUIRED_USE="
+	cpu_flags_x86_sse2? ( cpu_flags_x86_mmx )
+	cpu_flags_x86_ssse3? ( cpu_flags_x86_sse2 )
+	test? ( threads )
+"
+
+# Disable test phase when USE="-test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="abi_x86_32? ( !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+DEPEND="abi_x86_32? ( dev-lang/yasm )
+	abi_x86_64? ( dev-lang/yasm )
+	abi_x86_x32? ( dev-lang/yasm )
+	x86-fbsd? ( dev-lang/yasm )
+	amd64-fbsd? ( dev-lang/yasm )
+	doc? (
+		app-doc/doxygen
+		dev-lang/php
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/libvpx-1.3.0-sparc-configure.patch" # 501010
+)
+
+src_configure() {
+	# https://bugs.gentoo.org/show_bug.cgi?id=384585
+	# https://bugs.gentoo.org/show_bug.cgi?id=465988
+	# copied from php-pear-r1.eclass
+	addpredict /usr/share/snmp/mibs/.index
+	addpredict /var/lib/net-snmp/
+	addpredict /var/lib/net-snmp/mib_indexes
+	addpredict /session_mm_cli0.sem
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	unset CODECS #357487
+
+	# #498364: sse doesn't work without sse2 enabled,
+	local myconfargs=(
+		--prefix="${EPREFIX}"/usr
+		--libdir="${EPREFIX}"/usr/$(get_libdir)
+		--enable-pic
+		--enable-vp8
+		--enable-vp9
+		--enable-shared
+		--extra-cflags="${CFLAGS}"
+		$(use_enable cpu_flags_x86_avx avx)
+		$(use_enable cpu_flags_x86_avx2 avx2)
+		$(use_enable cpu_flags_x86_mmx mmx)
+		$(use_enable postproc)
+		$(use cpu_flags_x86_sse2 && use_enable cpu_flags_x86_sse sse || echo --disable-sse)
+		$(use_enable cpu_flags_x86_sse2 sse2)
+		$(use_enable cpu_flags_x86_sse3 sse3)
+		$(use_enable cpu_flags_x86_sse4_1 sse4_1)
+		$(use_enable cpu_flags_x86_ssse3 ssse3)
+		$(use_enable svc experimental) $(use_enable svc spatial-svc)
+		$(use_enable static-libs static)
+		$(use_enable test unit-tests)
+		$(use_enable threads multithread)
+		$(use_enable highbitdepth vp9-highbitdepth)
+	)
+
+	# let the build system decide which AS to use (it honours $AS but
+	# then feeds it with yasm flags without checking...) #345161
+	tc-export AS
+	case "${CHOST}" in
+		i?86*) export AS=yasm;;
+		x86_64*) export AS=yasm;;
+	esac
+
+	# Build with correct toolchain.
+	tc-export CC CXX AR NM
+	# Link with gcc by default, the build system should override this if needed.
+	export LD="${CC}"
+
+	if multilib_is_native_abi; then
+		myconfargs+=( $(use_enable doc install-docs) $(use_enable doc docs) )
+	else
+		# not needed for multilib and will be overwritten anyway.
+		myconfargs+=( --disable-examples --disable-install-docs --disable-docs )
+	fi
+
+	"${S}"/configure "${myconfargs[@]}"
+}
+
+multilib_src_compile() {
+	# build verbose by default and do not build examples that will not be installed
+	emake verbose=yes GEN_EXAMPLES=
+}
+
+multilib_src_test() {
+	local -x LD_LIBRARY_PATH="${BUILD_DIR}"
+	local -x LIBVPX_TEST_DATA_PATH="${WORKDIR}/${PN}-testdata"
+	emake verbose=yes GEN_EXAMPLES= test
+}
+
+multilib_src_install() {
+	emake verbose=yes GEN_EXAMPLES= DESTDIR="${D}" install
+	multilib_is_native_abi && use doc && dodoc -r docs/html
+}
diff --git a/media-libs/mediastreamer/Manifest b/media-libs/mediastreamer/Manifest
index 5c01b8f4f568..39e09ae25c69 100644
--- a/media-libs/mediastreamer/Manifest
+++ b/media-libs/mediastreamer/Manifest
@@ -1,7 +1,3 @@
-AUX mediastreamer-2.7.3-ffmpeg-0.11.patch 3113 BLAKE2B 193c32ae313b3ddec2513417d3065ce07105ed657333447b04602a85a8349a94d258d2f9c33def746b75b051e5e3e2d9e6d0caad4c2a80d459c0ff7efc062104 SHA512 31413f9f2502558c4d8fad83176727e339169400923406c127705717be0c248cf14269cd3edfc24684fe34ecdad77bfc3acc718bbe5dff17bc32d8b0699e80ba
-AUX mediastreamer-2.7.3-sdl-build.patch 8006 BLAKE2B d8ae766a3c1d7ee41fb2f9fed7c9e3bf6f1352eef519ab4f4afeb72c1a71176dd4666f97d0a99690636821cda07fd3d0a74c539a575fa85758a8480353b2b1de SHA512 eb828e1cac9c904b5401b1b68402b6fc02225968b4d95827442994a20c00b99c621679c52c08a14b31e6d647b39e479e1077097cea7207203eaf3673f592454c
-AUX mediastreamer-2.7.3-v4l-automagic.patch 1083 BLAKE2B 1dd9f407f47935014afb694de3da1c61470d4982dd6e81e0b61e4a4952cf6d81fc7751892a8377e96af27a6e02b6ca138921b35a0eec2cd0bb5ba2b0ab80579c SHA512 cb37f468fcf16d2cacc64b309cb58fb2b841f9962a01c6075079dfb55d8022ef245abb9f44e91a47e72081115603ffacd1020023d67a3f1dadc1fe411ebb2e67
-AUX mediastreamer-2.7.3-videoenc_282.patch 3581 BLAKE2B 42188c3458c8c9aac238089941d5667563c83dfec59194052073612cea47e7a6654cd28724b07f59ced63549e18b03b075078623dd0b3fd9448252cb69ef96ae SHA512 750b9d212dad04729b5607c83b55afcb3fafb0f4b9ce7dd174a996d31421883747d1d1703293b8b3e2b458094470da7eed003a52b8951fff2e81da2326824f26
 AUX mediastreamer-2.8.2-autopoint.patch 710 BLAKE2B 151eddb1e24c60a3f29d6e175cc07ca64be9e19aa7bb44e337868f285cf88a88e967d7f32a88d1470651067a17609a33e9f00c16e216d8262bdf37f825bf5df6 SHA512 fed068438d9624d91dbace156933bba2a6d1a785f5f2eca3053d443cf479bf66731cd0b2d32118dba376ac4d96f34de31a82c70170553d0de497fea238bf162a
 AUX mediastreamer-2.8.2-ffmpeg-1.0.patch 1603 BLAKE2B 73dc8090d4e53ecdbdc3364bf162e6ef5bd65d233c10d6f3c493ec1a20d43e76480810277e9b390b0c8e945d31a84af1ede6fabc7e513827fb37a139a7b1a3be SHA512 19fed47ebb1261e6e3f98021b3b3acb92f112169991fa5dc5960cecf0de5044108e114fb65c7e516aae9412c1c8d6561e87a2d45b50cd772a64d711d08148d0e
 AUX mediastreamer-2.8.2-libav9.patch 4464 BLAKE2B 34925043b3b61ec3048c9f038f17a8c70c64894d345f24501545728b8b03871fee039c4aea8c8525fd903a26f43cdc509f2d7a9a603f1c542e7e52305903ce47 SHA512 8df2c02bd2066b00bf5ce1e841d3fcf3ac51d8b7401a26e9b1f894b31cfa58026619874ce1e02393e41948bff3e89499f7be022abef5d4f9b6442033632d01bd
@@ -12,12 +8,9 @@ AUX mediastreamer-2.9.0-tests.patch 587 BLAKE2B a8cdf7645cc2555e05aa7ca08c3da252
 AUX mediastreamer-2.9.0-underlinking.patch 1969 BLAKE2B 6c820661cc5cb0c8dee4523e9b8b0cd91131ba41e2d537da60cb58fc921a4dae59ae0ca9133503df3ab834c05a1077c8df3fd01278bf2f1239d8204c3d2cdad1 SHA512 35103d8fc617d8202031cb9157e757d9a4822ad90595b2842a0715420c69b60bc4c99bedf0d4b6aee419c3a663104e8d0f05c743c7a374c3ae3bc5d7630a761e
 AUX mediastreamer-2.9.0-v4l-automagic.patch 1563 BLAKE2B 142852a63e1aaf4166464a3f9411ec3d91ddb4b2e2880d5bac8b2cdc4aba5b5a0b18830f975401b35bfde23409215f40a2ed8ec8847e8173f36bf1ff021e592f SHA512 0de2d426e0b9594695fea4c3cfe5fb832d351380c53ed671ede2c4c7d0142205af22c3fc9048812bbcd2e20c6b3f7fb8828baa4704466e2da1906112193d7dcf
 AUX mediastreamer-2.9.0-xxd.patch 642 BLAKE2B eba083c86b405da0aa7a96b192e70e87a45d25a98f13cb93d2b13c85d7e9e59ddfcbf59f73aec859d725ed6ee4bff015cde0d22cdcff1325e6893c965a2b29b2 SHA512 763a8d90b278b75574c8a3cd14a780ec069f3bb6267e4ae5425ead390b274662a6c31ca924b418df5454cd7a842929dbadf621acb65e52c5af7835a2bc21bca2
-DIST mediastreamer-2.7.3.tar.gz 758146 BLAKE2B bccce071cb8307ed5564a1327e0b6473dbfe8b49fa782d5f6d7022d68a2df43e93fb244fca3f85ac86a5fef286d44dbd6cb6d2bfa128c411b0f36379e348de4e SHA512 f9ebfa12b1c760b5c24b5496466d92148a170ee2d522d9085db3fb72cc93f8e3e71ba1ae14f57d94a33b752450555c7d3ebf59267447203861247a8685e18259
 DIST mediastreamer-2.8.2.tar.gz 882966 BLAKE2B f025bbfdf8e5940fd7e185df687f4d53c4416afea0e0c237ed63bd289cea0a34643945f625881d90564f025e311ecae317114e44ffe81484ecbb2edc653cf8f4 SHA512 2041d9fbba0f831aea6bdd3259b21742a37cfdbdf473b0bc4f20bd730371395ddf2866804ae496e9864adf5fcd0d24e03193d5d8feadd54e6ff0b3adda01ff60
 DIST mediastreamer-2.9.0.tar.gz 3578877 BLAKE2B 14db241196f5d98cd7fc06ebe9e59317d47248a6c0ba103c4382ad5a2e48ebf87293f344320215380a0b9ddf76c7d4986db2c27cf114734d883505424c21a6a7 SHA512 8c31ab07c659dce84c410dfb5814b6cdf3defcd4055814922f58e2886bfeecfd5bab294c408858a29e72fcf53f35a1f7748113e1f2863baa329daedae07ef2f0
-EBUILD mediastreamer-2.7.3-r3.ebuild 3898 BLAKE2B 0c0d3a249968143af013c67198e654f7d2c6af582b0efe1646412a299c46ef2f61efd46db788060586ec1aaa66a8bde0e06aff5e2ef628a3eee616f5d1990410 SHA512 941d6199e23c2e2d42e5e784fb125ab6ca128e839f691a45a3c5faf2ffe1cbc7189e506f8c1a129e92283fc4428573d78d4f9971b3d75f6c25d36e1f77ff176e
 EBUILD mediastreamer-2.8.2.ebuild 3824 BLAKE2B ad844e6ca0b7d3c7432fd8a6110487c84b5d67d15c387953deb35cfcc9123320281e04f9f337a0a62602635beff62aeb28b593dab8a10a96538d3e53ae6b6ee1 SHA512 9336b58a8b0ef34d58ee9f3d37cb40911e25a5c1979bbf9507370f3d9018de5c13833d8cfbaeb3482810bf1c9d366a0541ea576c345af5837fc4e4ca9d0579c1
 EBUILD mediastreamer-2.9.0-r1.ebuild 4584 BLAKE2B 0e76a1c5b90f4e4991073eed84ae37e2b50510ed156e705c773622225286b7f600d7c60df795dcce57e533f0574c05756fd18df9cb20b7854cc2feae2253507a SHA512 2b05c989175bb8fccf7d5bccce914ddfeec8c5ef28e76d34bbcdf811aa19b0343ead4b41fbcd5aa3fd0aa8cba9921d7d1ecabf253842108b45b01c69b162ade9
 EBUILD mediastreamer-2.9.0-r2.ebuild 4634 BLAKE2B 9ce8b66d844f0464a23433804c0a4e9d43a9201db12a3333b0832d1b3d52032de17ef46c7488f368dcc3854b75078e53deec1fd342fdd822ec7cece7573fa487 SHA512 25e1e987c9b99d265219961ca3cc17fb7f7ece54a502cbb10b6b693deefb20def94e3920d25c5bbf8052ee46c25701a2dead145477882ab4c1fae52fbd73537d
-EBUILD mediastreamer-2.9.0.ebuild 4469 BLAKE2B 2befba8d12580524af4c08219a711a2c35c76d385851833f6625ebf2e186c944bc688daa1b096836409e4136ace25ed24a003d21e4af3f6c368f5f408aff0fc2 SHA512 acf3c4d57f6e34e576ed7793c7b44da186ca48f667f4749e628ed2e3b9da0768ad49802063e782140964e8bd21286d6b470f394574a89c4004308791383dc610
 MISC metadata.xml 934 BLAKE2B 2e1402da227d8892f2a2e739510ab4b81e2588bb057479976ddfe917a08d4248a3d7c4c286b4a5367b703557b799df57049a42baa46bd6c5fe1058a9466941fe SHA512 8cf01a51dd7bafcbd4ca39c49deacd38104d9640ed26ceab65e3f96ebb9e9be6caed8e8e0a3813946365fd6400141fac0481e3d29d59cef1625f132a81b2eddd
diff --git a/media-libs/mediastreamer/files/mediastreamer-2.7.3-ffmpeg-0.11.patch b/media-libs/mediastreamer/files/mediastreamer-2.7.3-ffmpeg-0.11.patch
deleted file mode 100644
index c242b5fe139c..000000000000
--- a/media-libs/mediastreamer/files/mediastreamer-2.7.3-ffmpeg-0.11.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-Fix build with recent ffmpeg releases.
-https://bugs.gentoo.org/show_bug.cgi?id=419453
-
-Index: mediastreamer-2.7.3/src/videoenc.c
-===================================================================
---- mediastreamer-2.7.3.orig/src/videoenc.c
-+++ mediastreamer-2.7.3/src/videoenc.c
-@@ -53,7 +53,6 @@ void ms_ffmpeg_log_callback(void* ptr, i
- 
- void ms_ffmpeg_check_init(){
- 	if(!avcodec_initialized){
--		avcodec_init();
- 		avcodec_register_all();
- 		avcodec_initialized=TRUE;
- #ifdef ENABLE_LOG_FFMPEG
-@@ -107,6 +106,7 @@ typedef struct EncState{
- 	uint32_t framenum;
- 	VideoStarter starter;
- 	bool_t req_vfu;
-+	AVDictionary * ff_opts;
- }EncState;
- 
- static int enc_set_fps(MSFilter *f, void *arg){
-@@ -214,6 +214,7 @@ static void enc_init(MSFilter *f, enum C
- 	s->req_vfu=FALSE;
- 	s->framenum=0;
- 	s->av_context.codec=NULL;
-+	s->ff_opts = NULL;
- }
- 
- static void enc_h263_init(MSFilter *f){
-@@ -300,9 +301,9 @@ static void prepare_h263(EncState *s){
- 	if (s->profile==0){
- 		s->codec=CODEC_ID_H263;
- 	}else{
--		c->flags|=CODEC_FLAG_H263P_UMV;
-+		av_dict_set(&(s->ff_opts), "umv", "1", 0);
- 		c->flags|=CODEC_FLAG_AC_PRED;
--		c->flags|=CODEC_FLAG_H263P_SLICE_STRUCT;
-+		av_dict_set(&(s->ff_opts), "structured_slices", "1", 0);
- 		/*
- 		c->flags|=CODEC_FLAG_OBMC;
- 		c->flags|=CODEC_FLAG_AC_PRED;
-@@ -342,9 +343,9 @@ static void enc_preprocess(MSFilter *f){
- 		ms_error("could not find encoder for codec id %i",s->codec);
- 		return;
- 	}
--	error=avcodec_open(&s->av_context, s->av_codec);
-+	error=avcodec_open2(&s->av_context, s->av_codec, &(s->ff_opts));
- 	if (error!=0) {
--		ms_error("avcodec_open() failed: %i",error);
-+		ms_error("avcodec_open2() failed: %i",error);
- 		return;
- 	}
- 	video_starter_init(&s->starter);
-@@ -372,7 +373,7 @@ static void add_rfc2190_header(mblk_t **
- 	// assume video size is CIF or QCIF
- 	if (context->width == 352 && context->height == 288) header->b_wptr[1] = 0x60;
- 	else header->b_wptr[1] = 0x40;
--	if (context->coded_frame->pict_type != FF_I_TYPE) header->b_wptr[1] |= 0x10;
-+	if (context->coded_frame->pict_type != AV_PICTURE_TYPE_I) header->b_wptr[1] |= 0x10;
- 	header->b_wptr += 4;
- 	header->b_cont = *packet;
- 	*packet = header;
-@@ -779,7 +780,7 @@ static void process_frame(MSFilter *f, m
- 		s->req_vfu=TRUE;
- 	}
- 	if (s->req_vfu){
--		pict.pict_type=FF_I_TYPE;
-+		pict.pict_type=AV_PICTURE_TYPE_I;
- 		s->req_vfu=FALSE;
- 	}
- 	comp_buf->b_rptr=comp_buf->b_wptr=comp_buf->b_datap->db_base;
-@@ -799,7 +800,7 @@ static void process_frame(MSFilter *f, m
- 		if (s->framenum==1){
- 			video_starter_first_frame (&s->starter,f->ticker->time);
- 		}
--		if (c->coded_frame->pict_type==FF_I_TYPE){
-+		if (c->coded_frame->pict_type==AV_PICTURE_TYPE_I){
- 			ms_message("Emitting I-frame");
- 		}
- 		comp_buf->b_wptr+=error;
-Index: mediastreamer-2.7.3/src/h264dec.c
-===================================================================
---- mediastreamer-2.7.3.orig/src/h264dec.c
-+++ mediastreamer-2.7.3/src/h264dec.c
-@@ -46,7 +46,6 @@ typedef struct _DecData{
- static void ffmpeg_init(){
- 	static bool_t done=FALSE;
- 	if (!done){
--		avcodec_init();
- 		avcodec_register_all();
- 		done=TRUE;
- 	}
diff --git a/media-libs/mediastreamer/files/mediastreamer-2.7.3-sdl-build.patch b/media-libs/mediastreamer/files/mediastreamer-2.7.3-sdl-build.patch
deleted file mode 100644
index 2f7207e27ab0..000000000000
--- a/media-libs/mediastreamer/files/mediastreamer-2.7.3-sdl-build.patch
+++ /dev/null
@@ -1,220 +0,0 @@
-commit c0ae6c3f9f78ae9e9e4c7030e7054dc5c0267e2c
-Author: Simon Morlat <simon.morlat@linphone.org>
-Date:   Mon Apr 11 22:46:37 2011 +0200
-
-    fix SDL output that wasn't compiling anymore and bugfix videodisplay test program
-
-diff --git a/src/msfilter.c b/src/msfilter.c
-index d8d84f3..4b84b8b 100644
---- a/src/msfilter.c
-+++ b/src/msfilter.c
-@@ -169,9 +169,7 @@ int ms_filter_link(MSFilter *f1, int pin1, MSFilter *f2, int pin2){
- 
- int ms_filter_unlink(MSFilter *f1, int pin1, MSFilter *f2, int pin2){
- 	MSQueue *q;
--	ms_return_val_if_fail(f1, -1);
--	ms_return_val_if_fail(f2, -1);
--	ms_message("ms_filter_unlink: %s:%p,%i-->%s:%p,%i",f1->desc->name,f1,pin1,f2->desc->name,f2,pin2);
-+	ms_message("ms_filter_unlink: %s:%p,%i-->%s:%p,%i",f1 ? f1->desc->name : "!NULL!",f1,pin1,f2 ? f2->desc->name : "!NULL!",f2,pin2);
- 	ms_return_val_if_fail(pin1<f1->desc->noutputs, -1);
- 	ms_return_val_if_fail(pin2<f2->desc->ninputs, -1);
- 	ms_return_val_if_fail(f1->outputs[pin1]!=NULL,-1);
-diff --git a/src/videoout.c b/src/videoout.c
-index ca36b0f..5bdc6dd 100644
---- a/src/videoout.c
-+++ b/src/videoout.c
-@@ -114,8 +114,6 @@ void ms_display_destroy(MSDisplay *d);
- }
- #endif
- 
--#include "ffmpeg-priv.h"
--
- #define SCALE_FACTOR 4.0f
- #define SELVIEW_POS_INACTIVE -100.0
- 
-@@ -462,7 +460,7 @@ void ms_display_desc_set_default_window_id(MSDisplayDesc *desc, long id){
- 
- typedef struct VideoOut
- {
--	AVRational ratio;
-+	struct Rational {int num; int den;} ratio;
- 	MSPicture fbuf;
- 	MSPicture fbuf_selfview;
- 	MSPicture local_pic;
-@@ -474,8 +472,8 @@ typedef struct VideoOut
- 	float sv_posx,sv_posy;
- 	int background_color[3];
- 
--	struct ms_SwsContext *sws1;
--	struct ms_SwsContext *sws2;
-+	MSScalerContext *sws1;
-+	MSScalerContext *sws2;
- 	MSDisplay *display;
- 	bool_t own_display;
- 	bool_t ready;
-@@ -552,11 +550,11 @@ static void video_out_uninit(MSFilter *f){
- 	if (obj->display!=NULL && obj->own_display)
- 		ms_display_destroy(obj->display);
- 	if (obj->sws1!=NULL){
--		ms_sws_freeContext(obj->sws1);
-+		ms_scaler_context_free(obj->sws1);
- 		obj->sws1=NULL;
- 	}
- 	if (obj->sws2!=NULL){
--		ms_sws_freeContext(obj->sws2);
-+		ms_scaler_context_free(obj->sws2);
- 		obj->sws2=NULL;
- 	}
- 	if (obj->local_msg!=NULL) {
-@@ -581,11 +579,11 @@ static void video_out_prepare(MSFilter *f){
- 		obj->display=NULL;
- 	}
- 	if (obj->sws1!=NULL){
--		ms_sws_freeContext(obj->sws1);
-+		ms_scaler_context_free(obj->sws1);
- 		obj->sws1=NULL;
- 	}
- 	if (obj->sws2!=NULL){
--		ms_sws_freeContext(obj->sws2);
-+		 ms_scaler_context_free(obj->sws2);
- 		obj->sws2=NULL;
- 	}
- 	if (obj->local_msg!=NULL) {
-@@ -665,13 +663,12 @@ static void video_out_process(MSFilter *f){
- 			if (ms_yuv_buf_init_from_mblk(&src,inm)==0){
- 				
- 				if (obj->sws2==NULL){
--					obj->sws2=ms_sws_getContext(src.w,src.h,PIX_FMT_YUV420P,
--											 obj->fbuf_selfview.w,obj->fbuf_selfview.h,PIX_FMT_YUV420P,
--											 SWS_FAST_BILINEAR, NULL, NULL, NULL);
-+					obj->sws2=ms_scaler_create_context(src.w,src.h,MS_YUV420P,
-+											 obj->fbuf_selfview.w,obj->fbuf_selfview.h,MS_YUV420P,
-+											 MS_SCALER_METHOD_BILINEAR);
- 				}
- 				ms_display_lock(obj->display);
--				if (ms_sws_scale(obj->sws2,src.planes,src.strides, 0,
--							  src.h, obj->fbuf_selfview.planes, obj->fbuf_selfview.strides)<0){
-+				if (ms_scaler_process(obj->sws2,src.planes,src.strides,obj->fbuf_selfview.planes, obj->fbuf_selfview.strides)<0){
- 					ms_error("Error in ms_sws_scale().");
- 				}
- 				if (!mblk_get_precious_flag(inm)) ms_yuv_buf_mirror(&obj->fbuf_selfview);
-@@ -683,9 +680,9 @@ static void video_out_process(MSFilter *f){
- 			if (ms_yuv_buf_init_from_mblk(&src,inm)==0){
- 				
- 				if (obj->sws2==NULL){
--					obj->sws2=ms_sws_getContext(src.w,src.h,PIX_FMT_YUV420P,
--								obj->local_pic.w,obj->local_pic.h,PIX_FMT_YUV420P,
--								SWS_FAST_BILINEAR, NULL, NULL, NULL);
-+					obj->sws2=ms_scaler_create_context(src.w,src.h,MS_YUV420P,
-+								obj->local_pic.w,obj->local_pic.h,MS_YUV420P,
-+								MS_SCALER_METHOD_BILINEAR);
- 				}
- 				if (obj->local_msg==NULL){
- 					obj->local_msg=ms_yuv_buf_alloc(&obj->local_pic,
-@@ -693,8 +690,7 @@ static void video_out_process(MSFilter *f){
- 				}
- 				if (obj->local_pic.planes[0]!=NULL)
- 				{
--					if (ms_sws_scale(obj->sws2,src.planes,src.strides, 0,
--						src.h, obj->local_pic.planes, obj->local_pic.strides)<0){
-+					if (ms_scaler_process(obj->sws2,src.planes,src.strides,obj->local_pic.planes, obj->local_pic.strides)<0){
- 						ms_error("Error in ms_sws_scale().");
- 					}
- 					if (!mblk_get_precious_flag(inm)) ms_yuv_buf_mirror(&obj->local_pic);
-@@ -731,13 +727,12 @@ static void video_out_process(MSFilter *f){
- 				}
- 			}
- 			if (obj->sws1==NULL){
--				obj->sws1=ms_sws_getContext(src.w,src.h,PIX_FMT_YUV420P,
--				obj->fbuf.w,obj->fbuf.h,PIX_FMT_YUV420P,
--				SWS_FAST_BILINEAR, NULL, NULL, NULL);
-+				obj->sws1=ms_scaler_create_context(src.w,src.h,MS_YUV420P,
-+				obj->fbuf.w,obj->fbuf.h,MS_YUV420P,
-+				MS_SCALER_METHOD_BILINEAR);
- 			}
- 			ms_display_lock(obj->display);
--			if (ms_sws_scale(obj->sws1,src.planes,src.strides, 0,
--            			src.h, obj->fbuf.planes, obj->fbuf.strides)<0){
-+			if (ms_scaler_process(obj->sws1,src.planes,src.strides,obj->fbuf.planes, obj->fbuf.strides)<0){
- 				ms_error("Error in ms_sws_scale().");
- 			}
- 			if (obj->mirror && !mblk_get_precious_flag(inm)) ms_yuv_buf_mirror(&obj->fbuf);
-@@ -943,3 +938,4 @@ MSFilterDesc ms_video_out_desc={
- 
- 
- MS_FILTER_DESC_EXPORT(ms_video_out_desc)
-+
-diff --git a/tests/videodisplay.c b/tests/videodisplay.c
-index 76f67a5..0828c6a 100644
---- a/tests/videodisplay.c
-+++ b/tests/videodisplay.c
-@@ -52,6 +52,7 @@ int main(int argc, char *argv[]){
- 	for(i=0;i<1;++i){
- 		int n;
- 		vs=video_preview_new();
-+		/*video_preview_set_display_filter_name(vs,"MSVideoOut");*/
- 		video_preview_set_size(vs,vsize);
- 		video_preview_start(vs, cam);
- 
-@@ -79,11 +80,11 @@ int main(int argc, char *argv[]){
- 
- 			    vs->tee = ms_filter_new(MS_TEE_ID);
- 
--			    ms_filter_unlink(vs->pixconv,0, vs->output,0);
-+			    ms_filter_unlink(vs->pixconv,0, vs->output2,0);
- 
- 			    ms_filter_link(vs->pixconv,0,vs->tee,0);
--			    ms_filter_link(vs->tee,0,vs->output,0);
--			    ms_filter_link(vs->tee,1,vs->output,1);
-+			    ms_filter_link(vs->tee,0,vs->output2,0);
-+			    ms_filter_link(vs->tee,1,vs->output2,1);
- 			    
- 			    //ms_filter_unlink(vs->tee,0,vs->output,0);
- 			    ms_ticker_attach (vs->ticker, vs->source);
-@@ -92,34 +93,34 @@ int main(int argc, char *argv[]){
- 			if (n==500)
- 			  {
- 			    int corner=1;
--			    ms_filter_call_method(vs->output,MS_VIDEO_DISPLAY_SET_LOCAL_VIEW_MODE,&corner);
-+			    ms_filter_call_method(vs->output2,MS_VIDEO_DISPLAY_SET_LOCAL_VIEW_MODE,&corner);
- 			  }
- 			if (n==600)
- 			  {
- 			    int corner=2;
--			    ms_filter_call_method(vs->output,MS_VIDEO_DISPLAY_SET_LOCAL_VIEW_MODE,&corner);
-+			    ms_filter_call_method(vs->output2,MS_VIDEO_DISPLAY_SET_LOCAL_VIEW_MODE,&corner);
- 			  }
- 			if (n==700)
- 			  {
- 			    int corner=3;
--			    ms_filter_call_method(vs->output,MS_VIDEO_DISPLAY_SET_LOCAL_VIEW_MODE,&corner);
-+			    ms_filter_call_method(vs->output2,MS_VIDEO_DISPLAY_SET_LOCAL_VIEW_MODE,&corner);
- 			  }
- 			if (n==800)
- 			  {
- 			    int corner=-1;
--			    ms_filter_call_method(vs->output,MS_VIDEO_DISPLAY_SET_LOCAL_VIEW_MODE,&corner);
-+			    ms_filter_call_method(vs->output2,MS_VIDEO_DISPLAY_SET_LOCAL_VIEW_MODE,&corner);
- 			  }
- 			if (n==900)
- 			  {
- 			    ms_ticker_detach (vs->ticker, vs->source);
- 
- 			    ms_filter_unlink(vs->pixconv,0,vs->tee,0);
--			    ms_filter_unlink(vs->tee,0,vs->output,0);
--			    ms_filter_unlink(vs->tee,1,vs->output,1);
-+			    ms_filter_unlink(vs->tee,0,vs->output2,0);
-+			    ms_filter_unlink(vs->tee,1,vs->output2,1);
- 			    ms_filter_destroy(vs->tee);
- 			    vs->tee=NULL;
- 
--			    ms_filter_link(vs->pixconv,0, vs->output,0);
-+			    ms_filter_link(vs->pixconv,0, vs->output2,0);
- 
- 			    
- 			    ms_ticker_attach (vs->ticker, vs->source);
-@@ -129,3 +130,4 @@ int main(int argc, char *argv[]){
- 	}
- 	return 0;
- }
-+
diff --git a/media-libs/mediastreamer/files/mediastreamer-2.7.3-v4l-automagic.patch b/media-libs/mediastreamer/files/mediastreamer-2.7.3-v4l-automagic.patch
deleted file mode 100644
index d103a07fd9af..000000000000
--- a/media-libs/mediastreamer/files/mediastreamer-2.7.3-v4l-automagic.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-=== modified file 'configure.ac'
---- configure.ac	2011-04-09 08:17:33 +0000
-+++ configure.ac	2011-04-09 08:31:18 +0000
-@@ -590,6 +590,15 @@
- AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR,  "${package_prefix}/share" ,[path of data])
- AC_SUBST(PACKAGE_DATA_DIR)
- 
-+AC_ARG_ENABLE(v4l,
-+      [  --disable-v4l       Disable usage of v4l],
-+      [case "${enableval}" in
-+        yes) v4l=yes ;;
-+        no)  v4l=no ;;
-+        *) AC_MSG_ERROR(bad value ${enableval} for --disable-v4l) ;;
-+      esac],[v4l=yes])
-+
-+if test "$v4l" = "yes" ; then
- dnl check for video4linux headers
- AC_CHECK_HEADERS(linux/videodev.h linux/videodev2.h)
- if test "${ac_cv_header_linux_videodev_h}" = "yes" || \
-@@ -599,8 +608,6 @@
- 	found_v4l=no
- fi
- 
--AM_CONDITIONAL(BUILD_V4L, test x$found_v4l = xyes )
--
- AC_ARG_ENABLE(libv4l,
-       [  --disable-libv4l    Disable usage of libv4l, really discouraged],
-       [case "${enableval}" in
-@@ -632,6 +639,10 @@
- ])
- 	fi
- fi
-+fi
-+
-+AM_CONDITIONAL(BUILD_V4L, test x$found_v4l = xyes )
-+
- 
- dnl ##################################################
- dnl # Check for doxygen
-
diff --git a/media-libs/mediastreamer/files/mediastreamer-2.7.3-videoenc_282.patch b/media-libs/mediastreamer/files/mediastreamer-2.7.3-videoenc_282.patch
deleted file mode 100644
index 66d055ede084..000000000000
--- a/media-libs/mediastreamer/files/mediastreamer-2.7.3-videoenc_282.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-Update videoenc.c to the 2.8.2 version. Fixes some but not all problems with
-ffmpeg.
-
-
---- mediastreamer-2.7.3/src/videoenc.c	2010-12-17 05:59:50.000000000 -0300
-+++ mediastreamer-2.8.2/src/videoenc.c	2012-02-17 06:16:20.000000000 -0300
-@@ -164,6 +164,7 @@
- 		}else{
- 			ms_warning("unsupported video size %s",tmp);
- 			ret=FALSE;
-+			goto end;
- 		}
- 		divider=atoi(equal+1);
- 		if (divider!=0){
-@@ -174,6 +175,8 @@
- 			ret=FALSE;
- 		}
- 	}else ret=FALSE;
-+
-+end:
- 	ms_free(tmp);
- 	return ret;
- }
-@@ -231,11 +234,7 @@
- 
- static void prepare(EncState *s){
- 	AVCodecContext *c=&s->av_context;
--#ifdef ANDROID
- 	const int max_br_vbv=128000;
--#else
--	const int max_br_vbv=256000;
--#endif
- 
- 	avcodec_get_context_defaults(c);
- 	if (s->codec==CODEC_ID_MJPEG)
-@@ -315,13 +314,6 @@
- static void prepare_mpeg4(EncState *s){
- 	AVCodecContext *c=&s->av_context;
- 	c->max_b_frames=0; /*don't use b frames*/
--	c->flags|=CODEC_FLAG_AC_PRED;
--	c->flags|=CODEC_FLAG_H263P_UMV;
--	/*c->flags|=CODEC_FLAG_QPEL;*/ /*don't enable this one: this forces profile_level to advanced simple profile */
--	c->flags|=CODEC_FLAG_4MV;
--	c->flags|=CODEC_FLAG_GMC;
--	c->flags|=CODEC_FLAG_LOOP_FILTER;
--	c->flags|=CODEC_FLAG_H263P_SLICE_STRUCT;
- }
- 
- static void enc_uninit(MSFilter  *f){
-@@ -681,7 +673,7 @@
- 	uint8_t *pbuf_ptr=full_frame->b_rptr;
- 	uint8_t *buf_end=full_frame->b_wptr;	
- 
--	ms_message("image size: %i)", buf_end-pbuf_ptr);
-+	ms_message("image size: %li)", (long)(buf_end-pbuf_ptr));
- 
- 	*lqt=NULL;
- 	*cqt=NULL;
-@@ -689,7 +681,7 @@
- 	err = find_marker(&pbuf_ptr, buf_end);
- 	while (err!=-1)
- 	{
--		ms_message("marker found: %x (offset from beginning%i)", err, pbuf_ptr-full_frame->b_rptr);
-+		ms_message("marker found: %x (offset from beginning %li)", err, (long)(pbuf_ptr-full_frame->b_rptr));
- 		if (err==0xdb)
- 		{
- 			/* copy DQT table */
-@@ -772,10 +764,12 @@
- 	int error;
- 	mblk_t *comp_buf=s->comp_buf;
- 	int comp_buf_sz=comp_buf->b_datap->db_lim-comp_buf->b_datap->db_base;
-+	YuvBuf yuv;
- 
-+	ms_yuv_buf_init_from_mblk(&yuv, inm);
- 	/* convert image if necessary */
- 	avcodec_get_frame_defaults(&pict);
--	avpicture_fill((AVPicture*)&pict,(uint8_t*)inm->b_rptr,c->pix_fmt,c->width,c->height);
-+	avpicture_fill((AVPicture*)&pict,yuv.planes[0],c->pix_fmt,c->width,c->height);
- 	
- 	/* timestamp used by ffmpeg, unset here */
- 	pict.pts=AV_NOPTS_VALUE;
-@@ -796,7 +790,9 @@
- 		comp_buf->b_wptr+=4;
- 		comp_buf_sz-=4;
- 	}
-+
- 	error=avcodec_encode_video(c, (uint8_t*)comp_buf->b_wptr,comp_buf_sz, &pict);
-+
- 	if (error<=0) ms_warning("ms_AVencoder_process: error %i.",error);
- 	else{
- 		s->framenum++;
-@@ -837,6 +833,14 @@
- 	EncState *s=(EncState*)f->data;
- 	bool_t snow=s->codec==CODEC_ID_SNOW;
- 	s->maxbr=*(int*)arg;
-+	if (s->av_context.codec!=NULL){
-+		/*when we are processing, apply new settings immediately*/
-+		ms_filter_lock(f);
-+		enc_postprocess(f);
-+		enc_preprocess(f);
-+		ms_filter_unlock(f);
-+		return 0;
-+	}
- 	if (s->maxbr>=1024000 && s->codec!=CODEC_ID_H263P){
- 		s->vsize.width = MS_VIDEO_SIZE_SVGA_W;
- 		s->vsize.height = MS_VIDEO_SIZE_SVGA_H;
-@@ -854,7 +858,7 @@
- 		s->vsize.height=MS_VIDEO_SIZE_CIF_H;
- 		s->fps=17;
- 		s->qmin=3;
--	}else if (s->maxbr>=170000){
-+	}else if (s->maxbr>=170000 && s->codec!=CODEC_ID_H263P && s->codec!=CODEC_ID_H263){
- 		s->vsize.width=MS_VIDEO_SIZE_QVGA_W;
- 		s->vsize.height=MS_VIDEO_SIZE_QVGA_H;
- 		s->fps=15;
-@@ -875,14 +879,6 @@
- 		s->fps=5;
- 		s->qmin=5;
- 	}
--
--	if (s->av_context.codec!=NULL){
--		/*apply new settings dynamically*/
--		ms_filter_lock(f);
--		enc_postprocess(f);
--		enc_preprocess(f);
--		ms_filter_unlock(f);
--	}
- 	return 0;
- }
- 
diff --git a/media-libs/mediastreamer/mediastreamer-2.7.3-r3.ebuild b/media-libs/mediastreamer/mediastreamer-2.7.3-r3.ebuild
deleted file mode 100644
index 24f960f98802..000000000000
--- a/media-libs/mediastreamer/mediastreamer-2.7.3-r3.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils autotools multilib
-
-DESCRIPTION="Mediastreaming library for telephony application"
-HOMEPAGE="http://www.linphone.org/"
-SRC_URI="mirror://nongnu/linphone/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x64-macos ~x86-macos"
-# Many cameras will not work or will crash an application if mediastreamer2 is
-# not built with v4l2 support (taken from configure.ac)
-# TODO: run-time test for ipv6: does it really need ortp[ipv6] ?
-IUSE="+alsa amr bindist coreaudio debug examples gsm ilbc ipv6 jack oss portaudio
-pulseaudio sdl +speex static-libs theora v4l video x264 X"
-REQUIRED_USE="|| ( oss alsa jack portaudio coreaudio pulseaudio )
-	video? ( || ( sdl X ) )
-	theora? ( video )
-	X? ( video )
-	v4l? ( video )"
-
-RDEPEND=">=net-libs/ortp-0.16.2[ipv6?]
-	alsa? ( media-libs/alsa-lib )
-	gsm? ( media-sound/gsm )
-	jack? ( >=media-libs/libsamplerate-0.0.13
-		media-sound/jack-audio-connection-kit )
-	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.21 )
-	speex? ( >=media-libs/speex-1.2_beta3 )
-	video? (
-		virtual/ffmpeg
-		v4l? ( media-libs/libv4l
-			sys-kernel/linux-headers )
-		theora? ( media-libs/libtheora )
-		sdl? ( media-libs/libsdl[video,X] )
-		X? ( x11-libs/libX11
-			x11-libs/libXv ) )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	x11-proto/videoproto"
-
-PDEPEND="amr? ( !bindist? ( media-plugins/mediastreamer-amr ) )
-	ilbc? ( media-plugins/mediastreamer-ilbc )
-	video? ( x264? ( media-plugins/mediastreamer-x264 ) )"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-src_prepare() {
-	# respect user's CFLAGS
-	sed -i -e "s:-O2::;s: -g::" configure.ac || die "patching configure.ac failed"
-
-	# change default paths
-	sed -i -e "s:\(\${prefix}/\)lib:\1$(get_libdir):" \
-		-e "s:\(prefix/share\):\1/${PN}:" configure.ac \
-		|| die "patching configure.ac failed"
-
-	# fix html doc installation dir
-	sed -i -e "s:\$(pkgdocdir):\$(docdir):" help/Makefile.am \
-		|| die "patching help/Makefile.am failed"
-	sed -i -e "s:\(doc_htmldir=\).*:\1\$(htmldir):" help/Makefile.am \
-		|| die "patching help/Makefile.am failed"
-
-	epatch "${FILESDIR}/${PN}-2.7.3-v4l-automagic.patch"
-	epatch "${FILESDIR}/${P}-sdl-build.patch"
-	epatch "${FILESDIR}/${P}-videoenc_282.patch"
-	epatch "${FILESDIR}/${P}-ffmpeg-0.11.patch"
-
-	# linux/videodev.h dropped in 2.6.38
-	sed -i -e 's:msv4l.c::' src/Makefile.am || die
-	sed -i -e 's:linux/videodev.h ::' configure.ac || die
-	eautoreconf
-
-	# don't build examples in tests/
-	sed -i -e "s:\(SUBDIRS = .*\) tests \(.*\):\1 \2:" Makefile.in \
-		|| die "patching Makefile.in failed"
-}
-
-src_configure() {
-	# Mac OS X Audio Queue is an audio recording facility, available on
-	# 10.5 (Leopard, Darwin9) and onward
-	local macaqsnd="--disable-macaqsnd"
-	if use coreaudio && [[ ${CHOST} == *-darwin* && ${CHOST##*-darwin} -ge 9 ]];
-	then
-		macaqsnd="--enable-macaqsnd"
-	fi
-
-	# strict: don't want -Werror
-	# external-ortp: don't use bundled libs
-	# arts: arts is deprecated
-	econf \
-		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		--datadir="${EPREFIX}"/usr/share/${PN} \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--disable-strict \
-		--enable-external-ortp \
-		--disable-artsc \
-		$(use_enable alsa) \
-		$(use_enable pulseaudio) \
-		$(use_enable coreaudio macsnd) ${macaqsnd} \
-		$(use_enable debug) \
-		$(use_enable gsm) \
-		$(use_enable ipv6) \
-		$(use_enable jack) \
-		$(use_enable oss) \
-		$(use_enable portaudio) \
-		$(use_enable speex) \
-		$(use_enable static-libs static) \
-		$(use_enable theora) \
-		$(use_enable video) \
-		$(use_enable v4l) \
-		$(use_enable v4l libv4l) \
-		$(use_enable sdl) \
-		$(use_enable X x11) \
-		$(use_enable X xv)
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -exec rm -f {} +
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins tests/*.c
-	fi
-}
diff --git a/media-libs/mediastreamer/mediastreamer-2.9.0.ebuild b/media-libs/mediastreamer/mediastreamer-2.9.0.ebuild
deleted file mode 100644
index 68ed29238df3..000000000000
--- a/media-libs/mediastreamer/mediastreamer-2.9.0.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils
-
-DESCRIPTION="Mediastreaming library for telephony application"
-HOMEPAGE="http://www.linphone.org/"
-SRC_URI="mirror://nongnu/linphone/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/3"
-KEYWORDS="amd64 ppc ppc64 x86"
-# Many cameras will not work or will crash an application if mediastreamer2 is
-# not built with v4l2 support (taken from configure.ac)
-# TODO: run-time test for ipv6: does it really need ortp[ipv6] ?
-IUSE="+alsa amr bindist coreaudio debug doc examples +filters g726 g729 gsm ilbc
-	ipv6 ntp-timestamp opengl opus +ortp oss pcap portaudio pulseaudio sdl silk +speex
-	static-libs test theora upnp v4l video x264 X"
-
-REQUIRED_USE="|| ( oss alsa portaudio coreaudio pulseaudio )
-	video? ( || ( opengl sdl X ) )
-	theora? ( video )
-	X? ( video )
-	v4l? ( video )
-	opengl? ( video )"
-
-RDEPEND="alsa? ( media-libs/alsa-lib )
-	g726? ( >=media-libs/spandsp-0.0.6_pre1 )
-	gsm? ( media-sound/gsm )
-	opus? ( media-libs/opus )
-	ortp? ( >=net-libs/ortp-0.21.0[ipv6?] )
-	pcap? ( sys-libs/libcap )
-	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.21 )
-	speex? ( >=media-libs/speex-1.2_beta3 )
-	upnp? ( net-libs/libupnp )
-	video? (
-		virtual/ffmpeg
-		opengl? ( media-libs/glew
-			virtual/opengl
-			x11-libs/libX11 )
-		v4l? ( media-libs/libv4l
-			sys-kernel/linux-headers )
-		theora? ( media-libs/libtheora )
-		sdl? ( media-libs/libsdl[video,X] )
-		X? ( x11-libs/libX11
-			x11-libs/libXv ) )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	opengl? ( dev-util/xxdi )
-	test? ( >=dev-util/cunit-2.1_p2[ncurses] )
-	X? ( x11-proto/videoproto )"
-
-PDEPEND="amr? ( !bindist? ( media-plugins/mediastreamer-amr ) )
-	g729? ( !bindist? ( media-plugins/mediastreamer-bcg729 ) )
-	ilbc? ( media-plugins/mediastreamer-ilbc )
-	video? ( x264? ( media-plugins/mediastreamer-x264 ) )
-	silk? ( !bindist? ( media-plugins/mediastreamer-silk ) )"
-
-src_prepare() {
-	# variable causes "command not found" warning and is not
-	# needed anyway
-	sed -i \
-		-e 's/$(ACLOCAL_MACOS_FLAGS)//' \
-		Makefile.am || die
-
-	# respect user's CFLAGS
-	sed -i \
-		-e "s:-O2::;s: -g::" \
-		configure.ac || die "patching configure.ac failed"
-
-	# change default paths
-	sed -i \
-		-e "s:\(prefix/share\):\1/${PN}:" \
-		configure.ac || die "patching configure.ac failed"
-
-	# fix doc installation dir
-	sed -i \
-		-e "s:\$(pkgdocdir):\$(docdir):" \
-		help/Makefile.am || die "patching help/Makefile.am failed"
-
-	# fix html installation dir
-	sed -i \
-		-e "s:\(doc_htmldir=\).*:\1\$(htmldir):" \
-		help/Makefile.am || die "patching help/Makefile.am failed"
-
-	# linux/videodev.h dropped in 2.6.38
-	sed -i \
-		-e 's:linux/videodev.h ::' \
-		configure.ac || die
-
-	epatch "${FILESDIR}/${P}-v4l-automagic.patch" \
-		"${FILESDIR}/${P}-libav9.patch" \
-		"${FILESDIR}/${P}-underlinking.patch" \
-		"${FILESDIR}/${P}-tests.patch" \
-		"${FILESDIR}/${P}-xxd.patch"
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
-		--datadir="${EPREFIX}"/usr/share/${PN}
-		# arts is deprecated
-		--disable-artsc
-		# don't want -Werror
-		--disable-strict
-		--disable-libv4l1
-		# don't use bundled libs
-		--enable-external-ortp
-		$(use_enable alsa)
-		$(use_enable pulseaudio)
-		$(use_enable coreaudio macsnd)
-		$(use_enable debug)
-		$(use_enable filters)
-		$(use_enable g726 spandsp)
-		$(use_enable gsm)
-		$(use_enable ipv6)
-		$(use_enable ntp-timestamp)
-		$(use_enable opengl glx)
-		$(use_enable opus)
-		$(use_enable ortp)
-		$(use_enable oss)
-		$(use_enable pcap)
-		$(use_enable portaudio)
-		$(use_enable speex)
-		$(use_enable static-libs static)
-		$(use_enable theora)
-		$(use_enable upnp)
-		$(use_enable video)
-		$(use_enable v4l)
-		$(use_enable v4l libv4l2)
-		$(use_enable sdl)
-		$(use_enable X x11)
-		$(use_enable X xv)
-
-		$(use doc || echo ac_cv_path_DOXYGEN=false)
-	)
-
-	# Mac OS X Audio Queue is an audio recording facility, available on
-	# 10.5 (Leopard, Darwin9) and onward
-	if use coreaudio && [[ ${CHOST} == *-darwin* && ${CHOST##*-darwin} -ge 9 ]]
-	then
-		myeconfargs+=( --enable-macaqsnd )
-	else
-		myeconfargs+=( --disable-macaqsnd )
-	fi
-
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	default
-	cd tester || die
-	./mediastreamer2_tester || die
-}
-
-src_install() {
-	default
-	prune_libtool_files
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins tester/*.c
-	fi
-}
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 478fafa4a770..6af78e00e75f 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -2,12 +2,10 @@ AUX eselect-mesa.conf.9.2 1630 BLAKE2B 6c67ef9b5dc94f2f26378c004a459680b05084900
 DIST mesa-17.1.10.tar.xz 9872168 BLAKE2B 205ece7b016fcc1de5bb72711775cd8f4b90f5d6c26db77d1576752fcd4a99a36cbcd902bb6ad1041d476d1c3b32479baceb4087c902ce598ede3d57851c6b9d SHA512 728dbd41f5d3a7a1c33fc18c08a8b8eb1f6d236c5f00781209f46b144dd66a27ecd723ab1635868b7ad77de3a18ad53f1a88c932f17c0be97605a2775e3b3a9b
 DIST mesa-17.2.8.tar.xz 10393304 BLAKE2B 558321eefc6d599aaedfe468f03c2f1f99b5c96c253637db00b7da3265ec38e031d15f77623db1f4408f15912c93347e0f5769b01d92329be7f55e45f6f6bf75 SHA512 ce05ad2d3e1b55ffe9c8ef65023a840c04b29014c7876b23182a6a6dd0b768f248ec21bc5b738d21b846f59f4b73501a9fe834d6a87e7dba16c6f821008e0f01
 DIST mesa-17.3.3.tar.xz 10637708 BLAKE2B a2cec4abc58eb71c1ec92d073ac3a128e1f993f69b163c9f6e474fef4520fe074d84ca8d972a7822a76226e132230f6e7fac320b940ea3462553d398ef6bcfce SHA512 7ac8ecdcf3b2b43239835bc2c5da7f2730f80a2db945fe00df03d1548920fbc074dd4806ddd345a1ce682fd29d75b2209ef81b6b06e657f9c8ae8622a34a03c1
-DIST mesa-18.0.0-rc2.tar.xz 10962300 BLAKE2B 89444a46261d837bd5c7bc54898ebdafe58e863d3532bd80f6592432d2925317fc0ac144dd55862a249d6390efc3955942dc2980ce87e589b9360de61a1f6148 SHA512 aada4caf4c2021bc1e7c071b32ed0ccbbbfe415bc1cb5a80eee3911b1b11a2bd87a10e99c5a152790709488afbdb60e87b4b66c2ca22c0cf89c029fb10c6e8b3
-DIST mesa-18.0.0-rc3.tar.xz 10964880 BLAKE2B 4887e2962b3d1c328734af9effe33cac7fd69c888b3c500d28423c62bae0a26fe58396c8371b1e0861e68a90c03be0029d5a32019efa920f40908b0b054d7c6c SHA512 62e7491cdd5a6651c2bb7c0268685654d5376a68135c1904c684f716805695840c0a16fcff324c75f3ec000bebfa835b3da9a13c479b612da715b171fe68bc0b
+DIST mesa-18.0.0-rc4.tar.xz 11027596 BLAKE2B 96554acd69636b91d1b79e7fefa4ba6e3f701ef7ef6c16718493070d62ab41c7bbd66e2f4d4a97fac8c236ac4c9150b2ce41e4e57b865fff6122b3f60b047e25 SHA512 91dd0a4396715a7896fc47aabf38c4b486df3b50c9764795805550ef01724d2e2281ba9b000e82760ea0e199c58d8c9943dbc732b2adab46554ff5c2f9e2ece1
 EBUILD mesa-17.1.10.ebuild 13439 BLAKE2B bb22c34fa2e7a794ba78ea621e7e3fc6e0aeeb65efe3599f2d5d6024a2e1b21101ac91c5e3a706a7f23c868db662928684be478d1be4c0ee4ed3bb186d981285 SHA512 033085950f8ee3c6390e1f083ed18abfe3c0fb875a8f71fc488857c2fa663e4e10221c0d43d32520928abd2eaa308ee807c67bfe296e050ab90af0d811dbcb9d
 EBUILD mesa-17.2.8.ebuild 14999 BLAKE2B 48693ff690c7f7283e5d8412b282265a24100d7e5a05acc2054b5058bad9d1971b3bfd5b4070803eff6c045c8904accc78b68e84958c73528036e42d8a856335 SHA512 c00b4d4ebaeabfbece7727f9605d9a91c691a759247b59d7b719bd576864f69ac6887a92b1bade227e374da19d8c609abe934a979714a7259e21cb60b10abe31
 EBUILD mesa-17.3.3.ebuild 14892 BLAKE2B 4b44795597c2e47151553133e75476155fde4c438f384434254027a7d73f2d80de3412ba11edfee83d434814378234875b1f4f884897fce7153baab5ac6c592b SHA512 3246e7864889ffb4d0bb907e3393edc9d718398f0002478e0b5a5cb02aa3a2320c3675b7320053c46b3336d62dcd366d96af85c37d2b8d10539d0adbea66870e
-EBUILD mesa-18.0.0_rc2.ebuild 14974 BLAKE2B b829d32a94238ffb139ad6f539f1a56207cc17fca91e3b61446688c760b1f04f1f36cf1419619a6ae9c16fd6e63c3959e47703d69ffc86839cb3cd93ecf48153 SHA512 2f882fd3a2735513e9fe0290c8203ed50955b0e3ac6a3a9b446041c447b1cb0914ce20c661813ce0ec2c04765f86b2b13284b7fc071dc5f65af9aab79e51dd49
-EBUILD mesa-18.0.0_rc3.ebuild 14974 BLAKE2B b829d32a94238ffb139ad6f539f1a56207cc17fca91e3b61446688c760b1f04f1f36cf1419619a6ae9c16fd6e63c3959e47703d69ffc86839cb3cd93ecf48153 SHA512 2f882fd3a2735513e9fe0290c8203ed50955b0e3ac6a3a9b446041c447b1cb0914ce20c661813ce0ec2c04765f86b2b13284b7fc071dc5f65af9aab79e51dd49
+EBUILD mesa-18.0.0_rc4.ebuild 14974 BLAKE2B b829d32a94238ffb139ad6f539f1a56207cc17fca91e3b61446688c760b1f04f1f36cf1419619a6ae9c16fd6e63c3959e47703d69ffc86839cb3cd93ecf48153 SHA512 2f882fd3a2735513e9fe0290c8203ed50955b0e3ac6a3a9b446041c447b1cb0914ce20c661813ce0ec2c04765f86b2b13284b7fc071dc5f65af9aab79e51dd49
 EBUILD mesa-9999.ebuild 14974 BLAKE2B b829d32a94238ffb139ad6f539f1a56207cc17fca91e3b61446688c760b1f04f1f36cf1419619a6ae9c16fd6e63c3959e47703d69ffc86839cb3cd93ecf48153 SHA512 2f882fd3a2735513e9fe0290c8203ed50955b0e3ac6a3a9b446041c447b1cb0914ce20c661813ce0ec2c04765f86b2b13284b7fc071dc5f65af9aab79e51dd49
 MISC metadata.xml 2095 BLAKE2B c1c858a478bbb1c7e38a45dbf00e380a3d26c56920db1897521a7e9f4eb005157e535207ae2274d744e3ce5514a57654eb0effb2cfc773263a0f417874cdc742 SHA512 c3db8aeb4f4ae7ea27c8b48cb26ee9348d84e6fb4b99df815b177e62e78cd980a7834c152e2c10c6fdbe2b91a032861a0c0503625874bfb6df58ccc3bf54e705
diff --git a/media-libs/mesa/mesa-18.0.0_rc3.ebuild b/media-libs/mesa/mesa-18.0.0_rc3.ebuild
deleted file mode 100644
index e2f425d49acd..000000000000
--- a/media-libs/mesa/mesa-18.0.0_rc3.ebuild
+++ /dev/null
@@ -1,582 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/mesa.git"
-
-if [[ ${PV} = 9999 ]]; then
-	GIT_ECLASS="git-r3"
-	EXPERIMENTAL="true"
-fi
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools llvm multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS}
-
-OPENGL_DIR="xorg-x11"
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
-
-if [[ $PV == 9999 ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="!bindist? ( bindist )"
-
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 imx intel nouveau vc4 virgl vivante vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-	bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 unwind
-	+llvm +nptl opencl osmesa pax_kernel openmax pic selinux vaapi valgrind
-	vdpau vulkan wayland xvmc xa"
-
-REQUIRED_USE="
-	d3d9?   ( dri3 gallium )
-	llvm?   ( gallium )
-	opencl? ( gallium llvm )
-	openmax? ( gallium )
-	gles1?  ( egl )
-	gles2?  ( egl )
-	vaapi? ( gallium )
-	vdpau? ( gallium )
-	vulkan? ( || ( video_cards_i965 video_cards_radeonsi )
-			  video_cards_radeonsi? ( llvm ) )
-	wayland? ( egl gbm )
-	xa?  ( gallium )
-	video_cards_freedreno?  ( gallium )
-	video_cards_intel?  ( classic )
-	video_cards_i915?   ( || ( classic gallium ) )
-	video_cards_i965?   ( classic )
-	video_cards_imx?    ( gallium video_cards_vivante )
-	video_cards_nouveau? ( || ( classic gallium ) )
-	video_cards_radeon? ( || ( classic gallium )
-						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
-	video_cards_r100?   ( classic )
-	video_cards_r200?   ( classic )
-	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_r600?   ( gallium )
-	video_cards_radeonsi?   ( gallium llvm )
-	video_cards_vc4? ( gallium )
-	video_cards_virgl? ( gallium )
-	video_cards_vivante? ( gallium gbm )
-	video_cards_vmware? ( gallium )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.89"
-# keep correct libdrm and dri2proto dep
-# keep blocks in rdepend for binpkg
-RDEPEND="
-	!<x11-base/xorg-server-1.7
-	!<=x11-proto/xf86driproto-2.0.3
-	abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
-	classic? ( app-eselect/eselect-mesa )
-	gallium? ( app-eselect/eselect-mesa )
-	>=app-eselect/eselect-opengl-1.3.0
-	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
-	>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libxcb-1.9.3:=[${MULTILIB_USEDEP}]
-	x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
-	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-	llvm? (
-		video_cards_radeonsi? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-		video_cards_r600? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-		video_cards_radeon? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-	)
-	opencl? (
-				app-eselect/eselect-opencl
-				dev-libs/libclc
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-	openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}] )
-	vaapi? (
-		>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
-		video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
-	)
-	vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
-	wayland? (
-		>=dev-libs/wayland-1.11.0:=[${MULTILIB_USEDEP}]
-		>=dev-libs/wayland-protocols-1.8
-	)
-	xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
-	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
-
-	video_cards_intel? (
-		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-	)
-	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-"
-for card in ${RADEON_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
-	"
-done
-RDEPEND="${RDEPEND}
-	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
-"
-
-# Please keep the LLVM dependency block separate. Since LLVM is slotted,
-# we need to *really* make sure we're not pulling one than more slot
-# simultaneously.
-#
-# How to use it:
-# 1. List all the working slots (with min versions) in ||, newest first.
-# 2. Update the := to specify *max* version, e.g. < 7.
-# 3. Specify LLVM_MAX_SLOT, e.g. 6.
-LLVM_DEPSTR="
-	|| (
-		sys-devel/llvm:7[${MULTILIB_USEDEP}]
-		sys-devel/llvm:6[${MULTILIB_USEDEP}]
-		sys-devel/llvm:5[${MULTILIB_USEDEP}]
-		sys-devel/llvm:4[${MULTILIB_USEDEP}]
-		>=sys-devel/llvm-3.9.0:0[${MULTILIB_USEDEP}]
-	)
-	sys-devel/llvm:=[${MULTILIB_USEDEP}]
-"
-LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
-CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-RDEPEND="${RDEPEND}
-	llvm? (
-		opencl? (
-			video_cards_r600? (
-				${CLANG_DEPSTR_AMDGPU}
-			)
-			!video_cards_r600? (
-				video_cards_radeonsi? (
-					${CLANG_DEPSTR_AMDGPU}
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeonsi? (
-					video_cards_radeon? (
-						${CLANG_DEPSTR_AMDGPU}
-					)
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeon? (
-					!video_cards_radeonsi? (
-						${CLANG_DEPSTR}
-					)
-				)
-			)
-		)
-		!opencl? (
-			video_cards_r600? (
-				${LLVM_DEPSTR_AMDGPU}
-			)
-			!video_cards_r600? (
-				video_cards_radeonsi? (
-					${LLVM_DEPSTR_AMDGPU}
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeonsi? (
-					video_cards_radeon? (
-						${LLVM_DEPSTR_AMDGPU}
-					)
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeon? (
-					!video_cards_radeonsi? (
-						${LLVM_DEPSTR}
-					)
-				)
-			)
-		)
-	)
-"
-unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	opencl? (
-		>=sys-devel/gcc-4.6
-	)
-	sys-devel/gettext
-	virtual/pkgconfig
-	valgrind? ( dev-util/valgrind )
-	>=x11-proto/dri2proto-2.8-r1:=[${MULTILIB_USEDEP}]
-	dri3? (
-		>=x11-proto/dri3proto-1.0:=[${MULTILIB_USEDEP}]
-		>=x11-proto/presentproto-1.0:=[${MULTILIB_USEDEP}]
-	)
-	>=x11-proto/glproto-1.4.17-r1:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}]
-	vulkan? (
-		$(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
-	)
-"
-[[ ${PV} == 9999 ]] && DEPEND+="
-	sys-devel/bison
-	sys-devel/flex
-	$(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
-	!pic? (
-		usr/lib*/libglapi.so.0.0.0
-		usr/lib*/libGLESv1_CM.so.1.1.0
-		usr/lib*/libGLESv2.so.2.0.0
-		usr/lib*/libGL.so.1.2.0
-		usr/lib*/libOSMesa.so.8.0.0
-	)
-)"
-
-llvm_check_deps() {
-	local flags=${MULTILIB_USEDEP}
-	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
-	then
-		flags+=",llvm_targets_AMDGPU(-)"
-	fi
-
-	if use opencl; then
-		has_version "sys-devel/clang[${flags}]" || return 1
-	fi
-	has_version "sys-devel/llvm[${flags}]"
-}
-
-pkg_setup() {
-	# warning message for bug 459306
-	if use llvm && has_version sys-devel/llvm[!debug=]; then
-		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
-		ewarn "detected! This can cause problems. For details, see bug 459306."
-	fi
-
-	if use llvm; then
-		llvm_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	[[ ${PV} == 9999 ]] && eautoreconf
-	eapply_user
-}
-
-multilib_src_configure() {
-	local myconf
-
-	if use classic; then
-		# Configurable DRI drivers
-		driver_enable swrast
-
-		# Intel code
-		driver_enable video_cards_i915 i915
-		driver_enable video_cards_i965 i965
-		if ! use video_cards_i915 && \
-			! use video_cards_i965; then
-			driver_enable video_cards_intel i915 i965
-		fi
-
-		# Nouveau code
-		driver_enable video_cards_nouveau nouveau
-
-		# ATI code
-		driver_enable video_cards_r100 radeon
-		driver_enable video_cards_r200 r200
-		if ! use video_cards_r100 && \
-				! use video_cards_r200; then
-			driver_enable video_cards_radeon radeon r200
-		fi
-	fi
-
-	if use egl; then
-		myconf+=" --with-platforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm")"
-	fi
-
-	if use gallium; then
-		myconf+="
-			$(use_enable d3d9 nine)
-			$(use_enable llvm)
-			$(use_enable openmax omx-bellagio)
-			$(use_enable vaapi va)
-			$(use_enable vdpau)
-			$(use_enable xa)
-			$(use_enable xvmc)
-		"
-		use vaapi && myconf+=" --with-va-libdir=/usr/$(get_libdir)/va/drivers"
-
-		gallium_enable swrast
-		gallium_enable video_cards_vc4 vc4
-		gallium_enable video_cards_vivante etnaviv
-		gallium_enable video_cards_vmware svga
-		gallium_enable video_cards_nouveau nouveau
-		gallium_enable video_cards_i915 i915
-		gallium_enable video_cards_imx imx
-		if ! use video_cards_i915 && \
-			! use video_cards_i965; then
-			gallium_enable video_cards_intel i915
-		fi
-
-		gallium_enable video_cards_r300 r300
-		gallium_enable video_cards_r600 r600
-		gallium_enable video_cards_radeonsi radeonsi
-		if ! use video_cards_r300 && \
-				! use video_cards_r600; then
-			gallium_enable video_cards_radeon r300 r600
-		fi
-
-		gallium_enable video_cards_freedreno freedreno
-		# opencl stuff
-		if use opencl; then
-			myconf+="
-				$(use_enable opencl)
-				--with-clang-libdir="${EPREFIX}/usr/lib"
-				"
-		fi
-
-		gallium_enable video_cards_virgl virgl
-	fi
-
-	if use vulkan; then
-		vulkan_enable video_cards_i965 intel
-		vulkan_enable video_cards_radeonsi radeon
-	fi
-
-	# x86 hardened pax_kernel needs glx-rts, bug 240956
-	if [[ ${ABI} == x86 ]]; then
-		myconf+=" $(use_enable pax_kernel glx-read-only-text)"
-	fi
-
-	# on abi_x86_32 hardened we need to have asm disable
-	if [[ ${ABI} == x86* ]] && use pic; then
-		myconf+=" --disable-asm"
-	fi
-
-	if use gallium; then
-		myconf+=" $(use_enable osmesa gallium-osmesa)"
-	else
-		myconf+=" $(use_enable osmesa)"
-	fi
-
-	# build fails with BSD indent, bug #428112
-	use userland_GNU || export INDENT=cat
-
-	ECONF_SOURCE="${S}" \
-	econf \
-		--enable-dri \
-		--enable-glx \
-		--enable-shared-glapi \
-		$(use_enable !bindist texture-float) \
-		$(use_enable d3d9 nine) \
-		$(use_enable debug) \
-		$(use_enable dri3) \
-		$(use_enable egl) \
-		$(use_enable gbm) \
-		$(use_enable gles1) \
-		$(use_enable gles2) \
-		$(use_enable nptl glx-tls) \
-		$(use_enable unwind libunwind) \
-		--enable-valgrind=$(usex valgrind auto no) \
-		--enable-llvm-shared-libs \
-		--disable-opencl-icd \
-		--with-dri-drivers=${DRI_DRIVERS} \
-		--with-gallium-drivers=${GALLIUM_DRIVERS} \
-		--with-vulkan-drivers=${VULKAN_DRIVERS} \
-		PYTHON2="${PYTHON}" \
-		${myconf}
-}
-
-multilib_src_install() {
-	emake install DESTDIR="${D}"
-
-	if use classic || use gallium; then
-			ebegin "Moving DRI/Gallium drivers for dynamic switching"
-			local gallium_drivers=( i915_dri.so i965_dri.so r300_dri.so r600_dri.so swrast_dri.so )
-			keepdir /usr/$(get_libdir)/dri
-			dodir /usr/$(get_libdir)/mesa
-			for x in ${gallium_drivers[@]}; do
-				if [ -f "$(get_libdir)/gallium/${x}" ]; then
-					mv -f "${ED}/usr/$(get_libdir)/dri/${x}" "${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \
-						|| die "Failed to move ${x}"
-				fi
-			done
-			if use classic; then
-				emake -C "${BUILD_DIR}/src/mesa/drivers/dri" DESTDIR="${D}" install
-			fi
-			for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do
-				if [ -f ${x} -o -L ${x} ]; then
-					mv -f "${x}" "${x/dri/mesa}" \
-						|| die "Failed to move ${x}"
-				fi
-			done
-			pushd "${ED}"/usr/$(get_libdir)/dri || die "pushd failed"
-			ln -s ../mesa/*.so . || die "Creating symlink failed"
-			# remove symlinks to drivers known to eselect
-			for x in ${gallium_drivers[@]}; do
-				if [ -f ${x} -o -L ${x} ]; then
-					rm "${x}" || die "Failed to remove ${x}"
-				fi
-			done
-			popd
-		eend $?
-	fi
-	if use opencl; then
-		ebegin "Moving Gallium/Clover OpenCL implementation for dynamic switching"
-		local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa"
-		dodir ${cl_dir}/{lib,include}
-		if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then
-			mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \
-			"${ED}"${cl_dir}
-		fi
-		if [ -f "${ED}/usr/include/CL/opencl.h" ]; then
-			mv -f "${ED}"/usr/include/CL \
-			"${ED}"${cl_dir}/include
-		fi
-		eend $?
-	fi
-
-	if use openmax; then
-		echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share/mesa/xdg\"" > "${T}/99mesaxdgomx"
-		doenvd "${T}"/99mesaxdgomx
-		keepdir /usr/share/mesa/xdg
-	fi
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name '*.la' -delete
-	einstalldocs
-
-	if use !bindist; then
-		dodoc docs/patents.txt
-	fi
-
-	# Install config file for eselect mesa
-	insinto /usr/share/mesa
-	newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf
-}
-
-multilib_src_test() {
-	if use llvm; then
-		local llvm_tests='lp_test_arit lp_test_arit lp_test_blend lp_test_blend lp_test_conv lp_test_conv lp_test_format lp_test_format lp_test_printf lp_test_printf'
-		pushd src/gallium/drivers/llvmpipe >/dev/null || die
-		emake ${llvm_tests}
-		pax-mark m ${llvm_tests}
-		popd >/dev/null || die
-	fi
-	emake check
-}
-
-pkg_postinst() {
-	# Switch to the xorg implementation.
-	echo
-	eselect opengl set --use-old ${OPENGL_DIR}
-
-	# Select classic/gallium drivers
-	if use classic || use gallium; then
-		eselect mesa set --auto
-	fi
-
-	# Switch to mesa opencl
-	if use opencl; then
-		eselect opencl set --use-old ${PN}
-	fi
-
-	# run omxregister-bellagio to make the OpenMAX drivers known system-wide
-	if use openmax; then
-		ebegin "Registering OpenMAX drivers"
-		BELLAGIO_SEARCH_PATH="${EPREFIX}/usr/$(get_libdir)/libomxil-bellagio0" \
-			OMX_BELLAGIO_REGISTRY=${EPREFIX}/usr/share/mesa/xdg/.omxregister \
-			omxregister-bellagio
-		eend $?
-	fi
-
-	# warn about patent encumbered texture-float
-	if use !bindist; then
-		elog "USE=\"bindist\" was not set. Potentially patent encumbered code was"
-		elog "enabled. Please see /usr/share/doc/${P}/patents.txt.bz2 for an"
-		elog "explanation."
-	fi
-}
-
-pkg_prerm() {
-	if use openmax; then
-		rm "${EPREFIX}"/usr/share/mesa/xdg/.omxregister
-	fi
-}
-
-# $1 - VIDEO_CARDS flag
-# other args - names of DRI drivers to enable
-# TODO: avoid code duplication for a more elegant implementation
-driver_enable() {
-	case $# in
-		# for enabling unconditionally
-		1)
-			DRI_DRIVERS+=",$1"
-			;;
-		*)
-			if use $1; then
-				shift
-				for i in $@; do
-					DRI_DRIVERS+=",${i}"
-				done
-			fi
-			;;
-	esac
-}
-
-gallium_enable() {
-	case $# in
-		# for enabling unconditionally
-		1)
-			GALLIUM_DRIVERS+=",$1"
-			;;
-		*)
-			if use $1; then
-				shift
-				for i in $@; do
-					GALLIUM_DRIVERS+=",${i}"
-				done
-			fi
-			;;
-	esac
-}
-
-vulkan_enable() {
-	case $# in
-		# for enabling unconditionally
-		1)
-			VULKAN_DRIVERS+=",$1"
-			;;
-		*)
-			if use $1; then
-				shift
-				for i in $@; do
-					VULKAN_DRIVERS+=",${i}"
-				done
-			fi
-			;;
-	esac
-}
diff --git a/media-libs/mesa/mesa-18.0.0_rc2.ebuild b/media-libs/mesa/mesa-18.0.0_rc4.ebuild
index e2f425d49acd..e2f425d49acd 100644
--- a/media-libs/mesa/mesa-18.0.0_rc2.ebuild
+++ b/media-libs/mesa/mesa-18.0.0_rc4.ebuild
diff --git a/media-libs/openal/Manifest b/media-libs/openal/Manifest
index a09c8d42bed9..f671724d8fe6 100644
--- a/media-libs/openal/Manifest
+++ b/media-libs/openal/Manifest
@@ -1,5 +1,5 @@
 DIST openal-soft-1.15.1.tar.bz2 253006 BLAKE2B 0023eed2e98d07190aa4301a84e6818224feb6459303681276525237c5de9c145cdaab3437cae6b7998307a2294aafebedf3852cbebe8c12232d1e39ba6e15e8 SHA512 ca6dafdd503d06892dff08763bc00b974ec6e7c4bf3dcebb4cb41a486b4ea777c278299a198db182fee888a19a5716bd57d91a2859b764a532138a79f2bd672f
 DIST openal-soft-1.18.2.tar.bz2 639420 BLAKE2B 8e31db9d3c6eb49fe4833a6449603dc6284e39810942536594fb5e96d0bc2b867b69bd90e64d40cf99f9a279f3809509cf1c9af3114a4887057e78962a5463e8 SHA512 752e2fb0a5a014caa6d6bac1590d3df46140b463fbaa13378fb5de89f1c97ee8b62bec74f68484d4ec02ee8755c1a2d0c9394cdb477db1b7401deae2fb9eeb4d
 EBUILD openal-1.15.1-r2.ebuild 1461 BLAKE2B 96c339461509d21beccecef1f52a60f2181d1dc87b31d2cc05aad10dc3e8a4e47cc5be6721dcbaae07ad401650f38092bd20d501302137354ca668b0c631186a SHA512 0f4ce8cfdeb34c1ab3ef16cb7fdb72fd6d2e53ff306ac241c472f161f298fe9eec4b64603bda566e2fd45ed8fc89f8a4ad60f3043594e53568711b728af1a098
-EBUILD openal-1.18.2-r1.ebuild 2026 BLAKE2B 19565179ae0ee6da4f82a035aca850d0b155c754451b0399e2ef3f8deeab4c9036323f7ae9e000a0cb97095fad1fd6cb39dcdf8dd98117bac8589d176a72f5e6 SHA512 48a8131eecc06bd97486f1fc1bd0a283e9fbb0460f61cae532eb1a44d057b66d7babc31772e2b38fb4b762d239016cb084040bc249bd8633426e37d000d0b8e2
+EBUILD openal-1.18.2-r1.ebuild 2025 BLAKE2B f18ec6fd37743ce78066ae5525945f09a61b1bb90fea037636611f46b428b076d57173a207f037474c2625df827f433de9abb72e4177205883a8a06ee062985e SHA512 78732b2738a88b7f626a814a395ab422f989be8cb2bf0202784a55b4b7f3d16843c0c17c462e06d5228b06637607dd1976e4c7e0d8ab18a3985fe25945313c61
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-libs/openal/openal-1.18.2-r1.ebuild b/media-libs/openal/openal-1.18.2-r1.ebuild
index 4ec48c899f8a..34c7c4a76eee 100644
--- a/media-libs/openal/openal-1.18.2-r1.ebuild
+++ b/media-libs/openal/openal-1.18.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://kcat.strangesoft.net/openal-releases/${MY_P}.tar.bz2"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="
 	alsa coreaudio debug jack oss portaudio pulseaudio qt5
 	cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 4e8039bc6a54..e682197eda6e 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -20,6 +20,7 @@ AUX opencv-3.3.0-contrib-xfeatures2d.patch 1038 BLAKE2B 19b304148474a5baab14c231
 AUX opencv-3.3.0-cuda9-cmake.patch 4676 BLAKE2B 9de3c4b988720a0b5fad1674d3967271def339c9fe45bd733b0843bede6da9ecc24b6f58b41a8f329f7f97a11e6c9ce6eacb33d9819d046d16acf257486fd4c2 SHA512 a526c9b0b248dac465da67adfd2260c9edd24ad3c335e060af134fa8700c7fb4e4a0ca0450b666966f917fb73ef2f168254a31488ce2bb74262f915d67225f90
 AUX opencv-3.3.0-cuda9-compute20.patch 775 BLAKE2B 7a818042ba9c75fd835b7fc8f6c0793aab8fef6f72964e9b57738e164c67ca16f885a8ad362360065b13bd35d4045e9c1a2683b59cc5d2b4162dc7794558a542 SHA512 00468ac115865acaba15efcf3791a927d6434ee54e37af3dd78bae3485868108ce4d1068ce94739a4d92b1673dd2111ebc30831446d69db4c999b95c5454c9cf
 AUX opencv-3.3.0-cuda9-saturate.patch 1075 BLAKE2B 9e7af021924e84d0f12e8f9b764630dbd35e8d732550f2c16d7f812e9cbd4d4a1499182d7239b266985d39061a8a3f3e95b65e876c8dd339de9f1b764e769089 SHA512 e19b95957c282af846d08d2d6a7d8290c32692af165bc9c627a3d2e42319775d5128a832a4f639915b1331f8db979f2b88c1528e6059aeb78159a8f5409e1644
+AUX opencv-3.3.0-remove-tiny-dnn-autodownload.patch 1138 BLAKE2B 0bf85ca7a0e3759a4de14a844f2929120a47f9c0c212992d078b19cc7a602e157d5233ebc30d7eb6dcfa8c5a9606e3acea15e5a96717842fa80d2d8b3fa3189c SHA512 6824c3fc193491d0d776a7a904d71515309a5b67b0dfa1790bbd402c40b68e813c9fdfc3037a60f31893341ea78553d97470d152e90f34485004e0e50e6d66f6
 DIST imgcodecs-opencv-3.3.0.tar.gz 7724 BLAKE2B 0e1c931a6dd796a7fa8e4a958f9a959d3bbba9bfa636a74a22d839b2919a8e1d0843765bcb69c5fbff7156efad0db2e5b3b70a2fc6e1911c0317ba46142cc130 SHA512 9c6fc31830e299e3d15da1cfc3468fe23eecda970a02e5826e0a7cfba34200c557c0e46f940154a26e9916da05859a83376217cbe7452ec8d14e99bc76f63d37
 DIST opencv-2.4.13.tar.gz 91669572 BLAKE2B 7f6be39e29c0db5d005cb14215fdf5955fa69c34d72c4f1e1fa8bf8de1e748a0d2fe5febb43296ef529c57e4dec8d1b6739c0c4df9e64657b9550ed382fbc4b9 SHA512 efdc4340fdf557dae44ac604c8c20f61ced89f99274264b61c2640f28741504462c6b57076e207040ca2513e3921275bdfbe6c22fc123bd50df78745e6b7bcd6
 DIST opencv-3.1.0.tar.gz 76135587 BLAKE2B 59d0facba6573ae7b6ec8b4d8097693181244988c8c460a738004b975a65442230f387eef172920cd56682a4fa19f28368262ad85b7c79f243e2063c56275755 SHA512 57e0fe41e3d5d1dc036e7fc5673523e53d54f5f62e4d3bcb95238a9cd53e79da7c1704dc136ce632f7cfce369ebf5eb27f629a9b6ac4f7fa34120b80b5c7438f
@@ -37,4 +38,4 @@ EBUILD opencv-3.2.0-r3.ebuild 12171 BLAKE2B f5fdc59285166a2a4e2e31901eef8d66cf0b
 EBUILD opencv-3.3.0-r2.ebuild 12169 BLAKE2B a6ed4ce0fc0f3a2bd432979c2caa88f8e27ad2dfe2b94e8c871d394496b7443452323463e7cbc47b52a8bdfaf02d9573d146746bd38248e26da05bcf36d0203e SHA512 d56942b7173929b842e068fcc83dceba38c9cad6e48dfc745438d2bd007a1db604e312034a423e299fd082a3d22ae0cbe52ad82219ffe8a228fb3a8e3ecc80f6
 EBUILD opencv-3.3.0-r4.ebuild 16525 BLAKE2B 053b335e77f6a85ccc3d31de2e0ab7211fff0ef93d37d43f659161581d130c2fd64d9e5558e4f3c0fb2628dee01e37093782ed05e57c74a1eff74064d4c194bd SHA512 4b2a62017bc97ea01c08e56fb33a55f48abebea743cb6d6b9be15cc42c7fbc26707bc016b4f27f39c183abbeca1c4666e7c98844413e2495ebd6a93cf85d42ba
 EBUILD opencv-3.3.0-r5.ebuild 17096 BLAKE2B b831fe5601493b228023ee9f2d86d265b3841375beec391c1c2622df8c7b673c239086d249470a98b09aade2be3c7f983e7748b386f385d23dd2762ccd8cfa0e SHA512 9f8b51d1adaae620133c144ca3f4c1ad6d249a4bc77db883a7318eb3d80034978e371852d003866de5376824e1808fc2644da2308365920842f4c3590b0b452f
-MISC metadata.xml 2589 BLAKE2B 461791c4838078ef4a73add8fe730195ffc941e535e63a2d23603a0229e345071d08bf040cf86a17453239e5a7419fd8ccb1c78abfbf6b656b807ea766385913 SHA512 4db9642180623f050783e7d6018c5e0d8455791efe9fd23d329400af30dda7e2266f6b05a886b3cc327bf53b6c40027e77339636bc805e326db0fbf4d84381c9
+MISC metadata.xml 2541 BLAKE2B cc1a2f017f2cc80c76edc9e20cc4bb224a2f55351575d6faf5fba43e82906f9a99bd4abeb1de2677c527d40354dca3bd0bc69015145a339285341f3d46760cde SHA512 9800b705fa2571dee354b3fd6b34a71505ac66482d47b1bd974b49afdf42b7c27f37a375053c5cf469991f2d095535c3e96f4c5c89dc9a4e9820c57b8f1a21bc
diff --git a/media-libs/opencv/files/opencv-3.3.0-remove-tiny-dnn-autodownload.patch b/media-libs/opencv/files/opencv-3.3.0-remove-tiny-dnn-autodownload.patch
new file mode 100644
index 000000000000..6929a4c2ce4c
--- /dev/null
+++ b/media-libs/opencv/files/opencv-3.3.0-remove-tiny-dnn-autodownload.patch
@@ -0,0 +1,27 @@
+diff -purN a/modules/dnn_modern/CMakeLists.txt b/modules/dnn_modern/CMakeLists.txt
+--- a/modules/dnn_modern/CMakeLists.txt	2017-07-31 15:58:38.000000000 +0100
++++ b/modules/dnn_modern/CMakeLists.txt	2018-01-15 17:15:15.202454388 +0000
+@@ -15,23 +15,6 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CU
+ # MODULE REQUIREMENTS
+ # ----------------------------------------------------------------------------
+ 
+-set(TINY_DNN_CPP_PATH "${OpenCV_BINARY_DIR}/3rdparty/tinydnn")
+-set(TINY_DNN_CPP_ROOT "${TINY_DNN_CPP_PATH}/tiny-dnn-1.0.0a3")
+-ocv_download(FILENAME "v1.0.0a3.tar.gz"
+-               HASH "adb1c512e09ca2c7a6faef36f9c53e59"
+-               URL
+-                 "${OPENCV_TINY_DNN_URL}"
+-                 "$ENV{OPENCV_TINY_DNN_URL}"
+-                 "https://github.com/tiny-dnn/tiny-dnn/archive/"
+-               DESTINATION_DIR "${TINY_DNN_CPP_PATH}"
+-               STATUS TINY_DNN_DOWNLOAD_SUCCESS
+-               ID "tiny-dnn"
+-               UNPACK RELATIVE_URL)
+-
+-if(NOT TINY_DNN_DOWNLOAD_SUCCESS)
+-  message(STATUS "Failed to download tiny-dnn sources")
+-endif()
+-
+ find_package(TinyDNN QUIET)
+ 
+ include(CheckCXXCompilerFlag)
diff --git a/media-libs/opencv/metadata.xml b/media-libs/opencv/metadata.xml
index a557fc060986..5e3541cd325b 100644
--- a/media-libs/opencv/metadata.xml
+++ b/media-libs/opencv/metadata.xml
@@ -4,7 +4,6 @@
 	<maintainer type="person">
 		<email>amynka@gentoo.org</email>
 		<name>Amy Liffey</name>
-		<description>Assign bugs on me.</description>
 	</maintainer>
 	<maintainer type="person">
 		<email>dilfridge@gentoo.org</email>
diff --git a/media-libs/partio/Manifest b/media-libs/partio/Manifest
index a25353be6474..71c3240887ec 100644
--- a/media-libs/partio/Manifest
+++ b/media-libs/partio/Manifest
@@ -1,4 +1,4 @@
 AUX partio-1.1.0-Rename-partconv.patch 2459 BLAKE2B d811f5174dd2c5e158e7985e8fdea520faeb248249b88c8ebec37dc91f50312ed44d39563142cb3a28fa07ce9b6907824835484881782ceac9b8894978bcb061 SHA512 1965a236f43092c05c940c0f2b33d9c77066ed5fbf3b1753bcf5d9b13c8e5a6e60ef41ba13c9471d1d26d1dc74fead52d0ef1c18f04b1f942345fd1412b0c932
 DIST partio-1.1.0_p20170829.tar.gz 275959 BLAKE2B 441c2d0ab9dd91fa52a826d49f7448dc4d5d0a8d6b72bdb58793dd3c97d86739b25e582bdff41160599489a2835ad8e68676012cb70ef8edff062df3205ab209 SHA512 daedb23ae2b89d3f2ef36ef13afc624a663b3fab91c22f9a454439ff3bc194b78a87e37c9133f6948567ab3b183eff960bb51951b0427cff8c1c29099b6578d6
-EBUILD partio-1.1.0_p20170829.ebuild 1061 BLAKE2B d6a985afd56f4c564e6d66d38de07a2a794afd0798b8a0212c41a70188c556896111d8c8ea517387d91087b7c322abf4362698df70d2a0ac7f3ea54389663dfe SHA512 92dafb90ef000211544c9ed8e12282814be2a859ab92cc41df78204b3320fec5c0f60b5eca7cb5dd053c6c83aeedfd7d01eaaf7fbcdb09f276fc9775f7b06149
+EBUILD partio-1.1.0_p20170829.ebuild 1060 BLAKE2B e097b743240f8d2e1b81ef10e5f36264a97919df2bb331102fb983560e65aeb780bbd9a0fef29a1931d3febee4e08618cc3dfaf508589fcf219d77c1f90b6cac SHA512 799a7dcd0fa4a6d64a29a7cb13524ef09530225f4e78748605b20d779b3d5a89402e9379ddab7d063f34a5fbc918a88dd7df05338a3a50f0fe52af5074a58cdb
 MISC metadata.xml 640 BLAKE2B 3b2c33cb14c466bd4641cc04781d1de05d01170ccc591b3caae40356f934944c4c969834bad5ccdcf9f5390d203270055863b08feb7321492a27d4d7575aced5 SHA512 7116217ccc87ab80d8cb4ee0ea20089ea1c0a5b4ea9b3f666548b37422c01a8917516a5db565fc55f779bb19613fbfb515cfae0b9f87f010f5034c14d27ed8e0
diff --git a/media-libs/partio/partio-1.1.0_p20170829.ebuild b/media-libs/partio/partio-1.1.0_p20170829.ebuild
index bbba8e72a91c..0ca9c31c2662 100644
--- a/media-libs/partio/partio-1.1.0_p20170829.ebuild
+++ b/media-libs/partio/partio-1.1.0_p20170829.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/wdas/${PN}/archive/${MY_GIT_COMMIT}.tar.gz -> ${P}.t
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="doc"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/media-libs/speexdsp/Manifest b/media-libs/speexdsp/Manifest
index 272fcd611124..43a678e75dcb 100644
--- a/media-libs/speexdsp/Manifest
+++ b/media-libs/speexdsp/Manifest
@@ -2,7 +2,5 @@ AUX speexdsp-1.2_rc3-config_types.h.patch 2188 BLAKE2B 1e0c25b5e65a5999f5284abf0
 AUX speexdsp-1.2_rc3-configure.patch 1506 BLAKE2B 76276ba7cc0c7143da55d90be9a60ea697dc13f9ad65d7d24a83606b14c543700788e9213d1562371203ace9d45131cb52103d7f045ddf17adc0e30fd3876013 SHA512 95a95e5ca052b6ab3091ce9c461e7356f029e65b47a0a0f291448325acceb23c5cb12d81dbdecec13945b70fa8161e479bc6767de484c2c2f13a5299a3b9304c
 AUX speexdsp-1.2_rc3-overflow.patch 2211 BLAKE2B 36a5aaedd730d8847046ce8cb9453678cf7aa503e060b25fb24e57516bbaaa7b987d3abb93fab741933c3fd43c490a090ac9fd64a6fbb2496f3a0364029c6b50 SHA512 f948be7513ed33a133a19bf571b8b1395f37b86715e2426a59105494d16c269c54c3a32c916f89af7e5b4b1d4aff90839e2b1ed2b13de482e54ac05bef449b31
 DIST speexdsp-1.2rc3.tar.gz 901771 BLAKE2B 85d047df82fc06906598da39ae653aa245c246bfea75c02d25f7811983babdab6a8499c9b563e0d7d2145fa490674df2cf0a05989884ffb3c2c2a183415ce841 SHA512 29dfa8345df025eeb076561648a9b5c0485692be699b6da3c2a3734b4329187a1c2eb181252f4df12b21f1309ecdf59797437dfb123d160fd723491ab216e858
-EBUILD speexdsp-1.2_rc3-r1.ebuild 1466 BLAKE2B 3778e15394c69370bd493a1130f716954861fd9bab81244da11bee3f5a5ad3fad42e368b7b6219999fdc125b70b2257518c3a7ce657654239d777782b1cd59f1 SHA512 148ab93d88edea7e6fd50ea7fa8a5011d13b4609778f03b61d63ef5457074a7f8a6daf0ab1cc6de402ce6fe0bf4391345b15466d9fa8c466c86ec0a7a70d7b76
 EBUILD speexdsp-1.2_rc3-r2.ebuild 1496 BLAKE2B dd55b007f5d9a7b3fccb32d75d0548a0a619a32357ac4a47729b8b3dfebd1c4593da66afd47ab5240b54c8c4302e9bce985923019226b8697952ce085a12f2c5 SHA512 a5b4a09814a072fd4a94d5568777e7b545f669ec841f6b19fe3285a295569cb93be83b8bd1b29b3788339e63f09c6a605b317e26c0f38110122a9f3a9abbabf2
-EBUILD speexdsp-1.2_rc3.ebuild 1422 BLAKE2B 3e2720efc4fa740ba5ba18c0dcbcff580f4b572baf2c5840aece7cad18464862394c25db7a0fff2f9be996cf3d18f85feb6d393d31be6975b35fc9712e78d129 SHA512 16cb6141e84d413af8be8652c60398612bead1a95f9bfb6e26c2ec9260885a2bd9db910a35ff34123f6095c6502946859623169e364daf86935530b972e98f53
 MISC metadata.xml 342 BLAKE2B 5b793ea5060e3e8359d6b50ebd5211471de0d72608086d1d0a67c655cc30c15e0b0db4545a578882144f9f1f4913779037ff76aeeb94002db2b162db78a6364e SHA512 32081e424d3f4ad3fd0ef4979c339d1139cb2298e6703210ff741b77a8b3bf2e1d4b550b0d76a1bd0c4dc5ac465b3ebdd1fe86da45d46586cd3560261f73c457
diff --git a/media-libs/speexdsp/speexdsp-1.2_rc3-r1.ebuild b/media-libs/speexdsp/speexdsp-1.2_rc3-r1.ebuild
deleted file mode 100644
index b8f99c5a28a6..000000000000
--- a/media-libs/speexdsp/speexdsp-1.2_rc3-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools flag-o-matic multilib-minimal
-
-MY_P=${P/_}
-MY_P=${MY_P/_p/.}
-
-DESCRIPTION="Audio compression format designed for speech -- DSP"
-HOMEPAGE="https://www.speex.org/"
-SRC_URI="https://downloads.xiph.org/releases/speex/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_arm_neon static-libs"
-
-RDEPEND="!<media-libs/speex-1.2.0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}/${P}-configure.patch"
-	"${FILESDIR}/${P}-config_types.h.patch"
-)
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e 's:noinst_PROGRAMS:check_PROGRAMS:' \
-		libspeexdsp/Makefile.am || die
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	append-lfs-flags
-
-	# Can also be configured with one of:
-	# --enable-fixed-point             (no floating point)
-	# --with-fft=proprietary-intel-mkl (mkl)
-	# --with-fft=gpl-fftw3             (fftw)
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable static-libs static) \
-		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_enable cpu_flags_x86_sse2 sse2) \
-		$(use_enable cpu_flags_arm_neon neon)
-}
-
-multilib_src_install_all() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/speexdsp/speexdsp-1.2_rc3.ebuild b/media-libs/speexdsp/speexdsp-1.2_rc3.ebuild
deleted file mode 100644
index ebc776d5b2d0..000000000000
--- a/media-libs/speexdsp/speexdsp-1.2_rc3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools flag-o-matic multilib-minimal
-
-MY_P=${P/_}
-MY_P=${MY_P/_p/.}
-
-DESCRIPTION="Audio compression format designed for speech -- DSP"
-HOMEPAGE="http://www.speex.org/"
-SRC_URI="http://downloads.xiph.org/releases/speex/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_arm_neon static-libs"
-
-RDEPEND="!<media-libs/speex-1.2.0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=( "${FILESDIR}/${P}-configure.patch" )
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e 's:noinst_PROGRAMS:check_PROGRAMS:' \
-		libspeexdsp/Makefile.am || die
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	append-lfs-flags
-
-	# Can also be configured with one of:
-	# --enable-fixed-point             (no floating point)
-	# --with-fft=proprietary-intel-mkl (mkl)
-	# --with-fft=gpl-fftw3             (fftw)
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable static-libs static) \
-		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_enable cpu_flags_x86_sse2 sse2) \
-		$(use_enable cpu_flags_arm_neon neon)
-}
-
-multilib_src_install_all() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index fccfd8fc54bc..5fe06a384ec8 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -6,7 +6,7 @@ DIST xine-lib-1.2.6.tar.xz 5020964 BLAKE2B 832a05897b233773569d74caf5320b5a11fdd
 DIST xine-lib-1.2.8.tar.xz 5151580 BLAKE2B e0b62aa74545aa40737673e8fb4b6f493f65cbb14f059aaafdeab52f0ad6a34832558b0e1f6cad3bc288e584594de3a4e842d1e770dbc1244247431bb5bd1829 SHA512 ef7cdf1090f4e113f441055963dce9751b548398ff1a4da5e45b7fea45d4f8b5443622e675d343984ec956f3fc054ff9214a2aee3edd3a79d8ddb77afc3e17b2
 DIST xine-lib-1.2.9.tar.xz 5180452 BLAKE2B 43d977d31bf2fcabd896c806e56d5cd12cf579951a4e0df5451df7323fb43cff2770fb2bf1b65b9041e761ec9e9e68d55f761e18522c787aa643f71bb73bd0b7 SHA512 bc672b32d6d72e6fa5641319e0bd15d721ea4b65e6d025e3cdbf6ba3655a7b2c714809d919a53fca8a908a7ce37541a341c13dd8a336799c2e942d5f86b84d3c
 EBUILD xine-lib-1.2.6-r2.ebuild 5726 BLAKE2B 47bc92135d960c6d94970e86c3e02b7e325feb5aa2ba73cf62c43d4a15b0b87c3fec03978f5345c043b12482383668e7b86c968298fb87d51ea8e31da8fe35b2 SHA512 5b92b1712da307acd84b3e0afa091cbb395e169d434b640cb3b44e4b02fae0d7c48e8296511124679e1e478a948b8a261933b27f8ce64d4f669bdc3ed445bd79
-EBUILD xine-lib-1.2.8.ebuild 5697 BLAKE2B d8baf5cd1478665d092e74da71f23bf23e598545c1f3c32b62a5e667f84ec66e7a26735688598fcd6fbf9d80b297ce5e42d93b2f220f8db5a200548790c99dec SHA512 c25ea834cada0b68d19adacfc8e338608e4f855693b989913900f9ddc86c56b386825f399a830ddfd19eadfbf255c81be61da30d8dbc213848f7c85bbbecb7f2
+EBUILD xine-lib-1.2.8.ebuild 5696 BLAKE2B 7560e459258e066d5df9bd939e559845e22f86a63213bababdd6f98febbd26c616c1659ac06dc79bcad3e10d670b539ec735170d257ffa96c57c6123d3164be2 SHA512 4e84e6312fb3df90291680cd338ef336dae7a7835c282c16fd792b33b4112782c8ea77dbca2f72ca42ee9aaa2f4f0940e50184d4e77be2b3e4ff5f33fe58df45
 EBUILD xine-lib-1.2.9.ebuild 5565 BLAKE2B 6e5ca0d27be4dae22f23dbc822e849c2b24696ebfbc2dd788b1391470cea49c9ad5ee5ebc44b2c76c55c94e256e80cf1c95d8d91d630a933eb1b4ddee2bfbf05 SHA512 7cd31a34ec4cb49b0faf0c56a3b6e672b5d602f50a3d732ddcab8934808531599f49bce3ef599bb72fef30b2b4a7de735f43b53f996d3671590aafe1fffd4763
 EBUILD xine-lib-1.2.9999.ebuild 5449 BLAKE2B 03d41975b7a68c73c3331f5be5086042f514a55f28eb16b62117afdab1657909281af440b4ff9a87e950ef6cd7e0f9b9e0bc8b7e29acc0b1a3e44cf37e69cd15 SHA512 7996e99e79a9bd761ce4fe8e0694ab53e8f9c3ea394953489ee0f64906b374a6883d8487e9b0f3229e2f3e1dfd9c6a6663b574ae64475b75023e84c3e4fd993c
 MISC metadata.xml 2668 BLAKE2B 64956b27b10284478ae15509a1aa4a1408104c1e98263ac7e1ea376cbb8e596f532e049f4b3381c51f86d4cd4187784be6ad481177ffc62aef0964c90094d6b1 SHA512 17263da5cdc28752dc9344b9806665d236d8a5d3ccad7b19209912a3510b17c9d6587fd1aa847e509a3c4accd53cc96c7d1fc476f6adf9aa63c90b7eed45183b
diff --git a/media-libs/xine-lib/xine-lib-1.2.8.ebuild b/media-libs/xine-lib/xine-lib-1.2.8.ebuild
index 5bcd9a57d226..09a56a22a579 100644
--- a/media-libs/xine-lib/xine-lib-1.2.8.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then
 	NLS_DEPEND="sys-devel/gettext"
 	NLS_RDEPEND="virtual/libintl"
 else
-	KEYWORDS="amd64 ~arm64 ~hppa ppc ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="amd64 ~arm64 ~hppa ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
 	SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
 	NLS_IUSE="nls"
 	NLS_DEPEND="nls? ( sys-devel/gettext )"
author	V3n3RiX <venerix@redcorelinux.org>	2018-02-11 16:09:52 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2018-02-11 16:09:52 +0000
commit	f78108598211053d41752a83e0345441bb9014ae (patch)
tree	dd2fc7ae0a1aea7bda4942ab0c453d1e55284b37 /media-libs
parent	dc45b83b28fb83e9659492066e347b8dc60bc9e3 (diff)