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

Package-Manager: portage-2.1.9.49/cvs/Linux x86_64

5 files changed, 108 insertions, 3 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/Manifest b/games-arcade/opentyrian/Manifest
index d9c0f39381ce..f853227bf9f1 100644
--- a/games-arcade/opentyrian/Manifest
+++ b/games-arcade/opentyrian/Manifest
@@ -1,10 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 20090702-datapath.diff 765 RMD160 17ba34b4cb0605148771f806cc8216363aa2d126 SHA1 20b57ea12df04d77c44a7c1b835421168f5d6a3c SHA256 60512dfc66d8531f37bbd80a03cddfaf55793b63a8352041246fd9949ae27a41
 AUX 20091025-cflag-idiocy.diff 435 RMD160 2a3da7ec5cc7449b1bcc7e028878d15021aecfe5 SHA1 b8ef229c71da040cd9036717243d91654bc3ba64 SHA256 6ab38e19bfd3fb441e7db843e9c93d949b5934ee9febd79e5a25f09e039bfa48
 AUX 20091025-datapath.diff 742 RMD160 45afd577dbdde7c0ef7e3871031258b44e6e0745 SHA1 0b57201bd549fe23d6df1acf8a2e70f0e21b4ba0 SHA256 4ca9ea400f217edcee962c385ae7677d8c7cf81878a83dbdf8f9a1b9a596e745
+AUX 20110517-cflag-idiocy.diff 526 RMD160 5d371ba2ca2557115f8704ba0535995232ee0b53 SHA1 d1cb4e0823769b5d718e82f12ddcd21727de7700 SHA256 a44ef237f8bd0617198fa3fea8aecaa5fbac4463996d64e9dda36d905c1ae6c6
+AUX 20110517-datapath.diff 786 RMD160 4f3152b9286d8d81b34b6b6e613b01643dd99567 SHA1 6a1690fcb97e153e457bc4f0eea2b587b58bf573 SHA256 1164251af4b49c75dbfc0eb5a05c8cceeacebbe696ce40714361fb55b03fb78a
 DIST opentyrian-20090702.tar.bz2 365480 RMD160 9389beb90fbc7f0ec6c53e71f73f11a820e5f394 SHA1 12663324846563c6635eae09772d72f370dc6ef6 SHA256 bbce2b50bc1b34cc833e0312518acfa885da336bbb82546754380c2179a59fb3
 DIST opentyrian-20091025.tar.bz2 2247053 RMD160 05157323f25df8c210dedd0f9f8c17f580302f3b SHA1 d4574da93a7297f62712a2178b4e237988055457 SHA256 68111eec3ce51a6896ef9bd896ccb4baeebad59d0d20901cbcb4584eb11ce1ba
+DIST opentyrian-20110517.tar.bz2 2580253 RMD160 4ac96512a5424bb6a1b979d6008d431d102f88c8 SHA1 e904ef7611a9275ff44ef4ed4f56483ac86712da SHA256 d34a0f6e43a3b12688a98f8a541b33578769f027eb7b3ee0fb147b7e1cd8438c
 DIST tyrian21.zip 4754048 RMD160 62d69ebcb98db8bae64f9bf9efc453d961e9efe2 SHA1 29827de99c92cdba7ac8d8b1307776c8f473cd44 SHA256 7790d09a2a3addcd33c66ef063d5900eb81cc9c342f4807eb8356364dd1d9277
 EBUILD opentyrian-20090702.ebuild 1328 RMD160 f68625e0c4d85cae6e5467f2a4530c3d036b080a SHA1 8f818b492af015b48e356c33f7097bc01136e7fa SHA256 0e8659ee3d75e41c04d80babf508872c2b035ba99aac697d88b965e928dd6afb
 EBUILD opentyrian-20091025.ebuild 1261 RMD160 c979cabb6376c9e645888c1d38b438db55df3b28 SHA1 6f6d3f5c4e0578dc18f3ce0c22da73c6564ee8c2 SHA256 817a8810c903878b33b53e27e5281f0938836fb61395ccc5d22b5aad55aa6799
-MISC ChangeLog 1940 RMD160 8cf022da7f588f7de4d9d0bc8c2e634300c3a363 SHA1 2f89f539050275ad0b30f3ecc53a41d91d234552 SHA256 9d637af88e40bb9481c28072b8b7df40d68dfb976b0a1e1967a3e67d87f6ae39
+EBUILD opentyrian-20110517.ebuild 1302 RMD160 0ffc1e0c2a02dff169095c513e4efa8c5c74c794 SHA1 599ef915880e1e66908de8a252bc022f09984857 SHA256 fde00a4685900f912da12c7446ffa60db100fbb6a57fc6a9644dc5fe49945335
+MISC ChangeLog 2213 RMD160 811c42914ba3ae6422987fe1ae83c53246030111 SHA1 4621d7aea68a47f148fd246a4f546f274d8a1585 SHA256 ff0905a911c6154b960b26f4051f1f733aa8087527c38f486fe222b9609163f4
 MISC metadata.xml 248 RMD160 b4db6b5c35ecb316653b3692c21c208e9e431a5f SHA1 f4ca5bd5587de4bb2546172472f9f997c8812778 SHA256 902e1ccbd26bbb00bb47d7901cf47ddb3126dc7b8a3cabcb930838d923bd68bc
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk3Sby4ACgkQp5vW4rUFj5psdgCfYDuNbEIrYFwDdTbNTkemU8MK
+wBYAnAnAlqdG6lTCu2vNtNW8FRvsBpDR
+=pr1D
+-----END PGP SIGNATURE-----
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
+}