Version bump adding mpv support (bug #538002). Implement Qt5 support (bug #523114). Remove mplayer2 option (dead project). Update bidi patch.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x4FDF9CFD2FAC514E!

5 files changed, 142 insertions, 8 deletions

diff --git a/media-video/smplayer/ChangeLog b/media-video/smplayer/ChangeLog
index 8275d3af14ca..0c734b1ee177 100644
--- a/media-video/smplayer/ChangeLog
+++ b/media-video/smplayer/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-video/smplayer
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/smplayer/ChangeLog,v 1.152 2014/10/07 19:51:37 sping Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/smplayer/ChangeLog,v 1.153 2015/01/31 13:07:57 yngwin Exp $
+
+*smplayer-14.9.0.6690 (31 Jan 2015)
+
+  31 Jan 2015; Ben de Groot <yngwin@gentoo.org>
+  +files/smplayer-14.9.0.6690-zero-bidi.patch, +smplayer-14.9.0.6690.ebuild,
+  metadata.xml:
+  Version bump adding mpv support (bug #538002). Implement Qt5 support (bug
+  #523114). Remove mplayer2 option (dead project). Update bidi patch.
 
 *smplayer-14.9.0-r1 (07 Oct 2014)
 
diff --git a/media-video/smplayer/Manifest b/media-video/smplayer/Manifest
index c88e3e44c6e6..f1d2384abad1 100644
--- a/media-video/smplayer/Manifest
+++ b/media-video/smplayer/Manifest
@@ -2,17 +2,32 @@
 Hash: SHA256
 
 AUX smplayer-14.9.0-zero-bidi.patch 870 SHA256 2512d52581ba20980ea3451b318a573f6dc7c501243db177758bed40552a5cf7 SHA512 20a57ce4ee4e1d515ca4109662d8247a5d9910152c9aabfee1a4fd3d697fa5b481dfaa17bbba0465accda79f16480de432761c19fbb5f1043821045f61cd6c2b WHIRLPOOL 48c626d95dc05225e2a1cee1d22da1ca5929fb2aecdbb538865b064af849d9859797e917e34e0bab56b36cb49d9c0705981b7e6b11130a16265bbd2c8405c029
+AUX smplayer-14.9.0.6690-zero-bidi.patch 410 SHA256 b1dc553f744fdbeddbdf3cc250122785e61b48a35b318426ad6c367b06e0d653 SHA512 0498e2519fbaf5f217e0ae7b47660f26e5a25a99aa8500c6e82716540d348d679628d061552e75afbf70dbe38e5ce3a433c553119d1ab8180e6fe7d9640433e7 WHIRLPOOL 87890c3052910b83af8e0f6273a951f82fd7b1904dcadeba7565dc9dd3c30659564cf09fa693541592c358971e7bf9bb5071986fa3190569034137129cb4becd
 DIST smplayer-14.3.0.tar.bz2 3675657 SHA256 9b8db20043d1528ee5c6054526779e88a172d2c757429bd7095c794d65ecbc18 SHA512 11ccb390b220a8cf978f9059ed04871c68d91db2a234b7d42a695e17d2bc1ff108d0696439fc148637a5af6d9189fc19cf51dad581c6f59fe84361aa49db4faa WHIRLPOOL 6702e140527c95f5dc284c29fe6e49ac16b01af8162393f20d53ca7124abc9420d20ad3e704f7da79dc5e4341f282ab0ab48389f45dc3e481d2a76f19ea32180
+DIST smplayer-14.9.0.6690.tar.bz2 3813209 SHA256 5ec8a1d2912828e9b19f800e338029e6757fc30e3974cf62a21b67f46632bc5a SHA512 68f5a1ab162e5e722a6058b7e4724201dd37212591174d7045b1cd1a9a32a4a224006a5df3bbade47d6bca951725b5b2ae7c8630cd9baa3cecc57aecb550d882 WHIRLPOOL 67504ff5c475dffdd71267cc533e21afbf27c0c8746f295aed41a276d1747025164d1d6953042b8b0eed3161fd54f668306714a4591b20b4f3946fdd6004fc84
 DIST smplayer-14.9.0.tar.bz2 3716434 SHA256 429ad4edd6df1fcedd5ea4fa2b024eb5a61c9412f52762e9d9a9c2245b7ddf13 SHA512 78cecdad7e5f18c221a2f08a0472da01eb14db6230733616b805b6fccf2929c3f5b4dd92fd037362890a308967fa6602b89318c5376c3ce3a38d0dd9a1a17e43 WHIRLPOOL d7e621cd9ebcee450ce7aa9beaf1240c3d2f91271d2a6f043688c8688d77e8ad4761777a05ae77230966d050d647e700aa5bc8d3b566adc3fb724eaf9e315399
 EBUILD smplayer-14.3.0.ebuild 2156 SHA256 bcae6caed7f025bf9cdf96c5b352ea06a6b6c93e8474d2e7e8351779e553f052 SHA512 1e5cd636d3f5c204702b871274ebbfc25d2073a7a2208474e409094688cfc58d887a382d0c057426e4828d45a5b8cac95ebb204e33e2228117634f661c056587 WHIRLPOOL cf99299f71a139bb7e6ff7ca1811b2175d97d33f8bbd8e0479ab9118659c0f6c4af1f96535f7d4954fb0bdc716160429a00dd582507eff6b42cf913a350a1ba3
 EBUILD smplayer-14.9.0-r1.ebuild 2495 SHA256 1e3afca018fb730221226d8aac144354f3437114bdf59956652528833fcd6892 SHA512 edcadc68b41b2982ac0a7c66feaf451896042d11a3f328b2d98ac7bb5abf5a6603fda8eea7ecaa52759adf74a088f82f19f25668b52598719d7157d1067c2c16 WHIRLPOOL 74a1036b2b8ee38523b31e26fc892b3dd683128fa3bde9495abf7e059647b42547ded7d9db2ff7f7822584f11783eed2b66ea488dde185d198fe05f51871d037
+EBUILD smplayer-14.9.0.6690.ebuild 2815 SHA256 9334cc221d40d9cddf621d669afdc9157d317fc79b3df93a1cb5d5ccb776450d SHA512 98b5e52b079c1c622bd6266b34a869bd7019d0bcc48d2385571fa86a6364c9b92c40d38ea0cae3daba44e7bbc6f1c5deb107a65e2cfd9a4ae7a547c626b58f60 WHIRLPOOL c142ad4ad511da1ce110ded983adb9fdf45c7be8416111db423013f44d00d853f62d32969e2b2bf8f6166a999b803e0736f1b4f231bc5eb1b4deea59e6f8c344
 EBUILD smplayer-14.9.0.ebuild 2431 SHA256 f5f9668375eead2c2cb2205cfff079dce64eee340e5dcd0dcf838721694bfc14 SHA512 a9c97c77f26840651dbe1c59b29e8f1819ba1d03a87b36e3aa43b335f1dbe6c91030e857fc9965f662cc5e616165b7b7f529382265f8dd57112ef16593553d2a WHIRLPOOL c49fc2546cb44b43c0d3a47dda63e146803deeaf6d6507e98d8529e0bee7a91deba2c2d19a9d4e9aae0ff46a23f31f49bee8f5d0ce0ce44501da609a86d6ba94
-MISC ChangeLog 20924 SHA256 1ddaa2a0e4eb354253a9538247688c4edcff051fbb89dca0f1531160a9f5df0a SHA512 6e70ece07251128ea0b865436879c2e863d1b10fa1444b9a973ae795377c0016fcf7ad7c0fd92ebdc3b171b91adba134eb78ea30d1d66bacecdfe043cd7ae381 WHIRLPOOL 6713352f3c62c91c0338261c107cf4df3bdb716f0ffb5e9e6cdc7fff5eddf0e7912e8c18f8315941cd27f02bd70054d595a7559086ba9a8c905d1fb38eb4328f
-MISC metadata.xml 378 SHA256 e716cc0ba108ea127cf6668e22bca8676dcc4110825d580dceb527042dad8022 SHA512 bdcbb965130e23d1eff4857b6df60538ce21771cf938311d803193fc766b641bb200c1f0e6d0ee74c2d884c226e404c686caf12d87e97a607f1ad6c33e7ca8a8 WHIRLPOOL ed745757df9f6d03cf180f7747bbe53fd708c4675f5f2038a77b40412630e8acb64c63df2199f1475753eb17c11faf2dcbed77a4ca1aa8cb8c704893f2156031
+MISC ChangeLog 21250 SHA256 20a2dba3db23fc763eb8e76290ccbedd5282f4e8412265720ccb9cb810287f09 SHA512 cd28c867f7fb8592dfac71a47825942375736087833e7c77e7ea888738eabad5ee31f6573261b456a960219dff46693074618190a73f18535a90e5c1bedda219 WHIRLPOOL 2813ec341979e089afdb2f36f246dec8f9b217c8c7f85ebf8d814afb4b32a3fe7ad935486704a6134841774751acc9f4c4efb77b7c69d3a89bbae4279981ed63
+MISC metadata.xml 505 SHA256 ca8bb6982e46f56f34350483c91999e947f0d30aae50bdb75dc7f8fba8e76e1b SHA512 18a3dbf2bea045c321945434a0933468d27b40cc0984d0c439a6726b25cbf978c9f9886aa09f7dbfa6c0176477095e5c5ddec4267ce52478cc92d053f0697f18 WHIRLPOOL dd5ae89b730a16d4531adc640df01b4d01fad68d8b7018f35e7dfefff3dd30c36cb6d2b3e8ff6d0332de8e639ea850985d5388435744dcbdff8f255822d4e0c6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlQ0RE8ACgkQsAvGakAaFgDjMgCePf25xkX++7E+2vlOQG+poPjF
-Bp8AniAj8dbxCncVYsdJrv3vKMlsfwjT
-=L8Ub
+iQJ8BAEBCABmBQJUzNPZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ5MTlDREQ0NUU5Mjc4RkU2RjJDNTAyNzU0
+RkRGOUNGRDJGQUM1MTRFAAoJEE/fnP0vrFFOI7MP/RrhDPcHL9P0f4D2lb8B9e3C
+0GMoNym4dve4wPCdCacvbIHFbRTbRAdFOJYoYcYVYkqoUTl98MZVXL/gUFEVGfVh
+T8MRTxyoEonn1TSK+89TZgbsJhqq4tIZLhkCnMamLVF+LMBkpVNmL0yoDC3hOhzV
+hy29xn0i7g6gJ2Lwrcg6xvSShDVS1EZ138moz5kFnlpayeRlUPKrrNQbckH7s7OM
+5zA6VQbwMD2pgLVJmi1LaCt3T/wRc/adNXX51kVLwvGYSv1iJg4hc4GME1iFvBum
+PhDmkkR0eeVmNxiExGfbcLO/RsxSegxi37xyT88grATWm6Fz6SlyPH6D2dUZEpPF
++BPHwrY3RyONnFbKieZ2Wv0wFIkMoBX7B4+WgC9towP3K1qHjjIq5D7A5iHeUvbU
+gAa7HUItwP9nUOQLV6b8kE+Bt/NBbMNQlL8P9Ji4Pbe6rpTKJ99vcgg+hNF/I9hx
+aUZnBCEBlORiXdTR+b28yLAaTEY6GFyT3CIlRRlo1aVFqP2GRM4YNOKZQDAyovpT
+lpivrPf5UlLVIL7sHsjXtiIQEOrCOxUG5hpzgaIh6w5bDvIGbtv7IRNIlxesRsCm
+BuFtxffY6Q0mf+5w/RIFg9sMGs12QlHEjiRfOwnCG7FOTSlavdSLTZNaaF+iLj1T
+qebSrxPtCOLwE+jxOzUp
+=YkP0
 -----END PGP SIGNATURE-----
diff --git a/media-video/smplayer/files/smplayer-14.9.0.6690-zero-bidi.patch b/media-video/smplayer/files/smplayer-14.9.0.6690-zero-bidi.patch
new file mode 100644
index 000000000000..650dcd79c4b4
--- /dev/null
+++ b/media-video/smplayer/files/smplayer-14.9.0.6690-zero-bidi.patch
@@ -0,0 +1,13 @@
+--- a/src/core.cpp
++++ b/src/core.cpp
+@@ -1811,10 +1811,6 @@
+ 
+ 		proc->setOption("ass-font-scale", QString::number(mset.sub_scale_ass));
+ 
+-		if (!pref->mplayer_is_mplayer2) {
+-			proc->setOption("flip-hebrew",false); // It seems to be necessary to display arabic subtitles correctly when using -ass
+-		}
+-
+ 		if (pref->enable_ass_styles) {
+ 			if (!pref->force_ass_styles) {
+ 				// Load the styles.ass file
diff --git a/media-video/smplayer/metadata.xml b/media-video/smplayer/metadata.xml
index 2e4aa676a6a0..87a5facf090f 100644
--- a/media-video/smplayer/metadata.xml
+++ b/media-video/smplayer/metadata.xml
@@ -8,5 +8,8 @@
       Enable the option to shutdown your computer after finishing the playlist.
       This requires <pkg>dev-qt/qtdbus</pkg> as dependency.
     </flag>
+	<flag name='streaming'>Support for streaming video sites through
+      <pkg>net-misc/youtube-dl</pkg> (MPV only).
+    </flag>
   </use>
 </pkgmetadata>
diff --git a/media-video/smplayer/smplayer-14.9.0.6690.ebuild b/media-video/smplayer/smplayer-14.9.0.6690.ebuild
new file mode 100644
index 000000000000..60777d31e5b3
--- /dev/null
+++ b/media-video/smplayer/smplayer-14.9.0.6690.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/smplayer/smplayer-14.9.0.6690.ebuild,v 1.1 2015/01/31 13:07:57 yngwin Exp $
+
+EAPI=5
+PLOCALES="ar ar_SY bg ca cs da de el_GR en_GB en_US es et eu fi fr gl he_IL hr hu it ja
+ka ko ku lt mk ms_MY nl pl pt pt_BR ro_RO ru_RU sk sl_SI sq_AL sr sv th tr uk_UA vi_VN
+zh_CN zh_TW"
+PLOCALE_BACKUP="en_US"
+
+inherit eutils l10n qmake-utils
+
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+DESCRIPTION="Great Qt GUI front-end for mplayer/mpv"
+HOMEPAGE="http://smplayer.sourceforge.net/"
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux"
+IUSE="autoshutdown bidi debug qt4 qt5 streaming"
+REQUIRED_USE="^^ ( qt4 qt5 )"
+
+DEPEND="qt4? ( dev-qt/qtcore:4
+		dev-qt/qtgui:4
+		autoshutdown? ( dev-qt/qtdbus:4 ) )
+	qt5? ( dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtscript:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtxml:5
+		autoshutdown? ( dev-qt/qtdbus:5 ) )"
+RDEPEND="${DEPEND}
+	|| ( >=media-video/mpv-0.6.2[libass,X]
+		media-video/mplayer[bidi?,libass,png,X]	)
+	streaming? ( >=media-video/mpv-0.6.2[libass,X]
+		>=net-misc/youtube-dl-2014.11.26 )"
+
+src_prepare() {
+	use bidi || epatch "${FILESDIR}"/${P}-zero-bidi.patch
+
+	# Upstream Makefile sucks
+	sed -i -e "/^PREFIX=/s:${EPREFIX}/usr/local:${EPREFIX}/usr:" \
+		-e "/^DOC_PATH=/s:packages/smplayer:${PF}:" \
+		-e '/\.\/get_svn_revision\.sh/,+2c\
+	cd src && $(DEFS) $(MAKE)' \
+		"${S}"/Makefile || die "sed failed"
+
+	# Toggle autoshutdown option which pulls in dbus, bug #524392
+	if ! use autoshutdown ; then
+		sed -e 's:DEFINES += AUTO_SHUTDOWN_PC:#DEFINES += AUTO_SHUTDOWN_PC:' \
+			-i "${S}"/src/smplayer.pro || die "sed failed"
+	fi
+
+	# Turn debug message flooding off
+	if ! use debug ; then
+		sed -i 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' \
+			"${S}"/src/smplayer.pro || die "sed failed"
+	fi
+
+	# Turn off online update checker, bug #479902
+	sed -e 's:DEFINES += UPDATE_CHECKER:#DEFINES += UPDATE_CHECKER:' \
+		-e 's:DEFINES += CHECK_UPGRADED:#DEFINES += CHECK_UPGRADED:' \
+		-i "${S}"/src/smplayer.pro || die "sed failed"
+
+	# l10n_find_plocales_changes "${S}/src/translations" "${PN}_" '.ts'
+}
+
+src_configure() {
+	cd "${S}"/src
+	echo "#define SVN_REVISION \"${PV} (Gentoo)\"" > svn_revision.h
+	use qt4 && eqmake4
+	use qt5 && eqmake5
+}
+
+gen_translation() {
+	ebegin "Generating $1 translation"
+	lrelease ${PN}_${1}.ts
+	eend $? || die "failed to generate $1 translation"
+}
+
+src_compile() {
+	emake
+
+	cd "${S}"/src/translations
+	l10n_for_each_locale_do gen_translation
+}
+
+src_install() {
+	# remove unneeded copies of licenses
+	rm Copying* docs/{cs,en,hu,it,ja,pt,ru,zh_CN}/gpl.html || die
+	rm -r docs/{de,es,fr,nl,ro} || die
+
+	emake DESTDIR="${D}" install
+}