reroll and actually apply patch

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

4 files changed, 46 insertions, 100 deletions

diff --git a/games-roguelike/powder/ChangeLog b/games-roguelike/powder/ChangeLog
index d5b4b6040594..5c3d8e4336b9 100644
--- a/games-roguelike/powder/ChangeLog
+++ b/games-roguelike/powder/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-roguelike/powder
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/powder/ChangeLog,v 1.1 2010/05/03 23:56:21 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/powder/ChangeLog,v 1.2 2010/05/04 00:57:02 mr_bones_ Exp $
+
+  04 May 2010; Michael Sterrett <mr_bones_@gentoo.org> powder-113.ebuild,
+  files/powder-113-make.patch:
+  reroll and actually apply patch
 
 *powder-113 (03 May 2010)
 
diff --git a/games-roguelike/powder/Manifest b/games-roguelike/powder/Manifest
index 39de9346b034..04a023667e45 100644
--- a/games-roguelike/powder/Manifest
+++ b/games-roguelike/powder/Manifest
@@ -1,5 +1,5 @@
-AUX powder-113-make.patch 3434 RMD160 93860f27362f3231c6b041cee91c17dd16744046 SHA1 d562ab53bd8f346cec2f852c96012848329efd3b SHA256 6d646ae208f8fbd7ed43b1f3f56cfcb6bbab78781ac0f771126d15aeca0d55b3
+AUX powder-113-make.patch 1872 RMD160 49b6ea248380525be4e25902eb61ff1e19bbf5a3 SHA1 043cb04d595e26393f0c1a8be53b1220c356f3ec SHA256 2b34d58daa9ce7bdbd8cfd8e4ef8afe853cd8468f928fc4040cc21690cb2c21b
 DIST powder113_src.tar.gz 1860339 RMD160 b0c2f8d68b69beb510082b5573ee42a9c806f4b8 SHA1 fe76b4f58fd9466b250591bc4250e38b103314e8 SHA256 8ab194230e5ef06c9b7a02e781d858ecc112975251da344297b79090e7f119ae
-EBUILD powder-113.ebuild 811 RMD160 8cc82566c285dfc422f1f8d5ad9146d192652a57 SHA1 214432cc96c929d6b8886a8b0135c0030fbac4ac SHA256 d616f27073b4f214c8dc98b36f0cb2b49747c34cf17e92c12f6f759c0fdee719
-MISC ChangeLog 492 RMD160 17676bc2d05b82616ffd2fb42c6625163e333c78 SHA1 cd74547cac95aaaf29025d97dd6a10cb5285987f SHA256 c57ca6410e93314b358244a778946f2a3a7ba8de0bbd291dba14ca103c052d1f
+EBUILD powder-113.ebuild 854 RMD160 d867e26327ca3c248903b3cae146bc254a65dc62 SHA1 7709ab9ca41815992acdf62edf1bd804e1e2ebdb SHA256 63eba4d05bf7f260796ebd3280f044bcb7e752d849c2d4d6a4612dd1e269f2ec
+MISC ChangeLog 632 RMD160 7f88b4abc14d47b07ab22bc8d41ae648bdc59939 SHA1 181af86e98e1e47cad4727c9326c82c77eaf0894 SHA256 4257e4042a00ec0ea3caab0b0a77a1c272015c799323abf236fd2a71253cfbdc
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-roguelike/powder/files/powder-113-make.patch b/games-roguelike/powder/files/powder-113-make.patch
index 9f6dda709d23..fa39312b6b92 100644
--- a/games-roguelike/powder/files/powder-113-make.patch
+++ b/games-roguelike/powder/files/powder-113-make.patch
@@ -1,107 +1,47 @@
---- powder110_src/make/makerules.origin	2009-01-29 00:32:32.141421840 +0200
-+++ powder110_src/make/makerules	2009-01-29 00:27:37.128428046 +0200
-@@ -1,11 +1,11 @@
- .cpp.o:
--	g++ -O3 -I . -DLINUX -c $< -o $@ $(CXXFLAGS)
-+	$(CXX) -I . -DLINUX -c $< -o $@ $(CXXFLAGS)
- 
+diff -ru powder113_src.orig/make/makerules powder113_src/make/makerules
+--- powder113_src.orig/make/makerules	2009-02-05 20:11:41.000000000 -0500
++++ powder113_src/make/makerules	2010-05-03 20:38:32.579540189 -0400
+@@ -8,7 +8,7 @@
  all: $(TARGET)
  
  $(TARGET): $(OFILES)
--	g++ -O3 -o $(TARGET) $(OFILES) $(CXXFLAGS)
-+	$(CXX) -o $(TARGET) $(OFILES) $(CXXFLAGS)
+-	$(CXX) -o $(TARGET) $(OFILES) $(CXXFLAGS)
++	$(CXX) -o $(TARGET) $(OFILES) $(CXXFLAGS) $(LDFLAGS)
  
  clean:
--	rm -f *.o
--	rm -f $(TARGET)
-+	$(RM) *.o
-+	$(RM) $(TARGET)
---- powder110_src/make/makerules.LINUX.origin	2009-01-28 21:59:57.499759608 +0200
-+++ powder110_src/make/makerules.LINUX	2009-01-29 00:27:34.747275321 +0200
-@@ -1,5 +1,5 @@
- .cpp.o:
--	g++ -O3 -DLINUX -I ../../port/sdl `sdl-config --cflags` -c $< -o $@ $(CXXFLAGS)
-+	$(CXX) -DLINUX -I ../../port/sdl `sdl-config --cflags` -c $< -o $@ $(CXXFLAGS)
- 
- all: $(TARGET)
- 
-@@ -8,10 +8,10 @@
- 	# http://www.trilithium.com/johan/2005/06/static-libstdc/
+ 	$(RM) $(OFILES)
+diff -ru powder113_src.orig/make/makerules.LINUX powder113_src/make/makerules.LINUX
+--- powder113_src.orig/make/makerules.LINUX	2009-01-18 19:54:09.000000000 -0500
++++ powder113_src/make/makerules.LINUX	2010-05-03 20:39:11.022462202 -0400
+@@ -13,8 +13,8 @@
  	# and is to try and ensure we end up with a static link
  	# of stdc++.
--	rm -f libstdc++.a
-+	$(RM) libstdc++.a
- 	ln -s `g++ -print-file-name=libstdc++.a`
--	g++ -O3 -static-libgcc -L. -o $(TARGET) $(OFILES) `sdl-config --libs` $(CXXFLAGS)
-+	$(CXX) -static-libgcc -L. -o $(TARGET) $(OFILES) `sdl-config --libs` $(CXXFLAGS)
+ 	$(RM) libstdc++.a
+-	ln -s `g++ -print-file-name=libstdc++.a`
+-	$(CXX) -static-libgcc -L. -o $(TARGET) $(OFILES) `sdl-config --libs` $(CXXFLAGS)
++	ln -s `$(CXX) -print-file-name=libstdc++.a`
++	$(CXX) -static-libgcc -L. -o $(TARGET) $(OFILES) `sdl-config --libs` $(CXXFLAGS) $(LDFLAGS)
  
  clean:
--	rm -f *.o
--	rm -f $(TARGET)
-+	$(RM) *.o
-+	$(RM) $(TARGET)
---- powder110_src/port/linux/Makefile.orig	2008-01-14 04:28:15.000000000 +0200
-+++ powder110_src/port/linux/Makefile	2009-01-29 02:19:52.018078431 +0200
-@@ -38,19 +38,54 @@
- 	 ../../gfx/all_bitmaps.o \
- 	 ../../rooms/allrooms.o
+ 	$(RM) $(OFILES)
+diff -ru powder113_src.orig/port/linux/Makefile powder113_src/port/linux/Makefile
+--- powder113_src.orig/port/linux/Makefile	2009-05-13 19:32:42.000000000 -0400
++++ powder113_src/port/linux/Makefile	2010-05-03 20:40:57.629463531 -0400
+@@ -48,7 +48,7 @@
+ all: $(TARGET)
  
--include ../../make/makerules.LINUX
-+PREMAKE_TRG = ../../support/map2c/map2c \
-+			  ../../support/tile2c/tile2c \
-+			  ../../support/bmp2c/bmp2c \
-+			  ../../support/encyclopedia2c/encyclopedia2c \
-+			  ../../support/enummaker/enummaker\
-+			  ../../support/txt2c/txt2c
+ powder: premake $(OFILES)
+-	$(CXX) -o $(TARGET) $(OFILES) `sdl-config --libs` $(CXXFLAGS)
++	$(CXX) -o $(TARGET) $(OFILES) `sdl-config --libs` $(CXXFLAGS) $(LDFLAGS)
  
--clean:
--	cd ../.. ; rm -f *.o
--	cd ../../gfx ; rm -f *.o
--	rm -f *.o
--	cd ../sdl ; rm -f *.o
--	rm -f $(TARGET)
-+all: $(TARGET)
-+
-+
-+$(PREMAKE_TRG): 
-+	$(MAKE) -C `dirname $@`
+ .cpp.o:
+ 	$(CXX) -DLINUX -I ../../port/sdl `sdl-config --cflags` -c $< -o $@ $(CXXFLAGS)
+@@ -60,7 +60,7 @@
+ 	# of stdc++.
+ 	$(RM) libstdc++.a
+ 	ln -s `g++ -print-file-name=libstdc++.a`
+-	$(CXX) -static-libgcc -L. -o $(TARGET) $(OFILES) `sdl-config --libs` $(CXXFLAGS)
++	$(CXX) -static-libgcc -L. -o $(TARGET) $(OFILES) `sdl-config --libs` $(CXXFLAGS) $(LDFLAGS)
  
--premake:
-+premake: $(PREMAKE_TRG)
- 	cd ../../rooms ; ./buildrooms.bash
- 	cd ../../gfx ; ./rebuild.sh
- 	cd ../.. ; support/enummaker/enummaker source.txt
- 	cd ../.. ; support/txt2c/txt2c LICENSE.TXT license.cpp
- 	cd ../.. ; support/txt2c/txt2c CREDITS.TXT credits.cpp
- 	cd ../.. ; support/encyclopedia2c/encyclopedia2c encyclopedia.txt
-+
-+$(OFILES): premake
-+	$(CXX) -DLINUX -I ../../port/sdl `sdl-config --cflags` -c $(patsubst %.o,%.cpp,$@) -o $@ $(CXXFLAGS)
-+
-+$(TARGET): $(OFILES)
-+	$(CXX) -o $@ $(OFILES) `sdl-config --libs` $(CXXFLAGS)
-+
-+$(TARGET)-static: $(OFILES)
-+	# This extra step is from:
-+	# http://www.trilithium.com/johan/2005/06/static-libstdc/
-+	# and is to try and ensure we end up with a static link
-+	# of stdc++.
-+	$(RM) libstdc++.a
-+	ln -s `g++ -print-file-name=libstdc++.a`
-+	$(CXX) -static-libgcc -L. -o $@ $(OFILES) `sdl-config --libs` $(CXXFLAGS)
-+
-+clean:
-+	$(RM) *.o $(TARGET) libstdc++.a
-+	cd ../../; $(RM) credits.cpp encyclopedia.cpp encyclopedia.h glbdef.cpp glbdef.h license.cpp
-+	cd ../../gfx; $(RM) 
-+	cd ../../gfx; $(RM) icon_sdl.bmp.c slug_and_blood.bmp.c slug_and_blood_hires.bmp.c classic/*.c adambolt/*.c nethack/*.c ascii/*.c akoimeexx/*.c
-+	cd ../../rooms/; $(RM) *.cpp allrooms.h allrooms.o 
-+	$(RM) 
-+	$(RM) ../../*.o
-+	$(RM) ../../gfx/*.o
-+	$(RM) ../sdl/*.o
-+	@for trgt in $$( echo "$(PREMAKE_TRG)" | tr -s ' ' '\n' ); do \
-+		$(MAKE) clean -C `dirname $$trgt` ; \
-+	done;
-+
-+.PHONY: all clean premake
+ clean:
+ 	$(RM) $(OFILES)
diff --git a/games-roguelike/powder/powder-113.ebuild b/games-roguelike/powder/powder-113.ebuild
index 7e126ef50a75..bc292db0979b 100644
--- a/games-roguelike/powder/powder-113.ebuild
+++ b/games-roguelike/powder/powder-113.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/powder/powder-113.ebuild,v 1.1 2010/05/03 23:56:21 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/powder/powder-113.ebuild,v 1.2 2010/05/04 00:57:02 mr_bones_ Exp $
 
 EAPI=2
 inherit flag-o-matic eutils games
@@ -20,6 +20,8 @@ DEPEND="media-libs/libsdl[video]"
 
 S=${WORKDIR}/${MY_P}
 
+PATCHES=( "${FILESDIR}"/${P}-make.patch )
+
 src_compile() {
 	append-cxxflags -DCHANGE_WORK_DIRECTORY
 	emake -j1 -C port/linux || die