gentoo resync : 13.06.2020

5 files changed, 140 insertions, 12 deletions

diff --git a/games-rpg/kqlives/Manifest b/games-rpg/kqlives/Manifest
index 0301e934d37f..9dcf7f2561fa 100644
--- a/games-rpg/kqlives/Manifest
+++ b/games-rpg/kqlives/Manifest
@@ -1,4 +1,7 @@
+AUX kqlives-0.99_autoconf.patch 3898 BLAKE2B 60877de270f5ceb0ee6ae79f26b86c4a271b49bfc33e698c7663131934d2814e0d8e3ae06de6497be5a1fab12b5f9db3c74b20dbd471b2c339d1ded2e69dcdbd SHA512 2165b7302532b1ceabf21262d024687189cfc8557fd6720cb9156dbab9cec0f1c4148ba9b77a7098a056d1bff20909f2648674ac85c29cf686a08bacfc7f8df4
+AUX kqlives-0.99_dumb2.patch 551 BLAKE2B f903482f3256a2fdeb896ffa2641615dd685ccb28fc0ff2647a084c2596d1ffa4e63a1e69aed5df4f3568aa9c76fed155f644b5d74a7329e2d4b026d89c2817a SHA512 6c164ff134d857b5c7abc83741e9d8b3c85102f401e53bf1351226287ad1088b6f1c373a7a5563575f1626cafc0e4f9dd3afbcaf690cded3a88c032c50deb827
+AUX kqlives-0.99_gcc10.patch 490 BLAKE2B b9fa88b7faf79c39d7d027072759e992e70b55f31a169b0adf97c1116d4e20f920dafa649f0e45e14394505652c8897cc6e14c427a7c05a80ea8d07c398f03de SHA512 75cea1dbbc3f02e8ff724822c2ab8c398aebc9a98e99043642fc1ecfb14e74eac79534cf54e893f0fb2aef578b0028697b658536db2b0dc423664fae6f991bfb
 AUX kqlives.xpm 1404 BLAKE2B f2aae7268857f5c5e4e9a724a2b3a97a930741bf051bbd59cb6e36e4dabe09c29cc17d5b010c1c1ffb0cfaf9f2440e2350cca88adbea76d7429be176b74b6caf SHA512 32aeaa6e80c906f894773a12fa3bfdd2c52f15b11fe00bd99020d1577441a13573abb02a1fb0f11bb875fc1c61bfdc56285b805a5fd423d9ecc42ceb32eb8e66
 DIST kq-0.99.tar.gz 3642143 BLAKE2B 7279d3ab2808caab77c08283cc6aaab84fcef3814c3c259528320d6516fa8937a62d033b899aaaca4b562affed113faab5fac443ed3487565796377092df0f90 SHA512 fa343561679baf2201fb7107153ca07b715c1e56c9a4cb17db0f04759dd859436e8daa6a364d62ad57d138dbb5d8c680e35cafecea1a8f7f217ec190bfdd7918
-EBUILD kqlives-0.99-r1.ebuild 875 BLAKE2B 638f2b7de3fe05835ecb2d1565592808fefcb0397524a65eb99b435ea67abcf5be90786ce73911422f0c63046f52d5bb96e65b2d382db4be94a4048a3aaad55d SHA512 879b6a2ff06944aa9346350f1ef5a22d1553f9124e07bc549f25b773d3c959f45fce6a2fb56f8c228309a03abc51b481680146fdd4219825b09c81f9b26cc1f4
+EBUILD kqlives-0.99-r2.ebuild 1039 BLAKE2B dad1b1949b94fe87ed286a0b0e6822b4cad4bdf202a67cf24c59f4c0cd82f2e39d576f524406c1cbe89fa96b8c26e2dc55bb168dcc78178003d99759a9aa875f SHA512 24d5fce808bef484563235ebe1430e26c25aa0bc628f92c8f711863aa1c346b0e97251b1fd05cc836d4a9e7486e8c59dfb6000a5649cbd3fa339905ec8b7fce4
 MISC metadata.xml 409 BLAKE2B 9429ac5342781ed6109743d9b39da1e2094276c6464b7ad982cdbd5d30d8634400890edbb70abbd8c709b3a8c3def37e09a17d60df37e1ce8caeda41ff3869e7 SHA512 d341ddc4a801b649ae83022f3ea04480f59569b2cf91c106ace77735d1d7902fd10a739f41014c1928aae05f66643826390bdfc7917fbfa7106b3656a286edbc
diff --git a/games-rpg/kqlives/files/kqlives-0.99_autoconf.patch b/games-rpg/kqlives/files/kqlives-0.99_autoconf.patch
new file mode 100644
index 000000000000..dc4a5f9d4534
--- /dev/null
+++ b/games-rpg/kqlives/files/kqlives-0.99_autoconf.patch
@@ -0,0 +1,93 @@
+diff --git a/Makefile.am b/Makefile.am
+index 799b2c0..ff49ce2 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,8 +1,8 @@
+ SUBDIRS = intl po scripts
+-bin_PROGRAMS = kq mapdraw mapdiff mapdump $(MAPDRAW2)
+-EXTRA_PROGRAMS = mapdraw2
++bin_PROGRAMS = kqlives kqlives-mapdraw kqlives-mapdiff kqlives-mapdump $(MAPDRAW2)
++EXTRA_PROGRAMS = kqlives-mapdraw2
+ 
+-kq_SOURCES = src/enemyc.c src/intrface.c src/sgame.c src/bounds.c \
++kqlives_SOURCES = src/enemyc.c src/intrface.c src/sgame.c src/bounds.c \
+ 	src/combat.c src/entity.c src/movement.c src/shopmenu.c \
+ 	src/credits.c src/eqpmenu.c src/itemmenu.c src/music.c src/timing.c \
+ 	src/disk.c src/eskill.c src/kq.c  src/res.c \
+@@ -20,29 +20,29 @@ kq_SOURCES = src/enemyc.c src/intrface.c src/sgame.c src/bounds.c \
+ 	include/eskill.h include/magic.h include/selector.h \
+ 	include/bounds.h include/gettext.h include/console.h
+ 
+-EXTRA_kq_SOURCES = src/unix.c src/osx.m src/beos.c src/win.c src/dos.c src/winres.rc
+-kq_LDADD = $(kq_extra_files) $(ALLEGRO_LIBS) $(LIBINTL)
+-kq_DEPENDENCIES = $(kq_extra_files)
++EXTRA_kqlives_SOURCES = src/unix.c src/osx.m src/beos.c src/win.c src/dos.c src/winres.rc
++kqlives_LDADD = $(kq_extra_files) $(ALLEGRO_LIBS) $(LIBINTL)
++kqlives_DEPENDENCIES = $(kq_extra_files)
+ 
+-mapdraw_SOURCES = maps/mapdata.c maps/mapdraw.h maps/mapedit.c \
++kqlives_mapdraw_SOURCES = maps/mapdata.c maps/mapdraw.h maps/mapedit.c \
+ 	maps/mapfile.c maps/mapent.c maps/mapshared.c src/disk.c \
+ 	maps/mapstructs.c src/bounds.c include/disk.h include/structs.h
+-mapdraw_LDADD = $(ALLEGRO_LIBS) $(LIBINTL)
++kqlives_mapdraw_LDADD = $(ALLEGRO_LIBS) $(LIBINTL)
+ 
+-mapdraw2_SOURCES = maps/mapdraw2.c maps/mapdraw2.h \
++kqlives_mapdraw2_SOURCES = maps/mapdraw2.c maps/mapdraw2.h \
+ 	maps/mainwindow.c maps/mapedit2.c maps/mapedit2.h \
+ 	maps/mapshared.c maps/mapdraw.h src/disk.c \
+         src/bounds.c include/disk.h include/structs.h
+-mapdraw2_LDADD = $(GTK_LIBS) $(ALLEGRO_LIBS) $(LIBINTL)
+-mapdraw2_CPPFLAGS = $(AM_CPPFLAGS) $(GTK_CFLAGS)
++kqlives_mapdraw2_LDADD = $(GTK_LIBS) $(ALLEGRO_LIBS) $(LIBINTL)
++kqlives_mapdraw2_CPPFLAGS = $(AM_CPPFLAGS) $(GTK_CFLAGS)
+ 
+-mapdiff_SOURCES = maps/mapdraw.h maps/mapdiff.c src/disk.c \
++kqlives_mapdiff_SOURCES = maps/mapdraw.h maps/mapdiff.c src/disk.c \
+ 	include/disk.h include/structs.h
+-mapdiff_LDADD = $(ALLEGRO_LIBS) $(LIBINTL)
++kqlives_mapdiff_LDADD = $(ALLEGRO_LIBS) $(LIBINTL)
+ 
+-mapdump_SOURCES = maps/mapdump.c maps/mapshared.c maps/mapdata.c \
++kqlives_mapdump_SOURCES = maps/mapdump.c maps/mapshared.c maps/mapdata.c \
+ 	src/disk.c src/bounds.c include/disk.h include/structs.h
+-mapdump_LDADD = $(ALLEGRO_LIBS) $(LIBINTL)
++kqlives_mapdump_LDADD = $(ALLEGRO_LIBS) $(LIBINTL)
+ 
+ APPR=KQ.app/Contents/Resources
+ KQ.app: kq
+@@ -88,10 +88,10 @@ dist_music_DATA = music/aa_arofl.xm music/exp.s3m music/oxford.s3m \
+ 
+ musicdir = $(pkgdatadir)/music
+ 
+-dist_man_MANS = debian/kq.6
++dist_man_MANS = debian/kqlives.6
+ 
+ AM_CPPFLAGS = $(WARNING_CFLAGS) -I$(top_srcdir)/include \
+-	-DKQ_BIN=\"$(bindir)/kq$(EXEEXT)\" \
++	-DKQ_BIN=\"$(bindir)/kqlives$(EXEEXT)\" \
+ 	-DKQ_DATA=\"$(pkgdatadir)\" \
+ 	-DKQ_LIB=\"$(pkglibdir)\" \
+ 	-DKQ_LOCALE=\"$(localedir)\" \
+diff --git a/configure.ac b/configure.ac
+index 679d74f..48db735 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2,7 +2,7 @@
+ # Process this file with autoconf to produce a configure script.
+ 
+ AC_PREREQ(2.61)
+-AC_INIT([KQ],[0.99],[peterhull90@users.sourceforge.net])
++AC_INIT([KQLIVES],[0.99],[peterhull90@users.sourceforge.net])
+ AC_CONFIG_SRCDIR([src/kq.c])
+ AC_CONFIG_HEADER([config.h])
+ AC_CANONICAL_BUILD
+@@ -88,7 +88,7 @@ AC_SEARCH_LIBS(lua_gettop, lua50 lua5.1 lua, [], [AC_MSG_ERROR([Lua not found])]
+ PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.8.0 libglade-2.0 >= 2.4.0],
+   [AC_SUBST(GTK_LIBS)
+   AC_SUBST(GTK_CFLAGS)
+-  MAPDRAW2="mapdraw2${EXEEXT}"],
++  MAPDRAW2="kqlives-mapdraw2${EXEEXT}"],
+   [MAPDRAW2=""])
+ AC_SUBST(MAPDRAW2)
+ 
diff --git a/games-rpg/kqlives/files/kqlives-0.99_dumb2.patch b/games-rpg/kqlives/files/kqlives-0.99_dumb2.patch
new file mode 100644
index 000000000000..943145b44763
--- /dev/null
+++ b/games-rpg/kqlives/files/kqlives-0.99_dumb2.patch
@@ -0,0 +1,13 @@
+diff --git a/src/music.c b/src/music.c
+index 94c2786..1912d4d 100644
+--- a/src/music.c
++++ b/src/music.c
+@@ -125,7 +125,7 @@ void play_music (const char *music_name, long position)
+       stop_music ();
+       strcpy (filename, kqres (MUSIC_DIR, music_name));
+       if (strstr (filename, ".mod"))
+-         mod_song[current_music_player] = dumb_load_mod (filename);
++         mod_song[current_music_player] = dumb_load_mod (filename, 0);
+ 
+       else if (strstr (filename, ".xm"))
+          mod_song[current_music_player] = dumb_load_xm (filename);
diff --git a/games-rpg/kqlives/files/kqlives-0.99_gcc10.patch b/games-rpg/kqlives/files/kqlives-0.99_gcc10.patch
new file mode 100644
index 000000000000..693b993cdbdf
--- /dev/null
+++ b/games-rpg/kqlives/files/kqlives-0.99_gcc10.patch
@@ -0,0 +1,13 @@
+diff --git a/maps/mapshared.c b/maps/mapshared.c
+index 47fa7af..0c05d81 100644
+--- a/maps/mapshared.c
++++ b/maps/mapshared.c
+@@ -129,7 +129,7 @@ unsigned short *map, *b_map, *f_map, *c_map, *cf_map, *cb_map;
+ unsigned char *z_map, *sh_map, *o_map, *cz_map, *csh_map, *co_map;
+ unsigned char *search_map;
+ 
+-s_bound bound_box[MAX_BOUNDS]; // WK - not redundant. Used on line 266
++extern s_bound bound_box[MAX_BOUNDS]; // WK - not redundant. Used on line 266
+ 
+ /*! \brief Blit to screen
+  *
diff --git a/games-rpg/kqlives/kqlives-0.99-r1.ebuild b/games-rpg/kqlives/kqlives-0.99-r2.ebuild
index c667ef716e6f..0c16049e1001 100644
--- a/games-rpg/kqlives/kqlives-0.99-r1.ebuild
+++ b/games-rpg/kqlives/kqlives-0.99-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit desktop
+inherit autotools desktop
 
 MY_P=${P/lives}
 
@@ -19,8 +19,8 @@ IUSE="cheats nls"
 RDEPEND="
 	dev-lang/lua:0
 	>=gnome-base/libglade-2.4
-	media-libs/aldumb
 	media-libs/allegro:0
+	>=media-libs/dumb-2.0.3[allegro]
 	>=x11-libs/gtk+-2.8:2
 	nls? ( virtual/libintl )"
 DEPEND="${RDEPEND}
@@ -29,6 +29,18 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${MY_P}
 
+PATCHES=(
+	"${FILESDIR}/${P}_autoconf.patch"	# Fix #597790
+	"${FILESDIR}/${P}_dumb2.patch"		# >=media-libs/dumb-2.0.3 support
+	"${FILESDIR}/${P}_gcc10.patch"		# Fix #661422
+)
+
+src_prepare() {
+	default
+	mv debian/{kq,${PN}}.6 || die
+	eautoreconf
+}
+
 src_configure() {
 	econf \
 		$(use_enable cheats) \
@@ -37,12 +49,6 @@ src_configure() {
 
 src_install() {
 	default
-
-	local x
-	for x in diff draw draw2 dump; do
-		mv -vf "${D}/etc"/map${x} "${D}/etc"/kq-map${x} || die
-	done
-
 	doicon "${FILESDIR}"/${PN}.xpm
-	make_desktop_entry kq KqLives ${PN}
+	make_desktop_entry ${PN} KqLives ${PN}
 }