gentoo resync : 14.07.2018

3 files changed, 96 insertions, 0 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 000000000000..3b9b68b745c0
--- /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-flags.patch b/games-action/spacearyarya-kxl/files/spacearyarya-kxl-1.0.2-flags.patch
new file mode 100644
index 000000000000..2239858be998
--- /dev/null
+++ b/games-action/spacearyarya-kxl/files/spacearyarya-kxl-1.0.2-flags.patch
@@ -0,0 +1,11 @@
+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
new file mode 100644
index 000000000000..81321b76857a
--- /dev/null
+++ b/games-action/spacearyarya-kxl/files/spacearyarya-kxl-1.0.2-gentoo-paths.patch
@@ -0,0 +1,74 @@
+--- 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