Fixed an error with sed and error check it in the ebuild and converted einfo to elog where appropriate.

Package-Manager: portage-2.1.2-r6

3 files changed, 37 insertions, 33 deletions

diff --git a/games-fps/ut2004/ChangeLog b/games-fps/ut2004/ChangeLog
index c54a7a6b2965..5d136ed3a7d2 100644
--- a/games-fps/ut2004/ChangeLog
+++ b/games-fps/ut2004/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/ut2004
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004/ChangeLog,v 1.59 2006/12/06 19:52:03 wolf31o2 Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004/ChangeLog,v 1.60 2007/02/07 12:06:16 wolf31o2 Exp $
+
+  07 Feb 2007; Chris Gianelloni <wolf31o2@gentoo.org> ut2004-3369-r4.ebuild:
+  Fixed an error with sed and error check it in the ebuild and converted einfo
+  to elog where appropriate.
 
   06 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org> files/ut2004.xml,
   ut2004-3369-r4.ebuild:
diff --git a/games-fps/ut2004/Manifest b/games-fps/ut2004/Manifest
index 0f7390f39621..4e1844d37673 100644
--- a/games-fps/ut2004/Manifest
+++ b/games-fps/ut2004/Manifest
@@ -6,14 +6,14 @@ MD5 ea7cb10746e55fd4b466a895fb7ee839 files/ut2004.xml 370
 RMD160 f54254f4af9422b72e93b9f4e2aa126b828c34f4 files/ut2004.xml 370
 SHA256 69d2ad349f8b0464157979518ca3482b6b8bbc34f25d710668775f36581be34c files/ut2004.xml 370
 DIST ut2004-lnxpatch3369-2.tar.bz2 22465217 RMD160 af632d8cd1f05e36e861eb3fab927ffc8ae3f59d SHA1 a8cc33877a02a0a09c288b5fc248efde282f7bdf SHA256 438b9b13a367d46f23cce12b065382a55afa2fc68add1f1dd3db03b015f60bb3
-EBUILD ut2004-3369-r4.ebuild 5237 RMD160 95c7d9416c0d08885683f11a76518b230eb19617 SHA1 2f3c9abe14543478b1a1a182468c17d74e32457f SHA256 0c2cd98dab44997bfd42589d9d0e87a023cd0d88dcadbd74d79efc9487a9a4df
-MD5 ddfb49ec2892bfa96feb73588e98e3e3 ut2004-3369-r4.ebuild 5237
-RMD160 95c7d9416c0d08885683f11a76518b230eb19617 ut2004-3369-r4.ebuild 5237
-SHA256 0c2cd98dab44997bfd42589d9d0e87a023cd0d88dcadbd74d79efc9487a9a4df ut2004-3369-r4.ebuild 5237
-MISC ChangeLog 10660 RMD160 834e086e72d4bb9e9785e4369ad7b618ade176ff SHA1 7da67a8ac3649041f9c18b460d4793365baf7243 SHA256 951b0cbfc01e752432dc3f9abaf994d2fe60e671b5674e4a17b5dc818e7cdf90
-MD5 9f737520ed9d86f094497fd6f0e39f1c ChangeLog 10660
-RMD160 834e086e72d4bb9e9785e4369ad7b618ade176ff ChangeLog 10660
-SHA256 951b0cbfc01e752432dc3f9abaf994d2fe60e671b5674e4a17b5dc818e7cdf90 ChangeLog 10660
+EBUILD ut2004-3369-r4.ebuild 5244 RMD160 6e96ffba5deb9a76fd87ee1a1656286281eac4d2 SHA1 8e44e8005044c4a6764870dfd5ce0d637efebcef SHA256 e4f4e98e77b3027acd7000e12d00d0aed2176774c078e0c7c2e8e0edae245ba4
+MD5 3c576e40b6553c1ddc0f339141bc0592 ut2004-3369-r4.ebuild 5244
+RMD160 6e96ffba5deb9a76fd87ee1a1656286281eac4d2 ut2004-3369-r4.ebuild 5244
+SHA256 e4f4e98e77b3027acd7000e12d00d0aed2176774c078e0c7c2e8e0edae245ba4 ut2004-3369-r4.ebuild 5244
+MISC ChangeLog 10846 RMD160 167c7fce31287d4658c496c5a895880ec452d9eb SHA1 2ebac32ec5f39e221fc82b5c63aeaad57c4265dc SHA256 a47fcec8c5923e5c34911e537bb7b7a8028c8cfc9bd1cff46d217a8309b8392c
+MD5 f786f08eae543a55216cf043ff2e481e ChangeLog 10846
+RMD160 167c7fce31287d4658c496c5a895880ec452d9eb ChangeLog 10846
+SHA256 a47fcec8c5923e5c34911e537bb7b7a8028c8cfc9bd1cff46d217a8309b8392c ChangeLog 10846
 MISC metadata.xml 254 RMD160 877a1dc36df2be58926bc51041093feafdefe429 SHA1 45f0334cd127c4a1b4ece41f7098ab70046e378a SHA256 2916aab684ec3908fffb515065eeb2c481cde563380b682646add582bed5f535
 MD5 11a7e1491b1ac042ac7216b26b4ad1fb metadata.xml 254
 RMD160 877a1dc36df2be58926bc51041093feafdefe429 metadata.xml 254
@@ -22,9 +22,9 @@ MD5 2316e4a01aee16470ad74edc0de49cab files/digest-ut2004-3369-r4 274
 RMD160 a4f837e7ef67ff362db4c743a1dad0543dfa5fc7 files/digest-ut2004-3369-r4 274
 SHA256 1d955ade2fd863e38d6a1170b089ee73152a05e1ce800f24db8095bba8e2e57f files/digest-ut2004-3369-r4 274
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFdx9vkT4lNIS36YERAvOsAJwK/k0easMxEkQgFK7NU91WESYfiwCfclFf
-jsT2o9T62P0l4oYiA4l+yX0=
-=kDV3
+iD8DBQFFyb65kT4lNIS36YERAlMYAJ9uU5dwPvMZO2aR7uBYUrwpDPmCVwCgggJc
+yViZxC3O7/xsMDKa1TuKeEQ=
+=MNGA
 -----END PGP SIGNATURE-----
diff --git a/games-fps/ut2004/ut2004-3369-r4.ebuild b/games-fps/ut2004/ut2004-3369-r4.ebuild
index bcacae4cd6cb..9481b49bff8e 100644
--- a/games-fps/ut2004/ut2004-3369-r4.ebuild
+++ b/games-fps/ut2004/ut2004-3369-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004/ut2004-3369-r4.ebuild,v 1.14 2006/12/06 19:52:03 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004/ut2004-3369-r4.ebuild,v 1.15 2007/02/07 12:06:16 wolf31o2 Exp $
 
 # To use system libraries, uncomment the following line and comment the one
 # below it.
@@ -76,8 +76,8 @@ src_install() {
 		"${Ddir}"/System/ut2004-bin-linux-amd64
 
 	# Creating .manifest files
-	sed -e "s/GAMES_PREFIX_OPT/${GAMES_PREFIX_OPT}/" "${FILESDIR}"/${PN}.xml > \
-		${T}/${PN}.xml
+	sed -e "s:GAMES_PREFIX_OPT:${GAMES_PREFIX_OPT}:" "${FILESDIR}"/${PN}.xml > \
+		${T}/${PN}.xml || die "sed failed"
 	insinto "${dir}"/.manifest
 	doins "${T}"/${PN}.xml
 
@@ -105,25 +105,25 @@ pkg_postinst() {
 		ewarn "That way you can [re]enter your cdkey."
 	fi
 	echo
-	einfo "Starting with 3369, the game supports render-to-texture.  To enable"
-	einfo "it, you will need the Nvidia drivers of at least version 7676 and"
-	einfo "you should edit the following:"
-	einfo 'Set "UseRenderTargets=True" in the "[OpenGLDrv.OpenGLRenderDevice]"'
-	einfo 'section of your UT2004.ini/Default.ini and set "bPlayerShadows=True"'
-	einfo 'and "bBlobShadow=False" in the "[UnrealGame.UnrealPawn]" section of'
-	einfo 'your User.ini/DefUser.ini'
+	elog "Starting with 3369, the game supports render-to-texture.  To enable"
+	elog "it, you will need the Nvidia drivers of at least version 7676 and"
+	elog "you should edit the following:"
+	elog 'Set "UseRenderTargets=True" in the "[OpenGLDrv.OpenGLRenderDevice]"'
+	elog 'section of your UT2004.ini/Default.ini and set "bPlayerShadows=True"'
+	elog 'and "bBlobShadow=False" in the "[UnrealGame.UnrealPawn]" section of'
+	elog 'your User.ini/DefUser.ini'
 	echo
 	if use x86
 	then
-		einfo "The 32-bit version of UT2004 uses Pixomatic, which means it"
-		einfo "really does need an executable stack.  It is safe to ignore any"
-		einfo "warnings from portage about this.  See:"
-		einfo "http://bugs.gentoo.org/show_bug.cgi?id=114733"
-		einfo "for more information."
+		elog "The 32-bit version of UT2004 uses Pixomatic, which means it"
+		elog "really does need an executable stack.  It is safe to ignore any"
+		elog "warnings from portage about this.  See:"
+		elog "http://bugs.gentoo.org/show_bug.cgi?id=114733"
+		elog "for more information."
+		echo
 	fi
-	echo
-	einfo "To play the game run:"
-	einfo " ut2004"
+	elog "To play the game run:"
+	elog " ut2004"
 	echo
 }