Workaround bug #285448; fix textrels on x86

Package-Manager: portage-2.2_rc49/cvs/Linux x86_64

5 files changed, 53 insertions, 22 deletions

diff --git a/games-fps/warsow/ChangeLog b/games-fps/warsow/ChangeLog
index e731c0f46255..7f9a538d2455 100644
--- a/games-fps/warsow/ChangeLog
+++ b/games-fps/warsow/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-fps/warsow
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/ChangeLog,v 1.24 2009/10/05 17:46:44 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/ChangeLog,v 1.25 2009/11/14 17:04:23 nyhm Exp $
+
+*warsow-0.5-r1 (14 Nov 2009)
+
+  14 Nov 2009; Tristan Heaven <nyhm@gentoo.org> -warsow-0.5.ebuild,
+  +warsow-0.5-r1.ebuild, files/warsow-0.5-build.patch,
+  +files/warsow-0.5-pic.patch:
+  Workaround bug #285448; fix textrels on x86
 
   05 Oct 2009; Michael Sterrett <mr_bones_@gentoo.org> warsow-0.5.ebuild:
   The code seems fragile. strip-flags to fix at least bug #285448 and
diff --git a/games-fps/warsow/Manifest b/games-fps/warsow/Manifest
index e8cfb8f7c419..a11fb0f876dc 100644
--- a/games-fps/warsow/Manifest
+++ b/games-fps/warsow/Manifest
@@ -1,12 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX warsow-0.4.2-build.patch 1720 RMD160 9a6181acfea494fab37eefaf31a8d19197f88591 SHA1 82555ec5d7f7217f6dc92da7e0d681414c9f00a2 SHA256 4212b21cc58adc3af57c8cfc63313df19c901f760d88a303a7b042975e2a3fa6
-AUX warsow-0.5-build.patch 3045 RMD160 19a783ce9a73e268984bbeb88a6bdbe9e910d0a8 SHA1 12757893fc72a053de75fb66825d14d1b18054fa SHA256 9b9c2739055ff45a83d343e3a2204b9f7becbfa319a31774bfd00fd6da5bc4b9
+AUX warsow-0.5-build.patch 2995 RMD160 18edaf6577496dc6a843fa92c249a78b25d50b93 SHA1 1a0c7a720c617b0b6bea76231440e63b94895139 SHA256 cbd7ddbfa45e12644f33a910dc453ff3b7d60a5e9e1dc14b71fb818e8bbd0e8c
 AUX warsow-0.5-openal.patch 304 RMD160 58055a1197ce0569e7ece3bdaa671928421e0fe1 SHA1 ed06409b5b6bf48ab63f23ce2ac031f7e7123d70 SHA256 6eb943201d4c5d6b8a902cda4efc75ea6ce6c8849d5ea10b39e12650c810d4df
+AUX warsow-0.5-pic.patch 377 RMD160 e10f5d8c31859f229de3bb96765df5f609f55ebc SHA1 fc11b52f092ae34da859823ea1d064969d9b97a2 SHA256 300c220fb833424be66da460ad4ac1ef6c61cde0dc5b76e1e8e0b75f5ece3782
 DIST warsow.png 1692 RMD160 098a1505a74a20eb4bdfeda4cf2c537a9524ce23 SHA1 73f0a742940861724bec445a1a582f89d9517dcf SHA256 086968e72271b248ef32609ed1818ff9f5c355297b1eee3cbee9e41f4e18a954
 DIST warsow_0.42_sdk.zip 16601262 RMD160 bc0849d0ac012592f4293c1445af418aee24d9ad SHA1 1b358463169cad425d4c4379d7d302888879ce09 SHA256 6c3c4cf161472646501c53672792e123787e5fef9f3dac60e70f1235525e9278
 DIST warsow_0.42_unified.zip 193348129 RMD160 76f0ad8477320bd375411e7d6e4f4f86fe878490 SHA1 2553aaf544a4a2eb02a0a875214906b0f3a076df SHA256 69e8d33dd73b92b8205a4de3feee2baf6ce27d155ed977aa4acd23c1fa9aa776
 DIST warsow_0.5_sdk.zip 34213675 RMD160 eb92f0e9e83f3ff1a8bdd44c7648bb4bebb26756 SHA1 faa58805b0aedfb5b44e35cd21384088314d2be3 SHA256 35cc937b4b38659df803d84f6b3fd6e9d5a5480ecadb4b642d991b99e3401f05
 DIST warsow_0.5_unified.zip 256768515 RMD160 eb93e0c2b08465b98fcd27ac309a1575476ad875 SHA1 71b9b9b43578ad2ccc9b73fe5435dd018faf7772 SHA256 66ac784277def8d90a8368d44e7ca72cd1d3a50b63cee4ad7c3e102cf16f5100
 EBUILD warsow-0.4.2.ebuild 3173 RMD160 a41704cff49d0973ad07e3ff022a7743310c538c SHA1 7fc3c127e89125acdb5e17438f44e439da9e0ec4 SHA256 717db550357c4e2b66269eb3da22b2f9ed4ead29969c083675395d03b74a8078
-EBUILD warsow-0.5.ebuild 3105 RMD160 5099722f4cc93273796a56351cf0715211cdac1c SHA1 61ab3d18d9130b2dcf53f1f457957a0e0ef96a89 SHA256 1fbd04c1f88a937bbc02267e01b5dec463d740a7986510f29ad048721f35b8b0
-MISC ChangeLog 3592 RMD160 e6ab27c6a138959e9f201d32513b7cbfdbc44757 SHA1 917572e2148fb3edf6779dd7b56c2d8784898ea6 SHA256 ec8464e9c0397b97aae9ff89ea48f3bce6274fca3d6cbad6701e4d84ff916233
+EBUILD warsow-0.5-r1.ebuild 3231 RMD160 caa72e9a85f7cc2d96977f03d1b6dc71e60db437 SHA1 c25fd6aafe12cb5fda70bcaf84929da98b47ef7f SHA256 8873f35960579c4f72b21114476278a4e130de04642791fe334dab9cec1fec0f
+MISC ChangeLog 3818 RMD160 a690e9e4b4fbe637d98fde304144106b004c760f SHA1 c251c21021038e99b2d585fdab7769a7dc49d133 SHA256 c71a0bef271787bb7244dd3d63c9281ce199fa12cc95fa09ae6b34a185307946
 MISC metadata.xml 287 RMD160 78042c7cef987a054185106e0d002716402ec9e0 SHA1 ab38f2b4bec87f92ab5465438f029b6ba4e03c3a SHA256 f48eacb17b39a68ff1f05cd10b43aa703b9b9f0edc1fc67848f7918ecce3876d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.12 (GNU/Linux)
+
+iEYEARECAAYFAkr+4x0ACgkQdz7hIScOURHiIwCgoYsYghPMH/Ft4aBxazqmVYZ5
+Yw8AoJN8fp24TP0/ZEGPM2CMtZ8ckV82
+=fFqa
+-----END PGP SIGNATURE-----
diff --git a/games-fps/warsow/files/warsow-0.5-build.patch b/games-fps/warsow/files/warsow-0.5-build.patch
index 84666db65b5f..b5989e582786 100644
--- a/games-fps/warsow/files/warsow-0.5-build.patch
+++ b/games-fps/warsow/files/warsow-0.5-build.patch
@@ -1,17 +1,17 @@
 --- libsrcs/angelscript/angelSVN/sdk/angelscript/projects/gnuc/makefile
 +++ libsrcs/angelscript/angelSVN/sdk/angelscript/projects/gnuc/makefile
-@@ -12,8 +12,8 @@
+@@ -12,7 +12,9 @@
  INCDIR = ../../include
  OBJDIR = obj
  
 -CXX = gcc
--CXXFLAGS = -g -Wall -fPIC
-+CC ?= gcc
-+CFLAGS += -Wall -fPIC -fno-strict-aliasing
++CXX ?= g++
++# FIXME: https://bugs.gentoo.org/show_bug.cgi?id=285448
++#CXXFLAGS += -Wall -fPIC -fno-strict-aliasing
+ CXXFLAGS = -g -Wall -fPIC
  DELETER = rm -f
  COPIER = cp
- 
-@@ -59,13 +59,13 @@
+@@ -59,8 +61,8 @@
  all: $(BIN)
  
  $(BIN): $(OBJ)
@@ -22,12 +22,6 @@
  	@echo -------------------------------------------------------------------
  	@echo Done. As root, type 'make install' to install the library.
  
- $(OBJDIR)/%.o: $(SRCDIR)/%.cpp
--	$(CXX) $(CXXFLAGS) -o $@ -c $<
-+	$(CC) $(CFLAGS) -o $@ -c $<
- 
- 
- clean:
 --- source/Makefile
 +++ source/Makefile
 @@ -52,7 +52,7 @@
diff --git a/games-fps/warsow/files/warsow-0.5-pic.patch b/games-fps/warsow/files/warsow-0.5-pic.patch
new file mode 100644
index 000000000000..71c4d8eed690
--- /dev/null
+++ b/games-fps/warsow/files/warsow-0.5-pic.patch
@@ -0,0 +1,11 @@
+--- source/snd_qf/snd_mix.c
++++ source/snd_qf/snd_mix.c
+@@ -27,7 +27,7 @@
+ int *snd_p, snd_linear_count, snd_vol, music_vol;
+ short *snd_out;
+ 
+-#if !defined ( id386 ) || defined ( __MACOSX__ )
++#if defined ( PIC ) || !defined ( id386 ) || defined ( __MACOSX__ )
+ #ifdef _WIN32
+ #pragma warning( push )
+ #pragma warning( disable : 4310 )       // cast truncates constant value
diff --git a/games-fps/warsow/warsow-0.5.ebuild b/games-fps/warsow/warsow-0.5-r1.ebuild
index 3e3a7a6d91c5..9f1c0420aace 100644
--- a/games-fps/warsow/warsow-0.5.ebuild
+++ b/games-fps/warsow/warsow-0.5-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/warsow-0.5.ebuild,v 1.2 2009/10/05 17:46:44 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/warsow-0.5-r1.ebuild,v 1.1 2009/11/14 17:04:23 nyhm Exp $
 
 EAPI=2
-inherit flag-o-matic eutils toolchain-funcs versionator games
+inherit eutils toolchain-funcs versionator games
 
 MY_P=${PN}_${PV}
 DESCRIPTION="Multiplayer FPS based on the QFusion engine (evolved from Quake 2)"
@@ -47,10 +47,11 @@ src_prepare() {
 		|| die "sed files.c failed"
 
 	cd "${WORKDIR}"
+	rm -rf docs/old
 	epatch \
 		"${FILESDIR}"/${P}-build.patch \
-		"${FILESDIR}"/${P}-openal.patch
-	strip-flags
+		"${FILESDIR}"/${P}-openal.patch \
+		"${FILESDIR}"/${P}-pic.patch
 }
 
 src_compile() {
@@ -63,15 +64,22 @@ src_compile() {
 		use openal && openal="YES"
 	fi
 
-	tc-export CC AR RANLIB
-
 	if use angelscript ; then
+		tc-export AR RANLIB
 		emake \
 			-C ../libsrcs/angelscript/angelSVN/sdk/angelscript/projects/gnuc \
 			|| die "emake angelscript failed"
 	fi
 
+	local arch
+	if use amd64 ; then
+		arch=x86_64
+	elif use x86 ; then
+		arch=i386
+	fi
+
 	emake \
+		BASE_ARCH=${arch} \
 		BINDIR=bin \
 		BUILD_CLIENT=${client} \
 		BUILD_SERVER=$(yesno dedicated) \