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

(Portage version: 2.1.10.11/cvs/Linux i686)

3 files changed, 13 insertions, 55 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/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() {