fix build of swedish help, by larkang@gmail.com, bug #395677

Package-Manager: portage-2.2.0_alpha81/cvs/Linux x86_64

4 files changed, 29 insertions, 8 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 6723ce22af17..74505d3a4797 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.831 2011/12/19 16:47:17 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.832 2011/12/22 13:26:21 aballier Exp $
+
+  22 Dec 2011; Alexis Ballier <aballier@gentoo.org>
+  mplayer-1.0_rc4_p20111215.ebuild, +files/swedish.patch:
+  fix build of swedish help, by larkang@gmail.com, bug #395677
 
   19 Dec 2011; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
   improve a warning
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index cf151db4420f..81df442d262c 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -5,20 +5,21 @@ AUX dump_ffmpeg.sh 2494 RMD160 49af8d85dd18122496f32035864e0d87d6446140 SHA1 ca1
 AUX mplayer-1.0_rc4_p20110322-gcc46.patch 657 RMD160 a327aa565f55102be2d6f73f12e08862418023e9 SHA1 560e41e7c5c147e8656ec0216f4272e1421e887c SHA256 4c57d5c4c79db87796b6b1b4a485f4d0a8ed95f3ae71040592a0bd5f3dc070b2
 AUX mplayer-1.0_rc4_p20110322-sami_subtitle_parsing.patch 417 RMD160 d72bf30164ed6acfac7113ac4c78ff36ebce884e SHA1 4bb165cf52e176201dad512dd4a50cd04a08b228 SHA256 413876d32509c5e09df58b6f833036cb16d1073fcfecb17e0be9dc355d0e7160
 AUX prepare_mplayer.sh 758 RMD160 008741cb14819858a7f08ba752d722ee44907666 SHA1 d60af28ae9025b1cd2f468701ab9732329a9ed38 SHA256 d8a92d83db920a3e47b864b24e78407c1ef5b2c523e91dceae2d96f5bcce435e
+AUX swedish.patch 778 RMD160 cff6977dadbb10fe3b43e9fcdae4be0961b4ab03 SHA1 fabb55c984fe1ccc5d6f750e3cbea6fe1bb369dc SHA256 5a539b946fabebd3e98b4a4b8c022db88e58b2b3387527fc6eb25e09d2d53d26
 DIST font-arial-cp1250.tar.bz2 249705 RMD160 a2fc7ae07b0d80936ea58e168e1047efccb9eb91 SHA1 ccf11dce5d0fb72fd3af97f788b7471cd0cd0b68 SHA256 423a07e780bb130cd8e4730715545c5d919c248dda595aab7a0a01de3c83fd12
 DIST font-arial-iso-8859-1.tar.bz2 234242 RMD160 666697cd5efd9387057a898c714175e7c2aacbcd SHA1 152c40bf20de34aa8802d7f80d34d673b0b67212 SHA256 9730f481764f367c9089d0166fb6ccf9148808ffbbfeca635cf0e6db75765d29
 DIST font-arial-iso-8859-2.tar.bz2 222208 RMD160 562d4d92c4f5f3d537340fde3ad8d1495ac41acb SHA1 7b99bbe0e9ba89a57eccbea8f93c453c4f268181 SHA256 71debfc960007c2f6242dfc91e8b1c005b30a99e129aeb00ab8c03f4371b41c1
 DIST mplayer-1.0_rc4_p20110322.tar.xz 8323532 RMD160 7082c95fa20cb7e3d491546ae08a4dfafdc17d09 SHA1 3f60cf0ce8c910e3628e425167cb6a46bb4a29a3 SHA256 addaae78cfd7f8cb950370b3b43d82c2f8170830ccc1046b98726d34f3958bf5
 DIST mplayer-1.0_rc4_p20111215.tar.xz 5209748 RMD160 294a0a6aaf773c0c59e772e059541a315b8134dd SHA1 69f46ffe5b26f1b30a4afbf66bae42f033fca199 SHA256 edb23cae8c49cace3ecb303b6d66490e9a143c5d2d9db803f9ec1bbbbb874635
 EBUILD mplayer-1.0_rc4_p20110322-r1.ebuild 20381 RMD160 19bc9b09ce7902b4a7b16d5b5bd2215dc07a7f1e SHA1 08e9ca9249683695feab78ca3644dcfa1cc586b8 SHA256 1322ed59489cec383d7dac04c752cd083132c21711183e5bc02d70b2a525ab94
-EBUILD mplayer-1.0_rc4_p20111215.ebuild 19455 RMD160 2eb8087a10021f937cc894ffc840f08471a59f14 SHA1 ac7409811698ad1dac29d45ba8ead0a777891c0d SHA256 28678530fed056e3e826ebbddac5069ccb435adef250bda27fa4f41f85acbc8e
+EBUILD mplayer-1.0_rc4_p20111215.ebuild 19483 RMD160 a9ab1ecb51f1c6535793726a8aebbc31285e59a1 SHA1 acbddba711723cc1f725ec5d706444622b6ad547 SHA256 7d02da4cd49e6097cba15204570d507ab09d6f4e2e1270eb749327b53650889d
 EBUILD mplayer-9999.ebuild 17741 RMD160 0a6e26122ef4f7f0b4d65fef9f4d718348834083 SHA1 e0732891b625cfc0cedc19c76b056d80d105bdf9 SHA256 076f9d22322a2796e4351c22c9776bcedc2154ebd61cbd31796e28929e9c2dc6
-MISC ChangeLog 145164 RMD160 ac7d33584a199156f86ed9a4e9eeb194f4d1e226 SHA1 45eb104d42cc85c63fb88887542b89e8095660e4 SHA256 ddc3d04e93f4eac2867bb76ed764499ca9a9475d48e3dcee4d720663a5812473
+MISC ChangeLog 145338 RMD160 a40ecbcbe8e66352da3652340532973199f575d4 SHA1 753f401e79100faddb7f37d5461e988ab7128aa9 SHA256 30dfa65bd84fadb4af7ddefca76b4d3246a3d547e64f450cea55993eaae453ef
 MISC metadata.xml 3737 RMD160 7e18b891f225227f4ecad678e423777f5dd908a7 SHA1 daf40e426abbf0306e2ebeca72ebe54546d81e46 SHA256 dd83a6946f62cbeb84b0e65d2ba6289638d632b80a690714595a44aa3cf86c1a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk7vapsACgkQvFcC4BYPU0prOACgwk0y1oM5dMLRWlrpJH/j8Fg2
-jpYAn1ZQCYhUn+dfrNIt5BpkTXyqtdsL
-=4fef
+iEYEARECAAYFAk7zMAMACgkQvFcC4BYPU0qa1gCZAfHyG0SYSX9ZfhUqJgHBkvI0
+h0oAoMXzL/T9MKmg/He1GrvCyer8bseo
+=SZpG
 -----END PGP SIGNATURE-----
diff --git a/media-video/mplayer/files/swedish.patch b/media-video/mplayer/files/swedish.patch
new file mode 100644
index 000000000000..6b9b1316baa3
--- /dev/null
+++ b/media-video/mplayer/files/swedish.patch
@@ -0,0 +1,16 @@
+Fix build of swedish help after 33915
+Patch by larkang@gmail.com
+https://bugs.gentoo.org/show_bug.cgi?id=395677
+
+Index: help/help_mp-sv.h
+===================================================================
+--- help/help_mp-sv.h	(revision 34452)
++++ help/help_mp-sv.h	(working copy)
+@@ -99,7 +99,6 @@
+ #define MSGTR_Playing "Spelar %s.\n"
+ #define MSGTR_NoSound "Audio: inget ljud\n"
+ #define MSGTR_FPSforced "FPS forcerad att vara %5.3f  (ftime: %5.3f).\n"
+-    "För att få bäst prestanda, omkompilera med '--disable-runtime-cpudetection'.\n"
+ #define MSGTR_AvailableVideoOutputDrivers "Tillgängliga video-ut-drivrutiner:\n"
+ #define MSGTR_AvailableAudioOutputDrivers "Tillgängliga audio-ut-drivrutiner:\n"
+ #define MSGTR_AvailableAudioCodecs "Tillgängliga audiocodec:\n"
diff --git a/media-video/mplayer/mplayer-1.0_rc4_p20111215.ebuild b/media-video/mplayer/mplayer-1.0_rc4_p20111215.ebuild
index a687d07843d3..afbe894c0eaf 100644
--- a/media-video/mplayer/mplayer-1.0_rc4_p20111215.ebuild
+++ b/media-video/mplayer/mplayer-1.0_rc4_p20111215.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc4_p20111215.ebuild,v 1.3 2011/12/17 13:01:33 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc4_p20111215.ebuild,v 1.4 2011/12/22 13:26:21 aballier Exp $
 
 EAPI=4
 
@@ -188,7 +188,7 @@ fi
 # xvmc requires xvideo support
 REQUIRED_USE="bindist? ( !faac !win32codecs )"
 
-PATCHES=(
+PATCHES=( "${FILESDIR}/swedish.patch"
 )
 
 pkg_setup() {