gentoo resync : 13.10.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-10-13 22:19:36 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-10-14 23:22:23 +0100
commit: 4b19be30aa626b327c885dae62c559ec0e9fb935 (patch)
tree: 76e74807bc479502e13866b581b6bf86734ec634 /media-video
parent: 30d6f67c98d149508509d5e86f176d558793acc0 (diff)
92 files changed, 275 insertions, 1506 deletions
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 4944be4062cb..3d193cbd5d78 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/acidrip/Manifest b/media-video/acidrip/Manifest
index e046872887ef..32ef69962224 100644
--- a/media-video/acidrip/Manifest
+++ b/media-video/acidrip/Manifest
@@ -1,5 +1,5 @@
 AUX acidrip-0.14-makefile.patch 2360 BLAKE2B 565554ea73dc3eefa7141ecd9fec35bba2837e0fbd74991241f1a07bfe63221c346335aa86a42d134cb28c9ceeb3d261d508a25b7285430406814a80c17bad2b SHA512 7e91ea9ad24e20f620f0d406f2dd5d5ed5364cf92d57566c969e17aef0a0bb3d172142692a08766b4cbce0f4e1c2594672542765e68c559e9c9679a27012441b
 AUX acidrip-mplayer.patch 1079 BLAKE2B 8115276151641042b854f7ddc0607a939eb67c86b2cc1d56037cd5209a5c898e6bba97ee974d58eba59d09bc43c2701176e0a54ad26aa4d17c2582c3a7b3fd30 SHA512 ae1b57efbd49de33f60dd0d6daffb4c4ddf6bf726ad5fc2fab485a4af39d5c1326c43471dbbe8a28147e3a0f42e1ea55bd98554a1fbd8ee0fa3a150a180f4f23
 DIST acidrip-0.14.tar.gz 92086 BLAKE2B 0f1dec1a6a35d41ecbc66fc4ccf5df82c3f0e6f9f958482ebf8965dd59ffdcae88b8f1b7453c06c48d6555067e00ca57f7b5d469f7780c78cb5180a883a45009 SHA512 3ee0e329bd7e5eb4067d618fc79a49707084526d53e8c10cd9ec560828cf621e8d7263259cc8bc7944e6f9d7b7fd1fc5b8a42a8f37f18666f1974f240edb99a0
-EBUILD acidrip-0.14-r4.ebuild 695 BLAKE2B a1eb82d05eaaaa6489fe3abead43759d43ecf9fcd02cfe10fdb226d0278af653c90a09e2649c9a7a8d97328d672446318d86152bc4c4772c76be764143818bec SHA512 ba3ff2e1b8da1c2a6bece8e0dcb7fd435d98f8656bba2e95f39d0791b05ec262e38994937c5083e53e779cf638f14f2f912bf1db4488e5903c403118646111ef
+EBUILD acidrip-0.14-r4.ebuild 706 BLAKE2B 89b80c94715cee50422ed87b7adde847646cb9a31a442f6614b56631696be01f71c4870531d68fab71d9b4af86a6ce841a8489c7a85d80695029b7dbe6e7919e SHA512 c87093ecbdc1853213eba6e680a32e8f0c1bc36fbe3e9f17864c67a1e0ce5fa24e967caca947915b704e0cb4c60e71c33d223b1967b04e1f3f9a892ce00eede4
 MISC metadata.xml 300 BLAKE2B 253c7b9fff6f6baad509f1daf8033ba7f08602d26761bd54bfab87721d41998b43f2f0cc56734c87353625ab82cf74c76561da5fd96a14d750a8bb7992563e7c SHA512 38c5aed9ac2ffb07d440065ca471b391cd3cf8a6b3f424779679d2eeafb6de38c72c29802c8ef772447a20ff83533d25c9aed2ddbb1b3330b3a8e5c597098b08
diff --git a/media-video/acidrip/acidrip-0.14-r4.ebuild b/media-video/acidrip/acidrip-0.14-r4.ebuild
index 8a0141cdf490..990424cacafa 100644
--- a/media-video/acidrip/acidrip-0.14-r4.ebuild
+++ b/media-video/acidrip/acidrip-0.14-r4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit perl-app
+inherit perl-module
 
 DESCRIPTION="A gtk-perl mplayer/mencoder frontend for ripping DVDs"
 HOMEPAGE="https://sourceforge.net/projects/acidrip/"
@@ -13,8 +13,7 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 IUSE="encode"
 
-RDEPEND="dev-lang/perl:=
-	dev-perl/Gtk2
+RDEPEND="dev-perl/Gtk2
 	media-video/lsdvd
 	media-video/mplayer[encode]
 	encode? ( >=media-sound/lame-3.92 )"
@@ -23,4 +22,5 @@ DEPEND="${RDEPEND}"
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-mplayer.patch #168012
 	epatch "${FILESDIR}/${P}-makefile.patch" #299173
+	perl-module_src_prepare
 }
diff --git a/media-video/cheese/Manifest b/media-video/cheese/Manifest
index 6868405a5358..6cd16ddf859a 100644
--- a/media-video/cheese/Manifest
+++ b/media-video/cheese/Manifest
@@ -1,3 +1,5 @@
 DIST cheese-3.30.0.tar.xz 1546680 BLAKE2B 32cfc9553e1c9ebfe7d3eb5fdf19d74b49e9f69ea005f4c79097d69caa2125803c5c319e98ccd3e8f72157a5fd86c018f1be7af7045f6541ecd36d4162c5cdd1 SHA512 622910cedc8eadec4161f60e2bb3f02cbe11352b2431fdd9783f724b4119ffae6254b1566e1144c25491067f9c683a55eb85b265ef28992d852adce02fbdc8b4
-EBUILD cheese-3.30.0.ebuild 1952 BLAKE2B c484fe4641a1396cb363f6fb6d14e3a21a29037b556453201ba204bff7a46d4c324eaa78f24289bee0e31f6f7b3d04ee2c1c60866f29adc282d720c562e89698 SHA512 495c39f4b8ec14e03de31d95915800943b11968102dd3fbc96dbf969ace3ffaa87b97ed882588c279457b03f4545d0584c6c084cdcccad35d2cb2f94d15d592d
+DIST cheese-3.32.1.tar.xz 1487792 BLAKE2B 6e27b68f590aa4f90a8bbbc72972bed96fe9741b4efd849d226751cfd6abe37241fa214240c4a8b0449fb2bc53de1043ac0abd60a06bc884796a4272c07212af SHA512 bdd0ae72e3df596d19ad467dc0222a49b028f2ad8c285d55360813624ca2dac1956463cfd9cea4f2a6ff123070966544cd7254ee2891e973dca42d07061a6c94
+EBUILD cheese-3.30.0.ebuild 1945 BLAKE2B 389b37c1dbb908d1b41b2ad91c4064059861e949d5c860d7ef226d51bcb4d20cab4fbc8221834b89b880d61ece209519cb06615cc5f7166cac71e5cc91ff8260 SHA512 9e0a2b41c23aba4915e83d44fa6e2dab3f7a89ff87060ae9a53e4cf37ccba0ec2c516cc47479001041fbaa693adf0ddbef862c6957d6d050d1a98dc014de1d52
+EBUILD cheese-3.32.1.ebuild 1947 BLAKE2B 4dd833885868bcf63ab430c82eab305db35f3dfaa0eb3d3c0546efafee2c616ec4a9ccc833f003573a766fdca36a340fd2df7d683fe289edc9d1cdd4908d7997 SHA512 19315044c141f29b373b41f44a6e65d0c3180073cdec6ba7b6289ad4c2712a8c781b30e1b2bf20e5a33757a99ba1431629bbcaaf8f3e5b7a12dbabf4884f03c4
 MISC metadata.xml 428 BLAKE2B 3a6b33697b144cba857668b55e04897b8b6c6c4323f09be85ce827843ef50c9c6d988a4e60ffde4ecf1e66a73d70f0e71f2f05371f33f3853429107684abbc9a SHA512 cbe065cc8fe75a86d8f16788dc2ddeafda2b1c27858427f6c9ec83841730e3d9c1c9f7815718c86e19626098b96782a1017b614bac5a0121c92af04b11a30a22
diff --git a/media-video/cheese/cheese-3.30.0.ebuild b/media-video/cheese/cheese-3.30.0.ebuild
index 3456aaba1a7e..417c6ee59b6c 100644
--- a/media-video/cheese/cheese-3.30.0.ebuild
+++ b/media-video/cheese/cheese-3.30.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Cheese"
 LICENSE="GPL-2+"
 SLOT="0/8" # subslot = libcheese soname version
 IUSE="+introspection"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.39.90:2
diff --git a/media-video/cheese/cheese-3.32.1.ebuild b/media-video/cheese/cheese-3.32.1.ebuild
new file mode 100644
index 000000000000..9107e56ee5a7
--- /dev/null
+++ b/media-video/cheese/cheese-3.32.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2 virtualx
+
+DESCRIPTION="A cheesy program to take pictures and videos from your webcam"
+HOMEPAGE="https://wiki.gnome.org/Apps/Cheese"
+
+LICENSE="GPL-2+"
+SLOT="0/8" # subslot = libcheese soname version
+IUSE="+introspection"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.39.90:2
+	>=x11-libs/gtk+-3.13.4:3[introspection?]
+	>=gnome-base/gnome-desktop-2.91.6:3=
+	>=media-libs/libcanberra-0.26[gtk3]
+	>=media-libs/clutter-1.13.2:1.0[introspection?]
+	>=media-libs/clutter-gtk-0.91.8:1.0
+	media-libs/clutter-gst:3.0
+	media-libs/cogl:1.0=[introspection?]
+
+	media-video/gnome-video-effects
+	x11-libs/gdk-pixbuf:2[jpeg,introspection?]
+	x11-libs/libX11
+	x11-libs/libXtst
+
+	>=media-libs/gstreamer-1.4:1.0[introspection?]
+	>=media-libs/gst-plugins-base-1.4:1.0[introspection?,ogg,pango,theora,vorbis,X]
+
+	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	>=media-libs/gst-plugins-bad-1.4:1.0
+	>=media-libs/gst-plugins-good-1.4:1.0
+
+	>=media-plugins/gst-plugins-jpeg-1.4:1.0
+	>=media-plugins/gst-plugins-v4l2-1.4:1.0
+	>=media-plugins/gst-plugins-vpx-1.4:1.0
+"
+# libxml2+gdk-pixbuf required for glib-compile-resources
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.3
+	dev-libs/appstream-glib
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.14
+	>=dev-util/intltool-0.50
+	dev-util/itstool
+	virtual/pkgconfig
+	x11-base/xorg-proto
+"
+# eautoreconf needs yelp-tools
+
+src_configure() {
+	gnome2_src_configure \
+		GST_INSPECT=$(type -P true) \
+		GTESTER_REPORT=$(type -P true) \
+		VALAC=$(type -P true) \
+		$(use_enable introspection) \
+		--disable-lcov \
+		--disable-static
+}
+
+src_test() {
+	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
+	GSETTINGS_SCHEMA_DIR="${S}/data" virtx emake check
+}
diff --git a/media-video/clive/Manifest b/media-video/clive/Manifest
index 018a0c47aef4..d1b6bcb636d7 100644
--- a/media-video/clive/Manifest
+++ b/media-video/clive/Manifest
@@ -1,3 +1,3 @@
 DIST clive-2.3.0.1.tar.gz 43551 BLAKE2B eea428fdce2598e01e85a81f90110f2f1e4a7d9e8033d39745817d97886f80ddadfe2ba649e9778ab84f11c2f6fe2360eefda24cf5d0285c1a1a248ee7f6b1b6 SHA512 7426d6e8f19c358b30a7d33257d7ee536802eb35442d3cac68f6742613696ab1b280457a65d980237b53b692c5cf311725e46a5d8c27c7f2200172d050337cfc
-EBUILD clive-2.3.0.1.ebuild 1633 BLAKE2B 45a79d5bad67f8d03cf20768b726fd3b20c925660892203cf4d55caac8efb550245b6d6f3e23e51b24c01cf4bdeb7155d96513a4dc40df773b6a4ec72b164406 SHA512 f68d2df557da34ef83ca89d661e3cb88b9cd5faa17b765ea8f7282f78a7135d2d608a39cc248e2a1bf41f3db1fa620ea8191aba5217ee96ee2b39cc8357e2aaa
+EBUILD clive-2.3.0.1.ebuild 1666 BLAKE2B 2cf205e74f406c1a3d4a0be15c9fe3930f4bf36f41d53e6ab5c7b756814c7ede032bae58fcc03f7a08de75026bc9442bee106268a2b26b594d0f816107bc3a4a SHA512 164172c4c4862cf5bf7981a79a5c346d1e9f9db418eb72aaae85cb337b50db5d4ab40a32c70b62f6f2b6f54ee629a50bbf75412af6b2dec4a915c20d56596ece
 MISC metadata.xml 699 BLAKE2B 02c38e22deea866093aae3022592371163a1d7bba6b60e35831018711e6f9c6a42a80eb11ccc4ef956ab39aa6ce1d327a6f583164247cb218c1b6881f90d647d SHA512 c58b34f4586809b4dc9fc151cf75a066a95b6872a6487276cefa5c71ca5a8c6c043e2b11de07240f095fe025a6a042e5c9c52555f6ce841a8b12cb2dd6e75ada
diff --git a/media-video/clive/clive-2.3.0.1.ebuild b/media-video/clive/clive-2.3.0.1.ebuild
index d5d07324ff83..9d5ff02dec34 100644
--- a/media-video/clive/clive-2.3.0.1.ebuild
+++ b/media-video/clive/clive-2.3.0.1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit perl-app
+GENTOO_DEPEND_ON_PERL_SUBSLOT=no
+inherit perl-module
 
 DESCRIPTION="Command line tool for extracting videos from various websites"
 HOMEPAGE="http://clive.sourceforge.net/"
diff --git a/media-video/dirac/Manifest b/media-video/dirac/Manifest
index a06bc4678e0a..219df1248fa6 100644
--- a/media-video/dirac/Manifest
+++ b/media-video/dirac/Manifest
@@ -1,4 +1,4 @@
 AUX dirac-0.5.2-doc.patch 2304 BLAKE2B 1753b2645553deac3479ffc776eba95e9c100ce2d1ee18fd5a43af1d333608ac1df885ff6d10954414357b0cf76110c101d246d9ef66e7691bf4ff03a9387ea1 SHA512 1cac4ce26efd5f28b1d671258d5b8b0612815ac41dff230eda0db2c3a0f7414e2266ed1f92de728c97c40319e5d035f42fd1882233f85e3ccfd83b36b84ac099
 DIST dirac-1.0.2.tar.gz 918366 BLAKE2B 16fb215958e0d772c0c7a89ee25603b25115b422a2e669d3256ea1384b5376e4df2bbf3303000ff26f08c3290a96958ace3391898bebe086b29116cf04180046 SHA512 71d49fe17da4069ea28581565d5a4c4f64565848b51d04b39a646bdaa9afc899a265e9ace34af57fba64b03562e8c2259f882f6f17c1e49d1057cd8e69d1250c
-EBUILD dirac-1.0.2-r1.ebuild 1478 BLAKE2B 2ff0796b889f7d6444fbdafe1ac0b5742894c67def0a3549abb01390b22f1b3777f35807ae63a74296d5a5620ccb1eb90870023bee6dca67126dac37f369f019 SHA512 bee71987bbd1865149f33d78af9320c4127d189aeeea27e1e1478cfb22428468541b6f705c0ea445773bab91c0948ed60c887a25d60b823fc7be5da843e634e5
+EBUILD dirac-1.0.2-r1.ebuild 1456 BLAKE2B 11f6695c342967fe02288aa917f05bd90c5cb2ab9b4d6d86a4c46cc3b6425dd179f957168b5f36e6b27666120f8a46e34249041f5f5d3d8d8cab11e8ea5e1e04 SHA512 efb24797c7caada66f2f2edf7a8bcf8d1ace3d12662ffc114c59fee334e19fad02bd63289f1e5bf0c5960c1db70265d4a7201380300897fb9510245eacf33467
 MISC metadata.xml 298 BLAKE2B f1f8662f90d8bb126d611299d7b184d5b0d4fe7ca39415c7a1e9aa0f87f911469f7d423fd4f77c29e6734512131971a062b4eaf41ef2fed46f9e10b82aea3e84 SHA512 af4dca87e12f4378990ff854d7f6ad5af7ccc083694a3ad34521dece8cc740508aa2cecaf6ab8aae3cac66069ba9d6becc5fd7e0856af532a5011db50041dff6
diff --git a/media-video/dirac/dirac-1.0.2-r1.ebuild b/media-video/dirac/dirac-1.0.2-r1.ebuild
index 36eee488263f..9986743bf139 100644
--- a/media-video/dirac/dirac-1.0.2-r1.ebuild
+++ b/media-video/dirac/dirac-1.0.2-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="debug doc cpu_flags_x86_mmx static-libs"
 
 RDEPEND=""
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index cafbcb3758ad..018a9828679d 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -5,11 +5,9 @@ DIST ffmpeg-3.4.6.tar.bz2 10190001 BLAKE2B 4c7842900171cf871f8524f08f435797b1a16
 DIST ffmpeg-4.1.3.tar.bz2 10689073 BLAKE2B 8486e21c8df116af802bb7f9208e702ec1feaa4f292f14021e0b6bfb3957b13ddacfa87db361e677ae0583cc2bd1d402a66b0c8507cbed79a001c9b8462100bf SHA512 d0f8b3ee7b55e67b1c7ad9610a7b19a15acfc35dc843683502e536ebcc2e8678b55325532c0039b764cc978e95f83afb48bd24304abaee26f26d3247a8310bfe
 DIST ffmpeg-4.1.4.tar.bz2 10691784 BLAKE2B 5f1f0b3c78cdd913e44bef448ff4d26fc5ea01e1a002baf98461fe0d8870bc2b0f29a1770377df8ff4f0c45febd532d6436c6627f5d1fb97125e92d9929f9284 SHA512 0c2d5bf4873b2bf12aff8c8b576d58dc3c5984ca727f48e1247293cbebda382e9070e8b7fac99870ec2ae0cef3be0a187d5ec5d58ee3e861cd673cae961b5947
 DIST ffmpeg-4.2.1.tar.bz2 10953293 BLAKE2B efc60a7e4a185d48a9ae7a5737fa930dea35ca19f1e2505fc4355815a8216f365134a018fb7a5eb7be8709989d27c2c0a56f7783e3f27eb12795e005fd6dc28d SHA512 5bd556546716ccb5292289c3092c11f216e573d0b09a015fdb568dee7544878d057d922a63758867f0343a09262d7b51023e862b70cefc529875f2319e716de4
-DIST ffmpeg-4.2.tar.bz2 10954171 BLAKE2B 1c2dfeb000a0cc85ca23d255163336db132b5f16cb184a0f3363f68108f5bde0220050b351f9c50273ef6642f86f1a43832f4b831928d95dd991a908c7c25e2e SHA512 74d06a420af61e05d9e076f4f433e8316590c3b850ada96e74c1df39431db1595f74315bdef624153edb160b8bef8683a4e9f35d69714cde4b5ec72aeb1d28e1
-EBUILD ffmpeg-3.4.6-r1.ebuild 15659 BLAKE2B d2dcdc4da728c0466d9cdd8c1e3f92253dbb4381d8f179a48761e631d79f727a95e6b4bff104189054e5a391786c1060ccdd257bf19b60df63df973c34883a77 SHA512 75460743011065d4f2e29e56029991c42f499bffdd66c3aa2ada3792c4449f193ac2a8a5dfcee234b170a9d4e5f9e889c24ec86fbf6713b853357e00d05e27e9
-EBUILD ffmpeg-4.1.3.ebuild 17094 BLAKE2B 8cbd003eff1d0e4dce8fc96323119a65399da0b8249973d9c516ecc452b49c2c56dd74f9427a4d0ab66c12d5d21d05dbe11bac7c7dc0e0b1d1b91ae235f7b5c3 SHA512 15983c8e5444a2b470572aaf6958d809a7000bcd28bccb83c07a05b18c5cc84f1c7a166442b2f065fa727a9d84a2511d153a761a91b93049e0837cf5fff1d98a
-EBUILD ffmpeg-4.1.4.ebuild 17099 BLAKE2B e58b016483c1c96996e020a1cf242df7fbeaa2d539e56eb519d454f337c1c7ca352d84f5b63bbd9b6c46d4d39d9e47d7082b78d1c3fdc9a774e930856926759f SHA512 f5686aa2e4c6302b29ff713bf7fab5542d94a15dcb646778d103c5282568a7cf1d3d871163f05ea68ea8bc22058fceb992308f969e6478386b2f67f75264b467
-EBUILD ffmpeg-4.2.1.ebuild 17688 BLAKE2B df6b71d84b40f3455d1f4ab67387c371a8f6b02d6cd912c810662728750737ee6bd02d549feb9ea40beff1bd4fb68c6ca283454a8f7a0d7fb6d1d6c07928dd02 SHA512 1902f5fed8d047f3e0b50fbbc0d8b6173b72f408a1ba4dd8e2652c493ea5c9dc29e1d3513000c93563c141167d0901fcc3c9b5008c9472481b3e28cf118b3c19
-EBUILD ffmpeg-4.2.ebuild 17688 BLAKE2B df6b71d84b40f3455d1f4ab67387c371a8f6b02d6cd912c810662728750737ee6bd02d549feb9ea40beff1bd4fb68c6ca283454a8f7a0d7fb6d1d6c07928dd02 SHA512 1902f5fed8d047f3e0b50fbbc0d8b6173b72f408a1ba4dd8e2652c493ea5c9dc29e1d3513000c93563c141167d0901fcc3c9b5008c9472481b3e28cf118b3c19
-EBUILD ffmpeg-9999.ebuild 17694 BLAKE2B d366faed1d9876c2f8d5d9df89528eff562748846a790c4ce2eb96b997e298457f431321e87fe2440b174d5bbd34369e4757a4cd7590fdd0faca9f63bdc8de35 SHA512 949d149b82827a5eb4c484dd5f139d1edad1c572d281db35cd36cb70c59d223feff80dc865c6580f0332b4efcfbdf5f26ca772fc6901789c623599948901c212
-MISC metadata.xml 5728 BLAKE2B c5e24e8b81b147d84f7204c9dd1cca5eb45a0bf9b46c25c39670b1c59432e8c6e65bb472bbf3c4b57451d8dff4f8663cfa0abd9fda9c13f57e3eed82945da0cf SHA512 2822c0df5018e1003b7be90b8579747024e05732a1fa698a1f85f4e8362a3e76b4add6c6bb39036eeb5b0483241b55a7300c65350f7b774fcc7dff33cd0061a4
+EBUILD ffmpeg-3.4.6-r1.ebuild 15637 BLAKE2B df4a750c330163286e9cc0c9ab8ca5975b7d19ea4242e60fdd21aad9e61a4c90d09ad06a473de37803e780bd57a62bc90ab29e99fc320a5500cd4e92a98e3f23 SHA512 a66e8ee9ebc465ecb54be3761b46cdb250620ea3d9028b9cd8e7015dc612e49b469d9fdb43937704b36f88666f1d6eca7467483de2c302b33019ef22b0c71826
+EBUILD ffmpeg-4.1.3.ebuild 17081 BLAKE2B fe513d3729129ee7458981e6ce4a94d2613b6e04dec532e4461908082213c0cad38a1addb641cb0097470e3ba8f899b6ae23a0532b25980a2424640e3f5bfcbd SHA512 1d4e6f4837e116f4fc3478a45c97579291849776cee767d6eae2ac17c39a3adf7732b8542c9106530ac1a788eac7cc99c91ae5cd5aee5c64a25f532242892f1a
+EBUILD ffmpeg-4.1.4.ebuild 17089 BLAKE2B 6f7f4c6ea186dc45af104335c929aa35efe4c8815b9817642691f6cde17fb88cd725ce4828c6de2cf5fa0b4d3b73ad0c9e49e9ba5ea2c23176115b1c47682fcf SHA512 ebd06587fcec467bb810521ea4cabe08f4f475789737f308f5bab660edfb3407b6f79578af8f9f8539518877635cd78572507817b02e3d33a1c35309979cec2a
+EBUILD ffmpeg-4.2.1.ebuild 17763 BLAKE2B 8433f382d62fbb6eb6b228062fed31aff73389e372c9d61ad1011edd443cb788f23d294bd52cbd9c0d01bcc86f6238a8a550781a4a12f4aa4d548a1c010b7101 SHA512 c8ac88b2464efafa3c23ddd271d320ed323019e48222a7abeee87b8cb654d37cf01e24aaab162d0d7b36cdd7cd345cc279ab87d9107ff23b716a984020c10b4f
+EBUILD ffmpeg-9999.ebuild 17769 BLAKE2B 304436501113119dc5491ad4ba56fcbc2732617e76580b7f8acaff22f4b7349ce48fb5fd6a93dc40da64eaddfbc071bd4b8bebfedfa65afaf6c066c52e9fb6cd SHA512 f8fc9bfa3b4801568a7b5348e6a516f15c3baf78a719f81d38105cda5cfff6f925e1df00242d53b4b2ad3dc8eed2bfd349a95476a117f8e06538f9996bfad303
+MISC metadata.xml 5820 BLAKE2B 01cde597d11525602c97167c405cbcc2b42c28bcf074c3d035e6994ad7cead68e5256aea89d10680a9e4b61057a69a6dd66ead329b41685d206937e20761f475 SHA512 8a8a4fc714ba566024960eeada731ba71f30577cccd9fc1b775ac86f1093568cfc3f0f204129f65aec2d921838d1372fa5a9410223a44e60b83a759c07d632cc
diff --git a/media-video/ffmpeg/ffmpeg-3.4.6-r1.ebuild b/media-video/ffmpeg/ffmpeg-3.4.6-r1.ebuild
index a375361a8cd0..57488e979b6c 100644
--- a/media-video/ffmpeg/ffmpeg-3.4.6-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-3.4.6-r1.ebuild
@@ -54,7 +54,7 @@ LICENSE="
 	samba? ( GPL-3 )
 "
 if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 # Options to use as use_enable in the foo[:bar] form.
diff --git a/media-video/ffmpeg/ffmpeg-4.1.3.ebuild b/media-video/ffmpeg/ffmpeg-4.1.3.ebuild
index 29ee8125994c..dde475dd768a 100644
--- a/media-video/ffmpeg/ffmpeg-4.1.3.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.1.3.ebuild
@@ -55,7 +55,7 @@ LICENSE="
 	samba? ( GPL-3 )
 "
 if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 # Options to use as use_enable in the foo[:bar] form.
diff --git a/media-video/ffmpeg/ffmpeg-4.1.4.ebuild b/media-video/ffmpeg/ffmpeg-4.1.4.ebuild
index 15f3beb31803..6aae30ff2717 100644
--- a/media-video/ffmpeg/ffmpeg-4.1.4.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.1.4.ebuild
@@ -55,7 +55,7 @@ LICENSE="
 	samba? ( GPL-3 )
 "
 if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 # Options to use as use_enable in the foo[:bar] form.
diff --git a/media-video/ffmpeg/ffmpeg-4.2.1.ebuild b/media-video/ffmpeg/ffmpeg-4.2.1.ebuild
index e614ce5a2060..30af5b7ec27a 100644
--- a/media-video/ffmpeg/ffmpeg-4.2.1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.2.1.ebuild
@@ -59,7 +59,7 @@ LICENSE="
 	samba? ( GPL-3 )
 "
 if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 # Options to use as use_enable in the foo[:bar] form.
@@ -85,7 +85,7 @@ FFMPEG_FLAG_MAP=(
 		# libavfilter options
 		appkit
 		bs2b:libbs2b chromaprint cuda:cuda-llvm flite:libflite frei0r
-		fribidi:libfribidi fontconfig ladspa libass lv2 truetype:libfreetype vidstab:libvidstab
+		fribidi:libfribidi fontconfig ladspa libass libtesseract lv2 truetype:libfreetype vidstab:libvidstab
 		rubberband:librubberband zeromq:libzmq zimg:libzimg
 		# libswresample options
 		libsoxr
@@ -221,6 +221,7 @@ RDEPEND="
 	libilbc? ( >=media-libs/libilbc-2[${MULTILIB_USEDEP}] )
 	librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
 	libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] )
+	libtesseract? ( >=app-text/tesseract-4.1.0-r1[${MULTILIB_USEDEP}] )
 	libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
 	libxml2? ( dev-libs/libxml2:=[${MULTILIB_USEDEP}] )
 	lv2? ( media-libs/lv2[${MULTILIB_USEDEP}] media-libs/lilv[${MULTILIB_USEDEP}] )
@@ -240,7 +241,7 @@ RDEPEND="
 	ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
 	svg? ( gnome-base/librsvg:2=[${MULTILIB_USEDEP}] )
 	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
-	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
+	vaapi? ( >=x11-libs/libva-1.2.1-r1:0=[${MULTILIB_USEDEP}] )
 	video_cards_nvidia? ( >=media-libs/nv-codec-headers-9.0.18.0[${MULTILIB_USEDEP}] )
 	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
 	vidstab? ( >=media-libs/vidstab-1.1.0[${MULTILIB_USEDEP}] )
diff --git a/media-video/ffmpeg/ffmpeg-4.2.ebuild b/media-video/ffmpeg/ffmpeg-4.2.ebuild
deleted file mode 100644
index e614ce5a2060..000000000000
--- a/media-video/ffmpeg/ffmpeg-4.2.ebuild
+++ /dev/null
@@ -1,545 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Subslot: libavutil major.libavcodec major.libavformat major
-# Since FFmpeg ships several libraries, subslot is kind of limited here.
-# Most consumers will use those three libraries, if a "less used" library
-# changes its soname, consumers will have to be rebuilt the old way
-# (preserve-libs).
-# If, for example, a package does not link to libavformat and only libavformat
-# changes its ABI then this package will be rebuilt needlessly. Hence, such a
-# package is free _not_ to := depend on FFmpeg but I would strongly encourage
-# doing so since such a case is unlikely.
-FFMPEG_SUBSLOT=56.58.58
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_MIN_CLONE_TYPE="single"
-	EGIT_REPO_URI="https://git.ffmpeg.org/ffmpeg.git"
-fi
-
-inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
-
-DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec"
-HOMEPAGE="https://ffmpeg.org/"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
-	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-else # Release
-	SRC_URI="https://ffmpeg.org/releases/${P/_/-}.tar.bz2"
-fi
-FFMPEG_REVISION="${PV#*_p}"
-
-SLOT="0/${FFMPEG_SUBSLOT}"
-LICENSE="
-	!gpl? ( LGPL-2.1 )
-	gpl? ( GPL-2 )
-	amr? (
-		gpl? ( GPL-3 )
-		!gpl? ( LGPL-3 )
-	)
-	gmp? (
-		gpl? ( GPL-3 )
-		!gpl? ( LGPL-3 )
-	)
-	libaribb24? (
-		gpl? ( GPL-3 )
-		!gpl? ( LGPL-3 )
-	)
-	encode? (
-		amrenc? (
-			gpl? ( GPL-3 )
-			!gpl? ( LGPL-3 )
-		)
-	)
-	samba? ( GPL-3 )
-"
-if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-
-# Options to use as use_enable in the foo[:bar] form.
-# This will feed configure with $(use_enable foo bar)
-# or $(use_enable foo foo) if no :bar is set.
-# foo is added to IUSE.
-FFMPEG_FLAG_MAP=(
-		+bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt gnutls gmp
-		+gpl hardcoded-tables +iconv libressl:libtls libxml2 lzma +network opencl
-		openssl +postproc samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau
-		X:xlib xcb:libxcb xcb:libxcb-shm xcb:libxcb-xfixes +zlib
-		# libavdevice options
-		cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal
-		opengl
-		# indevs
-		libv4l:libv4l2 pulseaudio:libpulse libdrm jack:libjack
-		# decoders
-		amr:libopencore-amrwb amr:libopencore-amrnb codec2:libcodec2 dav1d:libdav1d fdk:libfdk-aac
-		jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm
-		libaribb24 mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
-		speex:libspeex srt:libsrt svg:librsvg video_cards_nvidia:ffnvcodec
-		vorbis:libvorbis vpx:libvpx zvbi:libzvbi
-		# libavfilter options
-		appkit
-		bs2b:libbs2b chromaprint cuda:cuda-llvm flite:libflite frei0r
-		fribidi:libfribidi fontconfig ladspa libass lv2 truetype:libfreetype vidstab:libvidstab
-		rubberband:librubberband zeromq:libzmq zimg:libzimg
-		# libswresample options
-		libsoxr
-		# Threads; we only support pthread for now but ffmpeg supports more
-		+threads:pthreads
-)
-
-# Same as above but for encoders, i.e. they do something only with USE=encode.
-FFMPEG_ENCODER_FLAG_MAP=(
-	amrenc:libvo-amrwbenc mp3:libmp3lame
-	kvazaar:libkvazaar libaom
-	openh264:libopenh264 snappy:libsnappy theora:libtheora twolame:libtwolame
-	wavpack:libwavpack webp:libwebp x264:libx264 x265:libx265 xvid:libxvid
-)
-
-IUSE="
-	alsa chromium doc +encode oss pic static-libs test v4l
-	${FFMPEG_FLAG_MAP[@]%:*}
-	${FFMPEG_ENCODER_FLAG_MAP[@]%:*}
-"
-
-# Strings for CPU features in the useflag[:configure_option] form
-# if :configure_option isn't set, it will use 'useflag' as configure option
-ARM_CPU_FEATURES=(
-	cpu_flags_arm_thumb:armv5te
-	cpu_flags_arm_v6:armv6
-	cpu_flags_arm_thumb2:armv6t2
-	cpu_flags_arm_neon:neon
-	cpu_flags_arm_vfp:vfp
-	cpu_flags_arm_vfpv3:vfpv3
-	cpu_flags_arm_v8:armv8
-)
-ARM_CPU_REQUIRED_USE="
-	arm64? ( cpu_flags_arm_v8 )
-	cpu_flags_arm_v8? (  cpu_flags_arm_vfpv3 cpu_flags_arm_neon )
-	cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp )
-	cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp )
-	cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 )
-	cpu_flags_arm_v6? ( cpu_flags_arm_thumb )
-"
-MIPS_CPU_FEATURES=( mipsdspr1:mipsdsp mipsdspr2 mipsfpu )
-PPC_CPU_FEATURES=( altivec )
-X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext aes:aesni avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop )
-X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
-X86_CPU_REQUIRED_USE="
-	cpu_flags_x86_avx2? ( cpu_flags_x86_avx )
-	cpu_flags_x86_fma4? ( cpu_flags_x86_avx )
-	cpu_flags_x86_fma3? ( cpu_flags_x86_avx )
-	cpu_flags_x86_xop?  ( cpu_flags_x86_avx )
-	cpu_flags_x86_avx?  ( cpu_flags_x86_sse4_2 )
-	cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 )
-	cpu_flags_x86_sse4_2?  ( cpu_flags_x86_sse4_1 )
-	cpu_flags_x86_sse4_1?  ( cpu_flags_x86_ssse3 )
-	cpu_flags_x86_ssse3?  ( cpu_flags_x86_sse3 )
-	cpu_flags_x86_sse3?  ( cpu_flags_x86_sse2 )
-	cpu_flags_x86_sse2?  ( cpu_flags_x86_sse )
-	cpu_flags_x86_sse?  ( cpu_flags_x86_mmxext )
-	cpu_flags_x86_mmxext?  ( cpu_flags_x86_mmx )
-	cpu_flags_x86_3dnowext?  ( cpu_flags_x86_3dnow )
-	cpu_flags_x86_3dnow?  ( cpu_flags_x86_mmx )
-"
-
-CPU_FEATURES_MAP=(
-	${ARM_CPU_FEATURES[@]}
-	${MIPS_CPU_FEATURES[@]}
-	${PPC_CPU_FEATURES[@]}
-	${X86_CPU_FEATURES[@]}
-)
-IUSE="${IUSE}
-	${CPU_FEATURES_MAP[@]%:*}"
-
-CPU_REQUIRED_USE="
-	${ARM_CPU_REQUIRED_USE}
-	${X86_CPU_REQUIRED_USE}
-"
-
-FFTOOLS=( aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt graph2dot ismindex pktdumper qt-faststart sidxindex trasher )
-IUSE="${IUSE} ${FFTOOLS[@]/#/+fftools_}"
-
-RDEPEND="
-	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
-	bluray? ( >=media-libs/libbluray-0.3.0-r1:=[${MULTILIB_USEDEP}] )
-	bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
-	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
-	cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
-	chromaprint? ( >=media-libs/chromaprint-1.2-r1[${MULTILIB_USEDEP}] )
-	codec2? ( media-libs/codec2[${MULTILIB_USEDEP}] )
-	dav1d? ( >=media-libs/dav1d-0.4.0:0=[${MULTILIB_USEDEP}] )
-	encode? (
-		amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
-		kvazaar? ( >=media-libs/kvazaar-1.2.0[${MULTILIB_USEDEP}] )
-		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
-		openh264? ( >=media-libs/openh264-1.4.0-r1[${MULTILIB_USEDEP}] )
-		snappy? ( >=app-arch/snappy-1.1.2-r1:=[${MULTILIB_USEDEP}] )
-		theora? (
-			>=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
-			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-		)
-		twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
-		wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
-		webp? ( >=media-libs/libwebp-0.3.0:=[${MULTILIB_USEDEP}] )
-		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
-		x265? ( >=media-libs/x265-1.6:=[${MULTILIB_USEDEP}] )
-		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
-	)
-	fdk? ( >=media-libs/fdk-aac-0.1.3:=[${MULTILIB_USEDEP}] )
-	flite? ( >=app-accessibility/flite-1.4-r4[${MULTILIB_USEDEP}] )
-	fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
-	frei0r? ( media-plugins/frei0r-plugins )
-	fribidi? ( >=dev-libs/fribidi-0.19.6[${MULTILIB_USEDEP}] )
-	gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[${MULTILIB_USEDEP}] )
-	gme? ( >=media-libs/game-music-emu-0.6.0[${MULTILIB_USEDEP}] )
-	gmp? ( >=dev-libs/gmp-6:0=[${MULTILIB_USEDEP}] )
-	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
-	iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
-	iec61883? (
-		>=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}]
-		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
-		>=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}]
-	)
-	ieee1394? (
-		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
-		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
-	)
-	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
-	jpeg2k? ( >=media-libs/openjpeg-2:2[${MULTILIB_USEDEP}] )
-	libaom? ( >=media-libs/libaom-1.0.0-r1[${MULTILIB_USEDEP}] )
-	libaribb24? ( >=media-libs/aribb24-1.0.3-r2[${MULTILIB_USEDEP}] )
-	libass? ( >=media-libs/libass-0.10.2:=[${MULTILIB_USEDEP}] )
-	libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
-	libdrm? ( x11-libs/libdrm[${MULTILIB_USEDEP}] )
-	libilbc? ( >=media-libs/libilbc-2[${MULTILIB_USEDEP}] )
-	librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
-	libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] )
-	libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
-	libxml2? ( dev-libs/libxml2:=[${MULTILIB_USEDEP}] )
-	lv2? ( media-libs/lv2[${MULTILIB_USEDEP}] media-libs/lilv[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
-	mmal? ( media-libs/raspberrypi-userland )
-	modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
-	openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
-	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
-	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
-	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
-	rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] )
-	samba? ( >=net-fs/samba-3.6.23-r1[client,${MULTILIB_USEDEP}] )
-	sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] )
-	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
-	srt? ( >=net-libs/srt-1.3.0[${MULTILIB_USEDEP}] )
-	ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
-	svg? ( gnome-base/librsvg:2=[${MULTILIB_USEDEP}] )
-	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
-	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
-	video_cards_nvidia? ( >=media-libs/nv-codec-headers-9.0.18.0[${MULTILIB_USEDEP}] )
-	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
-	vidstab? ( >=media-libs/vidstab-1.1.0[${MULTILIB_USEDEP}] )
-	vorbis? (
-		>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
-		>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-	)
-	vpx? ( >=media-libs/libvpx-1.4.0:=[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
-	)
-	xcb? ( >=x11-libs/libxcb-1.4[${MULTILIB_USEDEP}] )
-	zeromq? ( >=net-libs/zeromq-4.1.6 )
-	zimg? ( >=media-libs/zimg-2.7.4:=[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-	zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] )
-	!media-video/qt-faststart
-	postproc? ( !media-libs/libpostproc )
-"
-
-# Crypto & co provider magic
-# - libressl is a useflag meaning it should always favor libressl over openssl
-# - libressl and openssl provide more features to ffmpeg than gnutls
-#
-# The ordering is thus: libressl > openssl > gnutls
-RDEPEND="${RDEPEND}
-	libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-	!libressl? (
-		openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-		!openssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] ) )
-	)
-"
-
-DEPEND="${RDEPEND}
-	ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] )
-	v4l? ( sys-kernel/linux-headers )
-"
-BDEPEND="
-	>=sys-devel/make-3.81
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) )
-	cuda? ( >=sys-devel/clang-7[llvm_targets_NVPTX] )
-	doc? ( sys-apps/texinfo )
-	test? ( net-misc/wget sys-devel/bc )
-"
-
-# Code requiring FFmpeg to be built under gpl license
-GPL_REQUIRED_USE="
-	postproc? ( gpl )
-	frei0r? ( gpl )
-	cdio? ( gpl )
-	rubberband? ( gpl )
-	samba? ( gpl )
-	encode? (
-		x264? ( gpl )
-		x265? ( gpl )
-		xvid? ( gpl )
-		X? ( !xcb? ( gpl ) )
-	)
-"
-REQUIRED_USE="
-	cuda? ( video_cards_nvidia )
-	libv4l? ( v4l )
-	fftools_cws2fws? ( zlib )
-	test? ( encode )
-	${GPL_REQUIRED_USE}
-	${CPU_REQUIRED_USE}"
-RESTRICT="
-	gpl? ( openssl? ( bindist ) fdk? ( bindist ) libressl? ( bindist ) )
-"
-
-S=${WORKDIR}/${P/_/-}
-
-PATCHES=(
-	"${FILESDIR}"/chromium-r1.patch
-)
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/libavutil/avconfig.h
-)
-
-build_separate_libffmpeg() {
-	use opencl
-}
-
-src_prepare() {
-	if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
-		export revision=git-N-${FFMPEG_REVISION}
-	fi
-	default
-	echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die
-}
-
-multilib_src_configure() {
-	local myconf=( ${EXTRA_FFMPEG_CONF} )
-
-	local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
-	use openssl || use libressl && use gpl && myconf+=( --enable-nonfree )
-	use samba && myconf+=( --enable-version3 )
-
-	# Encoders
-	if use encode ; then
-		ffuse+=( "${FFMPEG_ENCODER_FLAG_MAP[@]}" )
-
-		# Licensing.
-		if use amrenc ; then
-			myconf+=( --enable-version3 )
-		fi
-	else
-		myconf+=( --disable-encoders )
-	fi
-
-	# Indevs
-	use v4l || myconf+=( --disable-indev=v4l2 --disable-outdev=v4l2 )
-	for i in alsa oss jack ; do
-		use ${i} || myconf+=( --disable-indev=${i} )
-	done
-
-	# Outdevs
-	for i in alsa oss ; do
-		use ${i} || myconf+=( --disable-outdev=${i} )
-	done
-
-	# Decoders
-	use amr && myconf+=( --enable-version3 )
-	use gmp && myconf+=( --enable-version3 )
-	use libaribb24 && myconf+=( --enable-version3 )
-	use fdk && use gpl && myconf+=( --enable-nonfree )
-
-	for i in "${ffuse[@]#+}" ; do
-		myconf+=( $(use_enable ${i%:*} ${i#*:}) )
-	done
-
-	# Incompatible features: openssl or libressl and gnutls
-	if use libressl ; then
-		myconf+=( --disable-gnutls --disable-openssl )
-	elif use openssl ; then
-		myconf+=( --disable-gnutls )
-	fi
-
-	# (temporarily) disable non-multilib deps
-	if ! multilib_is_native_abi; then
-		for i in frei0r libzmq ; do
-			myconf+=( --disable-${i} )
-		done
-	fi
-
-	# CPU features
-	for i in "${CPU_FEATURES_MAP[@]}" ; do
-		use ${i%:*} || myconf+=( --disable-${i#*:} )
-	done
-
-	if use pic ; then
-		myconf+=( --enable-pic )
-		# disable asm code if PIC is required
-		# as the provided asm decidedly is not PIC for x86.
-		[[ ${ABI} == x86 ]] && myconf+=( --disable-asm )
-	fi
-	[[ ${ABI} == x32 ]] && myconf+=( --disable-asm ) #427004
-
-	# Try to get cpu type based on CFLAGS.
-	# Bug #172723
-	# We need to do this so that features of that CPU will be better used
-	# If they contain an unknown CPU it will not hurt since ffmpeg's configure
-	# will just ignore it.
-	for i in $(get-flag mcpu) $(get-flag march) ; do
-		[[ ${i} = native ]] && i="host" # bug #273421
-		myconf+=( --cpu=${i} )
-		break
-	done
-
-	# LTO support, bug #566282
-	is-flagq "-flto*" && myconf+=( "--enable-lto" )
-
-	# Mandatory configuration
-	myconf=(
-		--enable-avfilter
-		--enable-avresample
-		--disable-stripping
-		# This is only for hardcoded cflags; those are used in configure checks that may
-		# interfere with proper detections, bug #671746 and bug #645778
-		# We use optflags, so that overrides them anyway.
-		--disable-optimizations
-		--disable-libcelt # bug #664158
-		"${myconf[@]}"
-	)
-
-	# cross compile support
-	if tc-is-cross-compiler ; then
-		myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- --host-cc="$(tc-getBUILD_CC)" )
-		case ${CHOST} in
-			*freebsd*)
-				myconf+=( --target-os=freebsd )
-				;;
-			*mingw32*)
-				myconf+=( --target-os=mingw32 )
-				;;
-			*linux*)
-				myconf+=( --target-os=linux )
-				;;
-		esac
-	fi
-
-	# doc
-	myconf+=(
-		$(multilib_native_use_enable doc)
-		$(multilib_native_use_enable doc htmlpages)
-		$(multilib_native_enable manpages)
-	)
-
-	set -- "${S}/configure" \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--shlibdir="${EPREFIX}/usr/$(get_libdir)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--mandir="${EPREFIX}/usr/share/man" \
-		--enable-shared \
-		--cc="$(tc-getCC)" \
-		--cxx="$(tc-getCXX)" \
-		--ar="$(tc-getAR)" \
-		--optflags="${CFLAGS}" \
-		$(use_enable static-libs static) \
-		"${myconf[@]}"
-	echo "${@}"
-	"${@}" || die
-
-	if multilib_is_native_abi && use chromium && build_separate_libffmpeg; then
-		einfo "Configuring for Chromium"
-		mkdir -p ../chromium || die
-		pushd ../chromium >/dev/null || die
-		set -- "${@}" \
-			--disable-shared \
-			--enable-static \
-			--enable-pic \
-			--disable-opencl
-		echo "${@}"
-		"${@}" || die
-		popd >/dev/null || die
-	fi
-}
-
-multilib_src_compile() {
-	emake V=1
-
-	if multilib_is_native_abi; then
-		for i in "${FFTOOLS[@]}" ; do
-			if use fftools_${i} ; then
-				emake V=1 tools/${i}$(get_exeext)
-			fi
-		done
-
-		if use chromium; then
-			if build_separate_libffmpeg; then
-				einfo "Compiling for Chromium"
-				pushd ../chromium >/dev/null || die
-				emake V=1 libffmpeg
-				popd >/dev/null || die
-			else
-				emake V=1 libffmpeg
-			fi
-		fi
-	fi
-}
-
-multilib_src_install() {
-	emake V=1 DESTDIR="${D}" install install-doc
-
-	if multilib_is_native_abi; then
-		for i in "${FFTOOLS[@]}" ; do
-			if use fftools_${i} ; then
-				dobin tools/${i}$(get_exeext)
-			fi
-		done
-
-		if use chromium; then
-			if build_separate_libffmpeg; then
-				einfo "Installing for Chromium"
-				pushd ../chromium >/dev/null || die
-				emake V=1 DESTDIR="${D}" install-libffmpeg
-				popd >/dev/null || die
-			else
-				emake V=1 DESTDIR="${D}" install-libffmpeg
-
-				# When not built separately, libffmpeg has no code of
-				# its own so this QA check raises a false positive.
-				QA_FLAGS_IGNORED+=" usr/$(get_libdir)/chromium/.*"
-			fi
-		fi
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges
-	[ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES"
-}
-
-multilib_src_test() {
-	LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil:${BUILD_DIR}/libavresample" \
-		emake V=1 fate
-}
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index b95ad2762089..6c78527aa36a 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -59,7 +59,7 @@ LICENSE="
 	samba? ( GPL-3 )
 "
 if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 # Options to use as use_enable in the foo[:bar] form.
@@ -85,7 +85,7 @@ FFMPEG_FLAG_MAP=(
 		# libavfilter options
 		appkit
 		bs2b:libbs2b chromaprint cuda:cuda-llvm flite:libflite frei0r
-		fribidi:libfribidi fontconfig ladspa libass lv2 truetype:libfreetype vidstab:libvidstab
+		fribidi:libfribidi fontconfig ladspa libass libtesseract lv2 truetype:libfreetype vidstab:libvidstab
 		rubberband:librubberband zeromq:libzmq zimg:libzimg
 		# libswresample options
 		libsoxr
@@ -221,6 +221,7 @@ RDEPEND="
 	libilbc? ( >=media-libs/libilbc-2[${MULTILIB_USEDEP}] )
 	librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
 	libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] )
+	libtesseract? ( >=app-text/tesseract-4.1.0-r1[${MULTILIB_USEDEP}] )
 	libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
 	libxml2? ( dev-libs/libxml2:=[${MULTILIB_USEDEP}] )
 	lv2? ( media-libs/lv2[${MULTILIB_USEDEP}] media-libs/lilv[${MULTILIB_USEDEP}] )
@@ -240,7 +241,7 @@ RDEPEND="
 	ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
 	svg? ( gnome-base/librsvg:2=[${MULTILIB_USEDEP}] )
 	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
-	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
+	vaapi? ( >=x11-libs/libva-1.2.1-r1:0=[${MULTILIB_USEDEP}] )
 	video_cards_nvidia? ( >=media-libs/nv-codec-headers-9.0.18.0[${MULTILIB_USEDEP}] )
 	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
 	vidstab? ( >=media-libs/vidstab-1.1.0[${MULTILIB_USEDEP}] )
diff --git a/media-video/ffmpeg/metadata.xml b/media-video/ffmpeg/metadata.xml
index 183c78718dcd..338a8f562975 100644
--- a/media-video/ffmpeg/metadata.xml
+++ b/media-video/ffmpeg/metadata.xml
@@ -33,6 +33,7 @@
 	<flag name="libilbc">Enables iLBC de/encoding via <pkg>media-libs/libilbc</pkg>.</flag>
 	<flag name="librtmp">Enables Real Time Messaging Protocol using librtmp (<pkg>media-video/rtmpdump</pkg>) in addition to FFmpeg's native implementation.</flag>
 	<flag name="libsoxr">Enables audio resampling through <pkg>media-libs/soxr</pkg>.</flag>
+	<flag name="libtesseract">Enables the OCR filter via <pkg>app-text/tesseract</pkg>.</flag>
 	<flag name="libv4l">Uses <pkg>media-libs/libv4l</pkg> for video4linux instead of direct calls. Adds support for more devices via the userspace library.</flag>
 	<flag name="libxml2">Uses <pkg>dev-libs/libxml2</pkg> to enable dash demuxing support.</flag>
 	<flag name="lv2">Enables lv2 audio filter wrapper.</flag>
diff --git a/media-video/ffmpeg2theora/Manifest b/media-video/ffmpeg2theora/Manifest
index 667be5257314..a3e34428679c 100644
--- a/media-video/ffmpeg2theora/Manifest
+++ b/media-video/ffmpeg2theora/Manifest
@@ -1,5 +1,5 @@
 AUX ffmpeg2theora-0.29-swr.patch 778 BLAKE2B e0b57be8a1941abc1c3c2c01939dc339a705c9cc7ce1a0de81a868023dc6d9bb7593ae3b7c10cae9ad9e3418819637a2f9e20c42409047f5b9d5686864eacf15 SHA512 38ab469efff0f7607cbc8d8b9c57e1b4e92ce02ff2d4380aa2a04e1e3092e8b5fb2b95eb1c761df4809333d6979cb66fcd8892d245777d375adacfdd82d07c73
 AUX ffmpeg2theora-0.29-underlinking.patch 503 BLAKE2B 2d6d4fb7c23a2fc439b519348a2b39ea30ab00c5a12f5c37f2ae8965d42af5baa4465172e163cd66a63810b3c13923068d8debad495197ec1bc7d469710dbdc5 SHA512 a9c16e115d72400cd29c60e9893b89e37a1c4800edebc23ebd576c47b49c37ec69e31fe2de4bef50a32c1f60a1be5df5dae2b62000e8f558b30c440938652632
 DIST ffmpeg2theora-0.30.tar.bz2 91269 BLAKE2B e5a57679cb874e7052db184e8e24b60da640ed818affa228cf5353216c64d2805aee375f67cfa2653112beafa36d492a274ced745846e53f81101e0f97418c41 SHA512 2c77d2c5e705751928e2bfd86c4fe4c2b7df2ca2ce70f3dfeb0014a3269eef067587eaa045c11b0db86c69176d8f01a43b3ad75544d181c016a89aa50b6518c1
-EBUILD ffmpeg2theora-0.30.ebuild 1115 BLAKE2B a29387370972fb1812e97d2d3b6961a4cc8781cb4dcad56077fc0dcf713ce69f81db7256fb662a62c8cbabf93156c2f09d6b930eddd52a7be0c7cfb0d2926d95 SHA512 4a065d46a2948a79741f8d72b204489751180086df1ee8282039a35485c011f5a6ab51d00f0ebbc8dfb20b7679706eb82d688e410a882f1b53836f6eac8d3bf3
+EBUILD ffmpeg2theora-0.30.ebuild 1105 BLAKE2B 9b9ee9658b61e6c81c14406685276b0c0f8aa102b31b505e40ba881993f8dd87ad46d0c8fa45fcbde141502936648511135cf57902676f1ef95f0f72dfc83edf SHA512 25aa470fd34f4218bd0e6808b065e2f76b0e75b97799c1e5a0e4e38f1df2184c695dd826e97cc34fd4de79ab83775381494381d1ec1b576090953a3130d20f94
 MISC metadata.xml 314 BLAKE2B d200d644a8e139816ef36f882f1adf6025a292cfcc6fbfc820265b84a8fc564ad427b0815fb30024ca3d90cf7f42738896cee49e92fc5f8a1e55566051015220 SHA512 2cc51e06842a129ba5e490939f29861b36a1919086aae97a1f5639b56b211700b3839ac66898d0e14b25a3b1471869266ccbff47d2fd98a0baae429514466f54
diff --git a/media-video/ffmpeg2theora/ffmpeg2theora-0.30.ebuild b/media-video/ffmpeg2theora/ffmpeg2theora-0.30.ebuild
index a5dbd34ce2a9..60c0a9a5362e 100644
--- a/media-video/ffmpeg2theora/ffmpeg2theora-0.30.ebuild
+++ b/media-video/ffmpeg2theora/ffmpeg2theora-0.30.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.v2v.cc/~j/${PN}/downloads/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
 IUSE="kate libav"
 
 RDEPEND="
diff --git a/media-video/ffmpegthumbnailer/Manifest b/media-video/ffmpegthumbnailer/Manifest
index 52e1d8fc68ce..86014a780d26 100644
--- a/media-video/ffmpegthumbnailer/Manifest
+++ b/media-video/ffmpegthumbnailer/Manifest
@@ -1,4 +1,4 @@
 AUX ffmpegthumbnailer-2.2.0-pkgconfig-libdir.patch 675 BLAKE2B b6b00228900e3fb1894eb4ca4872a2be645cb3a6aecbb9d3581ff1fc00b7290eab72196fb9c5f6ac4924eb3e4b1b82093669128fe32c01ce56e4c36ee53528b4 SHA512 facfdf9693710c93896590b8814af0b6ed98fe9fe4ecde013a3554032ed733b3ab713a4a840212808c84b1277c9c4e7951fd1fbc641ad9c001f78635e4e539be
 DIST ffmpegthumbnailer-2.2.0.tar.bz2 1223895 BLAKE2B 1babd01672f927a9ae043488e67225490f732b26544ad92e4c55ae683eb7d852cb90233e76a52cbda2f6aec26654b57907d7706e3ad4ae6d76ca3bca163c78eb SHA512 526d15b2c754fcb1415e69fb54cb6e7d0102b6d73a32a7e8528df81e32633dfe3786898984fdb988c93daee7218956c75c096ef657c9b3a42399d2d1d27c7bbf
-EBUILD ffmpegthumbnailer-2.2.0-r1.ebuild 1140 BLAKE2B 1b3a928afc3b58994f3bcb1bd7469dded0c6ab9a8c897614c67784205f3caf7aaa6cd0ade6c92b7d4b4688f1ffc16c73be06ac1c111ba5c6a8e5cea88f46bde9 SHA512 0fc35aba21d61e01cf5f3ab9acf1c26337b51fedfb65ad98b452e84a477273d8b5d911ff548bc07f0a288d946fe8718be087d59c8768940a9e7acf712d7f3f45
+EBUILD ffmpegthumbnailer-2.2.0-r1.ebuild 1130 BLAKE2B 7933952ba835112a095e4e8aa3300789c6391b3443ce12bfd357e071ceae45fa4f3d657de737c32bfae220144ea330bbcd2ad870ed93f1e9fb43c4609ac6a6b1 SHA512 bffdfe8240be8e7a45fbe0b627c507427c5649eb588e4235e311857a3456000a38b87f86f0c934bcb0638f5ebbc7bd2b48c4e93a757d6c720d419a263029e0c7
 MISC metadata.xml 375 BLAKE2B 95c0757230dcb40e028a904cfeb17bc44d651e2c5840fb9bd45222f56217ab72cee863157c014fa301a69611eee2e5b574fe9351f066bba1a846ad2b458ae52e SHA512 a3b8d0dc66f4660489b8e084a310da37b5379843b5e4a661a7c1150a4c2a7c4924f6d92366edefa6e57ed77016577d86c4aef084238df06925395f21c3078ab0
diff --git a/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.2.0-r1.ebuild b/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.2.0-r1.ebuild
index ad3961659c74..3dc2ba06cd44 100644
--- a/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.2.0-r1.ebuild
+++ b/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.2.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/dirkvdb/${PN}/releases/download/${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="gnome gtk jpeg libav png test"
 
 REQUIRED_USE="gnome? ( gtk )
diff --git a/media-video/gpac/Manifest b/media-video/gpac/Manifest
index 2b85590b87e8..47ba99f9e42e 100644
--- a/media-video/gpac/Manifest
+++ b/media-video/gpac/Manifest
@@ -3,6 +3,6 @@ AUX gpac-0.7.1-configure.patch 2928 BLAKE2B 98ce3227f87c3c4576f5d4bc3a28d560ca3f
 AUX gpac-0.7.1-openssl-1.1.patch 4037 BLAKE2B e03c781c54a78ae3b36aec5766b47a8bc1fafceccf03e04517bdf5756cc15214dc22fe3ee20a1deb1a68b4ead6b198fd30fac04bccb584fd2fda321e4ff2204e SHA512 1ffdde35f09e0ae8b037d00c0e57fabf402053acc46201ed3be791b16436bcdebd6c0ed232de45d40279891c06ddb9bf26a3a5093fd379850495808930f878bb
 AUX gpac-freetype.patch 622 BLAKE2B b27d2ae313ca95cd46280b56d42b631854995d5e283269ea2f059b6be8bb547949e6c241f62ec4692b7b31626898cf31874ee8e8462e6cc414353aa8b72965cf SHA512 8361efbe7fa8989d63a8de733094e2f9e0f7467d7bf437330477bcbc4091517619c925aef056a1ee57c3cc7b0f3e973abab5cb095a5a8444ff1b220bbb7a2dde
 DIST gpac-0.7.1.tar.gz 10654838 BLAKE2B 795fd11d6bf02bb0d27d97f2c98017e9875aae26ea7d99c5587c7ec5ccc8273283fbce6444389ff4371a34d0e7d03102982ff8a8ec014c7f0c2ddd36c684cba9 SHA512 0377d9471db9e5ccf75f85dfd0c9f4e37a211108b5e128a5411ac015bd9c906257320d517717f0fa03d434e1fce24bd8a9c3a73200fac5c21b80895b716ab403
-EBUILD gpac-0.7.1-r1.ebuild 3412 BLAKE2B 93f5c9bcd17312d6b6ade841b034ca170e72a34a0e18da4d72e02273e3e2af8f99b73ee6d6e2da895437c6015e2dd9720d725347fd19ea5891f933298daf48a0 SHA512 7097bc7a7e299496834d2450fe73e58c079e12bbc85c9864fb4194fa96db9080e1ca96da5a1942928934ed89a55681b6cd206a048b1e7ddc3d663210af40cb1d
-EBUILD gpac-9999.ebuild 3181 BLAKE2B 8c51ec87f24e14deac39139aab5546585a7a84a1ecb80623237390b7189d519bcaccbc9481f64c225d50879cb586b20ee4f02af21f11ae746730ff6c269dbfd3 SHA512 af202c5d441454bc677c7b7e5dc0766530164465e1776b4f764fbe967d07c05fb0f8d3183af4e63a2c9f15988361bfc1b2286a1d8e703f191d992083ab1222e7
+EBUILD gpac-0.7.1-r1.ebuild 3402 BLAKE2B 2b772daaad1c27e6108673c1264f38697b26fcd8464d7454efa28d80ea1b6e5a46463e07085dc5cc940923e6d57ad416a10fbee30b997e6ff89826c1b33f7803 SHA512 934bd434be50901c4a6f7b4fc4484f8de7376e23f4d577c0a39006cb3f71df7040b021af1dbc606671ea8f2b0e2e20b48e10b3fe363c6a545dc4fd7943c75b0a
+EBUILD gpac-9999.ebuild 3171 BLAKE2B 2df32484ff5587c46ba6f4e177e9dda7d31dcb8ae275c4840257fa7ed0b03460c7d3be1cbb72b83e3af9e4ab92ae66d516c61b40d41662e920eca0b34f681fe7 SHA512 fcb635819a2123c46140ba4a92df760e68f00d96d17143cd43acafae40bd5f433c3bef16861d2d16f64418e00df87b6f2430249e9ce4aab517f5ac57db82e7cc
 MISC metadata.xml 356 BLAKE2B 02d021261f873991949e9d24bdd1f2791a93e033c6a350bd014bdc9d2fa32f733547d8f7b78733f010d95420e07d4d1c0dd63ac367757dcc505a4eb0801921bb SHA512 651073c0156c19eda006ee7622db5a127f1e2f747ed7e0cb141be1abca2084a1427ea82a888b335a68b056980b68a693f852b44d96bfe47f28cc985bf72dfac4
diff --git a/media-video/gpac/gpac-0.7.1-r1.ebuild b/media-video/gpac/gpac-0.7.1-r1.ebuild
index ff65e99eef40..6ce91ae81ef0 100644
--- a/media-video/gpac/gpac-0.7.1-r1.ebuild
+++ b/media-video/gpac/gpac-0.7.1-r1.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/gpac/gpac"
 else
 	SRC_URI="https://github.com/gpac/gpac/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="alpha amd64 ppc ppc64 sparc x86 ~x86-fbsd"
+	KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 fi
 
 inherit flag-o-matic toolchain-funcs ${SCM}
diff --git a/media-video/gpac/gpac-9999.ebuild b/media-video/gpac/gpac-9999.ebuild
index 5acc9d8e2d32..c39142d90179 100644
--- a/media-video/gpac/gpac-9999.ebuild
+++ b/media-video/gpac/gpac-9999.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/gpac/gpac"
 else
 	SRC_URI="https://github.com/gpac/gpac/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+	KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 inherit flag-o-matic toolchain-funcs ${SCM}
diff --git a/media-video/griffith/Manifest b/media-video/griffith/Manifest
index 91facbaad729..c58e0d9dd087 100644
--- a/media-video/griffith/Manifest
+++ b/media-video/griffith/Manifest
@@ -2,5 +2,5 @@ AUX 0.10-fix_lib_path.patch 666 BLAKE2B 03dcaf2732c753885bd34254c988a5d6b5be12df
 AUX griffith-0.13-validators.patch 549 BLAKE2B fb8b53aeea53d331ff01b74a7bfbad05615b7de8f7e2d09057674a582191381a4a4a9348573a22ba9d42814946598f2e5592288799dba39b682509b814cb81f4 SHA512 0ce26c62d26d397fb4b212ada76895af826dfc11ea289f928d1761809bcd67d3e9c0de4a2c3ac402f4cb550ed9b50dc067689d4cc0c8e05f5117317c968e7c9b
 DIST griffith-0.13.tar.gz 1565903 BLAKE2B d3d806ef2a7cef76ce548e3ad785e96938447cb6425ac95fdbb4b5ae233adb2aeb4a274aa24c9e502607bc1287ea30ce8806cb1608fc194531757943e499b0e7 SHA512 dc8117b1a89253a87eb303c5229e6cdffde26b52de9ac4a3409dcc3f6dca64105f13a98cace225a932aefb2d620e828eea66bae57f40328b7ee3c06a944f0bed
 DIST griffith-extra-artwork-0.9.4.tar.gz 124008 BLAKE2B 992f8e4995d0465e891eacfe601eead2323754c60ad0c0a96ea9568dbecf5790039f58212e8a115f382532e1787e4db267b1259ac91de40728f7911f6b2178ae SHA512 09e912b4511c5c4a7b501d9a8f98223d20e58574e667cdb759e66f743cce14b45cce8bf0f9502ff2aacfc09e7a7b37966a887205a74a6e028b832703a65a2734
-EBUILD griffith-0.13-r2.ebuild 2123 BLAKE2B 3b2b0f93ae340858f005d12aa5e497fce45b61a4491f68b6ed013d331c5115afca678bf94a25a45e99b0cd158a1d637e4b8a90a4963730e9090c5871a201f9fd SHA512 e0d9b21831f03bf2c1f2049c7f9e8af4365d24a7fece28314524821bfde42644cac8cbd12541d5a077b1d7fac2e05f53315b0bce0ae04318116013a57c577f31
+EBUILD griffith-0.13-r2.ebuild 2113 BLAKE2B d671255ec142676227d68dde7fb87cdb995fbb621bdfbfa447c11f169e067499bc8ac5ba16ed6520fe738dbc3ab12da55cb0c39f049233a9b57b247f1c6fc884 SHA512 91eb875d5b85a34f78e6d1fb3e5a3b84f508a2f3c35001877ac0aa91c1ea6d876e17f41a2ffe5a066e79e9e0912c331d62f4b701dc41b6466343886d64c673a9
 MISC metadata.xml 345 BLAKE2B 2c1e03aeaaa718018760dc5853f6ed18c915c5c436f7fa64e101ebf8cde36b442d41641a0a6bb3b05ecc3cffd138a749bfff1721430a78300c7ce9a312a4b9c2 SHA512 c259fe792b25d60fa4112e229076beeecb198cdb5e7b3b737f8546954039995ad321253d9004d939fb7232b67fb44d4ea0d6cae5e5240baa0c0ad0b9265f5592
diff --git a/media-video/griffith/griffith-0.13-r2.ebuild b/media-video/griffith/griffith-0.13-r2.ebuild
index 74c6fc2d2ffa..aa9efbb2fc61 100644
--- a/media-video/griffith/griffith-0.13-r2.ebuild
+++ b/media-video/griffith/griffith-0.13-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz
 	https://dev.gentoo.org/~hwoarang/distfiles/${PN}-extra-artwork-${ARTWORK_PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="amd64 x86"
 IUSE="doc"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/media-video/libav/Manifest b/media-video/libav/Manifest
index 7ca9af9c4b83..6a5f9298446a 100644
--- a/media-video/libav/Manifest
+++ b/media-video/libav/Manifest
@@ -2,7 +2,7 @@ AUX libav-12.3-x264.patch 2466 BLAKE2B 8dd7fe5a6699f34bd1662f10eebbe5f189a22c43f
 DIST fate-12-r1.tar.xz 763758260 BLAKE2B 299e1a2a773e49c7a51c1222ac34eaea24f77420570a1b0c0b18db5517736656f52ad0a7ca807f65f5e9f9597709265fcd950cf989ad995aa4289ba0e364950e SHA512 084f584c34d34b66c1f4d4742a11376ee2b90f6a07529b5aba6d50421dc8f863fded73dd57ad2c201aadfd529f0f923fa531ea9b41aaaa7b682846ef565a1018
 DIST libav-12.3.tar.xz 5267988 BLAKE2B 92147dde4f41a5aa05d93824d3ffa9a21b067f99cec5fa17bc4b8e3600f2b1913f7e74d4ea766c864cdba686dd14d5d3a8bc8af8f9e6de4c956f14cb8e20ab88 SHA512 fd4838a934792797a975ece034cbd63760c94ee6becc99b8707e8345e41777baf26e30ef6937ab30b7d2f722977e69aabc2cfca3fcdf88373d579f9cc9d69162
 DIST libav-13_pre20171219.tar.xz 5427904 BLAKE2B 074dc5d071aeb656fc14a015c2e3c168aa81d25e2fb08d99e300dc47d7ea28f61500fcfab0b16fa136261a5af27631b7536eb3aefa0e1feb4d615af57f9f5a36 SHA512 0c9b59957f1fbbff8f5b95b02c11014a4efdddf4b7e1b158cd0fda3af8b89bd90d48263ed0239915adfb7abcd7a8b22c278cd5cf1d01822bd22df65cc7f69689
-EBUILD libav-12.3.ebuild 11242 BLAKE2B 25ad4fbef4ff27561de0184450b79991cb80661558aabc5b2b84d1ef69974a2230990b9cbaa04c963eedbb48b4b1cecef20a64ffb3b7bd0d9186d98a1e73ae24 SHA512 49793537ed1c926b4f3d3ab9829b2516da5280bab76af76fd627ae9a1f37edd6a6d6beb7160a0000352b96ea6fb0f7be62224f7d683f0331e508edd570147497
-EBUILD libav-13_pre20171219.ebuild 10625 BLAKE2B 33a1d89df5a2188d5322f690c93a3832be3777a73b7a154e07e4167c5938bef5dd05b3b965e136d85ae6e3e010bb035bb304e5cd555894890109309afcfd1b6f SHA512 e14e5698c35358bc02450ac248053687c18734044499feb1c1bd2c4cc07394c1ad4cc31e43b134b5c04138d34965f8882021503e293273d7ebd9b2abd9907476
-EBUILD libav-9999.ebuild 10766 BLAKE2B 89157d8d1e2ec75cddf618a5a788f55def679462b4e61cc252528a5fd80bd66811a732b504b0bd969bda48d8634fda53e7eee47f6c88c94c02c8b2aec40dedba SHA512 b0f81f087eb16c64eaf2bd1eea1da95f5ecbcc7c23dd08f50bde7ffee7cdc1cfdcf23d42636f4d59fd86584e9e2ae5cf2935a5356a14b95ee684fb73f9317452
+EBUILD libav-12.3.ebuild 11232 BLAKE2B 0ae9cb567e120853db2ca6e9d86002bd2c579aaf83459ba838772576747c05e9b6e7772479a8e54be5c02a248b8b5df3b885234c272bf7e576e32e1f0fea869a SHA512 2dae79e2edcff70eb696847f5b92162aacaf144e7bc6726dabab6a2df6df4235c6b0a368f0b8fb74ab7e0ce18961767f98745511975cdd06878d5cf823e32ce9
+EBUILD libav-13_pre20171219.ebuild 10615 BLAKE2B 9998c90f11291fe420ffc9ed749338b2d38cb288b920d9a5224684456c08f66ebfe0636ef7c39fdeb5e5a3796cef00651cad725ee44dfaac008999f62b188685 SHA512 086e1a0bd077707b773904b97a5f549ff1e9e7ecaf34c7b273cf15570a2520587432fac0cb0692618925c987227392b609d77c464627b617e0c64f96f951b705
+EBUILD libav-9999.ebuild 10756 BLAKE2B d7833b5fb3b896924124dd4d86d13909d61c48b30284e74b9494aae4c14e5b4e2f162582eb3cbe4c78381d78da10c21e5ad263c611bf5e0e14553aa0bc46a228 SHA512 74b99c2ef7efd84da77e1eb6bf839cbaa67b42360567db18077dd8f50a478129a0df603907d211a6e5dca2f4e42e74f89fdd7ffc6fef7aed12c36818cb98f9c0
 MISC metadata.xml 2601 BLAKE2B d09d7ca403657b7d446f2504ff22c74ebb86303db22d4df43cb4b026ca39c059e754459f5f99ffc5cf6c5a29a189ed47754fbe709bc4897901cab96ed6928ab3 SHA512 12d2a41647e3e9ca824de3276098f742c9a068a8d4b33b2dbc45f32329ccdbdbe13c1f6f52cc4028ef5511c9f8557cea39bf1926c2433c7ae85687bf1f6ea7a1
diff --git a/media-video/libav/libav-12.3.ebuild b/media-video/libav/libav-12.3.ebuild
index 2e4a307f5bd2..edeec8edc904 100644
--- a/media-video/libav/libav-12.3.ebuild
+++ b/media-video/libav/libav-12.3.ebuild
@@ -30,7 +30,7 @@ fi
 
 LICENSE="LGPL-2.1  gpl? ( GPL-3 )"
 SLOT="0/12"
-[[ ${PV} == *9999 ]] || KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+[[ ${PV} == *9999 ]] || KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="aac alsa amr bs2b +bzip2 cdio cpudetection custom-cflags debug doc +encode faac fdk
 	frei0r fontconfig +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k libressl mp3
 	+network nvidia openssl opus oss pic pulseaudio rtmp sdl speex ssl
diff --git a/media-video/libav/libav-13_pre20171219.ebuild b/media-video/libav/libav-13_pre20171219.ebuild
index 034734f041e9..73e9a1a3abc9 100644
--- a/media-video/libav/libav-13_pre20171219.ebuild
+++ b/media-video/libav/libav-13_pre20171219.ebuild
@@ -27,9 +27,7 @@ SRC_URI+=" test? ( https://dev.gentoo.org/~lu_zero/libav/fate-12-r1.tar.xz )"
 
 LICENSE="LGPL-2.1  gpl? ( GPL-3 )"
 SLOT="0/13"
-[[ ${PV} == *9999 ]] || KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64
-~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-~x64-solaris ~x86-solaris"
+[[ ${PV} == *9999 ]] || KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="aac alsa amr bs2b +bzip2 cdio cpudetection custom-cflags debug doc +encode faac fdk
 	frei0r fontconfig +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k libressl mp3
 	+network openssl opus oss pic pulseaudio rtmp sdl speex ssl
diff --git a/media-video/libav/libav-9999.ebuild b/media-video/libav/libav-9999.ebuild
index 9d1c7550d6d4..6f5fab3e33e2 100644
--- a/media-video/libav/libav-9999.ebuild
+++ b/media-video/libav/libav-9999.ebuild
@@ -27,7 +27,7 @@ fi
 
 LICENSE="LGPL-2.1  gpl? ( GPL-3 )"
 SLOT="0/13"
-[[ ${PV} == *9999 ]] || KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+[[ ${PV} == *9999 ]] || KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="aac alsa amr bs2b +bzip2 cdio cpudetection custom-cflags debug doc +encode faac fdk
 	frei0r fontconfig +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k libressl mp3
 	+network openssl opus oss pic pulseaudio rtmp sdl speex ssl
diff --git a/media-video/lsdvd/Manifest b/media-video/lsdvd/Manifest
index 876873bd61ee..92645031b5da 100644
--- a/media-video/lsdvd/Manifest
+++ b/media-video/lsdvd/Manifest
@@ -1,4 +1,4 @@
 AUX lsdvd-0.17-autotools.patch 538 BLAKE2B cd5967fe1ae36d355db2a2b8f35a9a28d69f852729b8fc62425c7e71676f253ba3e6d47a4c9cd181bd45258b550e6c457b1d9baff125ae3d5f66a7c206330d44 SHA512 7fc4b172d8ca75019165758b2bad030e6a5ffc28cf542e1f0d9025078029578cb96b6ba5f1a6bd877f315baef74aa302dae78352636b03592e5a1343da5680b0
 DIST lsdvd-0.17.tar.gz 99250 BLAKE2B 2b3203527aa4aabd43d26de5f983733f5570905a81043f49e18531a29198499ebb2b9c1ed9caf4ff061639ca02f047c13f95948c09bad7b105d8c02bb3ec9c67 SHA512 d217ebe063c9d4c1584abe99cba5c5d09e1d600d26c58f90d542235f9a629433aa24f24fd8399c639e21391e7a5e8bdf54a9c85083aed63eae1090f4c23677e0
-EBUILD lsdvd-0.17.ebuild 611 BLAKE2B f2947298e6e98f35a558c6d94139ad46884a871aeae33c3d22b910c4c7383f59e4db2bd6afe2ea11288a878eb53bc0ac1bd5e8a6a02a88a033268365130b6943 SHA512 21f67b121beb1a422aeb0f991577f17333074e68277e3bb1253041e034fa81ca784934bff8551c5f7a40ad5a8b16b5092efe0f65ab13361902522613bb31fb82
+EBUILD lsdvd-0.17.ebuild 611 BLAKE2B 09b78daf02e232d21e71ad8b3dc53eeaa9906c1730e3671e57c9a37497ff8f97eea94fa852141e6aee07a32a82339727f934026c55baca1f933b40fff015ac68 SHA512 e97ba163d2f9c0ed0ebbdac0cfb2a4c8b2068b015490ec905b1d421092771fda9a508b2091a353e28110c3d96ea5360d59aba81bf0d9b9fb6d688fe4d264c2aa
 MISC metadata.xml 298 BLAKE2B c3e1a45f064520eab1bb66929326a061c877aa6ebf092b4b467aa0ba2a9d904acbc4a5354a6773765973d18c5359bac14a0f04bf9a2f84490d56161155870f6c SHA512 b52246d4fa2022782a488aa4181dae1eb3b4c1371f492eae86c871d4e7f4cc23c89889ac08a5d74f337276933a53237a7d49e4489db384913017e74c888230b6
diff --git a/media-video/lsdvd/lsdvd-0.17.ebuild b/media-video/lsdvd/lsdvd-0.17.ebuild
index c7ac5c7dc1d0..b1d3d8981010 100644
--- a/media-video/lsdvd/lsdvd-0.17.ebuild
+++ b/media-video/lsdvd/lsdvd-0.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 2003-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="~alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
-RDEPEND="media-libs/libdvdread"
+RDEPEND="media-libs/libdvdread:0="
 DEPEND="${RDEPEND}"
 DOCS="AUTHORS README ChangeLog"
 
diff --git a/media-video/maven-poke/Manifest b/media-video/maven-poke/Manifest
deleted file mode 100644
index d5ee79dec4e6..000000000000
--- a/media-video/maven-poke/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST maven-poke-0.0.1.tgz 12974 BLAKE2B afff47f044b7c635b902cf5004e1b35312dde70c39195a59e4660633f1088f63a84649fd6e2067b15b369442789ff6f40e8b7e4c88443186546beaeacbec7f7f SHA512 e463062d004078b9180d8f5a652a22b029a364189809f739e70237dcf6f96f9e73840e706c082f9d4f1df7f3ec68396f8cf378535cdfef37ca1cc402c3f8a6d8
-EBUILD maven-poke-0.0.1.ebuild 894 BLAKE2B d68c9a8d0dffdf5021953d180ddd3bf2bd704b215fc04c07e2e58b2546fc07bdc284bf24cb8b5b8ad607a2e1efa23a0bb04289b85f14a7c1eafbe70810839c89 SHA512 bf9f37223637ae4443a1c6bc3784f45be61c714e3ca762f9e0f97c36e9872ea87dfc74d0082855530e775c01e6cb8f6a4523abc72cbc8f084fbc9b0ed073cb1d
-MISC metadata.xml 265 BLAKE2B 81ae71ff8ff3fc89fd58f7cee9f59ba0399695fb9ceb7b6e4221b6c9b4f5930d026f4e6ae466d52cf27a3f58dc92e19051c645f034681a16758b0962fc2efffc SHA512 7af3db1dc60ec583ef99a62d5649624c2ef01efa64cee6ee916b6042cbf8d0edb5a0a9a6a1baa047940d5d17dc10f00e9675ae613bf114d33507c3204aceeab2
diff --git a/media-video/maven-poke/maven-poke-0.0.1.ebuild b/media-video/maven-poke/maven-poke-0.0.1.ebuild
deleted file mode 100644
index 0da9fcd6dcf6..000000000000
--- a/media-video/maven-poke/maven-poke-0.0.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="Matrox utility to read and set maven registers (tune tvout)"
-HOMEPAGE="ftp://platan.vc.cvut.cz/pub/linux/matrox-latest/"
-SRC_URI="ftp://platan.vc.cvut.cz/pub/linux/matrox-latest/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc ~x86"
-IUSE=""
-
-src_compile() {
-	emake all || die
-
-	#prepare small README
-	cat >> "${S}"/README << _EOF_
-This utility has been created by Petr Vandrovec.
-It was formerly called maven-prog (and the executable was matrox).
-
-A listing of maven registers
-http://platan.vc.cvut.cz/~vana/maven/mavenreg.html
-
-Not much info here, but here are some pointers
-http://davedina.apestaart.org/download/doc/Matrox-TVOUT-HOWTO-0.1.txt
-http://www.netnode.de/howto/matrox-fb.html
-_EOF_
-}
-
-src_install() {
-	newbin matrox maven-poke || die
-	dodoc README
-}
diff --git a/media-video/maven-poke/metadata.xml b/media-video/maven-poke/metadata.xml
deleted file mode 100644
index 093834a431a4..000000000000
--- a/media-video/maven-poke/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>media-video@gentoo.org</email>
-    <name>Gentoo Video project</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/media-video/mjpegtools/Manifest b/media-video/mjpegtools/Manifest
index b2251de5bdae..47b57386d9f6 100644
--- a/media-video/mjpegtools/Manifest
+++ b/media-video/mjpegtools/Manifest
@@ -2,5 +2,5 @@ AUX mjpegtools-2.1.0-no_format.patch 2800 BLAKE2B fd608ca5b9700fc0ab216f99be79fe
 AUX mjpegtools-2.1.0-pic.patch 2298 BLAKE2B 9babd547b6c631845964e7ab6cb929d0b704700782ff3118c44e6434585b66a21ae713b544e57d33beae6193b7ff499fc6be1ddb9147cf93cc3c00ccec676f76 SHA512 d90c30e097f3f2694f611b3e52d76834f9f6e1c9020680e87cc353b28492d36dfb49a7a1167792450cb6f7ed88c20ed891b9282693be9d8583e4948fd998802c
 AUX mjpegtools-2.1.0-sdl-cflags.patch 387 BLAKE2B ad8065afdf164335e77adf972b21c6fd7108dba3f21a56006eede02a650f7f0728950c36f9e73dbedd9713eb69f8dab010c547c472c02abd8642dc518cc43621 SHA512 67b43ab22d1358755a6e109b8eaf21b14058c6a4f4dc511e27162c4205274eacbe4fb9016a5c8a3938ca071f6d4f1898801ed3ab0571b011aab170771a1b7602
 DIST mjpegtools-2.1.0.tar.gz 1844336 BLAKE2B 90ae51c81e18708132f26c1fb002128193168366542cadc15060ad52f664a5f90770b3039ada2a1777eab5fec9743fb24c65083de913ebd72b23dd55f6b25741 SHA512 10d3288f47d7cc4de87fa63f65e0fd4bd0a9af95db77155eecccecae7a7e60ebab83eaec44cf7a2c3d9e627f0cc086eda208abee1a7a74cbf3f85e87bb979ac5
-EBUILD mjpegtools-2.1.0-r4.ebuild 2887 BLAKE2B 5766a4400f6142bcf2d35ac7e641ed465bdefaf4aaeae47e6f82948083601fd95aad889657fd44b7934e24208981810466189f552a1b7b3ad3bf58957d1e5447 SHA512 5e58b44d51e5148f18686786646bb71f4bbf43c41ca103691152f63914666fca434471b9942de9e785543d4b3280385b3554a9ad7c6067073a7b1aec7b5caca9
+EBUILD mjpegtools-2.1.0-r4.ebuild 2875 BLAKE2B 18a6530e7e606c3e5e678e30c2193f5ddad0c3666a2d9bbbfec75b60ca997273404d93b212fba1e6e2e344160a27203308194ef472b795480ce20d76aff95833 SHA512 e4220c18d4fbba0e7e6eac780d57d2c539ed106ac9650c11af0a1e20eb84292f21ecc54295ee892c3848765f57af75565260fcb6aefbe8ccf21f88f3a78e1e78
 MISC metadata.xml 537 BLAKE2B 9a038894ff7da6df6f8746be16e0a0f9e0586321eba052a95afd038d2625110d7dbcd2961ac8de8c14ab2fd74ccb2eb3881d64c8b96c97936e92173e2b62a67b SHA512 f3360892e77c064d2062bb963b91f031587ebed6a31b8ba2c698d969cf88998daec9ef910689f477e36921df60d2aa8bdfbe569dda701b0e375d75acfd31d79d
diff --git a/media-video/mjpegtools/mjpegtools-2.1.0-r4.ebuild b/media-video/mjpegtools/mjpegtools-2.1.0-r4.ebuild
index 9d93eeb9c645..88471580065f 100644
--- a/media-video/mjpegtools/mjpegtools-2.1.0-r4.ebuild
+++ b/media-video/mjpegtools/mjpegtools-2.1.0-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="cpu_flags_x86_mmx dv gtk png quicktime sdl sdlgfx static-libs"
 REQUIRED_USE="sdlgfx? ( sdl )"
 
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index 0c50b9e05ea8..18a9951ab1b9 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,10 +1,6 @@
 DIST mkvtoolnix-35.0.0.tar.xz 7297244 BLAKE2B 9a7cd015b00fe46f165903b8b6f9317489548aa9a352c85727296ee0638506336028231b115a9270388a4ede1a088a4bdba16156600341c51bd5a2ae557b181f SHA512 aa109be9da3f0bd119d9315b9ea136d3c1532d0f351c5a052dcc7ad67a4dcec9d8fec69a0c9358790abfcb6eeaee47fad4af2a0506bef39cfd5c8466f90bdf98
 DIST mkvtoolnix-37.0.0.tar.xz 7307984 BLAKE2B 4ee59d6ed186e7181733f5723fc8ab5abed5056c7562cf646b123f0e4d9e6b191176feab549231d8210b669d4cec36aaa6e33bf1b666b92ba471696d83e98c8e SHA512 196f8d12f36d95d077b8afeda4d651fe7fe5a0d6c9e71a49608732cbf6d68052681ec855875ed4a79e8aa0589502f4475a4306eaa9464523288a1af740b84df8
 EBUILD mkvtoolnix-35.0.0.ebuild 2673 BLAKE2B 2e0f0339434a91911d6b09541c1e1ea0a33deb365e82c13cd97a976c0ffff08a340d2402bd5a6949d24a9565e2406c5403a684f582068eb505494938fda9a89e SHA512 55744b23a1f061e14601d157309615bed32a282a0d6c3b84aa2dd1212cdcaf264d6e6b28f345bfbef16759c01e3f88e20457ccb0de40ee2d9f86569dadbb5f06
-<<<<<<< HEAD
-EBUILD mkvtoolnix-37.0.0.ebuild 2610 BLAKE2B 49af0fe580bda9d5317933a9ff81ca2083a52003dc1ae840eb15993910901dabc760c907eedb568a608b1f21ba492dab7538b08a51381f4a72b879a373ce86a6 SHA512 bd3b475b421f12790d703ade528eade5640d97591a0fbeedb2387690bfddbe1a395e15e75fce6de6b01aaacb7d25874abae9750b5c964d24761efae693e0a563
-=======
-EBUILD mkvtoolnix-37.0.0.ebuild 2609 BLAKE2B 0b11227821e40722646ce98f05cc1c54ac5667672c8959e1174de4beeaa446a6bd4450c363ada5aa3dac00e96bffb1c045c73183c592d489412c2edbd26a0c6e SHA512 86748441100688abb58bfc748119a95cfb9f6ed9de1ebfc2f43d9233d0e88a5410cde46e9645d5a9c93995d6288e3d666346f324a888f1a78dd63b76a8e23424
->>>>>>> next
+EBUILD mkvtoolnix-37.0.0.ebuild 2606 BLAKE2B 8803095ef8a6afec2b048a4d5e56ded7741c537714d151281da52d15a067d8fbfd2a6436f454eeac5a4bcf2bb4284e09cd7c5f333218523e878569a7b3d6cb76 SHA512 71f0476067793a1209e76913cb94844bfd67d33a825fad193fda526fcbc48e4c003367a1a1fbc1e3971574e71753c6f93a96dfc025a37b9b13b1ade2ea392699
 EBUILD mkvtoolnix-9999.ebuild 2610 BLAKE2B 49af0fe580bda9d5317933a9ff81ca2083a52003dc1ae840eb15993910901dabc760c907eedb568a608b1f21ba492dab7538b08a51381f4a72b879a373ce86a6 SHA512 bd3b475b421f12790d703ade528eade5640d97591a0fbeedb2387690bfddbe1a395e15e75fce6de6b01aaacb7d25874abae9750b5c964d24761efae693e0a563
 MISC metadata.xml 255 BLAKE2B 84855d12acedab301e8e709820ef74f658689209ce914cad2c71d11f4248a7d3356109d93573ed675698031eca1e0b6e0372a61c2a43a9f09840e295f94b74ef SHA512 92b56f4d9c86ad69341e67e8cc74db0bd068e45afdf2f3d3f9ea410fc5e64f3476143b656f2cb3d26b97ae01a967d71766952eba22e2278aab907c20b00ae0e9
diff --git a/media-video/mkvtoolnix/mkvtoolnix-37.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-37.0.0.ebuild
index ffdf966c2335..ed4d29782167 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-37.0.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-37.0.0.ebuild
@@ -11,11 +11,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz"
-<<<<<<< HEAD
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-=======
-	KEYWORDS="~amd64 ~ppc ppc64 ~x86"
->>>>>>> next
+	KEYWORDS="amd64 ppc ppc64 x86"
 fi
 
 DESCRIPTION="Tools to create, alter, and inspect Matroska files"
diff --git a/media-video/mpeg2vidcodec/Manifest b/media-video/mpeg2vidcodec/Manifest
index d8bdd4421734..515e2fce9780 100644
--- a/media-video/mpeg2vidcodec/Manifest
+++ b/media-video/mpeg2vidcodec/Manifest
@@ -1,3 +1,3 @@
 DIST mpeg2vidcodec_v12.tar.gz 259790 BLAKE2B 528a6bc7ffdf25ff97241752d26accf83860f3dcf6a7f8ce9394308c1cb1ece0cad9d79f8a6ce7b59823900e9ff991a1cc0ff9de8c11749736576d847d07545a SHA512 2a46f486102ac2a1ae99a0f75b196c5aa01f8a99a6230723a2000ca8411adbca6c3e07d70f7cb269b17ce5fa4bf318e6dd4bfa83ecf8e137e8efca2bb352735c
-EBUILD mpeg2vidcodec-12-r1.ebuild 829 BLAKE2B 186c891ca4b753ff5bddb8f43e5cc3ec6e68964bce5e1921727ba92ff467ec112765aa7753bfd4da5926f4c201e41d12411fac6dc10989bb936f5748d13451a5 SHA512 21d76f1e88e56fe776a105844367efe1da0a8f765b5f84eed5b5d67c6483b2f5d5ddd60abd1d66a74034a1e256a99f56acfeda889f25227265cc9e6e848e8b16
+EBUILD mpeg2vidcodec-12-r1.ebuild 819 BLAKE2B 35eb7318a4e038d5839c098c8df44c780b9ebfb5360ba8b9aa8950cd0beaf4283020420f90585ef667429624c2c83534c3ce016cd9fb0851373d23e08f2ac4a3 SHA512 305bd5edac08bf2447b3cdab9d16ded6151021312574e3a6b58c14c77fdf035c2ddedfaf8bdec6dbcb9d3848f01f832f7f3e18bc19d2264927ff179094a0e2b4
 MISC metadata.xml 221 BLAKE2B dbd3c4ca4e95a1ad33f79e707799593ad704252f4f1c17e08c7e42ede0e4ad153eb659fc130717823dad18cab485c7b941a7089d2d964b96d2e2f7c5f1ba8df2 SHA512 e5a88aac41d38b1bdf0becef8d0a08d1875eb803fac3f791524a7810c8068cfd2239a42717bddf9835daf6c0b2c5d5592b12669882bbc2abaab39955d7de7fb4
diff --git a/media-video/mpeg2vidcodec/mpeg2vidcodec-12-r1.ebuild b/media-video/mpeg2vidcodec/mpeg2vidcodec-12-r1.ebuild
index 3f8cd99c1e7f..d3769dd81efc 100644
--- a/media-video/mpeg2vidcodec/mpeg2vidcodec-12-r1.ebuild
+++ b/media-video/mpeg2vidcodec/mpeg2vidcodec-12-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.mpeg.org/pub_ftp/mpeg/mssg/${MY_P}.tar.gz"
 
 LICENSE="mpeg2enc"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE=""
 RESTRICT="mirror bindist" #465088
 
diff --git a/media-video/mpglen/Manifest b/media-video/mpglen/Manifest
index 9313fc610933..95b9a14ec5ae 100644
--- a/media-video/mpglen/Manifest
+++ b/media-video/mpglen/Manifest
@@ -1,3 +1,3 @@
 DIST mpglen-0.1.tar.gz 10149 BLAKE2B 479fbaad9c635fc47dce9dd8191b8c2df4c9da115a2a7c30d59e6c5e65751bc7a757c311f98f222dbaf633f25a0c7bfde0f8600e27ac8aefae5e45ae01abcac4 SHA512 10c3550e14fb0d76360f8b99e8e82f7ca951cffc14921a6ffce5a949bf10d0c1d7d2dcafaf61c85123fecf5432139332a10f0f54e9c04ef99584578294d812a2
-EBUILD mpglen-0.1.ebuild 662 BLAKE2B 62447f089f591f667646f4efb414cd1f13171f96552aae8f10fa90eae0c65c5735ec057058c1b27e968f1ee0d1666009426265d955e4756e30b5142f8333e065 SHA512 4d52124c02410d73314690b9dda0df0494b9f93bfc556de2579eea90204692aea13441aa0cf0536a111087cb2ab92677c15ee592a2c462640651f4f1ce797dd5
+EBUILD mpglen-0.1.ebuild 646 BLAKE2B 9acaa87f7859384ed6fcd73e6eb0caed1611973326136f8da31d217a4a18998157b5d48cfe14199f87f5ce8358461d80e3267956743796934e0563310a62cf09 SHA512 e5099c78599d0a430d95e9892df14cf2f3859d770b2bd3a89b73b3d431816a337a2c5a4c855e570c01aec028e197f7536784b17b9cb789fc5c7c55c759b1668e
 MISC metadata.xml 219 BLAKE2B bca5749b6f2d3541ba2d2635b59056f9ecdc46553991dec3ee5a7bc9f26393bdae62755418850d3cbda0eeb65b7f72029ddf09d4f088b21c84d407d0e6eaa098 SHA512 24793c7fd0e2cef8fa5a0efd9bd55fed1e62ff6810199a969d4c0b869bac9b9ec79b288105b73b1b99734320bb13569a8ee00516b5452dd67d91d14dd17038e2
diff --git a/media-video/mpglen/mpglen-0.1.ebuild b/media-video/mpglen/mpglen-0.1.ebuild
index d366cc724bfa..333aba26e066 100644
--- a/media-video/mpglen/mpglen-0.1.ebuild
+++ b/media-video/mpglen/mpglen-0.1.ebuild
@@ -7,7 +7,7 @@ inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="A program to scan through a MPEG file and count the number of GOPs and frames"
 HOMEPAGE="http://www.iamnota.net/mpglen/"
-SRC_URI="mirror://gentoo/${PN}.tar.gz -> ${P}.tar.gz"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index c59cc4894caa..876c6fa8aeed 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -9,6 +9,6 @@ DIST MPlayer-1.3.0.tar.xz 13278984 BLAKE2B 4e2d67f6fda893f3b200bc92598c23410a2a3
 DIST font-arial-cp1250.tar.bz2 249705 BLAKE2B eb4366a110d917dc975b8add168ab43b1e8a0db7342647f69f5421fc1170719015c97ffa770e89892cbb4cee8e5b2fb74a4772c8f6cbef9606ee12c3746d78c9 SHA512 4f77ff5ceb8ec6e5d9f8f34d8950a6a6276d1fd5a947772fcbdb6554988b1ea665c12b82f45164f91fb7bd08000cb4afc26fa35beb4c760464160e22b9b8c340
 DIST font-arial-iso-8859-1.tar.bz2 234242 BLAKE2B 0671854e1a257d27b502affb59de681942a93990d3ac2575bbf1a6dd9eef026969f2f9ce4e9c11a68ea3d8aed48063f826a1e153f7468437a39791672c92a5d0 SHA512 a1d03b6f09c48f48b7733f3bc0402ceab239a9abf88b860d852ea9fe69b4da690208a79d6f29d30204f5b37becf10672e8e8c0bfef201846d80ec54df617d029
 DIST font-arial-iso-8859-2.tar.bz2 222208 BLAKE2B 94b1a04672bf9b4b20a0e6981591e761f751bd637deddcb801855296c525bf3b5e8feb1cb11cef282c0269f2c963ded22846089076e7e6763f258b8a932af454 SHA512 5671e628303fd816f64a51ad10e2f4dd9c3dc1b34c379a2ecf489b83931db7af668aaa4e00e96a00cacd63ed98daeae6b6a4d5925edfb06fc98d3a923f70257d
-EBUILD mplayer-1.3.0-r5.ebuild 16978 BLAKE2B c5ce5f7355598be4c87cb8a59176ca51654236a68cb851a115eb3d3736b62b7f4c8718fc07d69cb606fcd42cd2beb4e4fe33bbd816115f3e30509121c7b797ee SHA512 076d0291f12002467066068e5722436c8bcbc29dbe88974e7495f819184b1abc0cf7bae538a6c6333f6d31cd74f899135096146d2303f5261efc5c62fd125496
-EBUILD mplayer-9999.ebuild 16678 BLAKE2B 01753aa6746ee12944db1e880b07ed95a96f0331e9d071bb6fa96499d4ae86049cc71cfed21e7155379a0cd834f172917e402731827b5ee15cfe9f280fd0ef79 SHA512 8771cdee24aafe1f65dedc6cfd0dfdba7dbd2b4d7a6087c175a30dbdcf6f52899506dde3dcd498361815acbbfff543f9f8659c5f8a029bad6a4298b60086ff17
+EBUILD mplayer-1.3.0-r5.ebuild 16962 BLAKE2B e3f08726aeccc85e4bf69708fc3ac57451eb36e3e2b5c2eb7e187f4a4fe476832a6676bf53775531ee1421604bc928bd5c9c456f6fc8117684286362812a4f82 SHA512 0e7a074925a1e6a45bbc3437583d0e7b19f2530ede4ee56a76eadeba394cf874b25832341f9e5f8455176fcec7df0a3b7a2be7cced121a0f6ef6ed279a513241
+EBUILD mplayer-9999.ebuild 16584 BLAKE2B 81d9e0eb84b79f19f1d889931927c162b627fd962792d1718094b6eca2f282d8d453dd64a7332928606b2ca35220edb78041731736fc05dc96b71221804b0eaf SHA512 81ba82dcba13820daee636f7d0b81900dd6a573e4feec0ac1da9ad50028fc97ab8bccccd6316bbcd90df335a9a5df12d37a4c2844a24e798d650eb949e343a80
 MISC metadata.xml 2536 BLAKE2B 1a8ff751e68c46c921cd09a9364e8046372cf0a77aaf062c26ed1356eebfaa8b90eb36cac6e101fe22f9f7ddcec611806271683e76d53c642dfc1fc87ba0baa5 SHA512 01fadd14038f9bda1fb3b521f65ab92e2cfed58628352b02f26dfef710d4d5a6fd964ef00e3a123a76046557b15ae29bc7c221c5a8a692cb06763e478b3b58c7
diff --git a/media-video/mplayer/mplayer-1.3.0-r5.ebuild b/media-video/mplayer/mplayer-1.3.0-r5.ebuild
index b3c344f98b88..b9c59a729aa3 100644
--- a/media-video/mplayer/mplayer-1.3.0-r5.ebuild
+++ b/media-video/mplayer/mplayer-1.3.0-r5.ebuild
@@ -71,8 +71,8 @@ RDEPEND+="
 	dga? ( x11-libs/libXxf86dga )
 	dts? ( media-libs/libdca )
 	dv? ( media-libs/libdv )
-	dvd? ( >=media-libs/libdvdread-4.1.3 )
-	dvdnav? ( >=media-libs/libdvdnav-4.1.3 )
+	dvd? ( >=media-libs/libdvdread-4.1.3:0= )
+	dvdnav? ( >=media-libs/libdvdnav-4.1.3:0= )
 	encode? (
 		!twolame? ( toolame? ( media-sound/toolame ) )
 		twolame? ( media-sound/twolame )
@@ -150,7 +150,7 @@ RDEPEND+="
 SLOT="0"
 LICENSE="GPL-2"
 if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 fi
 
 # faac codecs are nonfree
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index 62db816aa75e..8ca4b4a54f5f 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -71,8 +71,8 @@ RDEPEND+="
 	dga? ( x11-libs/libXxf86dga )
 	dts? ( media-libs/libdca )
 	dv? ( media-libs/libdv )
-	dvd? ( >=media-libs/libdvdread-4.1.3 )
-	dvdnav? ( >=media-libs/libdvdnav-4.1.3 )
+	dvd? ( >=media-libs/libdvdread-4.1.3:0= )
+	dvdnav? ( >=media-libs/libdvdnav-4.1.3:0= )
 	encode? (
 		!twolame? ( toolame? ( media-sound/toolame ) )
 		twolame? ( media-sound/twolame )
@@ -150,7 +150,7 @@ RDEPEND+="
 SLOT="0"
 LICENSE="GPL-2"
 if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 fi
 
 # faac codecs are nonfree
@@ -329,8 +329,6 @@ src_configure() {
 	# DVB / Video4Linux / Radio support #
 	#####################################
 	myconf+=" --disable-tv-bsdbt848"
-	# broken upstream, won't work with recent kernels
-	myconf+=" --disable-ivtv"
 	# gone since linux-headers-2.6.38
 	myconf+=" --disable-tv-v4l1"
 	if { use dvb || use v4l || use pvr || use radio; }; then
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index 96ffd053d456..9d9aa64c5794 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -9,10 +9,6 @@ DIST mpv-0.29.1.tar.gz 3059503 BLAKE2B 231e7c184d441c126c6b6b7199810552981816e5a
 DIST waf-1.9.8 100685 BLAKE2B b335115b7ba5af4f8f49fc4da7967fa20e0633bfc7de7ad28fdb58dfcf7ae9c7833d053d298280e26e94b18af70a66fc13d08adf1fc7f9ad9b81e70d95cc74fc SHA512 e7493767f65deeb38aa162adef22adf60ebbd038410e9cdf4fe6f0de8c43395dbbba14962aa2c3855e1277136085fc22ad12ebfb8ac4e76f16358296039b8ea2
 DIST waf-2.0.9 103104 BLAKE2B c7e996aa49662da3ff941d076fc7e2dd23e867ade92a3b2ae07560b76d63a69e495184a1f9c76be5c51977ddb1713f9247f62e672033ecb988ac559e3a47e546 SHA512 0755170ded115b03e78a2096f197cd9fff62b5036db764153d26ce426f182ea7d7b8231cfa1a10b4a564a8480428502f3691851df66e7b83c7bca8e5fe26de7d
 EBUILD mpv-0.27.2.ebuild 10639 BLAKE2B d5b64552973347ec3ac9423029dfec5448cb2c36e7cdfd293c2a61fa4d4fe9fb59837719eae234c5f46eb4396ef3f409669a2b1a5da62f59fc90712e912ecd72 SHA512 ebd5a47f15408583f1dfe1a9fefe40a2b0fcf968f6a71b5c603d5bd85187f51cee926f6f1cb6746050715b2aea64bddc4771ebccf307f1ec1d3f466e31e3658b
-EBUILD mpv-0.29.1-r1.ebuild 10296 BLAKE2B e683008242a323ec31bbdcc73b823e65ad6b296687f1832e8d6f85a571c029b67780e4440ca52a12252edb6e5f7a0feb022ee742a187280002862a28e00f2f85 SHA512 5e03a94e4640b82b33a7099034450dc942dcdd9b2b9215172c8c426cfd0437b5f2e5ced09aea27593ead91694f8dd2913dbb396d8d25b0b5315320acfb0990aa
+EBUILD mpv-0.29.1-r1.ebuild 10294 BLAKE2B ff462cb281cad580b53b92c728b0c40764abac864f8182896a1213feb1cd9ec520eaa06d17f9b492cbfe6c8e3ae986a61d8e599a706849e9f4ef709e02e97233 SHA512 4e65e14054e75644be877de94b6eb6096701971f95900bac5220e65f84793c109a00d376392a1d3eb63890bff31c01f67811a8081e79827212b1774a109da118
 EBUILD mpv-9999.ebuild 10323 BLAKE2B fceb344df0fe5a8f600db00cabe4c64985de7db4b15c3eea31c492f9f41ede8cbf91d072e19bc5b323f0e71e13d1bcc633dbb59d8c689df8d39744eb0ea8ea9a SHA512 14ae91c3b6e08361fab33987998471d0dc9b6c9a3ddd5cc2fac0e66b6f55db78fe0ac0170b5b3544853194edb0dd2612505637c7b1682136e1129f175d54e10f
-<<<<<<< HEAD
-MISC metadata.xml 2207 BLAKE2B 41d54819efc59037d5d086dec0f47f85d19d784c59db5dd54b30fe4334d2e58225a6a97dc5b71f257f95b36557268d2896a537f1ca7ac02c84fab52b90df502f SHA512 c64d32e92d343682154ad564a094bd045c22822272a32694aa37aed52b230fcf141013940e69fc8604b3f8a7a54b73d8b4c9b227365fa84cfb68a1680ba96767
-=======
 MISC metadata.xml 2195 BLAKE2B 2cb6ef92e3152efff57b7284f907512fe5ccccd38bff5ddbff746565780636478016312b9612dc817613e4bfc3b5818d4e919a16bb4ba12b85f8fce797dac1f7 SHA512 5d771852f9431e46301fe644a407c1c800c4cf1b9bc7a274d03822f999c5c3366b738e4678f400e05fb6ac5cffb8ad98007a7ac9c369889d08a7fece9ec72e16
->>>>>>> next
diff --git a/media-video/mpv/metadata.xml b/media-video/mpv/metadata.xml
index 78824a7b5960..61ab5a1fe43a 100644
--- a/media-video/mpv/metadata.xml
+++ b/media-video/mpv/metadata.xml
@@ -1,15 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<<<<<<< HEAD
-	<maintainer type="project">
-		<email>media-video@gentoo.org</email>
-		<name>Gentoo Video project</name>
-=======
 	<maintainer type="person">
 		<email>zlogene@gentoo.org</email>
 		<name>Mikle Kolyada</name>
->>>>>>> next
 	</maintainer>
 	<use>
 		<flag name="archive">Enable support for various archive formats via <pkg>app-arch/libarchive</pkg></flag>
diff --git a/media-video/mpv/mpv-0.29.1-r1.ebuild b/media-video/mpv/mpv-0.29.1-r1.ebuild
index c8e08108c8f3..a1e4fc1744a9 100644
--- a/media-video/mpv/mpv-0.29.1-r1.ebuild
+++ b/media-video/mpv/mpv-0.29.1-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://mpv.io/"
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-linux"
 	DOCS=( RELEASE_NOTES )
 else
 	EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"
diff --git a/media-video/parole/Manifest b/media-video/parole/Manifest
index 49ee00c6997f..11f516e68f79 100644
--- a/media-video/parole/Manifest
+++ b/media-video/parole/Manifest
@@ -3,5 +3,5 @@ DIST parole-1.0.3.tar.bz2 963822 BLAKE2B 8f7131ea8e46541edab093514f7955ebe551549
 DIST parole-1.0.4.tar.bz2 921020 BLAKE2B c81b5d8773a933e7f3b2d3816401e5e833db58964623b1c40747b47632f594e9aaabde87d89de3c6e87b01b43ef9aef01194ab5a40ce2e36fe8909acceac5c3e SHA512 5f67830e36b6ac41c85dbbb7d6b4e2dfbd037c9e8fe4f5ab5ef8c52ebe4c69b5a9bfdee298b174a85334a4ae9414ed3492994853896f745c489116359cc14969
 EBUILD parole-1.0.2.ebuild 1442 BLAKE2B db6d0f6f8ad020030448874f38d2e2d270fb2f7b5446e24f85792d1de574c368f0c6ce352bef0a0834d331089ac42052b8f5662599ed874d836e2b273dc68634 SHA512 985e7c0dcd1f792ee707e47fd34dd52dc4698fa474103a0565905212e55ef7c576bc99cf315664782dec3a4693ee928eb33c58efcaba10a47827c93c8175dde0
 EBUILD parole-1.0.3.ebuild 1444 BLAKE2B 928756a4fb9ad566657266178425bd2d92f983addea0ff360eba32d307514bba50410bf5471d3e3fa0b9fa6b5c33d9beb1a35638185f6955f9c888cd864992d1 SHA512 db929065e2c46e0a060c4e2647cf7b21674ffd42711f147fcc97db42f9edd0b41abf3737be08dc9fcb330c126241a9ccefa8488717129a3e4c4e7023dba49d4a
-EBUILD parole-1.0.4.ebuild 1420 BLAKE2B 3ed5b8491d39c1fb0655de2cfffcfaf71ab79f8d74082a9e81073a7f5ca66fd1e3a5a582367d9a31402e80267bca24b83bab4608fa8c46cade95ea837a382276 SHA512 804a9913d3572d2dc58fc12b03ff32ad180d797092caee752c2be991c77ac0cbd826c3d13f7e59b497fccc81b8d5bf2d7ccb1d802de216fd5703cedfbed9b800
+EBUILD parole-1.0.4.ebuild 1418 BLAKE2B a1abef8e6c6ba9e38e2cda7e5ea376778266cd7018e6ac7f92290412294281e56e05f2f9591aac3f5224cf8aed6464e3aae9fdb29959ebe0ab49eadf41f7ab73 SHA512 e6783e3eae9679c806a3626451cde9f1ad9d34ee387e70838e47c2f78d6dbcd87602e743a0903652c69137a9bebcb253913a6e02297f4bf817ca509d6f014183
 MISC metadata.xml 241 BLAKE2B 19a1f7371ba9451232b7795e806499d1de2aba44dc9864bf1c8c72f6074af18387f6091c891f84c402c70e52f8502bc7a9a937828d63991402d2f0d17b247782 SHA512 97a8057b496da7d18b75e0cec2f5de16f7f16187776c3d7134ade6b0be2539c5f0e8de7ce43c2a4fc342ca9c3dd83a74c194a506ad28221c260dfa8a4eadb1e8
diff --git a/media-video/parole/parole-1.0.4.ebuild b/media-video/parole/parole-1.0.4.ebuild
index 23581583e261..dbb13e8a3220 100644
--- a/media-video/parole/parole-1.0.4.ebuild
+++ b/media-video/parole/parole-1.0.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86"
+KEYWORDS="amd64 ~mips x86"
 IUSE="libnotify taglib"
 
 COMMON_DEPEND=">=dev-libs/dbus-glib-0.100
diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index 10168b9da057..4b3bf20a0cbe 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -3,5 +3,7 @@ AUX pipewire-0.2.6-fix-probing-without-starting.patch 2119 BLAKE2B f7180ad95f0f2
 AUX pipewire-0.2.6-reuse-fd-in-pipewiresrc.patch 5684 BLAKE2B 9ce85e2f15b18ef458d21a44b10c875b0cb456972a61dd1ff127ad62510604d35ea6dd70daa0191181a34d2fea613ac254ffd6fa4f0fa3bb6114191e3a62996e SHA512 ba194a678b1130a29b17f1831c1a94c24db6cb05ae1d2a0e825fd1099aa2a300200d7cbfd5e5b592c54aea33893c68e554edd4bdfd1ca6cc84739b12e33058f6
 AUX pipewire-0.2.6-revert-combine-all-perms.patch 1039 BLAKE2B 5fd1d82c92680b6097ac70367eb5f7fc8190d0589d4bb228dc93c6f673763a65a7c18a5fd3b242686ba86773d90078cc50a5d7c2277dc90edcdb341d5ecb9f23 SHA512 c9bab5e79b4a88f240d34702dfe5de2df4ab7c5158d5b95228647018cb5bb69ec124fb47405074aef91480d25d388df7cdbb7fa94396d228b6f573697b2f8333
 DIST pipewire-0.2.6.tar.gz 421137 BLAKE2B 155667d14fe5380e21f0b70accea72dc4478085916a9126185136f6d33bd7729d91b790c171dcf7b6aea2c52894462d16516f8821229ca0bf9f6cde15df524d9 SHA512 3d1db41f5beb42a0ee15ae7bc8afb89b54a37c3a6a414e88b5e33ceaf98ec6dda0d9a2d03ac47a8dfce48e9637e647291919e6670bb70589b0d1951fbcbd3ff8
+DIST pipewire-0.2.7.tar.gz 421644 BLAKE2B d2ccb56a9ea5ea7782678deb6eae0b0a70da1fa69e807398062d388733901839f15a2f0f7db982fbebd2b2759f443709e6c1950b6367f3ed4801d6c2d6109e73 SHA512 10d3e20cc3d233fbcd1fc39702ae3043a656ebcd9cd3c39c77f0cc2bf42ff4956fc03e7933c7b397bca446c63f45ddacea948d5ec7e4a3300499fa2794f14334
 EBUILD pipewire-0.2.6.ebuild 1860 BLAKE2B b9017a577f438bc060ffc67be21afa5a2deb86fa6f1a994f7d6d9b4b37a65aca3780dd19aa59324f4ea33929ec04bd36fb3c653460fc97353603f4af8de8f067 SHA512 c335d7b5a2c331804d722ceaec6fbefe9104f2ba1c89c8f7eda08409f29c66b0d50a669bfd353a520fb22efc53d7209a7041ab6a7fc8bb66c6ca1a8358436216
+EBUILD pipewire-0.2.7.ebuild 1650 BLAKE2B b17c8d5a96bded29ada3bdd753128fa55a9c4517420e67197cce724d8a61a9daf1e4df4a5c10504ed51f0594973721ae7c716d59fd9560a8d5c7bc67cc48a3e6 SHA512 8b958ddd4abe83277ce172a51099ba9e0631c65a2a9c2594162c9984a409c613c304ce171f2229967600969c25a63eccf2ad4f4bd71b8a2d1e5ba9cedad95cfd
 MISC metadata.xml 449 BLAKE2B c580fa69fbecd1046123d51f0a556bf54e7dd76a7ced768ae31289969a3fcb0c03f301a214da222201bad2cd0bcf68674807e28efcdee27edd9fa6d913cdc146 SHA512 73c4b73b417e92d1bdf802ce38939afdff2ba42bc638e0c6ba42593894755ce6f197678e8676f763bd66bb0b2bb9175c1369c173be3ab64e7323795d3b00bf0c
diff --git a/media-video/pipewire/pipewire-0.2.7.ebuild b/media-video/pipewire/pipewire-0.2.7.ebuild
new file mode 100644
index 000000000000..d26990a0d08a
--- /dev/null
+++ b/media-video/pipewire/pipewire-0.2.7.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/PipeWire/pipewire.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/PipeWire/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Multimedia processing graphs"
+HOMEPAGE="https://pipewire.org/"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/0.2"
+IUSE="bluetooth doc ffmpeg libav gstreamer sdl systemd vaapi X"
+
+BDEPEND="
+	app-doc/xmltoman
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
+"
+DEPEND="
+	media-libs/alsa-lib
+	sys-apps/dbus
+	virtual/libudev
+	bluetooth? ( media-libs/sbc )
+	ffmpeg? (
+		!libav? ( media-video/ffmpeg:= )
+		libav? ( media-video/libav:= )
+	)
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	sdl? ( media-libs/libsdl2 )
+	systemd? ( sys-apps/systemd )
+	vaapi? ( x11-libs/libva )
+	X? ( x11-libs/libX11 )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	spa_use() {
+		if ! use ${1}; then
+			sed -e "/.*dependency.*'${2-$1}'/s/'${2-$1}'/'${2-$1}-disabled-by-USE-no-${1}'/" \
+				-i spa/meson.build || die
+		fi
+	}
+
+	default
+	spa_use bluetooth sbc
+	spa_use ffmpeg libavcodec
+	spa_use ffmpeg libavformat
+	spa_use ffmpeg libavfilter
+	spa_use vaapi libva
+	spa_use sdl sdl2
+	spa_use X x11
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dman=true
+		$(meson_use doc docs)
+		$(meson_feature gstreamer)
+		$(meson_use systemd)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	elog "Package has optional sys-auth/rtkit RUNTIME support that may be"
+	elog "disabled by setting DISABLE_RTKIT env var."
+}
diff --git a/media-video/pymp/Manifest b/media-video/pymp/Manifest
index 6c07ee1a550d..98908057572a 100644
--- a/media-video/pymp/Manifest
+++ b/media-video/pymp/Manifest
@@ -1,3 +1,3 @@
 DIST pymp-1.1.tar.bz2 132710 BLAKE2B 4c834ed96a6436daf6c29fea3e6eeab4e93c03b39897e904650640e4b27b856674f584caa1ef658069cc71c3f83dbab917319290d974641053e848682a7da3dd SHA512 10647af1233c5a030cc32f5efb7790fb93568832547f8c886d49597cff36f5d5606b7b06c00c0206e9eacd6331dbb40bc2331dc30230052b4510be1ffec34500
-EBUILD pymp-1.1-r1.ebuild 1014 BLAKE2B 247281b89a6b28fe09ab33181525b9881f14322a093ce6419b9ccab92722babf99d51849123bcc388132d02576bfea32b732670fec5dc883c295ff12cdda994e SHA512 212212b4dc63d8b83603fcdebf9ba4d78e76f53f5cd5b99378bc5799504e948f891215adaeac747d3158b59c97c50715279034a62c87af421f2ab48fe87a7f8e
+EBUILD pymp-1.1-r1.ebuild 1002 BLAKE2B 3f4de8bf37c80393bda131c14dbd0c7f8f93a99c37573a77a3e8010ec6fc442f73a76f7973f23520369efa357e5f77694730245e8bfaff85452563065aa8d1be SHA512 019e9254b4ffea10124599cadf0220d7234ba692ba4fa973b446d2eda04cede65ad59738b4ebc7a7c465ee13245e21162d95e734daa766892779d37c85077859
 MISC metadata.xml 223 BLAKE2B 1a772bb5add75cb4343b09bb2456adcd5e46896daaab4091ab64b667c5fa1a4adab0940015a3e755df3d6540b456694dc67ef9581d02d40c63b89290f8f83e43 SHA512 27b688917e0b1c4a75ea34c97d2d67d309573941492ab04124de11034f3b2796480f02408d86e2eba77ca2000722ea6606fe12a49622c04f9e2c1fa27b6fc8db
diff --git a/media-video/pymp/pymp-1.1-r1.ebuild b/media-video/pymp/pymp-1.1-r1.ebuild
index 304dbf15c50f..b9fb82683b78 100644
--- a/media-video/pymp/pymp-1.1-r1.ebuild
+++ b/media-video/pymp/pymp-1.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://jdolan.dyndns.org/jaydolan/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-fbsd"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="media-video/mplayer
diff --git a/media-video/rtmpdump/Manifest b/media-video/rtmpdump/Manifest
index 638cb68df606..8dfba8fc7a29 100644
--- a/media-video/rtmpdump/Manifest
+++ b/media-video/rtmpdump/Manifest
@@ -1,11 +1,7 @@
 AUX rtmpdump-openssl-1.1-v2.patch 8964 BLAKE2B 7ac621cafbbd159a9e143f0c0108c4b08230c7e9221be711983c6e525b7b550fd7062182796049f03f35a908eb12947e333b90c25085dce37ac6e7a0a51cff5a SHA512 f3b39e5c52db0e14d686ab02c7e374fae1c47304bee19a66b1e93eb24ad67c2f08af3695b9919ceccfdbf78f5533ce95f9877725aa3e6cc3f9d660c116e83050
-AUX rtmpdump-openssl-1.1.patch 9309 BLAKE2B f66a968c16f5c7c8c0eba28370131941a9352054ed3db6dc6e380dbdf96cac0d76bd66dcbe6f9e2aa5c8f720fd92b780bcd0018c7392ed2064cdac8ebb1bb57d SHA512 41f213c9f419d3b8c566746d8df1400fefd2350992bfca76531a98a3338a4a4ac0f77598466a642f4b811bf1889a012f28427f1369e00aa7e46a3a0abff8e73e
 AUX rtmpdump-swf_vertification_type_2.patch 545 BLAKE2B e6db03f060ead7122029f15c0cc259e04863c2d5d0d2509a21de69f7fc61c1d3fb0ac062759c52e22e60733acdfb495cb4e6892ba7acb8e1f36ce1fe42f3ccd9 SHA512 5b5b4582b488429f8192b1158903047986d8ebc117c2ed81f7ab18bf59bcf8b8f6bc9a38fae89aff04af2342ca1362288a39516660f2163b94781c838652ad06
 AUX rtmpdump-swf_vertification_type_2_part_2.patch 868 BLAKE2B a5014fdc8bcf2cecbe5120297d4563c7d396e54c34e5f6dddf420fcfdbea4797c865daa0750cb1fa65f7c959d36381ce257ec48b3f4f377ce9ead3b3fe4cf833 SHA512 a0c1c46561384961bbb45962d416664cbd7a4a8c2e16eda4370d9acf76be809541ade182e41320102f252ed4e69dd2d6a0de37ad4085b52a22dc6ff0135d8894
 DIST rtmpdump-2.4_p20161210.tar.gz 142837 BLAKE2B 412a7c3b21738db643042e51e03b11e115ae1d68214e644374e8c10f3b2ab3f659ce1af884135d0e89f2e0ba44ebdf41937bc0f02d875c463ca711d9ae95698c SHA512 76617f02c13d7e8e3a7cf2734c6174e56fb321a881c9e4869bf6393786b193e0c01a8c530ecbf0679cc888c523af5712f2dcb2031fbd09729b7ddeebc3a4b133
-EBUILD rtmpdump-2.4_p20161210-r1.ebuild 2281 BLAKE2B ae5c238de3a29c6ec8e916d7c22fb155cd3a96840159cc4eb45d14a8b1d0ad56adfb47c31d5bfc72a0eeb392e6994f44098d91b90efab9bf89dabdcc0e0bd552 SHA512 9fce59f5412ff228fc81442b4b9f8b954e51aff27d2d119d52eb9b2f62611d0f12101369250f992a94e5ba6c684d77f321adc735269575f092bba34a48273079
-EBUILD rtmpdump-2.4_p20161210-r2.ebuild 2691 BLAKE2B 1d059509986461e6c774a792bb183c99e6bb019d3c38f508db2c1acd49eb63dbc511107e0495c984fb9e54c9411519f8c36a5e4a01d7ae4285cec45ed89eafa3 SHA512 407809cdc6c188b8c1c69d5527243a2470e35711569c133d7b28b1ac70889e32c2e06e40e31554a13e96ca58f0b8925b2b74426ad6db1d24668a30be844087b7
-EBUILD rtmpdump-2.4_p20161210-r3.ebuild 2730 BLAKE2B 2a9af6612d49359a97578d5b5f6f13715b3ed5ca8115904e39e2216b0fd405612d104b13e01b4d04fa4c51c6dba6a9f7fea63513ce84f34d3ccb31cd96ea1a39 SHA512 ce60049e5b91bb7d454b1770fe8fdf9440082e537cfb656b603e2d726866efe3b3b2aad5bac46a4d3716a0a645e3aa57be1e97e800854a765b67b9d570841203
-EBUILD rtmpdump-2.4_p20161210.ebuild 2260 BLAKE2B 40771266f4e6ae5821800b52a7f31dd83ddd7a138a9b169117b66b44acdf9305158e550a2bd99afec37d836f7c74fd10861c019583930d54c9f8023f8ac1f8ef SHA512 f50ecdaaa85377e079587bd38001202edd5769f7f336ac58a7532df68131ba4117acf43b74c23846baf59e4286eaf2a2bd59a79f810e0baf5880d6163145e88a
-EBUILD rtmpdump-9999.ebuild 2708 BLAKE2B 4ff6efada54e480a49888b7c18562e624be4cd434f766a533c51345b2501e70e19bb90edcbea929a73d24221e789458010dfeee46a9fcc9ae7a605493284eedd SHA512 61b8f3162c44b2c6f82480dfc64a5298010c09f12b4837f084acd6299ea560b5b327b5d3f7d00e539a28a1844e588c2fb2871db2958fc512e5d28a795efe4c7d
+EBUILD rtmpdump-2.4_p20161210-r3.ebuild 2666 BLAKE2B 777369f139bb1d2b8f6fceb8ffc933aed16993195b83b175d04798154bc6188671cb1d8bca3c9dfdd916d2c9a5c643a9f7d68802bb8e554c8ff5061cbdf78ea1 SHA512 5697b0cea8dde0bd1e1a94778d82c85a768c68b5690ff701859cdf40f4aa1551ea76b040726d44ee9fdcb965b788b06438703612ba35d751e4d312219c84d75e
+EBUILD rtmpdump-9999.ebuild 2673 BLAKE2B 55215ffd874a9c376a4073de46e72d71156344508f93a37ff978f9c6cbcfc966ac46ffc76068e19b0eadd7edd498d698a184d7c6c06806d814a1b49b78673d5d SHA512 2a026172538691d6fe5a9777c577557fe88342dc252ad16727d8525d8ab5d7092b7110861139eff67ac23e72a1109ae1929e1d5efbdf86c55e681293f64da973
 MISC metadata.xml 444 BLAKE2B 97f64854abc028cf6eb902008992a94e434db6de7258b8065666b31af4b92118044e4c3427792782cf7ac7a2eb8bb0fbaee047027ca2f648178cc07f46c6ac88 SHA512 38b9987993f4a3ed479c50aeda81436a8cbec7ad48c1e509fc351a58557c3922fe0834a680cda9996a5c5ca1b0b48377772e3eef775281eb40962f95ac095e7c
diff --git a/media-video/rtmpdump/files/rtmpdump-openssl-1.1.patch b/media-video/rtmpdump/files/rtmpdump-openssl-1.1.patch
deleted file mode 100644
index b3bb508af21a..000000000000
--- a/media-video/rtmpdump/files/rtmpdump-openssl-1.1.patch
+++ /dev/null
@@ -1,249 +0,0 @@
-https://github.com/xbmc/inputstream.rtmp/blob/dc9353823f9cfd2943f97b586230fe387cc55dc6/depends/common/librtmp/0003-openssl-1.1.patch
---- a/librtmp/dh.h
-+++ b/librtmp/dh.h
-@@ -253,20 +253,44 @@
-   if (!dh)
-     goto failed;
- 
-+#if !defined(USE_OPENSSL) || !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-   MP_new(dh->g);
- 
-   if (!dh->g)
-     goto failed;
-+#else
-+  BIGNUM *g = NULL;
-+  MP_new(g);
-+  if (!g)
-+    goto failed;
-+
-+  DH_set0_pqg(dh, NULL, g, NULL);
-+#endif
- 
-+#if !defined(USE_OPENSSL) || !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-   MP_gethex(dh->p, P1024, res);	/* prime P1024, see dhgroups.h */
-+#else
-+  BIGNUM* p = NULL;
-+  DH_get0_pqg(dh, (BIGNUM const**)&p, NULL, NULL);
-+  MP_gethex(p, P1024, res); /* prime P1024, see dhgroups.h */
-+#endif
-   if (!res)
-     {
-       goto failed;
-     }
- 
-+#if !defined(USE_OPENSSL) || !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-   MP_set_w(dh->g, 2);	/* base 2 */
-+#else
-+  MP_set_w(g, 2);   /* base 2 */
-+  DH_set0_pqg(dh, NULL, g, NULL);
-+#endif
- 
-+#if !defined(USE_OPENSSL) || !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-   dh->length = nKeyBits;
-+#else
-+  DH_set_length(dh, nKeyBits);
-+#endif
-   return dh;
- 
- failed:
-@@ -293,12 +317,24 @@
-       MP_gethex(q1, Q1024, res);
-       assert(res);
- 
-+#if !defined(USE_OPENSSL) || !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-       res = isValidPublicKey(dh->pub_key, dh->p, q1);
-+#else
-+      BIGNUM const* pub_key = NULL;
-+      BIGNUM const* p = NULL;
-+      DH_get0_key(dh, &pub_key, NULL);
-+      DH_get0_pqg(dh, &p, NULL, NULL);
-+      res = isValidPublicKey((BIGNUM*)pub_key, (BIGNUM*)p, q1);
-+#endif
-       if (!res)
- 	{
-+#if !defined(USE_OPENSSL) || !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- 	  MP_free(dh->pub_key);
- 	  MP_free(dh->priv_key);
- 	  dh->pub_key = dh->priv_key = 0;
-+#else
-+          DH_free(dh);
-+#endif
- 	}
- 
-       MP_free(q1);
-@@ -314,15 +350,29 @@
- DHGetPublicKey(MDH *dh, uint8_t *pubkey, size_t nPubkeyLen)
- {
-   int len;
-+#if !defined(USE_OPENSSL) || !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-   if (!dh || !dh->pub_key)
-+#else
-+  BIGNUM const* pub_key = NULL;
-+  DH_get0_key(dh, &pub_key, NULL);
-+  if (!dh || !pub_key)
-+#endif
-     return 0;
- 
-+#if !defined(USE_OPENSSL) || !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-   len = MP_bytes(dh->pub_key);
-+#else
-+  len = MP_bytes(pub_key);
-+#endif
-   if (len <= 0 || len > (int) nPubkeyLen)
-     return 0;
- 
-   memset(pubkey, 0, nPubkeyLen);
-+#if !defined(USE_OPENSSL) || !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-   MP_setbin(dh->pub_key, pubkey + (nPubkeyLen - len), len);
-+#else
-+  MP_setbin(pub_key, pubkey + (nPubkeyLen - len), len);
-+#endif
-   return 1;
- }
- 
-@@ -364,7 +414,13 @@
-   MP_gethex(q1, Q1024, len);
-   assert(len);
- 
-+#if !defined(USE_OPENSSL) || !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-   if (isValidPublicKey(pubkeyBn, dh->p, q1))
-+#else
-+  BIGNUM const* p = NULL;
-+  DH_get0_pqg(dh, &p, NULL, NULL);
-+  if (isValidPublicKey(pubkeyBn, (BIGNUM*)p, q1))
-+#endif
-     res = MDH_compute_key(secret, nPubkeyLen, pubkeyBn, dh);
-   else
-     res = -1;
---- a/librtmp/handshake.h
-+++ b/librtmp/handshake.h
-@@ -31,9 +31,9 @@
- #define SHA256_DIGEST_LENGTH	32
- #endif
- #define HMAC_CTX	sha2_context
--#define HMAC_setup(ctx, key, len)	sha2_hmac_starts(&ctx, (unsigned char *)key, len, 0)
--#define HMAC_crunch(ctx, buf, len)	sha2_hmac_update(&ctx, buf, len)
--#define HMAC_finish(ctx, dig, dlen)	dlen = SHA256_DIGEST_LENGTH; sha2_hmac_finish(&ctx, dig)
-+#define HMAC_setup(ctx, key, len)	sha2_hmac_starts(ctx, (unsigned char *)key, len, 0)
-+#define HMAC_crunch(ctx, buf, len)	sha2_hmac_update(ctx, buf, len)
-+#define HMAC_finish(ctx, dig, dlen)	dlen = SHA256_DIGEST_LENGTH; sha2_hmac_finish(ctx, dig)
- 
- typedef arc4_context *	RC4_handle;
- #define RC4_alloc(h)	*h = malloc(sizeof(arc4_context))
-@@ -50,9 +50,9 @@
- #endif
- #undef HMAC_CTX
- #define HMAC_CTX	struct hmac_sha256_ctx
--#define HMAC_setup(ctx, key, len)	hmac_sha256_set_key(&ctx, len, key)
--#define HMAC_crunch(ctx, buf, len)	hmac_sha256_update(&ctx, len, buf)
--#define HMAC_finish(ctx, dig, dlen)	dlen = SHA256_DIGEST_LENGTH; hmac_sha256_digest(&ctx, SHA256_DIGEST_LENGTH, dig)
-+#define HMAC_setup(ctx, key, len)	hmac_sha256_set_key(ctx, len, key)
-+#define HMAC_crunch(ctx, buf, len)	hmac_sha256_update(ctx, len, buf)
-+#define HMAC_finish(ctx, dig, dlen)	dlen = SHA256_DIGEST_LENGTH; hmac_sha256_digest(ctx, SHA256_DIGEST_LENGTH, dig)
- #define HMAC_close(ctx)
- 
- typedef struct arcfour_ctx*	RC4_handle;
-@@ -64,14 +64,23 @@
- 
- #else	/* USE_OPENSSL */
- #include <openssl/sha.h>
-+#include <openssl/ossl_typ.h>
- #include <openssl/hmac.h>
- #include <openssl/rc4.h>
- #if OPENSSL_VERSION_NUMBER < 0x0090800 || !defined(SHA256_DIGEST_LENGTH)
- #error Your OpenSSL is too old, need 0.9.8 or newer with SHA256
- #endif
--#define HMAC_setup(ctx, key, len)	HMAC_CTX_init(&ctx); HMAC_Init_ex(&ctx, key, len, EVP_sha256(), 0)
--#define HMAC_crunch(ctx, buf, len)	HMAC_Update(&ctx, buf, len)
--#define HMAC_finish(ctx, dig, dlen)	HMAC_Final(&ctx, dig, &dlen); HMAC_CTX_cleanup(&ctx)
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#define HMAC_setup(ctx, key, len)	HMAC_CTX_init(ctx); HMAC_Init_ex(ctx, key, len, EVP_sha256(), 0)
-+#else
-+#define HMAC_setup(ctx, key, len)       HMAC_CTX_reset(ctx); HMAC_Init_ex(ctx, key, len, EVP_sha256(), 0)
-+#endif
-+#define HMAC_crunch(ctx, buf, len)	HMAC_Update(ctx, buf, len)
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#define HMAC_finish(ctx, dig, dlen)	HMAC_Final(ctx, dig, &dlen); HMAC_CTX_cleanup(ctx)
-+#else
-+#define HMAC_finish(ctx, dig, dlen)     HMAC_Final(ctx, dig, &dlen); HMAC_CTX_free(ctx)
-+#endif
- 
- typedef RC4_KEY *	RC4_handle;
- #define RC4_alloc(h)	*h = malloc(sizeof(RC4_KEY))
-@@ -117,7 +126,7 @@
- {
-   uint8_t digest[SHA256_DIGEST_LENGTH];
-   unsigned int digestLen = 0;
--  HMAC_CTX ctx;
-+  HMAC_CTX* ctx = NULL;
- 
-   RC4_alloc(rc4keyIn);
-   RC4_alloc(rc4keyOut);
-@@ -266,7 +275,7 @@
- 	   size_t keylen, uint8_t *digest)
- {
-   unsigned int digestLen;
--  HMAC_CTX ctx;
-+  HMAC_CTX* ctx = NULL;
- 
-   HMAC_setup(ctx, key, keylen);
-   HMAC_crunch(ctx, message, messageLen);
---- a/librtmp/hashswf.c
-+++ b/librtmp/hashswf.c
-@@ -37,9 +37,9 @@
- #define SHA256_DIGEST_LENGTH	32
- #endif
- #define HMAC_CTX	sha2_context
--#define HMAC_setup(ctx, key, len)	sha2_hmac_starts(&ctx, (unsigned char *)key, len, 0)
--#define HMAC_crunch(ctx, buf, len)	sha2_hmac_update(&ctx, buf, len)
--#define HMAC_finish(ctx, dig, dlen)	dlen = SHA256_DIGEST_LENGTH; sha2_hmac_finish(&ctx, dig)
-+#define HMAC_setup(ctx, key, len)	sha2_hmac_starts(ctx, (unsigned char *)key, len, 0)
-+#define HMAC_crunch(ctx, buf, len)	sha2_hmac_update(ctx, buf, len)
-+#define HMAC_finish(ctx, dig, dlen)	dlen = SHA256_DIGEST_LENGTH; sha2_hmac_finish(ctx, dig)
- #define HMAC_close(ctx)
- #elif defined(USE_GNUTLS)
- #include <nettle/hmac.h>
-@@ -48,19 +48,27 @@
- #endif
- #undef HMAC_CTX
- #define HMAC_CTX	struct hmac_sha256_ctx
--#define HMAC_setup(ctx, key, len)	hmac_sha256_set_key(&ctx, len, key)
--#define HMAC_crunch(ctx, buf, len)	hmac_sha256_update(&ctx, len, buf)
--#define HMAC_finish(ctx, dig, dlen)	dlen = SHA256_DIGEST_LENGTH; hmac_sha256_digest(&ctx, SHA256_DIGEST_LENGTH, dig)
-+#define HMAC_setup(ctx, key, len)	hmac_sha256_set_key(ctx, len, key)
-+#define HMAC_crunch(ctx, buf, len)	hmac_sha256_update(ctx, len, buf)
-+#define HMAC_finish(ctx, dig, dlen)	dlen = SHA256_DIGEST_LENGTH; hmac_sha256_digest(ctx, SHA256_DIGEST_LENGTH, dig)
- #define HMAC_close(ctx)
- #else	/* USE_OPENSSL */
- #include <openssl/ssl.h>
- #include <openssl/sha.h>
- #include <openssl/hmac.h>
- #include <openssl/rc4.h>
--#define HMAC_setup(ctx, key, len)	HMAC_CTX_init(&ctx); HMAC_Init_ex(&ctx, (unsigned char *)key, len, EVP_sha256(), 0)
--#define HMAC_crunch(ctx, buf, len)	HMAC_Update(&ctx, (unsigned char *)buf, len)
--#define HMAC_finish(ctx, dig, dlen)	HMAC_Final(&ctx, (unsigned char *)dig, &dlen);
--#define HMAC_close(ctx)	HMAC_CTX_cleanup(&ctx)
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#define HMAC_setup(ctx, key, len)	HMAC_CTX_init(ctx); HMAC_Init_ex(ctx, (unsigned char *)key, len, EVP_sha256(), 0)
-+#else
-+#define HMAC_setup(ctx, key, len) HMAC_CTX_reset(ctx); HMAC_Init_ex(ctx, (unsigned char *)key, len, EVP_sha256(), 0)
-+#endif
-+#define HMAC_crunch(ctx, buf, len)	HMAC_Update(ctx, (unsigned char *)buf, len)
-+#define HMAC_finish(ctx, dig, dlen)	HMAC_Final(ctx, (unsigned char *)dig, &dlen);
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#define HMAC_close(ctx)	HMAC_CTX_cleanup(ctx)
-+#else
-+#define HMAC_close(ctx) HMAC_CTX_reset(ctx); HMAC_CTX_free(ctx)
-+#endif
- #endif
- 
- extern void RTMP_TLS_Init();
-@@ -289,7 +297,7 @@
- struct info
- {
-   z_stream *zs;
--  HMAC_CTX ctx;
-+  HMAC_CTX *ctx;
-   int first;
-   int zlib;
-   int size;
diff --git a/media-video/rtmpdump/rtmpdump-2.4_p20161210-r1.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20161210-r1.ebuild
deleted file mode 100644
index baadc800af89..000000000000
--- a/media-video/rtmpdump/rtmpdump-2.4_p20161210-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit multilib toolchain-funcs multilib-minimal flag-o-matic
-
-DESCRIPTION="RTMP client intended to stream audio or video flash content"
-HOMEPAGE="https://rtmpdump.mplayerhq.hu/"
-SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
-
-# the library is LGPL-2.1, the command is GPL-2
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="gnutls ssl libressl"
-
-DEPEND="ssl? (
-		gnutls? (
-			>=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP},nettle(+)]
-			dev-libs/nettle:0=[${MULTILIB_USEDEP}]
-		)
-		!gnutls? (
-			!libressl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
-			libressl? ( dev-libs/libressl )
-		)
-		>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	)"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	if ! use ssl && use gnutls ; then
-		ewarn "USE='gnutls' is ignored without USE='ssl'."
-		ewarn "Please review the local USE flags for this package."
-	fi
-}
-
-src_unpack() {
-	mkdir -p "${S}" || die "Can't create source directory"
-	cd "${S}" || die
-	unpack ${A}
-}
-
-src_prepare() {
-	# fix #571106 by restoring pre-GCC5 inline semantics
-	append-cflags -std=gnu89
-	# fix Makefile ( bug #298535 , bug #318353 and bug #324513 )
-	sed -i 's/\$(MAKEFLAGS)//g' Makefile \
-		|| die "failed to fix Makefile"
-	sed -i -e 's:OPT=:&-fPIC :' \
-		-e 's:OPT:OPTS:' \
-		-e 's:CFLAGS=.*:& $(OPT):' librtmp/Makefile \
-		|| die "failed to fix Makefile"
-	eapply_user
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	if use ssl ; then
-		if use gnutls ;	then
-			crypto="GNUTLS"
-		else
-			crypto="OPENSSL"
-		fi
-	fi
-	#fix multilib-script support. Bug #327449
-	sed -i "/^libdir/s:lib$:$(get_libdir):" librtmp/Makefile || die
-	if ! multilib_is_native_abi; then
-		cd librtmp || die
-	fi
-	emake CC="$(tc-getCC)" LD="$(tc-getLD)" \
-		OPT="${CFLAGS}" XLDFLAGS="${LDFLAGS}" CRYPTO="${crypto}" SYS=posix
-}
-
-multilib_src_install() {
-	mkdir -p "${ED}"/usr/$(get_libdir) || die
-	if multilib_is_native_abi; then
-		dodoc README ChangeLog rtmpdump.1.html rtmpgw.8.html
-	else
-		cd librtmp || die
-	fi
-	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" mandir='$(prefix)/share/man' \
-		CRYPTO="${crypto}" install
-}
diff --git a/media-video/rtmpdump/rtmpdump-2.4_p20161210-r2.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20161210-r2.ebuild
deleted file mode 100644
index 6c6bbb4ef985..000000000000
--- a/media-video/rtmpdump/rtmpdump-2.4_p20161210-r2.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit multilib toolchain-funcs multilib-minimal flag-o-matic
-
-DESCRIPTION="RTMP client intended to stream audio or video flash content"
-HOMEPAGE="https://rtmpdump.mplayerhq.hu/"
-
-# the library is LGPL-2.1, the command is GPL-2
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-IUSE="gnutls ssl libressl"
-
-DEPEND="ssl? (
-		gnutls? (
-			>=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP},nettle(+)]
-			dev-libs/nettle:0=[${MULTILIB_USEDEP}]
-		)
-		!gnutls? (
-			!libressl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
-			libressl? ( dev-libs/libressl )
-		)
-		>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	)"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-swf_vertification_type_2.patch"
-	"${FILESDIR}/${PN}-swf_vertification_type_2_part_2.patch"
-)
-
-if [[ ${PV} == *9999 ]] ; then
-	KEYWORDS=""
-	SRC_URI=""
-	EGIT_REPO_URI="https://git.ffmpeg.org/rtmpdump.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-	SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
-fi
-
-pkg_setup() {
-	if ! use ssl && use gnutls ; then
-		ewarn "USE='gnutls' is ignored without USE='ssl'."
-		ewarn "Please review the local USE flags for this package."
-	fi
-}
-
-src_unpack() {
-	if [[ ${PV} == *9999 ]] ; then
-		git-r3_src_unpack
-	else
-		mkdir -p "${S}" || die "Can't create source directory"
-		cd "${S}" || die
-		unpack ${A}
-	fi
-}
-
-src_prepare() {
-	# fix #571106 by restoring pre-GCC5 inline semantics
-	append-cflags -std=gnu89
-	# fix Makefile ( bug #298535 , bug #318353 and bug #324513 )
-	sed -i 's/\$(MAKEFLAGS)//g' Makefile \
-		|| die "failed to fix Makefile"
-	sed -i -e 's:OPT=:&-fPIC :' \
-		-e 's:OPT:OPTS:' \
-		-e 's:CFLAGS=.*:& $(OPT):' librtmp/Makefile \
-		|| die "failed to fix Makefile"
-	use ssl && use !gnutls && use !libressl && eapply "${FILESDIR}/${PN}-openssl-1.1.patch"
-	default
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	if use ssl ; then
-		if use gnutls ; then
-			crypto="GNUTLS"
-		else
-			crypto="OPENSSL"
-		fi
-	fi
-	#fix multilib-script support. Bug #327449
-	sed -i "/^libdir/s:lib$:$(get_libdir):" librtmp/Makefile || die
-	if ! multilib_is_native_abi; then
-		cd librtmp || die
-	fi
-	emake CC="$(tc-getCC)" LD="$(tc-getLD)" \
-		OPT="${CFLAGS}" XLDFLAGS="${LDFLAGS}" CRYPTO="${crypto}" SYS=posix
-}
-
-multilib_src_install() {
-	mkdir -p "${ED}"/usr/$(get_libdir) || die
-	if multilib_is_native_abi; then
-		dodoc README ChangeLog rtmpdump.1.html rtmpgw.8.html
-	else
-		cd librtmp || die
-	fi
-	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" mandir='$(prefix)/share/man' \
-		CRYPTO="${crypto}" install
-}
diff --git a/media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild
index 2bf9f5d0cefa..5f6a9cd3cb04 100644
--- a/media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild
+++ b/media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild
@@ -32,12 +32,11 @@ PATCHES=(
 )
 
 if [[ ${PV} == *9999 ]] ; then
-	KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 	SRC_URI=""
 	EGIT_REPO_URI="https://git.ffmpeg.org/rtmpdump.git"
 	inherit git-r3
 else
-	KEYWORDS="amd64 arm arm64 hppa ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm arm64 hppa ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux"
 	SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
 fi
 
diff --git a/media-video/rtmpdump/rtmpdump-2.4_p20161210.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20161210.ebuild
deleted file mode 100644
index d7c99b0d7dc9..000000000000
--- a/media-video/rtmpdump/rtmpdump-2.4_p20161210.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit multilib toolchain-funcs multilib-minimal flag-o-matic
-
-DESCRIPTION="RTMP client intended to stream audio or video flash content"
-HOMEPAGE="https://rtmpdump.mplayerhq.hu/"
-SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
-
-# the library is LGPL-2.1, the command is GPL-2
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 hppa ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="gnutls ssl libressl"
-
-DEPEND="ssl? (
-		gnutls? (
-			>=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP},nettle(+)]
-			dev-libs/nettle:0=[${MULTILIB_USEDEP}]
-		)
-		!gnutls? (
-			!libressl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
-			libressl? ( dev-libs/libressl )
-		)
-		>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	)"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	if ! use ssl && use gnutls ; then
-		ewarn "USE='gnutls' is ignored without USE='ssl'."
-		ewarn "Please review the local USE flags for this package."
-	fi
-}
-
-src_unpack() {
-	mkdir -p "${S}" || die "Can't create source directory"
-	cd "${S}" || die
-	unpack ${A}
-}
-
-src_prepare() {
-	# fix #571106 by restoring pre-GCC5 inline semantics
-	append-cflags -std=gnu89
-	# fix Makefile ( bug #298535 , bug #318353 and bug #324513 )
-	sed -i 's/\$(MAKEFLAGS)//g' Makefile \
-		|| die "failed to fix Makefile"
-	sed -i -e 's:OPT=:&-fPIC :' \
-		-e 's:OPT:OPTS:' \
-		-e 's:CFLAGS=.*:& $(OPT):' librtmp/Makefile \
-		|| die "failed to fix Makefile"
-	multilib_copy_sources
-	eapply_user
-}
-
-multilib_src_compile() {
-	if use ssl ; then
-		if use gnutls ;	then
-			crypto="GNUTLS"
-		else
-			crypto="OPENSSL"
-		fi
-	fi
-	#fix multilib-script support. Bug #327449
-	sed -i "/^libdir/s:lib$:$(get_libdir):" librtmp/Makefile || die
-	if ! multilib_is_native_abi; then
-		cd librtmp || die
-	fi
-	emake CC="$(tc-getCC)" LD="$(tc-getLD)" \
-		OPT="${CFLAGS}" XLDFLAGS="${LDFLAGS}" CRYPTO="${crypto}" SYS=posix
-}
-
-multilib_src_install() {
-	mkdir -p "${ED}"/usr/$(get_libdir) || die
-	if multilib_is_native_abi; then
-		dodoc README ChangeLog rtmpdump.1.html rtmpgw.8.html
-	else
-		cd librtmp || die
-	fi
-	emake DESTDIR="${ED}" prefix="/usr" mandir="/usr/share/man" \
-	CRYPTO="${crypto}" install
-}
diff --git a/media-video/rtmpdump/rtmpdump-9999.ebuild b/media-video/rtmpdump/rtmpdump-9999.ebuild
index d4e9a79c5e11..aef12b6aa94f 100644
--- a/media-video/rtmpdump/rtmpdump-9999.ebuild
+++ b/media-video/rtmpdump/rtmpdump-9999.ebuild
@@ -32,12 +32,11 @@ PATCHES=(
 )
 
 if [[ ${PV} == *9999 ]] ; then
-	KEYWORDS=""
 	SRC_URI=""
 	EGIT_REPO_URI="https://git.ffmpeg.org/rtmpdump.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 	SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
 fi
 
diff --git a/media-video/smplayer/Manifest b/media-video/smplayer/Manifest
index b3793f3ca804..9eaff86f7f30 100644
--- a/media-video/smplayer/Manifest
+++ b/media-video/smplayer/Manifest
@@ -6,7 +6,7 @@ AUX smplayer-18.3.0-disable-werror.patch 367 BLAKE2B 68b0f5b9cb34afb3843de4dd366
 DIST smplayer-18.6.0.tar.bz2 5111791 BLAKE2B db19932703d93cba7f3f54989988d88af7ed033a61388f89263f613ce743cfd1ff649dad9db2b43193a459110267ee176eae9640f814e77545cfe6b5fb53abe2 SHA512 8383c8c3d4a171adc189d6bc4c11c0b7a8ea78bf8ff8518589647dfd846b314cf3290a1d607c617e7e971ee29c6966666bf9d306d1b1c1bb4824f42efd97c7a8
 DIST smplayer-19.1.0.tar.bz2 5169546 BLAKE2B fc15fd33522f137371442696b20ed695dbc4cfeb759ae504cdc688dc30de14fd35da81f6788b3dc2886119012416218f1d39ba64a7d747194dd777544a08d1e0 SHA512 aee009f0ff6dcfe8e5b0b80c99d44c41a02c34d7974c1a15b21235e3daaf3142f5c936adb043327804412309b88e0ff8f0ef440c1835541adb6bf703d486ff79
 DIST smplayer-19.5.0.tar.bz2 5175017 BLAKE2B e7160ca7d404dd6a8d7c316df3c39b2e238410435960d714aec271d2034030f9e1b59997d11d758188e327117f0eb773cb8baccc1defc20cd071e40c87deb07c SHA512 ee19186b3f4eac94b06a1e389e42edb8c2b22f8182b679bdc40e3ae1569a6c69f168260abfee3b2827b71b10eb353e7a3821805798f37aae2600af3b73d25ca1
-EBUILD smplayer-18.6.0.ebuild 3208 BLAKE2B 7c809a0375fc293b2af598e3f2c672a8a4f4bca451e155ad7dbad944adaa80d1e2a489b60ad9a1b133afca472ac59e15b5ec7057652353765f9ed19f4e6a8585 SHA512 21a14fccf5d307cb0b2d2cee864d5ca8bb29d462aa8b821a7654da42e193d6480520d2c71e1c0cc84df0f782aa0494cbaf88b6b977d3bfe056002318a69c4577
-EBUILD smplayer-19.1.0-r1.ebuild 3164 BLAKE2B 0b6fc77b7f22e590325ffb1304868cdf4551eb8c10fe5239b7b1bef43e66a8784c0a325a4c4fcd83350ae3635b82e94cf2c9d553788a3336d5555a35f698a592 SHA512 d78f0e68b457b267195a6124bec53d89c001f7c6007db62c3afb4946a8bf47b6697a1c4fe333bec8cc4d2034c6e22aef53003ce23e7bf24c023f824dbf8ed21d
-EBUILD smplayer-19.5.0.ebuild 3164 BLAKE2B 0b6fc77b7f22e590325ffb1304868cdf4551eb8c10fe5239b7b1bef43e66a8784c0a325a4c4fcd83350ae3635b82e94cf2c9d553788a3336d5555a35f698a592 SHA512 d78f0e68b457b267195a6124bec53d89c001f7c6007db62c3afb4946a8bf47b6697a1c4fe333bec8cc4d2034c6e22aef53003ce23e7bf24c023f824dbf8ed21d
+EBUILD smplayer-18.6.0.ebuild 3198 BLAKE2B 9308361b80dda582ba1894bed9e47e2fd66a48be962d21fb267fa5909f1b73cc523aac8cc87f4d2ecc43be9044a18c5585be0e54da2935cd57e0336be068754b SHA512 c9f8da664cc37fdb2e7ac780f15ed87d4b6089a6c4015ad747f36e3a9ae0b96e4fd66c2ace62a15cb9b42887cd81b6f7e83dafd59b215f71117ea90e77f714a2
+EBUILD smplayer-19.1.0-r1.ebuild 3154 BLAKE2B de825ff508e94ef4a44612134b3eef149bf603dadbd6b1439321537cb49d64fe132b83c48865e15834d68024c0eb28743981912e333d04873e57e817c126d9bc SHA512 49615613aeca2723f69d4e262e93ff09343c030fae71746873cd8a25e7725f757d47b2160fd171433601fc43c0064ca8c9ebf531c62e73ecf7a0201aa222eb13
+EBUILD smplayer-19.5.0.ebuild 3154 BLAKE2B de825ff508e94ef4a44612134b3eef149bf603dadbd6b1439321537cb49d64fe132b83c48865e15834d68024c0eb28743981912e333d04873e57e817c126d9bc SHA512 49615613aeca2723f69d4e262e93ff09343c030fae71746873cd8a25e7725f757d47b2160fd171433601fc43c0064ca8c9ebf531c62e73ecf7a0201aa222eb13
 MISC metadata.xml 886 BLAKE2B 93069f16c27051f346dfd71113b7998f84c09efc7b1b7ad05600f82712e1693368a99bd51e4833cb8ec5c6433ec41f002370e564a2f67aace9e65fea14ce7653 SHA512 e82489ac4436ddbecd44783d694f1056a8a40b278ef941faa236079ad4cfdf0d542cee8c73b7ae1492efe76c2cac31c6a641e2187e01a1210d4b5cd519a839f4
diff --git a/media-video/smplayer/smplayer-18.6.0.ebuild b/media-video/smplayer/smplayer-18.6.0.ebuild
index 4a7db89b0508..0176daf8f1c2 100644
--- a/media-video/smplayer/smplayer-18.6.0.ebuild
+++ b/media-video/smplayer/smplayer-18.6.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2+ BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~amd64-linux"
 IUSE="autoshutdown bidi debug mpris"
 
 COMMON_DEPEND="
diff --git a/media-video/smplayer/smplayer-19.1.0-r1.ebuild b/media-video/smplayer/smplayer-19.1.0-r1.ebuild
index a7d7dc8f6ecf..1863a883169d 100644
--- a/media-video/smplayer/smplayer-19.1.0-r1.ebuild
+++ b/media-video/smplayer/smplayer-19.1.0-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2+ BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE="autoshutdown bidi debug mpris"
 
 BDEPEND="dev-qt/linguist-tools:5"
diff --git a/media-video/smplayer/smplayer-19.5.0.ebuild b/media-video/smplayer/smplayer-19.5.0.ebuild
index a7d7dc8f6ecf..1863a883169d 100644
--- a/media-video/smplayer/smplayer-19.5.0.ebuild
+++ b/media-video/smplayer/smplayer-19.5.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2+ BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE="autoshutdown bidi debug mpris"
 
 BDEPEND="dev-qt/linguist-tools:5"
diff --git a/media-video/totem/Manifest b/media-video/totem/Manifest
index 10cd290e7860..933a1bf5bfb2 100644
--- a/media-video/totem/Manifest
+++ b/media-video/totem/Manifest
@@ -4,6 +4,6 @@ AUX 3.30.0-vala-errormsg.patch 820 BLAKE2B 6b896371078f59b5e46efb28ccca56ef710cb
 AUX 3.32.1-control-plugins.patch 4548 BLAKE2B bafca1010119387693f8acf6b107235677ab2b674e72d6e65da6cf1124e34da05be990adc2a824d3c12fdb1f97e656a03e954900e8329bd412f4c7827f69e319 SHA512 70e0b783d57912eeb2055062eb1b5b980f2f1f54c8e6d5fe9a77936587693008f5f15d982511a8b20b08aecc270fa38d691f13a7632ddcc52f1cad17b4349be7
 DIST totem-3.30.0.tar.xz 3275852 BLAKE2B 9a5f97229a8aa6f7665c6d3e79dff48cfcce3caeab69510361ef3e9e1a107f7a56c66a5ae89ba3ae0a77d4b0ae8a16ac1f61e77278c82bf768e50009420110d0 SHA512 9d2e0a9e89358eea03404afd9353d18fa23afee7a34612912411ef10d4fb0b26ee02db002e6f8e05f68a333202d419f1e1a35188da23f87189e3093dac655742
 DIST totem-3.32.1.tar.xz 2154892 BLAKE2B ff9ec2facbada0f72ae82bbb35d03e82b574be02d7c1f1d4c4dd3262e2b302d3430ba953cd9f4b4e1d1e5151f9b5987986c7ea387a7f5d6667eb931d41805659 SHA512 31a3e3ac7628b992da3cf99570d013eb8b972e28465db30a9ec68291f8e19ab498d89df6275228367a7e3e43121bcebda2654f2b0461a9d1d561cf46e0029f67
-EBUILD totem-3.30.0.ebuild 3742 BLAKE2B 8e2f992b6a3e9baede4c4d36063aee266753fa3badd3bdb85d13db9daaa92bf9cff737411d2232cebf53907cfc3b96e394822211e0ca9e417a34c0f39cd867ea SHA512 3ebb6f56195aa9e03883886e4972e0028c51f1f8fc9c26892651d3ddae29f496de635390cd83e163a5e6f6b32f9a4fb3ae11c67eb41761e8eadc33dea5a10968
-EBUILD totem-3.32.1-r1.ebuild 3110 BLAKE2B eb249c13d246dc798bc218df09b48ed8490c1c4960a6e1899b0b1a1f20ad44751503db3dc2df7365efe333b34f31d36658073b7df6565c577c8ed54d1fb9a732 SHA512 3fff1db6c78ff7eb38816e2b61cb130e64c2f1a887d34c607e1bed7dceab612ec4f221ca3fca13b3f83d0e9cc2757a2e4050a18c8263317674f4b94ee5c76eb4
+EBUILD totem-3.30.0.ebuild 3732 BLAKE2B e1bc6349ed5ba2ba55d498cf27d7d981e2ffed32201e369b1d574a82bd720b19db9bb7c2b52ae80d1d80da7c0b6e8adea9ebae193fd6a611d8731b9562fe0608 SHA512 72a4d6f9f8323d5c7d53d0ff1d228c691b3286e5c634dc825ecc8f0a17cfcfba071d283ab88e0889ae9b003c5372b988cb31dc6e6a9dcb3cfdd4ae9472644ac7
+EBUILD totem-3.32.1-r1.ebuild 3100 BLAKE2B 347a0de828a02b11d1e9e9df85630ca5983ae9bfb7d844d6116641933e049405087436dd54ff8059ce95c82487a784fd4b8fe066266d2b48c2fa4d72475633de SHA512 1a1c03f956ef210824c6078b9c52619ce54d906d8a4d2f585a0bc592f86a89a7fc6dd2145ee8c95138432c7cfcc7dd7338298263237c8ed74f9994635b8b2941
 MISC metadata.xml 1323 BLAKE2B 50a31cc1ea80714ce43b7434888c275acfea44b2231c500b20422ead6f248b3ccb0765909df4dd2c74c05aee333e294c599982037f91364efe77b1dad639c63e SHA512 95686fb2c0a601026587bc759548bc7b3798f7ed1347d34d2deb42a35ed5f424da7412ccb4b6d6fb50ca078855c32f1eb0485ffa4eec919baad7e19b899058be
diff --git a/media-video/totem/totem-3.30.0.ebuild b/media-video/totem/totem-3.30.0.ebuild
index 291623b00836..ee7f1d4b1587 100644
--- a/media-video/totem/totem-3.30.0.ebuild
+++ b/media-video/totem/totem-3.30.0.ebuild
@@ -19,7 +19,7 @@ REQUIRED_USE="
 	vala? ( introspection )
 "
 
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
 
 # FIXME:
 # Runtime dependency on gnome-session-2.91
diff --git a/media-video/totem/totem-3.32.1-r1.ebuild b/media-video/totem/totem-3.32.1-r1.ebuild
index b06daab34a8b..492a875756ba 100644
--- a/media-video/totem/totem-3.32.1-r1.ebuild
+++ b/media-video/totem/totem-3.32.1-r1.ebuild
@@ -19,7 +19,7 @@ REQUIRED_USE="
 "
 RESTRICT="!test? ( test )"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
 
 # FIXME:
 # Runtime dependency on gnome-session-2.91
diff --git a/media-video/transcode/Manifest b/media-video/transcode/Manifest
index 1766023a4f4a..eb27f9d79abe 100644
--- a/media-video/transcode/Manifest
+++ b/media-video/transcode/Manifest
@@ -1,5 +1,5 @@
 AUX ffmpeg4.patch 28911 BLAKE2B f1189589a39ea9801e1620bd138499f5f5a29429cc7372ebf65b38901f1f4f0b71957a216a65367108660709ea5ca001e5ce68d67dfd478ed471963acef087a3 SHA512 1550b2de1ca0265703513d3b7fca3441f6216d89792dc68e224f5f2d99386275cdfdf7ef7b01abaf69f5de5d9af1f221617697aff6345d3d1b2e5a06d30e1f6d
 DIST transcode-1.1.7-patchset.tar.bz2 16379 BLAKE2B fbdc188bffeb8751814abfa7e119a1053e482f194bc1b87a721c48e2b66e107df146d38b3ea11a88d066c49d8862489b88b74f61fa36ce3f8a1a782da3762615 SHA512 bedc82aa4fbc17774e34d8fc24799d70b8460c6c1dd728549bcaa5c387492f56e520674fdf8bb976c0b5fcc9ccefb765f2ee26816e0d2b96a83402a21cee3f6d
 DIST transcode-1.1.7.tar.bz2 2183627 BLAKE2B 25001d4cae83d86e5295917bcd9e2e77dd61637e238394a2d603398baf810201dc61d8b0de5b54a7b8848ac3bcef5fb211e8f2b43ed7da4e56e335b8d4d2fbe1 SHA512 d6f9674f3f5c3346194120585741ca660eb9ee133085cfce9460a14eaa0cf16fdf291761bd1db78e1c784e4d69a9481c7470cf8357dc7638ee3017620500f45f
-EBUILD transcode-1.1.7-r3.ebuild 4172 BLAKE2B 0013a7b8aa44f887d43a0d3a8fb461d589f07d9c4dec231e0fa7123153c35fd61e1d6f6f346c2cc7f0d4a353256c4e19f0477c12d94652f90cba3a2169cee4b2 SHA512 d422160cf0b90f6d4128a4ceb4410195f3a96939830e4b30245a47158e094a5614357ce0c59fd8926647d3e4d3031199efd45c822d2ccbb26b18a8e0b3a5cf85
+EBUILD transcode-1.1.7-r3.ebuild 4175 BLAKE2B 51278a80486f512285177bdad146aea6f70da24c5385df40ea3deaa4b35e5203943348079fdf29596a27de2b64b3e592eea5a724d6ed701842e904387bc8ec51 SHA512 251591941b88eb5fd94699fe67e167ddac36a9f2b7091935509e8f636a80c12cc3d47e0c0ded6faed2440facd420a2f79abfa9c6eb7682963d9c7d7c75c33eea
 MISC metadata.xml 619 BLAKE2B fa440f0f00bd7afe2834108078f48dc93dfe5ea38d343587267e2b45f4c4187762fdf16e1f023e4fc3af69d181ec77cbedec4a39df98eb8d4a098b98248c7b56 SHA512 043d39001850f8088e33e7277a579af7cb45b6fd2b3fe4483eb7771340dae8eab14927184f0fab9aedc8934a6d2599ce6231726308079d0ae16e7710f826ad1b
diff --git a/media-video/transcode/transcode-1.1.7-r3.ebuild b/media-video/transcode/transcode-1.1.7-r3.ebuild
index 53c0de6f7dcc..3512708808c4 100644
--- a/media-video/transcode/transcode-1.1.7-r3.ebuild
+++ b/media-video/transcode/transcode-1.1.7-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 2002-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,7 +20,7 @@ RDEPEND="
 	aac? ( media-libs/faac )
 	alsa? ( media-libs/alsa-lib )
 	dv? ( media-libs/libdv )
-	dvd? ( media-libs/libdvdread )
+	dvd? ( media-libs/libdvdread:0= )
 	iconv? ( virtual/libiconv )
 	imagemagick? ( media-gfx/imagemagick:= )
 	jpeg? ( virtual/jpeg:0= )
diff --git a/media-video/vcdimager/Manifest b/media-video/vcdimager/Manifest
index 651c8b6890f9..2e191fb98331 100644
--- a/media-video/vcdimager/Manifest
+++ b/media-video/vcdimager/Manifest
@@ -2,6 +2,6 @@ AUX vcdimager-0.7.24-libcdio-1.0.0.patch 7545 BLAKE2B 58426bd919e0c0cbe9703a33fc
 AUX vcdimager-2.0.1-pkg-config.patch 347 BLAKE2B 082ac47630ce7289967a3dfb17c601ba90c01d15e87bedb61a78a44573a38ac0c0d8790bf2acca540c2dbe91f6a099b57032644dbb32d202c05709dddc17ffbe SHA512 e43827527b656e8813c41266e30a9f9e86a3a7dd67ff01de08088d78a775481914d7a6f1d472b80d53e93f09573e0b922006652626415fd5d7f6a9c3ca534468
 DIST vcdimager-0.7.24.tar.gz 1066815 BLAKE2B b58648a4ab54b3151448c2aa17306105ada45d9708375c7461c7f9087b851339f8288855c0d38d1521317b303c79b432b5e99b39ca7b8f59da8ae7aff7238582 SHA512 162f361d3c871c85887f0b25e70c207c511dcf597f337633be3ce925e8c589a8ba26275b8378d1002b8c5eb56995eda017f5f1cf52e52a38e9ff900acba7a214
 DIST vcdimager-2.0.1.tar.gz 1115207 BLAKE2B edf70212e81a89924e64115cae9eab77619f7e639e5529b85cc6a80c6ef4f4028c8a207bec86c41283b9768f6a0f56ef56adfad18c7bba20c315b1e5554a83a9 SHA512 55a9d235149a35fe26576703c623a2c9a3f7deedd2e42e01271fdf1e1fdf14c51ee040ee3b5d15fe1b5860fbd4cbeb437362b1a1f40187c8d4d691b6b89a2230
-EBUILD vcdimager-0.7.24.ebuild 1514 BLAKE2B 02c041f82bda11b33d20d7f1a422fc123d21266a396df8bf987158c032466f5115d81827f603fe664f9a806561fcd129755a0f51ec3d17a38bd0a0e8dbd2ff7a SHA512 28a15cb2d396ff3f4a16d7356c96f39ee75c9cbdcb5827408f3e2089bc88ca169a6ba0d0b9a5a69f1245441a6a225d7fd65ce7a60881f46f933df86707639f5f
-EBUILD vcdimager-2.0.1.ebuild 1398 BLAKE2B 274e1dfdd86c2fad21e952f658325dfa477e2826f4cdd2c75db68b083fb78fd7df7e0bc6e9088a0581d20f780fe8aaccce4669d5c90d07b11b04b43209c62210 SHA512 5efb06c4810ccdce48d2d58c274388102b3954d5a557323b19bd010b719ad6f77abfd5f57544779fe90310e5ddedf4f9f7ed9d4a64685581490b4590fc3f1efd
+EBUILD vcdimager-0.7.24.ebuild 1492 BLAKE2B 69b176284b7c915f72785cb02fd4c340644b82519318a749086fd8850707214d5429c2f9d19b35a4d95c395c0e0fb4677775cf05707a34da0cc2a69840318442 SHA512 5e5cf2a27d353be4c23e34565cc0ffdccdac97b261de89d255086655d76deaaaafabafe4e06a994bc76cdea485511f17a2fa63f593ca369c6c3c877b0e98b134
+EBUILD vcdimager-2.0.1.ebuild 1376 BLAKE2B 2559bef9b946d90e061bcbe31c71843973d7936165bab70b1b94620044d2076395b2ff4052f870058a51fda8769894bf15eff0ec49e09d5abea36f9fb0d20a1a SHA512 5e4d25aeca4b15b8f64c58c2ccb81b2f51e2f0e0a73888e44fa083e94b99ee9d05941c923dab073c210e571359e8f9759261a9619a0af0bc7188bde6fa47b2ce
 MISC metadata.xml 223 BLAKE2B 1a772bb5add75cb4343b09bb2456adcd5e46896daaab4091ab64b667c5fa1a4adab0940015a3e755df3d6540b456694dc67ef9581d02d40c63b89290f8f83e43 SHA512 27b688917e0b1c4a75ea34c97d2d67d309573941492ab04124de11034f3b2796480f02408d86e2eba77ca2000722ea6606fe12a49622c04f9e2c1fa27b6fc8db
diff --git a/media-video/vcdimager/vcdimager-0.7.24.ebuild b/media-video/vcdimager/vcdimager-0.7.24.ebuild
index 5eece94aa347..d6faa838f46c 100644
--- a/media-video/vcdimager/vcdimager-0.7.24.ebuild
+++ b/media-video/vcdimager/vcdimager-0.7.24.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86"
 IUSE="+xml static-libs"
 
 RDEPEND="
diff --git a/media-video/vcdimager/vcdimager-2.0.1.ebuild b/media-video/vcdimager/vcdimager-2.0.1.ebuild
index 9a20db721b36..4923e365621c 100644
--- a/media-video/vcdimager/vcdimager-2.0.1.ebuild
+++ b/media-video/vcdimager/vcdimager-2.0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh sparc x86"
 IUSE="static-libs +xml"
 
 RDEPEND="
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index bba21626a306..6542609e28f9 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -4,7 +4,7 @@ AUX vlc-2.2.8-libupnp-slot-1.8.patch 725 BLAKE2B eb217ef57f0709fa1d0bdf164461058
 AUX vlc-3.0.6-fdk-aac-2.0.0.patch 3436 BLAKE2B 022201ed10fef189feeb36f44ab4194ab7994e4fdd8bad922070b54688d34d051fac28177a0e648d55670e0b9f0c6b45f9a05650476b0ae12ebfe759dd561e28 SHA512 68964adda04cd88e80b586984f1af0cfdccff5dbf8529070d5ab985b23402dfb7380b5d39eacfea433c1ba03434139e4f394c1c25d6b426489883d3a42cb7b5b
 AUX vlc-9999-libupnp-slot-1.8.patch 763 BLAKE2B 6bc8cf46f029db27d6d30d96e871d3bcfddee004e4e8469e1526a6a38fb5cc11a24a19888443e5f9062d7145665d594e142c12f3a9693967f195bab3b33ada38 SHA512 dd3375997a1935d3a227231785f35e300e3f992034da6a9c3019e28c68c1f005cbdd67190672264b342abc719e69005f965599f7af975e2bbd4cfccd89e3770d
 DIST vlc-3.0.8.tar.xz 26041520 BLAKE2B 4a507206e5a183fe036a95c84d7e94592973a0bd913aa764881bf73928b3c770a776fde1fce7878c4385cf11876813c7d7d48dfe219e71b0e13a9f6be9aa701a SHA512 5ade0b350e98fd6fa90035bffabda96f0addb3844a7c0a242b4db1cab6a746e1adb1d713ddcb48ae51a7d1736090f096f5d3b0637a9f958ccf4fcf27e838cf70
-EBUILD vlc-3.0.8.ebuild 13064 BLAKE2B 75dd207495eb869ce5a4bb5c19a896250ec08363ee24e3e16c555a5c70e75d929c105a202f1a6f946c99ac2b80379eeaa024a86963f231ea8d96e2c6b0571118 SHA512 72aee17a30b21880c8118c463012b7aa02e40f014afabe0019eb45bb5d5dcd1b05a3b7cce46180908b669ee6e011b0554ef1b36e1b9327850abd2498d19eee2f
-EBUILD vlc-3.0.9999.ebuild 13069 BLAKE2B ad1b1b4830bccdee31dec6640b8fb3dfee35082f15cecf66117e4341dfbc4b137bf8fb6738683a72f09a3b78b8d0d3e3998db08a0a0a5f0cecdf60a6037b018a SHA512 b97ba0c1fac40a3e9d6601c853b440b174d81d1cf7a4e5f48ff4d32f164673ab34234d37343241b1386e1e272d51c188d9e64ac27eee804739e89df0fb6eca1d
-EBUILD vlc-9999.ebuild 13008 BLAKE2B 780b62d33b6f61a2a6f652cf8d08cc8559d597cb09a91bccdc3f87472675c9935ca013b8dad4660c8e6b92b7b1d1a2c9b4eecb6686089897020237d6cbac6ed5 SHA512 d4f741600a0a9f133f811087f54e748b78e7817c02d8761822ae59d9fce15683f098185ac3716278ed475d14e33a621473f59b25e8e1f6112b21a7edca6386d4
+EBUILD vlc-3.0.8.ebuild 13060 BLAKE2B 2003cd2e1625476f2857c98eb996fcd8b13539587a730591dedb345bbcc6c6181c5e9e57cce6f7d91d2fb0be3d83ec4a66799c7f8eaff5f719c4594b7286c861 SHA512 11919e27811167ba322640a83a12f3c74c58dd644a1b101ca8316f015e3aebad20fb5287da9ff619a8e382e8dccad931a0f3b879bcc7ae82ea2351d6848b9aa7
+EBUILD vlc-3.0.9999.ebuild 13065 BLAKE2B 6e43d8f3ac4b1e2f7e02e78461085c658c5e5198c7577049dcdb6af593baa1bf520f0a70dfb507f17f2700f297fb71abb508adc20bfd7a6eb55b19383e3c4663 SHA512 bfde9f5f4a76bd8fd55c6d976c2be11549c35fcc9d33186fd4b4991880e018fd16ce4c859ea86850a652ec0ac116c96e24b60131aeaa791bd09dc9c40b4d6fc9
+EBUILD vlc-9999.ebuild 13004 BLAKE2B 82df7a4bb8c9573288c3df49d7a983df7aa3d87f3087678139d5b7fbc31f4debf31ec535d703b0e2e2bb6f0d264e0cec829a4a9d629d34412a8b6a1fd5f4775b SHA512 8417d3bcf672e4bc4aac2fce628c4941b21fe50e49ba1dc4f15f4d9171201c58b5acfc5f316ea4b9b6abd491bcb4460d7207bacba44232e11776ef5dd06132c0
 MISC metadata.xml 4914 BLAKE2B 9cc2e2e3d4da8bb4c5ec63bc5c0e4b7b9e6e5c567ba0b1c515d806e0ec0fe4a90b15406a6c978a2e37b91805ef922182cc09057364203b641c64365d95b2a9b8 SHA512 37ef990f0444d819d8b68da62a5929964e3d247339347c84ddc929b608b358efa94503caeb379ce1c39dfda4fac3c679db33a7d590d8dd09d7e2552f482cd889
diff --git a/media-video/vlc/vlc-3.0.8.ebuild b/media-video/vlc/vlc-3.0.8.ebuild
index 2adb5c449a1b..8c53749a75b0 100644
--- a/media-video/vlc/vlc-3.0.8.ebuild
+++ b/media-video/vlc/vlc-3.0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 2000-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,7 @@ else
 	else
 		SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
 	fi
-	KEYWORDS="amd64 ~arm arm64 ppc ppc64 -sparc x86 ~x86-fbsd"
+	KEYWORDS="amd64 ~arm arm64 ppc ppc64 -sparc x86"
 fi
 inherit autotools flag-o-matic toolchain-funcs virtualx xdg
 
@@ -90,8 +90,8 @@ RDEPEND="
 	dts? ( media-libs/libdca )
 	dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= )
 	dvd? (
-		>=media-libs/libdvdnav-4.9
-		>=media-libs/libdvdread-4.9
+		>=media-libs/libdvdnav-4.9:0=
+		>=media-libs/libdvdread-4.9:0=
 	)
 	faad? ( media-libs/faad2 )
 	fdk? ( media-libs/fdk-aac:= )
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild
index 8a0363090c55..eff579106bd9 100644
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 2000-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,7 @@ else
 	else
 		SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
 	fi
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86"
 fi
 inherit autotools flag-o-matic toolchain-funcs virtualx xdg
 
@@ -90,8 +90,8 @@ RDEPEND="
 	dts? ( media-libs/libdca )
 	dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= )
 	dvd? (
-		>=media-libs/libdvdnav-4.9
-		>=media-libs/libdvdread-4.9
+		>=media-libs/libdvdnav-4.9:0=
+		>=media-libs/libdvdread-4.9:0=
 	)
 	faad? ( media-libs/faad2 )
 	fdk? ( media-libs/fdk-aac:= )
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index aabafcaad22e..07483fd7d3a1 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 2000-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,7 @@ else
 	else
 		SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
 	fi
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86"
 fi
 inherit autotools flag-o-matic toolchain-funcs virtualx xdg
 
@@ -90,8 +90,8 @@ RDEPEND="
 	dts? ( media-libs/libdca )
 	dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= )
 	dvd? (
-		>=media-libs/libdvdnav-4.9
-		>=media-libs/libdvdread-4.9
+		>=media-libs/libdvdnav-4.9:0=
+		>=media-libs/libdvdread-4.9:0=
 	)
 	faad? ( media-libs/faad2 )
 	fdk? ( media-libs/fdk-aac:= )
diff --git a/media-video/vobcopy/Manifest b/media-video/vobcopy/Manifest
index ebffeaf8bbb7..29917d06523d 100644
--- a/media-video/vobcopy/Manifest
+++ b/media-video/vobcopy/Manifest
@@ -1,3 +1,3 @@
 DIST vobcopy-1.2.0.tar.bz2 60102 BLAKE2B 7456ded4df8c001678b0c61fedd66ef8f71ac98280894e803b64fccb96d5ed5e6fc44ef207e861c2f5a019f692aafaf676d718b8c1646bbbc48c6cfcc37a1fe5 SHA512 442849e0e4d379d6289011baa9074b89d579323d1d01faa1531f642d5dd4d25bd76b0286741e79da6e13f71b13ae8f86795c67059b47067d108b00a7b77945a5
-EBUILD vobcopy-1.2.0.ebuild 632 BLAKE2B 61219bb9a40f2b752ee0d4bc78cdb6c91a5372e80c680ea7c2ca5204529df0b4ce9ccc8fa4bef70461860ca52583845379717a952d9596352a1a41279ca19ec0 SHA512 5c6f2b40713c75694c37c7d5957d4f1cf5ba705169afb83c45de9b4063a438213b1635fdd23dbc5a52727a4d46712af6beca9b62922e85353064a31e605cb522
+EBUILD vobcopy-1.2.0.ebuild 624 BLAKE2B 6b6d82a1298d8d6164f7e3dae52deefb97874e487d5c5ba10adb65248c65ee1991b224cf88ebb9bd8b116bc3ba69b4d7ec524dca8941cc6703d1eab323973275 SHA512 f8c932045289a6fdb1ebf372da8cfe214e705f3ab0890a18be68c465ccf01362806b7cc95869c1c2cf0ef511e5a3fa072418f14e6486592f81341352408cde94
 MISC metadata.xml 255 BLAKE2B 84855d12acedab301e8e709820ef74f658689209ce914cad2c71d11f4248a7d3356109d93573ed675698031eca1e0b6e0372a61c2a43a9f09840e295f94b74ef SHA512 92b56f4d9c86ad69341e67e8cc74db0bd068e45afdf2f3d3f9ea410fc5e64f3476143b656f2cb3d26b97ae01a967d71766952eba22e2278aab907c20b00ae0e9
diff --git a/media-video/vobcopy/vobcopy-1.2.0.ebuild b/media-video/vobcopy/vobcopy-1.2.0.ebuild
index f51dff5679b7..1d55e359f714 100644
--- a/media-video/vobcopy/vobcopy-1.2.0.ebuild
+++ b/media-video/vobcopy/vobcopy-1.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2003-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 
-DEPEND=">=media-libs/libdvdread-0.9.4"
+DEPEND="media-libs/libdvdread:0="
 RDEPEND=""
 
 src_configure() {
diff --git a/media-video/x264-encoder/Manifest b/media-video/x264-encoder/Manifest
index c4b83b85433d..811ffc9767f1 100644
--- a/media-video/x264-encoder/Manifest
+++ b/media-video/x264-encoder/Manifest
@@ -1,7 +1,7 @@
 AUX gpac.patch 507 BLAKE2B 7872c56ed87e96a247b63b92c6a23c094346fea9ee5127a6086a45efd064b4c00ddf2cd2191772bcbd54365c56ef550f3f5e0ecf2c2ab35a2e0c9dc3197ec9b9 SHA512 9da7a1ffe637e39863e5828547923424b9c072d194d3ddadcc9a6c31f7803f5456b3ba88d470458a84d37b0c07374983adc124f3710ae7122a81a13ea9b4ae0e
 DIST x264-snapshot-20190214-2245.tar.bz2 770462 BLAKE2B d90a3bafb88febe12526b225617616a62c32fa3d3eacf410267e1fbd7e0fafaadca7c146172c08fc525bce8791d81c7d87dc27b06d61a6a44bf2ad92f6c1def6 SHA512 c8b1b46d4e6c0ef653dab35083a454c635ebf72c6a5255ce30bbb5d9d6bb8e23fca0e6cc197ea99f3c702fbfec096587df6fa82dec338d8bd45e35fa89c43039
 DIST x264-snapshot-20190903-2245.tar.bz2 774515 BLAKE2B 0b19fc1d3cedea32bfac9c5247bce7b3c04dead35458d61f3b5c0694040dc852b0110b620faf4118ed265a5605aafce3c49d468d38fb91e4c515b2860c486920 SHA512 c357c9025ffdf653c974eb7ccc2e9a4de86c02881372a6a8270ae59ce948c284da48a2aba37763bd29359d2a6dfc76ea56a52fed6082f8483912c8f948488a2d
-EBUILD x264-encoder-0.0.20190214.ebuild 2133 BLAKE2B 60e4e1dd5a5625fdb17d37c551d42ce983b7c6e3b7e2f76fb1c2be19bc3bfdd10883c7e75f5ab623e458bf9cfe7b637007e12f340025666bc610535c0be90676 SHA512 e45fb0e38ca9fb60b800c3def2bb01d30597ff3de369a98289d5ead339fc8ace562f559674f29723d7bd320de12d6f39170609b85e6ad290b26773f2864d13aa
-EBUILD x264-encoder-0.0.20190903.ebuild 2135 BLAKE2B 6e2999f14ba5ebd68ec86eb00f8039c21159aae811241c77ea09de8ca61c7e103d5567f29f973eba549b1650506ee0cd8110e321209e25f79ca7ac2607766d8c SHA512 4ed53d1b52d17ec1c3dc8aa1ed20bd350b00b300ebb707894e0ad4596bb5b551a0c8841eba02350d838e97a4f40adb68bfe1b2e3f42fd62d02f91174773855a5
-EBUILD x264-encoder-9999.ebuild 2135 BLAKE2B 6e2999f14ba5ebd68ec86eb00f8039c21159aae811241c77ea09de8ca61c7e103d5567f29f973eba549b1650506ee0cd8110e321209e25f79ca7ac2607766d8c SHA512 4ed53d1b52d17ec1c3dc8aa1ed20bd350b00b300ebb707894e0ad4596bb5b551a0c8841eba02350d838e97a4f40adb68bfe1b2e3f42fd62d02f91174773855a5
+EBUILD x264-encoder-0.0.20190214.ebuild 2123 BLAKE2B 9723fe01f4a70ae1b15c7439b43f29e8040f3c7d48334ecf7d7e9b5568ac8d02bf7af36611422519554ac5f35cb64fcd79c10b48ebb0dbd606971e9df6aadcaa SHA512 6fea3377290b50177a3c455e4487bd7336b11143f3084296b1d207653030ee193351f073034b8685af6185e579834bce5bdd02de82edff0e6acac16928c14022
+EBUILD x264-encoder-0.0.20190903.ebuild 2125 BLAKE2B bbf4bea8aa2b6984ea20b5a2b1f59821314d426bb95ba00b467c2d509685890cb4d41c07bba85dede9d12a85761a45973f7cd22daebd84c8b333171b74c455d6 SHA512 2ea659ea355be0da7da6b0a94a67780743c94c4cb06dd8b2cf9fd25a58c6e924ddd1489993f92c3003fcf686082e709fc49c7f7987ee259695b15d632e154960
+EBUILD x264-encoder-9999.ebuild 2125 BLAKE2B bbf4bea8aa2b6984ea20b5a2b1f59821314d426bb95ba00b467c2d509685890cb4d41c07bba85dede9d12a85761a45973f7cd22daebd84c8b333171b74c455d6 SHA512 2ea659ea355be0da7da6b0a94a67780743c94c4cb06dd8b2cf9fd25a58c6e924ddd1489993f92c3003fcf686082e709fc49c7f7987ee259695b15d632e154960
 MISC metadata.xml 530 BLAKE2B 19afea6649cc9611b31fce82055c949d8bbb8de99df320d390591d0e3abe27126b54af9c91bc7b96a8d2fac705427ba2c8cc19bdcddfadc304419a7966c40617 SHA512 01eabe2c536c89cc9ed8cd4295ce68941a626b6675c808294a4828704f9f3c89c87d70f5898f60f326c783a77d7e1dc8213e3bfbadbbca8b71f268959232a577
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20190214.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20190214.ebuild
index 83503e08e456..a597d419a813 100644
--- a/media-video/x264-encoder/x264-encoder-0.0.20190214.ebuild
+++ b/media-video/x264-encoder/x264-encoder-0.0.20190214.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	MY_P="x264-snapshot-$(ver_cut 3)-2245"
 	SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
-	KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+	KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20190903.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20190903.ebuild
index 207434fe1c32..6ad1f8d7a6c7 100644
--- a/media-video/x264-encoder/x264-encoder-0.0.20190903.ebuild
+++ b/media-video/x264-encoder/x264-encoder-0.0.20190903.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	MY_P="x264-snapshot-$(ver_cut 3)-2245"
 	SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+	KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/media-video/x264-encoder/x264-encoder-9999.ebuild b/media-video/x264-encoder/x264-encoder-9999.ebuild
index 207434fe1c32..6ad1f8d7a6c7 100644
--- a/media-video/x264-encoder/x264-encoder-9999.ebuild
+++ b/media-video/x264-encoder/x264-encoder-9999.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	MY_P="x264-snapshot-$(ver_cut 3)-2245"
 	SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+	KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/media-video/xanim-export/Manifest b/media-video/xanim-export/Manifest
deleted file mode 100644
index c63ee01ba78d..000000000000
--- a/media-video/xanim-export/Manifest
+++ /dev/null
@@ -1,14 +0,0 @@
-AUX 2.80.1-gentoo.patch 2814 BLAKE2B 14e3a7820726227dfeb4e950018aff513fb5d88c5374cbccc4a6927a45e71baa1fe36abc18f45de4040b5e7be949876533cb81bebea2d460e525df8d3a7d376e SHA512 6ccae1b9a904af30ccf7f4ff151a8085d4b81fcccea7beb54311784a2232a6923731338153290a40d4f28827fc28a0d56e1816cfeadecd0283e280d3b38866a5
-AUX 2.80.1-implicit_funcs.patch 571 BLAKE2B e90d56e95c22e82762d976def4092e0c0cc515edeae60704f8ad0991749dae683de9e3dc7fd47771cef07a0b6c80e98a59d3c944bdf09dca498ab0a6bf160a28 SHA512 2abbc5f55deb1327d8835f97a7d94215b4667c6e874ee87510406fda0243e046c484a71ef01605ecd730e0c2c5b1a1258f17fb5c193bfacb19b8f632d44b3164
-DIST xa1.0_cyuv_linuxELFg21.o.gz 1141 BLAKE2B 1d1f9160c9f345754e1a197dc3942d7acebdaafda93fd719e5c7dfb98c925cdf391a168ecbe74021ae44d72e2d9398577a2f6f0f34ccf5fc72e5c1d20a28747c SHA512 bc60f1a657c48a5aa2dbfd8808f76d9b904c9d745e1e5bd02d9b7a3c701378f5359b2c99e3eb48ca74708477c296b461ec78ce78f1895ca6279a3e750f6bb84f
-DIST xa1.0_cyuv_linuxPPC.o.Z 1513 BLAKE2B 7c3bebf89d2ae68a3384416221b1991c9dc96b41635b7ef157f267ec48b1af7271e930111a569274da2b84ae49a3ac34c9ec9f732bdaa692e4a0aefb98742f3f SHA512 8659bb119793291e7ce087795cddcdfc6b918e1c169132a6f1ebb1bd36270d57e0dfc84503ec61f90c461496cab688aaac1cb4dbb2a2483f846bea038305733f
-DIST xa1.0_cyuv_sparcELF.o.Z 1277 BLAKE2B 3490552b0bf47362337930b61319fa0e6a8b924467106db495a639a9613482f319c03f6e7bab433b316fe7e7167ea97cadf3f6c0541c1a1c8919da7cf5a60219 SHA512 2e7cab9942d2df510df5e3ed03a970a33276de56353ad0ee0970f42efac2fb2d4e4a92c8534eaa61eeb4f560241b405c92c77283086cf13be2bdcbb1f8423848
-DIST xa2.0_cvid_linuxELFg21.o.gz 3689 BLAKE2B c5ab11f1a1db2bf529602ab88d41def40daebefc9745912a69e27a55f36f26d2e5867c81a195891c87c0a65c863b0247b0ba5b02b24d17c1177bd90c1deae1b4 SHA512 2375d44713af0fe5c6f3873cefd4e82ad2cdb5c3f2be936966a3d1747f73f15ad37945f2185da116f733eff7bdff989961e2cfc5d715ea9b5045d860aa32f0b4
-DIST xa2.0_cvid_linuxPPC.o.Z 5192 BLAKE2B 30c736b25b6f9aacac9c144979d9d291bd4c6f30c33adede6e56996e3dd011460777d460e376c94c924a7260904e5a6ac0e547a5e5b78795ccf912f695a05cdd SHA512 12ced02b89c2d8d8981104fe7fe93a95a2fb20607635194852e5ff6044c2def9df18ba1db8f639426fb9015f25e17d3b945170f4e1669a1281e0c8494363fe83
-DIST xa2.0_cvid_sparcELF.o.Z 4730 BLAKE2B dd278ca427ab126eab5bbcdd4bdc4fe3657350923710cbd525ee92e81763087165b8968b8a93ea206466b114b54dedd94601620e0579179fde1f2c958b3967b5 SHA512 6d6aef8f5c4018facafbc42085b9644f2dbd37f8f0131b9e99bcb0d03157ead6d6bfe8fbc92f11cd1ab335d3771fb323081af578a40bf39c8e3ec766a2b0891a
-DIST xa2.0_iv32_linuxPPC.o.Z 56163 BLAKE2B c6cde31a8d92e131f4e7e81d82e79f2cd19171cbcfded71e5db875111250bf1decb58da2ee3653fc4623d8b1da91604235bcc0e030bf9a3c765a3e26199c89d4 SHA512 73837266ff178568dd384207443b1236bad7c9867c03c8b45e3894b091780b7f4c2564a993ea4dbeeadc151dfcf87c3a5ecaa3efdc41fa2ab8461151c6aca72f
-DIST xa2.0_iv32_sparcELF.o.Z 48813 BLAKE2B 63f32b2f698f07fb99e8613b03912409de733a2bc558f37c56d46d34833a8c1892df4a7d2f8b52099507288e5aaf5afcc3f7209d413fb12127e44a35db8ef86f SHA512 6f42e13f5adea510458b9d08cc8acc401cdebec5668bb73922ac053707d2401d503f38a33182c80748e09378464b907224ac77a166098f9dd7877e7dbe972bd1
-DIST xa2.1_iv32_linuxELFg21.o.gz 29291 BLAKE2B a02be1b121458137f33f0e81d81a17e2877bba6db93e15fd03e175be10ba85ebf8bb44db6c4134887e39f0d21cb87792bae89d5f181b4459b582ec3c62be0f16 SHA512 df2a9c534239061da3dab413b6e4e9c127ec4b0a3fd6a8665169bc69e3577b10b7c26c21124e083ece891ac28605ec6f4e407dc2a35ffe54f16101d8cc9be179
-DIST xanim_exporting_edition.tar.gz 985946 BLAKE2B 023d0789d0c0a0d36c37c931c25d2db7f5b66eb5f6f16e2e483569f789b904d7e795663926211c676270af0214a39e7fc61c6c736796c8d0bf44e55a54da114c SHA512 49d1aa8853f1688097788e2082e209b769f12996dce0fc613453decf22cd48553e2a7a1b08162a49803de1213864f3b42b1d2ab46d3b7242cfb018e8a543a871
-EBUILD xanim-export-2.80.1-r5.ebuild 2963 BLAKE2B 2f8e0cef79cc27f3abf9c6c88fd712594f49b9f7280d88b6fbe30e3845d68f97d82eb2704ee30ae9bc750ab1a9276215b2a082927aa5d14460baeb2ec3462482 SHA512 7145ef53bdc3e601d98b54cf44885cd9eccd8733a8f92d09b718792eaf697c93bad0cc1869b49485bc0a4f540855e5587b276c24aca41499d445362ba5f01523
-MISC metadata.xml 221 BLAKE2B dbd3c4ca4e95a1ad33f79e707799593ad704252f4f1c17e08c7e42ede0e4ad153eb659fc130717823dad18cab485c7b941a7089d2d964b96d2e2f7c5f1ba8df2 SHA512 e5a88aac41d38b1bdf0becef8d0a08d1875eb803fac3f791524a7810c8068cfd2239a42717bddf9835daf6c0b2c5d5592b12669882bbc2abaab39955d7de7fb4
diff --git a/media-video/xanim-export/files/2.80.1-gentoo.patch b/media-video/xanim-export/files/2.80.1-gentoo.patch
deleted file mode 100644
index ffd0149a937e..000000000000
--- a/media-video/xanim-export/files/2.80.1-gentoo.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-Fixing as-needed issues, debundling libquicktime, respect FLAGS
-
-http://bugs.gentoo.org/show_bug.cgi?id=247919
-
---- Makefile
-+++ Makefile
-@@ -72,9 +72,6 @@
- #         a setup problem on my SunOS machine.   Under Solaris, gcc worked
- #         fine.
- #
--# CC = cc
-- CC = gcc
--#CC = egcs
- #
- ######### OPTIMIZATION FLAGS
- # -- Specifiy Any compiler Optimization flags that you wish to use. This
-@@ -116,7 +113,7 @@
- #  to link against symbols inside xanim.
- #
- ### Linux
--LD_FLAGS = -rdynamic
-+LD_FLAGS = $(LDFLAGS) -rdynamic
- ### SunOS/Solaris use:
- # LD_FLAGS =
- 
-@@ -133,7 +130,7 @@
- #
- XA_DLL_DEF = -DXA_DLL -DXA_PRINT
- #### Use this only if the above doesn't work.
--XA_DLL_DEF = -DXA_DLL
-+#XA_DLL_DEF = -DXA_DLL
- #
- #### You may need this library.
- XA_DLL_LIB = -ldl
-@@ -141,7 +138,7 @@
- # If you'd like to change the default directory that XAnim searches while
- # looking for dlls, then change the directory below. 
- #
--XA_DLL_PATH = /usr/local/xanim/mods
-+XA_DLL_PATH = /usr/lib/xanim/mods-export
- 
- 
- ##########################################################################
-@@ -208,9 +205,9 @@
- # XA_CVID_DEF = -DXA_CVID
- # XA_CYUV_DEF = -DXA_CYUV
- #
--#XA_IV32_LIB = mods/xa2.0_iv32_linuxELF.o
--#XA_CVID_LIB = mods/xa2.0_cvid_linuxELF.o
--#XA_CYUV_LIB = mods/xa1.0_cyuv_linuxELF.o
-+XA_IV32_LIB = mods/xa2.1_iv32_linuxELFg21.o
-+XA_CVID_LIB = mods/xa2.0_cvid_linuxELFg21.o
-+XA_CYUV_LIB = mods/xa1.0_cyuv_linuxELFg21.o
- #
- ###########################
- # NOTE: SGI Machines Only: 
-@@ -297,16 +294,16 @@
- # XLIBDIR = -L/usr/openwin/lib
- #
- ###-- Linux using X11R6
--INCLUDE =  -I/usr/X11R6/include -I/usr/X11R6/include/X11
--XLIBDIR = -L/usr/X11R6/lib
-+INCLUDE =  -I/usr/include -I/usr/include/X11
-+XLIBDIR = -L/usr/lib
- #
- ###-- My SunOS machine running X11R5
- # INCLUDE = -I/usr/X11R5/include -I/usr/X11R5/include/X11
- # XLIBDIR = -L/usr/X11R5/lib  -lnsl
- #
- ###-- My SunOS machine running X11R6
--# INCLUDE = -I/usr/X11R6/include -I/usr/X11R6/include/X11
--# XLIBDIR = -L/usr/X11R6/lib  -lnsl
-+# INCLUDE = -I/usr/include -I/usr/include/X11
-+# XLIBDIR = -L/usr/lib  -lnsl
- #
- ###-- Win32 
- #-- This depends on where you installed the Cygnus X11 includes and libs.
-@@ -534,8 +531,8 @@
- #
- 
- XA_DEFS = $(XA_MISC_DEFS) $(XA_MOD_DEFS) $(XA_AUDIO_DEFS) -DXA_PETUNIA -DXA_KPCD -DXA_EXPORT -DXA_EXPORT_QT
--XA_LIBS = $(XA_X11R6_LIBS) $(XA_MACH_LIBS) $(XA_MOD_LIBS) $(XA_AUDIO_LIBS) -lpthread quicktime/quicktime/libquicktime.a -ljpeg -lpng -lz
--XA_INCS = $(INCLUDE) $(XA_VIDEO_INCS) $(XA_AUDIO_INCS) -Iquicktime/quicktime
-+XA_LIBS = $(XA_X11R6_LIBS) $(XA_MACH_LIBS) $(XA_MOD_LIBS) $(XA_AUDIO_LIBS) -ljpeg -lpng $(shell pkg-config --libs libquicktime)
-+XA_INCS = $(INCLUDE) $(XA_VIDEO_INCS) $(XA_AUDIO_INCS) $(shell pkg-config --cflags libquicktime)
- CFLAGS	=  $(DEBUG) $(OPTIMIZE)
- 
- #####################################
diff --git a/media-video/xanim-export/files/2.80.1-implicit_funcs.patch b/media-video/xanim-export/files/2.80.1-implicit_funcs.patch
deleted file mode 100644
index f8fba207b4b2..000000000000
--- a/media-video/xanim-export/files/2.80.1-implicit_funcs.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- xa_g72x.c
-+++ xa_g72x.c
-@@ -30,6 +30,7 @@
-  * Common routines for G.721 and G.723 conversions.
-  */
- 
-+#include <stdlib.h>
- #include "xa_g72x.h"
- 
- static short power2[15] = {1, 2, 4, 8, 0x10, 0x20, 0x40, 0x80,
---- xa_export.c
-+++ xa_export.c
-@@ -7,7 +7,8 @@
- 
- 
- 
--
-+#include <stdlib.h>
-+#include <string.h>
- #include <stdio.h>
- #include <signal.h>
- #include <jpeglib.h>
---- xa_audio.c
-+++ xa_audio.c
-@@ -227,7 +227,7 @@
- */
- 
- /* TOP */
--
-+#include <sys/ioctl.h>
- #include "xa_audio.h"
- 
- /* POD note:  For opening audio device non-blocking. Should probably set it
diff --git a/media-video/xanim-export/metadata.xml b/media-video/xanim-export/metadata.xml
deleted file mode 100644
index 68b9a06fccf1..000000000000
--- a/media-video/xanim-export/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-  <email>media-video@gentoo.org</email>
-</maintainer>
-</pkgmetadata>
diff --git a/media-video/xanim-export/xanim-export-2.80.1-r5.ebuild b/media-video/xanim-export/xanim-export-2.80.1-r5.ebuild
deleted file mode 100644
index 66aeba4eb847..000000000000
--- a/media-video/xanim-export/xanim-export-2.80.1-r5.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit flag-o-matic eutils toolchain-funcs
-
-_XA_CYUV_sparc=xa1.0_cyuv_sparcELF.o
-_XA_CVID_sparc=xa2.0_cvid_sparcELF.o
-_XA_IV32_sparc=xa2.0_iv32_sparcELF.o
-_XA_EXT_sparc=.Z
-
-_XA_CYUV_x86=xa1.0_cyuv_linuxELFg21.o
-_XA_CVID_x86=xa2.0_cvid_linuxELFg21.o
-_XA_IV32_x86=xa2.1_iv32_linuxELFg21.o
-_XA_EXT_x86=.gz
-
-_XA_CYUV_ppc=xa1.0_cyuv_linuxPPC.o
-_XA_CVID_ppc=xa2.0_cvid_linuxPPC.o
-_XA_IV32_ppc=xa2.0_iv32_linuxPPC.o
-_XA_EXT_ppc=.Z
-
-MY_P="xanim_exporting_edition"
-
-# This might leave _XA_EXT empty and that's fine, just indicates no
-# particular support for a given arch
-eval _XA_EXT=\${_XA_EXT_${ARCH}}
-eval _XA_CVID=\${_XA_CVID_${ARCH}}
-eval _XA_CYUV=\${_XA_CYUV_${ARCH}}
-eval _XA_IV32=\${_XA_IV32_${ARCH}}
-
-# Not much we could do here, the modules are predownloaded and
-# xanim-export compiles against them
-QA_EXECSTACK_x86="usr/bin/xanim-export
-	    usr/lib/xanim/mods-export/${_XA_CVID}
-	    usr/lib/xanim/mods-export/${_XA_CYUV}
-	    usr/lib/xanim/mods-export/${_XA_IV32}
-	    usr/lib/xanim/mods-export/${_XA_CVID/g21/}
-	    usr/lib/xanim/mods-export/${_XA_CYUV/g21/}
-	    usr/lib/xanim/mods-export/xa2.0_iv32_linuxELF.o"
-
-DESCRIPTION="XAnim with Quicktime and RAW Audio export functions"
-HOMEPAGE="http://heroin.linuxave.net/toys.html"
-SRC_URI="http://heroine.linuxave.net/${MY_P}.tar.gz
-	sparc? (
-		ftp://xanim.va.pubnix.com/modules/${_XA_CYUV_sparc}${_XA_EXT_sparc}
-		ftp://xanim.va.pubnix.com/modules/${_XA_CVID_sparc}${_XA_EXT_sparc}
-		ftp://xanim.va.pubnix.com/modules/${_XA_IV32_sparc}${_XA_EXT_sparc}
-	)
-	ppc? (
-		ftp://xanim.va.pubnix.com/modules/${_XA_CYUV_ppc}${_XA_EXT_ppc}
-		ftp://xanim.va.pubnix.com/modules/${_XA_CVID_ppc}${_XA_EXT_ppc}
-		ftp://xanim.va.pubnix.com/modules/${_XA_IV32_ppc}${_XA_EXT_ppc}
-	)
-	x86? (
-		ftp://xanim.va.pubnix.com/modules/${_XA_CYUV_x86}${_XA_EXT_x86}
-		ftp://xanim.va.pubnix.com/modules/${_XA_CVID_x86}${_XA_EXT_x86}
-		ftp://xanim.va.pubnix.com/modules/${_XA_IV32_x86}${_XA_EXT_x86}
-	)"
-
-LICENSE="XAnim"
-SLOT="0"
-KEYWORDS="ppc sparc x86"
-IUSE=""
-
-RDEPEND="virtual/jpeg
-	media-libs/libpng
-	x11-libs/libXext
-	x11-libs/libXt
-	media-libs/libquicktime"
-DEPEND="${RDEPEND}
-	app-arch/ncompress
-	virtual/pkgconfig
-	x11-base/xorg-proto"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-
-	if [[ -n ${_XA_EXT} ]]; then
-		cd "${S}"/mods || die
-		unpack ${_XA_CVID}${_XA_EXT}
-		unpack ${_XA_CYUV}${_XA_EXT}
-		unpack ${_XA_IV32}${_XA_EXT}
-	fi
-
-	cd "${S}"
-	rm -f xanim
-	epatch "${FILESDIR}"/${PV}-gentoo.patch \
-		"${FILESDIR}"/${PV}-implicit_funcs.patch
-}
-
-src_compile() {
-	tc-export CC
-	make \
-		XA_IV32_LIB=mods/${_XA_CYUV} \
-		XA_CVID_LIB=mods/${_XA_CVID} \
-		XA_CYUV_LIB=mods/${_XA_IV32} \
-		OPTIMIZE="${CFLAGS}" \
-		|| die "main make failed"
-}
-
-src_install() {
-	newbin xanim xanim-export
-	insinto /usr/lib/xanim/mods-export
-	doins mods/*
-	dodoc README*
-	dodoc docs/README.* docs/*.readme docs/*.doc
-}
diff --git a/media-video/xine-ui/Manifest b/media-video/xine-ui/Manifest
index c8894c269ac0..9abc9c44c743 100644
--- a/media-video/xine-ui/Manifest
+++ b/media-video/xine-ui/Manifest
@@ -1,5 +1,5 @@
 AUX xine-ui-0.99.10-desktop.patch 996 BLAKE2B 3ea4d4f4c3a9c3fd93f211c949694abef94d9f115d41f45afce07632f96473912e393b14de8fba714f9d11bb351ff8df41d056d6c4aebd680f03f84b5498d60a SHA512 f4d40ff11f851ab2e56e902fd9c5cf51f530c76308d6f7f6675cd5b90486a1e265d29b12375c10a57a8a825b45132fef9ca471dad056c5524e817678ce79626f
 AUX xine-ui-0.99.10-libcaca.patch 977 BLAKE2B f91dd8813b549ea00db0028e6a86d04ff7a27575f749509e27e331cfa9d76ac50349e52bc74ebdf4b7ae9b357209e5da292f2eee24c0a79204202417adfa9c98 SHA512 edde19d900c19ca6530877041a0d78d9a0d7fad44d3ec62f76e5907c8907ffe338434161d1c59066ddce132b61ee6072981ef00899588bb6adebbdb461d0d2ce
 DIST xine-ui-0.99.10.tar.xz 1762968 BLAKE2B eede1a7b43f3fca37c092541145a4d13813185a740c396503bdfc93fd96d4d3bf52ad2daed4389634e2a517972c1233e3d9b1af74b718dd9def58eb2e702d967 SHA512 73cbc72375b27335e9d5f5527c35dab12d1ae40539b587630b3d8709471e4c61ce7b619062b75f587252c0647c234ffcf611f3b4e38e0447f7041b7ca5d7289e
-EBUILD xine-ui-0.99.10.ebuild 2038 BLAKE2B 8d5ca5a102dff2b51d5dd1185897d5025ba5715fcd395de1793c3fe9d8c2e05d33a751e00f7fffe89473dd6322d7acb8270f23cabc34208418c38536b16a797e SHA512 e2c630d90fa484047d1cd4e19956d81d583ad042c69d21b1ea9bd5c943b5ca337dfa6bf31d178afdb46c8b0eb2446acfe25fb33a00bba5d21bf2df2edbd5e939
+EBUILD xine-ui-0.99.10.ebuild 2028 BLAKE2B 153fb6819a95fab8058fc3d7241419ac9f5b5797042ba077088bec627f3906017da9f349c3af63da76b3a1a74505c2d5a3103ac5689411177355116cd46a12fc SHA512 ae9301c83a7d404229d6b7714f5b761e1224f173f01666ce9fd47c6be74fb765ffc091717674e484af2c15d7954acf1d559c5563eb1f730b6cc23c7da12fa64f
 MISC metadata.xml 386 BLAKE2B 8874545c1b0a0b9f60505dc08c933e3268f42b64fb1eed4e889d30af4ba3b6c74b1b1986f06425aa00ca81ab91e993a37e2c723ec4f53bbf69a2ccae8ba3ed69 SHA512 ead8587493161ece36b38168e0c628a05a97d1dfc7dddec3d7a966a783621634be28bd661a6e0d65e370dd7066ef49019265967f7394aa4026b3ae97de26a820
diff --git a/media-video/xine-ui/xine-ui-0.99.10.ebuild b/media-video/xine-ui/xine-ui-0.99.10.ebuild
index c78d44375ed9..eacab2930ba0 100644
--- a/media-video/xine-ui/xine-ui-0.99.10.ebuild
+++ b/media-video/xine-ui/xine-ui-0.99.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ~hppa ppc ppc64 x86"
 IUSE="aalib curl debug libcaca lirc nls readline vdr X xinerama"
 
 RDEPEND="
author	V3n3RiX <venerix@redcorelinux.org>	2019-10-13 22:19:36 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-10-14 23:22:23 +0100
commit	4b19be30aa626b327c885dae62c559ec0e9fb935 (patch)
tree	76e74807bc479502e13866b581b6bf86734ec634 /media-video
parent	30d6f67c98d149508509d5e86f176d558793acc0 (diff)