Improve dependency ordering and streaming handling (bug #543642). Put mplayer back...

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

diff --git a/media-video/smplayer/ChangeLog b/media-video/smplayer/ChangeLog
index c138464e3ce3dd1f70cd402ab4f3764269ccb41d..2f004c3e6e223e9c10c1cf4b4623dda25a6f511a 100644 (file)
--- a/media-video/smplayer/ChangeLog
+++ b/media-video/smplayer/ChangeLog
@@ -1,6 +1,15 @@
 # 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.162 2015/03/17 11:49:20 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/smplayer/ChangeLog,v 1.163 2015/03/22 06:18:09 yngwin Exp $
+
+*smplayer-14.9.0.6690-r3 (22 Mar 2015)
+
+  22 Mar 2015; Ben de Groot <yngwin@gentoo.org> +smplayer-14.9.0.6690-r3.ebuild,
+  -smplayer-14.9.0.6690-r1.ebuild, -smplayer-14.9.0.6690-r2.ebuild:
+  Improve dependency ordering and streaming handling (bug #543642). Put mplayer
+  back into preferred position over mpv, since mpv is used thru deprecated slave
+  mode, some smplayer options will not work in mpv, and we have a proper libmpv
+  GUI in baka-mplayer now. Remove old revisions.
 
   17 Mar 2015; Ben de Groot <yngwin@gentoo.org> smplayer-14.9.0.6690-r2.ebuild:
   Fix translations generation snafu

diff --git a/media-video/smplayer/Manifest b/media-video/smplayer/Manifest
index d16aa55e79e7c3b11e9f33fd3e0f07d210caa809..a0dc2d799234e3d09524e506e262e57be7b158b7 100644 (file)
--- a/media-video/smplayer/Manifest
+++ b/media-video/smplayer/Manifest
@@ -8,26 +8,25 @@ DIST smplayer-14.9.0.6690.tar.bz2 3813209 SHA256 5ec8a1d2912828e9b19f800e338029e
 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 2490 SHA256 c056216c5ac57e8ef40dfd9896206272a2c4a0268aa82d52f0468765c1911d91 SHA512 6cef8e864077062de8b1c1eca6b7ec5433453f6bd108db1c031fa8f09ae18ccd62401e8eed175e6c1c0a9030e3820bf535aae75c82d5b782c2d2dfc11a417c62 WHIRLPOOL 54c2534e27226ebe20505d65b4c57dfc6e995da472070ab6b758e79ec5662be15851d8cc45bd97ffc6682ffebedaf6d0d388f444367f8927b59646e653fc41f9
-EBUILD smplayer-14.9.0.6690-r1.ebuild 3054 SHA256 49f380065c96aeac87142e51a3434c4b9233f32a7142e3db5d43245b9e771009 SHA512 ce4199e9f8c5b240c72747466eab6e8d94f70511698eff6c455b27db4acfc92623abce814a0637c3307cf7f457db7f222e3f3d379c1d82df40cae3326a25ce21 WHIRLPOOL 2363a4af583704dcc8b60a1a453ecfde4a6d0c9e117b0bc7bce6cb6a9916c089fc13c9afe548860dcaa97873f8ca74f8e33c730e28868f009a4aaf180d15f895
-EBUILD smplayer-14.9.0.6690-r2.ebuild 3241 SHA256 50544445f10ed69171589ec24d603b20832f77498a3a600e8035a2be5a994615 SHA512 06a3df427be668119a13c129671f8e00a550a7c8f5d2ea1d93eccc7f1f58711002c853362261ea3693950c03029ae06b7ecac11b8b6dabe84a5550b95e933926 WHIRLPOOL 116ecd004e8bc9bfeb405c2a9dbd9dafd3738fb215e48f9c2accf39f4e545f71b991ad2146267d418de8b566e165a368d475d30f14e8f74f339ca157311a8d9b
-MISC ChangeLog 22458 SHA256 d6c9d245b1fea8d27fae60e268ac1452950fa3222bf6a88a77d03e48a2de59c3 SHA512 ae64e50b66940463966c5f8df9b18d1d1c74f5c81bdc7a4855c9c580e58579804d5695232d78f0470c6e59ee19a72aee1b2211836835bd957128bffa30430a17 WHIRLPOOL 891f87e1d3025303df32614b7c6ac3248117dc79911e3ce81e308b4131f71d69e0d53d3924e98add876fc8cee613d722c77359208b4253325f402dbf2d73b4d7
+EBUILD smplayer-14.9.0.6690-r3.ebuild 3226 SHA256 c2d21a64bb46320751094988d9f2944ed2e1a63fcb3c57a2f5573c3256e1ffb9 SHA512 3ca8ff602afb1f9be636a6784288b886bd58ec98c29077507c23f2670ccbe933689b1aab49ff04c01099b4fc6651f975eba931e792ebc355ed2d92e87896fc2f WHIRLPOOL 583d8daa614f112f865e172a0ceda265dec8fa442cde28897527c9157bb8bfe371887a946ffcb1d9f26997909f8c90a1b66ee0117bb9116208cccea453db3012
+MISC ChangeLog 22938 SHA256 70cf41b7a0ca60d09f8e2c83cc10668c4fae8cba41e0b2c45dfe9e5665d67379 SHA512 bcebcb5a8335b1c238382989ae81013ec62602a671b0fb7794100923194f32a127a304734c35f1ca5566ea0494b9d5edd2fae01544a327baed9bcaefbe65fe36 WHIRLPOOL d9f17a4f22ad76db896931752aead609e570eab139d0eb3fcb5b71c0ad2e50901ee3af2680d7d9f67b25a190ca61b052596f4e7f045ac511f1e8671634717e63
 MISC metadata.xml 505 SHA256 ca8bb6982e46f56f34350483c91999e947f0d30aae50bdb75dc7f8fba8e76e1b SHA512 18a3dbf2bea045c321945434a0933468d27b40cc0984d0c439a6726b25cbf978c9f9886aa09f7dbfa6c0176477095e5c5ddec4267ce52478cc92d053f0697f18 WHIRLPOOL dd5ae89b730a16d4531adc640df01b4d01fad68d8b7018f35e7dfefff3dd30c36cb6d2b3e8ff6d0332de8e639ea850985d5388435744dcbdff8f255822d4e0c6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVCBTKXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVDl6oXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ5MTlDREQ0NUU5Mjc4RkU2RjJDNTAyNzU0
-RkRGOUNGRDJGQUM1MTRFAAoJEE/fnP0vrFFO3rIQAKB7UvSFa26tzPU0NPV+wi+G
-6gL5LbXeBc7DL9qP+/8CSsZH42PrJn3qRdvFgdklV+MVzf3oy3zMI5ccf0s5Munm
-T2/MyUl9Y5lKlSISm8WulTwdnOEhIbnwA11NVtpZ++gCyAHWRRgKzD6N7TLOfMvv
-gz5ohydXsW2elfd3x1LOXo4+P2VDEWvIhCtP/mz2sl9J6Nx+mc1KhnKpE1/SzPHC
-GC7REWqselxumGPi/Q+RxmBoExQ0PyOv50OrECq9OmbvlneiV17fJc1UwQLJRfOg
-FvsOzbmIPwTZ1iQSJK+VZRf/94Vze3wuH3JGxfrCl8e8iypj+l42ZUYBnbCr08Z6
-1x1bhnQYbMPSi612tuSR3odwxohuJMpBj4rCWcLoVH0tkreuydKJH2WwndDwWq9Q
-C6R/1UjQs9OyvhOVa5gk2QhIHU+d869N1kMW9b8RqNJM2JL6132BLx8mBLqbQNhy
-NqadU/ys1f/bb6lgFJfDwsL6jKylIwcCK04VaCHRIbLnVBugfS72Fp9KlptABb+S
-Rp8olkc3ismoTwLsXGg2dMV79xfDsJXHHgn1i/D2nrekXcZnZE3P44BvqjhSeNkl
-lcqOhq1hR21h3GIHvnR+utBGlk/hzUOEluriWP/8+yCetXsZuibkQDOtD8w4Zcbs
-EPP5izobvh9VrFhuzDqp
-=9Lve
+RkRGOUNGRDJGQUM1MTRFAAoJEE/fnP0vrFFOT44QAJS0D1+1eIA+JIZ+pyGoEamA
+QUD/FZ35S0CfDGHuCjiIRcD6NdAfU3s5dBYZGz3rv+zkYQbDoe1A7wfMbw9nIJ+X
+jr78aodVSTRMGw3pSi1sXfkFhiwSxgnA+KAKV87sQFQ+bH4q+AXZCgDnb4HeFGGB
+2j3T1z5Gmo9oh2yF/CupDwBbm4dvY7mc2Zfh66bkKW9baS0OmR3c9VQDTv7eGfGO
+TZvNycItDUDPPJZm/P9EaTImekdwN3hNmPDfBR8lvq76AUHb84I1V+iyY6Nxqaqw
+ey2E0z4NpMtP2B0rcm/ozRd4T5DgLZkCpQSrsl97cE7hByEva6jgFaMjrddi26ju
+z0Fde6p4tdwjz2ZqnQi992SWrp01XeKEkr6RX33irGHbMwB2EtvkwerMa5hmxcpK
+CZVjh0IAmXVySM7iLsKkeMPZSConxQtYxMFifLntzL4v3Kme7q2BOYy4vs8/FBdT
+9h8amUnKzFLp2Vqlv7dYCIvP5wDjmiH488SGuvO68yaCXlv00Zqxl914PUGCKAew
+n2ZMnoMkzZsDEb/X8OcIyZNiEiYwqOh/x1p5Tdn21Ccz/rX1NTHeT/d8MJue5xJp
+Zw0SG8fSRuOBmjkJuG+q3jixnhpGUHTpWCOcLMBYEgERFDepk4clw+VP8/tme0Gm
+A7Z1kJzMdbiTYleJuLEj
+=9on3
 -----END PGP SIGNATURE-----

diff --git a/media-video/smplayer/smplayer-14.9.0.6690-r1.ebuild b/media-video/smplayer/smplayer-14.9.0.6690-r1.ebuild
deleted file mode 100644 (file)
index 11238dd..0000000
--- a/media-video/smplayer/smplayer-14.9.0.6690-r1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# 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-r1.ebuild,v 1.2 2015/03/12 08:28:34 jer 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="~amd64 ~arm ~hppa ~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/linguist-tools:5
-               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
-}
-
-get_qt_bindir() {
-       local qt4bindir=${EPREFIX}/usr/$(get_libdir)/qt4/bin
-       [[ -x ${qtbindir} ]] || qt4bindir=${EPREFIX}/usr/bin
-       use qt4 && echo ${qt4bindir}
-       use qt5 && echo ${EPREFIX}/usr/$(get_libdir)/qt5/bin
-}
-
-gen_translation() {
-       ebegin "Generating $1 translation"
-       "$(get_qt_bindir)"/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
-}

diff --git a/media-video/smplayer/smplayer-14.9.0.6690-r2.ebuild b/media-video/smplayer/smplayer-14.9.0.6690-r3.ebuild
similarity index 86%
rename from media-video/smplayer/smplayer-14.9.0.6690-r2.ebuild
rename to media-video/smplayer/smplayer-14.9.0.6690-r3.ebuild
index bc7d0cdb1d82a3e16d1cd101548061695f46ab93..473d89a4653aeaa99c0a09eeda904664b0468e09 100644 (file)
--- a/media-video/smplayer/smplayer-14.9.0.6690-r2.ebuild
+++ b/media-video/smplayer/smplayer-14.9.0.6690-r3.ebuild
@@ -1,6 +1,6 @@
 # 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-r2.ebuild,v 1.2 2015/03/17 11:49:20 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/smplayer/smplayer-14.9.0.6690-r3.ebuild,v 1.1 2015/03/22 06:18:09 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
@@ -19,24 +19,24 @@ KEYWORDS="~amd64 ~arm ~hppa ~x86 ~x86-fbsd ~amd64-linux"
 IUSE="autoshutdown bidi debug qt4 qt5 streaming"
 REQUIRED_USE="^^ ( qt4 qt5 )"
 
-DEPEND="qt4? ( dev-qt/qtcore:4
+DEPEND="
+       qt4? ( dev-qt/qtcore:4
                dev-qt/qtgui:4
-               autoshutdown? ( dev-qt/qtdbus: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/qtscript:5
                dev-qt/qtwidgets:5
                dev-qt/qtxml:5
-               autoshutdown? ( dev-qt/qtdbus:5 ) )"
+               autoshutdown? ( dev-qt/qtdbus:5 )
+               streaming? ( dev-qt/qtnetwork:5[ssl]
+                       dev-qt/qtscript: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
-               qt4? ( dev-qt/qtcore:4[ssl] )
-               qt5? ( dev-qt/qtnetwork:5[ssl] ) )"
+       || ( 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}"/${P}-zero-bidi.patch