add patch to have more respect for CFLAGS and LDFLAGS

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

4 files changed, 79 insertions, 12 deletions

diff --git a/games-emulation/sdlmame/ChangeLog b/games-emulation/sdlmame/ChangeLog
index 01c6c9844412..d699d67d6fc0 100644
--- a/games-emulation/sdlmame/ChangeLog
+++ b/games-emulation/sdlmame/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-emulation/sdlmame
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/sdlmame/ChangeLog,v 1.45 2011/04/11 16:29:22 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/sdlmame/ChangeLog,v 1.46 2011/05/22 21:51:33 mr_bones_ Exp $
+
+  22 May 2011; Michael Sterrett <mr_bones_@gentoo.org> sdlmame-0.142.ebuild,
+  +files/sdlmame-0.142-makefile.patch:
+  add patch to have more respect for CFLAGS and LDFLAGS
 
 *sdlmame-0.142 (11 Apr 2011)
 
diff --git a/games-emulation/sdlmame/Manifest b/games-emulation/sdlmame/Manifest
index 70cf2c083642..29bf2f9afd06 100644
--- a/games-emulation/sdlmame/Manifest
+++ b/games-emulation/sdlmame/Manifest
@@ -2,6 +2,7 @@ AUX joymap.dat 223 RMD160 d86c536a5d33bec9ecd6efbee2f7389835495328 SHA1 011d631b
 AUX mame-0.139.ini.in 6688 RMD160 0e9cbdca2dc2f30971544298fda3d4ff8003c22e SHA1 f0eb42695dc3fa46452565c69a91c027686acebd SHA256 4788e0c7bccc6d286cf1b3cbfe39aa1be6f210a94dea37954d4821a97bfb14da
 AUX mame.ini.in 5962 RMD160 6eb4c315b29d5e6da24a40ad94a646bb56b27998 SHA1 fadb0546bdac23e7162833fad60533c0a4fcf772 SHA256 6205c738b7e57ead9c05885bdaeb3ebfb143bec9dc1de7a97016b791bea532d8
 AUX sdlmame-0.136-nodebug.patch 952 RMD160 4098730d8cdf205b8dfc4f4a4dbcccf36ddff787 SHA1 19365ec2431f808311e49732413b88844b1d0ccc SHA256 92486bf8ff6ba153ef4759205d1250c8294c1f7cd2187e194ab10d0cc7cada17
+AUX sdlmame-0.142-makefile.patch 1746 RMD160 c9f212f04481aaf89c6d6ec77afccef4aff00c65 SHA1 c1ebd02c0efc29562d4de3d910ce93535b0646b3 SHA256 f59407b1aa7d2f69aacbc207cf238be50a986b4dbd6d12d97bd9a7d17db7fb45
 AUX vector.ini 116 RMD160 e63ed40b21a2426b28571d514933efab6ccce7e8 SHA1 c6615ce44d08b89a65435dfe7e0af9ac6d8459df SHA256 408aeaaffcb2ecccd20db457f22d2d5efa930c0f62a92987b0fbefaf6c038c23
 DIST mame0141s.zip 17092788 RMD160 c09ef461280dfd7e45ca638caaa66d8752a9794b SHA1 80225e2694469dac39a75815f227b864a4992f5e SHA256 27c8829c55041886edafaa459b83452b0a327df31ce922c0b6a2ee91877504f8
 DIST mame0142s.zip 17657289 RMD160 20b7fc0af868521462e8081021acbfbe98bea16d SHA1 6d70b7a2a15abfdb7955772844ac4c6eae50ced4 SHA256 d5ccb987088522a203bf978a34eab8fa8c8560947a13373d48c11b2a496b6986
@@ -13,6 +14,6 @@ DIST sdlmame0141u2_diff.zip 878752 RMD160 3c27330000dd8ab0f16d331159e38432f36fad
 DIST sdlmame0141u3_diff.zip 1257622 RMD160 62c6a368a7949f6db766a4c40c5feb316570ad74 SHA1 4139b43620ae6148f4e1fa1d3159e0894f93a5b5 SHA256 d1c9cb608ddb34548245b7a3de91f6ccf5faf27db3cf751a37816fa308210b4b
 EBUILD sdlmame-0.136.ebuild 3384 RMD160 1d79b94c2af8e8a4dbbf76bb3ad80b796828f85c SHA1 c32128b66147ee8c6cfe01f28f49989711b6a6e9 SHA256 31c6ce4b49f273a2c6fb3d85f8efe1ac91a9bbd85868aa877ff56b16bff54506
 EBUILD sdlmame-0.141_p3.ebuild 4005 RMD160 23d00e710b351dc0ffd3dd9403e6c87b7b3c4556 SHA1 a7775b7b692847680ec7a6356bbc8c718d4a3003 SHA256 1c78221a600937515112a4090fff6f26e38ae44e744a6b7e83839be668d0975e
-EBUILD sdlmame-0.142.ebuild 4002 RMD160 55a829b1907e966020158cd311832addca6e8774 SHA1 62fecf74c42517e4b4761dede5e1dae15ce22371 SHA256 a5c78a600f6b772add5e3078f94062770c064c3f3514dc3ad19a1b4a09d9a8af
-MISC ChangeLog 5840 RMD160 24c16420aa60c56a2ad31ce31da0d6e6aab3288e SHA1 01b83700383ae7e8f28e49594ce687c8794e08b5 SHA256 7e7ba085b5798e9714479ca708ea1b9c624afc4fd20389bf8521803aca151676
+EBUILD sdlmame-0.142.ebuild 3849 RMD160 4fe5124a81a23924a3bd0a88c18c983a52c00fae SHA1 3c1cbe4aee8818e2215668de01bbfe97e7c6d6d3 SHA256 b5490bfed18ca1a7c055c4831ca7ecf2bc69eb43497818de84e77e9479dc9d36
+MISC ChangeLog 6013 RMD160 cf0fcd8b4266d8dfced5427140bfd2227baeaab7 SHA1 fa33ad1ddf297c875b167aef928780c49935792c SHA256 57981b609e5b15d341b163156ed6dbd1ec5fd098577b22b91938d92fd64f3e88
 MISC metadata.xml 1089 RMD160 9c8a425da7e10ddc2cdf1bfbbf60b23257eca1e7 SHA1 9ba3821b6dc312016d9cecc295555411e8bc044c SHA256 67982ede09eba43a5e84327f2f529031242424222e0d5170f31c8f2e647e937f
diff --git a/games-emulation/sdlmame/files/sdlmame-0.142-makefile.patch b/games-emulation/sdlmame/files/sdlmame-0.142-makefile.patch
new file mode 100644
index 000000000000..f03ea82fc5d6
--- /dev/null
+++ b/games-emulation/sdlmame/files/sdlmame-0.142-makefile.patch
@@ -0,0 +1,68 @@
+diff -ru work.orig/makefile work/makefile
+--- work.orig/makefile	2011-02-12 15:17:48.000000000 -0500
++++ work/makefile	2011-05-22 17:27:47.006482020 -0400
+@@ -431,9 +431,6 @@
+ CPPONLYFLAGS += -x c++ -std=gnu++98

+ COBJFLAGS += -x objective-c++

+ 

+-# this speeds it up a bit by piping between the preprocessor/compiler/assembler

+-CCOMFLAGS += -pipe

+-

+ # add -g if we need symbols, and ensure we have frame pointers

+ ifdef SYMBOLS

+ CCOMFLAGS += -g$(SYMLEVEL) -fno-omit-frame-pointer

+@@ -449,23 +446,6 @@
+ CCOMFLAGS += -pg

+ endif

+ 

+-# add the optimization flag

+-CCOMFLAGS += -O$(OPTIMIZE)

+-

+-# if we are optimizing, include optimization options

+-# and make all errors into warnings

+-ifneq ($(OPTIMIZE),0)

+-ifneq ($(TARGETOS),os2)

+-ifndef NOWERROR

+-CCOMFLAGS += -Werror -fno-strict-aliasing $(ARCHOPTS)

+-else

+-CCOMFLAGS += -fno-strict-aliasing $(ARCHOPTS)

+-endif

+-else

+-CCOMFLAGS += -fno-strict-aliasing $(ARCHOPTS)

+-endif

+-endif

+-

+ # add a basic set of warnings

+ CCOMFLAGS += \

+ 	-Wall \

+@@ -523,16 +503,6 @@
+ # linking flags

+ #-------------------------------------------------

+ 

+-# LDFLAGS are used generally; LDFLAGSEMULATOR are additional

+-# flags only used when linking the core emulator

+-LDFLAGS =

+-ifneq ($(TARGETOS),macosx)

+-ifneq ($(TARGETOS),os2)

+-ifneq ($(TARGETOS),solaris)

+-LDFLAGS = -Wl,--warn-common

+-endif

+-endif

+-endif

+ LDFLAGSEMULATOR =

+ 

+ # add profiling information for the linker

+@@ -540,13 +510,6 @@
+ LDFLAGS += -pg

+ endif

+ 

+-# strip symbols and other metadata in non-symbols and non profiling builds

+-ifndef SYMBOLS

+-ifneq ($(TARGETOS),macosx)

+-LDFLAGS += -s

+-endif

+-endif

+-

+ # output a map file (emulator only)

+ ifdef MAP

+ LDFLAGSEMULATOR += -Wl,-Map,$(FULLNAME).map

diff --git a/games-emulation/sdlmame/sdlmame-0.142.ebuild b/games-emulation/sdlmame/sdlmame-0.142.ebuild
index 085e168fdf4f..d1a19211343d 100644
--- a/games-emulation/sdlmame/sdlmame-0.142.ebuild
+++ b/games-emulation/sdlmame/sdlmame-0.142.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-emulation/sdlmame/sdlmame-0.142.ebuild,v 1.1 2011/04/11 16:29:22 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/sdlmame/sdlmame-0.142.ebuild,v 1.2 2011/05/22 21:51:33 mr_bones_ Exp $
 
 EAPI=2
 inherit eutils flag-o-matic games
@@ -64,14 +64,8 @@ src_prepare() {
 		einfo "Patching release with source updates"
 		epatch ${MY_PV%%_p*}*.diff
 	fi
-	sed -i \
-		-e '/CFLAGS += -O$(OPTIMIZE)/s:^:# :' \
-		-e '/CFLAGS += -pipe/s:^:# :' \
-		-e '/LDFLAGS += -s/s:^:# :' \
-		-e '/LDFLAGS =/d' \
-		-e 's:-Werror::' \
-		makefile \
-		|| die "sed failed"
+	epatch "${FILESDIR}"/${P}-makefile.patch
+
 	# Don't compile zlib and expat
 	einfo "Disabling embedded libraries: zlib and expat"
 	disable_feature BUILD_ZLIB