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

2021-09-14 Thread Ionen Wolkens 
commit: 851b2c3c1af187d6b3621dacb7fa0fcf54e3c780
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed Sep 15 02:22:36 2021 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Sep 15 02:42:00 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=851b2c3c

games-action/spacearyarya-kxl: EAPI6->8, use gamestat, add font dep

Removed paths patch that was mostly for /usr/games, and instead
require use install-data target and remove .score (replaced by
a score file in /var/games that can now be written to).

Add media-fonts/font-bitstream-100dpi as it'd crash (later) without.

Also fix .desktop icon, bmp is not valid for XDG icons.

This brings the ebuild/patch layout more identical to geki2/3
given this game is actually geki4.

Signed-off-by: Ionen Wolkens  gentoo.org>

 games-action/spacearyarya-kxl/Manifest |  1 +
 ...s.patch => spacearyarya-kxl-1.0.2-cflags.patch} | 10 ++-
 .../files/spacearyarya-kxl-1.0.2-clang.patch   | 22 +--
 .../spacearyarya-kxl-1.0.2-gentoo-paths.patch  | 74 --
 .../spacearyarya-kxl-1.0.2-r2.ebuild   | 43 -
 .../spacearyarya-kxl-1.0.2-r3.ebuild   | 56 
 6 files changed, 76 insertions(+), 130 deletions(-)

diff --git a/games-action/spacearyarya-kxl/Manifest 
b/games-action/spacearyarya-kxl/Manifest
index 8ad31c7ac1a..7486f9d6158 100644
--- a/games-action/spacearyarya-kxl/Manifest
+++ b/games-action/spacearyarya-kxl/Manifest
@@ -1 +1,2 @@
 DIST SpaceAryarya-KXL-1.0.2.tar.gz 279894 BLAKE2B 
1e7d24107d21396d4463924c7e5665271c14c6ba84f600f126128195ac9d6a08bd112cb6730b1931cf113700d7cae18367359639c8c8a10073a2395bcdc87948
 SHA512 
1109606741bab6c290395cdfd8d19cf12e68cfef41f50164586c316fc425a32232e0f8dd822207d969c27c3f7a8478d1a65f36fe5468f3cfa8932c99ab3cb125
+DIST spacearyarya-kxl.png 4853 BLAKE2B 
e8dcaf2e75f18900d67c68f75939ba030dc8207d4a2df1b465ce516527d846c4b44d105f85afcb0750dbfc6b33c9030da34c863b6e8f09f120d855d7361cce67
 SHA512 
f47c497f28c4cb22a518c8bc593a443aa0f52a600db04b6a3d33006b40aa57c11bdedd97a272587d6751bee04a593965c4f348ad5e7dff4deb276b7d89243e2e

diff --git 
a/games-action/spacearyarya-kxl/files/spacearyarya-kxl-1.0.2-flags.patch 
b/games-action/spacearyarya-kxl/files/spacearyarya-kxl-1.0.2-cflags.patch
similarity index 50%
rename from 
games-action/spacearyarya-kxl/files/spacearyarya-kxl-1.0.2-flags.patch
rename to 
games-action/spacearyarya-kxl/files/spacearyarya-kxl-1.0.2-cflags.patch
index 2239858be99..66cd0b7fe1b 100644
--- a/games-action/spacearyarya-kxl/files/spacearyarya-kxl-1.0.2-flags.patch
+++ b/games-action/spacearyarya-kxl/files/spacearyarya-kxl-1.0.2-cflags.patch
@@ -1,11 +1,9 @@
-respect CFLAGS
-
+https://bugs.gentoo.org/429422
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -5,5 +5,5 @@ spacearyarya_SOURCES = extern.h \
-your.c your.h ranking.c ranking.h \
-boss.c boss.h
-
+@@ -6,4 +6,4 @@
+   boss.c boss.h
+ 
 -CFLAGS = @X_CFLAGS@ @KXL_CFLAGS@
 +AM_CFLAGS = @X_CFLAGS@ @KXL_CFLAGS@
  LIBS = @X_LIBS@ -lX11 @KXL_LIBS@ -lKXL

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
index 3b9b68b745c..7115b4a2382 100644
--- 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
@@ -1,11 +1,19 @@
 a/src/ranking.c.bak2016-07-27 16:42:34.367945713 -0500
-+++ b/src/ranking.c2016-07-27 16:43:34.679949783 -0500
-@@ -5,7 +5,7 @@
- /**
-   孥�
+Use void so that clang does not complain about missing (unused)
+return value, and also add missing string.h.
+--- a/src/ranking.c
 b/src/ranking.c
+@@ -1,2 +1,3 @@
+ #include 
++#include 
+ #include "geki4.h"
+@@ -7,3 +8,3 @@
   **/
 -int ScoreRanking(void)
 +void ScoreRanking(void)
  {
-   Uint16 i, j, k;
-   struct passwd *pw;
+--- a/src/ranking.h
 b/src/ranking.h
+@@ -3,2 +3,3 @@
+ 
++void ScoreRanking(void);
+ void RankingScore(void);

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
deleted file mode 100644
index 81321b76857..000
--- 
a/games-action/spacearyarya-kxl/files/spacearyarya-kxl-1.0.2-gentoo-paths.patch
+++ /dev/null
@@ -1,74 +0,0 @@
 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\
 a/configure.in
-+++ b/configure.in
-@@ -25,17 +25,20 @@
- BMP_PATH=/usr/local/share/SpaceAryarya/bmp
- WAV_PATH=/usr/local/share/SpaceAryarya/wav
- else
--DATA_PATH=$prefix/share/SpaceAryarya/data

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

2018-08-15 Thread Michał Górny 
commit: 5cb505e19be826120ace6a75db79ce19955a2813
Author: Marty E. Plummer  startmail  com>
AuthorDate: Thu Aug  2 23:03:18 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Aug 15 10:33:03 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cb505e1

games-action/spacearyarya-kxl: eutils->desktop

Only has eutils for the implicit desktop inheritance for
make_desktop_entry and newicon.

Package-Manager: Portage-2.3.44, Repoman-2.3.10

 games-action/spacearyarya-kxl/spacearyarya-kxl-1.0.2-r2.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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
index 2396a9a92a1..5e97b2431a5 100644
--- a/games-action/spacearyarya-kxl/spacearyarya-kxl-1.0.2-r2.ebuild
+++ b/games-action/spacearyarya-kxl/spacearyarya-kxl-1.0.2-r2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools eutils
+
+inherit autotools desktop
 
 MY_P=SpaceAryarya-KXL-${PV}
 DESCRIPTION="A 2D/3D shooting game"

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

2016-07-27 Thread Austin English 
commit: 44d3fdedf738b6475cf6d17e7378f75d3cb3f240
Author: Austin English  gentoo  org>
AuthorDate: Wed Jul 27 21:46:20 2016 +
Commit: Austin English  gentoo  org>
CommitDate: Wed Jul 27 21:46:35 2016 +
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 000..3b9b68b
--- /dev/null
+++ b/games-action/spacearyarya-kxl/files/spacearyarya-kxl-1.0.2-clang.patch
@@ -0,0 +1,11 @@
+--- a/src/ranking.c.bak2016-07-27 16:42:34.367945713 -0500
 b/src/ranking.c2016-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 000..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
+}

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

2015-12-18 Thread Michael Sterrett 
commit: 27bc5935fa69c5e90478bca037d6bea68c92535c
Author: Michael Sterrett  gentoo  org>
AuthorDate: Fri Dec 18 09:20:47 2015 +
Commit: Michael Sterrett  gentoo  org>
CommitDate: Fri Dec 18 09:20:47 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27bc5935

EAPI=5

Package-Manager: portage-2.2.24

 games-action/spacearyarya-kxl/spacearyarya-kxl-1.0.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-action/spacearyarya-kxl/spacearyarya-kxl-1.0.2-r1.ebuild 
b/games-action/spacearyarya-kxl/spacearyarya-kxl-1.0.2-r1.ebuild
index c1ee6b5..812bb2a 100644
--- a/games-action/spacearyarya-kxl/spacearyarya-kxl-1.0.2-r1.ebuild
+++ b/games-action/spacearyarya-kxl/spacearyarya-kxl-1.0.2-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=4
+EAPI=5
 inherit autotools eutils games
 
 MY_P=SpaceAryarya-KXL-${PV}