24 files changed, 662 insertions, 171 deletions
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index fe744e53d612..a72f2f309b4e 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/aegisub/Manifest b/media-video/aegisub/Manifest
index c8f51c107430..d13770c28cf1 100644
--- a/media-video/aegisub/Manifest
+++ b/media-video/aegisub/Manifest
@@ -2,8 +2,8 @@ AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-fix-icu59-build.patch 496 BLAKE2B 33
 AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-fix-icu62-build.patch 2369 BLAKE2B edbada9d9bb3fbd4ffcd3f8f6aa640132163e0127baada7d40eb39312479602cf57b80e9314b8d3a92aff74764a9ed8336b055cf9c2d387c27595553f1f01185 SHA512 7963b76652126e1aa574e89f56c09e6008afd745c9198a2b081ed65c8697a15cbd7e611d6aeae0e2513b0eb79409665fd78885ef3599ff6f0d074b42bb461a8a
 AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-fix-system-luajit-build.patch 4029 BLAKE2B 635bfd2317a05b1393c26b648f0081920be30e9ca29eeac0a5d25b75a141a3eb40cded94d27934eddb4d2ad1f28a1d8752faf97f264cc4a2a4ef0ffaedeed7b4 SHA512 247dba6e593212294f3157226c03e2fb5d3a5a8eaf9a16e0a65ea1fee006b8f21fadbdd80fb0b748be3a9b043779a0da6bb6007fac07b7908fb46f27a055704e
 AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-respect-compiler-flags.patch 2186 BLAKE2B 67558c0d8a1227e03d6ab97e4f417ec0ef557609be908b403ea5d4c4b12b58dd33822611b98e42afdbc3e65741094ef52d19812fd4eea5611f12a7e109b0986f SHA512 8584f8b6822642f5afdbe1fb9a1e77b32fa4eefebb473d6a501147d328ca38ecb2f88f4247a7ad06a8dfe3d9cc6695f60652dbc122237a17d097bae2f29a6a7e
-AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-support-system-gtest.patch 2483 BLAKE2B 6bff0828e0678e269dc129be03f9bf1135933abefdb9190de5fe6afd214b9caa8b4283f65f30853b3ae118c5ade021a174fa164cee606b635f6587deabf47581 SHA512 802ee218e2c005760a8260271791df0891ef6392bec4fbbb5936df5a84db888b0b6f36055d0760c4929cb442adcc1433a363fa93eae6c163f296166028684daf
+AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-support-system-gtest.patch 2446 BLAKE2B 5b1a5556829fbcd5d10ad869af5dcce4c6227dbc9d460094f237448a4aac9e07a9752039ab857a3556d062297cd0101e71ace0b4d3643f481e7479f16ccdf2e3 SHA512 f5171353ac14806166e26c4b335e6c7d9e111ba1eb68c3160fc9f802e1e3de659df48c4be180a0a25c67f7733007c8875c191436314ccfc9d7696a1f8a1fa719
 DIST aegisub-3.2.2_p20160518.tar.gz 7438734 BLAKE2B 3a57e5d6fafac2ca95d64d60e8d68b48177aaa0c5fd1438d0b0a133757ef95443c16324fb7effb41506f2b1eb70aab9d34845a91beef0ef81a3658444e24be07 SHA512 8d8775ba0a12735a9756b9abfd65c89519dae4e21afcaedbd18985d1c1021975b1ae909b3bef1121b707c626e1711d56f1823f3b4746eab49e8386536a5e84e6
-EBUILD aegisub-3.2.2_p20160518-r2.ebuild 3526 BLAKE2B a38d02662aa047b7f9d505391a25be856d50267c9d917a9df7342b1afaec5122f22a4649d0ac8adfb2259eb0c01bbab1681c138280db191782711d4bd32436ef SHA512 b657555a4f49c09b9c06570dd9927a136b1341ef8ae5cd209ec73ce45a62e33fcd15fbf90b8a870f6a68f071b3e322e03fcd17f8fdfc04b1579a64b19bfea0cb
+EBUILD aegisub-3.2.2_p20160518-r2.ebuild 3524 BLAKE2B 0cabead7524421c8eb0aef0aaa420257bde80b91f472caa10a1974eb62cf618e18929d6b834976f35e11961cf608138481172b8c4a1eb95b3fd4a0d22641ea51 SHA512 75d0d42d3cba04d06e866ce4717fa6cc4382f092edcd6d3e765038d6341785731fc23de961c2bf3b0688e1b768bbc4025f441b2f3c5fe4d92c1bf53e87ac2187
 EBUILD aegisub-9999.ebuild 2867 BLAKE2B 9eeddc22c8774b94d0365b8f0b628f4cde96847f90d1373e26cedd4ae74662b04407858b71d2de9f44b67f444651513ae95b13743eb5c2157e6f9daa00f4af96 SHA512 afce1fa2d15e8a63bff8551e88338aa5d01093aa61ccd84105f2c0200dcefeeeadd0a4535d9e176ab39043d842e272abecaff2d7113f77f9f36354788e3c021e
 MISC metadata.xml 489 BLAKE2B b26abe2056ef0465a81ea8f9928c6d05053595b5650aff750251173ddce6f5248a30331104710c1b05cafe9641c072764c45f66935b25857785bc833af31174a SHA512 450c45be100ed72d7f0b69fe596862137ea2f421597e99129325bf2f58940600a62e1502ee4d6c7cbbab17b4cbd99da8c481ceb6fec2709452c17d8cb7aaae48
diff --git a/media-video/aegisub/aegisub-3.2.2_p20160518-r2.ebuild b/media-video/aegisub/aegisub-3.2.2_p20160518-r2.ebuild
index d5b623eb234e..bef93fffa85b 100644
--- a/media-video/aegisub/aegisub-3.2.2_p20160518-r2.ebuild
+++ b/media-video/aegisub/aegisub-3.2.2_p20160518-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -46,7 +46,7 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext
 	virtual/pkgconfig
 	test? (
-		~dev-cpp/gtest-1.7.0
+		>=dev-cpp/gtest-1.8.1
 		dev-lua/busted
 		dev-lua/luarocks
 	)
diff --git a/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-support-system-gtest.patch b/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-support-system-gtest.patch
index 8209ac5ec7c3..7e3fac2acd81 100644
--- a/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-support-system-gtest.patch
+++ b/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-support-system-gtest.patch
@@ -24,13 +24,13 @@ index 8c30c1d..c5bf049 100644
  GTEST_ROOT ?= $(TOP)vendor/googletest
  GTEST_FILE := ${GTEST_ROOT}/src/gtest-all
 +GTEST_CPPFLAGS := -I$(GTEST_ROOT) -I$(GTEST_ROOT)/include
-+GTEST_CXXFLAGS := $(CFLAGS_PTHREAD)
 +GTEST_LIBS := $(LIBS_PTHREAD)
 +else
-+GTEST_CPPFLAGS := $(shell gtest-config --cppflags)
-+GTEST_CXXFLAGS := $(shell gtest-config --cxxflags)
-+GTEST_LIBS := $(shell gtest-config --libs)
++GTEST_CPPFLAGS := $(shell pkg-config --cflags-only-I gtest)
++GTEST_LIBS := $(shell pkg-config --libs gtest)
 +endif
++
++GTEST_CXXFLAGS := $(CFLAGS_PTHREAD)
 
  run_PCH := $(d)support/tests_pre.h
  run_CPPFLAGS := -I$(TOP)libaegisub/include -I$(TOP) -I$(d)support \
diff --git a/media-video/ccextractor/Manifest b/media-video/ccextractor/Manifest
index 44183623fccd..752d06dd26cb 100644
--- a/media-video/ccextractor/Manifest
+++ b/media-video/ccextractor/Manifest
@@ -1,11 +1,4 @@
-AUX ccextractor-0.68-libpng.patch 316 BLAKE2B b2e9888be409b56ba0f7ea1a7838c780f0b3e781d8ccd26aa83b8e952fcaee41b19e459729a0b76c1dcfcc8ad548c892ea21bcd71fe96c50c1c34d6cd986fe80 SHA512 1952c3a9a8804cb2adafb026994c94fad3e621fcdd601ead9ccb53d022efd131c8325ea93b1dbf5d37afd272ae69db120087452fad640b990f15e6e1b198d676
 AUX ccextractor-0.85-cmake.patch 3008 BLAKE2B a6ce3f6004dbaaa2cb2b5d87798d8125779f380923f930210440165c09ddedc4027f71e338acf560f25ebbb235064e35c4afec7cec588e058367a2cbb4069cf7 SHA512 d2fee97a35c3b104d311d9424cdd199655b12a114172c3b152cca8503b06900897a5334709770af3b1b1294893376d9d4f5f3fc0486250dd90899df0bc7af3d0
-DIST ccextractor-0.59-src.zip 168198 BLAKE2B b0398e897b2f5e1aa7974b92aefd1d7a8c2c7fcaa9761b672de8f0b6c636fc373a5b66a0421e163c6b03253817475eb07cb0ec1a4561d9e930d332f1a31cb1dd SHA512 13c9ffacdcbea781bac067e850700dbe46ba5fad00f2fde1fb563980c06b77be4c2216b1075d3dad873e3604f408f4cb739fca66bc0764bbaf15a987eb9cc9a3
 DIST ccextractor-src-nowin.0.85.zip 1843154 BLAKE2B 507018e76ed075de033df10c8af235ab7095b3dcf85c10398d9a7c8dbec338c6fe43f98b4f337419945b5deb9290d8652caa54c70de5fdfb0364b9dc48468379 SHA512 53adc017b7b1679302677e3773aabdcceddabdd8a6550cf8b9fb98150b7323a1cc6dbe67a48ebcdf22a4d013c00831907799032dd0f7f6f06943252be8177cec
-DIST ccextractor.src.0.68.zip 927590 BLAKE2B 2f2e3423ef67acb76a9cdfec66a6bd3c41fac88b53b8fcabaf1c260589d117efe19f04b3b005ad30b549d23a5974509a242beabd61eda01fb5bfe77f52e9fe45 SHA512 c73eb007db7058cf17a818cd5bdf20dfb6f6f3585f55d9f7f1b894aaedcc6b74ac0c2b34b517b44491cdefe2fe7b1fc0035802326b61f7f6330acdb854b8c2ad
-DIST ccextractor.src.0.69.zip 940531 BLAKE2B c15d8936cbbae5d2fc54add13b0b80318280dd0250a57f0d8f188eac57847c5307da1fb633c59a90de189069e1850a1eb353a9337952831462f448a941521680 SHA512 51c3218a9a8e88aa86acfdd0cbd51bc52a734bde77dbea32c7e2a0f63835b25e0e86ea4b228564e5e996a5a19c74d5513d057bf510c324280f0c155a96b77775
-EBUILD ccextractor-0.59.ebuild 589 BLAKE2B 0ca1569ffb185579d9f845c2683013f8b6992f2c5375851d3055e34da6fa1809638906d41bcec1193765ee90bfa5ff3280d7e7a8faf425ab40a781a45591b158 SHA512 0e0f88172de4ce078192f8279307ead63cea96aa837264e3b823056414c1d3b451cf1971bdbe1fc5633afc749d4e77e867c29e42d592582c3995736e51222c98
-EBUILD ccextractor-0.68.ebuild 836 BLAKE2B dad24887218fc543d8f5795f348071484fa4107db11958248e4e4c20173a6dc6f66ccec7a8ccb3fcc1bb34f95d2f97edde45f0efae6f1ac12d3247640207fee8 SHA512 fbd2aad9e1208b2c0f6a47a6c1086b4fd1ea425ef8c8c5107359b28d94591cac51c382ca24223623595498274005c7e1c2949c31bed13bdef0baef0be3e382e1
-EBUILD ccextractor-0.69.ebuild 783 BLAKE2B 4e005b471352246d52b8c8b144a11f0b80c30d85c23036a27cc205807eef99f2f516aba35090e7bd248168f88b4a974c912963c1c0c53607bb6b0ca027a42248 SHA512 c6e4ee836537639a126f23cc5cb8eedc3ae0f564ef43f33c0476ef975ba1a986020aa87bb91f9fa00e89cb27e933b8d2363d5e6e155a3640d5d1478dcc352a9a
 EBUILD ccextractor-0.85-r2.ebuild 624 BLAKE2B eacce2446719eb3554906739f47c65fa870b39fc4b18cc2444d7655df6291f4dbf4a552e54ec636ebbba5a4f98802204308c87b2c35be3c794598b4947951e64 SHA512 12ba8f588dd933fffcfe89842ede6e1b71f395b18b00a7418e29eaad322f19f832202d1fc78719347202066a9e9f77e40c59a34bc9e0ede6e03413a6863bc61f
 MISC metadata.xml 525 BLAKE2B 930b586a391abcf3b3f5b3102fd4e720e8ca762eeec93adea4e3c4078b2e903f356d1e6da7cbf8a294a95b43b392efe64287c01c6b5666ced37326d6236c777f SHA512 497eb90960d645c7d1a205c4d556d79b4d2df8aec51fa0abf73afc3b359dbf6f85b4c6e035b966a69f2e5ed4d3de22ee7b335d62d60ad6b20b071edd4d75ddb2
diff --git a/media-video/ccextractor/ccextractor-0.59.ebuild b/media-video/ccextractor/ccextractor-0.59.ebuild
deleted file mode 100644
index 83c1fae4d223..000000000000
--- a/media-video/ccextractor/ccextractor-0.59.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit toolchain-funcs
-
-DESCRIPTION="Extract closed captioning subtitles from video to SRT"
-HOMEPAGE="http://ccextractor.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ccextractor/${P}-src.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}/${PN}"
-
-src_compile() {
-	cd src
-	$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} -D_FILE_OFFSET_BITS=64 -o ccextractor *.cpp || die
-}
-
-src_install() {
-	dobin src/ccextractor
-	dodoc docs/*.TXT
-}
diff --git a/media-video/ccextractor/ccextractor-0.68.ebuild b/media-video/ccextractor/ccextractor-0.68.ebuild
deleted file mode 100644
index 450af1ba16c8..000000000000
--- a/media-video/ccextractor/ccextractor-0.68.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Extract closed captioning subtitles from video to SRT"
-HOMEPAGE="http://ccextractor.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ccextractor/${PN}.src.${PV}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="app-arch/unzip
-	media-libs/libpng
-	sys-libs/zlib"
-
-S="${WORKDIR}/${PN}.${PV}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-libpng.patch" || die
-	rm -r src/libpng src/zlib || die
-}
-
-src_compile() {
-	cd src
-	$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} -DHAVE_LIBPNG -DGPAC_CONFIG_LINUX -D_FILE_OFFSET_BITS=64 -Igpacmp4/ -o ccextractor $(find . -name '*.cpp') $(find . -name '*.c') -lpng || die
-}
-
-src_install() {
-	dobin src/ccextractor
-	dodoc docs/*.TXT
-}
diff --git a/media-video/ccextractor/ccextractor-0.69.ebuild b/media-video/ccextractor/ccextractor-0.69.ebuild
deleted file mode 100644
index c98da414d1b9..000000000000
--- a/media-video/ccextractor/ccextractor-0.69.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Extract closed captioning subtitles from video to SRT"
-HOMEPAGE="http://ccextractor.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ccextractor/${PN}.src.${PV}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="app-arch/unzip
-	media-libs/libpng
-	sys-libs/zlib"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	rm -r src/libpng src/zlib || die
-}
-
-src_compile() {
-	cd src
-	$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} -DHAVE_LIBPNG -DGPAC_CONFIG_LINUX -D_FILE_OFFSET_BITS=64 -Igpacmp4/ -o ccextractor $(find . -name '*.cpp') $(find . -name '*.c') -lpng || die
-}
-
-src_install() {
-	dobin src/ccextractor
-	dodoc docs/*.TXT
-}
diff --git a/media-video/ccextractor/files/ccextractor-0.68-libpng.patch b/media-video/ccextractor/files/ccextractor-0.68-libpng.patch
deleted file mode 100644
index 518d434df369..000000000000
--- a/media-video/ccextractor/files/ccextractor-0.68-libpng.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/608_spupng.cpp.orig     2014-03-19 10:32:47.578960867 -0600
-+++ src/608_spupng.cpp  2014-03-19 10:33:00.692179157 -0600
-@@ -490,7 +490,7 @@
- {
-     unsigned int i;
- 
--    if (setjmp (png_ptr->jmpbuf))
-+    if (setjmp(png_jmpbuf(png_ptr)))
-             return 0;
- 
-     png_init_io (png_ptr, fppng);
-\ No newline at end of file
diff --git a/media-video/ffmpegthumbnailer/Manifest b/media-video/ffmpegthumbnailer/Manifest
index ef59a6859b07..9992b70fb03a 100644
--- a/media-video/ffmpegthumbnailer/Manifest
+++ b/media-video/ffmpegthumbnailer/Manifest
@@ -1,3 +1,4 @@
+AUX ffmpegthumbnailer-2.2.0-pkgconfig-libdir.patch 675 BLAKE2B b6b00228900e3fb1894eb4ca4872a2be645cb3a6aecbb9d3581ff1fc00b7290eab72196fb9c5f6ac4924eb3e4b1b82093669128fe32c01ce56e4c36ee53528b4 SHA512 facfdf9693710c93896590b8814af0b6ed98fe9fe4ecde013a3554032ed733b3ab713a4a840212808c84b1277c9c4e7951fd1fbc641ad9c001f78635e4e539be
 DIST ffmpegthumbnailer-2.2.0.tar.bz2 1223895 BLAKE2B 1babd01672f927a9ae043488e67225490f732b26544ad92e4c55ae683eb7d852cb90233e76a52cbda2f6aec26654b57907d7706e3ad4ae6d76ca3bca163c78eb SHA512 526d15b2c754fcb1415e69fb54cb6e7d0102b6d73a32a7e8528df81e32633dfe3786898984fdb988c93daee7218956c75c096ef657c9b3a42399d2d1d27c7bbf
-EBUILD ffmpegthumbnailer-2.2.0.ebuild 1076 BLAKE2B acb911814f42b64e2b3b54464a1d1e30e8168565d097af9e6310585a0a779f8a6c8e0826560a61e8125c20cd1b1f2a1729c565d0206de2696d4eec97ce93fa11 SHA512 7b4bae26667130559f279da041e79d0b956e1d1f98e39843cf33799b0d029074e9688a477bf1c6e91398bb4bae39c7d22388f55d08b7bea9d4c2faf0faea4795
+EBUILD ffmpegthumbnailer-2.2.0-r1.ebuild 1133 BLAKE2B 6d2140ceb1d5a441c81f24323e8518d31c363bd0fa1044c380cef933e7b4d53a585dde5f12a8072a45fbf24df45d6bf1a52b417b4f63b5c43686032576f87c3f SHA512 923d107551284f6cdfabf11cabd28d42da3a51ea5ab0e612b16c9781db6827c804868ae1808fd7b678877a53b0d49d8c01cc5d42270518e0b11adf787b3b94e9
 MISC metadata.xml 375 BLAKE2B 95c0757230dcb40e028a904cfeb17bc44d651e2c5840fb9bd45222f56217ab72cee863157c014fa301a69611eee2e5b574fe9351f066bba1a846ad2b458ae52e SHA512 a3b8d0dc66f4660489b8e084a310da37b5379843b5e4a661a7c1150a4c2a7c4924f6d92366edefa6e57ed77016577d86c4aef084238df06925395f21c3078ab0
diff --git a/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.2.0.ebuild b/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.2.0-r1.ebuild
index d92f8f290948..c10e330b5787 100644
--- a/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.2.0.ebuild
+++ b/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.2.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils eutils
+inherit cmake-utils
 
 DESCRIPTION="Lightweight video thumbnailer that can be used by file managers"
 HOMEPAGE="https://github.com/dirkvdb/ffmpegthumbnailer"
@@ -14,6 +14,12 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="gnome gtk jpeg libav png test"
 
+REQUIRED_USE="gnome? ( gtk )
+	test? ( png jpeg )"
+
+BDEPEND="
+	virtual/pkgconfig
+"
 RDEPEND="
 	gtk? ( dev-libs/glib:2= )
 	jpeg? ( virtual/jpeg:0= )
@@ -21,14 +27,12 @@ RDEPEND="
 	libav? ( >=media-video/libav-11:0= )
 	png? ( media-libs/libpng:0= )
 "
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-REQUIRED_USE="gnome? ( gtk )
-	test? ( png jpeg )"
+DEPEND="${RDEPEND}"
 
 DOCS=( AUTHORS ChangeLog README.md )
 
+PATCHES=( "${FILESDIR}/${P}-pkgconfig-libdir.patch" )
+
 src_prepare() {
 	rm -rf out* || die
 
diff --git a/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-2.2.0-pkgconfig-libdir.patch b/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-2.2.0-pkgconfig-libdir.patch
new file mode 100644
index 000000000000..8a70b6fbde49
--- /dev/null
+++ b/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-2.2.0-pkgconfig-libdir.patch
@@ -0,0 +1,21 @@
+From 88c09cb6218fda5457c228f33084244db8725ed2 Mon Sep 17 00:00:00 2001
+From: orbea <ovariegata@yahoo.com>
+Date: Sat, 15 Apr 2017 19:36:01 -0700
+Subject: [PATCH] Fix libffmpegthumbnailer.pc to work with multilib systems
+
+---
+ libffmpegthumbnailer.pc.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libffmpegthumbnailer.pc.in b/libffmpegthumbnailer.pc.in
+index 77c00b2..0a2f997 100644
+--- a/libffmpegthumbnailer.pc.in
++++ b/libffmpegthumbnailer.pc.in
+@@ -1,6 +1,6 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
+ includedir=${prefix}/include
+ 
+ Name: libffmpegthumbnailer
diff --git a/media-video/gaupol/Manifest b/media-video/gaupol/Manifest
index 521bdc0bc792..1e96133570d0 100644
--- a/media-video/gaupol/Manifest
+++ b/media-video/gaupol/Manifest
@@ -1,7 +1,7 @@
-DIST gaupol-1.4.1.tar.gz 524816 BLAKE2B 677f1ee0e3b523f97d4b0f6491547d07a658c41c3c2c0f76732589592b542176761df28e13735af58371594043ef234f7987988deacd4d8f73554a87f555d001 SHA512 464e71390ba13f1da11bd40ecb4683d146acb6e547204231a2e78c24719b4ad9ba188210d1bf2108924bcfa0df89c0296f428cba693d3b6d4366e98950cb072a
 DIST gaupol-1.4.tar.gz 524369 BLAKE2B 6f27ce3328339fc2f6248bb58d80965a5a26fed220ddf9c989a5029b4322ea790f768cb9e0472bb2c5eae4e4da3abd4b0f808e785273ff9fb787ff5b7df5d137 SHA512 da9256dd8dafeaff012226a8ff09807c7cb7609c293bde7d90b05b4f75c47751e65181f1bf47dff1c8e979f48186996253141ff18e849786bf2cff5ed5555148
 DIST gaupol-1.5.tar.gz 537279 BLAKE2B 1ba8644b49832ee80e61bf304b7978275064acbe2e5e733a991b280f947c4064f0d4f385055e580bd3aa2d9ee2291d64fd1ee4bd8a1ba4f8eaaaaf9a137085ff SHA512 48f3eda460c2fb3e4bdaf52c42645599f0d5ce8eae05f7a2a9c608192a27a8b86b83830584216dc73105968f544aeab30e171b2c176d9a3f5047e93510413b85
-EBUILD gaupol-1.4.1.ebuild 1381 BLAKE2B d37fa000caa5a0cbff624baa12e576c376b70bb4e8ef0ca1316c25e03b96d3fa86185c467a4d22171ec517294aee60cc3c7ef682127c6fda81d912910fbe8052 SHA512 14efcf4494539d175815d8c6458796312a13ce6ed8a6a3a9d65ec9ea119434cc49f8f96dc717215c1bd638868a53f4792c28c981ebb0d6f2769f19696d6f2a0d
+DIST gaupol-1.6.tar.gz 540186 BLAKE2B 4e7a2e0c01be2ac88c0ae5948d3002005c72418ef21835195daf6b0c5b71d970006b0f76fa78a1ec7337d1f9366436c44eb336e0a56d8cbb7eac905e09d4c81a SHA512 e0f258b579a34644e54456978df9c5a6f72aa019b6de79918fe6892bb59d2316c3fc093f2f49c60d6eef74832fa2a9a9e102bb1d25f64f3143fd29d3cb4966e5
 EBUILD gaupol-1.4.ebuild 1419 BLAKE2B 12444dc45108e191261ad8d372d594178de4c4e04816eaab7dea8e56261b9a4e10ded197fa574e54e52f14e4a7467740ea579fa1ab6a42dc11e6180ab305e088 SHA512 b2e46895b60e336b7d5bcb07e3137080993a836ff97a4fa3f2457a5050148944bdf00fbdd8360aba3607bce6ad94f77b12e3363c70d2b00dd5a83bfb27a5e2e8
 EBUILD gaupol-1.5.ebuild 1389 BLAKE2B ee1e651f5476267ec77a0568a11320eaa8301d9d9398b731c55ecf5429452bd529d6e327de2cd216350d54396bf60a38a6a22100c0f27defdc8a83571be91aad SHA512 c3e333e2f5790799541cd1e757a321548957dbde7cb8d9690d145802b8e07a5ff43915281ab9ff841029046a57e620966a9cfea40a780f1c4bc04dee9be05dab
+EBUILD gaupol-1.6.ebuild 1391 BLAKE2B d9cbeef16f7cdb25c934276e839ece9c4c40794ad656956b6ad7071f4e4d3d27bbf64f01d436ab8596d1fb6bf9189310d032f867902258e5250efa768bdaff57 SHA512 76ebf50ff227cff32a6661ef0492c56bb14a1849ebf6ffb9664415dacf5e0b5f67205fcacfb210d0fc10920400f84fd78364ccc020211819e401d00116e9cc3a
 MISC metadata.xml 508 BLAKE2B 979a43569103cfe36a47d56ed16c15b7775d0a36d031d488ac064152b8d59115dc656e28a5eced25da13d9a3925be24114a760862bf043b88a89c70b8dc053e8 SHA512 1af2a5a287075a0668850c229a5c9dcbef51bbe64467516e37b870459266021d528435dbd5274e0d5abf7cf0fe2d4b8fb08f6cc470418c3b64e4da6b93dcc147
diff --git a/media-video/gaupol/gaupol-1.4.1.ebuild b/media-video/gaupol/gaupol-1.6.ebuild
index 1f923779ac1c..aaf18f26072d 100644
--- a/media-video/gaupol/gaupol-1.4.1.ebuild
+++ b/media-video/gaupol/gaupol-1.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/otsaloma/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="spell test"
 
 RDEPEND="
@@ -38,7 +38,7 @@ DEPEND="
 DOCS=( AUTHORS.md NEWS.md TODO.md README.md README.aeidon.md )
 
 python_test() {
-	virtx py.test
+	virtx pytest -vv
 }
 
 pkg_postinst() {
diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index 6b4a66b33c8f..a5da082b2925 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,5 +1,5 @@
 AUX makemkv-path.patch 2153 BLAKE2B bab155f5aea1c7f5e3d1923b580b3f36115d32bf0d384a347379dd9ea80b650ea9755c641be0253c9d5b269f9aa4d2774ace89ea598b5206391794263530a84a SHA512 c7744f92ed7a5f09f0301c454afa32e4fce7251f276129917d2ce602b35f5961e629fa0328213f6e5a8d260b5964db099c44b1e870b209f7bb78712cf52b6e95
-DIST makemkv-bin-1.14.3.tar.gz 9117659 BLAKE2B ddc6d080a06adf2b3f8728623a11c9a7fa6392770ca472b62d172bfdf78b433ab7947f4a463ab5a8ea8d9ed7ac4d4f1a1d63572ca694274728751b75c8fb3855 SHA512 28c0b252898ba42e0c8b1fcf9440e464c7d1fb183e95faa7bcb906e0e0a299598d0264fcf8c04960c9f6609fe5a4ce0109e8ab7a9438ae205accae4c99433f09
-DIST makemkv-oss-1.14.3.tar.gz 4384183 BLAKE2B c5e96ebd06d8d2f0f83bf94344d31a8259cabe8af278307dd856b891f9cd11be8bfe4622c0824ccec5968360a68ada2b088fb71651a5c789fa55297b58d27b20 SHA512 bb83f7cafba072012a532cf4ea12e3cf6c640d2a020c65979247a4931abbd75a9c0407dd52a3013ab280bf5ded3a105a5306f9d06dfa108d0102259053e63f9c
-EBUILD makemkv-1.14.3.ebuild 2931 BLAKE2B d32a0e0c147ce15c20e5beb5a14dc8447a5396cb1f51c0624f73284112c4f58a4e9a54711dfc8873e02753c84eecea75ffefddd437f4356480ddd90dcf8daa1a SHA512 e094e299de88f22e1254ba636a48a5c89c8a3434ec8e960bc23c339e43c572529f6bfa5136b1fd2be4ac1307c0ea97038890096f3f0ad4c3ab09771a499fe9d0
+DIST makemkv-bin-1.14.4.tar.gz 9135402 BLAKE2B 0564ec01067c39fa2c538f4923f010fc4bda555c84e1c054ff04fe8be958fe596adedc272d755958ae192883b28cd914af5e177d87f9274879ce9f49f135fa20 SHA512 ef48c09f56b3c46edd25a690b27dd0216b701ff84133e99742c263157f5ea032fd76286b9d8e3979cdd0da8ddceacab4fe0981e056df65228394ac91228c3c09
+DIST makemkv-oss-1.14.4.tar.gz 4385464 BLAKE2B 1645014ce87fff2f6eedea8059fc3d2db5f9f371272453b6d86162163c7b4fe46362af14310b6f3ce628c22e6b552cf99c780368c4384afa772fe17b44f18dd0 SHA512 05fab5d97fe0f0678c2000dd7580532ccafa6c0232bc61a5f17e79f1c02577b6317a78bb12af481d5fdc8eff2e0633aa58a430c256d6d72f04247774e2044b20
+EBUILD makemkv-1.14.4.ebuild 2931 BLAKE2B d32a0e0c147ce15c20e5beb5a14dc8447a5396cb1f51c0624f73284112c4f58a4e9a54711dfc8873e02753c84eecea75ffefddd437f4356480ddd90dcf8daa1a SHA512 e094e299de88f22e1254ba636a48a5c89c8a3434ec8e960bc23c339e43c572529f6bfa5136b1fd2be4ac1307c0ea97038890096f3f0ad4c3ab09771a499fe9d0
 MISC metadata.xml 1225 BLAKE2B c65dc32de4283f661bb1725d24d7346ad93a5cc77fc794cb41ef95174eaabd3fe17fac4ae7c4a4791170563e7ae0596c37ec734880723f9a9e81b5d991646b4d SHA512 b5730528c0efef8dc5d98248d0eaa85625b292e610cb7aa294d87f968fabdd45a6d240e66d7d2a4f0cdfc7642ad11dbaf36417b36b8895b8e50b307202ac1bb9
diff --git a/media-video/makemkv/makemkv-1.14.3.ebuild b/media-video/makemkv/makemkv-1.14.4.ebuild
index 3668bf07c790..3668bf07c790 100644
--- a/media-video/makemkv/makemkv-1.14.3.ebuild
+++ b/media-video/makemkv/makemkv-1.14.4.ebuild
diff --git a/media-video/openshot/Manifest b/media-video/openshot/Manifest
index 9fdfb7262b4f..e05195b566b7 100644
--- a/media-video/openshot/Manifest
+++ b/media-video/openshot/Manifest
@@ -1,3 +1,5 @@
+DIST openshot-2.4.4.tar.gz 63065376 BLAKE2B 2ee00f24d699d5935a182c394821f215a27ba2701d493f51299c19cf99452ca4df2e5b86f7a6e5734e6194e39e5b7995eb94be168c0e9f7bc7a3b78206277304 SHA512 efa71f97a83b89e691b7dab09288ba7d3e91eb25119669fa8f6e28becb8d4cb3e60a923f936ee4ff9a593d016fe3a6b0348153cff937ab7d21a5517de5dfa10c
 DIST openshot-qt-2.4.0.tar.gz 60710408 BLAKE2B 33c8abe7ba3122ae720163d6ab91d367ee282b94d3d8986fdccf4f9efae832f54af7f946472c781a17f7e54083028762952d02d7139e6815cd0d44e80515c728 SHA512 95778effa5b02a467c44741384b0f43bf90343d4f450d5fcc2319ff1c3bee212338435dd8c781e0ff111a704aacdce3dbfb6bdcf62afa1f59bbb0668b58074ca
 EBUILD openshot-2.4.0-r1.ebuild 1275 BLAKE2B 04d16ebe05301d91fd4692410662618f4d7d1304e719f4ef3c3b3dabb85285c3dc64044fe80920dfae5d52c2f9789c60a7ce535e25d5fce196fe3888f0d89776 SHA512 40495955fe86cb522f12fc78a73e216093a21f08a899667197bc4943e929c858bfd9d807261df0179b4d1079fea9551db3e76c81bc3e1cefb83828432a712751
-MISC metadata.xml 487 BLAKE2B dc721eeb1c4ab6880cd9a5cc1c8c0a032303f0c56ff4312f723c364978b4338e3acaecc887a5617e1d691d69bb3415d92dd9cc812da161f303f33381422f7e42 SHA512 3b1dc5bc39de8b46ccea5497b228675c7d379ec627e12630d8914d9d35e316f4818bc165551dd271b24d377b3bcc2b97d528b43219765460058d123bde078149
+EBUILD openshot-2.4.4.ebuild 1210 BLAKE2B 7d6ee91f9bf739c785b57387f9f0ca61f0b372c64210f1f6d86f660ff06b655dce2638494574798fecc789c7732e02e6cec3552061aabe9870d7ef7528f8dfdc SHA512 f1b006b2d1a99c19af6b6c5d26af31205ddbed121010002ebc164ef66cb4bbd5531a80cebb8717dfebb2d494a6f3518d37731bfa00c50233949688f12343d487
+MISC metadata.xml 516 BLAKE2B 00f73a7bde29bf2e437dabe263b6a1b4a18a46133516788a3072b9f306b4db8a2f413f2f273128dbb1f9761a5d1e0157ba4be1e111d733214c2eb73077fd481d SHA512 7511087d836af5594f5e9261974ee0e3b7df77b066d05a4b032993bcfffa2d703dcee869c96c710196b5acbb580ea39be3f9d14bbd05b86fe929269edce6bf6f
diff --git a/media-video/openshot/metadata.xml b/media-video/openshot/metadata.xml
index 6dbde2947b33..2229623f13c1 100644
--- a/media-video/openshot/metadata.xml
+++ b/media-video/openshot/metadata.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>steils@gentoo.org</email>
+		<name>Stefan Strogin</name>
+	</maintainer>
 	<longdescription>Free, open-source, non-linear video editor to create and edit videos and movies</longdescription>
 	<upstream>
-		<remote-id type="launchpad">openshot</remote-id>
 		<remote-id type="github">OpenShot/openshot-qt</remote-id>
 		<bugs-to>https://github.com/OpenShot/openshot-qt/issues</bugs-to>
 	</upstream>
diff --git a/media-video/openshot/openshot-2.4.4.ebuild b/media-video/openshot/openshot-2.4.4.ebuild
new file mode 100644
index 000000000000..d252a05676b2
--- /dev/null
+++ b/media-video/openshot/openshot-2.4.4.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_REQ_USE=xml
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1 xdg
+
+MY_PN="${PN}-qt"
+
+DESCRIPTION="Free, open-source, non-linear video editor to create and edit videos and movies"
+HOMEPAGE="https://www.openshot.org/"
+SRC_URI="https://github.com/OpenShot/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="1"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/PyQt5[${PYTHON_USEDEP},gui,svg,webkit,widgets]
+	dev-python/pyzmq[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	>=media-libs/libopenshot-0.2.3[python,${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	distutils-r1_python_prepare_all
+	# prevent setup.py from trying to update MIME databases
+	sed -i 's/^ROOT =.*/ROOT = False/' setup.py || die
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/media-video/simplescreenrecorder/Manifest b/media-video/simplescreenrecorder/Manifest
index c15ffe15bdf1..164186aa6191 100644
--- a/media-video/simplescreenrecorder/Manifest
+++ b/media-video/simplescreenrecorder/Manifest
@@ -1,4 +1,4 @@
 DIST simplescreenrecorder-0.3.11.tar.gz 1823944 BLAKE2B b7692ad158b4784f0222dd47227b85d33aae7eb416ed87d2eda1040027c910ec8d0ebe6a7e164e77cb9c3f6f2756e15fe97a7f05f45c92465473d2ae90e86b34 SHA512 5919774a00cd7015cd7db40561efaea43809b9465508b7770db9eb0fc87f338746e5cd4a79a0ab6c09e516257fa80184c3dcb5ab400c0ef2c0a8cf50ea2a073f
-EBUILD simplescreenrecorder-0.3.11-r1.ebuild 2889 BLAKE2B c741205598595d625fdf83e9df3cc06032b7e7b440fc84d880402af6bf58e75cb23e3aae45f1bae352b94d2437dfa034294984a4c51273af45975e799828e2dc SHA512 ea236e2ad36e41e0c5ff7344028150f4a18e2561e29c8e9ee668d984657cf997ddf51fdb85e7b06f21df4f0d8a6db2689b1ff62c8f29e6b523286d9c660f9759
-EBUILD simplescreenrecorder-9999.ebuild 2889 BLAKE2B c741205598595d625fdf83e9df3cc06032b7e7b440fc84d880402af6bf58e75cb23e3aae45f1bae352b94d2437dfa034294984a4c51273af45975e799828e2dc SHA512 ea236e2ad36e41e0c5ff7344028150f4a18e2561e29c8e9ee668d984657cf997ddf51fdb85e7b06f21df4f0d8a6db2689b1ff62c8f29e6b523286d9c660f9759
+EBUILD simplescreenrecorder-0.3.11-r2.ebuild 3079 BLAKE2B b7a1704ca440040b31136057a0a7d0684a5bab4417a45f845abc96e633dd323e8a4c858f9a72bd486d3380003554f14878dd35178e3ee488dbfa186ef55c4b78 SHA512 048cdd940936d8a133f617d3b807638b7ddedb7bd01008423d1e40bba159c0a4341c1c5f4f5e5a54bcc3a2a8a65e4fdbb9f6a507ca2587b65939778a0ca0bd3a
+EBUILD simplescreenrecorder-9999.ebuild 3079 BLAKE2B b7a1704ca440040b31136057a0a7d0684a5bab4417a45f845abc96e633dd323e8a4c858f9a72bd486d3380003554f14878dd35178e3ee488dbfa186ef55c4b78 SHA512 048cdd940936d8a133f617d3b807638b7ddedb7bd01008423d1e40bba159c0a4341c1c5f4f5e5a54bcc3a2a8a65e4fdbb9f6a507ca2587b65939778a0ca0bd3a
 MISC metadata.xml 508 BLAKE2B c43c69903c35e9e1f87c94cb26b06a8d6c4dd1a51c8a3409027ab8c867e54851aa8e4bfcaf4a0a37298795ded69743e82d2b0a4e0bb84cb3d88d6a6c5c4a1c0f SHA512 d4879cb7f57f23d273e45b429ab5548d30a0a6eefe63e28c2c60e7cef9a44b295d8455bfedaf9d9294ff4cf16b4f841f0ddb34541c62c25cbf190f7b6c7538ce
diff --git a/media-video/simplescreenrecorder/simplescreenrecorder-0.3.11-r1.ebuild b/media-video/simplescreenrecorder/simplescreenrecorder-0.3.11-r2.ebuild
index 1cf430a123ec..852caf0a6bac 100644
--- a/media-video/simplescreenrecorder/simplescreenrecorder-0.3.11-r1.ebuild
+++ b/media-video/simplescreenrecorder/simplescreenrecorder-0.3.11-r2.ebuild
@@ -1,9 +1,9 @@
-# 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 cmake-multilib flag-o-matic gnome2-utils xdg-utils
+inherit cmake-multilib flag-o-matic xdg
 
 if [[ ${PV} = 9999 ]]; then
 	inherit git-r3
@@ -47,8 +47,8 @@ DEPEND="${RDEPEND}
 	dev-qt/linguist-tools:5
 "
 
-pkg_setup() {
-	if [[ ${ABI} == amd64 ]]; then
+pkg_pretend() {
+	if [[ "${ABI}" == amd64 ]]; then
 		elog "You may want to add USE flag 'abi_x86_32' when running a 64bit system"
 		elog "When added 32bit GLInject libraries are also included. This is"
 		elog "required if you want to use OpenGL recording on 32bit applications."
@@ -63,16 +63,22 @@ pkg_setup() {
 		ewarn "record videos with x264."
 		ewarn
 	fi
+}
 
+pkg_setup() {
 	# QT requires -fPIC. Compile fails otherwise.
 	# Recently removed from the default compile options upstream
 	# https://github.com/MaartenBaert/ssr/commit/25fe1743058f0d1f95f6fbb39014b6ac146b5180
 	append-flags -fPIC
 }
 
+src_prepare() {
+	# required because xdg.eclass overrides default cmake-utils_src_prepare
+	cmake-utils_src_prepare
+}
+
 multilib_src_configure() {
 	local mycmakeargs=(
-		-DENABLE_32BIT_GLINJECT="$(usex abi_x86_32)"
 		-DENABLE_X86_ASM="$(usex asm)"
 		-DWITH_PULSEAUDIO="$(multilib_native_usex pulseaudio)"
 		-DWITH_JACK="$(multilib_native_usex jack)"
@@ -86,20 +92,30 @@ multilib_src_configure() {
 	fi
 
 	if multilib_is_native_abi ; then
-		mycmakeargs+=( -DWITH_QT5="true" )
+		mycmakeargs+=(
+			-DENABLE_32BIT_GLINJECT="false"
+			-DWITH_QT5="true"
+		)
 	else
-		mycmakeargs+=( -DWITH_SIMPLESCREENRECORDER="false" )
+		mycmakeargs+=(
+			# https://bugs.gentoo.org/660438
+			-DCMAKE_INSTALL_LIB32DIR="$(get_libdir)"
+			-DENABLE_32BIT_GLINJECT="true"
+			-DWITH_SIMPLESCREENRECORDER="false"
+		)
 	fi
 
 	cmake-utils_src_configure
 }
 
+pkg_preinst() {
+	xdg_pkg_preinst
+}
+
 pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
+	xdg_pkg_postinst
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
+	xdg_pkg_postrm
 }
diff --git a/media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild b/media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild
index 1cf430a123ec..852caf0a6bac 100644
--- a/media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild
+++ b/media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild
@@ -1,9 +1,9 @@
-# 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 cmake-multilib flag-o-matic gnome2-utils xdg-utils
+inherit cmake-multilib flag-o-matic xdg
 
 if [[ ${PV} = 9999 ]]; then
 	inherit git-r3
@@ -47,8 +47,8 @@ DEPEND="${RDEPEND}
 	dev-qt/linguist-tools:5
 "
 
-pkg_setup() {
-	if [[ ${ABI} == amd64 ]]; then
+pkg_pretend() {
+	if [[ "${ABI}" == amd64 ]]; then
 		elog "You may want to add USE flag 'abi_x86_32' when running a 64bit system"
 		elog "When added 32bit GLInject libraries are also included. This is"
 		elog "required if you want to use OpenGL recording on 32bit applications."
@@ -63,16 +63,22 @@ pkg_setup() {
 		ewarn "record videos with x264."
 		ewarn
 	fi
+}
 
+pkg_setup() {
 	# QT requires -fPIC. Compile fails otherwise.
 	# Recently removed from the default compile options upstream
 	# https://github.com/MaartenBaert/ssr/commit/25fe1743058f0d1f95f6fbb39014b6ac146b5180
 	append-flags -fPIC
 }
 
+src_prepare() {
+	# required because xdg.eclass overrides default cmake-utils_src_prepare
+	cmake-utils_src_prepare
+}
+
 multilib_src_configure() {
 	local mycmakeargs=(
-		-DENABLE_32BIT_GLINJECT="$(usex abi_x86_32)"
 		-DENABLE_X86_ASM="$(usex asm)"
 		-DWITH_PULSEAUDIO="$(multilib_native_usex pulseaudio)"
 		-DWITH_JACK="$(multilib_native_usex jack)"
@@ -86,20 +92,30 @@ multilib_src_configure() {
 	fi
 
 	if multilib_is_native_abi ; then
-		mycmakeargs+=( -DWITH_QT5="true" )
+		mycmakeargs+=(
+			-DENABLE_32BIT_GLINJECT="false"
+			-DWITH_QT5="true"
+		)
 	else
-		mycmakeargs+=( -DWITH_SIMPLESCREENRECORDER="false" )
+		mycmakeargs+=(
+			# https://bugs.gentoo.org/660438
+			-DCMAKE_INSTALL_LIB32DIR="$(get_libdir)"
+			-DENABLE_32BIT_GLINJECT="true"
+			-DWITH_SIMPLESCREENRECORDER="false"
+		)
 	fi
 
 	cmake-utils_src_configure
 }
 
+pkg_preinst() {
+	xdg_pkg_preinst
+}
+
 pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
+	xdg_pkg_postinst
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
+	xdg_pkg_postrm
 }
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index e911fd28e76c..835217564bbf 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -7,7 +7,9 @@ AUX vlc-3.0.6-libvpx-1.8.0.patch 1147 BLAKE2B b12fa40a02dcc5d6ba319b773cb4bcfa52
 AUX vlc-3.0.6-sftp.patch 979 BLAKE2B b6fd797112363e5fb0f0721eeeb92ee7b5c9a9e1a9450e51a99346dd824f75089775ae09c0dbc48dce7adaa889f3b03570d2d995b2aade6e73ffcd8e8765cf51 SHA512 3f510d9b007ce353211db878b671c43b17abffafd22a03c883e509808ce8b46bf64fa48e64d077c1e8f6ba2cd1f3e08a24e5db48fcda9cba02bdf266ca1a4378
 AUX vlc-9999-libupnp-slot-1.8.patch 763 BLAKE2B 6bc8cf46f029db27d6d30d96e871d3bcfddee004e4e8469e1526a6a38fb5cc11a24a19888443e5f9062d7145665d594e142c12f3a9693967f195bab3b33ada38 SHA512 dd3375997a1935d3a227231785f35e300e3f992034da6a9c3019e28c68c1f005cbdd67190672264b342abc719e69005f965599f7af975e2bbd4cfccd89e3770d
 DIST vlc-3.0.6.tar.xz 25699704 BLAKE2B 91c43fa3ceb6f55a3808c64a661ca453f0872f01eecc801921eb1b9f9cc462478b1fcd6f7cc36f33b7e1085320710b27a42a3b7b49dd74338fe63a3a46f36b0f SHA512 7c72e98f30ce5c5a94d74e097fa9960442f89240079b042a729f8a33dd7fedee2538c86c99738ccef2eb27f29055f0221d4c70316e3312c5ebba9565eaa15c52
+DIST vlc-3.0.7.tar.xz 26059760 BLAKE2B 552ba7dce17219a632a011203e45405085ea39ec5b4bf062f9e94501fc4c24ea5a8c73f96690fd2b6d8e15be3fedcb9c5d01e5fced3a8725bf21e1e63655393f SHA512 0ee2407b44c6ed33e4c4089a9e00702dd65eb9a50173ca4028411ddd6de51fdee1f437de48941b2a9e449e647d14e16907be35daeb273b3ddfec92e0cd330bec
 EBUILD vlc-3.0.6-r1.ebuild 13308 BLAKE2B 69eb584b41942885678439a16b0b99ccba1e00f6c369233a23d190b739d9ce2906e5c7fe2d4a2bff38edd5f03bb047f016a40839c9ea788c60b5824068e64db9 SHA512 fa81f931ed9216997be00835584542224eec9c74086b2df48c6c00ad8d3b15b88e51769402997103ed303fc77e81a35ed087b46a59c2306a1f510260454c5075
+EBUILD vlc-3.0.7.ebuild 13095 BLAKE2B be7332c48b815e83afb4e138ee6d64f43feeead4a03b37acebea1668f3df7c0a7023311ecbe3d2a881b573dab63dd3e53d7aae2943545b702a8e5e0a241a9d2b SHA512 c78a9aa66f3cfe5fd7723cacab40c606ad6a29eae98b459d6d964bc1cef656dd78687197f2f7d9d4d04eae51f84db9dbace94448f3f572e377c9501b6396a6e7
 EBUILD vlc-3.0.9999.ebuild 13105 BLAKE2B cb8098cb3cac5c90c57b170bd7e8947ac17a0f12721c0783af940acbbdd41b05362e9160aa3e2d4ee45453f5e105f07fc84ad7dccc91231bc9e4f1e155b74ca8 SHA512 61a250dcc2e246269eab095e3ecc13173471c2f8ef79e20158b3d495f64b7367585d06cb7aea4c0235c928321858b9d303d21953a7ef93449114d51dbb09ad89
 EBUILD vlc-9999.ebuild 12990 BLAKE2B a55dc13a60632cbdb925007c8dd52ebc964125e8d4412557ff281cc206143c35ef9d41ba813b68d1976e5dd1224bc0c030b0bf0819ec7921b2d196da4e0b8820 SHA512 86e8e1e2d58d59d6c3ae5999fa27b025e4b1304c000a10c9935f013bb9c77379a2397b0a13d5447c7f04167a1de9938ded9ea60baf9e071d411ff8a117ffddb4
 MISC metadata.xml 5087 BLAKE2B 57254aa856882b33eb97358623d2600cb07e30d1554316de645d808f1bb6a7442cfb3b3fe6422f5de72dcadab06fbae28aa2c7b1d88d8fa588472de76d20fa23 SHA512 eb14beac4431445a8920190edac1a2a0b818565dc352b5df1e05dcddd4ff15a817e2624bce66a6aea431fa17b2203732bb9165396528e9a13c5dafacfce39274
diff --git a/media-video/vlc/vlc-3.0.7.ebuild b/media-video/vlc/vlc-3.0.7.ebuild
new file mode 100644
index 000000000000..9220dbf11a1a
--- /dev/null
+++ b/media-video/vlc/vlc-3.0.7.ebuild
@@ -0,0 +1,495 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-beta/-test}"
+MY_P="${PN}-${MY_PV}"
+if [[ ${PV} = *9999 ]] ; then
+	if [[ ${PV%.9999} != ${PV} ]] ; then
+		EGIT_REPO_URI="https://git.videolan.org/git/vlc/vlc-${PV%.9999}.git"
+	else
+		EGIT_REPO_URI="https://git.videolan.org/git/vlc.git"
+	fi
+	inherit git-r3
+else
+	if [[ ${MY_P} = ${P} ]] ; then
+		SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz"
+	else
+		SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
+	fi
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86"
+fi
+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/"
+
+LICENSE="LGPL-2.1 GPL-2"
+SLOT="0/5-9" # vlc - vlccore
+
+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 libplacebo +libsamplerate libtar libtiger linsys lirc
+	live lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses
+	neon nfs ogg omxil opencv optimisememory opus png postproc projectm pulseaudio
+	+qt5 rdp run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl
+	svg taglib theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vorbis vpx
+	wayland +X x264 x265 xml zeroconf zvbi cpu_flags_x86_mmx cpu_flags_x86_sse
+"
+REQUIRED_USE="
+	chromecast? ( encode )
+	directx? ( ffmpeg )
+	fontconfig? ( truetype )
+	libcaca? ( X )
+	libtar? ( skins )
+	libtiger? ( kate )
+	postproc? ( ffmpeg )
+	skins? ( qt5 truetype X xml )
+	ssl? ( gcrypt )
+	vaapi? ( ffmpeg X )
+	vdpau? ( ffmpeg X )
+"
+BDEPEND="
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	amd64? ( dev-lang/yasm )
+	x86? ( dev-lang/yasm )
+"
+RDEPEND="
+	net-dns/libidn:=
+	sys-libs/zlib[minizip]
+	virtual/libintl
+	virtual/opengl
+	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
+		media-libs/freetype:2[harfbuzz]
+		media-libs/harfbuzz
+		virtual/ttf-fonts
+	)
+	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 )
+	dc1394? (
+		media-libs/libdc1394:2
+		sys-libs/libraw1394
+	)
+	dts? ( media-libs/libdca )
+	dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= )
+	dvd? (
+		>=media-libs/libdvdnav-4.9
+		>=media-libs/libdvdread-4.9
+	)
+	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
+		media-libs/libogg
+	)
+	fluidsynth? ( media-sound/fluidsynth:= )
+	fontconfig? ( media-libs/fontconfig:1.0 )
+	gcrypt? (
+		dev-libs/libgcrypt:0=
+		dev-libs/libgpg-error
+	)
+	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
+		sys-libs/libraw1394
+	)
+	jack? ( virtual/jack )
+	jpeg? ( virtual/jpeg:0 )
+	kate? ( media-libs/libkate )
+	libass? (
+		media-libs/fontconfig:1.0
+		media-libs/libass:=
+	)
+	libcaca? ( media-libs/libcaca )
+	libnotify? (
+		dev-libs/glib:2
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:3
+		x11-libs/libnotify
+	)
+	libplacebo? ( media-libs/libplacebo )
+	libsamplerate? ( media-libs/libsamplerate )
+	libtar? ( dev-libs/libtar )
+	libtiger? ( media-libs/libtiger )
+	linsys? ( media-libs/zvbi )
+	lirc? ( app-misc/lirc )
+	live? ( media-plugins/live:= )
+	lua? ( >=dev-lang/lua-5.1:0= )
+	mad? ( media-libs/libmad )
+	matroska? (
+		dev-libs/libebml:=
+		media-libs/libmatroska:=
+	)
+	modplug? ( media-libs/libmodplug )
+	mp3? ( media-sound/mpg123 )
+	mpeg? ( media-libs/libmpeg2 )
+	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 )
+	opencv? ( media-libs/opencv:= )
+	opus? ( >=media-libs/opus-1.0.3 )
+	png? ( media-libs/libpng:0= )
+	postproc? ( libav? ( media-libs/libpostproc ) )
+	projectm? (
+		media-fonts/dejavu
+		media-libs/libprojectm
+	)
+	pulseaudio? ( media-sound/pulseaudio )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+		X? (
+			dev-qt/qtx11extras:5
+			x11-libs/libX11
+		)
+	)
+	rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client] )
+	samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] )
+	sdl-image? ( media-libs/sdl-image )
+	sftp? ( net-libs/libssh2 )
+	shout? ( media-libs/libshout )
+	sid? ( media-libs/libsidplay:2 )
+	skins? (
+		x11-libs/libXext
+		x11-libs/libXinerama
+		x11-libs/libXpm
+	)
+	soxr? ( >=media-libs/soxr-0.1.2 )
+	speex? (
+		>=media-libs/speex-1.2.0
+		media-libs/speexdsp
+	)
+	srt? ( net-libs/srt )
+	ssl? ( net-libs/gnutls:= )
+	svg? (
+		gnome-base/librsvg:2
+		x11-libs/cairo
+	)
+	taglib? ( >=media-libs/taglib-1.9 )
+	theora? ( media-libs/libtheora )
+	tremor? ( media-libs/tremor )
+	truetype? (
+		media-libs/freetype:2
+		virtual/ttf-fonts
+		!fontconfig? ( media-fonts/dejavu )
+	)
+	twolame? ( media-sound/twolame )
+	udev? ( virtual/udev )
+	upnp? ( net-libs/libupnp:= )
+	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
+	)
+	X? (
+		x11-libs/libX11
+		x11-libs/libxcb
+		x11-libs/xcb-util
+		x11-libs/xcb-util-keysyms
+	)
+	x264? ( >=media-libs/x264-0.0.20190214:= )
+	x265? ( media-libs/x265:= )
+	xml? ( dev-libs/libxml2:2 )
+	zeroconf? ( net-dns/avahi[dbus] )
+	zvbi? ( media-libs/zvbi )
+"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system
+	"${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164
+	"${FILESDIR}"/${PN}-3.0.6-fdk-aac-2.0.0.patch # bug 672290
+)
+
+DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	xdg_src_prepare # bug 608256
+
+	has_version '>=net-libs/libupnp-1.8.0' && \
+		eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch
+
+	# Bootstrap when we are on a git checkout.
+	if [[ ${PV} = *9999 ]] ; then
+		./bootstrap
+	fi
+
+	# Make it build with libtool 1.5
+	rm m4/lt* m4/libtool.m4 || die
+
+	# We are not in a real git checkout due to the absence of a .git directory.
+	touch src/revision.txt || die
+
+	# Don't use --started-from-file when not using dbus.
+	if ! use dbus ; then
+		sed -i 's/ --started-from-file//' share/vlc.desktop.in || die
+	fi
+
+	# Disable running of vlc-cache-gen, we do that in pkg_postinst
+	sed -e "/test.*build.*host/s/\$(host)/nothanks/" \
+		-i Makefile.am -i bin/Makefile.am || die "Failed to disable vlc-cache-gen"
+
+	eautoreconf
+
+	# Disable automatic running of tests.
+	find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {} \; || die
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-aa
+		--disable-dependency-tracking
+		--disable-optimizations
+		--disable-rpath
+		--disable-update-check
+		--enable-fast-install
+		--enable-screen
+		--enable-vcd
+		--enable-vlc
+		$(use_enable a52)
+		$(use_enable alsa)
+		$(use_enable altivec)
+		$(use_enable aom)
+		$(use_enable archive)
+		$(use_enable aribsub)
+		$(use_enable bidi fribidi)
+		$(use_enable bidi harfbuzz)
+		$(use_enable bluray)
+		$(use_enable cddb libcddb)
+		$(use_enable chromaprint)
+		$(use_enable chromecast)
+		$(use_enable chromecast microdns)
+		$(use_enable cpu_flags_x86_mmx mmx)
+		$(use_enable cpu_flags_x86_sse sse)
+		$(use_enable dav1d)
+		$(use_enable dbus)
+		$(use_enable dbus kwallet)
+		$(use_enable dc1394)
+		$(use_enable debug)
+		$(use_enable directx)
+		$(use_enable directx d3d11va)
+		$(use_enable directx dxva2)
+		$(use_enable dts dca)
+		$(use_enable dvbpsi)
+		$(use_enable dvd dvdnav)
+		$(use_enable dvd dvdread)
+		$(use_enable encode sout)
+		$(use_enable encode vlm)
+		$(use_enable faad)
+		$(use_enable fdk fdkaac)
+		$(use_enable ffmpeg avcodec)
+		$(use_enable ffmpeg avformat)
+		$(use_enable ffmpeg swscale)
+		$(use_enable flac)
+		$(use_enable fluidsynth)
+		$(use_enable fontconfig)
+		$(use_enable gcrypt libgcrypt)
+		$(use_enable gme)
+		$(use_enable gnome-keyring secret)
+		$(use_enable gstreamer gst-decode)
+		$(use_enable ieee1394 dv1394)
+		$(use_enable jack)
+		$(use_enable jpeg)
+		$(use_enable kate)
+		$(use_enable libass)
+		$(use_enable libcaca caca)
+		$(use_enable libnotify notify)
+		$(use_enable libplacebo)
+		$(use_enable libsamplerate samplerate)
+		$(use_enable libtar)
+		$(use_enable libtiger tiger)
+		$(use_enable linsys)
+		$(use_enable lirc)
+		$(use_enable live live555)
+		$(use_enable lua)
+		$(use_enable macosx-notifications osx-notifications)
+		$(use_enable mad)
+		$(use_enable matroska)
+		$(use_enable modplug mod)
+		$(use_enable mp3 mpg123)
+		$(use_enable mpeg libmpeg2)
+		$(use_enable mtp)
+		$(use_enable musepack mpc)
+		$(use_enable ncurses)
+		$(use_enable neon)
+		$(use_enable ogg)
+		$(use_enable omxil)
+		$(use_enable omxil omxil-vout)
+		$(use_enable opencv)
+		$(use_enable optimisememory optimize-memory)
+		$(use_enable opus)
+		$(use_enable png)
+		$(use_enable postproc)
+		$(use_enable projectm)
+		$(use_enable pulseaudio pulse)
+		$(use_enable qt5 qt)
+		$(use_enable rdp freerdp)
+		$(use_enable run-as-root)
+		$(use_enable samba smbclient)
+		$(use_enable sdl-image)
+		$(use_enable sftp)
+		$(use_enable shout)
+		$(use_enable sid)
+		$(use_enable skins skins2)
+		$(use_enable soxr)
+		$(use_enable speex)
+		$(use_enable srt)
+		$(use_enable ssl gnutls)
+		$(use_enable svg)
+		$(use_enable svg svgdec)
+		$(use_enable taglib)
+		$(use_enable theora)
+		$(use_enable tremor)
+		$(use_enable twolame)
+		$(use_enable udev)
+		$(use_enable upnp)
+		$(use_enable v4l v4l2)
+		$(use_enable vaapi libva)
+		$(use_enable vdpau)
+		$(use_enable vnc)
+		$(use_enable vorbis)
+		$(use_enable vpx)
+		$(use_enable wayland)
+		$(use_with X x)
+		$(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)
+		$(use_enable zvbi)
+		$(use_enable !zvbi telx)
+		--with-kde-solid=/usr/share/solid/actions
+		--disable-asdcp
+		--disable-coverage
+		--disable-cprof
+		--disable-crystalhd
+		--disable-decklink
+		--disable-gles2
+		--disable-goom
+		--disable-kai
+		--disable-kva
+		--disable-macosx-qtkit
+		--disable-maintainer-mode
+		--disable-merge-ffmpeg
+		--disable-mfx
+		--disable-mmal
+		--disable-opensles
+		--disable-oss
+		--disable-rpi-omxil
+		--disable-schroedinger
+		--disable-shine
+		--disable-sndio
+		--disable-spatialaudio
+		--disable-vsxu
+		--disable-wasapi
+		--disable-wma-fixed
+	)
+	# ^ We don't have these disabled libraries in the Portage tree yet.
+
+	# Compatibility fix for Samba 4.
+	use samba && append-cppflags "-I/usr/include/samba-4.0"
+
+	if use x86; then
+		# We need to disable -fstack-check if use >=gcc 4.8.0. bug #499996
+		append-cflags $(test-flags-CC -fno-stack-check)
+		# Bug 569774
+		replace-flags -Os -O2
+	fi
+
+	# VLC now requires C++11 after commit 4b1c9dcdda0bbff801e47505ff9dfd3f274eb0d8
+	append-cxxflags -std=c++11
+
+	# FIXME: Needs libresid-builder from libsidplay:2 which is in another directory...
+	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
+
+	if use truetype || use bidi; then
+		myeconfargs+=( --enable-freetype )
+	else
+		myeconfargs+=( --disable-freetype )
+	fi
+
+	if use truetype || use projectm; then
+		local dejavu="/usr/share/fonts/dejavu/"
+		myeconfargs+=(
+			--with-default-font=${dejavu}/DejaVuSans.ttf
+			--with-default-font-family=Sans
+			--with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf
+			--with-default-monospace-font-family=Monospace
+		)
+	fi
+
+	econf "${myeconfargs[@]}"
+
+	# _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo.
+	# Other values may break the build (bug 523144), so definition should not be removed.
+	# To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the start of config.h
+	sed -i '1i#undef _FORTIFY_SOURCE' config.h || die
+}
+
+src_test() {
+	virtx emake check-TESTS
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	if [[ -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
+		ewarn "We cannot run vlc-cache-gen (most likely ROOT!=/)"
+		ewarn "Please run /usr/$(get_libdir)/vlc/vlc-cache-gen manually"
+		ewarn "If you do not do it, vlc will take a long time to load."
+	fi
+
+	xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	if [[ -e /usr/$(get_libdir)/vlc/plugins/plugins.dat ]]; then
+		rm /usr/$(get_libdir)/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat"
+	fi
+
+	xdg_pkg_postrm
+}