[gentoo-commits] repo/gentoo:master commit in: games-action/geki2-KXL/files/, games-action/geki2-KXL/

2022-11-04 Thread Ionen Wolkens 
commit: 45a08073b16549f3514937634d28fef811e6578c
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri Nov  4 22:57:31 2022 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat Nov  5 02:00:29 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45a08073

games-action/geki2-KXL: fix build w/ upcoming clang16

Also adjust old patch since moved string.h to geki2.h.

Essentially same fixes as geki3-KXL except with two
missing function declarations in less.

Closes: https://bugs.gentoo.org/874639
Signed-off-by: Ionen Wolkens  gentoo.org>

 games-action/geki2-KXL/files/geki2-KXL-2.0.3-clang.patch   |  8 +---
 games-action/geki2-KXL/files/geki2-KXL-2.0.3-clang16.patch | 14 ++
 ...geki2-KXL-2.0.3-r4.ebuild => geki2-KXL-2.0.3-r5.ebuild} |  3 ++-
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/games-action/geki2-KXL/files/geki2-KXL-2.0.3-clang.patch 
b/games-action/geki2-KXL/files/geki2-KXL-2.0.3-clang.patch
index 5d621e2de638..ff7f45fc09f3 100644
--- a/games-action/geki2-KXL/files/geki2-KXL-2.0.3-clang.patch
+++ b/games-action/geki2-KXL/files/geki2-KXL-2.0.3-clang.patch
@@ -1,13 +1,7 @@
-Use void so that clang does not complain about missing (unused)
-return value, and also add missing string.h.
 https://bugs.gentoo.org/730848
 --- a/src/ranking.c
 +++ b/src/ranking.c
-@@ -1,2 +1,3 @@
- #include 
-+#include 
- #include "geki2.h"
-@@ -7,3 +8,3 @@
+@@ -7,3 +7,3 @@
   **/
 -int ScoreRanking(void)
 +void ScoreRanking(void)

diff --git a/games-action/geki2-KXL/files/geki2-KXL-2.0.3-clang16.patch 
b/games-action/geki2-KXL/files/geki2-KXL-2.0.3-clang16.patch
new file mode 100644
index ..fb7892f3b68d
--- /dev/null
+++ b/games-action/geki2-KXL/files/geki2-KXL-2.0.3-clang16.patch
@@ -0,0 +1,14 @@
+https://bugs.gentoo.org/874639
+--- a/src/geki2.h
 b/src/geki2.h
+@@ -11,2 +11,4 @@
+ #include 
++#include 
++#include 
+ #include 
+--- a/src/load.h
 b/src/load.h
+@@ -11,2 +11,3 @@
+ void LoadStageData(void);
++void UnLoadStageData(void);
+ 

diff --git a/games-action/geki2-KXL/geki2-KXL-2.0.3-r4.ebuild 
b/games-action/geki2-KXL/geki2-KXL-2.0.3-r5.ebuild
similarity index 93%
rename from games-action/geki2-KXL/geki2-KXL-2.0.3-r4.ebuild
rename to games-action/geki2-KXL/geki2-KXL-2.0.3-r5.ebuild
index 781b3790bff7..8f7fda9fe303 100644
--- a/games-action/geki2-KXL/geki2-KXL-2.0.3-r4.ebuild
+++ b/games-action/geki2-KXL/geki2-KXL-2.0.3-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -26,6 +26,7 @@ RDEPEND="
 PATCHES=(
"${FILESDIR}"/${P}-cflags.patch
"${FILESDIR}"/${P}-clang.patch
+   "${FILESDIR}"/${P}-clang16.patch
 )
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: games-action/geki2-KXL/files/, games-action/geki2-KXL/

2021-09-14 Thread Ionen Wolkens 
commit: eac91b797c30a05d5e13e1a6c1687ae5bd4b06c8
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Sep 14 21:09:34 2021 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Sep 15 02:40:36 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eac91b79

games-action/geki2-KXL: EAPI6->8, fix clang/fonts, cleanup patches

Removed paths patch that was mostly for /usr/games, and instead
require a smaller workaround to install-data and remove .score.

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

Closes: https://bugs.gentoo.org/730848
Signed-off-by: Ionen Wolkens  gentoo.org>

 .../geki2-KXL/files/geki2-KXL-2.0.3-cflags.patch   |  5 +-
 .../geki2-KXL/files/geki2-KXL-2.0.3-clang.patch| 20 
 .../geki2-KXL/files/geki2-KXL-2.0.3-paths.patch| 44 --
 games-action/geki2-KXL/geki2-KXL-2.0.3-r3.ebuild   | 49 
 games-action/geki2-KXL/geki2-KXL-2.0.3-r4.ebuild   | 53 ++
 5 files changed, 76 insertions(+), 95 deletions(-)

diff --git a/games-action/geki2-KXL/files/geki2-KXL-2.0.3-cflags.patch 
b/games-action/geki2-KXL/files/geki2-KXL-2.0.3-cflags.patch
index d00f8d439c8..e5e04cad6e7 100644
--- a/games-action/geki2-KXL/files/geki2-KXL-2.0.3-cflags.patch
+++ b/games-action/geki2-KXL/files/geki2-KXL-2.0.3-cflags.patch
@@ -1,5 +1,6 @@
 a/src/Makefile.am  2012-11-10 21:50:02.159117541 +0100
-+++ b/src/Makefile.am  2012-11-10 21:50:20.658715770 +0100
+https://bugs.gentoo.org/437992
+--- a/src/Makefile.am
 b/src/Makefile.am
 @@ -4,5 +4,5 @@
boss.h extern.h ranking.h your.h game.h\
geki2.h load.h opening.h my.h misc.h

diff --git a/games-action/geki2-KXL/files/geki2-KXL-2.0.3-clang.patch 
b/games-action/geki2-KXL/files/geki2-KXL-2.0.3-clang.patch
new file mode 100644
index 000..5d621e2de63
--- /dev/null
+++ b/games-action/geki2-KXL/files/geki2-KXL-2.0.3-clang.patch
@@ -0,0 +1,20 @@
+Use void so that clang does not complain about missing (unused)
+return value, and also add missing string.h.
+https://bugs.gentoo.org/730848
+--- a/src/ranking.c
 b/src/ranking.c
+@@ -1,2 +1,3 @@
+ #include 
++#include 
+ #include "geki2.h"
+@@ -7,3 +8,3 @@
+  **/
+-int ScoreRanking(void)
++void ScoreRanking(void)
+ {
+--- a/src/ranking.h
 b/src/ranking.h
+@@ -3,2 +3,3 @@
+ 
++void ScoreRanking(void);
+ void RankingScore(void);

diff --git a/games-action/geki2-KXL/files/geki2-KXL-2.0.3-paths.patch 
b/games-action/geki2-KXL/files/geki2-KXL-2.0.3-paths.patch
deleted file mode 100644
index 22844202bb2..000
--- a/games-action/geki2-KXL/files/geki2-KXL-2.0.3-paths.patch
+++ /dev/null
@@ -1,44 +0,0 @@
 a/bmp/Makefile.am
-+++ b/bmp/Makefile.am
-@@ -1,4 +1,4 @@
--bmpdir = $(prefix)/share/geki2/bmp
-+bmpdir = $(BMP_PATH)
- bmp_DATA =   back1.bmp boss2.bmp enemyshot4.bmp kuru.bmp myshot.bmp back2.bmp\
-boss3.bmp enemyshot5.bmp mboss.bmp uraura.bmp back3.bmp\
-boss3laser.bmp flash.bmp uturn.bmp back4.bmp back6.bmp boss6.bmp\
 a/configure.in
-+++ b/configure.in
-@@ -25,9 +25,9 @@
- BMP_PATH=/usr/local/share/geki2/bmp
- WAV_PATH=/usr/local/share/geki2/wav
- else
--DATA_PATH=$prefix/share/geki2/data
--BMP_PATH=$prefix/share/geki2/bmp
--WAV_PATH=$prefix/share/geki2/wav
-+DATA_PATH=$datadir/geki2/data
-+BMP_PATH=$datadir/geki2/bmp
-+WAV_PATH=$datadir/geki2/wav
- fi
- AC_DEFINE_UNQUOTED(DATA_PATH,"$DATA_PATH")
- AC_DEFINE_UNQUOTED(BMP_PATH,"$BMP_PATH")
 a/data/Makefile.am
-+++ b/data/Makefile.am
-@@ -1,9 +1,7 @@
--datadir = $(prefix)/share/geki2/data
-+datadir = $(DATA_PATH)
- data_DATA = stage1.dat stage2.dat stage3.dat stage4.dat stage5.dat stage6.dat\
-   map1.dat map2.dat map3.dat map4.dat map5.dat map6.dat
- EXTRA_DIST = stage1.dat stage2.dat stage3.dat stage4.dat stage5.dat 
stage6.dat\
-   map1.dat map2.dat map3.dat map4.dat map5.dat map6.dat .score
- 
--install:
--  $(INSTALL) -c -m 666 ./.score $(DESTDIR)$(DATA_PATH)
- 
 a/wav/Makefile.am
-+++ b/wav/Makefile.am
-@@ -1,4 +1,4 @@
--wavdir = $(prefix)/share/geki2/wav
-+wavdir = $(WAV_PATH)
- wav_DATA =   bgm1.wav bgm2.wav bgm3.wav bgm4.wav bgm5.wav\
-bomb.wav laser5.wav warning.wav boss.wav open.wav\
-laser.wav pow.wav go.wav bgm6.wav

diff --git a/games-action/geki2-KXL/geki2-KXL-2.0.3-r3.ebuild 
b/games-action/geki2-KXL/geki2-KXL-2.0.3-r3.ebuild
deleted file mode 100644
index c6ee48cce75..000
--- a/games-action/geki2-KXL/geki2-KXL-2.0.3-r3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools desktop
-
-DESCRIPTION="2D length scroll shooting game"
-HOMEPAGE="http://triring.net/ps2linux/games/kxl/kxlgames.html;
-SRC_URI="mirror://gentoo/${P}.tar.gz
-   mirror://gentoo/${PN}.png"
-
-LICENSE="GPL-2"
-SLOT="0"

[gentoo-commits] repo/gentoo:master commit in: games-action/geki2-KXL/

2019-07-17 Thread James Le Cuirot 
commit: b91406bbf46d932b774b4fbec25efb4cf4e9862c
Author: Ulrich Müller  gentoo  org>
AuthorDate: Mon Jul  8 08:30:56 2019 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Wed Jul 17 20:03:27 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b91406bb

games-action/geki2-KXL: Depend on acct-group/gamestat.

Package-Manager: Portage-2.3.68, Repoman-2.3.16
Signed-off-by: Ulrich Müller  gentoo.org>
Signed-off-by: James Le Cuirot  gentoo.org>

 games-action/geki2-KXL/geki2-KXL-2.0.3-r3.ebuild | 11 ---
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/games-action/geki2-KXL/geki2-KXL-2.0.3-r3.ebuild 
b/games-action/geki2-KXL/geki2-KXL-2.0.3-r3.ebuild
index 9512cd8bffc..c6ee48cce75 100644
--- a/games-action/geki2-KXL/geki2-KXL-2.0.3-r3.ebuild
+++ b/games-action/geki2-KXL/geki2-KXL-2.0.3-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit autotools desktop user
+inherit autotools desktop
 
 DESCRIPTION="2D length scroll shooting game"
 HOMEPAGE="http://triring.net/ps2linux/games/kxl/kxlgames.html;
@@ -15,7 +15,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="dev-games/KXL"
+DEPEND="acct-group/gamestat
+   dev-games/KXL"
 RDEPEND="${DEPEND}
media-fonts/font-adobe-100dpi"
 
@@ -24,10 +25,6 @@ PATCHES=(
"${FILESDIR}"/${P}-paths.patch
 )
 
-pkg_setup(){
-   enewgroup gamestat 36
-}
-
 src_prepare() {
default
rm -f missing

[gentoo-commits] repo/gentoo:master commit in: games-action/geki2-KXL/

2018-08-15 Thread Michał Górny 
commit: 711ae1fa62fcd2943dd2f48c71f257a8b556b29f
Author: Marty E. Plummer  startmail  com>
AuthorDate: Wed Aug  1 10:52:50 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Aug 15 10:32:58 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=711ae1fa

games-action/geki2-KXL: eutils->desktop

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

Package-Manager: Portage-2.3.44, Repoman-2.3.10

 games-action/geki2-KXL/geki2-KXL-2.0.3-r3.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/games-action/geki2-KXL/geki2-KXL-2.0.3-r3.ebuild 
b/games-action/geki2-KXL/geki2-KXL-2.0.3-r3.ebuild
index fe44b06c04b..9512cd8bffc 100644
--- a/games-action/geki2-KXL/geki2-KXL-2.0.3-r3.ebuild
+++ b/games-action/geki2-KXL/geki2-KXL-2.0.3-r3.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 user
+
+inherit autotools desktop user
 
 DESCRIPTION="2D length scroll shooting game"
 HOMEPAGE="http://triring.net/ps2linux/games/kxl/kxlgames.html;

[gentoo-commits] repo/gentoo:master commit in: games-action/geki2-KXL/, games-action/geki2-KXL/files/

2016-07-06 Thread Austin English 
commit: d9c72abe1fe26d9834172dcd1a04aa64be11f8c6
Author: Austin English  gentoo  org>
AuthorDate: Wed Jul  6 19:24:09 2016 +
Commit: Austin English  gentoo  org>
CommitDate: Wed Jul  6 19:45:40 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9c72abe

games-action/geki2-KXL: remove deprecated games eclass

Also update to EAPI 6

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

Package-Manager: portage-2.2.28

 .../geki2-KXL/files/geki2-KXL-2.0.3-cflags.patch   |  4 +-
 .../geki2-KXL/files/geki2-KXL-2.0.3-paths.patch| 16 +++
 games-action/geki2-KXL/geki2-KXL-2.0.3-r3.ebuild   | 52 ++
 3 files changed, 62 insertions(+), 10 deletions(-)

diff --git a/games-action/geki2-KXL/files/geki2-KXL-2.0.3-cflags.patch 
b/games-action/geki2-KXL/files/geki2-KXL-2.0.3-cflags.patch
index 9812e6d..d00f8d4 100644
--- a/games-action/geki2-KXL/files/geki2-KXL-2.0.3-cflags.patch
+++ b/games-action/geki2-KXL/files/geki2-KXL-2.0.3-cflags.patch
@@ -1,5 +1,5 @@
 src/Makefile.am.old2012-11-10 21:50:02.159117541 +0100
-+++ src/Makefile.am2012-11-10 21:50:20.658715770 +0100
+--- a/src/Makefile.am  2012-11-10 21:50:02.159117541 +0100
 b/src/Makefile.am  2012-11-10 21:50:20.658715770 +0100
 @@ -4,5 +4,5 @@
boss.h extern.h ranking.h your.h game.h\
geki2.h load.h opening.h my.h misc.h

diff --git a/games-action/geki2-KXL/files/geki2-KXL-2.0.3-paths.patch 
b/games-action/geki2-KXL/files/geki2-KXL-2.0.3-paths.patch
index 1e4d7db..2284420 100644
--- a/games-action/geki2-KXL/files/geki2-KXL-2.0.3-paths.patch
+++ b/games-action/geki2-KXL/files/geki2-KXL-2.0.3-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/geki2/bmp
 +bmpdir = $(BMP_PATH)
  bmp_DATA =   back1.bmp boss2.bmp enemyshot4.bmp kuru.bmp myshot.bmp back2.bmp\
 boss3.bmp enemyshot5.bmp mboss.bmp uraura.bmp back3.bmp\
 boss3laser.bmp flash.bmp uturn.bmp back4.bmp back6.bmp boss6.bmp\
 configure.in
-+++ configure.in
+--- a/configure.in
 b/configure.in
 @@ -25,9 +25,9 @@
  BMP_PATH=/usr/local/share/geki2/bmp
  WAV_PATH=/usr/local/share/geki2/wav
@@ -21,8 +21,8 @@
  fi
  AC_DEFINE_UNQUOTED(DATA_PATH,"$DATA_PATH")
  AC_DEFINE_UNQUOTED(BMP_PATH,"$BMP_PATH")
 data/Makefile.am
-+++ data/Makefile.am
+--- a/data/Makefile.am
 b/data/Makefile.am
 @@ -1,9 +1,7 @@
 -datadir = $(prefix)/share/geki2/data
 +datadir = $(DATA_PATH)
@@ -34,8 +34,8 @@
 -install:
 -  $(INSTALL) -c -m 666 ./.score $(DESTDIR)$(DATA_PATH)
  
 wav/Makefile.am
-+++ wav/Makefile.am
+--- a/wav/Makefile.am
 b/wav/Makefile.am
 @@ -1,4 +1,4 @@
 -wavdir = $(prefix)/share/geki2/wav
 +wavdir = $(WAV_PATH)

diff --git a/games-action/geki2-KXL/geki2-KXL-2.0.3-r3.ebuild 
b/games-action/geki2-KXL/geki2-KXL-2.0.3-r3.ebuild
new file mode 100644
index 000..613ab63
--- /dev/null
+++ b/games-action/geki2-KXL/geki2-KXL-2.0.3-r3.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit autotools eutils user
+
+DESCRIPTION="2D length scroll shooting game"
+HOMEPAGE="http://triring.net/ps2linux/games/kxl/kxlgames.html;
+SRC_URI="mirror://gentoo/${P}.tar.gz
+   mirror://gentoo/${PN}.png"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-games/KXL"
+RDEPEND="${DEPEND}
+   media-fonts/font-adobe-100dpi"
+
+PATCHES=(
+   "${FILESDIR}"/${P}-cflags.patch
+   "${FILESDIR}"/${P}-paths.patch
+)
+
+pkg_setup(){
+   enewgroup gamestat 36
+}
+
+src_prepare() {
+   default
+   rm -f missing
+   sed -i \
+   -e '1i #include ' \
+   -e "s:DATA_PATH \"/.score\":\"/var/games/${PN}\":" \
+   src/ranking.c || die
+   eautoreconf
+}
+
+src_install() {
+   default
+
+   insinto /var/games/
+   newins data/.score ${PN}
+   fowners root:gamestat /var/games/${PN} /usr/bin/geki2
+   fperms 660 /var/games/${PN}
+   fperms 2755 /usr/bin/geki2
+
+   doicon "${DISTDIR}"/${PN}.png
+   make_desktop_entry geki2 Geki2
+}