gentoo resync 08.09.2018

17 files changed, 589 insertions, 21 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 44040cf39b76..67225c718e80 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/bino/Manifest b/media-video/bino/Manifest
index 15e73ab0408c..cdfbabca381b 100644
--- a/media-video/bino/Manifest
+++ b/media-video/bino/Manifest
@@ -1,4 +1,6 @@
 AUX bino.html 658 BLAKE2B 9eab6fd2e14b72928ce0c73c21a61ac26981bb23df9eaf3f89132729debc32a10fa0d703c5f3340aa758d741aa1ac733df3718e5577148609f1ae1e1e5c4e47f SHA512 c4861b4536ebc08fd9a68a9b8d420b323eb16ab057b74a83fd56c5c4e0c1f7c4fc7665a0933eabf58e5eca7c38206597e7b6ddb99722054804a64821950f23be
 DIST bino-1.6.6.tar.xz 822680 BLAKE2B c863e16a4f576bffb3abf3ab03d8e4cd4ab9db0b0cc73ef2c255b18f103294a9f7e2bf382b286bb7d1d3cb9278c06965772cfc6241a7f23d2f4edc0a47059d92 SHA512 43a17f390881fcc8b7721b21ff8524b89992cd7fb0cfc467769bdddd0ad0c0d2536d161475a7fce6d4d3e758e017a38f671648dfaa4a345dc02127b7b192c8c0
+DIST bino-1.6.7.tar.xz 825068 BLAKE2B d9019a793838f33ea1315849aa994b20a1c6127995315dc03972fe6c64a742c73434c07ba06402a1e2bd5357781d18aaf3d19ab2d61788745b2aa99ad3f4c6f4 SHA512 ae8f72b200100664b9fd55963371ce64a2f39e240676494d69b422d662f2295560ba458eb04707b82f88d3c6b3fab98a1ecb40d74799300f96b8eb8be680c9b8
 EBUILD bino-1.6.6.ebuild 1507 BLAKE2B 55990360ab9bcd21f57d631a88c1ebc82cc98fcfd652d17457e55d29dfe06d92817815babe040b689e44035493f196dafdf32c0ed3ca3dffa8b741b7f9a29b1a SHA512 fca8b2961701fbcf1df421cf0f0e65a3cb78dac56d06aea66fdd1f2a961babf6808aee68839ca12f4370afce7cdd89bda101597c9495e099d332c85daf4980a4
+EBUILD bino-1.6.7.ebuild 1573 BLAKE2B 5fce8361923e30065c970f78f1cbf2c053bba6c84be45f633279373869f9dd40425e8238fc001d61421ccf4d0a3e8ced8f9845800d711fef49021555d5b700ce SHA512 2bd2c283a7983c374263e25b6f46003b3218bdbeb1bc8d26786955c10af6a41587664ccc57cce047a873c55b0412b0b5431d06059f89dcde716a674c791236a7
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/media-video/bino/bino-1.6.7.ebuild b/media-video/bino/bino-1.6.7.ebuild
new file mode 100644
index 000000000000..5a98d40353a7
--- /dev/null
+++ b/media-video/bino/bino-1.6.7.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic xdg-utils
+
+DESCRIPTION="Stereoscopic and multi-display media player"
+HOMEPAGE="https://bino3d.org/"
+SRC_URI="https://bino3d.org/releases/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc libav lirc video_cards_nvidia"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtopengl:5
+	dev-qt/qtwidgets:5
+	>=media-libs/glew-1.6.0:0=
+	>=media-libs/libass-0.9.9
+	>=media-libs/openal-1.15.1
+	virtual/libintl
+	libav? ( >=media-video/libav-0.7:0= )
+	!libav? ( >=media-video/ffmpeg-0.7:0= )
+	lirc? ( app-misc/lirc )
+	video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_configure() {
+	if use video_cards_nvidia; then
+		append-cppflags "-I/usr/include/NVCtrl"
+		append-ldflags "-L/usr/$(get_libdir)/opengl/nvidia/lib -L/usr/$(get_libdir)"
+		append-libs "Xext"
+	fi
+	if use lirc; then
+		append-cppflags "-I/usr/include/lirc"
+		append-libs "lirc_client"
+	fi
+
+	# Fix a compilation error because of a multiple definitions in glew
+	append-ldflags "-zmuldefs"
+
+	econf \
+		$(use_with video_cards_nvidia xnvctrl) \
+		$(use_with lirc) \
+		$(use_enable debug) \
+		--without-equalizer \
+		--with-qt-version=5 \
+		--htmldir=/usr/share/doc/${PF}/html
+
+}
+
+src_install() {
+	default
+	if ! use doc; then
+		rm -rf "${D}"/usr/share/doc/${PF}/html || die
+	fi
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index ef1e7855ccec..966dd1090955 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -10,12 +10,12 @@ DIST ffmpeg-3.3.6.tar.bz2 9943322 BLAKE2B 2526fdf9580045131426e554a9bf44fdc6567c
 DIST ffmpeg-3.3.8.tar.bz2 9953307 BLAKE2B edd3c2ce9730494455a05ec9d81b6c2ceb0ebf526124f95a530214cdb113ffe91aa13b80a66501aefa4f571c5b8f2eedb97f8086370d08e3b4e2a98d517eb92b SHA512 a793f6d0a06ff5244a580d9e54e1252d3ac88e2513dad4d137081103327ae4440ebe9b0d60a13f93536cb6b35097982ea76acc4056bfa31683063eef5c211ede
 DIST ffmpeg-3.4.4.tar.bz2 10181822 BLAKE2B 1b15d389576cbbe6d375e8934aac20a1d7ee5854c711aa90cc831201e5b1f42ed8b2c2b277ddde33060cda8fcd605dc6f3fa5e95ab8dff9125515de2d5bf8579 SHA512 6803ede26d403dd38835491e0b66c23856d62312a32520ad98866ebd4468d1d50723060c45101481282285711790bcf810c5012bc067e54568fc1954d361e620
 DIST ffmpeg-4.0.2.tar.bz2 10424065 BLAKE2B 0d3e072fa31bfae37722d8113f9c9cfd2071067b2a29ed5c7332ae49b388b91e8646b6bc8a816517bcebcdcc8d923d1e8b5a080dbdc63ea2a153aea8ecfb2af9 SHA512 92a3bedcd070df72b26dbe3ebf4a3faea0a02289fbefdb6a6c73d65801cf60a7e11cd832d29ab46b7749a1ffd0a31505cf75bb46bd01ea06423b454ca04e9b7b
-EBUILD ffmpeg-3.2.6.ebuild 14927 BLAKE2B 8a9e1cda51c5bcd2631b02ec80c8e725ed3974ce795eaafbc62d8b98cbad90c4b33840237f89214a51f78ba2c029a1e983d4722c2f07326239d3b521c981ca76 SHA512 69b076b981f63f9d0e427f0554bc53630dce0fa866a4202426c242ea2e58d75e2edd0198702191c9ae7b9a85e5f7acdfcf666bab954c1c5008e18b19b3474190
-EBUILD ffmpeg-3.2.7.ebuild 14932 BLAKE2B 197c75e1c5cb3ec2b8ed2ae587237ddc8491a83bc89b0f8df99cdc4a29671e0ec2f0c638f269a708fb52ae8dabe33eaf46c0d2fa028a75c4e2e07e7944b62755 SHA512 a32d04b257c547a1f05933ac8499d49fceb1a4aa9aafece17dd438acddb676e7ff7c6f910b052676023eb23116e99d24955d5442796d76175ab51581f2b9571d
-EBUILD ffmpeg-3.3.4.ebuild 15956 BLAKE2B 43f20cd2657f7f18102d67311b5cfac1698e59ca027c2d3547cf24e95aac78f94a35c7ca49e46f207e06351e8fc896527826b097db61e6f4b0d9630612e9a278 SHA512 c1b3d92116726d0a1d3f320b3061670880b23fd40c87512631e2709810eff8d305975cbf2a9964359521888f364dbcbec43a20c702b0c32a053d5280e86b3dc8
-EBUILD ffmpeg-3.3.6.ebuild 15957 BLAKE2B eb439e2f522e49991df4143b4ec69b428e4ea69c97f6aab1d1aa19628d0b311adfb484cd7d807c44b90a8e74c87255992fa8181ad8ddee51ed515424bc7e60b1 SHA512 9329ae807ed9c5e3f63f2ca9c1c658728f924dca5885375438ccc01a22ee9f21da208cfaa62329eb5df77200ba27fc0ffeb3250b6507e6731210b46e973dbd96
-EBUILD ffmpeg-3.3.8.ebuild 15963 BLAKE2B 661e209e31328a85b460a4edcc43373986dde755297908e476ab38a4aab9b5a263bba7c6b93d98ed6931fb9ad10523207457805e4ad7e7a17ccc48b27b22e195 SHA512 2fe576a2bc1f5581528ace1cf20952cae8d3ca4eb5889b37b823b13d49cb56956beae0fed0a0a3e335252be1ed811de85d4f92ea7efe799c821498fa4be7c2cb
-EBUILD ffmpeg-3.4.4.ebuild 15633 BLAKE2B 2e5391e267c92cb7a16b6ee26652f536636a49346d7145c0f2974c6daf546a5b01b745c8038156a76161476b51309f8f622f2ceacb92f0ae1c992284d8161a82 SHA512 5a037bc3c6078776338027492ad55237d3328df390528ad2c3fc3edb52817038e2ca38d297b3302fcd522ec34f69cd8f1b3ee6876997f4a95dd5c938af37c07f
-EBUILD ffmpeg-4.0.2.ebuild 16483 BLAKE2B f1c9238ca3cb364bbcd5ce20fda8db567ce19d9eda1e9e6b83fc4e0a2d73edee52062e25b2cfa9515668577c80a6216f74b90ed4b2136541b9da5c32cdfd9a1f SHA512 019f3eb86d811e02a984c968cd867e59a895959483b1784f63df1045411edbc2218190f65ae6098818e78c4d9cccf0489ed93754878959f4d5989999bb5a526c
-EBUILD ffmpeg-9999.ebuild 16532 BLAKE2B d83feedb396b1e948f5bad72ba5ea79c26391c5eea49bfa5f1845960d0cd2add0cb0de796338600a5a799a9d651f37d87efed9ee382af88e7f87cd53b881f4ac SHA512 9e75c604bdcf11db95dbde2b91d2dac972950eb48b74aa48bfae694eefeb5a7738fa0c66fcf87f99cc9357f96def56c7631eca7fc829327361a50279c625a75a
+EBUILD ffmpeg-3.2.6.ebuild 14916 BLAKE2B 36725fe6eca73d10787b95c174c4ad893226d1930462134d9d95cd6900ada87ffe60bdcac3873ae8db2d9c2b9ce3297a0eb87a02546ea1e465e0f2d34f87dc70 SHA512 2c7a9841c344eba9b165a6c0190867297212d04e139fa5e00d774cd8f90d56965daeb78c94b6453f35ace4cd6b750deaa4d694c2733be4e45724ef2aa248bcca
+EBUILD ffmpeg-3.2.7.ebuild 14921 BLAKE2B 50fcb14dd41dae4ae0365568bad04f8e7d434c29add0ec17a9a39fec7d7219e11947eba820f81b88f8e1c296233a8ed1be3a1040d19240e4b58f10f9984ec4cf SHA512 3acd7468aca58b0d24acabb404f15da37fbe06a41b3e1b287aad6977306e1e819f0acc2ea79f9dd84113756269fb6ae97c54710f42b9d5d15685c806fd32b730
+EBUILD ffmpeg-3.3.4.ebuild 15945 BLAKE2B 827322318e0de371d5b449f46f728387e55ad08e8986c5f4c2851c9ac039348c73e33fe223cf5b3b3ae1dec8f43d97d57b4c03f3b7539febd1a6125a635beb15 SHA512 9d9cda2e7fe77d76d4a4a2a70c09fd4052528b394cbf3ff1225683949a66ff0eee36f77e8e4cefbb7469640f1d025651c54c04390672273cf38201f00fdfc4a9
+EBUILD ffmpeg-3.3.6.ebuild 15946 BLAKE2B f7c4901c2d50228f6ded80b2523f4b7bb98cc80825d22c571fb0668d8a5f63c5700db615db74a5e147a72c87209161c279c86a0456b0839cfaebf493a4d12281 SHA512 4fd8693818b0a3a7ef24c5e02f6b70b2849035e7976c93f590968e48b25be4abe82188a571127179cedebd5368666d3e0cba38283ab6facc68db6a5252a6d0b7
+EBUILD ffmpeg-3.3.8.ebuild 15952 BLAKE2B cb001262d47db1677277959baf4c3f272bdfa1be98a205be42599c2d00c9de0e405c3cc916d0bb4b035af4551c95af854a4c8418772d4e2916d7f1bf16fda3a4 SHA512 f8c2924c5eddccfe626edbf62f15fac0c7e700a8a0c5b25ef95a03d2434365cbc2c40fbfd089a639dc4897212f7346579d9940fc9a51dc6b06f2b1e25cb064c1
+EBUILD ffmpeg-3.4.4.ebuild 15622 BLAKE2B 7daf35a4c6d2ae51a03c9b2c7b7866de02cb6c730387b7725d47994a64807995ebe86fde4673f15d703a09998f4412bac6f3edaaa1bccd297102a1cdd6f50119 SHA512 b5210dda0b6593d2f3317bc6919fa6b91b809e34f4e0f951cfdd0290450837bf77bc89cdc291c9047d77d02d1a13eaabbca6c9d4fd601672379d994e0a5a0664
+EBUILD ffmpeg-4.0.2.ebuild 16472 BLAKE2B fe2c7dc060bad7b5eba2037089b8d3df8e62ce4d4bbf1adeafdc11587e1af4997b16bd79be88eec956ba198a2b739cc0c7dfb881c7cc3d8e61380f416b2b27e1 SHA512 a0bb187d96f6c00b51962a500f91ba1017f6205030971cd968159d0b910314c72e0b259822c6d3fdacdc73d053557322c9551f2da1868f526faebecbbe9aa1fa
+EBUILD ffmpeg-9999.ebuild 16521 BLAKE2B 7dc905745eba08b462799f06fe60d911b1337c017af55378b8ae2c57678fe9b80d94d644a31d30deee2caab1b4e3fdd276c71feafccd0a2b6902f6479e0bebec SHA512 d41c2c98523862b479102ee45a28edb36607c2a8504c644c5dc8894e374c7985e619b91d130b062e4b47ca33bdf770b4c6b220878a6c75eebb656f377baae7e3
 MISC metadata.xml 6059 BLAKE2B c3bd41f2496c42f3f426f9a06e1ed860f8bf7853b17a1854e5e6211a68ec96bc00aeb239f230c1ff10ae65bf2a2fcb7824dccb8836ab7a3b642ac9208b5bb822 SHA512 43469f265ca75b7ad487bc8b54e47fe632e21af8ec331ff87b0423c534c27b3adcdc92ffd98ea08a24ed3f22584c37b2965977ff600166c1700866841293de85
diff --git a/media-video/ffmpeg/ffmpeg-3.2.6.ebuild b/media-video/ffmpeg/ffmpeg-3.2.6.ebuild
index 1a9f556fd7b2..d133d024790d 100644
--- a/media-video/ffmpeg/ffmpeg-3.2.6.ebuild
+++ b/media-video/ffmpeg/ffmpeg-3.2.6.ebuild
@@ -54,7 +54,7 @@ LICENSE="
 	samba? ( GPL-3 )
 "
 if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ~ppc ~ppc64 x86 ~amd64-fbsd ~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.
diff --git a/media-video/ffmpeg/ffmpeg-3.2.7.ebuild b/media-video/ffmpeg/ffmpeg-3.2.7.ebuild
index f0b768a683de..ce347f5d0d86 100644
--- a/media-video/ffmpeg/ffmpeg-3.2.7.ebuild
+++ b/media-video/ffmpeg/ffmpeg-3.2.7.ebuild
@@ -54,7 +54,7 @@ LICENSE="
 	samba? ( GPL-3 )
 "
 if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~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.
diff --git a/media-video/ffmpeg/ffmpeg-3.3.4.ebuild b/media-video/ffmpeg/ffmpeg-3.3.4.ebuild
index 7c79a4b4a023..106581975ec4 100644
--- a/media-video/ffmpeg/ffmpeg-3.3.4.ebuild
+++ b/media-video/ffmpeg/ffmpeg-3.3.4.ebuild
@@ -54,7 +54,7 @@ LICENSE="
 	samba? ( GPL-3 )
 "
 if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="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"
 fi
 
 # Options to use as use_enable in the foo[:bar] form.
diff --git a/media-video/ffmpeg/ffmpeg-3.3.6.ebuild b/media-video/ffmpeg/ffmpeg-3.3.6.ebuild
index d522d44d299e..56f21ea10ded 100644
--- a/media-video/ffmpeg/ffmpeg-3.3.6.ebuild
+++ b/media-video/ffmpeg/ffmpeg-3.3.6.ebuild
@@ -54,7 +54,7 @@ LICENSE="
 	samba? ( GPL-3 )
 "
 if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="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"
 fi
 
 # Options to use as use_enable in the foo[:bar] form.
diff --git a/media-video/ffmpeg/ffmpeg-3.3.8.ebuild b/media-video/ffmpeg/ffmpeg-3.3.8.ebuild
index 1a9599b3c6d6..8c86da808b0e 100644
--- a/media-video/ffmpeg/ffmpeg-3.3.8.ebuild
+++ b/media-video/ffmpeg/ffmpeg-3.3.8.ebuild
@@ -54,7 +54,7 @@ LICENSE="
 	samba? ( GPL-3 )
 "
 if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~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"
 fi
 
 # Options to use as use_enable in the foo[:bar] form.
diff --git a/media-video/ffmpeg/ffmpeg-3.4.4.ebuild b/media-video/ffmpeg/ffmpeg-3.4.4.ebuild
index aa8b226963bb..6a49d24e8e00 100644
--- a/media-video/ffmpeg/ffmpeg-3.4.4.ebuild
+++ b/media-video/ffmpeg/ffmpeg-3.4.4.ebuild
@@ -54,7 +54,7 @@ LICENSE="
 	samba? ( GPL-3 )
 "
 if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~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"
 fi
 
 # Options to use as use_enable in the foo[:bar] form.
diff --git a/media-video/ffmpeg/ffmpeg-4.0.2.ebuild b/media-video/ffmpeg/ffmpeg-4.0.2.ebuild
index e6c7e1a95d90..af3844683b8f 100644
--- a/media-video/ffmpeg/ffmpeg-4.0.2.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.0.2.ebuild
@@ -55,7 +55,7 @@ LICENSE="
 	samba? ( GPL-3 )
 "
 if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~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.
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index 41f904c73598..464a797c81b0 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -55,7 +55,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 ~arm-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-fbsd ~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.
diff --git a/media-video/get_flash_videos/Manifest b/media-video/get_flash_videos/Manifest
index b8b141035578..5bfb2414c0b6 100644
--- a/media-video/get_flash_videos/Manifest
+++ b/media-video/get_flash_videos/Manifest
@@ -1,5 +1,5 @@
 AUX get_flash_videos-youtubefix.patch 3543 BLAKE2B c38d9de9c4b250cfe7f74648f01ea66974f7f7e3892ee4ab883a7bacad1a621c08dcf4bdd6f408cf6ece5b3660a897751ee15abb58849c125eda264bd0717d1c SHA512 d196f90384ee745e16577b12e74694d439a1e6fc44a4b3803e6872beb77b9f21a4b6b45a4775314056499c0bd2e92c363044f8399e6b51e38f351408f370b223
 DIST get_flash_videos-1.24.tar.gz 86380 BLAKE2B 6a391a3e9c31cbedb76dc0846a601af6c0ad730e1b81bcadab1d1efca80fb87c1bbd0310da962076fd5d166e2d776a77edcfa8ee1076fddf508518bcdd7053f2 SHA512 b966adc381ddf096f9f57ddd3ce0a9a155b3850f345b0624f11b4c553036f1e8881cf7c70e4f789741a43263325e35653f005731563702b6d7a594530558fc48
-EBUILD get_flash_videos-1.24-r1.ebuild 1400 BLAKE2B eedc8d3d59b4945861e9a51e4333b277b52ed7689d2db754c2316de9aed72cd05d384b2a6628d68f03ac2c2b1ef577c275127d313c879332e0abd19d84a8c81f SHA512 cc5606b2dfd03bc7dbf56107d21c8cb92a741941d74b5664cfc7240dd68b9f49864d86034b1cbc4d5b212dbe07f7aaf5d32ef4eea955e799e0d32ba60e64c7d1
+EBUILD get_flash_videos-1.24-r1.ebuild 1389 BLAKE2B 69b36b61d3e72d2b72b425c58c33be78f8d2ca683805c46481b13c489f5cf9b7673b8e44e0a63dfa359416903cdb3e1b82ec9b067f833806b9eb8e79c430be94 SHA512 ca7b80562e51a50c1a352dac432e5d31a8ceecd03cb83b063378ffb4e1a42daeeb82c34bf687c3cacf7b45860add90007059440ee85dd394dd46f5cb8bff4c0f
 EBUILD get_flash_videos-9999.ebuild 1206 BLAKE2B 18a94e201b23cd345c95840ab4052aef8d481d67fee16d0081605794b8b3eddbf6978ee6e7fbcb4b44ed94a866ac8b279164dd2127edbe2e23ab50fcb649696b SHA512 273f691e704638784af6211459beb5f6e519798c3bbadb6998856fe9e981c346b55b1f8bfce9c18183992f66105ea804410d774ddbe50fae69deda04345bf57d
 MISC metadata.xml 253 BLAKE2B 1696360d1dba7af5b1aabccbdd970b59ee70e7f37cdef78f1e9764d5b878c0ae2af2fed0b135b1a4063dc5035c35aeb15e460a6f403d3f86e0453dc45b7a1ff6 SHA512 b88fd545b0e2a472966a72c4a20687b8c1085f10d38fe348747eb551f801b3e89d6ec61a6d576ac05cd9b50eedaa4ba1fa540a4a3452cfb87a82ac2675b64571
diff --git a/media-video/get_flash_videos/get_flash_videos-1.24-r1.ebuild b/media-video/get_flash_videos/get_flash_videos-1.24-r1.ebuild
index 81ef2d756308..833c8d61d59c 100644
--- a/media-video/get_flash_videos/get_flash_videos-1.24-r1.ebuild
+++ b/media-video/get_flash_videos/get_flash_videos-1.24-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/monsieurvideo/get-flash-videos/archive/v${PV}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="dev-perl/WWW-Mechanize
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index aaa0ac55865b..cb020df2c936 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -7,7 +7,9 @@ AUX vlc-3.0.3-fix-disable-vlm.patch 1366 BLAKE2B a0ebb75f8b171063dfc4490ed8abfca
 AUX vlc-3.0.3-fribidi-1.patch 3406 BLAKE2B d7c670a57a442a1f093f4ca72c84b633bafcf5a631f0a31af45109cf0cedc1761f93817c26b412fc1af0a7ee8a9f84b5e318d210d4e78c95a989af37d99410f4 SHA512 403524d92607e8862836fbbdd4f32c064ee67dac521fbbfdd474d4b057b76e006cca6e9541d95765451eb147320111ef1774b6399e05ce9d32db61430ab4ef2a
 AUX vlc-9999-libupnp-slot-1.8.patch 763 BLAKE2B 6bc8cf46f029db27d6d30d96e871d3bcfddee004e4e8469e1526a6a38fb5cc11a24a19888443e5f9062d7145665d594e142c12f3a9693967f195bab3b33ada38 SHA512 dd3375997a1935d3a227231785f35e300e3f992034da6a9c3019e28c68c1f005cbdd67190672264b342abc719e69005f965599f7af975e2bbd4cfccd89e3770d
 DIST vlc-3.0.3.tar.xz 24941592 BLAKE2B dd6e27b10064ecae1c6f64459d2ed172d09f8dc1414c4d96bf66e8b3104154154229bb5d638955c855b6cf471b8630196b170db94b61506c7e0dd42bec8fbb20 SHA512 1569cefa6623b2631a832679bc9a63ebeba222901e5221d254e896a68d2ee467054da8de9eda566924e80a11bb29a673a9f0c4243793845547d8027b58a238ab
+DIST vlc-3.0.4.tar.xz 24934112 BLAKE2B b8e680e178f5d34b187d5ee613a75e247b9ef500b18843a6c987479d1afc2e723111a7d3f2ac2ec8c2f34cbd36e2e7a9c0e0add6e594418fc429ec8878f0b1b0 SHA512 55c5a45a1573d559f8d62272dc446bebfb328bd48f938e634693a45032e1a3095148e634de5bc53a3a3c0e4858f7df3ed7e5dc91f3f5447e47d0ab5775171271
 EBUILD vlc-3.0.3-r1.ebuild 13450 BLAKE2B 90c0942f1018dc8bae1bc15c4417bb7555aede9e6ec7d3a87ddd048af03d816855cc3f96e1042a2f6c0d2949ca76dd8b9d80b240509413af3bb61e212ffd11ad SHA512 072af5095c8fda41fe7c29d4254a4147687b64a8593b117d37466dc8012d1c64bb7291ecf6a5ef0f806f6de0522dd90eb796568f73201cd1a327d85efd3f7218
-EBUILD vlc-3.0.9999.ebuild 13261 BLAKE2B b014ff22f70752b739d22521c06a642093d25037cc2355dcd19dda351b4d4c8cbc44ff0e8b86e2410a15ca8529048f6c61601c412e83cbfd32188ead64a3fcfd SHA512 e6f34bb0e1c9f0c31fcd46f5f2e22e6ebf5834ad1140ee2178cae581049bb99b0c1fd6d96bca4765ec38c0611d1ca4740b3dc4e550b62a85642716df3af2af01
+EBUILD vlc-3.0.4.ebuild 13226 BLAKE2B 612c0e25b550e63fe14d871d95737b7d7f7388feb22db02685419a7ff86effc30e6a8591b267650154a3807b33a4a347a09510b778303324b7199ebb5d41c96d SHA512 5a619b52dc28b8aab14519c274483e44d1b71d2f26d8740fd4e757b7759899ec2ec123f0811ca6a353a4d1009c91f0f7403097806475f041cfed8752c4d2f4f2
+EBUILD vlc-3.0.9999.ebuild 13226 BLAKE2B 612c0e25b550e63fe14d871d95737b7d7f7388feb22db02685419a7ff86effc30e6a8591b267650154a3807b33a4a347a09510b778303324b7199ebb5d41c96d SHA512 5a619b52dc28b8aab14519c274483e44d1b71d2f26d8740fd4e757b7759899ec2ec123f0811ca6a353a4d1009c91f0f7403097806475f041cfed8752c4d2f4f2
 EBUILD vlc-9999.ebuild 13209 BLAKE2B 47add64565abb5e7f4fc44729f67de84d6bfe7bc025819d3f986d9497207bdb12c4a27462d917ae18197fe31899a252eed8aaf3efd80a0350e7c2c32d21e7706 SHA512 86bfd49188514a5ccd813590f8ec8eff9bd55d751b8c2f6057d250031bbcbe3dade0a18a55bfaba07ea7b11f42208d431fe04dc7c79a500679268a9cdf4fc49b
 MISC metadata.xml 5187 BLAKE2B 43c8474284bb05268e6846e646ff382a1cb0f3ffa1a9ee65aa5beb95c157c427cef3df82abdaafa60f3ede953506987342de284a06fad2fcf83b5fc3b7054ca2 SHA512 c518a431a420a40e0f627e0cc713980b660db1acfb837bf20bf80220df1773bdea325998e5b8270dc7d4ad2af6290bdefb45c30a1ed07f62c73c99d57a5ca77a
diff --git a/media-video/vlc/vlc-3.0.4.ebuild b/media-video/vlc/vlc-3.0.4.ebuild
new file mode 100644
index 000000000000..b2e1f771823a
--- /dev/null
+++ b/media-video/vlc/vlc-3.0.4.ebuild
@@ -0,0 +1,492 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-beta/-test}"
+MY_P="${PN}-${MY_PV}"
+if [[ ${PV} = *9999 ]] ; then
+	if [[ ${PV%.9999} != ${PV} ]] ; then
+		EGIT_REPO_URI="https://git.videolan.org/git/vlc/vlc-${PV%.9999}.git"
+	else
+		EGIT_REPO_URI="https://git.videolan.org/git/vlc.git"
+	fi
+	SCM="git-r3"
+else
+	if [[ ${MY_P} = ${P} ]] ; then
+		SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz"
+	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"
+fi
+inherit autotools flag-o-matic gnome2-utils toolchain-funcs virtualx xdg-utils ${SCM}
+
+DESCRIPTION="Media player and framework with support for most multimedia files and streaming"
+HOMEPAGE="https://www.videolan.org/vlc/"
+
+LICENSE="LGPL-2.1 GPL-2"
+SLOT="0/5-9" # vlc - vlccore
+
+IUSE="a52 alsa altivec aom archive aribsub bidi bluray cddb chromaprint chromecast dbus
+	dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth
+	fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate libass
+	libav libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua
+	macosx-notifications macosx-qtkit matroska modplug mp3 mpeg mtp musepack ncurses
+	neon nfs ogg omxil opencv optimisememory opus png postproc projectm pulseaudio +qt5
+	rdp run-as-root samba schroedinger sdl-image sftp shout sid skins soxr speex srt ssl
+	svg taglib theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vorbis vpx
+	wayland wma-fixed +X x264 x265 xml zeroconf zvbi cpu_flags_x86_mmx cpu_flags_x86_sse
+"
+REQUIRED_USE="
+	chromecast? ( encode )
+	directx? ( ffmpeg )
+	fontconfig? ( truetype )
+	libcaca? ( X )
+	libtar? ( skins )
+	libtiger? ( kate )
+	postproc? ( ffmpeg )
+	skins? ( qt5 truetype X xml )
+	ssl? ( gcrypt )
+	vaapi? ( ffmpeg X )
+	vdpau? ( ffmpeg X )
+"
+RDEPEND="
+	net-dns/libidn:=
+	sys-libs/zlib:0[minizip]
+	virtual/libintl:0
+	virtual/opengl
+	a52? ( media-libs/a52dec:0 )
+	alsa? ( media-libs/alsa-lib:0 )
+	aom? ( media-libs/libaom:= )
+	archive? ( app-arch/libarchive:= )
+	aribsub? ( media-libs/aribb24 )
+	bidi? (
+		dev-libs/fribidi:0
+		media-libs/freetype:2[harfbuzz]
+		media-libs/harfbuzz
+		virtual/ttf-fonts:0
+	)
+	bluray? ( media-libs/libbluray:0= )
+	cddb? ( media-libs/libcddb:0 )
+	chromaprint? ( media-libs/chromaprint:0= )
+	chromecast? (
+		>=dev-libs/protobuf-2.5.0:=
+		>=net-libs/libmicrodns-0.0.9:=
+	)
+	dbus? ( sys-apps/dbus:0 )
+	dc1394? (
+		media-libs/libdc1394:2
+		sys-libs/libraw1394:0
+	)
+	dts? ( media-libs/libdca:0 )
+	dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:0= )
+	dvd? (
+		>=media-libs/libdvdnav-4.9:0
+		>=media-libs/libdvdread-4.9:0
+	)
+	faad? ( media-libs/faad2:0 )
+	fdk? ( media-libs/fdk-aac:0= )
+	ffmpeg? (
+		!libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] )
+		libav? ( >=media-video/libav-12.2:0=[vaapi?,vdpau?] )
+	)
+	flac? (
+		media-libs/flac:0
+		media-libs/libogg:0
+	)
+	fluidsynth? ( media-sound/fluidsynth:0 )
+	fontconfig? ( media-libs/fontconfig:1.0 )
+	gcrypt? (
+		dev-libs/libgcrypt:0=
+		dev-libs/libgpg-error:0
+	)
+	gme? ( media-libs/game-music-emu:0 )
+	gnome-keyring? ( app-crypt/libsecret )
+	gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 )
+	ieee1394? (
+		sys-libs/libavc1394:0
+		sys-libs/libraw1394:0
+	)
+	jack? ( virtual/jack )
+	jpeg? ( virtual/jpeg:0 )
+	kate? ( media-libs/libkate:0 )
+	libass? (
+		media-libs/fontconfig:1.0
+		media-libs/libass:0=
+	)
+	libcaca? ( media-libs/libcaca:0 )
+	libnotify? (
+		dev-libs/glib:2
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:3
+		x11-libs/libnotify:0
+	)
+	libsamplerate? ( media-libs/libsamplerate:0 )
+	libtar? ( dev-libs/libtar:0 )
+	libtiger? ( media-libs/libtiger:0 )
+	linsys? ( media-libs/zvbi )
+	lirc? ( app-misc/lirc:0 )
+	live? ( media-plugins/live:0 )
+	lua? ( >=dev-lang/lua-5.1:0 )
+	matroska? (
+		dev-libs/libebml:0=
+		media-libs/libmatroska:0=
+	)
+	modplug? ( media-libs/libmodplug:0 )
+	mp3? ( media-libs/libmad:0 )
+	mpeg? ( media-libs/libmpeg2:0 )
+	mtp? ( media-libs/libmtp:0= )
+	musepack? ( media-sound/musepack-tools:0 )
+	ncurses? ( sys-libs/ncurses:0=[unicode] )
+	nfs? ( >=net-fs/libnfs-0.10.0:= )
+	ogg? ( media-libs/libogg:0 )
+	opencv? ( media-libs/opencv:0= )
+	opus? ( >=media-libs/opus-1.0.3:0 )
+	png? ( media-libs/libpng:0= )
+	postproc? ( libav? ( media-libs/libpostproc:0= ) )
+	projectm? (
+		media-fonts/dejavu:0
+		media-libs/libprojectm:0
+	)
+	pulseaudio? ( media-sound/pulseaudio:0 )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+		X? (
+			dev-qt/qtx11extras:5
+			x11-libs/libX11
+		)
+	)
+	rdp? ( >=net-misc/freerdp-2.0.0_rc0:0=[client] )
+	samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] )
+	schroedinger? ( >=media-libs/schroedinger-1.0.10:0 )
+	sdl-image? ( media-libs/sdl-image:0 )
+	sftp? ( net-libs/libssh2:0 )
+	shout? ( media-libs/libshout:0 )
+	sid? ( media-libs/libsidplay:2 )
+	skins? (
+		x11-libs/libXext:0
+		x11-libs/libXinerama:0
+		x11-libs/libXpm:0
+	)
+	soxr? ( media-libs/soxr )
+	speex? (
+		>=media-libs/speex-1.2.0:0
+		media-libs/speexdsp:0
+	)
+	srt? ( net-libs/srt )
+	ssl? ( net-libs/gnutls:0 )
+	svg? (
+		gnome-base/librsvg:2
+		x11-libs/cairo:0
+	)
+	taglib? ( >=media-libs/taglib-1.9:0 )
+	theora? ( media-libs/libtheora:0 )
+	tremor? ( media-libs/tremor:0 )
+	truetype? (
+		media-libs/freetype:2
+		virtual/ttf-fonts:0
+		!fontconfig? ( media-fonts/dejavu:0 )
+	)
+	twolame? ( media-sound/twolame:0 )
+	udev? ( virtual/udev:0 )
+	upnp? ( net-libs/libupnp:= )
+	v4l? ( media-libs/libv4l:0 )
+	vaapi? ( x11-libs/libva:0=[drm,wayland?,X?] )
+	vdpau? ( x11-libs/libvdpau:0 )
+	vnc? ( net-libs/libvncserver:0 )
+	vorbis? ( media-libs/libvorbis:0 )
+	vpx? ( media-libs/libvpx:0= )
+	wayland? (
+		>=dev-libs/wayland-1.15
+		dev-libs/wayland-protocols
+	)
+	X? (
+		x11-libs/libX11
+		x11-libs/libxcb
+		x11-libs/xcb-util
+		x11-libs/xcb-util-keysyms
+	)
+	x264? ( media-libs/x264:0= )
+	x265? ( media-libs/x265:0= )
+	xml? ( dev-libs/libxml2:2 )
+	zeroconf? ( net-dns/avahi:0[dbus] )
+	zvbi? ( media-libs/zvbi )
+"
+DEPEND="${RDEPEND}
+	>=sys-devel/gettext-0.19.8:*
+	virtual/pkgconfig:*
+	amd64? ( dev-lang/yasm:* )
+	x86? ( dev-lang/yasm:* )
+	X? ( x11-base/xorg-proto )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system
+	"${FILESDIR}"/${PN}-2.2.4-libav-11.7.patch # bug #593460
+	"${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164
+)
+
+DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	has_version '>=net-libs/libupnp-1.8.0' && \
+		eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch
+
+	# Bootstrap when we are on a git checkout.
+	if [[ ${PV} = *9999 ]] ; then
+		./bootstrap
+	fi
+
+	# Make it build with libtool 1.5
+	rm m4/lt* m4/libtool.m4 || die
+
+	# We are not in a real git checkout due to the absence of a .git directory.
+	touch src/revision.txt || die
+
+	# Don't use --started-from-file when not using dbus.
+	if ! use dbus ; then
+		sed -i 's/ --started-from-file//' share/vlc.desktop.in || die
+	fi
+
+	# Disable running of vlc-cache-gen, we do that in pkg_postinst
+	sed -e "/test.*build.*host/s/\$(host)/nothanks/" \
+		-i Makefile.am -i bin/Makefile.am || die "Failed to disable vlc-cache-gen"
+
+	eautoreconf
+
+	# Disable automatic running of tests.
+	find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {} \; || die
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-aa
+		--disable-dependency-tracking
+		--disable-optimizations
+		--disable-update-check
+		--enable-fast-install
+		--enable-screen
+		--enable-vcd
+		--enable-vlc
+		$(use_enable a52)
+		$(use_enable alsa)
+		$(use_enable altivec)
+		$(use_enable aom)
+		$(use_enable archive)
+		$(use_enable aribsub)
+		$(use_enable bidi fribidi)
+		$(use_enable bidi harfbuzz)
+		$(use_enable bluray)
+		$(use_enable cddb libcddb)
+		$(use_enable chromaprint)
+		$(use_enable chromecast)
+		$(use_enable chromecast microdns)
+		$(use_enable cpu_flags_x86_mmx mmx)
+		$(use_enable cpu_flags_x86_sse sse)
+		$(use_enable dbus)
+		$(use_enable dbus kwallet)
+		$(use_enable dc1394)
+		$(use_enable debug)
+		$(use_enable directx)
+		$(use_enable directx d3d11va)
+		$(use_enable directx dxva2)
+		$(use_enable dts dca)
+		$(use_enable dvbpsi)
+		$(use_enable dvd dvdnav)
+		$(use_enable dvd dvdread)
+		$(use_enable encode sout)
+		$(use_enable encode vlm)
+		$(use_enable faad)
+		$(use_enable fdk fdkaac)
+		$(use_enable ffmpeg avcodec)
+		$(use_enable ffmpeg avformat)
+		$(use_enable ffmpeg swscale)
+		$(use_enable flac)
+		$(use_enable fluidsynth)
+		$(use_enable fontconfig)
+		$(use_enable gcrypt libgcrypt)
+		$(use_enable gme)
+		$(use_enable gnome-keyring secret)
+		$(use_enable gstreamer gst-decode)
+		$(use_enable ieee1394 dv1394)
+		$(use_enable jack)
+		$(use_enable jpeg)
+		$(use_enable kate)
+		$(use_enable libass)
+		$(use_enable libcaca caca)
+		$(use_enable libnotify notify)
+		$(use_enable libsamplerate samplerate)
+		$(use_enable libtar)
+		$(use_enable libtiger tiger)
+		$(use_enable linsys)
+		$(use_enable lirc)
+		$(use_enable live live555)
+		$(use_enable lua)
+		$(use_enable macosx-notifications osx-notifications)
+		$(use_enable macosx-qtkit)
+		$(use_enable matroska)
+		$(use_enable modplug mod)
+		$(use_enable mp3 mad)
+		$(use_enable mpeg libmpeg2)
+		$(use_enable mtp)
+		$(use_enable musepack mpc)
+		$(use_enable ncurses)
+		$(use_enable neon)
+		$(use_enable ogg)
+		$(use_enable omxil)
+		$(use_enable omxil omxil-vout)
+		$(use_enable opencv)
+		$(use_enable optimisememory optimize-memory)
+		$(use_enable opus)
+		$(use_enable png)
+		$(use_enable postproc)
+		$(use_enable projectm)
+		$(use_enable pulseaudio pulse)
+		$(use_enable qt5 qt)
+		$(use_enable rdp freerdp)
+		$(use_enable run-as-root)
+		$(use_enable samba smbclient)
+		$(use_enable schroedinger)
+		$(use_enable sdl-image)
+		$(use_enable sftp)
+		$(use_enable shout)
+		$(use_enable sid)
+		$(use_enable skins skins2)
+		$(use_enable soxr)
+		$(use_enable speex)
+		$(use_enable srt)
+		$(use_enable ssl gnutls)
+		$(use_enable svg)
+		$(use_enable svg svgdec)
+		$(use_enable taglib)
+		$(use_enable theora)
+		$(use_enable tremor)
+		$(use_enable twolame)
+		$(use_enable udev)
+		$(use_enable upnp)
+		$(use_enable v4l v4l2)
+		$(use_enable vaapi libva)
+		$(use_enable vdpau)
+		$(use_enable vnc)
+		$(use_enable vorbis)
+		$(use_enable vpx)
+		$(use_enable wayland)
+		$(use_enable wma-fixed)
+		$(use_with X x)
+		$(use_enable X xcb)
+		$(use_enable X xvideo)
+		$(use_enable x264)
+		$(use_enable x265)
+		$(use_enable xml libxml2)
+		$(use_enable zeroconf avahi)
+		$(use_enable zvbi)
+		$(use_enable !zvbi telx)
+		--disable-asdcp
+		--disable-coverage
+		--disable-cprof
+		--disable-crystalhd
+		--disable-decklink
+		--disable-gles2
+		--disable-goom
+		--disable-kai
+		--disable-kva
+		--disable-libplacebo
+		--disable-maintainer-mode
+		--disable-merge-ffmpeg
+		--disable-mfx
+		--disable-mmal
+		--disable-opensles
+		--disable-oss
+		--disable-rpi-omxil
+		--disable-shine
+		--disable-sndio
+		--disable-spatialaudio
+		--disable-vsxu
+		--disable-wasapi
+	)
+	# ^ We don't have these disabled libraries in the Portage tree yet.
+
+	# Compatibility fix for Samba 4.
+	use samba && append-cppflags "-I/usr/include/samba-4.0"
+
+	if use x86; then
+		# We need to disable -fstack-check if use >=gcc 4.8.0. bug #499996
+		append-cflags $(test-flags-CC -fno-stack-check)
+		# Bug 569774
+		replace-flags -Os -O2
+	fi
+
+	# VLC now requires C++11 after commit 4b1c9dcdda0bbff801e47505ff9dfd3f274eb0d8
+	append-cxxflags -std=c++11
+
+	# FIXME: Needs libresid-builder from libsidplay:2 which is in another directory...
+	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
+
+	xdg_environment_reset # bug 608256
+
+	if use truetype || use bidi; then
+		myeconfargs+=( --enable-freetype )
+	else
+		myeconfargs+=( --disable-freetype )
+	fi
+
+	if use truetype || use projectm; then
+		local dejavu="/usr/share/fonts/dejavu/"
+		myeconfargs+=(
+			--with-default-font=${dejavu}/DejaVuSans.ttf
+			--with-default-font-family=Sans
+			--with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf
+			--with-default-monospace-font-family=Monospace
+		)
+	fi
+
+	econf ${myeconfargs[@]}
+
+	# _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo.
+	# Other values may break the build (bug 523144), so definition should not be removed.
+	# To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the start of config.h
+	sed -i '1i#undef _FORTIFY_SOURCE' config.h || die
+}
+
+src_test() {
+	virtx emake check-TESTS
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	if [[ "$ROOT" = "/" ]] && [[ -x "/usr/$(get_libdir)/vlc/vlc-cache-gen" ]] ; then
+		einfo "Running /usr/$(get_libdir)/vlc/vlc-cache-gen on /usr/$(get_libdir)/vlc/plugins/"
+		"/usr/$(get_libdir)/vlc/vlc-cache-gen" "/usr/$(get_libdir)/vlc/plugins/"
+	else
+		ewarn "We cannot run vlc-cache-gen (most likely ROOT!=/)"
+		ewarn "Please run /usr/$(get_libdir)/vlc/vlc-cache-gen manually"
+		ewarn "If you do not do it, vlc will take a long time to load."
+	fi
+
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	if [[ -e /usr/$(get_libdir)/vlc/plugins/plugins.dat ]]; then
+		rm /usr/$(get_libdir)/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat"
+	fi
+
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild
index de11890d1bcd..b2e1f771823a 100644
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.9999.ebuild
@@ -35,7 +35,7 @@ IUSE="a52 alsa altivec aom archive aribsub bidi bluray cddb chromaprint chromeca
 	libav libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua
 	macosx-notifications macosx-qtkit matroska modplug mp3 mpeg mtp musepack ncurses
 	neon nfs ogg omxil opencv optimisememory opus png postproc projectm pulseaudio +qt5
-	rdp rtsp run-as-root samba schroedinger sdl-image sftp shout sid skins soxr speex srt ssl
+	rdp run-as-root samba schroedinger sdl-image sftp shout sid skins soxr speex srt ssl
 	svg taglib theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vorbis vpx
 	wayland wma-fixed +X x264 x265 xml zeroconf zvbi cpu_flags_x86_mmx cpu_flags_x86_sse
 "
@@ -353,7 +353,6 @@ src_configure() {
 		$(use_enable pulseaudio pulse)
 		$(use_enable qt5 qt)
 		$(use_enable rdp freerdp)
-		$(use_enable rtsp realrtsp)
 		$(use_enable run-as-root)
 		$(use_enable samba smbclient)
 		$(use_enable schroedinger)