Add patch to avoid mangling CFLAGS (reported in bug #378141)

Package-Manager: portage-2.1.10.3/cvs/Linux i686

4 files changed, 55 insertions, 14 deletions

diff --git a/games-simulation/openttd/ChangeLog b/games-simulation/openttd/ChangeLog
index fa7bd3a3723c..5e032b6e1430 100644
--- a/games-simulation/openttd/ChangeLog
+++ b/games-simulation/openttd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-simulation/openttd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/ChangeLog,v 1.110 2011/08/08 16:23:42 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/ChangeLog,v 1.111 2011/08/08 16:29:31 mr_bones_ Exp $
+
+  08 Aug 2011; Michael Sterrett <mr_bones_@gentoo.org> openttd-1.1.1.ebuild,
+  +files/openttd-1.1.1-cflags.patch:
+  Add patch to avoid mangling CFLAGS (reported in bug #378141)
 
   08 Aug 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> openttd-1.1.1.ebuild:
   x86 stable wrt bug #378141
diff --git a/games-simulation/openttd/Manifest b/games-simulation/openttd/Manifest
index 83c06f408b1b..c233a49a98d8 100644
--- a/games-simulation/openttd/Manifest
+++ b/games-simulation/openttd/Manifest
@@ -1,19 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
+AUX openttd-1.1.1-cflags.patch 1246 RMD160 75ba5fa96bb079ff293af6071b47d265b7b2b193 SHA1 db09c40667712c9597eb08581943ca0e86ee724f SHA256 ba8d183f9cd8e97e6a98c3a6fec5555b695bcc6d033723ff096e6953cad68ddd
 AUX openttd.initd 529 RMD160 ff9fdf7a787ae3d08ec4dbef1b1b37eee12d1ccd SHA1 f833206fc430c6e7afec76c39e97af0f7ec6578a SHA256 a16e5c64a073d0b7e7092bb906b7f064414870a8607bebce16b4b08cff7f4112
 DIST openttd-1.0.5-source.tar.bz2 5684796 RMD160 8d723e8efeb6de9860b62cf835fa3db09a7848cd SHA1 2e0cfa2d6e4c4bc1235a60de39961728bb727eb8 SHA256 c353626b16b4b781db3c3c61f0ad651f5701e50f87439c4005b4456b63db09f8
 DIST openttd-1.1.0-source.tar.gz 7575181 RMD160 f10ed16fb3e99418f3335d2abd1871d8777d9b14 SHA1 2d504cf0d1b1a85cf77558aa11c5d42746453865 SHA256 f5584fb48a64fe173f351d13993f2d9439afe5cf3ad457692604d4f801d895f8
 DIST openttd-1.1.1-source.tar.gz 7597133 RMD160 38758b1830628bd80c599e53498ddfa32f4e135d SHA1 b9354bc9e8bc93ad1cf816cc91b3aadc14348f88 SHA256 34d1639d8948c5af51a3735ee37f545d357eb06e41f9e5c8b51b21973979fc5f
 EBUILD openttd-1.0.5.ebuild 5070 RMD160 43c75186deebe7bad6ca4023e206dde8588725f2 SHA1 b81e9d27fb06580fde193973e4c6fb5ff4460aef SHA256 489de570c21dc75dd4f1215f4b3efabb460ab27dc6bb9e6b598e20d50c07ec81
 EBUILD openttd-1.1.0.ebuild 5074 RMD160 30d96adf823e8b4523774a88bd2221914455e28e SHA1 bee0e2a53d86f17b6282fb660eb16a74e65be043 SHA256 2eaefc971bbb18abe4f60d9195080fc56bcdfd17e3d3f9615c5f19736f764bf2
-EBUILD openttd-1.1.1.ebuild 5074 RMD160 11b2f49d8297faa5da0ced7356b05a3331576feb SHA1 78f003f72bd06dee3425d8e38f923a22c7331afa SHA256 92836eef32651a2a6e42a2d9a07cccface5da820c5a935e0186b1f8f48db08d1
-MISC ChangeLog 14212 RMD160 700b53f2a54c43cfc962605aac8573042327410c SHA1 341948a10c4fcf349e65d5aecb37a99f74c43eef SHA256 61d0965eacb70c8280ea59946f4a518d0dd4f1c3154dd6add511dec9f382ec97
+EBUILD openttd-1.1.1.ebuild 5117 RMD160 8a86aabb729c48e15790f0a96da2b4fe2979219f SHA1 b7e75e13437e72ae613c9a82f9a166e0dca0a9c5 SHA256 b0e410652fd8d85d7aa93b9d361171e793e626a3e1d127793b5612709ead4a2c
+MISC ChangeLog 14389 RMD160 c0648f7c84aa4354f101b1928d6357f22105ddde SHA1 2af0ae33feaa64b25f95b76b30f14a750b9b153a SHA256 fe58808fd531bb838c4944c258d8535f6012443f29120a581695c20367735901
 MISC metadata.xml 658 RMD160 3e5f41ef03cfc2b3d91f3fe18939ded3aaf86cd1 SHA1 e5b0eefc09ca65a2dd09049aca0da1b6dcbe269c SHA256 d0e2ff0d4bbe57e15d58e5fc68884b70877561f127e8afd7b5ce3e4a46e97404
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEAREKAAYFAk5ADZUACgkQuUQtlDBCeQIVDwCfcqbccIkwjGRk5MJ2lu6hVpGQ
-WkMAmwUHMicJaEhQoH4AJGeVLeX2l8TI
-=MIqo
------END PGP SIGNATURE-----
diff --git a/games-simulation/openttd/files/openttd-1.1.1-cflags.patch b/games-simulation/openttd/files/openttd-1.1.1-cflags.patch
new file mode 100644
index 000000000000..60a9056a6634
--- /dev/null
+++ b/games-simulation/openttd/files/openttd-1.1.1-cflags.patch
@@ -0,0 +1,45 @@
+--- config.lib.orig	2011-08-08 11:40:21.641085825 -0400
++++ config.lib	2011-08-08 11:44:19.655285851 -0400
+@@ -1357,14 +1357,12 @@
+ 			CFLAGS="-I/gg/os-include -noixemul -fstrict-aliasing -fexpensive-optimizations -mcpu=604 -fno-inline -mstring -mmultiple $CFLAGS"
+ 			LDFLAGS="$LDFLAGS -noixemul"
+ 		fi
+-
+-		CFLAGS="-O2 -fomit-frame-pointer $CFLAGS"
+ 	else
+ 		OBJS_SUBDIR="debug"
+ 
+ 		# Each debug level reduces the optimization by a bit
+ 		if [ $enable_debug -ge 1 ]; then
+-			CFLAGS="$CFLAGS -g -D_DEBUG"
++			CFLAGS="-D_DEBUG $CFLAGS"
+ 			if basename "$cc_host" | grep "gcc" &>/dev/null; then
+ 				# Define only when compiling with GCC, some
+ 				# GLIBC versions use GNU extensions in a way
+@@ -1375,14 +1373,6 @@
+ 				CFLAGS="$CFLAGS -G0"
+ 			fi
+ 		fi
+-		if [ $enable_debug -ge 2 ]; then
+-			CFLAGS="$CFLAGS -fno-inline"
+-		fi
+-		if [ $enable_debug -ge 3 ]; then
+-			CFLAGS="$CFLAGS -O0"
+-		else
+-			CFLAGS="$CFLAGS -O2"
+-		fi
+ 	fi
+ 
+ 	if [ "$os" = "OSX" ] && [ $cc_version -eq 40 ]; then
+@@ -1391,11 +1381,6 @@
+ 		CFLAGS="$CFLAGS -fno-expensive-optimizations"
+ 	fi
+ 
+-	if [ "$enable_profiling" != "0" ]; then
+-		CFLAGS="$CFLAGS -p"
+-		LDFLAGS="$LDFLAGS -pg"
+-	fi
+-
+ 	if [ "$with_threads" = "0" ]; then
+ 		CFLAGS="$CFLAGS -DNO_THREADS"
+ 	fi
diff --git a/games-simulation/openttd/openttd-1.1.1.ebuild b/games-simulation/openttd/openttd-1.1.1.ebuild
index 49fbd3896ed0..bf9352f09b29 100644
--- a/games-simulation/openttd/openttd-1.1.1.ebuild
+++ b/games-simulation/openttd/openttd-1.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/openttd-1.1.1.ebuild,v 1.2 2011/08/08 16:23:42 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/openttd-1.1.1.ebuild,v 1.3 2011/08/08 16:29:31 mr_bones_ Exp $
 
 EAPI=2
 inherit eutils games
@@ -39,6 +39,7 @@ PDEPEND="
 	)
 	openmedia? ( games-misc/opengfx )
 	"
+PATCHES=( "${FILESDIR}"/${P}-cflags.patch )
 
 src_configure() {
 	# there is an allegro interface available as well as sdl, but