use patch instead of lots of sed

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

4 files changed, 124 insertions, 20 deletions

diff --git a/games-sports/stormbaancoureur/ChangeLog b/games-sports/stormbaancoureur/ChangeLog
index f533bccda9e0..fd825111ed31 100644
--- a/games-sports/stormbaancoureur/ChangeLog
+++ b/games-sports/stormbaancoureur/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-sports/stormbaancoureur
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/stormbaancoureur/ChangeLog,v 1.18 2010/09/16 17:52:37 scarabeus Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-sports/stormbaancoureur/ChangeLog,v 1.19 2012/02/20 17:57:59 mr_bones_ Exp $
+
+  20 Feb 2012; Michael Sterrett <mr_bones_@gentoo.org>
+  stormbaancoureur-2.1.6.ebuild, +files/stormbaancoureur-2.1.6-gentoo.patch:
+  use patch instead of lots of sed
 
   16 Sep 2010; Tomáš Chvátal <scarabeus@gentoo.org>
   stormbaancoureur-2.1.6.ebuild:
diff --git a/games-sports/stormbaancoureur/Manifest b/games-sports/stormbaancoureur/Manifest
index da5a4709ac00..9ad58dd47a87 100644
--- a/games-sports/stormbaancoureur/Manifest
+++ b/games-sports/stormbaancoureur/Manifest
@@ -1,4 +1,5 @@
+AUX stormbaancoureur-2.1.6-gentoo.patch 3773 RMD160 675205b489ca4d5b2cf28cc3ebf56e4c3e4f222b SHA1 3aee2b12d435ef686851f341a0afa940bbff3ea1 SHA256 35348f045af0862b13e335808990bd7f7665c7b91aad3edb420dd239cb7bd7f5
 DIST stormbaancoureur-2.1.6.tar.gz 3976459 RMD160 a72b2b4d625c2147b7e56951c15f1884c4e273ab SHA1 2fbeecbfad7ee208c1e04483a764c2437edbcc19 SHA256 c6bd67695734fd430ce8e8d744710531ed4dae1bc78d5cd0529af930144e7903
-EBUILD stormbaancoureur-2.1.6.ebuild 1282 RMD160 b74470ae5590e84b667232849d3d4b74c84a8acc SHA1 a3ed817a27663c4fd9974ebf8692641e034558f6 SHA256 021c601a33cf2eb3ac9c5b5445e108742ce68fce3d030779dc1db4d7385b466c
-MISC ChangeLog 2836 RMD160 757b0099e5c7b6b1955627f6cafeeca390b4df0f SHA1 86ae8346da2091db86a2ca1449f9fca2b3cd6b95 SHA256 89e91ffec639e0cd793cc80f24bd21b35e5ed49dfc245a5365dae887b456edd8
+EBUILD stormbaancoureur-2.1.6.ebuild 1005 RMD160 398cfbfc7db479b25c6c3e9112d14c88cfbeb01b SHA1 25868bc0b644431bf5c9e9ad4784d58834bc2298 SHA256 1188c5f9b730ea096c3d07d91862f84a8d82f508533586da5c2ce6a0aa828cd8
+MISC ChangeLog 3004 RMD160 79ff570cdb5c0e3264bbd765ebecfcdf9212daef SHA1 94a967114234fa0a34678a9cb6bad59c3fcfb272 SHA256 0baaae82cdc378132959749799913da3c899a7a365064970ff19c9fcc8566bc3
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-sports/stormbaancoureur/files/stormbaancoureur-2.1.6-gentoo.patch b/games-sports/stormbaancoureur/files/stormbaancoureur-2.1.6-gentoo.patch
new file mode 100644
index 000000000000..de77f6e846d5
--- /dev/null
+++ b/games-sports/stormbaancoureur/files/stormbaancoureur-2.1.6-gentoo.patch
@@ -0,0 +1,109 @@
+--- stormbaancoureur-2.1.6.orig/src-stormbaancoureur/Makefile
++++ stormbaancoureur-2.1.6/src-stormbaancoureur/Makefile
+@@ -5,21 +5,20 @@
+ GLPREFIX=/usr
+ PLIBPREFIX=/usr
+ ODEPREFIX=/usr
+-CXX=g++
+ LIBDIRNAME=lib
+ 
+ # END OF CUSTOM SETTINGS
+ 
+-CXXFLAGS=\
++LCXXFLAGS:=\
+   -I$(GLPREFIX)/include \
+   -I$(ODEPREFIX)/include \
+   -I$(PLIBPREFIX)/include \
+   -I../src-common \
+   -I. \
+   -DGAMEVERSION=$(VERSION) \
+-  -O2 -g -Wall
++  $(CXXFLAGS)
+ 
+-LFLAGS=\
++LFLAGS= $(LDFLAGS) \
+   -L$(PLIBPREFIX)/$(LIBDIRNAME) \
+   -L/usr/X11R6/$(LIBDIRNAME)
+ 
+@@ -39,7 +38,7 @@
+ 
+ 
+ LIBS=\
+-  $(ODEPREFIX)/$(LIBDIRNAME)/libode.a \
++  -lode \
+   -lplibssgaux -lplibssg -lplibsg -lplibpu -lplibfnt -lplibul \
+   -lglut -lGLU -lGL -lasound
+ 
+@@ -47,41 +46,41 @@
+ all: stormbaancoureur
+ 
+ 
+-stormbaancoureur: $(OBJS) $(ODEPREFIX)/$(LIBDIRNAME)/libode.a
++stormbaancoureur: $(OBJS)
+ 	$(CXX) -o stormbaancoureur $(OBJS) $(LFLAGS) $(LIBS)
+ 
+ staticworldobject.o: ../src-common/staticworldobject.cxx ../src-common/staticworldobject.h ../src-common/worldobject.h
+-	$(CXX) -c $(CXXFLAGS) ../src-common/staticworldobject.cxx
++	$(CXX) -c $(LCXXFLAGS) ../src-common/staticworldobject.cxx
+ 
+ dynamicobject.o: ../src-common/dynamicobject.cxx ../src-common/dynamicobject.h ../src-common/worldobject.h
+-	$(CXX) -c $(CXXFLAGS) ../src-common/dynamicobject.cxx
++	$(CXX) -c $(LCXXFLAGS) ../src-common/dynamicobject.cxx
+ 
+ carobject.o: carobject.cxx carobject.h
+-	$(CXX) -c $(CXXFLAGS) carobject.cxx
++	$(CXX) -c $(LCXXFLAGS) carobject.cxx
+ 
+ controllerpad.o: controllerpad.cxx controller.h ../src-common/joydb.h
+-	$(CXX) -c $(CXXFLAGS) controllerpad.cxx
++	$(CXX) -c $(LCXXFLAGS) controllerpad.cxx
+ 
+ controllerkey.o: controllerkey.cxx
+-	$(CXX) -c $(CXXFLAGS) controllerkey.cxx
++	$(CXX) -c $(LCXXFLAGS) controllerkey.cxx
+ 
+ intro.o: intro.cxx intro.h
+-	$(CXX) -c $(CXXFLAGS) intro.cxx
++	$(CXX) -c $(LCXXFLAGS) intro.cxx
+ 
+ vectortext.o: ../src-common/vectortext.cxx ../src-common/vectortext.h
+-	$(CXX) -c $(CXXFLAGS) ../src-common/vectortext.cxx
++	$(CXX) -c $(LCXXFLAGS) ../src-common/vectortext.cxx
+ 
+ postscore.o: postscore.cxx postscore.h
+-	$(CXX) -c $(CXXFLAGS) postscore.cxx
++	$(CXX) -c $(LCXXFLAGS) postscore.cxx
+ 
+ soundenginealsa.o: ../src-common/soundenginealsa.cxx ../src-common/soundenginealsa.h ../src-common/soundfeed.h ../src-common/soundclip.h
+-	$(CXX) -c $(CXXFLAGS) ../src-common/soundenginealsa.cxx
++	$(CXX) -c $(LCXXFLAGS) ../src-common/soundenginealsa.cxx
+ 
+ ogl.o: ../src-common/ogl.cxx 
+-	$(CXX) -c $(CXXFLAGS) ../src-common/ogl.cxx
++	$(CXX) -c $(LCXXFLAGS) ../src-common/ogl.cxx
+ 
+ main.o: main.cxx ../src-common/usercam.h ../src-common/trackingcam.h ../src-common/soundenginealsa.h cratewall.h controller.h intro.h plodegui.h doorstand.h carpettrack.h spikejump.h ferriswheel.h turntable.h sturmbahn.h ../src-common/modelmap.h starsky.h carobject.h respawnpoint.h
+-	$(CXX) -c $(CXXFLAGS) main.cxx
++	$(CXX) -c $(LCXXFLAGS) main.cxx
+ 
+ debugrun: stormbaancoureur
+ 	PLODE_DATADIR=`pwd` gdb ./stormbaancoureur
+--- stormbaancoureur-2.1.6.orig/src-stormbaancoureur/main.cxx
++++ stormbaancoureur-2.1.6/src-stormbaancoureur/main.cxx
+@@ -836,15 +836,7 @@
+   fprintf(stderr,"plib is (c) by Steve Baker\n");
+   fprintf(stderr,"OpenDE is (c) by Russel L. Smith\n");
+ 
+-  char *bindirname  = dirname(argv[0]);
+-  if (!strcmp(bindirname,"."))
+-    dirprefix="/usr/share/games/stormbaancoureur";
+-  else
+-  {
+-    dirprefix = dirname(bindirname) + std::string("/share/games/stormbaancoureur");
+-  }
+-  if (getenv("PLODE_DATADIR"))
+-    dirprefix = getenv("PLODE_DATADIR");
++  dirprefix="GENTOODIR";
+   if (getenv("PLODE_DISPLAYMODE"))
+     displaymode = getenv("PLODE_DISPLAYMODE");
+   assert(displaymode == "monoscopic" || displaymode == "quadbufferstereoscopic" || displaymode == "passivestereoscopic");
diff --git a/games-sports/stormbaancoureur/stormbaancoureur-2.1.6.ebuild b/games-sports/stormbaancoureur/stormbaancoureur-2.1.6.ebuild
index 7723ee6ad50a..e072ae073c80 100644
--- a/games-sports/stormbaancoureur/stormbaancoureur-2.1.6.ebuild
+++ b/games-sports/stormbaancoureur/stormbaancoureur-2.1.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/stormbaancoureur/stormbaancoureur-2.1.6.ebuild,v 1.3 2010/09/16 17:52:37 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/stormbaancoureur/stormbaancoureur-2.1.6.ebuild,v 1.4 2012/02/20 17:57:59 mr_bones_ Exp $
 
 EAPI=2
 inherit eutils games
@@ -24,24 +24,14 @@ DEPEND="virtual/opengl
 S=${WORKDIR}/${P}/src-${PN}
 
 src_prepare() {
-	sed -i \
-		-e "/dirprefix \?=\"/s:=.*: = \"${GAMES_DATADIR}/${PN}\";:" main.cxx \
-		|| die "sed failed"
-
-	sed -i \
-		-e "/^CXX=/d" \
-		-e '/Wall/d' \
-		-e "/^CXXFLAGS/ s%=%= ${CXXFLAGS} %" \
-		-e '/DGAMEVERSION/s:\\::' \
-		-e '/^LFLAGS=/s:=:= $(LDFLAGS) :' \
-		-e 's:$(ODEPREFIX)/$(LIBDIRNAME)/libode.a:-lode:' \
-		Makefile || die "sed failed"
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	sed -ie "s:GENTOODIR:${GAMES_DATADIR}/${PN}:" main.cxx || die
 }
 
 src_install() {
-	dogamesbin ${PN} || die "dogamesbin failed"
+	dogamesbin ${PN} || die
 	insinto "${GAMES_DATADIR}"/${PN}
-	doins -r images/ models/ sounds/ shaders/ || die "doins failed"
+	doins -r images/ models/ sounds/ shaders/ || die
 	dodoc JOYSTICKS README TODO
 	make_desktop_entry ${PN} "Stormbaan Coureur"
 	prepgamesdirs