From cc4618c9ba3d974948ebf340b542d8cb01db2f55 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 16 Sep 2021 22:05:01 +0100 Subject: gentoo resync : 16.09.2021 --- games-action/spacearyarya-kxl/Manifest | 10 +-- .../files/spacearyarya-kxl-1.0.2-cflags.patch | 9 +++ .../files/spacearyarya-kxl-1.0.2-clang.patch | 22 +++++-- .../files/spacearyarya-kxl-1.0.2-flags.patch | 11 ---- .../spacearyarya-kxl-1.0.2-gentoo-paths.patch | 74 ---------------------- games-action/spacearyarya-kxl/metadata.xml | 2 +- .../spacearyarya-kxl-1.0.2-r2.ebuild | 43 ------------- .../spacearyarya-kxl-1.0.2-r3.ebuild | 56 ++++++++++++++++ 8 files changed, 86 insertions(+), 141 deletions(-) create mode 100644 games-action/spacearyarya-kxl/files/spacearyarya-kxl-1.0.2-cflags.patch delete mode 100644 games-action/spacearyarya-kxl/files/spacearyarya-kxl-1.0.2-flags.patch delete mode 100644 games-action/spacearyarya-kxl/files/spacearyarya-kxl-1.0.2-gentoo-paths.patch delete mode 100644 games-action/spacearyarya-kxl/spacearyarya-kxl-1.0.2-r2.ebuild create mode 100644 games-action/spacearyarya-kxl/spacearyarya-kxl-1.0.2-r3.ebuild (limited to 'games-action/spacearyarya-kxl') diff --git a/games-action/spacearyarya-kxl/Manifest b/games-action/spacearyarya-kxl/Manifest index 92606237a4ad..2ea01a352acd 100644 --- a/games-action/spacearyarya-kxl/Manifest +++ b/games-action/spacearyarya-kxl/Manifest @@ -1,6 +1,6 @@ -AUX spacearyarya-kxl-1.0.2-clang.patch 304 BLAKE2B fe2a557607f3aaca0e22636b86c431938bbda63e0fb6826cd8884180ce3ac1361ca8c5d589d82037b17206fea94e645740122a1fe7878a61e38d98102105d472 SHA512 b70d09c918a80af4432d72d3bfe1c89c4e4b5d1c1ae2eb2eb0a9073e5410a144e1e8164d243d070f37b30e0d29d64c932d2525b83efc19a7adf570d44ba9cca1 -AUX spacearyarya-kxl-1.0.2-flags.patch 304 BLAKE2B e3a422c2bd0c5975aa43442ee1699218052dd1fdde29e24117f955599de6e1ef0326db4c5d1778d2fcadc129fcabcf575586b07e5c5f34407255b78fe56e6d9a SHA512 bc341e05daed7c4f2d0009dec73f068bc2d4bca3d627a3eed040360c41d96967211f4bd186f203aa41a713c31191e4a16c4754c4b22a7607ae2eebba3ddb3394 -AUX spacearyarya-kxl-1.0.2-gentoo-paths.patch 2384 BLAKE2B dfbe2b63832a5adb318b4fbcf68496ef7336651b55749a3dcb2f7b0a1a7a2cbec7667e1360b147d36a051c1af6ba266b3d4a4f62096b6c489f5d11022706ba71 SHA512 93351d22824d3fcc525ca33b2ae1b9949283541e62a717530d675bf63981f450a1667df22097d07ec27c1e43ed0386142ec424fa89601df0158821924ae06011 +AUX spacearyarya-kxl-1.0.2-cflags.patch 221 BLAKE2B 3b92bcc7ce4a11d53da26ec3b8031b7e2b01d29957866cd4eb2d1cb29ba69382ea3b061faa365ce3865363e30a8e9cc5e3adfd0ec876a75811f476847088394f SHA512 e7e62ae45a406dde281efcc98020b2994a87c26b4227d6bce768072702565aab1799a96659af80e3bd088cf05dd4137f470ba19a3d2f2b402e7b6ceb8ff05b4f +AUX spacearyarya-kxl-1.0.2-clang.patch 435 BLAKE2B 8e28a600f8a19aebfc9a7e8349ff985c35dccdf0edb3d75bd51c296dc1c9ef520b0083e960a6db8be5c663749b8583997b526af2f4239c9d7dd9d256270f4a5a SHA512 461213b469ad6d68980143821e8d4dedc3e13bfb8e28bc645430f65fbe6d849d16b30ad8dcdca63145f462c8f52befc987c712f6c8a989ce0c4096ce1fe8a1e8 DIST SpaceAryarya-KXL-1.0.2.tar.gz 279894 BLAKE2B 1e7d24107d21396d4463924c7e5665271c14c6ba84f600f126128195ac9d6a08bd112cb6730b1931cf113700d7cae18367359639c8c8a10073a2395bcdc87948 SHA512 1109606741bab6c290395cdfd8d19cf12e68cfef41f50164586c316fc425a32232e0f8dd822207d969c27c3f7a8478d1a65f36fe5468f3cfa8932c99ab3cb125 -EBUILD spacearyarya-kxl-1.0.2-r2.ebuild 832 BLAKE2B d8c513ff14339769e5a9ec1882f80488ab057af8ce2ddc9183eed4be3a5ff24d29bd145f9f2f4a102d653f398fae6d24157042cf3a76d55021bbcc4244fa72e0 SHA512 75d09c31b73816a25cf802a443b4e5ab02bd71c7a039ccbaea5488c480c68fb8a3f9db05b14c5d9c2f4feef154c12cabb39c858a1c40ad344a23301da1549914 -MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 +DIST spacearyarya-kxl.png 4853 BLAKE2B e8dcaf2e75f18900d67c68f75939ba030dc8207d4a2df1b465ce516527d846c4b44d105f85afcb0750dbfc6b33c9030da34c863b6e8f09f120d855d7361cce67 SHA512 f47c497f28c4cb22a518c8bc593a443aa0f52a600db04b6a3d33006b40aa57c11bdedd97a272587d6751bee04a593965c4f348ad5e7dff4deb276b7d89243e2e +EBUILD spacearyarya-kxl-1.0.2-r3.ebuild 1158 BLAKE2B d7e0ae42d347199749b4e433134dd093a5f30365e2484dd0a0a6c2ff360f3c81cc629289d16cdcdc8e865fd721e59f236655c68f16a3b5334a5544abfdd1dae2 SHA512 9ae7e2d439d26ae11dac867667b2918b1b7940ac10505f0227a12f311d299333af8420bfb17d596aaad8f65e0636b507366671bbe208e59c1c5a2d8932ba188f +MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610 diff --git a/games-action/spacearyarya-kxl/files/spacearyarya-kxl-1.0.2-cflags.patch b/games-action/spacearyarya-kxl/files/spacearyarya-kxl-1.0.2-cflags.patch new file mode 100644 index 000000000000..66cd0b7fe1bc --- /dev/null +++ b/games-action/spacearyarya-kxl/files/spacearyarya-kxl-1.0.2-cflags.patch @@ -0,0 +1,9 @@ +https://bugs.gentoo.org/429422 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -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 3b9b68b745c0..7115b4a2382f 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.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 @@ - /********************** - スコアランキング +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-flags.patch b/games-action/spacearyarya-kxl/files/spacearyarya-kxl-1.0.2-flags.patch deleted file mode 100644 index 2239858be998..000000000000 --- a/games-action/spacearyarya-kxl/files/spacearyarya-kxl-1.0.2-flags.patch +++ /dev/null @@ -1,11 +0,0 @@ -respect CFLAGS - ---- 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 - --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-gentoo-paths.patch b/games-action/spacearyarya-kxl/files/spacearyarya-kxl-1.0.2-gentoo-paths.patch deleted file mode 100644 index 81321b76857a..000000000000 --- 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 -- BMP_PATH=$prefix/share/SpaceAryarya/bmp -- WAV_PATH=$prefix/share/SpaceAryarya/wav -+ DATA_PATH=$datadir/SpaceAryarya/data -+ BMP_PATH=$datadir/SpaceAryarya/bmp -+ WAV_PATH=$datadir/SpaceAryarya/wav -+ SCORE_PATH=$localstatedir/SpaceAryarya - fi - AC_DEFINE_UNQUOTED(DATA_PATH,"$DATA_PATH") - AC_DEFINE_UNQUOTED(BMP_PATH,"$BMP_PATH") - AC_DEFINE_UNQUOTED(WAV_PATH,"$WAV_PATH") -+AC_DEFINE_UNQUOTED(SCORE_PATH,"$SCORE_PATH") - AC_DEFINE_UNQUOTED(TITLE,"$PACKAGE $VERSION") - AC_SUBST(DATA_PATH) - AC_SUBST(BMP_PATH) - AC_SUBST(WAV_PATH) -+AC_SUBST(SCORE_PATH) - - AC_OUTPUT([data/Makefile wav/Makefile bmp/Makefile src/Makefile - spacearyarya.spec Makefile]) ---- a/data/Makefile.am -+++ b/data/Makefile.am -@@ -1,6 +1,7 @@ --datadir = $(prefix)/share/SpaceAryarya/data -+datadir = $(DATA_PATH) - data_DATA = stage1.dat stage2.dat - EXTRA_DIST = stage1.dat stage2.dat .score - --install: -- $(INSTALL) -c -m 666 ./.score $(DESTDIR)$(DATA_PATH) -+install-data-local: -+ $(mkinstalldirs) $(DESTDIR)$(SCORE_PATH) -+ $(INSTALL) -m 660 .score $(DESTDIR)$(SCORE_PATH) ---- a/src/ranking.c -+++ b/src/ranking.c -@@ -36,7 +36,7 @@ - FILE *fp; - Uint16 i; - -- if ((fp = fopen(DATA_PATH "/.score", "r"))) { -+ if ((fp = fopen(SCORE_PATH "/.score", "r"))) { - fscanf(fp, "%d", &(Root->HiScore)); - for (i = 0; i < 5; i ++) - fscanf(fp, "%d %d %s", -@@ -65,7 +65,7 @@ - FILE *fp; - Uint16 i; - -- if ((fp = fopen(DATA_PATH "/.score", "w"))) { -+ if ((fp = fopen(SCORE_PATH "/.score", "w"))) { - fprintf(fp, "%d\n", Root->HiScore); - for (i = 0; i < 5; i ++) - fprintf(fp, "%d %d %s\n", ---- a/wav/Makefile.am -+++ b/wav/Makefile.am -@@ -1,3 +1,3 @@ --wavdir = $(prefix)/share/SpaceAryarya/wav -+wavdir = $(WAV_PATH) - wav_DATA = bgm1.wav bomb.wav hit.wav fire.wav die.wav boss.wav - EXTRA_DIST = bgm1.wav bomb.wav hit.wav fire.wav die.wav boss.wav diff --git a/games-action/spacearyarya-kxl/metadata.xml b/games-action/spacearyarya-kxl/metadata.xml index 78274e0fa550..1c3ba213c494 100644 --- a/games-action/spacearyarya-kxl/metadata.xml +++ b/games-action/spacearyarya-kxl/metadata.xml @@ -1,5 +1,5 @@ - + games@gentoo.org 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 deleted file mode 100644 index 5e97b2431a5e..000000000000 --- a/games-action/spacearyarya-kxl/spacearyarya-kxl-1.0.2-r2.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools desktop - -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 ~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 -} diff --git a/games-action/spacearyarya-kxl/spacearyarya-kxl-1.0.2-r3.ebuild b/games-action/spacearyarya-kxl/spacearyarya-kxl-1.0.2-r3.ebuild new file mode 100644 index 000000000000..935cf953f9f6 --- /dev/null +++ b/games-action/spacearyarya-kxl/spacearyarya-kxl-1.0.2-r3.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools desktop + +MY_P="SpaceAryarya-KXL-${PV}" + +DESCRIPTION="2D/3D shooting game" +HOMEPAGE="http://triring.net/ps2linux/games/kxl/kxlgames.html" +SRC_URI=" + mirror://gentoo/${MY_P}.tar.gz + https://dev.gentoo.org/~ionen/distfiles/${PN}.png" +S="${WORKDIR}/${MY_P}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DEPEND=" + acct-group/gamestat + dev-games/KXL" +RDEPEND=" + ${DEPEND} + media-fonts/font-adobe-100dpi + media-fonts/font-bitstream-100dpi" + +PATCHES=( + "${FILESDIR}"/${P}-cflags.patch + "${FILESDIR}"/${P}-clang.patch +) + +src_prepare() { + default + + sed -i "s|DATA_PATH \"/.score\"|\"${EPREFIX}/var/games/${PN}.hs\"|" src/ranking.c || die + + eautoreconf +} + +src_install() { + emake -C data DESTDIR="${D}" install-dataDATA + default + + rm "${ED}"/usr/share/SpaceAryarya/data/.score + insinto /var/games + newins data/.score ${PN}.hs + + fowners :gamestat /var/games/${PN}.hs /usr/bin/spacearyarya + fperms g+s /usr/bin/spacearyarya + fperms 660 /var/games/${PN}.hs + + doicon "${DISTDIR}"/${PN}.png + make_desktop_entry spacearyarya SpaceAryarya +} -- cgit v1.2.3