fix sed with patch from Nikolay Shley (bug #170170)

Package-Manager: portage-2.1.2.2

3 files changed, 20 insertions, 26 deletions

diff --git a/games-server/pvpgn/ChangeLog b/games-server/pvpgn/ChangeLog
index 1fc5b2ab3fbd..b36a048607e2 100644
--- a/games-server/pvpgn/ChangeLog
+++ b/games-server/pvpgn/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-server/pvpgn
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-server/pvpgn/ChangeLog,v 1.11 2007/03/07 17:22:05 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-server/pvpgn/ChangeLog,v 1.12 2007/03/11 05:52:35 mr_bones_ Exp $
+
+  11 Mar 2007; Michael Sterrett <mr_bones_@gentoo.org> pvpgn-1.8.0.ebuild:
+  fix sed with patch from Nikolay Shley (bug #170170)
 
   07 Mar 2007; Chris Gianelloni <wolf31o2@gentoo.org> -files/init.d.rc,
   +files/pvpgn.rc, pvpgn-1.6.6.ebuild, pvpgn-1.8.0.ebuild:
diff --git a/games-server/pvpgn/Manifest b/games-server/pvpgn/Manifest
index 83ceb0f5d525..a5303b5c8df9 100644
--- a/games-server/pvpgn/Manifest
+++ b/games-server/pvpgn/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 1.6.6-fhs.patch 10322 RMD160 a5463e9b8a17980256d5fe67ae550687610486c1 SHA1 1a94b482869af69498a74f27e6b3f7b91fb43b94 SHA256 926262b969c018fd39ae4f7ca42d247a11e7c52643955b02a48f77e5847786a5
 MD5 778be818c35e7df1e022398198427172 files/1.6.6-fhs.patch 10322
 RMD160 a5463e9b8a17980256d5fe67ae550687610486c1 files/1.6.6-fhs.patch 10322
@@ -20,14 +17,14 @@ EBUILD pvpgn-1.6.6.ebuild 2575 RMD160 814bfd551968af2a03f084429e47a12c69bf5050 S
 MD5 d23f1ca75ca0490a23d1e5ed7c6134c5 pvpgn-1.6.6.ebuild 2575
 RMD160 814bfd551968af2a03f084429e47a12c69bf5050 pvpgn-1.6.6.ebuild 2575
 SHA256 e906f867d80c278b3941a14773331bf5996d117ecefad5c182453fe5af659abb pvpgn-1.6.6.ebuild 2575
-EBUILD pvpgn-1.8.0.ebuild 2552 RMD160 07071b8507aa047a995f7d14bd37f708a70e9e90 SHA1 2f385deeeaa9edf40f25b0da543d0f1a24f34512 SHA256 70772cf578801e4a4784db8224013396d062076012d18849958df6dc65f86a11
-MD5 2605b60b82b0531ae3468eb755ff75ef pvpgn-1.8.0.ebuild 2552
-RMD160 07071b8507aa047a995f7d14bd37f708a70e9e90 pvpgn-1.8.0.ebuild 2552
-SHA256 70772cf578801e4a4784db8224013396d062076012d18849958df6dc65f86a11 pvpgn-1.8.0.ebuild 2552
-MISC ChangeLog 949 RMD160 bead812554eab6896f6a0baf21e811fdda081481 SHA1 36340646f5a4a7ab2927d16be800b73cfe3eda30 SHA256 3a41414f063251abdd08c79720e6370fc678a60a400bd164ce923683674f787e
-MD5 15c296ec3174383f151cf6fd9c6a0e30 ChangeLog 949
-RMD160 bead812554eab6896f6a0baf21e811fdda081481 ChangeLog 949
-SHA256 3a41414f063251abdd08c79720e6370fc678a60a400bd164ce923683674f787e ChangeLog 949
+EBUILD pvpgn-1.8.0.ebuild 2599 RMD160 0ad088451c9c459227213ed14955afa4d8eab72a SHA1 dc6ea6cc800ebe474b98cf2d6fe4325f60ec8c6c SHA256 552c915c40a09e16ef9cd0087b811a50d8041a7c9cfe194f479d5a8de9198ca5
+MD5 e3d804a6270f93a704a05c6ad93e4496 pvpgn-1.8.0.ebuild 2599
+RMD160 0ad088451c9c459227213ed14955afa4d8eab72a pvpgn-1.8.0.ebuild 2599
+SHA256 552c915c40a09e16ef9cd0087b811a50d8041a7c9cfe194f479d5a8de9198ca5 pvpgn-1.8.0.ebuild 2599
+MISC ChangeLog 1080 RMD160 082b9113d93befb17f05ea321cac633972ef36d7 SHA1 4f903192512bb6dbc38fb974af752c1020ffd6a8 SHA256 d846d98dfc72d60b45090b700c6dd6b34193d01b5fcd9d236031b76b49152366
+MD5 ccba8a7b443ccd0076d10375a89bd781 ChangeLog 1080
+RMD160 082b9113d93befb17f05ea321cac633972ef36d7 ChangeLog 1080
+SHA256 d846d98dfc72d60b45090b700c6dd6b34193d01b5fcd9d236031b76b49152366 ChangeLog 1080
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -38,10 +35,3 @@ SHA256 173528a29d9ab63ed1e4f7ededfe0806b53d6d94dbaffa8da712fd2acaf77e9d files/di
 MD5 8afb7387ddedf2b2e5cc12f5fd55978e files/digest-pvpgn-1.8.0 491
 RMD160 e962774007e759f6ea2ab7c050575e4b592d3bc4 files/digest-pvpgn-1.8.0 491
 SHA256 38179921f61f8d6f6c929f3e7f748fff67c96df42fcfa8c31bca4cd2db73b1f7 files/digest-pvpgn-1.8.0 491
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
-
-iD8DBQFF7vTDkT4lNIS36YERAlwNAKCkKxcabPTOiQcgb8zUQtLQzgtZQQCgkftn
-BTKad8wXzRv49WP+7rUYQgg=
-=qjlr
------END PGP SIGNATURE-----
diff --git a/games-server/pvpgn/pvpgn-1.8.0.ebuild b/games-server/pvpgn/pvpgn-1.8.0.ebuild
index f0b7c5cbca38..e9ab486abc84 100644
--- a/games-server/pvpgn/pvpgn-1.8.0.ebuild
+++ b/games-server/pvpgn/pvpgn-1.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-server/pvpgn/pvpgn-1.8.0.ebuild,v 1.4 2007/03/07 17:22:05 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-server/pvpgn/pvpgn-1.8.0.ebuild,v 1.5 2007/03/11 05:52:35 mr_bones_ Exp $
 
 inherit eutils games
 
@@ -55,12 +55,13 @@ src_install() {
 	for f in bnetd d2cs d2dbs ; do
 		newinitd "${FILESDIR}/${PN}.rc" ${f}
 		sed -i \
-			-e "s:NAME:${f}:g" \
-			-e "s:GAMES_BINDIR:${GAMES_BINDIR}:g" \
-			-e "s:GAMES_USER:${GAMES_USER_DED}:g" \
-			-e "s:GAMES_GROUP:${GAMES_GROUP}:g" \
-			"${D}/etc/${PN}/${f}" \
-			|| die "sed failed"
+				-e "s:NAME:${f}:g" \
+				-e "s:GAMES_BINDIR:${GAMES_BINDIR}:g" \
+				-e "s:GAMES_USER:${GAMES_USER_DED}:g" \
+				-e "s:GAMES_GROUP:${GAMES_GROUP}:g" \
+				"${D}/etc/games/${PN}/${f}.conf" \
+				"${D}/etc/init.d/${f}" \
+				|| die "sed failed"
 	done
 
 	prepgamesdirs