Bump to new snapshot, as requested by Torsten Kaiser in bug #333011. Port to EAPI=3.

(Portage version: 2.1.9.49/cvs/Linux x86_64)

4 files changed, 93 insertions, 2 deletions

diff --git a/games-arcade/opentyrian/ChangeLog b/games-arcade/opentyrian/ChangeLog
index 403210752b67..28ea5f7245a3 100644
--- a/games-arcade/opentyrian/ChangeLog
+++ b/games-arcade/opentyrian/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for games-arcade/opentyrian
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/opentyrian/ChangeLog,v 1.8 2010/06/22 18:52:36 arfrever Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/opentyrian/ChangeLog,v 1.9 2011/05/17 12:50:57 chainsaw Exp $
+
+*opentyrian-20110517 (17 May 2011)
+
+  17 May 2011; Tony Vroon <chainsaw@gentoo.org>
+  +files/20110517-cflag-idiocy.diff, +files/20110517-datapath.diff,
+  +opentyrian-20110517.ebuild:
+  Bump to new snapshot, as requested by Torsten Kaiser in bug #333011. Port to
+  EAPI=3.
 
   22 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   opentyrian-20090702.ebuild:
diff --git a/games-arcade/opentyrian/files/20110517-cflag-idiocy.diff b/games-arcade/opentyrian/files/20110517-cflag-idiocy.diff
new file mode 100644
index 000000000000..fbc178ad3418
--- /dev/null
+++ b/games-arcade/opentyrian/files/20110517-cflag-idiocy.diff
@@ -0,0 +1,15 @@
+diff -uNr opentyrian.ORIG//Makefile opentyrian/Makefile
+--- opentyrian.ORIG//Makefile	2011-05-17 11:26:17.030004857 +0100
++++ opentyrian/Makefile	2011-05-17 11:28:48.617004931 +0100
+@@ -18,11 +18,6 @@
+ 
+ # FLAGS ####################################################
+ 
+-ifneq ($(MAKECMDGOALS), release)
+-    EXTRA_CFLAGS += -g3 -O0 -Werror
+-else
+-    EXTRA_CFLAGS += -g0 -O2 -DNDEBUG
+-endif
+ EXTRA_CFLAGS += -MMD -pedantic -Wall -Wextra -Wno-missing-field-initializers
+ 
+ HG_REV := $(shell hg id -ib && touch src/hg_revision.h)
diff --git a/games-arcade/opentyrian/files/20110517-datapath.diff b/games-arcade/opentyrian/files/20110517-datapath.diff
new file mode 100644
index 000000000000..6d7f52cd6bd6
--- /dev/null
+++ b/games-arcade/opentyrian/files/20110517-datapath.diff
@@ -0,0 +1,26 @@
+diff -uNr opentyrian.ORIG//Makefile opentyrian/Makefile
+--- opentyrian.ORIG//Makefile	2011-05-17 11:26:17.030004857 +0100
++++ opentyrian/Makefile	2011-05-17 11:26:52.595004876 +0100
+@@ -39,6 +39,10 @@
+ ALL_LDFLAGS += $(LDFLAGS)
+ LDLIBS += $(EXTRA_LDLIBS) $(SDL_LDLIBS)
+ 
++ifneq ($(DATA_PATH), )
++	CFLAGS += -DDATA_PATH=\"$(DATA_PATH)\"
++endif
++
+ # RULES ####################################################
+ 
+ .PHONY : all release clean
+diff -uNr opentyrian.ORIG//src/file.c opentyrian/src/file.c
+--- opentyrian.ORIG//src/file.c	2011-05-17 11:26:17.020004860 +0100
++++ opentyrian/src/file.c	2011-05-17 11:26:52.595004876 +0100
+@@ -34,7 +34,7 @@
+ #ifdef TARGET_MACOSX
+ 		tyrian_game_folder(),
+ #endif
+-		"/usr/share/opentyrian/data"
++		DATA_PATH
+ 	};
+ 	
+ 	static const char *dir = NULL;
diff --git a/games-arcade/opentyrian/opentyrian-20110517.ebuild b/games-arcade/opentyrian/opentyrian-20110517.ebuild
new file mode 100644
index 000000000000..e4c7697d0752
--- /dev/null
+++ b/games-arcade/opentyrian/opentyrian-20110517.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/opentyrian/opentyrian-20110517.ebuild,v 1.1 2011/05/17 12:50:57 chainsaw Exp $
+
+inherit base games
+
+DESCRIPTION="Open-source port of the DOS game Tyrian, vertical scrolling shooter"
+HOMEPAGE="http://code.google.com/p/opentyrian/"
+SRC_URI="http://darklomax.org/tyrian/tyrian21.zip
+	 mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+S="${WORKDIR}/${PN}"
+
+RDEPEND="media-libs/libsdl
+	media-libs/sdl-net"
+# Yes, mercurial is needed to set the build version stamp.
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	dev-vcs/mercurial"
+PATCHES=(
+	"${FILESDIR}/${PV}-datapath.diff"
+	"${FILESDIR}/${PV}-cflag-idiocy.diff"
+)
+
+src_compile() {
+	emake DATA_PATH="${GAMES_DATADIR}/${PN}" || die "Compilation failed"
+}
+
+src_install() {
+	newgamesbin opentyrian tyrian || die "Failed to install game binary"
+	dodoc CREDITS NEWS README || die "Failed to install documentation"
+	domenu linux/opentyrian.desktop || die "Failed to install desktop file"
+	doicon linux/icons/* || die "Failed to install program icons"
+	insinto "${GAMES_DATADIR}/${PN}"
+	cd "${WORKDIR}/tyrian21"
+	doins * || die "Failed to install game data"
+	prepgamesdirs
+}