version bump

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

3 files changed, 135 insertions, 19 deletions

diff --git a/media-video/smplayer/ChangeLog b/media-video/smplayer/ChangeLog
index 4e974eefe934..ae9e0918aa73 100644
--- a/media-video/smplayer/ChangeLog
+++ b/media-video/smplayer/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/smplayer
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/smplayer/ChangeLog,v 1.165 2015/05/20 04:37:39 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/smplayer/ChangeLog,v 1.166 2015/06/16 10:45:41 yngwin Exp $
+
+*smplayer-14.9.0.6966 (16 Jun 2015)
+
+  16 Jun 2015; Ben de Groot <yngwin@gentoo.org> +smplayer-14.9.0.6966.ebuild:
+  version bump
 
   20 May 2015; Jeroen Roovers <jer@gentoo.org> smplayer-14.9.0.6690-r3.ebuild:
   Mark ~ppc64 (bug #538804).
diff --git a/media-video/smplayer/Manifest b/media-video/smplayer/Manifest
index c361252a16f9..f4a918bdee26 100644
--- a/media-video/smplayer/Manifest
+++ b/media-video/smplayer/Manifest
@@ -1,32 +1,34 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+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.6966.tar.bz2 3848779 SHA256 b24fb478e637151215bf050d3e84f99d802de2d9e3d10588aba33626fa24a34e SHA512 a398b90cca449efaa06d4e6ad0d508b452ab23e1f9117e919eece93fb637123211ea92002969c43fe6d20673bc26eccfd4008b37adc9e726382f5eb4de5c59ec WHIRLPOOL 2c543c19af6bad68d05fa083876b6d963e83965f09e712e2962482733f0050c634437fc95cf1061f7b72a3a0c774298d3e8d16f2c45d89b078b7b7f55327ff15
 DIST smplayer-14.9.0.tar.bz2 3716434 SHA256 429ad4edd6df1fcedd5ea4fa2b024eb5a61c9412f52762e9d9a9c2245b7ddf13 SHA512 78cecdad7e5f18c221a2f08a0472da01eb14db6230733616b805b6fccf2929c3f5b4dd92fd037362890a308967fa6602b89318c5376c3ce3a38d0dd9a1a17e43 WHIRLPOOL d7e621cd9ebcee450ce7aa9beaf1240c3d2f91271d2a6f043688c8688d77e8ad4761777a05ae77230966d050d647e700aa5bc8d3b566adc3fb724eaf9e315399
 EBUILD smplayer-14.3.0.ebuild 2114 SHA256 9367453934dff2ea3bf2dca5a43d1b65f75e9f3f80386becd66099a3ccfcc9c2 SHA512 1721f2eb8a2b85efe66f88dabb496624d66302f7a1cf017c1da3c92f42d711fe354f708e11b0c58e443d42144cbef5eef512498a54bbd7d3d17a8856fae74fb5 WHIRLPOOL 50a624540283089cfddfafa7c30ba3c9dd975ed93e149b0816b276cbb1d255440746afcd06012948b6338aea245d682b8f2519d21e71f7fb31d99ea837dabcfa
 EBUILD smplayer-14.9.0-r1.ebuild 2448 SHA256 9c278510270219338929f50e8ab6d3582faf08e3428a0e3eb3e3d1cb34c4b774 SHA512 d5da4ec07ca1c633dcc3249acf0c9a34908caafabc0f422ace91be7b95ab77a7f9a89536470e5f6fb775ed4aeab041e2b767ae6cd18002068140b71c27945565 WHIRLPOOL f78300f9a4431d916995b8e3e0d265206a73e6e7377ae0cb2fbb376eca6c249e3ebc4ed335a0233756512f8b0aae938074d42764999bc052cf372726a268078a
 EBUILD smplayer-14.9.0.6690-r3.ebuild 3230 SHA256 29e5b8869f03b0498cbe78e9ade5b7b0b912fd1328524172e6754cf78c72f073 SHA512 c47a6708308cbb311f3d81bca3abb4ded5343c89c013047e82ad1ae323d89021628c2cd04fdea1ca33c8148c95f593dd3e139990b25b17cad42c8a6b678a3b1b WHIRLPOOL f8237fc2d8af2aa0db3439b5c9c833f74578edfdca4765d546be8db9e9c532910fcb84c02a1f3a3a4030f23e63faa40845102c6f6fc08f2aa4dc8ffb146df617
-MISC ChangeLog 23236 SHA256 8f7049161463c0cfd931926702af8f94c8a3ba777b48b51aed708754871b1640 SHA512 c74053f915bfc78933fe3bd3abbabcd384feb6261bfe9387e65dfa74136548f0ca8b4a2b100862c01d009566f950767bc45a8d43a844769bf5ef248b876455f5 WHIRLPOOL 9dc12535b82e0da7c93a9c0a12004b82df2038831795faaa716cfca5abad5b2290287d7641f97e073ed7d59f097d7c4a90e0b977ac2a9130b36f5ecaf2cd8cc9
+EBUILD smplayer-14.9.0.6966.ebuild 3231 SHA256 7f31385d5e31ec9950faa9b20d8a7e753675b56cfcd35549bee096f2d58c3bb9 SHA512 e8d1d9445d035b8f32a0e911eda84e80db8b5c165509b49cd3d5b12751f3205b4980c626cc097a61602ddd4606cf87bf3020541294419bca352ef0e8dae3c4ed WHIRLPOOL 433eba276db217bed78e46bdb41240e408d8b7f0c2ff6ecc09a17e8a3a700b7430189bbe37e5496f4aa8fea51dc05692297a5c0e1046ae23bc99ac230a586283
+MISC ChangeLog 23370 SHA256 af4a9a74f5956aad60c0052789d2e5f47ebee4b11151dd1b10491c420668fd49 SHA512 883eb9550bd999648efd0f7cec02c531ae13d03a62b354a9ce3f88b47ec0e3dcba2f0433e290aea26755d1841de01c90e69d378e8261b9dcbeae156c96439f49 WHIRLPOOL 1217f39f291b81b3deba54d15280eb1b6837654303d8fc4716a0389e7d92cc40c6939bbeed9f592bf3026aef9ad6acd3a4548d0569e25d790b2ea7437de61188
 MISC metadata.xml 590 SHA256 5322ec68272b091a709ba5cd0b28b2934fddb0bbfbe862b229c89f2c07388c4e SHA512 16ac87b5e4f166535e0f0ab3011acb33a7c6f543d6620a0f7fd7a5b6491b173cb8c2b649ce3b5cb4eee28f95820e5bcb5982588bf5b855dbcbf16604e834232c WHIRLPOOL f5b3b2850e6c4039dbbc1379df765679d6cbc4d9d2a7061c51b8c2edf995d560c678783349d39a4f2ff1be350c6ce603b6d617b6b18ade06260bd51ae990b52d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2.1
 
-iQJ8BAEBCgBmBQJVfwVoXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmidv0P/i+4ZRlrLiIJNdpoQFU5P+aJ
-emHgf3+Bt3ttw3BEPeV/uE9Ajqjt/WzXNgaZuJvlMgSr425PQphxyda7g0tRoXJq
-3O+I5RBc6pbuykvehlcX1CrV3dsOXgMWIR/WaBMvFLEO4eDGFAIDiabVy+zn1F6v
-IIRVL/psHzSc2D45hlbfEZMCzi7jCzzusxeKvbcPhBY3IQkNfXJBnzDzOLQjh4I6
-nUMZFRmpUCWw01FYrvMxF+729KG/JEM6cdXVEzxtZZhX5JstmJDY8E1x5eXHGyuA
-OYnynWhMcKLNbVOp8qVyzQ4gMdnBXLNxX5lcAfGKKJjJv208NXwMhRM/jbf+O4pk
-Zt8IvsiC74HWL8AddMQ/5Iyqn9UHohzX6YG/1hakUAlZnUnaYbrN3LCnYgQOYNk/
-iAJMUJAaZM7XSrvWYKPtOCsdBDzQndrSYlLIfPfsUft8TiUyczTuRjQDyXuQ58/c
-GMBIL2KnlXs37JJu6VKgMhc1cOJrbbtrKfuR+MCEUzcgc+JgNJzH7q18vq424GOZ
-aiYMwNMFyzwc+bYUvKo3C/1Lmpa7ICYlUDihWvnUCynNjMSyNVBHnE/KZM8C6pwd
-lzSNDE5Y0o93NJX4yIZG03whMmEDkfrPa41XwxDeFlbfm9AFXWVww/NdefFNkuF7
-iJwR96RlMTxY4AsY0ajp
-=+uLG
+iQJ8BAEBCABmBQJVf/5ZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ5MTlDREQ0NUU5Mjc4RkU2RjJDNTAyNzU0
+RkRGOUNGRDJGQUM1MTRFAAoJEE/fnP0vrFFO7r4P/0DUCyUlVsvg0Gdn17b+g1SO
+/VxMhn9Bawr2sPTZ2mYmC6FoZ4dEWNGWtEG2tJZvIqE4t57HHGtFBK29jvPYEvXK
+BnYcEjr2xTp2y4SVrII/1V6y2uvHTbLh/Q3/Pt9hTI32yfSd92zuHS1NoR1E0TKy
+MNLMjxIUc9AyCD7HvG5xmDkWpT8hIdNENGnN4ozbVyowE8zlgScvQh1lZNFhhkqZ
+kLYuN2QgruO7pft1HIvpBT+sXgdDqruQImQUL6oXxGmcyTIb5wPCC2mxBwuuESGw
+4cNieHj5HJth+0i8dkzwq+hK/Hjks30ljTOZjmVQBQN/AV0MjcYmF4naDo9dVtWn
+OMht/CFr7veq0hf5x5rDd9zkeCuXxGTQydQi/NSZEe3Nug8flKMr0/745nx5pcIg
+0gNPLj4Qj1q2yRilXMxpoMTG989L3pHdQzr51MaHdFNZ4GJGTr7CMLDG0QS7CUH5
+UmnTc56RPAQSu+4BVHm+T/TsVWiZdpmqsYAsSXV4kRgqaBJKsGY5cUtOHUQM+bPy
+41u0NsHWsF3bOD6u3PX0yvu58eQkK9dPM3Dy16spO6VdCBJBlKWl9s04WFe9NyfX
+4ScUosrt49dPGnlzgqC7SkRQQfj7mRFVcBlO/NzAGaN4MCa/zSbBh54vmnp/nIqm
+IsZdBJzW/0yqxYtL2+aj
+=nnog
 -----END PGP SIGNATURE-----
diff --git a/media-video/smplayer/smplayer-14.9.0.6966.ebuild b/media-video/smplayer/smplayer-14.9.0.6966.ebuild
new file mode 100644
index 000000000000..501c35d03d5c
--- /dev/null
+++ b/media-video/smplayer/smplayer-14.9.0.6966.ebuild
@@ -0,0 +1,109 @@
+# 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.6966.ebuild,v 1.1 2015/06/16 10:45:41 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
+
+DESCRIPTION="Great Qt GUI front-end for mplayer/mpv"
+HOMEPAGE="http://smplayer.info/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~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 )
+		streaming? ( dev-qt/qtcore:4[ssl] ) )
+	qt5? ( dev-qt/linguist-tools:5
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtxml:5
+		autoshutdown? ( dev-qt/qtdbus:5 )
+		streaming? ( dev-qt/qtnetwork:5[ssl]
+			dev-qt/qtscript:5 ) )"
+RDEPEND="${DEPEND}
+	|| ( media-video/mplayer[bidi?,libass,png,X]
+		( >=media-video/mpv-0.6.2[libass,X]
+			streaming? ( >=net-misc/youtube-dl-2014.11.26 ) ) )"
+
+src_prepare() {
+	use bidi || epatch "${FILESDIR}"/${PN}-14.9.0.6690-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"
+
+	# Turn off youtube support (which pulls in extra dependencies) if unwanted
+	if ! use streaming ; then
+		sed -e 's:DEFINES += YOUTUBE_SUPPORT:#DEFINES += YOUTUBE_SUPPORT:' \
+		-i "${S}"/src/smplayer.pro || die "sed failed"
+	fi
+
+	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() {
+	local mydir
+	if use qt4; then
+		mydir="$(qt4_get_bindir)"
+	elif use qt5; then
+		mydir="$(qt5_get_bindir)"
+	fi
+	ebegin "Generating $1 translation"
+	"${mydir}"/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
+}