diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2006-04-24 20:07:33 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2006-04-24 20:07:33 +0000 |
| commit | 61831f3ea790e02496b38959ebf593df90d7fedc (patch) | |
| tree | 603ef652479c6debea2506783eee6f9c903e7b68 | |
| parent | Stable on sparc wrt security #130888 (diff) | |
| download | gentoo-2-61831f3ea790e02496b38959ebf593df90d7fedc.tar.gz gentoo-2-61831f3ea790e02496b38959ebf593df90d7fedc.tar.bz2 gentoo-2-61831f3ea790e02496b38959ebf593df90d7fedc.zip | |
fix amd patch (bug #131092); use doins; tidy
(Portage version: 2.1_pre9-r3)
| -rw-r--r-- | games-rpg/egoboo/ChangeLog | 6 | ||||
| -rw-r--r-- | games-rpg/egoboo/egoboo-2.22.ebuild | 16 | ||||
| -rw-r--r-- | games-rpg/egoboo/files/2.22-amd64.patch | 7 | ||||
| -rw-r--r-- | games-rpg/egoboo/files/digest-egoboo-2.22 | 2 |
4 files changed, 18 insertions, 13 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/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 |