games-arcade/flyhard: Version bump. Thanks to hasufell and floppym

5 files changed, 71 insertions, 30 deletions

diff --git a/games-arcade/flyhard/ChangeLog b/games-arcade/flyhard/ChangeLog
index 0cfb90f87..d21f8ca14 100644
--- a/games-arcade/flyhard/ChangeLog
+++ b/games-arcade/flyhard/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for games-arcade/flyhard
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*flyhard-0.42 (09 Sep 2012)
+
+  09 Sep 2012; Manuel Rüger (mrueg) gentoo@rueg.eu -flyhard-0.41.ebuild,
+  +flyhard-0.42.ebuild, +files/flyhard-0.42-Makefile.patch:
+  Version bump. Thanks to hasufell and floppym
+
   05 Mar 2010; Angelo D'Autilia (sYdRo) <sydro@salug.it>
   -flyhard-0.3.ebuild, +flyhard-0.41.ebuild:
   Version bump to flyhard-0.41
diff --git a/games-arcade/flyhard/Manifest b/games-arcade/flyhard/Manifest
index 699182507..704af7f03 100644
--- a/games-arcade/flyhard/Manifest
+++ b/games-arcade/flyhard/Manifest
@@ -1,4 +1,5 @@
-DIST flyhard-0.41.tar.gz 385981 RMD160 2baa79eeaa416e72f3789ffd90b2f62f1a1ceb05 SHA1 d5c8cc796507418067abb3750b1f573b50353e67 SHA256 bef504099b6a2e9f11f462a5ff3838e0293de2c703474af897b560070c54ce94
-EBUILD flyhard-0.41.ebuild 622 RMD160 a48221f2fa07b9cd9f76a9eec2ad4722c42aed78 SHA1 35f4045201d095e3ef1ed2c242cc373ee8e50658 SHA256 999c6a194a6205fe2e06f2bcfda35df5dfef155f499087d5e2e71a205c81922f
-MISC ChangeLog 467 RMD160 324d92d25b71863544f2282119fa9017642cd287 SHA1 d2dcc40a3d00308597f160abf67d33f65fe5dc6f SHA256 8db63a08f07aa8578ec3a8f1140f8b1316b33d122415466a91cfb7fd0d4d0375
-MISC metadata.xml 208 RMD160 c18611400760e42bdd001905be0a63c2e963bcea SHA1 595816105cac477cb85792a182e15888029118a1 SHA256 c4841c87f0c2b9b5e679a27dc72180be8d508fb3f5df0fbab2ec2c805c0a6d82
+AUX flyhard-0.42-Makefile.patch 923 SHA256 1f732ff258a984da89b2b58a89a26756e770e153abffe8fd4cafb1591f8fc5f3 SHA512 1949a7970ac31110fc743a849cf7fb47657eca37d0c1d019a573de6aef4d81de06ca53ea3b368ae81af73086606a14f9e30d77b96295bd125a9b97f2c5f6d00f WHIRLPOOL f168c17a573e740840ae0f29c3881edfdffc7f4bb56e96f7fce7d7923bef95ea579a434ffe2172b6e149b96a823677609532846fee73d83f850a3eb035096fbb
+DIST flyhard-0.42.tar.gz 386262 SHA256 fac46cce25462a9b7d67a7c14bf06cea14ece61b760fa93a99ca31e926dd21e3 SHA512 596772486d9f196ba01f438088ca2b33710593b32ea3e1da5b214c62149a2428afe063d8bcb3d1a40472866171ef230e2958192c840f86d84ee2ccf34fdf646a WHIRLPOOL efb03369e19c765f5eb669ad24590fdbd48e7c2b356db4b9132153cc434a76bb03eee368882f3117bc022c8097916247a79bb0e6d96e80b8cbaa226551afd417
+EBUILD flyhard-0.42.ebuild 732 SHA256 4cb2336f805bba44e0e0c4aa6f18092e7b97ab9f0c53906182a1b4e055586ee2 SHA512 301ee1f73435f54d2a8f0074014e01add571ac4732f2669861edaaf35da4abe76210a6729625e565221c1f59958e7713c2f1f18b79dda68dccb8adeeb8e49a72 WHIRLPOOL d8b4f611973268f281cd877d0221d829524c443c2cca6a9ec377d3ade310de986d7113e26b21bce71a6e151a110e0aa8cabb18dba1d7471b59f1a2c3c521998a
+MISC ChangeLog 678 SHA256 12819226e487e7c681b59ed119e1b6dc8e28ab76e45828f1680ddd6f8c114f55 SHA512 b0ef4ac41a36f060dff2877a0faf6b7da5dd7aeba2fdd2f3e32046af1649b454be7e71cb64dbaf89280100aef2144cdec3cd7dcb1ab7b4520533c65c8b3585e3 WHIRLPOOL 98c8273c7c1a6cb6d5884cc9bf1c3a3fb3f50f7de50b2cf6d795d41f11e08d7bab4fecafb1fabaf9b4a75654c304f779548d0fca359ea75a55a0dce2b47058a5
+MISC metadata.xml 208 SHA256 c4841c87f0c2b9b5e679a27dc72180be8d508fb3f5df0fbab2ec2c805c0a6d82 SHA512 21d90d4547c76c80e50e134359dfbec42b158bbc16e4741738bdde5f67b7926d158dae1905948a477405b74e754ce4ed63cad910f220a709db8dfccf160e5288 WHIRLPOOL 33ec53f42c7a8c4c419989bd94e083c417574463e19c9c1322e6b96d0f5a6a52e3dd69fbedf2d11a7a77d24a93b81f3a604b6b33cac62548389537bf3e42df0e
diff --git a/games-arcade/flyhard/files/flyhard-0.42-Makefile.patch b/games-arcade/flyhard/files/flyhard-0.42-Makefile.patch
new file mode 100644
index 000000000..e6c509d35
--- /dev/null
+++ b/games-arcade/flyhard/files/flyhard-0.42-Makefile.patch
@@ -0,0 +1,25 @@
+Drop optimization flag
+Take care of DESTDIR
+--- src/Makefile.am.old	2012-08-18 02:42:52.506530215 +0200
++++ src/Makefile.am	2012-08-18 02:48:02.191538017 +0200
+@@ -10,7 +10,7 @@
+ #...it's where the hi-score file goes.
+ savedir = $(pkgdatadir)/save
+ 
+-AM_CPPFLAGS = -Wall -O3 -Wno-sign-compare \
++AM_CPPFLAGS = -Wall -Wno-sign-compare \
+ ## Having directories defined by automake is nice, but how is the program
+ ## expected to know about them?  This is the best I can come up with.
+               -DIMAGESDIR=\"$(pkgdatadir)/images\" -DSOUNDSDIR=\"$(pkgdatadir)/sounds\" \
+@@ -36,8 +36,8 @@
+ #since automake doesn't directly put anything in $(savedir), it may not exist
+ install-data-hook:
+ 	@echo "Creating blank hi-score file"
+-	mkdir -p $(savedir)
+-	touch $(savedir)/scores
+-	chmod a+rw $(savedir)/scores
++	install -d $(DESTDIR)$(savedir)
++	touch $(DESTDIR)$(savedir)/scores
++	chmod a+rw $(DESTDIR)$(savedir)/scores
+ 
+ 
diff --git a/games-arcade/flyhard/flyhard-0.41.ebuild b/games-arcade/flyhard/flyhard-0.41.ebuild
deleted file mode 100644
index e34a6191f..000000000
--- a/games-arcade/flyhard/flyhard-0.41.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit games
-
-DESCRIPTION="A game resembling Thrust, but with lots of shooting and puzzles"
-HOMEPAGE="http://www.markboyd.me.uk/games/flyhard/flyhard.html"
-SRC_URI="http://www.markboyd.me.uk/games/flyhard/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/libpng
-	media-libs/libsdl
-	media-libs/sdl-mixer"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS README NEWS TODO ChangeLog
-	prepgamesdirs
-}
diff --git a/games-arcade/flyhard/flyhard-0.42.ebuild b/games-arcade/flyhard/flyhard-0.42.ebuild
new file mode 100644
index 000000000..879ffea74
--- /dev/null
+++ b/games-arcade/flyhard/flyhard-0.42.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+inherit eutils autotools games
+
+DESCRIPTION="A game resembling Thrust, but with lots of shooting and puzzles"
+HOMEPAGE="http://www.markboyd.me.uk/games/flyhard/flyhard.html" # returns 404
+SRC_URI="http://mirror.amdmi3.ru/distfiles/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="media-libs/libpng:0
+	media-libs/libsdl[audio]
+	media-libs/sdl-mixer[wav]"
+DEPEND="${RDEPEND}
+	dev-libs/boost"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-Makefile.patch"
+	# Needed for automake-1.13
+	mv configure.in configure.ac || die
+	eautoreconf
+}
+
+src_install() {
+	default
+	prepgamesdirs
+}