version bump (bug #394127) with patch from Michael (kensington)

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

4 files changed, 16 insertions, 69 deletions

diff --git a/games-roguelike/powder/ChangeLog b/games-roguelike/powder/ChangeLog
index ba5b7c459dc4..cb9b08996d6d 100644
--- a/games-roguelike/powder/ChangeLog
+++ b/games-roguelike/powder/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-roguelike/powder
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/powder/ChangeLog,v 1.8 2011/05/23 12:04:25 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/powder/ChangeLog,v 1.9 2011/12/09 21:18:27 mr_bones_ Exp $
+
+*powder-116 (09 Dec 2011)
+
+  09 Dec 2011; Michael Sterrett <mr_bones_@gentoo.org> -powder-114.ebuild,
+  -files/powder-114-make.patch, +powder-116.ebuild:
+  version bump (bug #394127) with patch from Michael (kensington)
 
   23 May 2011; Thomas Kahle <tomka@gentoo.org> powder-115.ebuild:
   x86 stable per bug 364841
diff --git a/games-roguelike/powder/Manifest b/games-roguelike/powder/Manifest
index f25f03bf4451..061adde0f965 100644
--- a/games-roguelike/powder/Manifest
+++ b/games-roguelike/powder/Manifest
@@ -1,17 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX powder-114-make.patch 1872 RMD160 49b6ea248380525be4e25902eb61ff1e19bbf5a3 SHA1 043cb04d595e26393f0c1a8be53b1220c356f3ec SHA256 2b34d58daa9ce7bdbd8cfd8e4ef8afe853cd8468f928fc4040cc21690cb2c21b
-DIST powder114_src.tar.gz 1863082 RMD160 92dc3412394300982a7ae0352c9c247e48c7a1cc SHA1 c402b2f8064c0c884cacd9d9a2ac7b1ac49387f5 SHA256 8e24392dc45035a32e57130311e3785be3d558268a0602329d0b98e0a9ab574e
 DIST powder115_src.tar.gz 1872955 RMD160 dc6656736e25ea34072fd0e3c57932efd23eb4ed SHA1 3a48cb199bf8bdd236a9c0094ad014eb58f90561 SHA256 223e03b30c98d1e500fe920b04fbb8b8df4a8d8d349735ad1e36c62e8450b895
-EBUILD powder-114.ebuild 1046 RMD160 067c5e5339fc5af0ada008f2ca65a0d0f5783170 SHA1 f4429c3d030f23ea715ae14b7dab5374fc6cd27b SHA256 ff3a6c604a4df9ee7da9a0270f0564dc2f50f1036577aa8e4cd4c415dd8dd5b7
+DIST powder116_src.tar.gz 1884616 RMD160 9d5f1d893c3b38107e9d3e16bbdc545c8627780e SHA1 278fce58b0b6fd24b3c50663f01f0adaa3caeee2 SHA256 9c946d6967c6109c038f49c0de3fc85179c4bba94e5117ba6e6c6671a3738c0d
 EBUILD powder-115.ebuild 996 RMD160 2206aceb0485720acb6c091f6cb92578261b2b25 SHA1 19628299a33a22aae50cf9d626aa22446ef4785c SHA256 583af6332b423628bca89d70f84234064947237f856f5705330701e3cca80549
-MISC ChangeLog 1290 RMD160 c90720bcf5650bad7d717166a9475d5f018bb9a3 SHA1 20caf2f45ec927e54197efddaab5b839b9a99a57 SHA256 d56b1e9ec4ae3f54eea7a47cec230336ea8911e84b3a4e6f4bbdebe9bb9e194a
+EBUILD powder-116.ebuild 1041 RMD160 401cfdc15e69fee6c813e27f1f1f734dc47cc0ed SHA1 a0a6dc2e976a7e03d97f9236f79670126ff2a517 SHA256 7a19db4970479164e7aca27cb0a1098766d75477b774a0a720bfdb64683b3eb7
+MISC ChangeLog 1515 RMD160 ac93da7a16c37b03e551a2e478d3aa792d87bd3c SHA1 3c67718edaa0f108866cfa220265ebb2a24756d2 SHA256 81e63a30b6621523a0f72c052fb8be37307d1e8bdc2dead965fb9933af731b06
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iF4EAREIAAYFAk3aVV8ACgkQodBTJSDyo67bVwD/Td5kC44kZLtnGX3zyT34gmq+
-ZViqxCCszXyBGjsJSG8A/R2FyzOU0HQHKpS08iw/FsG6FiVBUbw5/5aRrvRbgk/P
-=1kyc
------END PGP SIGNATURE-----
diff --git a/games-roguelike/powder/files/powder-114-make.patch b/games-roguelike/powder/files/powder-114-make.patch
deleted file mode 100644
index fa39312b6b92..000000000000
--- a/games-roguelike/powder/files/powder-114-make.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-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)
--	$(CXX) -o $(TARGET) $(OFILES) $(CXXFLAGS)
-+	$(CXX) -o $(TARGET) $(OFILES) $(CXXFLAGS) $(LDFLAGS)
- 
- clean:
- 	$(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) 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) $(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)
- 
- powder: premake $(OFILES)
--	$(CXX) -o $(TARGET) $(OFILES) `sdl-config --libs` $(CXXFLAGS)
-+	$(CXX) -o $(TARGET) $(OFILES) `sdl-config --libs` $(CXXFLAGS) $(LDFLAGS)
- 
- .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)
- 
- clean:
- 	$(RM) $(OFILES)
diff --git a/games-roguelike/powder/powder-114.ebuild b/games-roguelike/powder/powder-116.ebuild
index 6b4ffa8132af..28e36eda6fe0 100644
--- a/games-roguelike/powder/powder-114.ebuild
+++ b/games-roguelike/powder/powder-116.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/powder/powder-114.ebuild,v 1.3 2010/07/17 09:19:06 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/powder/powder-116.ebuild,v 1.1 2011/12/09 21:18:27 mr_bones_ Exp $
 
 EAPI=2
-inherit flag-o-matic eutils games
+inherit flag-o-matic games
 
 MY_P=${P/-/}_src
 
@@ -13,18 +13,17 @@ SRC_URI="http://www.zincland.com/powder/release/${MY_P}.tar.gz"
 
 LICENSE="CCPL-Sampling-Plus-1.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 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
+	emake -C port/linux premake || die
+	emake -C port/linux powder || die
 }
 
 src_install() {