summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Tupone <tupone@gentoo.org>2009-02-02 09:43:10 +0000
committerAlfredo Tupone <tupone@gentoo.org>2009-02-02 09:43:10 +0000
commitd86f634e9439f2b3bd36dfb96277226d5cb862c6 (patch)
tree9f5b1b08b09fcbaaf6e3a52f3646ca9e2538c200 /games-arcade
parentVersion bump. Fix: #256617 #210830 #240458 (diff)
downloadhistorical-d86f634e9439f2b3bd36dfb96277226d5cb862c6.tar.gz
historical-d86f634e9439f2b3bd36dfb96277226d5cb862c6.tar.bz2
historical-d86f634e9439f2b3bd36dfb96277226d5cb862c6.zip
Fix --as-needed bug #247301
Package-Manager: portage-2.1.6.4/cvs/Linux 2.6.27-gentoo-r8 x86_64
Diffstat (limited to 'games-arcade')
-rw-r--r--games-arcade/holotz-castle/ChangeLog8
-rw-r--r--games-arcade/holotz-castle/Manifest6
-rw-r--r--games-arcade/holotz-castle/files/holotz-castle-1.3.10-build.patch17
-rw-r--r--games-arcade/holotz-castle/holotz-castle-1.3.10.ebuild9
4 files changed, 29 insertions, 11 deletions
diff --git a/games-arcade/holotz-castle/ChangeLog b/games-arcade/holotz-castle/ChangeLog
index 84aff338ccd8..d5397370f455 100644
--- a/games-arcade/holotz-castle/ChangeLog
+++ b/games-arcade/holotz-castle/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-arcade/holotz-castle
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/holotz-castle/ChangeLog,v 1.8 2008/06/24 10:08:11 opfer Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/holotz-castle/ChangeLog,v 1.9 2009/02/02 09:43:10 tupone Exp $
+
+ 02 Feb 2009; Alfredo Tupone <tupone@gentoo.org>
+ files/holotz-castle-1.3.10-build.patch, holotz-castle-1.3.10.ebuild:
+ Fix --as-needed bug #247301 by flameeyes@gentoo.org
24 Jun 2008; Christian Faulhammer <opfer@gentoo.org>
holotz-castle-1.3.10.ebuild:
diff --git a/games-arcade/holotz-castle/Manifest b/games-arcade/holotz-castle/Manifest
index 81bf049152e0..7e96181da9c7 100644
--- a/games-arcade/holotz-castle/Manifest
+++ b/games-arcade/holotz-castle/Manifest
@@ -1,5 +1,5 @@
-AUX holotz-castle-1.3.10-build.patch 1779 RMD160 80f0e6110536cb07e09d56e86148df0182162ecc SHA1 a80961d8b9dcf2b44548e9ce3edc08fdd1fd71e5 SHA256 0be9f7429f1c9255f7daeff648a75b1f2c9589d98812813c291cebde81ef0d36
+AUX holotz-castle-1.3.10-build.patch 2177 RMD160 3a55c15d0dc3171b30eaa9c57e5aa2fab1b27ff9 SHA1 e391b0c410cc2ee4edc91c851284b524fbf93888 SHA256 f3dd073cf64d9cf56bdae5293aac955bc2e522e9e3764b786c84a353ecec1d80
DIST holotz-castle-1.3.10-src.tar.gz 3666272 RMD160 450363c840ff56ac72b0c2731d352269769cd6c4 SHA1 405e69778233920c155a29d9ef490a8bdada31af SHA256 6333d7bfba2952dd17127a4564b0f680ada177a46f5aed4282a283fe3cd6fedb
-EBUILD holotz-castle-1.3.10.ebuild 1078 RMD160 5d0bc02e9935326fdffee97e5d2a4e8413549def SHA1 f4f1b9f38c419907f33b492acc10ee7981f80730 SHA256 ff180835bd3771e543b880a49d0a2f73c1a35a03aec45f85fd383e05a3752c3a
-MISC ChangeLog 1402 RMD160 5dc2eaf5e436f1fb13ee82b9c21ae5d1356211c1 SHA1 fac2cdd317bc82f5dc91f356861d69220a1522ee SHA256 4ea36a9a0d9f8c67eea6925457ab746de52c661f4f98ca1578ecd53121cc31de
+EBUILD holotz-castle-1.3.10.ebuild 1063 RMD160 734e850597b58e0a55558c5dc5a659a48c1ee2ec SHA1 d7d888556817492190e4b0091f2d4342f8958268 SHA256 2fc35388da7eb9631257aca5ce3b0e8ec0bd3ca405d7d7b006584499a317aa4d
+MISC ChangeLog 1579 RMD160 d0647512525845f14e123cc6cd56b12b76554480 SHA1 19680b687546dec392b675088c2dfde706326a1d SHA256 1a756a262b54f32ddc6601a22e2f025220e5d97f8e269594e48dd0b3b93cc6c1
MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-arcade/holotz-castle/files/holotz-castle-1.3.10-build.patch b/games-arcade/holotz-castle/files/holotz-castle-1.3.10-build.patch
index e556d76193e9..6e6136304b27 100644
--- a/games-arcade/holotz-castle/files/holotz-castle-1.3.10-build.patch
+++ b/games-arcade/holotz-castle/files/holotz-castle-1.3.10-build.patch
@@ -47,7 +47,22 @@
-CFLAGS=-I. -I../JLib -O3 -Wall -Werror -Wshadow $(CPU_OPTS) -ffast-math -c `$(SDL_CONFIG) --cflags`
-LDFLAGS=-L. -ffast-math -lSDL_image -lSDL_ttf -lSDL_mixer `$(SDL_CONFIG) --libs`
+CFLAGS=-I. -I../JLib $(CPU_OPTS) -c `$(SDL_CONFIG) --cflags`
-+LDFLAGS=-L. -lSDL_image -lSDL_ttf -lSDL_mixer `$(SDL_CONFIG) --libs`
++LDLIBS=-L. -lSDL_image -lSDL_ttf -lSDL_mixer `$(SDL_CONFIG) --libs`
JLib:
+@@ -53,12 +53,12 @@
+ g++ $(CFLAGS) $(DEFINES) $< -o $@
+
+ HC: $(HC_OBJS) $(HC_OBJ_MAIN) ../JLib/libJLib.a
+- g++ $(LDFLAGS) $? -o $@;\
++ g++ $(LDFLAGS) $? $(LDLIBS) -o $@;\
+ mv HC ../holotz-castle
+
+ # HCed (Holotz's Castle editor).
+ HCed: $(HC_OBJS) $(HCED_OBJ_MAIN) ../JLib/libJLib.a
+- g++ $(LDFLAGS) $? -o $@;\
++ g++ $(LDFLAGS) $? $(LDLIBS) -o $@;\
+ mv HCed ../holotz-castle-editor
+
+ install:
diff --git a/games-arcade/holotz-castle/holotz-castle-1.3.10.ebuild b/games-arcade/holotz-castle/holotz-castle-1.3.10.ebuild
index 752d06f766d8..fa4de0ba4a00 100644
--- a/games-arcade/holotz-castle/holotz-castle-1.3.10.ebuild
+++ b/games-arcade/holotz-castle/holotz-castle-1.3.10.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/holotz-castle/holotz-castle-1.3.10.ebuild,v 1.3 2008/06/24 10:08:11 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/holotz-castle/holotz-castle-1.3.10.ebuild,v 1.4 2009/02/02 09:43:10 tupone Exp $
+EAPI=2
inherit eutils games
DESCRIPTION="2d platform jump'n'run game"
@@ -21,9 +22,7 @@ DEPEND="virtual/opengl
S=${WORKDIR}/${P}-src
-src_unpack() {
- unpack ${A}
- cd "${S}"
+src_prepare() {
epatch "${FILESDIR}"/${P}-build.patch
}