gentoo resync : 16.02.1018

author: V3n3RiX <venerix@redcorelinux.org> 2019-02-16 12:59:29 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-02-16 12:59:29 +0000
commit: 79599515788b85b18aa655e7b7f8cc05c1bbddd8 (patch)
tree: ade7cb031f363fad64c77139dea7aa3d81908537 /media-video
parent: 6bc2e4d7c5906e46a8f275a876ead6ec41aca5bb (diff)
28 files changed, 651 insertions, 1458 deletions
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 461a28d36057..34cbf99721ff 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/bino/Manifest b/media-video/bino/Manifest
index 62d0975bc592..12b5a28011c8 100644
--- a/media-video/bino/Manifest
+++ b/media-video/bino/Manifest
@@ -1,6 +1,4 @@
 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 1533 BLAKE2B f3ef2cadffae1632078d5e63807241b37765c9c5f5071070df5753ea723c4d8c0dbbc65b8c7267984f8dd389a75b96d26c2c82f183b7abf8ba6bf0d16b95d6af SHA512 23d5e59093a77295880cf589213a41d81ae6c214655962ba87f3514c673763c7665b6ff8ecdbc4b5431d54ffb506ba3dfeaf05854b77e6cc1eb41da6383325c3
-EBUILD bino-1.6.7.ebuild 1634 BLAKE2B f0272224bebc6610ea459170b96fb4f0ff3d44d403bc49b5ccf3804e92cc1c40433b08a7b1883c4cb6684c8bcf05a144b5eb7e9436ee80261a3d608dfe05881d SHA512 cf0f03d983d0eb05c489c5bcda9326b51a387e6c473d2a77fe6a5a6bea134144410c32ac09f3749c6f35fee8e474b8f0a934de356c5b62b6f153082355af5587
+EBUILD bino-1.6.7.ebuild 1632 BLAKE2B b27ff4ad1e063849af669fe1e81137d0e764713c648bcb054be3563aee410a4c94002a58b4aa2de7a71bc5b246a7f593caa5ec0f91115a1f00fe4124a4da2a3a SHA512 3394e7ba97b01718f28473c03284d44361375b62b0a268058556d7cd1e61438101665d9a56666897454c05c9e6232735af22818fd1627db5610970576869a411
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/media-video/bino/bino-1.6.6.ebuild b/media-video/bino/bino-1.6.6.ebuild
deleted file mode 100644
index 8d2731215ba0..000000000000
--- a/media-video/bino/bino-1.6.6.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic
-
-DESCRIPTION="Stereoscopic and multi-display media player"
-HOMEPAGE="http://bino3d.org/"
-SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug doc libav lirc video_cards_nvidia"
-
-RDEPEND="
-	>=media-libs/glew-1.6.0:0=
-	>=media-libs/openal-1.15.1
-	dev-qt/qtgui:5
-	dev-qt/qtcore:5
-	dev-qt/qtopengl:5
-	>=media-libs/libass-0.9.9
-	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] )
-	virtual/libintl
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_configure() {
-	# Qt5 now requires C++11, #649282
-	append-cxxflags -std=c++11
-
-	use video_cards_nvidia && append-cppflags "-I/usr/include/NVCtrl" \
-		&& append-ldflags "-L/usr/$(get_libdir)/opengl/nvidia/lib \
-		-L/usr/$(get_libdir)" && append-libs "Xext"
-	use lirc && append-cppflags "-I/usr/include/lirc" \
-		&& append-libs "lirc_client"
-
-	# 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
-	use doc || ( rm -rf "${D}"/usr/share/doc/${PF}/html && dohtml "${FILESDIR}/${PN}.html" )
-}
diff --git a/media-video/bino/bino-1.6.7.ebuild b/media-video/bino/bino-1.6.7.ebuild
index feefaa39d38b..5f658de3ca86 100644
--- a/media-video/bino/bino-1.6.7.ebuild
+++ b/media-video/bino/bino-1.6.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://bino3d.org/releases/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug doc libav lirc video_cards_nvidia"
 
 RDEPEND="
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index ba0e66dfc43b..0b877c5813cb 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -1,6 +1,5 @@
 AUX chromium-r1.patch 1582 BLAKE2B 48547a7d53fd1f0f44b682c7e2306e79f007f8e96b36253f76775c4a3ced54ffaaf403dfaae94e81aa26c60887677b2dabdd2c5cef9fc4553e203f8259453910 SHA512 808daad5afed13a6d3926c9f9ab5cb58f80e16969533022c7ee959147908bb2c12d066d2125a6b6975ef9304d9b8d49c39aeb0a047009adabb4529e3cf54498f
 AUX chromium.patch 1420 BLAKE2B 1acf931cd2e635b0b6c2c42d649d1bc92ac59321acc451501c70076d84449fd17b3a95c24a33208994df9aac8f8959a084f0ebaedaf0c997f535008594872bd8 SHA512 1f3f6d08aac64bb8c9d8a974170064b8a3531a6d06cea6fb208439dc687addeaf0c90f7f407dd7e71f50cd524f69c110c92d5276d04fe3bcaf7fb1ff2494ec59
-AUX ffmpeg-4.1-vaapi-tools.patch 850 BLAKE2B 2303915fce02ea555118c1dbac8f84ceb803f6ad43de31af7ef2c49cedc37c15bb5f968aa83949ccd393a8710f9b59389eff1fea54940fdd45e52d67eb998d4d SHA512 836b5737e6714daa1a5c9f7f390b9cd473cd7e05ed184c96a860cf5ef145561dcbbfd214e4e55db525d46b1c0dec7ba7b81aca7d5835d9ce4fb9bee1819bdfb0
 AUX ffmpeg32-openjpeg22.patch 4777 BLAKE2B 4ea7ed6b6b31c6d0d3e99358231ce27f18423aab866ceed75c10bf2c4b514ae4d023f9b0f4dd91346773f2ef2014943a08e6093e53266fa307557da69d766c8b SHA512 0d619b0e353ee9f80dffdb94bedd31b55fb4e6a18a0e60d8ef7119e5012583c1c0531b0b200b41c32caaa71cbade4899f74c9d0ae70d15403ef0aa6f3d77e07d
 AUX openjpeg22.patch 4770 BLAKE2B b5fd034e2af9d180b2e0ee76e5227fcc948e20bacc5e463c8d7d640db3c3e52dd0f12149e5a095388c3b8db0d7c37bb4080be3141b90fd554c46aa4650585b27 SHA512 8a198910cdf43df83fdf50e372c2ec5d911637dd61768d5ac3a1984f99d1f374f594af9ff6c501b248c390a22898e4964f7d07c81eb3586fa1bebad2c9e00730
 AUX openjpeg23.patch 5105 BLAKE2B 64aab97ec21e44f7ab94c9513ebf63e60a76698889ed3cafebec3a25adb07dddffe9358c4c3b29f89b0d0b4c8bb54d9197a5b8ca2e4105c539fd6b513ad5c247 SHA512 a1e3b91add49a80633e19eb49870ecb7ef1493cf3503d121bdeb74f2fcd0320b8e5f04a3505241f7375f4a598f5da651afb92350e3b92412977f55b9193409a7
@@ -10,17 +9,13 @@ DIST ffmpeg-3.3.4.tar.bz2 9944256 BLAKE2B 72d42a16396882b30641fb057bb597f8e98ecf
 DIST ffmpeg-3.3.6.tar.bz2 9943322 BLAKE2B 2526fdf9580045131426e554a9bf44fdc6567c12213ea4d5b78aa27f14513f14e07f38b8380183686fa1a62440fe4108eaecddca96f4dec3c74c410b1f90ee03 SHA512 1305760fa981bcb43c8fcb5dd1bf7dd8d3f405a124975f062062b741d49e12386e4d3eec3de6a032fc93cd7f6086d939275a669a9997ffa400f70c20f7eb3d23
 DIST ffmpeg-3.3.8.tar.bz2 9953307 BLAKE2B edd3c2ce9730494455a05ec9d81b6c2ceb0ebf526124f95a530214cdb113ffe91aa13b80a66501aefa4f571c5b8f2eedb97f8086370d08e3b4e2a98d517eb92b SHA512 a793f6d0a06ff5244a580d9e54e1252d3ac88e2513dad4d137081103327ae4440ebe9b0d60a13f93536cb6b35097982ea76acc4056bfa31683063eef5c211ede
 DIST ffmpeg-3.4.5.tar.bz2 10183082 BLAKE2B f72157baefcd6a0ca8f389309bbe947ad21996e0f2eb3c46c6bfc90f1ebbb14bfd007d001e46ea51efef5db5f9fcee24b1a90b6862136aeebecdc95bb61b23a5 SHA512 e12707d47404a9ce02790b77d2852fc1a1573c8108e980c7355fa48ba891d1649464d4fe4d08394ecd6d871f651ac4388486b7654cb54a7aaeedaf05c55513ec
-DIST ffmpeg-4.0.2.tar.bz2 10424065 BLAKE2B 0d3e072fa31bfae37722d8113f9c9cfd2071067b2a29ed5c7332ae49b388b91e8646b6bc8a816517bcebcdcc8d923d1e8b5a080dbdc63ea2a153aea8ecfb2af9 SHA512 92a3bedcd070df72b26dbe3ebf4a3faea0a02289fbefdb6a6c73d65801cf60a7e11cd832d29ab46b7749a1ffd0a31505cf75bb46bd01ea06423b454ca04e9b7b
-DIST ffmpeg-4.0.3.tar.bz2 10425117 BLAKE2B 1517d66d5a0c931b866df5206ae660a01daf49d375f7750a7b027ce62ab7dc8131fc02b8a6320e5ff7295b9bccdafbbaf25e206c55fad420ea206c1b9638e777 SHA512 8d600adf55f2fc1574a7013700129766a4a3db83bb33ec32fe07759310f1d8804c00e74b58fd1fcbdd91efec214764e4b2fadf7b01c948dc2ccdcd1b4d56e303
-DIST ffmpeg-4.1.tar.bz2 10687291 BLAKE2B 07293af1b13c6c6cad72e368207db21bdbc4b991931166c24ff40b00c3b3c8e1242be1876af8e3f154cc840fcd90d87b762fe77faccf06936dd096478d5d074b SHA512 ccf6d07268dc47e08ca619eb182a003face2a8ee73ec1a28157330dd7de1df88939def1fc1c7e6b6ac7b59752cdad84657d589b2fafb73e14e5ef03fb6e33417
+DIST ffmpeg-4.1.1.tar.bz2 10686360 BLAKE2B 47f4716d7e184d7318eb1a99ab1cdc188009464e973162e583f7ca4ae79fa3b103f9d5329c8993b72d20667e42e5a749123709a4640f07762568300b5c3c897f SHA512 0241c44e1dffd0d890a3d30a1b2387ea167d578bb39ba0c804fb417e132d343a9e43da9247b205e18b893d8cf75d8528e9971569be67ac380b88618ef0a75ed4
 EBUILD ffmpeg-3.2.6.ebuild 14779 BLAKE2B b79fb9e74ed3eaf3d84bb14823cd305dde3f14d5cd5bcf236bfac6443daa4d6c678ad2aea23559021af33afc0488c3fa845c4da52e1c27988a3f504a10475b3f SHA512 31fbf5b2294c6ba34960298347bb7c9523070bead6215b2f17ea7f7cf0b46878d14e22f1888959a4586550630e2f3b3e81ce7feae1270aad12a5cf5e297e51c1
 EBUILD ffmpeg-3.2.7.ebuild 14784 BLAKE2B 709df5de9f58af7d57a01a4a90f5eb3eacc132a6dbed7d7f86a74c984774ad119febd904cede6b77f9ef4b05ae48538b6d18a1b50e5c7406a07dcfe567370a52 SHA512 e9b1439ffbdb2299ddffccf9a6fd43a5ee4a99e39c461a82393ae71226623c042e7a73c093a9c4d70b175aba7fd0eccd3926fb9a9d8de24afd97ac44f189ea9f
 EBUILD ffmpeg-3.3.4.ebuild 15808 BLAKE2B c64f1cd480d0bf2e8834073571f40eef01093b6384003653d3da534534f4a23fa1e5315de5e05dc808b1743dedc587439b4959ae843feee252f848b826308d9a SHA512 a29e5beb75cdacb1ce07b34910b419013c7dc8b906c5927aff6492338e02ec9d8ec0813e2d2aabce4d0aca70e027001c8aa50be23e9cfabc1f6aa860975e1b4b
 EBUILD ffmpeg-3.3.6.ebuild 15809 BLAKE2B b78701e736d5b1a8c029bbbec3c5ce40356223c35e78e160cb93a3e30732441abe1a14ab5940d302556abffde9d798de3ad160a98cd274334d467b0e9ba5de80 SHA512 b71dfc45bf7e29e8a5e70402c1dccfe2148223e60a1270a58918c3c3486472193e269e81cd8a1074a792b12b3d24d7a8733f62e3ef5002689d46ce9ce588f605
 EBUILD ffmpeg-3.3.8.ebuild 15815 BLAKE2B 2bce668121996c1bbdf472dcede998450fa4b53b36dfa25ef62b1eaa988cb6b7f8ab216ef29ebefae026ee06b9d4ad001ecb90076efb61e1c6bbaff9b09dce1f SHA512 8650a978d1283d35f37b549e937f9c04cdc860540f7e7ee1871c07b21c13c3c165322075dd00ffbbeaf629d2c79b445b0fd715ae88fba3e59b0fd217b4c3dc72
-EBUILD ffmpeg-3.4.5.ebuild 15589 BLAKE2B 1adf2d23a2f5944d3b4f147ba74704a4868782e5e3f6b285bd940f5d2d81c74764ecf74b9b2dca8583e08e85da4945b1e527ed1fe7d521b7a0d439f29e1e4ece SHA512 4f8809b7f2e7669bb0ad7d7ecac278666dd2249b09db1e91bf11b9340c189fe19c1260d5919f14c9e80ee1b712c88d33fc96d54293a1ae2d5d4d1486249691bd
-EBUILD ffmpeg-4.0.2.ebuild 16672 BLAKE2B b7445d742b2c680e6a179c959b14cada3c26c6e27d0902fb102179c5b645ca61d62c8130003cc39f8caf66ddbf2617af788697e0d9bdb22346ca8681daee35f3 SHA512 0a51a4771a4814c8e5bd3c8243e38a5197ebe1a762b9e152f2e87053ea627cc75cfeae0bf42ebb959867d38e517bd9c11a4e6a99a8a99ca0cfb6b9063465b39f
-EBUILD ffmpeg-4.0.3.ebuild 16747 BLAKE2B 5c56e917ebc473e445238a1b4e8e51055cdf0afc32cb8cd81a64d1c61e4a3c3836ec875b76de726cc70000c19011d6b3a37ef266684e387e79df3e9887647a5c SHA512 511400d8cb89bf7196dda13f5cce8e311d05b441d3b5bf4edec5c0a12c4f63cad2eba6be6653b1c199a01a0e1e3f2adb9e380b7b8a0e5840a2aeb7b224c88427
-EBUILD ffmpeg-4.1.ebuild 17027 BLAKE2B e4fb8eb8b9dbdfc6b331b70654078fdb9aa6282b68c2759d03fcc0caa8827d91d3df7091ea7e0521641ffe21f1e90c760a84d050c10de591eea421e871f56dfe SHA512 510149a5a3b21b4da99e6c6454497698d9a2122ab02a9f4a1c154fec85b28e39c3d0760d6ccb6c6ab30a6db225acfaab7ab07f1d2c79396b8063675b6d34d96e
-EBUILD ffmpeg-9999.ebuild 16970 BLAKE2B be7189ee427dfd09dbd371656111ae40fbc738d03beb0079a670b37b403e3a03f2eba852fb902d40b6d32adf46f97a04120c7e01a80da25444ff5ce1ff0f5713 SHA512 99ad47c1607966ebc23d634488b13fcec81e4848de0b59390a02379a3dd463d79de7fde42bab19cc8d784e2f49802ab91d87708acd443e90df0450c40879f87e
+EBUILD ffmpeg-3.4.5.ebuild 15587 BLAKE2B be24d2ba751b0487ce6b7c07d5263db490a6457e3b3752336582ab049b1bf665274fe9a6e161f695775be3d5186013e294c1cb219e65c07a640b4601287240e5 SHA512 689a613b63222b45f332b2352a137d3cfd60e4608eb2b639d63d0a70d54896cfa71947d2e5648e6374a4fc831f5a31ab66f9e282764b72673c30ba9316d8896a
+EBUILD ffmpeg-4.1.1.ebuild 17004 BLAKE2B 000d64bcd56700ae186d3af21e048faf40bfa5a5d3a4af5a6272628c40dbd9efd72b0444c72feb13ad8ebef5379a8f1cc0b7a174de26d04ba1d0930ca42ddb0f SHA512 4c4468ef736571f45ed89e11b636e83e3c9ac14e82e1edc6d8fab8607b579e14418bb158f1c9db62af5e3dc7ee7bb8fd053bcb3dd6fcc7bf4137c771e3af1b6d
+EBUILD ffmpeg-9999.ebuild 16985 BLAKE2B edafb90cc04198b3840923c7e20ccf900b47ec918c53bf2db6357c1e7c89d932d76e795564fe292a29fb458a6bd45edd8ffa6538c929b0c312362dfd09bb5aa2 SHA512 c4ca2f06477ae6966dc14c49a0c038bddd528bdac99b66b3162bd317cc6f8f78c00cf4c7e20f873f41ee8ad70a02bcb9bcc11a8821c48fce7fe5ac4f03ad487a
 MISC metadata.xml 5697 BLAKE2B dc170e50190c36f1f6bf5ee36de0a757fd4815bbd41b8c284a55ea29894783ffa89a419b04d57d8489cac17f436df3e9a9d88266c256ca4c4a7672e857e73557 SHA512 ca3a7e0e712fef9fef181e9888dc97c62905b8b5b54623a58ef40743c1a4b58711ed47e9b391960421d720451ac816bfc1625be3fdeeb228d2041480f4f298b0
diff --git a/media-video/ffmpeg/ffmpeg-3.4.5.ebuild b/media-video/ffmpeg/ffmpeg-3.4.5.ebuild
index ffd21f6cd093..20e79edba04c 100644
--- a/media-video/ffmpeg/ffmpeg-3.4.5.ebuild
+++ b/media-video/ffmpeg/ffmpeg-3.4.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 ~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
deleted file mode 100644
index 4cb26fd90478..000000000000
--- a/media-video/ffmpeg/ffmpeg-4.0.2.ebuild
+++ /dev/null
@@ -1,522 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# 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="http://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="http://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 )
-	)
-	encode? (
-		amrenc? (
-			gpl? ( GPL-3 )
-			!gpl? ( LGPL-3 )
-		)
-	)
-	samba? ( GPL-3 )
-"
-if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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 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
-		# decoders
-		amr:libopencore-amrwb amr:libopencore-amrnb codec2:libcodec2 fdk:libfdk-aac
-		jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm
-		mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
-		speex:libspeex svg:librsvg video_cards_nvidia:ffnvcodec
-		vorbis:libvorbis vpx:libvpx zvbi:libzvbi
-		# libavfilter options
-		appkit
-		bs2b:libbs2b chromaprint flite:libflite frei0r
-		fribidi:libfribidi fontconfig ladspa libass lv2 truetype:libfreetype
-		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 jack 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}] )
-	encode? (
-		amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
-		kvazaar? ( media-libs/kvazaar[${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[${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}] )
-	libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] )
-	libv4l? ( >=media-libs/libv4l-0.9.5[${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}] )
-	librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${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}] )
-	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[${MULTILIB_USEDEP}] )
-	vdpau? ( >=x11-libs/libvdpau-0.7[${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}
-	>=sys-devel/make-3.81
-	doc? ( sys-apps/texinfo )
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] )
-	cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) )
-	test? ( net-misc/wget sys-devel/bc )
-	v4l? ( sys-kernel/linux-headers )
-"
-
-# Code requiring FFmpeg to be built under gpl license
-GPL_REQUIRED_USE="
-	postproc? ( gpl )
-	frei0r? ( gpl )
-	cdio? ( gpl )
-	samba? ( gpl )
-	encode? (
-		x264? ( gpl )
-		x265? ( gpl )
-		xvid? ( gpl )
-		X? ( !xcb? ( gpl ) )
-	)
-"
-REQUIRED_USE="
-	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 sdl ; do
-		use ${i} || myconf+=( --disable-outdev=${i} )
-	done
-
-	# Decoders
-	use amr && myconf+=( --enable-version3 )
-	use gmp && 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
-		--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
-			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-4.0.3.ebuild b/media-video/ffmpeg/ffmpeg-4.0.3.ebuild
deleted file mode 100644
index 8e011cb6e0b5..000000000000
--- a/media-video/ffmpeg/ffmpeg-4.0.3.ebuild
+++ /dev/null
@@ -1,523 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# 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 )
-	)
-	encode? (
-		amrenc? (
-			gpl? ( GPL-3 )
-			!gpl? ( LGPL-3 )
-		)
-	)
-	samba? ( GPL-3 )
-"
-if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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 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 fdk:libfdk-aac
-		jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm
-		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 flite:libflite frei0r
-		fribidi:libfribidi fontconfig ladspa libass lv2 truetype:libfreetype
-		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}] )
-	encode? (
-		amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
-		kvazaar? ( media-libs/kvazaar[${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[${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}] )
-	libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] )
-	libv4l? ( >=media-libs/libv4l-0.9.5[${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}] )
-	librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${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[${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-8.1.24.2[${MULTILIB_USEDEP}] )
-	vdpau? ( >=x11-libs/libvdpau-0.7[${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}
-	>=sys-devel/make-3.81
-	doc? ( sys-apps/texinfo )
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] )
-	cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) )
-	test? ( net-misc/wget sys-devel/bc )
-	v4l? ( sys-kernel/linux-headers )
-"
-
-# Code requiring FFmpeg to be built under gpl license
-GPL_REQUIRED_USE="
-	postproc? ( gpl )
-	frei0r? ( gpl )
-	cdio? ( gpl )
-	samba? ( gpl )
-	encode? (
-		x264? ( gpl )
-		x265? ( gpl )
-		xvid? ( gpl )
-		X? ( !xcb? ( gpl ) )
-	)
-"
-REQUIRED_USE="
-	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 sdl ; do
-		use ${i} || myconf+=( --disable-outdev=${i} )
-	done
-
-	# Decoders
-	use amr && myconf+=( --enable-version3 )
-	use gmp && 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
-		--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
-			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-4.1.ebuild b/media-video/ffmpeg/ffmpeg-4.1.1.ebuild
index 7502a685b968..69b952d3d413 100644
--- a/media-video/ffmpeg/ffmpeg-4.1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -172,7 +172,7 @@ RDEPEND="
 	codec2? ( media-libs/codec2[${MULTILIB_USEDEP}] )
 	encode? (
 		amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
-		kvazaar? ( media-libs/kvazaar[${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}] )
@@ -208,7 +208,7 @@ RDEPEND="
 	)
 	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
 	jpeg2k? ( >=media-libs/openjpeg-2:2[${MULTILIB_USEDEP}] )
-	libaom? ( media-libs/libaom[${MULTILIB_USEDEP}] )
+	libaom? ( >=media-libs/libaom-1.0.0-r1[${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}] )
@@ -305,7 +305,6 @@ S=${WORKDIR}/${P/_/-}
 
 PATCHES=(
 	"${FILESDIR}"/chromium-r1.patch
-	"${FILESDIR}/${P}-vaapi-tools.patch"
 )
 
 MULTILIB_WRAPPED_HEADERS=(
@@ -350,7 +349,7 @@ multilib_src_configure() {
 	done
 
 	# Outdevs
-	for i in alsa oss sdl ; do
+	for i in alsa oss ; do
 		use ${i} || myconf+=( --disable-outdev=${i} )
 	done
 
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index bf29f67ebbb9..38f74dcbe5d3 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -172,7 +172,7 @@ RDEPEND="
 	codec2? ( media-libs/codec2[${MULTILIB_USEDEP}] )
 	encode? (
 		amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
-		kvazaar? ( media-libs/kvazaar[${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}] )
@@ -208,7 +208,7 @@ RDEPEND="
 	)
 	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
 	jpeg2k? ( >=media-libs/openjpeg-2:2[${MULTILIB_USEDEP}] )
-	libaom? ( media-libs/libaom[${MULTILIB_USEDEP}] )
+	libaom? ( >=media-libs/libaom-1.0.0-r1[${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}] )
@@ -349,7 +349,7 @@ multilib_src_configure() {
 	done
 
 	# Outdevs
-	for i in alsa oss sdl ; do
+	for i in alsa oss ; do
 		use ${i} || myconf+=( --disable-outdev=${i} )
 	done
 
diff --git a/media-video/ffmpeg/files/ffmpeg-4.1-vaapi-tools.patch b/media-video/ffmpeg/files/ffmpeg-4.1-vaapi-tools.patch
deleted file mode 100644
index e55917471fbf..000000000000
--- a/media-video/ffmpeg/files/ffmpeg-4.1-vaapi-tools.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 4f1e07090a9f6064078cac694f1d7148f86176c3 Mon Sep 17 00:00:00 2001
-From: Mark Thompson <sw@jkqxz.net>
-Date: Wed, 14 Nov 2018 22:56:18 +0000
-Subject: [PATCH] configure: Add missing xlib dependency for VAAPI X11 code
-
-Fixes #7538.
-
-(cherry picked from commit 2ce3a48f30fe3cec7153aa3f18a1012a366aca3a)
----
- configure | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/configure b/configure
-index e79dae896c..a70c5f9e9e 100755
---- a/configure
-+++ b/configure
-@@ -2812,6 +2812,7 @@ d3d11va_deps="dxva_h ID3D11VideoDecoder ID3D11VideoContext"
- dxva2_deps="dxva2api_h DXVA2_ConfigPictureDecode ole32 user32"
- ffnvcodec_deps_any="libdl LoadLibrary"
- nvdec_deps="ffnvcodec"
-+vaapi_x11_deps="xlib"
- videotoolbox_hwaccel_deps="videotoolbox pthreads"
- videotoolbox_hwaccel_extralibs="-framework QuartzCore"
- xvmc_deps="X11_extensions_XvMClib_h"
--- 
-2.11.0
-
diff --git a/media-video/kaffeine/Manifest b/media-video/kaffeine/Manifest
index cd03ad7e927e..103e81457144 100644
--- a/media-video/kaffeine/Manifest
+++ b/media-video/kaffeine/Manifest
@@ -2,5 +2,5 @@ AUX kaffeine-2.0.15-qt-5.11.patch 40573 BLAKE2B 2e782013fcdc06e3ba19170da714e756
 DIST kaffeine-2.0.15.tar.xz 5988584 BLAKE2B a9361b321a0af13013596c2d06e53053a889a0697fcf5c644195d6bd7e43fb3c108d2c03cf3250c6cb8b14383e10735e883e5ebb17be1b5f9fe5ca81f012dd28 SHA512 d2b21df76710eb79395a0d4e762ecdde4610945de3d1105002a44a56725aea3f10003f4ebefe4cd67f58f561e79aa3f5561639ad5c3afba488146dcb9360f53d
 DIST kaffeine-2.0.16-2.tar.xz 5995824 BLAKE2B a472be60d10be077fd7ab3828e6958b0c3a2a8fef66318d33c0972e08cf3f5f19ce9d99cf42c21fed0aba67e296b639624e78d0e5567a9dc291a342c0ccf9249 SHA512 1b39bf59127c777b34f3076a237c53973af827191d2a279d40e7f14891dcd3d7bba1444b0b456d0e614807bf6bff494568aed958632dfba54515de8de5b06f21
 EBUILD kaffeine-2.0.15.ebuild 1385 BLAKE2B 1b1824ace75e0878cab888e50b3bec8fec65e21f4666aa07914435f9299429189871780237806ece7f6a6a27caa259e68d37d3808a3e7dc66698ef5f8e9ab400 SHA512 c20977403fa0b1d57b4231283b301ccc692aab5b6214e2bc47185254d3438887932fe7499da289f712ba5cda29edcfbbeb9c25adc0b8485374d2c011da83173b
-EBUILD kaffeine-2.0.16.2.ebuild 1361 BLAKE2B 60076e2c9dc7227af90726cd333c8da923c1dab5047ab89f6759ebb5556e51ee5d1c453d8da927545ebf51899789b9d1689c78c92a9d735582e3d2e59f974624 SHA512 399d3aec9188c4390e764ecddbe70245312a92f5f9951b82effad9ced0602c2dbcb3bb534033cfd67b0ba9891fd5fceffe6037e492dc2672ae69509a7b7bc460
+EBUILD kaffeine-2.0.16.2.ebuild 1360 BLAKE2B c363621821c9fac01745816fc9e9b1f50a0f6d15755e401951f300c624407d7fba25e09bc1c04d0b76db461e330d88e792497161038b39174795ded0872de177 SHA512 9062f32123227286c9f4de816df053d2b3c950505efac2f18fee6fc6cd913f963d33f369a86ced612d8d0f2262570dd4b762652d6452365a3684a06e4e326041
 MISC metadata.xml 369 BLAKE2B 2ba0f7bed05089f04c57eaeae806308ef4fe560461e5f44b32e05ffcb2cd2ee064d81a07589e1d9ad067acb56f9dd43d0acda9a87cdaf42187aae8cb67306a54 SHA512 f58a7acad05449a5cfc6ee4bc9d52677b06b9d994bb109a279d04e71ff7368cd697b286767b463e4f5d42a1194b268789fb373b17a19e581927c25d64d46a083
diff --git a/media-video/kaffeine/kaffeine-2.0.16.2.ebuild b/media-video/kaffeine/kaffeine-2.0.16.2.ebuild
index 73613ff6c313..6cc5ae4f8576 100644
--- a/media-video/kaffeine/kaffeine-2.0.16.2.ebuild
+++ b/media-video/kaffeine/kaffeine-2.0.16.2.ebuild
@@ -7,7 +7,7 @@ KDE_HANDBOOK="optional"
 inherit kde5
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 x86"
 	SRC_URI="mirror://kde/stable/${PN}/${PN}-$(ver_rs 3 -).tar.xz"
 fi
 
diff --git a/media-video/rtmpdump/Manifest b/media-video/rtmpdump/Manifest
index e6d6ffd3144d..64c366b6f035 100644
--- a/media-video/rtmpdump/Manifest
+++ b/media-video/rtmpdump/Manifest
@@ -1,9 +1,11 @@
+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 2237 BLAKE2B caf1dc99de57985a504a8eff880b62659dd65b2b7cf6a0e75861f5f46827216027b50d62372536333bc5704de60977eacd554080c0f5ae771efb569716b65f2a SHA512 9db37815cc030cfc37d1427d38e79bae3b2df4b63b53fec11a313ec05edc19223454a4a304a3430d8d39bb0251517b71955e2e2c632dcd3d0f2dc657effbef72
 EBUILD rtmpdump-2.4_p20161210-r2.ebuild 2644 BLAKE2B ad5b3f1a6314495537bcd2c124f25d5d2d6262d0bc5d69681d60724f6a1737b8c062f5a496ff0e15594b835d58f3d7042406fe1231234db239dff6494ba8d000 SHA512 5c2a1964d1289795ac8f97a7ae9e7080d8427f0e886e7dc4971550c396c7f63ed345f856649688ccbeda85b812deb623293c592df6b177accad06cab17c595b7
+EBUILD rtmpdump-2.4_p20161210-r3.ebuild 2661 BLAKE2B e570236063ab7e553fe4227018fa20cdf86bf17443b3c04367dc7a9e08fdbda5d88a37ec6d8b051559fdd30f7acc57cfd2d2132f5151734052d7bb0945568655 SHA512 5d212b89570bfb89f5f96050888ab510e879105c25344e005348c90962cb0eacccfb41e013ee645f734cfb1285e2f687e9292765bab87c67e51597c30753f84a
 EBUILD rtmpdump-2.4_p20161210.ebuild 2216 BLAKE2B 9e1eb7f275056f75971e791f7272bb46e440935dbf4bb5d48f0c5162d4bafb625001fd7a7005da4b96e83647c29facb0d206278a32bbaadb5ac5f7f7c4f96a93 SHA512 c54aa1492092479ed60fa69af7f81058b13e7af9c65c419c60c658e5c689576a483b35c21fca6c72a13095b133e5c8ab60643eec6ce2bc9d5f4a56749e8e3e04
-EBUILD rtmpdump-9999.ebuild 2644 BLAKE2B ad5b3f1a6314495537bcd2c124f25d5d2d6262d0bc5d69681d60724f6a1737b8c062f5a496ff0e15594b835d58f3d7042406fe1231234db239dff6494ba8d000 SHA512 5c2a1964d1289795ac8f97a7ae9e7080d8427f0e886e7dc4971550c396c7f63ed345f856649688ccbeda85b812deb623293c592df6b177accad06cab17c595b7
+EBUILD rtmpdump-9999.ebuild 2661 BLAKE2B e570236063ab7e553fe4227018fa20cdf86bf17443b3c04367dc7a9e08fdbda5d88a37ec6d8b051559fdd30f7acc57cfd2d2132f5151734052d7bb0945568655 SHA512 5d212b89570bfb89f5f96050888ab510e879105c25344e005348c90962cb0eacccfb41e013ee645f734cfb1285e2f687e9292765bab87c67e51597c30753f84a
 MISC metadata.xml 444 BLAKE2B 97f64854abc028cf6eb902008992a94e434db6de7258b8065666b31af4b92118044e4c3427792782cf7ac7a2eb8bb0fbaee047027ca2f648178cc07f46c6ac88 SHA512 38b9987993f4a3ed479c50aeda81436a8cbec7ad48c1e509fc351a58557c3922fe0834a680cda9996a5c5ca1b0b48377772e3eef775281eb40962f95ac095e7c
diff --git a/media-video/rtmpdump/files/rtmpdump-openssl-1.1-v2.patch b/media-video/rtmpdump/files/rtmpdump-openssl-1.1-v2.patch
new file mode 100644
index 000000000000..146243bd1111
--- /dev/null
+++ b/media-video/rtmpdump/files/rtmpdump-openssl-1.1-v2.patch
@@ -0,0 +1,248 @@
+https://raw.githubusercontent.com/xbmc/inputstream.rtmp/master/depends/common/librtmp/0003-openssl-1.1.patch
+See also https://github.com/xbmc/inputstream.rtmp/pull/46
+--- a/librtmp/dh.h
++++ b/librtmp/dh.h
+@@ -253,20 +253,42 @@
+   if (!dh)
+     goto failed;
+ 
++#if !defined(USE_OPENSSL) || !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L
+   MP_new(dh->g);
+ 
+   if (!dh->g)
+     goto failed;
++#else
++  BIGNUM *g = NULL;
++  MP_new(g);
++  if (!g)
++    goto failed;
++#endif
+ 
++#if !defined(USE_OPENSSL) || !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L
+   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
+   MP_set_w(dh->g, 2);	/* base 2 */
++#else
++  MP_set_w(g, 2);   /* base 2 */
++  DH_set0_pqg(dh, p, NULL, g);
++#endif
+ 
++#if !defined(USE_OPENSSL) || !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L
+   dh->length = nKeyBits;
++#else
++  DH_set_length(dh, nKeyBits);
++#endif
+   return dh;
+ 
+ failed:
+@@ -293,12 +315,24 @@
+       MP_gethex(q1, Q1024, res);
+       assert(res);
+ 
++#if !defined(USE_OPENSSL) || !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L
+       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
+ 	  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 +348,29 @@
+ DHGetPublicKey(MDH *dh, uint8_t *pubkey, size_t nPubkeyLen)
+ {
+   int len;
++#if !defined(USE_OPENSSL) || !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L
+   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
+   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
+   MP_setbin(dh->pub_key, pubkey + (nPubkeyLen - len), len);
++#else
++  MP_setbin(pub_key, pubkey + (nPubkeyLen - len), len);
++#endif
+   return 1;
+ }
+ 
+@@ -364,7 +412,13 @@
+   MP_gethex(q1, Q1024, len);
+   assert(len);
+ 
++#if !defined(USE_OPENSSL) || !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L
+   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)	ctx = HMAC_CTX_new(); 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)	ctx = HMAC_CTX_new(); HMAC_CTX_reset(ctx); HMAC_Init_ex(ctx, 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-r3.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild
new file mode 100644
index 000000000000..42acf5134f90
--- /dev/null
+++ b/media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+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(+)] )
+		!gnutls? (
+			!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+			libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+		)
+		>=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-v2.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-9999.ebuild b/media-video/rtmpdump/rtmpdump-9999.ebuild
index 8a45c29d0d07..42acf5134f90 100644
--- a/media-video/rtmpdump/rtmpdump-9999.ebuild
+++ b/media-video/rtmpdump/rtmpdump-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 inherit multilib toolchain-funcs multilib-minimal flag-o-matic
 
@@ -16,8 +16,8 @@ IUSE="gnutls ssl libressl"
 DEPEND="ssl? (
 		gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP},nettle(+)] )
 		!gnutls? (
-			!libressl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
-			libressl? ( dev-libs/libressl )
+			!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+			libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
 		)
 		>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
 	)"
@@ -65,7 +65,7 @@ src_prepare() {
 		-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"
+	use ssl && use !gnutls && use !libressl && eapply "${FILESDIR}/${PN}-openssl-1.1-v2.patch"
 	default
 	multilib_copy_sources
 }
diff --git a/media-video/ushare/Manifest b/media-video/ushare/Manifest
index 1df1bd36f105..fb508d531df5 100644
--- a/media-video/ushare/Manifest
+++ b/media-video/ushare/Manifest
@@ -11,6 +11,5 @@ AUX ushare.init.d 2050 BLAKE2B d0a71f1c5db918887b549847471455ae1d4e78b5a08db937e
 AUX ushare.init.d.ng 954 BLAKE2B f62f987fcaaa217e0b3a75d225351be4a8d486f4ff025c7fea5dd34a69e58a993fbafb43ab3b7feab474cdd736c6978d8cd149f919b758dc972e33508918376a SHA512 c70e6f47f29a9d555821c3bc2000ebd6533778208b46a7bbe823454e4b26408ab9b6e31ce7449dc84ae32fcc6754c3ca2a5afa0a0393a59888bda294f0e78c98
 AUX ushare.service 189 BLAKE2B 29037c78c7fb3b263e166e06dd82a5785f499db24cfbe8227e1f4695d200fff89f5a1275255f06938d134b3871b1551fee1262eaf0580ec75fb3b87ad1888adf SHA512 141b1f592220d3785af821f085f9c03811a2370e1a8c6bb5d2739b4ae74421323df437d2a6672d943ab8371b6d5ccfb395a4943a10eb5c1e8bc0ff16a3177b15
 DIST ushare-1.1a.tar.bz2 65864 BLAKE2B 2a6d6922ee46c96d89a6f9a3238a1cded04194c4e7b80432e87a1c2344dcbf36484959d4601a7da8dc599531334b15a0547fc571af72630f25562e07a4116ea9 SHA512 2144ef96e58960d4d11bcefcd857c7eb7adab8df4ff815772d3b9d668f9f9daa1312707eb00a770c461b2a316e094e6697a004723ea02e86ee872fbe60b4797c
-EBUILD ushare-1.1a-r6.ebuild 1682 BLAKE2B 8fa412013436189a6d17f50f96a019dcb0ddf6f4b3fbabcfdfc95b08f6ed0cbf12172e78f877fe23348dc85045f4538a1d1190faaddd4fee6bc300154c2a42c0 SHA512 c93023e3d535c06f9f70a5d72a26773ef14d22bb035d805f22636e4d0e0be5a2dde96f269fdc4e5de7fde2ecb73270f6f1f45ef4ed89f0176922ab53d9c95da3
-EBUILD ushare-1.1a-r8.ebuild 1684 BLAKE2B 49216170d85b233309129214ff6323adb6bf1a719be9f89d97cc89484d3640c306fac74f9365ae3bf50678bd88e3fbc9c9dbe95e7e91828af590f624b3749796 SHA512 d14fee0c9502a503d411c5435c1b9a758e0054e5e5c1abf0fec23b0981f3412a13a7e0e614a60ca966e0d2314bb3b5e7bdcbfa18a89f2cd6e33bd1622e508876
+EBUILD ushare-1.1a-r8.ebuild 1679 BLAKE2B 8b58b33b5ec2472727ecb25484b88ccdae67336ab31f6721a06ce2761a1eb6694e4a868eefb0be51c2ee20c0425bbe26c130580302cfa7fd57f35855ca2bf3bb SHA512 e4982b70647f50665eee3318dffc7a333d7b9b989a469164bba4ac408b277af259411d79ca0e4612cd9b06b133852ff08051a2558de596fdd1dd99ba3bbb7e9a
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-video/ushare/ushare-1.1a-r6.ebuild b/media-video/ushare/ushare-1.1a-r6.ebuild
deleted file mode 100644
index b49031658f23..000000000000
--- a/media-video/ushare/ushare-1.1a-r6.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils multilib readme.gentoo toolchain-funcs user systemd
-
-DESCRIPTION="uShare is a UPnP (TM) A/V & DLNA Media Server"
-HOMEPAGE="http://ushare.geexbox.org/"
-SRC_URI="http://ushare.geexbox.org/releases/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nls"
-
-RDEPEND=">=net-libs/libupnp-1.6.14:0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	EPATCH_EXCLUDE="06_all_ushare_disable_sysconf.patch"
-	EPATCH_SOURCE="${FILESDIR}" EPATCH_SUFFIX="patch" \
-		EPATCH_OPTS="-p1" epatch
-
-	DOC_CONTENTS="Please edit /etc/ushare.conf to set the shared directories
-		and other important settings. Check system log if ushare is
-		not booting."
-}
-
-src_configure() {
-	local myconf
-	myconf="--prefix=/usr --sysconfdir=/etc --disable-strip --disable-dlna"
-	# nls can only be disabled, on by default.
-	use nls || myconf="${myconf} --disable-nls"
-
-	# I can't use econf
-	# --host is not implemented in ./configure file
-	tc-export CC CXX
-
-	./configure ${myconf} || die "./configure failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	doman src/ushare.1
-	newconfd "${FILESDIR}"/${PN}.conf.d ${PN}
-	newinitd "${FILESDIR}"/${PN}.init.d.ng ${PN}
-	dodoc NEWS README TODO THANKS AUTHORS
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	enewuser ushare
-	readme.gentoo_print_elog
-	elog
-	elog "The config file has been moved to /etc/ushare.conf"
-	elog "Please migrate your settings from /etc/conf.d/ushare"
-	elog "to /etc/ushare.conf in order to use the ushare init script"
-	elog "and systemd unit service."
-	elog
-}
diff --git a/media-video/ushare/ushare-1.1a-r8.ebuild b/media-video/ushare/ushare-1.1a-r8.ebuild
index 9cc622f9ac63..05358c1f6f9f 100644
--- a/media-video/ushare/ushare-1.1a-r8.ebuild
+++ b/media-video/ushare/ushare-1.1a-r8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ SRC_URI="http://ushare.geexbox.org/releases/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="nls"
 
 RDEPEND=">=net-libs/libupnp-1.6.14:0"
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 11d24b529dce..16ff1c6e9edb 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -5,8 +5,8 @@ AUX vlc-2.2.8-libupnp-slot-1.8.patch 725 BLAKE2B eb217ef57f0709fa1d0bdf164461058
 AUX vlc-9999-libupnp-slot-1.8.patch 763 BLAKE2B 6bc8cf46f029db27d6d30d96e871d3bcfddee004e4e8469e1526a6a38fb5cc11a24a19888443e5f9062d7145665d594e142c12f3a9693967f195bab3b33ada38 SHA512 dd3375997a1935d3a227231785f35e300e3f992034da6a9c3019e28c68c1f005cbdd67190672264b342abc719e69005f965599f7af975e2bbd4cfccd89e3770d
 DIST vlc-3.0.4.tar.xz 24934112 BLAKE2B b8e680e178f5d34b187d5ee613a75e247b9ef500b18843a6c987479d1afc2e723111a7d3f2ac2ec8c2f34cbd36e2e7a9c0e0add6e594418fc429ec8878f0b1b0 SHA512 55c5a45a1573d559f8d62272dc446bebfb328bd48f938e634693a45032e1a3095148e634de5bc53a3a3c0e4858f7df3ed7e5dc91f3f5447e47d0ab5775171271
 DIST vlc-3.0.6.tar.xz 25699704 BLAKE2B 91c43fa3ceb6f55a3808c64a661ca453f0872f01eecc801921eb1b9f9cc462478b1fcd6f7cc36f33b7e1085320710b27a42a3b7b49dd74338fe63a3a46f36b0f SHA512 7c72e98f30ce5c5a94d74e097fa9960442f89240079b042a729f8a33dd7fedee2538c86c99738ccef2eb27f29055f0221d4c70316e3312c5ebba9565eaa15c52
-EBUILD vlc-3.0.4.ebuild 13148 BLAKE2B 5b7ca68d78ffa3807705b3468d3b410b28808123b2dc56604fde529d0d18aba0876064022105f0a0cd24b5bee4d466b169c648c24544c20b61f0031a5ecc3062 SHA512 c546a5398ad1ae41157763b39bc36946c05e8944c39c3df02c550043e205f9aa405a64fad19f55b936a0caca2a0e163f3e629406fe6b0ba92cd907854806cc5d
-EBUILD vlc-3.0.6.ebuild 13341 BLAKE2B 73eb7be9ac9845e6b830bc5f36f2df10e75f9f27f4576cf22e47d278cdf6ad220a89e5cafee8eab8b14be60c8cab48e00c34f1aa43b5d90cdac559b17116dc29 SHA512 256446b09df7cd825326ab1514257c50c48148240ff469b3bfc447e7c77996d5387265b7e57c02d1adba2b7709d3f6dbea871882e55812d200a4763acf28c3a4
-EBUILD vlc-3.0.9999.ebuild 13488 BLAKE2B f1e84c3e0769bc0a36065811157681f4cde626f1d3092af4d090fdf4acdf6c55949695b3f0b34344c5dcc2a199cdf115543053c6bae5982920c692e380f72b16 SHA512 f85c281514e2b6174b63de0ec6aa376f326af150eadfdf67bcb1eb324679824acdee93cca9d12c1b444428e83d372567dea69c7f9691d328756908b2a2fd8fec
-EBUILD vlc-9999.ebuild 13471 BLAKE2B 8d838fb84ad28a8d49f5e7fad00e528d064b12b1de0b468f7988f10ce2a5f402af7b81566a63f3149c4118b7bd3732c33deaf0838c98840d020c3f93fd05f19a SHA512 97a293758e636c5d3efdc41e92b54605f93df4d34264e9cb46049da72591c967a07779956d0fd97c1eeb65eb781811ae8792ea21e2381e45e322817afaa1c743
-MISC metadata.xml 5061 BLAKE2B 88d5027fa2a50db6a100bcb7cb6755ba56e056fc9cbb7d031e8c65d506082914421aa7b88809f07b34969388216f6fa402d045b48cb2919e6d61696eef76a1c7 SHA512 0ad4e4ba9d609ee349adf68d959629a7979757652fb841ce12e23a712d2f08a555211c5a5ac1f2f9b12acca307de19fbc04b9bccef402018a371892ffd9b7967
+EBUILD vlc-3.0.4.ebuild 13153 BLAKE2B 19afd631bdbc5ec35e6a3684fd767e3530c598da299a08826c4502956b093d38b49dba2b9667095a108044501967708e0e28939750a940e31f9b6878e3f208da SHA512 990a9bad72762e3f692901f3729df394473392d0929f23f5914838863fa096cfbf8ca48e9c2e57a9df708f11c5954be6ed1d799a5d729ca2333d19ea135515c2
+EBUILD vlc-3.0.6.ebuild 13173 BLAKE2B db1a24367368929bdfa11370c20c13d95057bcf66a390851c6b9fcf677ffd310d50e4ee6d099e1ff5bffc61e435b927cadc2d50e86265539f65ad09d994740d9 SHA512 75ccaaaa0527b3b71b25ecaa9828bc70b26cf6773b31d667fd1e12d0ea2776bad8aa5ae22a09bed7937fe9416affb3eb134c79a898f96aef5ea277752e0406e6
+EBUILD vlc-3.0.9999.ebuild 13050 BLAKE2B 6c00b6deadcbeac7e7aae647b22b73912be3e79761a5381aa4836ac9e2c2c92a1de3c123a4d4c124e62cfbc84e1f01bf4841a9b7d7899410770bd37baa8ac532 SHA512 49c5ea4784352a8e7837fc7cd9f9d9b3c9f307c768b291ce2139ccf60189a6459f6157ec37fc053ecd10d58c932603be7ffd36c8d9775d06ce99402b37caaa61
+EBUILD vlc-9999.ebuild 13033 BLAKE2B 098e5b91118a1963a68c76d52b3f045aa0de68ad37e1ec4904bb7d29ad2b4f8b7c660cd6a682fbfacf0d326073dead9b12709bb1610ee50ef577b777b74c0c84 SHA512 19f93977e935fa588e8f3faad57f212ab255cc0b9c5ebefc730e619694c2cbe35ad9fbbfb2383593ed02614285691b628c0ac22cd13472ed38eac3937a09a1f8
+MISC metadata.xml 4965 BLAKE2B 70ae1489394175d3a5b7972089da76553c01b28206eb2c97e748941c685f49a8ef5b98b204f81a748a7da463bb69c4051a1dd9017072b30412b6ae392b2e7fd5 SHA512 9777cc29b4bba9fe74a03f2b4157fb5bf782624a80a7971e6b738a035cd72fbac908eb414ad72c7e1924fa2acff757615ca4b1d66b5ce84c6f0d028a91dfc11e
diff --git a/media-video/vlc/metadata.xml b/media-video/vlc/metadata.xml
index 8a7aef8ab363..2c87fbf15408 100644
--- a/media-video/vlc/metadata.xml
+++ b/media-video/vlc/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Gentoo Video project</name>
 	</maintainer>
 	<use>
-		<flag name="10bit">Enable H264 10-bit encoding support with <pkg>media-libs/x264</pkg></flag>
 		<flag name="aom">Enable experimental support for AV1 codec</flag>
 		<flag name="archive">Enable support for libarchive stream extractor</flag>
 		<flag name="aribsub">Enable support for decoding ARIB STD-B24 subtitles</flag>
diff --git a/media-video/vlc/vlc-3.0.4.ebuild b/media-video/vlc/vlc-3.0.4.ebuild
index 44f97c55f69a..16570f46d8fd 100644
--- a/media-video/vlc/vlc-3.0.4.ebuild
+++ b/media-video/vlc/vlc-3.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -199,7 +199,7 @@ RDEPEND="
 	vdpau? ( x11-libs/libvdpau:0 )
 	vnc? ( net-libs/libvncserver:0 )
 	vorbis? ( media-libs/libvorbis:0 )
-	vpx? ( media-libs/libvpx:0= )
+	vpx? ( <media-libs/libvpx-1.8:0= )
 	wayland? (
 		>=dev-libs/wayland-1.15
 		dev-libs/wayland-protocols
diff --git a/media-video/vlc/vlc-3.0.6.ebuild b/media-video/vlc/vlc-3.0.6.ebuild
index 93c5c8b00a07..9743750ed2e1 100644
--- a/media-video/vlc/vlc-3.0.6.ebuild
+++ b/media-video/vlc/vlc-3.0.6.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 MY_PV="${PV/_/-}"
 MY_PV="${MY_PV/-beta/-test}"
@@ -12,7 +12,7 @@ if [[ ${PV} = *9999 ]] ; then
 	else
 		EGIT_REPO_URI="https://git.videolan.org/git/vlc.git"
 	fi
-	SCM="git-r3"
+	inherit git-r3
 else
 	if [[ ${MY_P} = ${P} ]] ; then
 		SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz"
@@ -21,7 +21,7 @@ else
 	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}
+inherit autotools flag-o-matic toolchain-funcs virtualx xdg
 
 DESCRIPTION="Media player and framework with support for most multimedia files and streaming"
 HOMEPAGE="https://www.videolan.org/vlc/"
@@ -52,6 +52,12 @@ REQUIRED_USE="
 	vaapi? ( ffmpeg X )
 	vdpau? ( ffmpeg X )
 "
+BDEPEND="
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	amd64? ( dev-lang/yasm )
+	x86? ( dev-lang/yasm )
+"
 RDEPEND="
 	net-dns/libidn:=
 	sys-libs/zlib:0[minizip]
@@ -201,7 +207,7 @@ RDEPEND="
 	vdpau? ( x11-libs/libvdpau:0 )
 	vnc? ( net-libs/libvncserver:0 )
 	vorbis? ( media-libs/libvorbis:0 )
-	vpx? ( media-libs/libvpx:0= )
+	vpx? ( <media-libs/libvpx-1.8:0= )
 	wayland? (
 		>=dev-libs/wayland-1.15
 		dev-libs/wayland-protocols
@@ -219,10 +225,6 @@ RDEPEND="
 	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 )
 "
 
@@ -237,7 +239,7 @@ DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
-	default
+	xdg_src_prepare # bug 608256
 
 	has_version '>=net-libs/libupnp-1.8.0' && \
 		eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch
@@ -436,8 +438,6 @@ src_configure() {
 	# 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
@@ -454,7 +454,7 @@ src_configure() {
 		)
 	fi
 
-	econf ${myeconfargs[@]}
+	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.
@@ -472,7 +472,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	if [[ "$ROOT" = "/" ]] && [[ -x "/usr/$(get_libdir)/vlc/vlc-cache-gen" ]] ; then
+	if [[ -z ${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
@@ -481,9 +481,7 @@ pkg_postinst() {
 		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
+	xdg_pkg_postinst
 }
 
 pkg_postrm() {
@@ -491,7 +489,5 @@ pkg_postrm() {
 		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
+	xdg_pkg_postrm
 }
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild
index ebea92479e02..7ef85d86eb35 100644
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 MY_PV="${PV/_/-}"
 MY_PV="${MY_PV/-beta/-test}"
@@ -12,7 +12,7 @@ if [[ ${PV} = *9999 ]] ; then
 	else
 		EGIT_REPO_URI="https://git.videolan.org/git/vlc.git"
 	fi
-	SCM="git-r3"
+	inherit git-r3
 else
 	if [[ ${MY_P} = ${P} ]] ; then
 		SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz"
@@ -21,7 +21,7 @@ else
 	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}
+inherit autotools flag-o-matic toolchain-funcs virtualx xdg
 
 DESCRIPTION="Media player and framework with support for most multimedia files and streaming"
 HOMEPAGE="https://www.videolan.org/vlc/"
@@ -29,7 +29,7 @@ HOMEPAGE="https://www.videolan.org/vlc/"
 LICENSE="LGPL-2.1 GPL-2"
 SLOT="0/5-9" # vlc - vlccore
 
-IUSE="10bit a52 alsa altivec aom archive aribsub bidi bluray cddb chromaprint chromecast
+IUSE="a52 alsa altivec aom archive aribsub bidi bluray cddb chromaprint chromecast
 	dav1d 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
@@ -52,107 +52,113 @@ REQUIRED_USE="
 	vaapi? ( ffmpeg X )
 	vdpau? ( ffmpeg X )
 "
+BDEPEND="
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	amd64? ( dev-lang/yasm )
+	x86? ( dev-lang/yasm )
+"
 RDEPEND="
 	net-dns/libidn:=
-	sys-libs/zlib:0[minizip]
-	virtual/libintl:0
+	sys-libs/zlib[minizip]
+	virtual/libintl
 	virtual/opengl
-	a52? ( media-libs/a52dec:0 )
-	alsa? ( media-libs/alsa-lib:0 )
+	a52? ( media-libs/a52dec )
+	alsa? ( media-libs/alsa-lib )
 	aom? ( media-libs/libaom:= )
 	archive? ( app-arch/libarchive:= )
 	aribsub? ( media-libs/aribb24 )
 	bidi? (
-		dev-libs/fribidi:0
+		dev-libs/fribidi
 		media-libs/freetype:2[harfbuzz]
 		media-libs/harfbuzz
-		virtual/ttf-fonts:0
+		virtual/ttf-fonts
 	)
-	bluray? ( media-libs/libbluray:0= )
-	cddb? ( media-libs/libcddb:0 )
-	chromaprint? ( media-libs/chromaprint:0= )
+	bluray? ( media-libs/libbluray:= )
+	cddb? ( media-libs/libcddb )
+	chromaprint? ( media-libs/chromaprint:= )
 	chromecast? (
 		>=dev-libs/protobuf-2.5.0:=
 		>=net-libs/libmicrodns-0.0.9:=
 	)
 	dav1d? ( media-libs/dav1d )
-	dbus? ( sys-apps/dbus:0 )
+	dbus? ( sys-apps/dbus )
 	dc1394? (
 		media-libs/libdc1394:2
-		sys-libs/libraw1394:0
+		sys-libs/libraw1394
 	)
-	dts? ( media-libs/libdca:0 )
-	dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:0= )
+	dts? ( media-libs/libdca )
+	dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= )
 	dvd? (
-		>=media-libs/libdvdnav-4.9:0
-		>=media-libs/libdvdread-4.9:0
+		>=media-libs/libdvdnav-4.9
+		>=media-libs/libdvdread-4.9
 	)
-	faad? ( media-libs/faad2:0 )
-	fdk? ( media-libs/fdk-aac:0= )
+	faad? ( media-libs/faad2 )
+	fdk? ( media-libs/fdk-aac:= )
 	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
+		media-libs/flac
+		media-libs/libogg
 	)
-	fluidsynth? ( media-sound/fluidsynth:0 )
+	fluidsynth? ( media-sound/fluidsynth:= )
 	fontconfig? ( media-libs/fontconfig:1.0 )
 	gcrypt? (
 		dev-libs/libgcrypt:0=
-		dev-libs/libgpg-error:0
+		dev-libs/libgpg-error
 	)
-	gme? ( media-libs/game-music-emu:0 )
+	gme? ( media-libs/game-music-emu )
 	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
+		sys-libs/libavc1394
+		sys-libs/libraw1394
 	)
 	jack? ( virtual/jack )
 	jpeg? ( virtual/jpeg:0 )
-	kate? ( media-libs/libkate:0 )
+	kate? ( media-libs/libkate )
 	libass? (
 		media-libs/fontconfig:1.0
-		media-libs/libass:0=
+		media-libs/libass:=
 	)
-	libcaca? ( media-libs/libcaca:0 )
+	libcaca? ( media-libs/libcaca )
 	libnotify? (
 		dev-libs/glib:2
 		x11-libs/gdk-pixbuf:2
 		x11-libs/gtk+:3
-		x11-libs/libnotify:0
+		x11-libs/libnotify
 	)
-	libsamplerate? ( media-libs/libsamplerate:0 )
-	libtar? ( dev-libs/libtar:0 )
-	libtiger? ( media-libs/libtiger:0 )
+	libsamplerate? ( media-libs/libsamplerate )
+	libtar? ( dev-libs/libtar )
+	libtiger? ( media-libs/libtiger )
 	linsys? ( media-libs/zvbi )
-	lirc? ( app-misc/lirc:0 )
-	live? ( media-plugins/live:0 )
-	lua? ( >=dev-lang/lua-5.1:0 )
+	lirc? ( app-misc/lirc )
+	live? ( media-plugins/live:= )
+	lua? ( >=dev-lang/lua-5.1:0= )
 	mad? ( media-libs/libmad )
 	matroska? (
-		dev-libs/libebml:0=
-		media-libs/libmatroska:0=
+		dev-libs/libebml:=
+		media-libs/libmatroska:=
 	)
 	modplug? ( media-libs/libmodplug )
 	mp3? ( media-sound/mpg123 )
 	mpeg? ( media-libs/libmpeg2 )
-	mtp? ( media-libs/libmtp:0= )
-	musepack? ( media-sound/musepack-tools:0 )
+	mtp? ( media-libs/libmtp:= )
+	musepack? ( media-sound/musepack-tools )
 	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 )
+	ogg? ( media-libs/libogg )
+	opencv? ( media-libs/opencv:= )
+	opus? ( >=media-libs/opus-1.0.3 )
 	png? ( media-libs/libpng:0= )
-	postproc? ( libav? ( media-libs/libpostproc:0= ) )
+	postproc? ( libav? ( media-libs/libpostproc ) )
 	projectm? (
-		media-fonts/dejavu:0
-		media-libs/libprojectm:0
+		media-fonts/dejavu
+		media-libs/libprojectm
 	)
-	pulseaudio? ( media-sound/pulseaudio:0 )
+	pulseaudio? ( media-sound/pulseaudio )
 	qt5? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
@@ -163,45 +169,45 @@ RDEPEND="
 			x11-libs/libX11
 		)
 	)
-	rdp? ( >=net-misc/freerdp-2.0.0_rc0:0=[client] )
+	rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client] )
 	samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] )
-	sdl-image? ( media-libs/sdl-image:0 )
-	sftp? ( net-libs/libssh2:0 )
-	shout? ( media-libs/libshout:0 )
+	sdl-image? ( media-libs/sdl-image )
+	sftp? ( net-libs/libssh2 )
+	shout? ( media-libs/libshout )
 	sid? ( media-libs/libsidplay:2 )
 	skins? (
-		x11-libs/libXext:0
-		x11-libs/libXinerama:0
-		x11-libs/libXpm:0
+		x11-libs/libXext
+		x11-libs/libXinerama
+		x11-libs/libXpm
 	)
 	soxr? ( media-libs/soxr )
 	speex? (
-		>=media-libs/speex-1.2.0:0
-		media-libs/speexdsp:0
+		>=media-libs/speex-1.2.0
+		media-libs/speexdsp
 	)
 	srt? ( net-libs/srt )
-	ssl? ( net-libs/gnutls:0 )
+	ssl? ( net-libs/gnutls:= )
 	svg? (
 		gnome-base/librsvg:2
-		x11-libs/cairo:0
+		x11-libs/cairo
 	)
-	taglib? ( >=media-libs/taglib-1.9:0 )
-	theora? ( media-libs/libtheora:0 )
-	tremor? ( media-libs/tremor:0 )
+	taglib? ( >=media-libs/taglib-1.9 )
+	theora? ( media-libs/libtheora )
+	tremor? ( media-libs/tremor )
 	truetype? (
 		media-libs/freetype:2
-		virtual/ttf-fonts:0
-		!fontconfig? ( media-fonts/dejavu:0 )
+		virtual/ttf-fonts
+		!fontconfig? ( media-fonts/dejavu )
 	)
-	twolame? ( media-sound/twolame:0 )
-	udev? ( virtual/udev:0 )
+	twolame? ( media-sound/twolame )
+	udev? ( virtual/udev )
 	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= )
+	v4l? ( media-libs/libv4l:= )
+	vaapi? ( x11-libs/libva:=[drm,wayland?,X?] )
+	vdpau? ( x11-libs/libvdpau )
+	vnc? ( net-libs/libvncserver )
+	vorbis? ( media-libs/libvorbis )
+	vpx? ( media-libs/libvpx:= )
 	wayland? (
 		>=dev-libs/wayland-1.15
 		dev-libs/wayland-protocols
@@ -212,20 +218,13 @@ RDEPEND="
 		x11-libs/xcb-util
 		x11-libs/xcb-util-keysyms
 	)
-	x264? (
-		!10bit? ( >=media-libs/x264-0.0.20160712:0= )
-		10bit? ( >=media-libs/x264-9999:0= )
-	)
-	x265? ( media-libs/x265:0= )
+	x264? ( >=media-libs/x264-0.0.20190214:= )
+	x265? ( media-libs/x265:= )
 	xml? ( dev-libs/libxml2:2 )
-	zeroconf? ( net-dns/avahi:0[dbus] )
+	zeroconf? ( net-dns/avahi[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 )
 "
 
@@ -240,7 +239,7 @@ DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
-	default
+	xdg_src_prepare # bug 608256
 
 	has_version '>=net-libs/libupnp-1.8.0' && \
 		eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch
@@ -390,6 +389,7 @@ src_configure() {
 		$(use_enable X xcb)
 		$(use_enable X xvideo)
 		$(use_enable x264)
+		$(use_enable x264 x26410b)
 		$(use_enable x265)
 		$(use_enable xml libxml2)
 		$(use_enable zeroconf avahi)
@@ -422,12 +422,6 @@ src_configure() {
 	)
 	# ^ We don't have these disabled libraries in the Portage tree yet.
 
-	if use x264; then
-		myeconfargs+=( $(use_enable 10bit x26410b) )
-	else
-		myeconfargs+=( --disable-x26410b )
-	fi
-
 	# Compatibility fix for Samba 4.
 	use samba && append-cppflags "-I/usr/include/samba-4.0"
 
@@ -444,8 +438,6 @@ src_configure() {
 	# 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
@@ -462,7 +454,7 @@ src_configure() {
 		)
 	fi
 
-	econf ${myeconfargs[@]}
+	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.
@@ -480,7 +472,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	if [[ "$ROOT" = "/" ]] && [[ -x "/usr/$(get_libdir)/vlc/vlc-cache-gen" ]] ; then
+	if [[ -z ${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
@@ -489,9 +481,7 @@ pkg_postinst() {
 		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
+	xdg_pkg_postinst
 }
 
 pkg_postrm() {
@@ -499,7 +489,5 @@ pkg_postrm() {
 		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
+	xdg_pkg_postrm
 }
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index 7246c78556aa..87447fb82505 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 MY_PV="${PV/_/-}"
 MY_PV="${MY_PV/-beta/-test}"
@@ -12,7 +12,7 @@ if [[ ${PV} = *9999 ]] ; then
 	else
 		EGIT_REPO_URI="https://git.videolan.org/git/vlc.git"
 	fi
-	SCM="git-r3"
+	inherit git-r3
 else
 	if [[ ${MY_P} = ${P} ]] ; then
 		SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz"
@@ -21,7 +21,7 @@ else
 	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}
+inherit autotools flag-o-matic toolchain-funcs virtualx xdg
 
 DESCRIPTION="Media player and framework with support for most multimedia files and streaming"
 HOMEPAGE="https://www.videolan.org/vlc/"
@@ -29,7 +29,7 @@ HOMEPAGE="https://www.videolan.org/vlc/"
 LICENSE="LGPL-2.1 GPL-2"
 SLOT="0/5-9" # vlc - vlccore
 
-IUSE="10bit a52 alsa altivec aom archive aribsub bidi bluray cddb chromaprint chromecast
+IUSE="a52 alsa altivec aom archive aribsub bidi bluray cddb chromaprint chromecast
 	dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac
 	fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate kms
 	libass libav libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua
@@ -52,108 +52,114 @@ REQUIRED_USE="
 	vaapi? ( ffmpeg X )
 	vdpau? ( ffmpeg X )
 "
+BDEPEND="
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	amd64? ( dev-lang/yasm )
+	x86? ( dev-lang/yasm )
+"
 RDEPEND="
 	net-dns/libidn:=
-	sys-libs/zlib:0[minizip]
-	virtual/libintl:0
+	sys-libs/zlib[minizip]
+	virtual/libintl
 	virtual/opengl
-	a52? ( media-libs/a52dec:0 )
-	alsa? ( media-libs/alsa-lib:0 )
+	a52? ( media-libs/a52dec )
+	alsa? ( media-libs/alsa-lib )
 	aom? ( media-libs/libaom:= )
 	archive? ( app-arch/libarchive:= )
 	aribsub? ( media-libs/aribb24 )
 	bidi? (
-		dev-libs/fribidi:0
+		dev-libs/fribidi
 		media-libs/freetype:2[harfbuzz]
 		media-libs/harfbuzz
-		virtual/ttf-fonts:0
+		virtual/ttf-fonts
 	)
-	bluray? ( media-libs/libbluray:0= )
-	cddb? ( media-libs/libcddb:0 )
-	chromaprint? ( media-libs/chromaprint:0= )
+	bluray? ( media-libs/libbluray:= )
+	cddb? ( media-libs/libcddb )
+	chromaprint? ( media-libs/chromaprint:= )
 	chromecast? (
 		>=dev-libs/protobuf-2.5.0:=
 		>=net-libs/libmicrodns-0.0.9:=
 	)
 	dav1d? ( media-libs/dav1d )
-	dbus? ( sys-apps/dbus:0 )
+	dbus? ( sys-apps/dbus )
 	dc1394? (
 		media-libs/libdc1394:2
-		sys-libs/libraw1394:0
+		sys-libs/libraw1394
 	)
-	dts? ( media-libs/libdca:0 )
-	dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:0= )
+	dts? ( media-libs/libdca )
+	dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= )
 	dvd? (
-		>=media-libs/libdvdnav-4.9:0
-		>=media-libs/libdvdread-4.9:0
+		>=media-libs/libdvdnav-4.9
+		>=media-libs/libdvdread-4.9
 	)
-	faad? ( media-libs/faad2:0 )
-	fdk? ( media-libs/fdk-aac:0= )
+	faad? ( media-libs/faad2 )
+	fdk? ( media-libs/fdk-aac:= )
 	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
+		media-libs/flac
+		media-libs/libogg
 	)
-	fluidsynth? ( media-sound/fluidsynth:0 )
+	fluidsynth? ( media-sound/fluidsynth:= )
 	fontconfig? ( media-libs/fontconfig:1.0 )
 	gcrypt? (
 		dev-libs/libgcrypt:0=
-		dev-libs/libgpg-error:0
+		dev-libs/libgpg-error
 	)
-	gme? ( media-libs/game-music-emu:0 )
+	gme? ( media-libs/game-music-emu )
 	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
+		sys-libs/libavc1394
+		sys-libs/libraw1394
 	)
 	jack? ( virtual/jack )
 	jpeg? ( virtual/jpeg:0 )
-	kate? ( media-libs/libkate:0 )
+	kate? ( media-libs/libkate )
 	kms? ( x11-libs/libdrm )
 	libass? (
 		media-libs/fontconfig:1.0
-		media-libs/libass:0=
+		media-libs/libass:=
 	)
-	libcaca? ( media-libs/libcaca:0 )
+	libcaca? ( media-libs/libcaca )
 	libnotify? (
 		dev-libs/glib:2
 		x11-libs/gdk-pixbuf:2
 		x11-libs/gtk+:3
-		x11-libs/libnotify:0
+		x11-libs/libnotify
 	)
-	libsamplerate? ( media-libs/libsamplerate:0 )
-	libtar? ( dev-libs/libtar:0 )
-	libtiger? ( media-libs/libtiger:0 )
+	libsamplerate? ( media-libs/libsamplerate )
+	libtar? ( dev-libs/libtar )
+	libtiger? ( media-libs/libtiger )
 	linsys? ( media-libs/zvbi )
-	lirc? ( app-misc/lirc:0 )
-	live? ( media-plugins/live:0 )
-	lua? ( >=dev-lang/lua-5.1:0 )
+	lirc? ( app-misc/lirc )
+	live? ( media-plugins/live:= )
+	lua? ( >=dev-lang/lua-5.1:0= )
 	mad? ( media-libs/libmad )
 	matroska? (
-		dev-libs/libebml:0=
-		media-libs/libmatroska:0=
+		dev-libs/libebml:=
+		media-libs/libmatroska:=
 	)
 	modplug? ( media-libs/libmodplug )
 	mp3? ( media-sound/mpg123 )
 	mpeg? ( media-libs/libmpeg2 )
-	mtp? ( media-libs/libmtp:0= )
-	musepack? ( media-sound/musepack-tools:0 )
+	mtp? ( media-libs/libmtp:= )
+	musepack? ( media-sound/musepack-tools )
 	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 )
+	ogg? ( media-libs/libogg )
+	opencv? ( media-libs/opencv:= )
+	opus? ( >=media-libs/opus-1.0.3 )
 	png? ( media-libs/libpng:0= )
-	postproc? ( libav? ( media-libs/libpostproc:0= ) )
+	postproc? ( libav? ( media-libs/libpostproc ) )
 	projectm? (
-		media-fonts/dejavu:0
-		media-libs/libprojectm:0
+		media-fonts/dejavu
+		media-libs/libprojectm
 	)
-	pulseaudio? ( media-sound/pulseaudio:0 )
+	pulseaudio? ( media-sound/pulseaudio )
 	qt5? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
@@ -164,45 +170,45 @@ RDEPEND="
 			x11-libs/libX11
 		)
 	)
-	rdp? ( >=net-misc/freerdp-2.0.0_rc0:0=[client] )
+	rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client] )
 	samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] )
-	sdl-image? ( media-libs/sdl-image:0 )
-	sftp? ( net-libs/libssh2:0 )
-	shout? ( media-libs/libshout:0 )
+	sdl-image? ( media-libs/sdl-image )
+	sftp? ( net-libs/libssh2 )
+	shout? ( media-libs/libshout )
 	sid? ( media-libs/libsidplay:2 )
 	skins? (
-		x11-libs/libXext:0
-		x11-libs/libXinerama:0
-		x11-libs/libXpm:0
+		x11-libs/libXext
+		x11-libs/libXinerama
+		x11-libs/libXpm
 	)
 	soxr? ( media-libs/soxr )
 	speex? (
-		>=media-libs/speex-1.2.0:0
-		media-libs/speexdsp:0
+		>=media-libs/speex-1.2.0
+		media-libs/speexdsp
 	)
 	srt? ( net-libs/srt )
-	ssl? ( net-libs/gnutls:0 )
+	ssl? ( net-libs/gnutls:= )
 	svg? (
 		gnome-base/librsvg:2
-		x11-libs/cairo:0
+		x11-libs/cairo
 	)
-	taglib? ( >=media-libs/taglib-1.9:0 )
-	theora? ( media-libs/libtheora:0 )
-	tremor? ( media-libs/tremor:0 )
+	taglib? ( >=media-libs/taglib-1.9 )
+	theora? ( media-libs/libtheora )
+	tremor? ( media-libs/tremor )
 	truetype? (
 		media-libs/freetype:2
-		virtual/ttf-fonts:0
-		!fontconfig? ( media-fonts/dejavu:0 )
+		virtual/ttf-fonts
+		!fontconfig? ( media-fonts/dejavu )
 	)
-	twolame? ( media-sound/twolame:0 )
-	udev? ( virtual/udev:0 )
+	twolame? ( media-sound/twolame )
+	udev? ( virtual/udev )
 	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= )
+	v4l? ( media-libs/libv4l:= )
+	vaapi? ( x11-libs/libva:=[drm,wayland?,X?] )
+	vdpau? ( x11-libs/libvdpau )
+	vnc? ( net-libs/libvncserver )
+	vorbis? ( media-libs/libvorbis )
+	vpx? ( media-libs/libvpx:= )
 	wayland? (
 		>=dev-libs/wayland-1.15
 		>=dev-libs/wayland-protocols-1.12
@@ -215,20 +221,13 @@ RDEPEND="
 		x11-libs/xcb-util
 		x11-libs/xcb-util-keysyms
 	)
-	x264? (
-		!10bit? ( >=media-libs/x264-0.0.20160712:0= )
-		10bit? ( >=media-libs/x264-9999:0= )
-	)
-	x265? ( media-libs/x265:0= )
+	x264? ( >=media-libs/x264-0.0.20190214:= )
+	x265? ( media-libs/x265:= )
 	xml? ( dev-libs/libxml2:2 )
-	zeroconf? ( net-dns/avahi:0[dbus] )
+	zeroconf? ( net-dns/avahi[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 )
 "
 
@@ -243,7 +242,7 @@ DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
-	default
+	xdg_src_prepare # bug 608256
 
 	has_version '>=net-libs/libupnp-1.8.0' && \
 		eapply "${FILESDIR}"/${P}-libupnp-slot-1.8.patch
@@ -391,6 +390,7 @@ src_configure() {
 		$(use_with X x)
 		$(use_enable X xcb)
 		$(use_enable x264)
+		$(use_enable x264 x26410b)
 		$(use_enable x265)
 		$(use_enable xml libxml2)
 		$(use_enable zeroconf avahi)
@@ -423,12 +423,6 @@ src_configure() {
 	)
 	# ^ We don't have these disabled libraries in the Portage tree yet.
 
-	if use x264; then
-		myeconfargs+=( $(use_enable 10bit x26410b) )
-	else
-		myeconfargs+=( --disable-x26410b )
-	fi
-
 	# Compatibility fix for Samba 4.
 	use samba && append-cppflags "-I/usr/include/samba-4.0"
 
@@ -445,8 +439,6 @@ src_configure() {
 	# 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
@@ -463,7 +455,7 @@ src_configure() {
 		)
 	fi
 
-	econf ${myeconfargs[@]}
+	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.
@@ -481,7 +473,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	if [[ "$ROOT" = "/" ]] && [[ -x "/usr/libexec/vlc/vlc-cache-gen" ]] ; then
+	if [[ -z ${ROOT} ]] && [[ -x "/usr/libexec/vlc/vlc-cache-gen" ]] ; then
 		einfo "Running /usr/libexec/vlc/vlc-cache-gen on /usr/libexec/vlc/plugins/"
 		"/usr/libexec/vlc/vlc-cache-gen" "/usr/libexec/vlc/plugins/"
 	else
@@ -490,9 +482,7 @@ pkg_postinst() {
 		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
+	xdg_pkg_postinst
 }
 
 pkg_postrm() {
@@ -500,7 +490,5 @@ pkg_postrm() {
 		rm /usr/libexec/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat"
 	fi
 
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
+	xdg_pkg_postrm
 }
diff --git a/media-video/x264-encoder/Manifest b/media-video/x264-encoder/Manifest
index 228a02a4ebe1..b615ea7ceced 100644
--- a/media-video/x264-encoder/Manifest
+++ b/media-video/x264-encoder/Manifest
@@ -1,5 +1,7 @@
 AUX gpac.patch 507 BLAKE2B 7872c56ed87e96a247b63b92c6a23c094346fea9ee5127a6086a45efd064b4c00ddf2cd2191772bcbd54365c56ef550f3f5e0ecf2c2ab35a2e0c9dc3197ec9b9 SHA512 9da7a1ffe637e39863e5828547923424b9c072d194d3ddadcc9a6c31f7803f5456b3ba88d470458a84d37b0c07374983adc124f3710ae7122a81a13ea9b4ae0e
 DIST x264-snapshot-20170701-2245.tar.bz2 750527 BLAKE2B ccf276da31383ab4b4a1ac48866bc49b4b2bc5913361c933fa2359de4d6e90cca091dd4aba781f3735a5b28d6ce006aa9d4e149ba48745b80cb971c2952ca867 SHA512 28fc9850c36ac385fced6dec9a0f68a5605a68805e1ef7b8cedcd78917eaa1ad6e47e57fe5a74fee0a6e482f3a33de6011f675e6c77b5db94c8fe01d5c5f3e9f
+DIST x264-snapshot-20190214-2245.tar.bz2 770462 BLAKE2B d90a3bafb88febe12526b225617616a62c32fa3d3eacf410267e1fbd7e0fafaadca7c146172c08fc525bce8791d81c7d87dc27b06d61a6a44bf2ad92f6c1def6 SHA512 c8b1b46d4e6c0ef653dab35083a454c635ebf72c6a5255ce30bbb5d9d6bb8e23fca0e6cc197ea99f3c702fbfec096587df6fa82dec338d8bd45e35fa89c43039
 EBUILD x264-encoder-0.0.20170701.ebuild 2153 BLAKE2B f02d87b81eed8ff4778bc31e36b7309aeb0bc82819c77dfcb4a02268fd3758cdb18eddd4338099074c9eccd11bf6cf925fc6e524202bf8977677f6eb8b5cb958 SHA512 214e20a611544cebf87b7a4b5d01688f4926d6d9d2685b37e6a0ddea9d419e2a0ed5cec51c0e3c3b9cfbab39e8ec5252b451f9bb3d26facc19c7f03cdf7c144c
+EBUILD x264-encoder-0.0.20190214.ebuild 2129 BLAKE2B b3f83ed8c5bb1b9df53d59329d9b8b711e045374183acfb23113ae4817371c1390d894caa940b838c2e1e2c2b2ea2319a8ebf4c5ec8f65661113e647d2888e30 SHA512 75425b85162966277993d7df3edcb0a4f159c519596c51e236fc6941d790ebc712781494f5f8eb65c41c7e38ce57f162ac81dd25b3b48812157d3b6472639581
 EBUILD x264-encoder-9999.ebuild 2129 BLAKE2B b3f83ed8c5bb1b9df53d59329d9b8b711e045374183acfb23113ae4817371c1390d894caa940b838c2e1e2c2b2ea2319a8ebf4c5ec8f65661113e647d2888e30 SHA512 75425b85162966277993d7df3edcb0a4f159c519596c51e236fc6941d790ebc712781494f5f8eb65c41c7e38ce57f162ac81dd25b3b48812157d3b6472639581
 MISC metadata.xml 587 BLAKE2B c768f1adecd9c56480a7ae1c3c4907230d5e1ffd7884abdf569de00f64bc34faf6314e473928540d6c9fa747bfaf2573717b2fdca0996a80f69ea7330c3c6226 SHA512 383e8540e2bde9190f48030956ff00eebb86f02781dfeffee9507198e00ee9d7f6cba6e05e5b9c7e8c692b0d5935531c162d7b5efe61a7f1ce2a88458ae2ec04
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20190214.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20190214.ebuild
new file mode 100644
index 000000000000..ae007c71112c
--- /dev/null
+++ b/media-video/x264-encoder/x264-encoder-0.0.20190214.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="A free commandline encoder for X264/AVC streams"
+HOMEPAGE="https://www.videolan.org/developers/x264.html"
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.videolan.org/git/x264.git"
+	SRC_URI=""
+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"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="avs custom-cflags ffmpeg ffmpegsource +interlaced libav mp4 +threads"
+
+REQUIRED_USE="ffmpegsource? ( ffmpeg )"
+
+RDEPEND="
+	~media-libs/x264-${PV}[interlaced=,threads=]
+	ffmpeg? (
+		!libav? ( media-video/ffmpeg:= )
+		libav? ( media-video/libav:= )
+	)
+	ffmpegsource? ( media-libs/ffmpegsource )
+	mp4? ( >=media-video/gpac-0.5.2:= )"
+
+ASM_DEP=">=dev-lang/nasm-2.13"
+DEPEND="${RDEPEND}
+	amd64? ( ${ASM_DEP} )
+	x86? ( ${ASM_DEP} )
+	x86-fbsd? ( ${ASM_DEP} )"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}/gpac.patch" )
+
+src_configure() {
+	tc-export CC
+
+	# let upstream pick the optimization level by default
+	use custom-cflags || filter-flags -O?
+
+	./configure \
+		--prefix="${EPREFIX}"/usr \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--system-libx264 \
+		--host="${CHOST}" \
+		--disable-lsmash \
+		$(usex avs "" "--disable-avs") \
+		$(usex ffmpeg "" "--disable-lavf --disable-swscale") \
+		$(usex ffmpegsource "" "--disable-ffms") \
+		$(usex interlaced "" "--disable-interlaced") \
+		$(usex mp4 "" "--disable-gpac") \
+		$(usex threads "" "--disable-thread") || die
+
+	# this is a nasty workaround for bug #376925 for x264 that also applies
+	# here, needed because as upstream doesn't like us fiddling with their CFLAGS
+	if use custom-cflags; then
+		local cflags
+		cflags="$(grep "^CFLAGS=" config.mak | sed 's/CFLAGS=//')"
+		cflags="${cflags//$(get-flag O)/}"
+		cflags="${cflags//-O? /$(get-flag O) }"
+		cflags="${cflags//-g /}"
+		sed -i "s:^CFLAGS=.*:CFLAGS=${cflags//:/\\:}:" config.mak
+	fi
+}
author	V3n3RiX <venerix@redcorelinux.org>	2019-02-16 12:59:29 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-02-16 12:59:29 +0000
commit	79599515788b85b18aa655e7b7f8cc05c1bbddd8 (patch)
tree	ade7cb031f363fad64c77139dea7aa3d81908537 /media-video
parent	6bc2e4d7c5906e46a8f275a876ead6ec41aca5bb (diff)