fix amd patch (bug #131092); use doins; tidy

Package-Manager: portage-2.1_pre9-r3

5 files changed, 47 insertions, 17 deletions

diff --git a/games-rpg/egoboo/ChangeLog b/games-rpg/egoboo/ChangeLog
index 4a8fdbb3ed83..b8e968607a06 100644
--- a/games-rpg/egoboo/ChangeLog
+++ b/games-rpg/egoboo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-rpg/egoboo
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/egoboo/ChangeLog,v 1.12 2006/03/14 20:23:43 deltacow Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/egoboo/ChangeLog,v 1.13 2006/04/24 20:07:33 mr_bones_ Exp $
+
+  24 Apr 2006; Michael Sterrett <mr_bones_@gentoo.org>
+  files/2.22-amd64.patch, egoboo-2.22.ebuild:
+  fix amd patch (bug #131092); use doins; tidy
 
   14 Mar 2006; Scott Stoddard <deltacow@gentoo.org> +files/2.22-amd64.patch,
   egoboo-2.22.ebuild:
diff --git a/games-rpg/egoboo/Manifest b/games-rpg/egoboo/Manifest
index f34761cc06e7..a4b6ca4e6026 100644
--- a/games-rpg/egoboo/Manifest
+++ b/games-rpg/egoboo/Manifest
@@ -1,8 +1,33 @@
-MD5 26a8fe8d0ad7a069d6b6e71e5ed636c9 ChangeLog 2288
-MD5 407414dbcadc2df154e2dec4cf065ae1 egoboo-2.22.ebuild 1553
-MD5 c3d07f2d6d88be2c9c9835e371cc8d33 files/2.22-amd64.patch 399
+AUX 2.22-amd64.patch 317 RMD160 527dd8f17d21f98f9948dc952a83f37aabea1e19 SHA1 16adfb20f585cef7bf3b5899efa5c4755d0bda52 SHA256 bc913af7c6cc3f91736b8e3f2b4a2d066ae5322356a28c3bbcb03e42e2a70788 size 317
+MD5 67b00ed989478cfd8917fecdbb3f32d1 files/2.22-amd64.patch 317
+RMD160 527dd8f17d21f98f9948dc952a83f37aabea1e19 files/2.22-amd64.patch 317
+SHA256 bc913af7c6cc3f91736b8e3f2b4a2d066ae5322356a28c3bbcb03e42e2a70788 files/2.22-amd64.patch 317
+AUX 2.22-endian.patch 6416 RMD160 21e216ae006cf57521b1982291afaebaec679c08 SHA1 839a30b15a266d0d0eb694647f8316d4513d5fe8 SHA256 1beb221b609b7dca4d8b2b0682d7a58675046cb7cb727c734640184d84d41307 size 6416
 MD5 0fc47d542e1b356cc9f9a99c4e8884f6 files/2.22-endian.patch 6416
-MD5 51c7e53fd5f581bc0e057240613daccd files/digest-egoboo-2.22 60
+RMD160 21e216ae006cf57521b1982291afaebaec679c08 files/2.22-endian.patch 6416
+SHA256 1beb221b609b7dca4d8b2b0682d7a58675046cb7cb727c734640184d84d41307 files/2.22-endian.patch 6416
+AUX egoboo-2.22-makefile-gentoo.patch 672 RMD160 660ad9c7f96c6b8e555402c19d3ed54fb48b3dcc SHA1 f8e285286998e008c22055235e30ca30296ac74c SHA256 962e0e1bffbc3f6b065fa0549dcb9df0df8a50df9c179a0c10e2db0f15680f6d size 672
 MD5 2afa7b7e1883fef3200371e1d3f3300f files/egoboo-2.22-makefile-gentoo.patch 672
+RMD160 660ad9c7f96c6b8e555402c19d3ed54fb48b3dcc files/egoboo-2.22-makefile-gentoo.patch 672
+SHA256 962e0e1bffbc3f6b065fa0549dcb9df0df8a50df9c179a0c10e2db0f15680f6d files/egoboo-2.22-makefile-gentoo.patch 672
+AUX egoboo-2.22.sh 269 RMD160 4a6649d709ab5f8cc61bf1b0ede2ab6f835d4500 SHA1 0177914cc6f046e7984ab8ae2ce2a05242d231de SHA256 f3ed493ce0ba045fbbfc167bf435d57369fc1bbaedf215df7f82abf8907fd441 size 269
 MD5 53d4b92337a6d90ccfc2e0256d47d46f files/egoboo-2.22.sh 269
+RMD160 4a6649d709ab5f8cc61bf1b0ede2ab6f835d4500 files/egoboo-2.22.sh 269
+SHA256 f3ed493ce0ba045fbbfc167bf435d57369fc1bbaedf215df7f82abf8907fd441 files/egoboo-2.22.sh 269
+DIST ego222.tar.gz 17283653 RMD160 915cf675147940e8687031a60db837cb6dbe3e2e SHA256 eb024b4e7fd4b1d2babfd9e0fbc1caabd2d1864c67fa4e2f03a806a5a4e6552b size 17283653
+EBUILD egoboo-2.22.ebuild 1511 RMD160 a11ce1bf914486054aaad38e562d5296a6b1508b SHA1 545e5ad094fc178099387d0a9fa3b7d0a2628ffc SHA256 a3fa72f739b3bac98b3ea9db9d7e1b686a96502b7a8e956789c878dceb75d538 size 1511
+MD5 ba3848df232001de28756e6841b52089 egoboo-2.22.ebuild 1511
+RMD160 a11ce1bf914486054aaad38e562d5296a6b1508b egoboo-2.22.ebuild 1511
+SHA256 a3fa72f739b3bac98b3ea9db9d7e1b686a96502b7a8e956789c878dceb75d538 egoboo-2.22.ebuild 1511
+MISC ChangeLog 2438 RMD160 9b8de0c515e1e0398a906f7f331c2abc8facfee0 SHA1 50b1cd7d8333ed339851a4e010c7aa3b6c26b6a6 SHA256 c471e912c32092c016b0c12bd2262f5ffe15dcee0be9b0e7b0e69d43240964a4 size 2438
+MD5 5f140db8aa3a76f54edd34d940fde641 ChangeLog 2438
+RMD160 9b8de0c515e1e0398a906f7f331c2abc8facfee0 ChangeLog 2438
+SHA256 c471e912c32092c016b0c12bd2262f5ffe15dcee0be9b0e7b0e69d43240964a4 ChangeLog 2438
+MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 size 158
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
+SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
+MD5 673b53fbf05c7f0227bf2cd85ed84263 files/digest-egoboo-2.22 226
+RMD160 80a7ce2f880dd1d576a23ed47b7d949bba3e2f66 files/digest-egoboo-2.22 226
+SHA256 91f401abf72dd2e4f6e0c17975adf15de1841facb2f95a7a3d9f2ded591ce9fd files/digest-egoboo-2.22 226
+size 226 files/digest-egoboo-2.22 226
diff --git a/games-rpg/egoboo/egoboo-2.22.ebuild b/games-rpg/egoboo/egoboo-2.22.ebuild
index d7263e717112..2877e9a7e698 100644
--- a/games-rpg/egoboo/egoboo-2.22.ebuild
+++ b/games-rpg/egoboo/egoboo-2.22.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/egoboo/egoboo-2.22.ebuild,v 1.15 2006/03/14 20:23:43 deltacow Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/egoboo/egoboo-2.22.ebuild,v 1.16 2006/04/24 20:07:33 mr_bones_ Exp $
 
 inherit eutils flag-o-matic toolchain-funcs games
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/ego${PV/./}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~amd64 ppc x86"
+KEYWORDS="~amd64 ppc x86"
 IUSE=""
 
 DEPEND="virtual/opengl
@@ -30,11 +30,11 @@ src_unpack() {
 		> "${T}/egoboo" || die "sed wrapper failed"
 
 	# Fix endianess using SDL
-	epatch ${FILESDIR}/${PV}-endian.patch
-
 	# amd64 patch must be applied after ${PV}-endian.patch
 	# this addresses bug #104271
-	epatch ${FILESDIR}/${PV}-amd64.patch
+	epatch \
+		${FILESDIR}/${PV}-endian.patch \
+		${FILESDIR}/${PV}-amd64.patch
 }
 
 src_compile() {
@@ -46,10 +46,10 @@ src_compile() {
 src_install () {
 	dogamesbin "${T}/egoboo" || die "dogamesbin failed"
 	dodoc egoboo.txt
-	dodir "${GAMES_DATADIR}/${PN}" "${GAMES_BINDIR}"
-	cp -R basicdat/ import/ modules/ players/ text/ \
+	insinto "${GAMES_DATADIR}/${PN}"
+	doins -r basicdat/ import/ modules/ players/ text/ \
 		code/egoboo controls.txt setup.txt \
-		"${D}${GAMES_DATADIR}/${PN}" || die "cp failed"
+		|| die "doins failed"
 
 	prepgamesdirs
 	# ugly, but the game needs write here.
diff --git a/games-rpg/egoboo/files/2.22-amd64.patch b/games-rpg/egoboo/files/2.22-amd64.patch
index 5e3ea57a0c1a..c8e5ed8ba678 100644
--- a/games-rpg/egoboo/files/2.22-amd64.patch
+++ b/games-rpg/egoboo/files/2.22-amd64.patch
@@ -1,7 +1,6 @@
-diff -ur egoboo/code/egobootypedef.h egoboo.new/code/egobootypedef.h

---- egoboo/code/egobootypedef.h	2005-08-31 18:16:26.000000000 +0200

-+++ egoboo/code/egobootypedef.h	2005-08-31 18:08:12.000000000 +0200

-@@ -99,7 +99,7 @@

+--- code/egobootypedef.h.orig	2006-04-24 15:50:56.000000000 -0400
++++ code/egobootypedef.h	2006-04-24 15:51:15.000000000 -0400
+@@ -99,7 +99,7 @@
  	/*Return the result*/

  	return data.f;

  }

diff --git a/games-rpg/egoboo/files/digest-egoboo-2.22 b/games-rpg/egoboo/files/digest-egoboo-2.22
index 627fa9c19ddc..d3771537021c 100644
--- a/games-rpg/egoboo/files/digest-egoboo-2.22
+++ b/games-rpg/egoboo/files/digest-egoboo-2.22
@@ -1 +1,3 @@
 MD5 b988464c0c96ba23b3cb5963729819cc ego222.tar.gz 17283653
+RMD160 915cf675147940e8687031a60db837cb6dbe3e2e ego222.tar.gz 17283653
+SHA256 eb024b4e7fd4b1d2babfd9e0fbc1caabd2d1864c67fa4e2f03a806a5a4e6552b ego222.tar.gz 17283653