Fix translations generation snafu

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 bf1a31f35bf5d8a60531b9a340ca15503a02e870..c138464e3ce3dd1f70cd402ab4f3764269ccb41d 100644 (file)
--- a/media-video/smplayer/ChangeLog
+++ b/media-video/smplayer/ChangeLog
@@ -1,6 +1,9 @@
 # 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.161 2015/03/16 14:54:37 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/smplayer/ChangeLog,v 1.162 2015/03/17 11:49:20 yngwin Exp $
+
+  17 Mar 2015; Ben de Groot <yngwin@gentoo.org> smplayer-14.9.0.6690-r2.ebuild:
+  Fix translations generation snafu
 
 *smplayer-14.9.0.6690-r2 (16 Mar 2015)
 

diff --git a/media-video/smplayer/Manifest b/media-video/smplayer/Manifest
index b6b49f5a8c9f756d2df7982dbda32cea8252018e..d16aa55e79e7c3b11e9f33fd3e0f07d210caa809 100644 (file)
--- a/media-video/smplayer/Manifest
+++ b/media-video/smplayer/Manifest
@@ -9,25 +9,25 @@ DIST smplayer-14.9.0.tar.bz2 3716434 SHA256 429ad4edd6df1fcedd5ea4fa2b024eb5a61c
 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 3205 SHA256 9f94d97840475d46ed48a9aea71499c698fe6bfbb29e3f565b1504b10ea2b68d SHA512 c4928c8353d4be3629d6ebbe64488aae04969baf7c0cb6c1def36d7781cc393599595787f1dcec6b4c99635f249efaaa601071c14eb13c59c53065a28c6535de WHIRLPOOL 5e09df35f962da7dcf31ac9632efec51fee6aa5d8ff8ff19b090994f230da9f1ab60b0604478dee7b01e9f4fab4086f10e3c351ce4c7f45158554135c9f09f3d
-MISC ChangeLog 22341 SHA256 22dd33051cd81e4e3e16509f101fa43aa776b49cdbc9944297b6e6d6fc07688b SHA512 2b1e67096a87ff891505cd1386ad55fa7b2abe1a4044c2f1bb5e701022743e2d18e094a8db8af3b3b02ef9e9875a41fc57b11b41227046c3783f4f02f8c5b80f WHIRLPOOL cca25acd2bc204037c9929b153a543e8e306aa3c17a909f71ea361dd57b06b2d7e12246bf4de036e217861e07a1acc86240c7fdd724a04f6d1cd51ef78aa3d53
+EBUILD smplayer-14.9.0.6690-r2.ebuild 3241 SHA256 50544445f10ed69171589ec24d603b20832f77498a3a600e8035a2be5a994615 SHA512 06a3df427be668119a13c129671f8e00a550a7c8f5d2ea1d93eccc7f1f58711002c853362261ea3693950c03029ae06b7ecac11b8b6dabe84a5550b95e933926 WHIRLPOOL 116ecd004e8bc9bfeb405c2a9dbd9dafd3738fb215e48f9c2accf39f4e545f71b991ad2146267d418de8b566e165a368d475d30f14e8f74f339ca157311a8d9b
+MISC ChangeLog 22458 SHA256 d6c9d245b1fea8d27fae60e268ac1452950fa3222bf6a88a77d03e48a2de59c3 SHA512 ae64e50b66940463966c5f8df9b18d1d1c74f5c81bdc7a4855c9c580e58579804d5695232d78f0470c6e59ee19a72aee1b2211836835bd957128bffa30430a17 WHIRLPOOL 891f87e1d3025303df32614b7c6ac3248117dc79911e3ce81e308b4131f71d69e0d53d3924e98add876fc8cee613d722c77359208b4253325f402dbf2d73b4d7
 MISC metadata.xml 505 SHA256 ca8bb6982e46f56f34350483c91999e947f0d30aae50bdb75dc7f8fba8e76e1b SHA512 18a3dbf2bea045c321945434a0933468d27b40cc0984d0c439a6726b25cbf978c9f9886aa09f7dbfa6c0176477095e5c5ddec4267ce52478cc92d053f0697f18 WHIRLPOOL dd5ae89b730a16d4531adc640df01b4d01fad68d8b7018f35e7dfefff3dd30c36cb6d2b3e8ff6d0332de8e639ea850985d5388435744dcbdff8f255822d4e0c6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVBu6yXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVCBTKXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ5MTlDREQ0NUU5Mjc4RkU2RjJDNTAyNzU0
-RkRGOUNGRDJGQUM1MTRFAAoJEE/fnP0vrFFOV34P/iBukP3Dk8WoZiEfQ9qBfZ+P
-hFJOh0EtDVz2YgON8Qmv+2Aweq9vUBl03vgOJadJx4UykiLpMr/i1NimqB9lq/UB
-RRd9ItROmggywUPjxqwX2RpI/9eVG4ytNK8S3Xc8c6gCnAAL5AgX3TqRduJYhCFt
-qlAjr7Ta5R8kwdt7o39Gjj2dlbW94A8Xmdbv7XxcjSEJYVww6/V4vLLeRsnxiO7B
-V+47bR/cQT1yFOBJH78S9xwZj77fkGIwK6+ckpDebAoBi6Ffr7vVGCwy00EhW/nA
-HJmeGpjVu9UHQw4ffmq0Q6lvmK5zvNRrZTT8NxkhooFKATYFvlhdr1J/LbZMYT9+
-cWR6E7FLKczdXpjmzGgKjfKJ6kQN2yAJNhAGOo0xKk9aITM6uuwQ/3/4aY6/tVTS
-/tyXhoUs8H1tyXBMyC8lW7+Pbxfj7bW0KpQAW6MNckIMofckoDCnG3Hw2TlQrnPs
-K8qSOe1SmiEEbUO29KCjWJF2Xd2nd1YCJ/RF3kspkQl/fbLGIqIitNyINbQiONpu
-fhJm711PurJQflpmxLcAJpB4erZQYovaOyoh6l1qLafOmkJxExsYdqzoitA5Bfef
-xTZQLAkD0YylyFJ41kknUT+aUA5lPqQAC4Zx5zLxJm7nmSueQj9Se6tT+dUSKDog
-L/on2QcrLHEejU/tVp0h
-=SRNv
+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
 -----END PGP SIGNATURE-----

diff --git a/media-video/smplayer/smplayer-14.9.0.6690-r2.ebuild b/media-video/smplayer/smplayer-14.9.0.6690-r2.ebuild
index 52fb3ed837f6f720303607db7494e6368e98313f..bc7d0cdb1d82a3e16d1cd101548061695f46ab93 100644 (file)
--- a/media-video/smplayer/smplayer-14.9.0.6690-r2.ebuild
+++ b/media-video/smplayer/smplayer-14.9.0.6690-r2.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.1 2015/03/16 14:54:37 yngwin Exp $
+# $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 $
 
 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
@@ -82,9 +82,14 @@ src_configure() {
 }
 
 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"
-       use qt4 && "$(qt4_get_bindir)"/lrelease ${PN}_${1}.ts
-       use qt5 && "$(qt5_get_bindir)"/lrelease ${PN}_${1}.ts
+       "${mydir}"/lrelease ${PN}_${1}.ts
        eend $? || die "failed to generate $1 translation"
 }