version bump

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

3 files changed, 144 insertions, 17 deletions

diff --git a/media-video/smplayer/ChangeLog b/media-video/smplayer/ChangeLog
index 22ab00e3289c..77373dc13978 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.170 2015/07/01 11:02:41 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/smplayer/ChangeLog,v 1.171 2015/07/29 09:40:27 yngwin Exp $
+
+*smplayer-14.9.0.6994 (29 Jul 2015)
+
+  29 Jul 2015; Ben de Groot <yngwin@gentoo.org> +smplayer-14.9.0.6994.ebuild:
+  version bump
 
   01 Jul 2015; Davide Pesavento <pesa@gentoo.org>
   smplayer-14.9.0.6966-r2.ebuild:
diff --git a/media-video/smplayer/Manifest b/media-video/smplayer/Manifest
index a5b1f45fecbe..7e307dcd4632 100644
--- a/media-video/smplayer/Manifest
+++ b/media-video/smplayer/Manifest
@@ -7,29 +7,31 @@ AUX smplayer-14.9.0.6966-unbundle-qtsingleapplication.patch 566 SHA256 98b2691ea
 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.6994.tar.bz2 3872223 SHA256 4993f4d753f2982667e088d0f06fccd36535d8e65eff5acbef82d4cde132b301 SHA512 9e902979d1d58096424596c691e9885f10b50d1c3a0cda90387f9d59247036a66c570bb430a1441fd40e4f397757d7b3b3f089a93deabd5b6d8a02cbaf3b583c WHIRLPOOL a500aff18f93b72f4595869d9b9c57640599a3c9a8bcc31249ca502568e52f93fb059829196de1c7b5c3407cf987f199ffd568d93d23b1c11d6718f7aa4fb8ad
 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
 EBUILD smplayer-14.9.0.6966-r2.ebuild 3638 SHA256 975e884a4040b871d371c0f526e85171af1fe09cbc66af842ef20efe13aae540 SHA512 030d8ec2a92dc00178ce82443c059e354df0ca33ae1b6cea2b364012615b30db153aa45f281213739df87cecb660f2bd21fb5beb9beee5c7f1b8805ee65c1e9e WHIRLPOOL 771622cf33480282358bdb16777520df2803c4295332a882c522308c6e17dbf09bd9d7b09ea109281730ca93fbeedb872b764559c34d81dc5702362765bbcc36
-MISC ChangeLog 24152 SHA256 38aba0e19a8ace2fc9d685bf2d17b1616ef76393cf74effd5f2e5f0ad4fb2f98 SHA512 cd25108d1e52e56685305920616e665be4ce8894d6e2ca3d76d8b1fe7ffeabb02caa150c68f6080decbed4ad5394eb4767117a0d8153935d55b9221d0e4c0281 WHIRLPOOL f9cf8957099f46f9c188a865bb3c37ebb052680c6a7f15c07ded61fff4b7b9de9df9b7b5630b2990b5d1534d84c8d16c15d9b21980741e5f14a6cb46644038c8
+EBUILD smplayer-14.9.0.6994.ebuild 3650 SHA256 c5fcc10c9944fa19e34d8a4259e7483592d8a928f6d5dce9c4b8a595498f51eb SHA512 551def5b232d233da8bcf7a759f54e6faacc161accc6216ef0bb03f11a92d6c504a5a934ecf7f7b89577c760bf8765d5562ed6606bc87f93bf33dd016954f323 WHIRLPOOL f52bdd8bd3ab1c6741546854f21a86cda53055c0580f031e8d1b9bb22d88fdf23ed8832799ca3e666b15d6ca7287f87fbc351c8f879e88da1e18fef5c244d53f
+MISC ChangeLog 24285 SHA256 83c4080cff45223afbf5a54fca18b206de66bbfab917ad9147d9b99d1d6155a6 SHA512 9e3a4d8b82ee7fd8ec1f903eda0f6689d9fd7c04e453c93c9db3b9c4a952ccdbf9239d522a9fe3d2e96c56874902544fcdb761fb4661746d52d65de8610de77c WHIRLPOOL 8c82ed1af5e6c22458c715987f81ec3f769e23d7fd33d275aa087889e96662f57d50ef88fd9b7096c5962988d58e0df4b1133a09a2c65e3c213d7686aecbaf89
 MISC metadata.xml 815 SHA256 a3512855b3defc4147a1d6d76fcf9404d323f2126ffbfc8439be507e13053c95 SHA512 c9e096aa628d8c2e5c90fbfe19995e50c0d860b1cdd91df9fa94810e8207fcc703f5d6306d77c99ddcc54646d497056ba53cedb16c36f27163988a2bae9f63a0 WHIRLPOOL c90f12142cd64bc43c976ec3a2724f96138172a721dd1e6682b523d33d56ea95e62400cc6d51c0717a6a6fd586df3dd19b7f2b3b91108c2822166120edb8443d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.1
 
-iQJ8BAEBCABmBQJVk8jSXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
-QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV94kQQAIJ8ZD2nC860IuJW03pxmuQl
-y865NuyxXMofydkBTVn2MycnMgm7MJzz/xF+eSUkpqACO628x0OQVSTVFOQCvQ7s
-DNrNCrJW8jzIQqc1+3nD0nwbpSWsMwqY+9Xd0YZNfIMRdYy0DtyP8dk3keW3pDRf
-vldVp14/9zkLyAm8xr585fOjALUhFU+l4sqgoIDlk3Sx4tv2URmfq+9ny44fvWZQ
-irZaGTZskfjTEAkhlNMf4i1rU78FR71TLD8mptqYS7m/p/BBYV8GF7jhxIctCFYD
-QlT3tz0C63/YRnASZqO792erJBDUQQq2rqS8twHbtTmRwxo2IWi8y7aavBMTKIC4
-DlfvNNTvqcv98PY0qyMG2cP8JwdX36xqJajsXbBOTpkNPeZxHcQTcgTVX1HU2yv4
-U91yEzJWS687MH5hyXDA2/LebvS1GzT/O1xKirChlXRi7+lkxaFm6JetLNA85jI0
-iklUqN+Pi3UsEAF94RQfCk9bgoohDm2PplQ0ebNvKZFAhIFpXjHJ+b0t/E7zgYJz
-MDnHOvGX6dV0LF/G1p4C+EwaA+AUiCIfdge8Z6v9l6j17toYZvLwYI/yaqC/Czap
-xU88b2MM5KWuaIP1Wk16oZnEjivexO4dGFqgkbWNe5umQnv5N04zsGdW2hmoAgwx
-rOX/IpYewGmFes5rz0At
-=8AuO
+iQJ8BAEBCABmBQJVuJ+NXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ5MTlDREQ0NUU5Mjc4RkU2RjJDNTAyNzU0
+RkRGOUNGRDJGQUM1MTRFAAoJEE/fnP0vrFFO6pQP/2Rh4hW9tx9SFqdpDf/0PoMI
+Hq8guE4aaPbxsRBQYNttJ2Hk2Df693/k+Y3A4WBhc+GJyIfBWzCGzvb4o77R//n2
+gv3gbZklOyZEXqW7wx6XOkOdfvKbujD0TEqLqb1yYnw9On2c1z/eq7Ox46LDHARJ
+kPXrQDi9sMDKtXvVhneMoAzsY/mYbSHw8XEZxdM7mr2oqDLv8vgWi+Fs1g7AK0av
+M4+FVEY9bab9SEmFxiznOZHvF7T8LcQDPGzgbr25IAKVvmYdPnCzQV0fq0SAU62J
+wRcFfso1iyec6UDaR7rf+um+s0MwfrMUD9dXhmavU0+JOXTPEEjBSd5K7GeTV5aA
+t8FovRqWa9WD/Oxd5PRiZw2RgjU/E4jtV8Gt/TGmg6z17QVxx3VRCPU7G+VYj7Ac
+JAXaIkgjXCZbSkn0491tW3w/sO+niYQMvGXY8toWEtNChZS9vf7XL8YahRbSAUxF
+x+hAjWVh3+LDQVHrMEt9dJ9cmjIB1yeBx+5cEmCv4KpUa8gRsadrdbNF02S9O51/
+VGZgisw66qvenbDskPUABx1CC2XFapR4z96RmzxwAo3sSgth2zToDMmPE9Z3n5QI
+RybFsyHgnniVFs/VW25cwWp8fAQNdgY8dn2m4BgnwbkS/M6FX0qeY3kXJmNqhCot
+lecqKxnoD+HIfkVPEve/
+=/evF
 -----END PGP SIGNATURE-----
diff --git a/media-video/smplayer/smplayer-14.9.0.6994.ebuild b/media-video/smplayer/smplayer-14.9.0.6994.ebuild
new file mode 100644
index 000000000000..34462c946d78
--- /dev/null
+++ b/media-video/smplayer/smplayer-14.9.0.6994.ebuild
@@ -0,0 +1,120 @@
+# 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.6994.ebuild,v 1.1 2015/07/29 09:40:27 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 id it ja ka ko ku lt mk ms_MY nl nn_NO 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 mpris +qt4 qt5 streaming"
+REQUIRED_USE="^^ ( qt4 qt5 )"
+
+DEPEND="
+	qt4? ( dev-qt/qtcore:4
+		dev-qt/qtgui:4
+		dev-qt/qtsingleapplication[X,qt4]
+		autoshutdown? ( dev-qt/qtdbus:4 )
+		mpris? ( 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/qtsingleapplication-2.6.1_p20150629[X,qt5]
+		dev-qt/qtwidgets:5
+		dev-qt/qtxml:5
+		autoshutdown? ( dev-qt/qtdbus:5 )
+		mpris? ( 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() {
+	epatch "${FILESDIR}"/${PN}-14.9.0.6966-unbundle-qtsingleapplication.patch # bug 487544
+	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
+
+	# MPRIS2 pulls in dbus, bug #553710
+	if ! use mpris ; then
+		sed -e 's:DEFINES += MPRIS2:#DEFINES += MPRIS2:' \
+			-i "${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
+}