generate snapshot_version the same way as upstream version.sh and use printf which...

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

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index c84a334a399956f8ad4756cd083c6320009bea08..2a106f37fcc98ba2b89fce948a975e4922f1d8c2 100644 (file)
--- 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.815 2011/12/16 13:05:16 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.816 2011/12/16 13:24:10 aballier Exp $
+
+  16 Dec 2011; Alexis Ballier <aballier@gentoo.org> files/prepare_mplayer.sh:
+  generate snapshot_version the same way as upstream version.sh and use printf
+  which should be more portable
 
   16 Dec 2011; Alexis Ballier <aballier@gentoo.org> files/prepare_mplayer.sh:
   create a snapshot_version file in snapshots to get svn revision

diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 269c531143ed22f9344f06e0bf72347ad8737493..56bfd45afff2d99827ddd00eabb56c3a2f9181ce 100644 (file)
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -4,7 +4,7 @@ Hash: SHA1
 AUX dump_ffmpeg.sh 2469 RMD160 cfff8600318af17877e74f4f77acba50ae9a5001 SHA1 66b7462315e75c8657c42a183874cc3ea7f847c0 SHA256 253841d4e44d7b63d2c4ea28f9cd80e4e71323321e1771c5ef9918c32490dca5
 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 736 RMD160 cc632e907b98a7392407fddb2267643854fba321 SHA1 13600b667676a9ef342bab24c8ba7662fc046204 SHA256 f9bc44d83f2f66d03e208de6f2391622e3df51a79b0f23c30d9ef703602d6433
+AUX prepare_mplayer.sh 758 RMD160 008741cb14819858a7f08ba752d722ee44907666 SHA1 d60af28ae9025b1cd2f468701ab9732329a9ed38 SHA256 d8a92d83db920a3e47b864b24e78407c1ef5b2c523e91dceae2d96f5bcce435e
 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
@@ -13,12 +13,12 @@ DIST mplayer-1.0_rc4_p20111215.tar.xz 5209748 RMD160 294a0a6aaf773c0c59e772e0595
 EBUILD mplayer-1.0_rc4_p20110322-r1.ebuild 20381 RMD160 19bc9b09ce7902b4a7b16d5b5bd2215dc07a7f1e SHA1 08e9ca9249683695feab78ca3644dcfa1cc586b8 SHA256 1322ed59489cec383d7dac04c752cd083132c21711183e5bc02d70b2a525ab94
 EBUILD mplayer-1.0_rc4_p20111215.ebuild 19479 RMD160 6048ba695449c7b2459f30647ddf00d11a5db393 SHA1 64aeeabfe1718112aafeb132c184fa3377490ae9 SHA256 bd76e50de8cd87faaca63fe48622c9dafe88d7a6af67b693a07487ed091b6a73
 EBUILD mplayer-9999.ebuild 19510 RMD160 61850c78d92efb42dae7b4999924cde32ee6adb9 SHA1 76859f1c49651ba18b6ad7cf810e797608cc6202 SHA256 e5bfe8fc0214a9a8d30fb9603629b8cabc1152ff23fec26f549532761fed6d85
-MISC ChangeLog 142569 RMD160 d66e1acd7c43c88bfb5d4d8b5e18d40b4744a0e6 SHA1 052f91d7488e9778413306abde120d98d56b2f19 SHA256 c116c515b559e22bbf99ae5915ea64a0ae62b8376d0f208249e27708f983acd0
+MISC ChangeLog 142759 RMD160 d89dbab88b4bd7344fc419572d36bdcd3845270c SHA1 48e4d0b0cb5e1db760021aae43e96bddd800a264 SHA256 aa400b14609a0f5558ada8428cdc19404c1b42fe9b472a44b3da9ae80082414c
 MISC metadata.xml 3737 RMD160 7e18b891f225227f4ecad678e423777f5dd908a7 SHA1 daf40e426abbf0306e2ebeca72ebe54546d81e46 SHA256 dd83a6946f62cbeb84b0e65d2ba6289638d632b80a690714595a44aa3cf86c1a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk7rQhEACgkQvFcC4BYPU0oibgCgiKBFp+gNXTY7x+7oF+Rw4Xjj
-kTsAoJGB1Q1097z2RHhJh+dTicFmjdEu
-=qPnU
+iEYEARECAAYFAk7rRn8ACgkQvFcC4BYPU0p5DwCgj4yzdaH5ICP6ufpV1gd5h5l2
+ghQAoLGqHo08lWtB9YD2KajUwqAAWUB6
+=o3+e
 -----END PGP SIGNATURE-----

diff --git a/media-video/mplayer/files/prepare_mplayer.sh b/media-video/mplayer/files/prepare_mplayer.sh
index d82154487782894b0de611edebe3ab877743ddbe..05aca67391c71727f66aa301f58afb1f2f5a16d2 100644 (file)
--- a/media-video/mplayer/files/prepare_mplayer.sh
+++ b/media-video/mplayer/files/prepare_mplayer.sh
@@ -10,8 +10,8 @@ pushd ${PACKAGE} > /dev/null
        rm -rf ffmpeg
        git clone git://git.videolan.org/ffmpeg.git ffmpeg/
         sh "$DUMP_FFMPEG"
-       STORE_VERSION=$(svn log -r HEAD -q |grep ^r |cut -d' ' -f1)
-       echo "$STORE_VERSION" > snapshot_version
+       STORE_VERSION=$(LC_ALL=C svn info 2> /dev/null | grep Revision | cut -d' ' -f2)
+       printf "$STORE_VERSION" > snapshot_version
 popd > /dev/null
 
 find "${PACKAGE}" -type d -name '.svn' -prune -print0 | xargs -0 rm -rf