From 00ccdedbb2ce0ccf5ba48b737cfc3b55320d9b53 Mon Sep 17 00:00:00 2001 From: Alexis Ballier Date: Fri, 16 Dec 2011 13:24:10 +0000 Subject: generate snapshot_version the same way as upstream version.sh and use printf which should be more portable (Portage version: 2.2.0_alpha81/cvs/Linux x86_64) --- media-video/mplayer/ChangeLog | 6 +++++- media-video/mplayer/files/prepare_mplayer.sh | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'media-video/mplayer') diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog index c84a334a3999..2a106f37fcc9 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.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 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 files/prepare_mplayer.sh: create a snapshot_version file in snapshots to get svn revision diff --git a/media-video/mplayer/files/prepare_mplayer.sh b/media-video/mplayer/files/prepare_mplayer.sh index d82154487782..05aca67391c7 100644 --- 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 -- cgit v1.2.3-65-gdbad