4 files changed, 57 insertions, 19 deletions
diff --git a/games-emulation/mupen64plus/ChangeLog b/games-emulation/mupen64plus/ChangeLog
index 9077e6287..f7abb4b10 100644
--- a/games-emulation/mupen64plus/ChangeLog
+++ b/games-emulation/mupen64plus/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  01 Aug 2009; Michał Górny (sedzimir) <gentoo@mgorny.alt.pl>
+  mupen64plus-1.5.ebuild, +files/mupen64plus-1.5-flags.patch:
+  Drop custom-cflags and add a patch to drop default CFLAGS/STRIP instead of
+  using sed. Thanks to Tommy[D] for suggestions.
+
   27 Jul 2009; Michał Górny (sedzimir) <gentoo@mgorny.alt.pl>
   +mupen64plus-1.5.ebuild, +files/mupen64plus-1.5-glide64-gcc44.patch,
   +files/mupen64plus-1.5-plugindir.patch,
diff --git a/games-emulation/mupen64plus/Manifest b/games-emulation/mupen64plus/Manifest
index 2adb8868a..f994677ef 100644
--- a/games-emulation/mupen64plus/Manifest
+++ b/games-emulation/mupen64plus/Manifest
@@ -1,7 +1,8 @@
+AUX mupen64plus-1.5-flags.patch 1204 RMD160 64d248c8200465398a1fd1cc5308f416d0fd36b1 SHA1 b06acd845203e078bf1e2d6043f62948f7757821 SHA256 39ccc5f2c30ff86a9b943befdacec6c3355e0d708e219c188f87ab0b0c61bf15
 AUX mupen64plus-1.5-glide64-gcc44.patch 1262 RMD160 28ccdd74a669af58363501f386acf290cf6a55bd SHA1 5113cffff2c0a472bd37325fa0f582850d71fac0 SHA256 fc9665e4cfa8ae99ab1a4e8d1810d257d81f6cd2c59fc3ac4b7b5d1ec42ef069
 AUX mupen64plus-1.5-plugindir.patch 722 RMD160 905d38cd37f4afdc67d2e7ac7f8d66a5bc9a296a SHA1 d4b77ace873c4a50ebe89fe81f523c6e00dffc8d SHA256 07507a688ab77322317cf3b7fb6419f681386b343c77d26bf3fd01afa3348276
 AUX mupen64plus-1.5-unbundle-bzip2.patch 1317 RMD160 98403a2c3853fc60c666180b106a735e8c8410a3 SHA1 9ff21c4c945dc475f7c248f738913adb13d29b82 SHA256 cc5e3e15ad44b2c5483b222dd55bba8588759ac032b97667d9e3c69d590938e0
 DIST Mupen64Plus-1-5-src.tar.gz 2348443 RMD160 690d1e80d4a10a3a74e7d955c0ee23e3bd4ff996 SHA1 ef200d6ea2eb3faa969ba9c82d2a771236c3145d SHA256 58b2da6095ed8f3bcdcb5d7612bb0f1ba81cda1861ca784ef7e46991fd73cf3f
-EBUILD mupen64plus-1.5.ebuild 3359 RMD160 f99d7adcd0b97ea81639be4824d503851bfd818b SHA1 8be3df6792d980f3a7727c21a028eb4919fe7b58 SHA256 dcced79ff64f47a168928c867a74a11c939a645fc8b2013ae9f59c5dbd238480
-MISC ChangeLog 470 RMD160 15d8acb1172bbc08f7b2405c5410b62e19827bcc SHA1 9d4fb6bb80f33f14bef5d8ee137dfd1103acddc5 SHA256 60015db342de5137016b68e82ec87c74cb04862660d451ef8e569670df747d20
+EBUILD mupen64plus-1.5.ebuild 2984 RMD160 1d9c532013d8f1aac0ddddb9229428de9527af4d SHA1 9b04f14783a29ffa03f50123456a055a9add7052 SHA256 6a0e13323bac52c8f8adf6d385bc4bba316b5e8f0931f5eaf24226daab4cd4cb
+MISC ChangeLog 723 RMD160 df27f2fde5098c80f5eed870022ad1fb4da83b7c SHA1 5fdb482a9dae645be8021db1a6eeb79a9dcf4d35 SHA256 337ce8da6db7a06c5d58e8de02f8d266a94a8c349500f5e368a8cfdb2eb127d0
 MISC metadata.xml 171 RMD160 ed284df01c230fc7990a6b5888b39166d23f29ba SHA1 f3d64a69044b710e23fb874b3ee4cd338858c8b4 SHA256 a7b30fbacd0e4c312c07a3efac112a3794c81d134442d8104325734d03425adf
diff --git a/games-emulation/mupen64plus/files/mupen64plus-1.5-flags.patch b/games-emulation/mupen64plus/files/mupen64plus-1.5-flags.patch
new file mode 100644
index 000000000..d9f5bcbb3
--- /dev/null
+++ b/games-emulation/mupen64plus/files/mupen64plus-1.5-flags.patch
@@ -0,0 +1,45 @@
+diff -dupr Mupen64Plus-1-5-src.orig/pre.mk Mupen64Plus-1-5-src/pre.mk
+--- Mupen64Plus-1-5-src.orig/pre.mk	2009-08-01 17:27:41.415292353 +0200
++++ Mupen64Plus-1-5-src/pre.mk	2009-08-01 17:32:29.038293121 +0200
+@@ -151,10 +151,10 @@ CC      = gcc
+ CXX     = g++
+ LD      = g++
+ ifeq ($(OS),LINUX)
+-STRIP	= strip -s
++STRIP	= true
+ endif
+ ifeq ($(OS),OSX)
+-STRIP	= strip -x 
++STRIP	= true
+ endif
+ RM      = rm
+ RM_F    = rm -f
+@@ -185,19 +185,10 @@ else 
+ endif
+ 
+ # set base CFLAGS and LDFLAGS
+-CFLAGS += -pipe -O3 -ffast-math -funroll-loops -fexpensive-optimizations -fno-strict-aliasing
+ CORE_LDFLAGS += -lz -lm -lpng -lfreetype -ldl
+ 
+ # set special flags per-system
+ ifeq ($(CPU), X86)
+-  ifeq ($(ARCH), 64BITS)
+-    CFLAGS += -march=athlon64
+-  else
+-    CFLAGS += -march=i686 -mtune=pentium-m -mmmx -msse
+-    ifneq ($(PROFILE), 1)
+-      CFLAGS += -fomit-frame-pointer
+-    endif
+-  endif
+   # tweak flags for 32-bit build on 64-bit system
+   ifeq ($(ARCH), 64BITS_32)
+     CFLAGS += -m32
+@@ -205,7 +196,7 @@ ifeq ($(CPU), X86)
+   endif
+ endif
+ ifeq ($(CPU), PPC)
+-  CFLAGS += -mcpu=powerpc -D_BIG_ENDIAN
++  CFLAGS += -D_BIG_ENDIAN
+ endif
+ 
+ # set CFLAGS, LIBS, and LDFLAGS for external dependencies
diff --git a/games-emulation/mupen64plus/mupen64plus-1.5.ebuild b/games-emulation/mupen64plus/mupen64plus-1.5.ebuild
index 617c29f4c..a0ee52c19 100644
--- a/games-emulation/mupen64plus/mupen64plus-1.5.ebuild
+++ b/games-emulation/mupen64plus/mupen64plus-1.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://mupen64plus.googlecode.com/files/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="custom-cflags +gtk libsamplerate lirc qt4 sse"
+IUSE="+gtk libsamplerate lirc qt4 sse"
 
 # GTK+ is currently required by plugins even if no GUI support is enabled
 RDEPEND="virtual/opengl
@@ -57,31 +57,18 @@ src_prepare() {
 	# first prepare to replace plugin path
 	epatch "${FILESDIR}"/${P}-plugindir.patch
 
+	# disable stripping, don't replace CFLAGS
+	epatch "${FILESDIR}"/${P}-flags.patch
+
 	# and then do real path replace
 	sed -i \
 		-e "s:/usr/local/share/mupen64plus:${GAMES_DATADIR}/mupen64plus:" \
 		-e "s:%PUT_PLUGIN_PATH_HERE%:$(games_get_libdir)/${PN}/plugins/:" \
 		main/main.c || die "sed failed"
 
-	# set right CFLAGS and disable stripping
-	local march
-	march="$(get-flag "-march")"
-	sed -i \
-		-e "s:STRIP.*= .*$:STRIP = true:" \
-		-e "s:CFLAGS += -march=.*$:CFLAGS += ${march}:" \
-		pre.mk glide64/Makefile || die "sed failed"
-
 	# replace absolute icon path with relative one
 	sed -i -e "s:^Icon=.*$:Icon=${PN}:" \
 		${PN}.desktop.in || die "sed failed"
-
-	# prevent use of environment CFLAGS
-	sed -i -e '1i CFLAGS =' pre.mk || die "sed failed"
-
-	if use custom-cflags; then
-		sed -i -e "s:CFLAGS += -pipe .*$:CFLAGS += ${CFLAGS}:" \
-			pre.mk || die "sed failed"
-	fi
 }
 
 get_opts() {