gentoo resync : 30.09.2018

15 files changed, 22 insertions, 394 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index a6fc46699466..cf8a4e0878c6 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/libav/Manifest b/media-video/libav/Manifest
index eed40f26f6b0..10b94f17e656 100644
--- a/media-video/libav/Manifest
+++ b/media-video/libav/Manifest
@@ -10,7 +10,7 @@ DIST libav-13_pre20171219.tar.xz 5427904 BLAKE2B 074dc5d071aeb656fc14a015c2e3c16
 DIST libav-9.17.tar.xz 4080028 BLAKE2B 206e80835292af9f4c1c65539e69981b6993679c11e8a1feef1e37dc32174e47744ebce319b8709bcd60804f493fab1e524c781e174d60d9ebe35ad01f6fbc60 SHA512 20af83d4b6a23c159c2386b6592ba6a6acf3f2c54e8aeb16dd0c8a64d637fbde24f37b864698b1143c6802b64a7b5e8ddfe0e7601b35c35686a789e2b3232f5a
 EBUILD libav-11.8.ebuild 11090 BLAKE2B bce6ee5af8fb86a4ca1c760fff386b4e3c7c70f4b8353e2d24162c7da9a42ee742b6a230b3e6b84ef57fb1bd957bb83e2d7c340e669ea2de4f98e46c2af8f319 SHA512 6b50605fe7e2d0f9468fa46e8d7b513db03603622ff69559e4517c1f610ea4be8fb8bceada46ab50694cc9bbbf6c0a5d1d2aa35a20046ffda7a60d4991d74037
 EBUILD libav-11.9999.ebuild 10990 BLAKE2B 2bab5e0b48d1d490d35c991fd74f4629a0de5b5375d7f9955c0d49c4f7a35fd6f1cfcc91b09833d89dc8f4fe01a29b0ab9058887c2ab2a299a957c0a6acfd50d SHA512 d5a1a7ecd91dbf0bad318ec8c5705afff4b12fd956da8e2a06ac7de002dd23e3dd8a86b5e162097901617d52ca0bdafd5ccc09b08fec51dc9b249d2169b58d90
-EBUILD libav-12.2.ebuild 11368 BLAKE2B 466d137e1af49b2a85d63c07d69fec072866ce6794c151828886ce5b362a9c033fa2704a1232f80f760e919b3d99e6aa559aa7549511f9ba9ab87b65bdb6bbf4 SHA512 39711c1372fa9526968e2c5c7f4031a2e98f0f612b5fa2bc4b726a4e6bbcfc260a01bc7aba6137b225bfc84b428437789a24a9440f5e68e72c05b98a0d53f978
+EBUILD libav-12.2.ebuild 11367 BLAKE2B 44f05754c5fa9cb2e93ef69804cd04426caced01fa12ab8d51aa0a98d277c5b1c1c5aa551816888a87188934c4155979830d1cd742940cfd877da15499d94e68 SHA512 d52ef20dc17f0cf14f12b8bed6eee953a17b4530b5339d50419a5a17d87b19854cbab224ccd2c0a3e225ed89ed119a70d50cfbe10cd620077f323158bcd1fbf9
 EBUILD libav-13_pre20171219.ebuild 10790 BLAKE2B 5a33e384d54549ec4fad1c082022b9d7187c3e3032461c38a1e237683e6e27b400a7bf23bc220fde169b1b2d7fd59b50620dbc4c4d9d2c8b2df195fbd3d4be05 SHA512 764fbebd1a086913e2a85430732a7b56a369a02a0200f10ed6fd7fef552bf76638df65601f7e2afdbc68987dccd777c403ed2799cca096bf606e382ee2681f54
 EBUILD libav-9.17.ebuild 9976 BLAKE2B 053e88c957d482f172b0ad170ed35712e86758d945df08e666640b28743d8970fc2c481b69c0ed74234a2a66e4e0116573f7e660500365f77e6ca3b41b55007e SHA512 0dba0e1cd904a8cacf6d50e6370983bba1dd85d5495e934d83def260a35a4d28fb14876d36d528dc4b2a34442e0d22b22e69a10b2b7d13506c9f175fad3e980a
 EBUILD libav-9999.ebuild 10849 BLAKE2B 1cccc4d2a8e55b9bc0f14d838689a253d52db1e741fe22f8b00bf2d90ab1460b0598e7c1fe9773ed7650af8d20942601698ae86e465272054ec8f5bb28b22936 SHA512 0c41cc11dd22ab4a7afe412e78e07d693a57dfbc97667a4bbe12eb294406f524d287a226ac7911ed3b6a329bf9a5b1b20d08f96d9cdb614fa947c9ef19f10035
diff --git a/media-video/libav/libav-12.2.ebuild b/media-video/libav/libav-12.2.ebuild
index 4a74879aae80..588da2ba1e60 100644
--- a/media-video/libav/libav-12.2.ebuild
+++ b/media-video/libav/libav-12.2.ebuild
@@ -30,7 +30,7 @@ fi
 
 LICENSE="LGPL-2.1  gpl? ( GPL-3 )"
 SLOT="0/12"
-[[ ${PV} == *9999 ]] || KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+[[ ${PV} == *9999 ]] || KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="aac alsa amr bs2b +bzip2 cdio cpudetection custom-cflags debug doc +encode faac fdk
 	frei0r fontconfig +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k libressl mp3
 	+network nvidia openssl opus oss pic pulseaudio rtmp schroedinger sdl speex ssl
diff --git a/media-video/nvidia-settings/Manifest b/media-video/nvidia-settings/Manifest
deleted file mode 100644
index 7b991effdf7f..000000000000
--- a/media-video/nvidia-settings/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-DIST nvidia-settings-340.58.tar.bz2 1549850 BLAKE2B 3b526854c231a999c6072b1251f9cc542fc7ddead7ad07cbf702dbacea584d99f3e8f7e8a3f2246b53cfff409f4d0b8a93f7260c170446d8cf2008fdd6ce99d0 SHA512 4c581a940c99fac28564ab6154f47cae496ebfda6339b7f10c5decf8fea52b6c12e5b63dfcf78f8365909e49539560a50338edb17117881b6a03c196bd51836c
-DIST nvidia-settings-355.11.tar.bz2 1570699 BLAKE2B 8eafd72d71d7469420b4b0e916dcdc876f3a2b84e3f49749465825de674cec8bcb40d1ea50efc757b0c8c8c9bf96c7bccd521f9f264482c3ef4e9ca674d08707 SHA512 7565e3d809c5f27ec9ca092a6369cf89ca7571e0cb1b1285c50192cc1cc763e95316d9c71d06ed2333077b97946318e825c6d672f48549b58bd41faa673fb49c
-DIST nvidia-settings-358.16.tar.bz2 1571104 BLAKE2B 0d56d4f54279712a2f8f549539e9cb6953dce9cc35784d4aea9d13f45a477dfab3afa5b622ea877413e80b8c57a14c392d0309e38815c8da02b3bd1ef6c9635c SHA512 0438aa2599e98f68a04c9f663f4ef9b05092df512fbca40ad0fe17e25ca4d940d02cc55e9fd44a2551950a2a30782d1e48553c4bebd071bfff280869a6dde556
-EBUILD nvidia-settings-340.58-r1.ebuild 1607 BLAKE2B a801dcb213741a661339822efab2edda7511c27a78b41c49501d3b604f9d2c75e579a08dcf252a7c011a5e8f4c5d1902f6e7fbb49a62712126527f3a7f4d7610 SHA512 e9758d7ab81ee6a88f5ebec87a8e793c394ff9ef5fbb246843bfb824e390059359ded39890db71b362c46e4052319439c6573c3d5a1276dd9bae17a59788f9c1
-EBUILD nvidia-settings-340.58.ebuild 1607 BLAKE2B 9a26dc24a2ddabee169dabb730db9e099164b55ec026ad50e72d91fbe8029ef3ac6b4cca74aa25e22a3c5a3211e8e04d652d1231ea1993da2b78e3a4253ae57e SHA512 a9aea2b25b2fa9da1a7438755605f0a83f4eb57a65d4dce76be2a2e175a232f7d8de4ebf0c635063b0c8babdd9d5062f6eeca28de17d2debc183e5d82922f040
-EBUILD nvidia-settings-355.11.ebuild 1750 BLAKE2B 9bdca8b498eb305e2c71d3aede5acea86748d2b3a25d2185b15e8aa805bc79516b4008e878f323f212665fa4dc528bef6d2dcd63c1235d8e8fda49ad18711f3e SHA512 75779c106546c6c0758a75a196bc6ab78169c5646cf54bc82b8610356d0091c74ee20f2a04dfcabe41cce4d0cc53f7616b92d3f7aebcb8f6ae4a742d72a8b942
-EBUILD nvidia-settings-358.16.ebuild 1750 BLAKE2B a4393866a14f5f48ce30767a212d18dfcb89fe1d3ae8b2ca50af59de5fcda7f2ce15fcfa099280cc9d89dd5338bb1b531168064bf5adeb41cb1c171c23554568 SHA512 936c544608eb776e677db9e2e8e1b05e918f860753d2756d8d762e60f2a0ae73dfcb14a63925c08bca917191eb0db37aca2b9b26c529b5519524dbc7c0f9e950
-MISC metadata.xml 246 BLAKE2B 603cfa77d2b4f6d1caac941370c4c940334959a4d7b719cde31416ab3db10537a0a1e5880d825e0fb22fd7951d4bfcad39aee60fba05b6ff47683f5bdeb99416 SHA512 c21e6c80b2ebfaad5808238bdadb375dfc148dc6a649c40a631798e07066e58210f7a44ee95803c02a7b0e36e724424e7606d91203c12c13b36d030eceb5f77e
diff --git a/media-video/nvidia-settings/metadata.xml b/media-video/nvidia-settings/metadata.xml
deleted file mode 100644
index c2b094fe3acf..000000000000
--- a/media-video/nvidia-settings/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<use>
-		<flag name="gtk3">Additionally build the GTK 3 library</flag>
-	</use>
-</pkgmetadata>
diff --git a/media-video/nvidia-settings/nvidia-settings-340.58-r1.ebuild b/media-video/nvidia-settings/nvidia-settings-340.58-r1.ebuild
deleted file mode 100644
index 10851bb2c8f2..000000000000
--- a/media-video/nvidia-settings/nvidia-settings-340.58-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="NVIDIA Linux X11 Settings Utility"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="ftp://download.nvidia.com/XFree86/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-IUSE="examples"
-
-COMMON_DEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXxf86vm
-	x11-libs/gtk+:2
-	x11-libs/gdk-pixbuf[X]
-	media-libs/mesa
-	x11-libs/pango[X]
-	x11-libs/libXv
-	x11-libs/libXrandr
-	dev-libs/glib:2
-	dev-libs/jansson"
-
-RDEPEND="
-	x11-drivers/nvidia-drivers:0/340
-	${COMMON_DEPEND}
-	x11-libs/libvdpau"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto"
-
-src_compile() {
-	einfo "Building libXNVCtrl..."
-	emake -C src/ \
-		CC="$(tc-getCC)" \
-		AR="$(tc-getAR)" \
-		RANLIB="$(tc-getRANLIB)" \
-		build-xnvctrl
-
-	einfo "Building nvidia-settings..."
-	emake -C src/ \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getLD)" \
-		STRIP_CMD="$(type -P true)" \
-		NV_VERBOSE=1 \
-		NV_USE_BUNDLED_LIBJANSSON=0
-}
-
-src_install() {
-	emake -C src/ DESTDIR="${D}" PREFIX=/usr NV_USE_BUNDLED_LIBJANSSON=0 install
-
-	insinto /usr/$(get_libdir)
-	doins src/libXNVCtrl/libXNVCtrl.a
-
-	insinto /usr/include/NVCtrl
-	doins src/libXNVCtrl/*.h
-
-#	doicon doc/${PN}.png # Installed through nvidia-drivers
-	make_desktop_entry ${PN} "NVIDIA X Server Settings" ${PN} Settings
-
-	# bug 412569 - Installed through nvidia-drivers
-#	rm -rf "${D}"/usr/share/man
-
-	dodoc doc/*.txt
-
-	if use examples; then
-		docinto examples/
-		dodoc samples/*.c
-		dodoc samples/README
-	fi
-}
diff --git a/media-video/nvidia-settings/nvidia-settings-340.58.ebuild b/media-video/nvidia-settings/nvidia-settings-340.58.ebuild
deleted file mode 100644
index 5e890a832b15..000000000000
--- a/media-video/nvidia-settings/nvidia-settings-340.58.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="NVIDIA Linux X11 Settings Utility"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="ftp://download.nvidia.com/XFree86/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* amd64 x86 ~x86-fbsd"
-IUSE="examples"
-
-COMMON_DEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXxf86vm
-	x11-libs/gtk+:2
-	x11-libs/gdk-pixbuf[X]
-	media-libs/mesa
-	x11-libs/pango[X]
-	x11-libs/libXv
-	x11-libs/libXrandr
-	dev-libs/glib:2
-	dev-libs/jansson"
-
-RDEPEND="
-	~x11-drivers/nvidia-drivers-340.93
-	${COMMON_DEPEND}
-	x11-libs/libvdpau"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto"
-
-src_compile() {
-	einfo "Building libXNVCtrl..."
-	emake -C src/ \
-		CC="$(tc-getCC)" \
-		AR="$(tc-getAR)" \
-		RANLIB="$(tc-getRANLIB)" \
-		build-xnvctrl
-
-	einfo "Building nvidia-settings..."
-	emake -C src/ \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getLD)" \
-		STRIP_CMD="$(type -P true)" \
-		NV_VERBOSE=1 \
-		NV_USE_BUNDLED_LIBJANSSON=0
-}
-
-src_install() {
-	emake -C src/ DESTDIR="${D}" PREFIX=/usr NV_USE_BUNDLED_LIBJANSSON=0 install
-
-	insinto /usr/$(get_libdir)
-	doins src/libXNVCtrl/libXNVCtrl.a
-
-	insinto /usr/include/NVCtrl
-	doins src/libXNVCtrl/*.h
-
-#	doicon doc/${PN}.png # Installed through nvidia-drivers
-	make_desktop_entry ${PN} "NVIDIA X Server Settings" ${PN} Settings
-
-	# bug 412569 - Installed through nvidia-drivers
-#	rm -rf "${D}"/usr/share/man
-
-	dodoc doc/*.txt
-
-	if use examples; then
-		docinto examples/
-		dodoc samples/*.c
-		dodoc samples/README
-	fi
-}
diff --git a/media-video/nvidia-settings/nvidia-settings-355.11.ebuild b/media-video/nvidia-settings/nvidia-settings-355.11.ebuild
deleted file mode 100644
index 8225afc77a3e..000000000000
--- a/media-video/nvidia-settings/nvidia-settings-355.11.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="NVIDIA Linux X11 Settings Utility"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="ftp://download.nvidia.com/XFree86/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-IUSE="examples gtk3"
-
-COMMON_DEPEND="
-	x11-libs/gtk+:2
-	gtk3? ( x11-libs/gtk+:3 )
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXxf86vm
-	x11-libs/gdk-pixbuf[X]
-	media-libs/mesa
-	x11-libs/pango[X]
-	x11-libs/libXv
-	x11-libs/libXrandr
-	dev-libs/glib:2
-	dev-libs/jansson
-	x11-libs/cairo
-	>=x11-libs/libvdpau-1.0"
-
-RDEPEND="${COMMON_DEPEND}
-	x11-drivers/nvidia-drivers:0/355"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto"
-
-src_compile() {
-	einfo "Building libXNVCtrl..."
-	emake -C src/ \
-		CC="$(tc-getCC)" \
-		AR="$(tc-getAR)" \
-		RANLIB="$(tc-getRANLIB)" \
-		build-xnvctrl
-
-	einfo "Building nvidia-settings..."
-	emake -C src/ \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getLD)" \
-		STRIP_CMD="$(type -P true)" \
-		NV_VERBOSE=1 \
-		NV_USE_BUNDLED_LIBJANSSON=0 \
-		NVML_AVAILABLE=0 \
-		GTK3_AVAILABLE=$(usex gtk3 1 0)
-}
-
-src_install() {
-	emake -C src/ DESTDIR="${D}" PREFIX=/usr NV_USE_BUNDLED_LIBJANSSON=0 GTK3_AVAILABLE=$(usex gtk3 1 0) install
-
-	insinto /usr/$(get_libdir)
-	doins src/libXNVCtrl/libXNVCtrl.a
-
-	insinto /usr/include/NVCtrl
-	doins src/libXNVCtrl/*.h
-
-#	doicon doc/${PN}.png # Installed through nvidia-drivers
-	make_desktop_entry ${PN} "NVIDIA X Server Settings" ${PN} Settings
-
-	# bug 412569 - Installed through nvidia-drivers
-#	rm -rf "${D}"/usr/share/man
-
-	dodoc doc/*.txt
-
-	if use examples; then
-		docinto examples/
-		dodoc samples/*.c
-		dodoc samples/README
-	fi
-}
diff --git a/media-video/nvidia-settings/nvidia-settings-358.16.ebuild b/media-video/nvidia-settings/nvidia-settings-358.16.ebuild
deleted file mode 100644
index 1ef8e7edc4b8..000000000000
--- a/media-video/nvidia-settings/nvidia-settings-358.16.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="NVIDIA Linux X11 Settings Utility"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="ftp://download.nvidia.com/XFree86/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-IUSE="examples gtk3"
-
-COMMON_DEPEND="
-	x11-libs/gtk+:2
-	gtk3? ( x11-libs/gtk+:3 )
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXxf86vm
-	x11-libs/gdk-pixbuf[X]
-	media-libs/mesa
-	x11-libs/pango[X]
-	x11-libs/libXv
-	x11-libs/libXrandr
-	dev-libs/glib:2
-	dev-libs/jansson
-	x11-libs/cairo
-	>=x11-libs/libvdpau-1.0"
-
-RDEPEND="${COMMON_DEPEND}
-	x11-drivers/nvidia-drivers:0/358"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto"
-
-src_compile() {
-	einfo "Building libXNVCtrl..."
-	emake -C src/ \
-		CC="$(tc-getCC)" \
-		AR="$(tc-getAR)" \
-		RANLIB="$(tc-getRANLIB)" \
-		build-xnvctrl
-
-	einfo "Building nvidia-settings..."
-	emake -C src/ \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getLD)" \
-		STRIP_CMD="$(type -P true)" \
-		NV_VERBOSE=1 \
-		NV_USE_BUNDLED_LIBJANSSON=0 \
-		NVML_AVAILABLE=0 \
-		GTK3_AVAILABLE=$(usex gtk3 1 0)
-}
-
-src_install() {
-	emake -C src/ DESTDIR="${D}" PREFIX=/usr NV_USE_BUNDLED_LIBJANSSON=0 GTK3_AVAILABLE=$(usex gtk3 1 0) install
-
-	insinto /usr/$(get_libdir)
-	doins src/libXNVCtrl/libXNVCtrl.a
-
-	insinto /usr/include/NVCtrl
-	doins src/libXNVCtrl/*.h
-
-#	doicon doc/${PN}.png # Installed through nvidia-drivers
-	make_desktop_entry ${PN} "NVIDIA X Server Settings" ${PN} Settings
-
-	# bug 412569 - Installed through nvidia-drivers
-#	rm -rf "${D}"/usr/share/man
-
-	dodoc doc/*.txt
-
-	if use examples; then
-		docinto examples/
-		dodoc samples/*.c
-		dodoc samples/README
-	fi
-}
diff --git a/media-video/orion/Manifest b/media-video/orion/Manifest
index 819136077d10..79b866a58739 100644
--- a/media-video/orion/Manifest
+++ b/media-video/orion/Manifest
@@ -1,8 +1,6 @@
 AUX orion-1.6.1-fix_desktop.patch 491 BLAKE2B 70d44443f10c55023120f2ef9f53186e095306d149302e091ecdbb64076cad1d07413018bc4af4b90c5de32371ab609a641d81a34026ffb9a54991dcb03d203d SHA512 82b6a12d3fac7e0283154c961684bef1ae34490b8a1ec065ee1f1876bfeaa7eb9bc5d4e2c6d5b10291af80126c790c5bed1d8d796d81f98e112a419e449cd961
-DIST orion-1.3.5.tar.gz 3213988 BLAKE2B e4786a277d92caf20ff4aa4f5a31a683e60fc7c163699375f953bfd05b5e4a32920d547e708c900574ad6860ef741bcc39b4e70440f9781f831eb0f052861870 SHA512 afd5540b2a61181c3db051fd39dd42f8a96799d19aab814f5846c5270f13bb0cb8305cd69e09e69cf215aeafb66682cc6d70379e791d6bffc551a38a8c751d0d
-DIST orion-1.4.0.tar.gz 3375433 BLAKE2B 8e3b83d89780c46bc8a29cd6e7cdf679f2be9e5176ccc9bc50fc6714bf5aa6178ea138c78d6cd427f6fa7c9977e2af06a54812b380e1a1cdf8321643969c14d6 SHA512 0dadd66f806d9f4bf464e855b38e35cb762ba9cbc1c51a135e5fd489f3a5ebf80117f502eaa8225d0a4a72f15bc8e4858b92866148dc73ecc0d18fd1e1717bed
 DIST orion-1.6.1.tar.gz 614216 BLAKE2B 8fc0909c1dd433e72d4ed41046d38a861ec48cbe6e93e1a9cc48f31cb3ef381e1b5b998c501d20756883431464eef798859b9ba4d086b89575281dbc17afca69 SHA512 3db0b59a89d2364f2d0586c3f318fc793f73a17d767adb0f44b89830e397be6f24c2ab662b7c84e7d857bc42b952fdf7fa280090313f5e39e37205eb8fb6dc9e
-EBUILD orion-1.3.5.ebuild 849 BLAKE2B 58a7ea4fbf26acdf20ff1701f80ed9bbf3f52477df41a3e46a1a69efccd9734ebf136f3f2b19e8d5792f8a8966fad93667b7488bbef22e2704c5078817033152 SHA512 dcee0f9084783001baa6b6e9fbe99714e5e1d5f8535febb0fc96faae0a6401919b9bcba2dace4251ea919b19cfef65272cb592fcfcd49b6dae33d6c5f6b9d59b
-EBUILD orion-1.4.0.ebuild 1114 BLAKE2B 2f16e2139522ce80bf4a4079db64af6b21521c6bedc59884b60fb886001fce306420c5b14deda275cee317431e86b81a9dd650d8ce711d761f2ba7806b03dce6 SHA512 10383b8e2a14a259a16be826e883893d4595b9a078751626fe18749fb96b80709f95f679cd4bd9ea62b821a0f5ed9b8761ac199066dffac02fe0cddf6dd452a3
+DIST orion-1.6.5.tar.gz 624005 BLAKE2B ca2c40a299ab3f1abc7f383f2a5f39ebbe1e6ce6737efc3da0acd8cbbc04753dab865f417bd8e39d7e42dd7db8de703dd3b251296b8820a9027ca3ad2cd5de1d SHA512 6add27b81bf2520354e1a8854c2be4caf81d1c7c161003cb86bb4911852965cff938381c0ea481c64dc91c36d45f5af44cfb6e9a6d1c379f8b3b3011bbe47c6f
 EBUILD orion-1.6.1.ebuild 972 BLAKE2B 475db2a56a07a0ec72a56e87c5f17f721e0a4dec0278847dde90b2374ce0e009d9f68e45128165d5dc64ea9582a77599a9e6f9f387014233bb1fdaf3c06941a3 SHA512 b6eb5de3734dbae9c8cbcb2f61cf0baf50f83a10b7f8bfa03a0cbabbd5c2985d628df544024e9c45dc282d1f2a5dd7e89b0f473dc8c6a1894032836b76108ffc
-MISC metadata.xml 486 BLAKE2B 9cc7562afaaf273a197bfc12e83421462c2964fc8a130eaafd0e9c1ac80c25d515f3c870838d973c55dd67edc9fec38a99d8b4cad8090c1eb01a729755120f31 SHA512 da5a7a2f3f51661f0c21efd0fe8a9f99b29cb8c4c94f89771c69bc70b678010d74a2959baa1cde4fb457f225005cfa4afc06bcb9d2dbc8b1563e227099b91776
+EBUILD orion-1.6.5.ebuild 988 BLAKE2B 9703326fe52193570e84fc3428941167b12680cb40a891920fa4b2e45a0144110322dcf391146b939647b0aacb0a7de5c72641dec5ada927b741cb7393eb68da SHA512 81dd5dd6ef117820bcdfb63449271f31ffec5724e24df52532d53c07fb49be71ea7d5e520db43f863a0f12e22a9ec6963155c9c52500ebdc5031c7ba04866acc
+MISC metadata.xml 574 BLAKE2B de16e0fa5f9fbb443c5218a093048811e4ad9e633ec0e23cbd8b00e5322f7709af121ff3fa8cc4ef9cbc164f84d57cbf9ce9c542b7753195f09735e859fb5a55 SHA512 4ffbe221d97a40411dbaefc31fad97978f2ae823d14e1fbfef1aa9d84697c9ea06f7d58c7174ff1daa3b8f64863d62350dc469414e0b55917a227e2953b86bc9
diff --git a/media-video/orion/metadata.xml b/media-video/orion/metadata.xml
index 98d88483f290..9c91e6887c8b 100644
--- a/media-video/orion/metadata.xml
+++ b/media-video/orion/metadata.xml
@@ -6,7 +6,9 @@
 		<name>Bernard Cafarelli</name>
 	</maintainer>
 	<use>
-		<flag name="mpv">Use the <pkg>media-video/mpv</pkg> player (upstream default) instead of the <pkg>dev-qt/qtmultimedia</pkg> one</flag>
+		<flag name="mpv">Use the <pkg>media-video/mpv</pkg> player (upstream default)</flag>
+		<flag name="qtav">Use the <pkg>media-libs/qtav</pkg> player</flag>
+		<flag name="qtmedia">Use the <pkg>dev-qt/qtmultimedia</pkg></flag>
 	</use>
 	<upstream>
 		<remote-id type="github">alamminsalo/orion</remote-id>
diff --git a/media-video/orion/orion-1.3.5.ebuild b/media-video/orion/orion-1.3.5.ebuild
deleted file mode 100644
index 59d5d8702da3..000000000000
--- a/media-video/orion/orion-1.3.5.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qmake-utils
-
-DESCRIPTION="Cross-platform Twitch client"
-HOMEPAGE="https://alamminsalo.github.io/orion/"
-SRC_URI="https://github.com/alamminsalo/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+mpv"
-
-DEPEND="dev-qt/qtquickcontrols:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwebengine:5
-	mpv? ( media-video/mpv[libmpv] )
-	!mpv? ( dev-qt/qtmultimedia:5 )"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	# TODO: also supports qtav, not yet in portage
-	local PLAYER
-	if use mpv; then
-		PLAYER=mpv
-	else
-		PLAYER=multimedia
-	fi
-	eqmake5 ${PN}.pro CONFIG+=${PLAYER}
-}
-
-src_install() {
-	dobin ${PN}
-	domenu distfiles/*.desktop
-
-	insinto /usr/share/icons/hicolor/scalable/apps
-	doins distfiles/${PN}.svg
-}
diff --git a/media-video/orion/orion-1.4.0.ebuild b/media-video/orion/orion-1.6.5.ebuild
index 804460e26d8f..17c83ddd2d0d 100644
--- a/media-video/orion/orion-1.4.0.ebuild
+++ b/media-video/orion/orion-1.6.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit qmake-utils eutils
+EAPI=7
+inherit eutils qmake-utils
 
 DESCRIPTION="Cross-platform Twitch client"
 HOMEPAGE="https://alamminsalo.github.io/orion/"
@@ -11,29 +11,25 @@ SRC_URI="https://github.com/alamminsalo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+mpv"
+IUSE="+mpv qtav qtmedia"
 
-DEPEND="dev-qt/qtquickcontrols:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwebengine:5
+DEPEND=">=dev-qt/qtquickcontrols2-5.8:5
+	>=dev-qt/qtsvg-5.8:5
+	>=dev-qt/qtwebengine-5.8:5
 	mpv? ( media-video/mpv[libmpv] )
-	!mpv? ( dev-qt/qtmultimedia:5 )"
+	qtav? ( media-libs/qtav )
+	qtmedia? ( >=dev-qt/qtmultimedia-5.8:5 )"
 RDEPEND="${DEPEND}
 	!mpv? ( media-plugins/gst-plugins-hls )"
 
-src_prepare() {
-	sed -i \
-		-e 's:^Icon=/usr/local/share/icons/orion.svg$:Icon=/usr/share/icons/hicolor/scalable/apps/orion.svg:' \
-		-e 's:^Categories=Games$:Categories=Game;:' \
-		distfiles/*.desktop
-	eapply_user
-}
+REQUIRED_USE="^^ ( mpv qtav qtmedia )"
 
 src_configure() {
-	# TODO: also supports qtav, not yet in portage
 	local PLAYER
 	if use mpv; then
 		PLAYER=mpv
+	elif use qtav; then
+		PLAYER=qtav
 	else
 		PLAYER=multimedia
 	fi
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index ef70502c51d7..6852e6017cc0 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -12,4 +12,4 @@ DIST vdr-2.2.0.tar.bz2 922708 BLAKE2B 975e07d6d4c5bd13ee92be5d6a1826d6404b0c59e2
 EBUILD vdr-2.0.6-r1.ebuild 6921 BLAKE2B bb5925105f29a4ac9d303459adc3742f3b817a352bb575271c20ce5565a3edb980bd89306ee978cfa398c38be4ae8f75cdf253b1fe6526f7384488cd1a917ab9 SHA512 10997c095cb8af5f0ffa00e07247a790cb038f42a9705a4e6b2e5ca715431dd51749dc5faf9beadf899a4170d9e01de92ff61cf1cdf6e21fe87e6dd60afab07b
 EBUILD vdr-2.2.0-r1.ebuild 7538 BLAKE2B fabc149e2174c9ba75bea2b3e560e1e8ad1a79ac31933162d31908843971d9529eb7cd63fc1e5adf0c025e3bfcbde914eab5e64314f60dffaa781001dc0b7e3e SHA512 641e41abcabaae613a2d6f0a6ba55194b04ee412ed48461869dc0e4c705a02bb7cfe7ae9c64cc7efadfd3a4ed9dd7a06661874bbbbf3a5e213269899a6b6d572
 EBUILD vdr-2.2.0-r3.ebuild 7638 BLAKE2B bdaf7b1db55325b3ac4adae95079a78e859043f1644c986e065ba38fb46a63f0594d52c2ff4e07ffb37c8ead72a6e902e4007c955dc831a99f03c1c947ff7ca9 SHA512 fb7dce28351be1c777a93e98b40fc1dde6fc74ee393015c58535048220440caa53781d46184c546f619f6d294a7ebfb01cb42b76b255d7a787b3c5366d11b012
-MISC metadata.xml 2164 BLAKE2B 1976e2e6090ee6bddcc008794c4ffcc6ae656ab46d1ca459d01a6dd5b7736387d53af03f72685c4e9237ea04bb4f86da49ef9af7f7e1707b038b6a87ae9028c0 SHA512 b960e1d56205787e2c2f6334835b7d9f28fbd283850e2e7af6427a25a590719b7832cc2dcbd94b4ecf3e983fb846909d6b66cfadda89e5b8bcbc469a91651d24
+MISC metadata.xml 2139 BLAKE2B acd40ba358753c60724b2fbf863568c43eb464aae4254856c1f084ef74147e6f7b073b6d0fc5aeed67c879dfef66ec61b6e9345d8d9a11184d19facdec2e1944 SHA512 83fd13bb32f02ca4983f9a3eead589bf9c10cc960ddacf85f4ce86c892c87b066cbebc85b6e37b5a877f3759a8cdd8c04759b877de74ec68ef313c84522866db
diff --git a/media-video/vdr/metadata.xml b/media-video/vdr/metadata.xml
index 62b1c32b1a8c..8ebb4b08a512 100644
--- a/media-video/vdr/metadata.xml
+++ b/media-video/vdr/metadata.xml
@@ -23,7 +23,7 @@
 		<flag name="permashift_v1">permanent timeshift by recording live TV on RAM, need plugin &gt;=mediaplugins/vdr-permashift-1</flag>
 		<flag name="pinplugin">Support for <pkg>media-plugins/vdr-pin</pkg></flag>
 		<flag name="resumereset">rreset resume of EOF</flag>
-		<flag name="rotor">Enable support for plugin <pkg>media-plugins/vdr-rotor</pkg> for dish-positioner.</flag>
+		<flag name="rotor">Enable support for plugin vdr-rotor for dish-positioner.</flag>
 		<flag name="ttxtsubs">support for <pkg>media-plugins/vdr-ttxtsubs</pkg></flag>
 		<flag name="vasarajanauloja">replacement for the liemikuutio patch, adds some nice must haves features</flag>
 		<flag name="wareagleicon">Replace original icon set in menu</flag>