gentoo resync : 30.09.2018

4 files changed, 18 insertions, 62 deletions

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