From aebf5bc3df92ffba857c3d6d94b47dd7b0e020c6 Mon Sep 17 00:00:00 2001 From: Luca Barbato Date: Mon, 31 May 2010 13:41:41 +0000 Subject: [PATCH] fix sed lines Package-Manager: portage-2.1.8.3/cvs/Linux x86_64 --- media-video/mplayer/ChangeLog | 5 ++++- media-video/mplayer/Manifest | 4 ++-- media-video/mplayer/mplayer-9999.ebuild | 6 +++--- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog index c826f0530ca4..f1254a4cbfaa 100644 --- a/media-video/mplayer/ChangeLog +++ b/media-video/mplayer/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-video/mplayer # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.741 2010/05/20 14:39:32 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.742 2010/05/31 13:41:40 lu_zero Exp $ + + 31 May 2010; Luca Barbato mplayer-9999.ebuild: + make sure sed line is safe as suggested by Nikoli on #gentoo-media 20 May 2010; Jeroen Roovers mplayer-1.0_rc4_p20100506.ebuild: diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest index a9a5fa7c2434..62f5dd1e8fe3 100644 --- a/media-video/mplayer/Manifest +++ b/media-video/mplayer/Manifest @@ -8,6 +8,6 @@ DIST mplayer-1.0_rc4_p20100506.tar.bz2 8966725 RMD160 3355600313ac6e6e661acfcdec DIST svgalib_helper-1.9.17-mplayer.tar.gz 7583 RMD160 927ff34f187e4fa9528e2e48208173d98b3d1d1b SHA1 bf789706d1d79c695f781644c7ea6d57c3eed4c3 SHA256 a6f803f3df4cd4544751d3a3ee936a8bf0e20e32a452639b3f7c7d9e73e65938 EBUILD mplayer-1.0_rc4_p20091026-r1.ebuild 18927 RMD160 c7309c7c6ede6bac97c11cad1cc7b0e22aefbd51 SHA1 c86f4c9aaa6988514567767bc956e13990604bce SHA256 33f3781cb30c8fa255720858dca723597a4e58aef5fa2ab61c22dcc295b9b070 EBUILD mplayer-1.0_rc4_p20100506.ebuild 20207 RMD160 1eb6056f90a443eaca390be0b38f7174ed9137b0 SHA1 e599d0d08f1789dfdcbd6b2b0f694ab14670404d SHA256 7d0a6d38e771f3dd58b93269f6b305712362339afd49ae25a0efbac61e53146e -EBUILD mplayer-9999.ebuild 20178 RMD160 b6cbf97650f74f7764960558cdd72263600c02d9 SHA1 cb783aebe6f6cf610547d614f177003367b1daaf SHA256 3fb4e02b64656a43ed9a5c596b9a7a60feb707f2041b7d7ee9d06598a5d34bfe -MISC ChangeLog 130952 RMD160 79bf9e07301d88abb5e9b7a0713a910616bc95a3 SHA1 8fd2f8d015a309d7d685b26d3ebd15c874ec76cd SHA256 a6ab3ee9413eaeb1ad10f5fdc4fcf429350c5e9b1d4c847f5acd30da05695e7d +EBUILD mplayer-9999.ebuild 20201 RMD160 234a8f62bbf8c80cfc26331b82d9900f3584e931 SHA1 1a4bd3ee49863e3ae880dd9a3af2ea9ae48b6852 SHA256 c1ffaca0a8c3d867c9e42641b4ecfa10a43077c6747116c2c4c5cebabdb5b07a +MISC ChangeLog 131096 RMD160 36e6e5ac9f9ba8032cff1c832e81634342d7b161 SHA1 e505aaa2240242cf90e1cc8d25b060a9e27d9bac SHA256 8fc403091cf98bd5068ec1fbeb9a479c6c229f794910468dadad05598c519c53 MISC metadata.xml 3586 RMD160 b9cb0e6ff486e5d3cc87e4d23bf0facb1bfa9b5b SHA1 9e082b1c3ff16683a7f7a3b0fd57eaad70673f24 SHA256 5a31e1c7c36addd4653af26afeacdf5cf527c03c55b1636fe0d9aad19215766e diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild index 51e6d2792b48..251dc365e08a 100644 --- a/media-video/mplayer/mplayer-9999.ebuild +++ b/media-video/mplayer/mplayer-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.58 2010/05/09 16:44:58 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.59 2010/05/31 13:41:41 lu_zero Exp $ EAPI="2" @@ -243,10 +243,10 @@ src_prepare() { if [[ ${PV} = *9999* ]]; then # Set SVN version manually subversion_wc_info - sed -i s/UNKNOWN/${ESVN_WC_REVISION}/ "${S}/version.sh" + sed -i -e "s/UNKNOWN/${ESVN_WC_REVISION}/" "${S}/version.sh" || die else # Set version # - sed -i s/UNKNOWN/${MPLAYER_REVISION}/ "${S}/version.sh" + sed -i -e "s/UNKNOWN/${MPLAYER_REVISION}/" "${S}/version.sh" || die fi if use svga; then -- 2.26.2