[gentoo-commits] repo/gentoo:master commit in: games-action/spacearyarya-kxl/files/, games-action/spacearyarya-kxl/

[Austin English]

commit:     44d3fdedf738b6475cf6d17e7378f75d3cb3f240
Author:     Austin English <wizardedit <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 27 21:46:20 2016 +0000
Commit:     Austin English <wizardedit <AT> gentoo <DOT> org>
CommitDate: Wed Jul 27 21:46:35 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44d3fded

games-action/spacearyarya-kxl: remove deprecated games eclass

Also update to EAPI 6
Also fix building with Clang

Gentoo-Bug: https://bugs.gentoo.org/574082

Package-Manager: portage-2.3.0

 .../files/spacearyarya-kxl-1.0.2-clang.patch       | 11 ++++++
 .../spacearyarya-kxl-1.0.2-gentoo-paths.patch      | 20 +++++-----
 .../spacearyarya-kxl-1.0.2-r2.ebuild               | 43 ++++++++++++++++++++++
 3 files changed, 64 insertions(+), 10 deletions(-)

diff --git a/games-action/spacearyarya-kxl/files/spacearyarya-kxl-1.0.2-clang.patch b/games-action/spacearyarya-kxl/files/spacearyarya-kxl-1.0.2-clang.patch
new file mode 100644
index 0000000..3b9b68b
--- /dev/null
+++ b/games-action/spacearyarya-kxl/files/spacearyarya-kxl-1.0.2-clang.patch
@@ -0,0 +1,11 @@
+--- a/src/ranking.c.bak	2016-07-27 16:42:34.367945713 -0500
++++ b/src/ranking.c	2016-07-27 16:43:34.679949783 -0500
+@@ -5,7 +5,7 @@
+ /**********************
+   ¥¹¥³¥¢¥é¥ó¥­¥ó¥°
+  **********************/
+-int ScoreRanking(void)
++void ScoreRanking(void)
+ {
+   Uint16 i, j, k;
+   struct passwd *pw;

diff --git a/games-action/spacearyarya-kxl/files/spacearyarya-kxl-1.0.2-gentoo-paths.patch b/games-action/spacearyarya-kxl/files/spacearyarya-kxl-1.0.2-gentoo-paths.patch
index 197dae5..81321b7 100644
--- a/games-action/spacearyarya-kxl/files/spacearyarya-kxl-1.0.2-gentoo-paths.patch
+++ b/games-action/spacearyarya-kxl/files/spacearyarya-kxl-1.0.2-gentoo-paths.patch
@@ -1,13 +1,13 @@
---- bmp/Makefile.am
-+++ bmp/Makefile.am
+--- a/bmp/Makefile.am
++++ b/bmp/Makefile.am
 @@ -1,4 +1,4 @@
 -bmpdir = $(prefix)/share/SpaceAryarya/bmp
 +bmpdir = $(BMP_PATH)
  bmp_DATA =   my.bmp enemy1.bmp shot.bmp bomb.bmp\
  	     enemy2.bmp kage.bmp wall.bmp wall2.bmp eshot.bmp\
  	     boss1_b.bmp  boss1_do.bmp  boss1_f.bmp\
---- configure.in
-+++ configure.in
+--- a/configure.in
++++ b/configure.in
 @@ -25,17 +25,20 @@
          BMP_PATH=/usr/local/share/SpaceAryarya/bmp
          WAV_PATH=/usr/local/share/SpaceAryarya/wav
@@ -32,8 +32,8 @@
  
  AC_OUTPUT([data/Makefile wav/Makefile bmp/Makefile src/Makefile
  spacearyarya.spec Makefile])
---- data/Makefile.am
-+++ data/Makefile.am
+--- a/data/Makefile.am
++++ b/data/Makefile.am
 @@ -1,6 +1,7 @@
 -datadir = $(prefix)/share/SpaceAryarya/data
 +datadir = $(DATA_PATH)
@@ -45,8 +45,8 @@
 +install-data-local:
 +	$(mkinstalldirs) $(DESTDIR)$(SCORE_PATH)
 +	$(INSTALL) -m 660 .score $(DESTDIR)$(SCORE_PATH)
---- src/ranking.c
-+++ src/ranking.c
+--- a/src/ranking.c
++++ b/src/ranking.c
 @@ -36,7 +36,7 @@
    FILE *fp;
    Uint16 i;
@@ -65,8 +65,8 @@
      fprintf(fp, "%d\n", Root->HiScore);
      for (i = 0; i < 5; i ++)
        fprintf(fp, "%d %d %s\n",
---- wav/Makefile.am
-+++ wav/Makefile.am
+--- a/wav/Makefile.am
++++ b/wav/Makefile.am
 @@ -1,3 +1,3 @@
 -wavdir = $(prefix)/share/SpaceAryarya/wav
 +wavdir = $(WAV_PATH)

diff --git a/games-action/spacearyarya-kxl/spacearyarya-kxl-1.0.2-r2.ebuild b/games-action/spacearyarya-kxl/spacearyarya-kxl-1.0.2-r2.ebuild
new file mode 100644
index 0000000..2378c43
--- /dev/null
+++ b/games-action/spacearyarya-kxl/spacearyarya-kxl-1.0.2-r2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit autotools eutils
+
+MY_P=SpaceAryarya-KXL-${PV}
+DESCRIPTION="A 2D/3D shooting game"
+HOMEPAGE="http://triring.net/ps2linux/games/kxl/kxlgames.html"
+SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="dev-games/KXL"
+RDEPEND="${DEPEND}
+	media-fonts/font-adobe-100dpi
+	media-fonts/font-bitstream-100dpi"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo-paths.patch
+	"${FILESDIR}"/${P}-flags.patch
+	"${FILESDIR}"/${P}-clang.patch
+)
+
+src_prepare() {
+	default
+
+	mv configure.{in,ac}
+	rm aclocal.m4
+	eautoreconf
+}
+
+src_install() {
+	default
+	newicon bmp/enemy1.bmp ${PN}.bmp
+	make_desktop_entry spacearyarya SpaceAryarya /usr/share/pixmaps/${PN}.bmp
+}