summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2003-12-09 00:43:45 +0000
committerMike Frysinger <vapier@gentoo.org>2003-12-09 00:43:45 +0000
commit36394169e35a8bc5de93593ad5370d9f729aa710 (patch)
treea504178a0afe37a88482cbaf3fffc49916eefe0f /games-strategy
parentfix vim.eclass autoconf fix (diff)
downloadgentoo-2-36394169e35a8bc5de93593ad5370d9f729aa710.tar.gz
gentoo-2-36394169e35a8bc5de93593ad5370d9f729aa710.tar.bz2
gentoo-2-36394169e35a8bc5de93593ad5370d9f729aa710.zip
ver bump
Diffstat (limited to 'games-strategy')
-rw-r--r--games-strategy/scorched3d/ChangeLog8
-rw-r--r--games-strategy/scorched3d/files/35-gcc3.patch24
-rw-r--r--games-strategy/scorched3d/files/digest-scorched3d-351
-rw-r--r--games-strategy/scorched3d/files/digest-scorched3d-361
-rw-r--r--games-strategy/scorched3d/scorched3d-36.ebuild (renamed from games-strategy/scorched3d/scorched3d-35.ebuild)13
5 files changed, 8 insertions, 39 deletions
diff --git a/games-strategy/scorched3d/ChangeLog b/games-strategy/scorched3d/ChangeLog
index a298fa85d9aa..53f8f931c066 100644
--- a/games-strategy/scorched3d/ChangeLog
+++ b/games-strategy/scorched3d/ChangeLog
@@ -1,9 +1,11 @@
# ChangeLog for games-strategy/scorched3d
# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/ChangeLog,v 1.3 2003/10/26 23:36:49 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/ChangeLog,v 1.4 2003/12/09 00:43:45 vapier Exp $
- 27 Oct 2003; David Holm <dholm@gentoo.org> scorched3d-35.ebuild:
- Added to ~ppc.
+*scorched3d-36 (08 Dec 2003)
+
+ 08 Dec 2003; Mike Frysinger <vapier@gentoo.org> :
+ Version bumpage.
*scorched3d-35 (06 Aug 2003)
diff --git a/games-strategy/scorched3d/files/35-gcc3.patch b/games-strategy/scorched3d/files/35-gcc3.patch
deleted file mode 100644
index 81ff4bea5027..000000000000
--- a/games-strategy/scorched3d/files/35-gcc3.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ur -x '*.o' scorched-orig/src/common/SoundStore.h scorched/src/common/SoundStore.h
---- scorched-orig/src/common/SoundStore.h 2003-07-30 17:41:28.000000000 -0400
-+++ scorched/src/common/SoundStore.h 2003-08-06 20:41:23.056115008 -0400
-@@ -29,7 +29,7 @@
- #include <string>
-
- #define CACHE_SOUND(var, filename) \
-- static SoundBuffer* ##var = SoundStore::instance()->fetchOrCreateBuffer(##filename);
-+ static SoundBuffer* var = SoundStore::instance()->fetchOrCreateBuffer(filename);
-
- class SoundStore
- {
-diff -ur -x '*.o' scorched-orig/src/engine/ActionMeta.h scorched/src/engine/ActionMeta.h
---- scorched-orig/src/engine/ActionMeta.h 2003-07-30 17:41:29.000000000 -0400
-+++ scorched/src/engine/ActionMeta.h 2003-08-06 20:36:57.001561448 -0400
-@@ -29,7 +29,7 @@
-
- #define REGISTER_ACTION_HEADER(x) \
- virtual const char *getActionName() { return #x ; } \
-- ##x *getActionCopy() { return new x ; } \
-+ x *getActionCopy() { return new x ; } \
- virtual bool getReferenced() { return true; }
- #define REGISTER_ACTION_SOURCE(x) \
- struct META_##x { META_##x() { ActionMetaRegistration::addMap(#x , new x ); } }; \
diff --git a/games-strategy/scorched3d/files/digest-scorched3d-35 b/games-strategy/scorched3d/files/digest-scorched3d-35
deleted file mode 100644
index cec5c548a432..000000000000
--- a/games-strategy/scorched3d/files/digest-scorched3d-35
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c43507e805b482cc0a37b8cd37a3a26b Scorched3D-35-src.tar.gz 10798751
diff --git a/games-strategy/scorched3d/files/digest-scorched3d-36 b/games-strategy/scorched3d/files/digest-scorched3d-36
new file mode 100644
index 000000000000..cdd11c786a5d
--- /dev/null
+++ b/games-strategy/scorched3d/files/digest-scorched3d-36
@@ -0,0 +1 @@
+MD5 10172c8f0c2cbacb34144680a51256bd Scorched3D-36-src.tar.gz 17838632
diff --git a/games-strategy/scorched3d/scorched3d-35.ebuild b/games-strategy/scorched3d/scorched3d-36.ebuild
index f0bec0dec4eb..9f50f58c4c85 100644
--- a/games-strategy/scorched3d/scorched3d-35.ebuild
+++ b/games-strategy/scorched3d/scorched3d-36.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/scorched3d-35.ebuild,v 1.4 2003/11/10 14:04:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/scorched3d-36.ebuild,v 1.1 2003/12/09 00:43:45 vapier Exp $
inherit games gcc eutils
@@ -23,20 +23,11 @@ DEPEND="${RDEPEND}
S=${WORKDIR}/scorched
-src_unpack() {
- unpack ${A}
- cd ${S}
- [ "`gcc-version`" == "3.3" ] && epatch ${FILESDIR}/${PV}-gcc3.patch
-}
-
src_compile() {
- # yeah, I know running it twice, but egamesconf has a lot more stuff
- ./autogen.sh
egamesconf \
--exec_prefix=${GAMES_PREFIX} \
--datadir=${GAMES_DATADIR}/${PN} \
|| die
-
sed -i \
"s:/usr/games/scorched3d/:${GAMES_DATADIR}/${PN}/:" \
src/scorched/Makefile \
@@ -47,7 +38,7 @@ src_compile() {
src_install() {
dogamesbin src/scorched/scorched3d
dodoc AUTHORS README TODO documentation/*.txt
- dodir ${GAMES_DATADIR}/${PN} || die "dodir failed"
+ dodir ${GAMES_DATADIR}/${PN}
cp -R data/ ${D}${GAMES_DATADIR}/${PN} || die "cp failed"
prepgamesdirs
}