gentoo resync : 13.06.2020

10 files changed, 165 insertions, 37 deletions

diff --git a/games-rpg/Manifest.gz b/games-rpg/Manifest.gz
index ffa0f3a2a25c..426c18621343 100644
--- a/games-rpg/Manifest.gz
+++ b/games-rpg/Manifest.gz
diff --git a/games-rpg/eternal-lands/Manifest b/games-rpg/eternal-lands/Manifest
index 377589cf1cb5..69ae0e5bffc5 100644
--- a/games-rpg/eternal-lands/Manifest
+++ b/games-rpg/eternal-lands/Manifest
@@ -1,6 +1,6 @@
-AUX el-wrapper 1646 BLAKE2B b4ddf1c5873b765af1c58a57cdb99b164f6e2558e1523253d4ed7a321ae9dc167dcb6f25271353d90549e24ff15387e087db88fda18f6832549a7e71168c4d98 SHA512 fc4e19608f40155f4e5014595b5497f6ebc0df0378bc430b9cd64c3a3139bcc8101e5831ef53e07866b456000c17d7e8209ff0d16e067fa434240bfc4851ee9e
-AUX eternal-lands-1.9.5.3-build.patch 2629 BLAKE2B 2151293ed631e75345fb2c264113e28d11ccf42471599ab4784f1ae19091602a0b2d1ef56da4a0396a263b7e8672810e12d96d0341666a8589037c41793b3342 SHA512 dba8288ee3309f97d779e0005f6f6234ce39de02badad78fe2b642ed120a09b2cda4b1558acf5bb3478a844c964454f935b407c02f0067ca837ab26c860494a1
+AUX el-wrapper-1.9.5.8 1648 BLAKE2B c429dd1fcd969a12fe6f7dc9df5241608cde6beec2574552c7cdb635fc212c52f2f9e6cfece25727dc9c1d98093762d18426c697c193f78db2aaa0b83e0ef3d8 SHA512 69689617582a31bb2d2b3ea8511b49a55c33332526720f72ea2a82440ba9b2e5bd60586e973b893bcf6a76a85b84831c9cc63e91558790d7b0ce0da93baacc8b
 AUX eternal-lands-1.9.5.3-minizip.patch 2944 BLAKE2B be3ff1adb91681bbe826a409f2ec3c855c7dcb49d7aab076ab65c6c1145fa70e6cf98ae25a6d18b77fed63395c552047dae1407885758186ef7f3f9e737fd25a SHA512 feaf805e16bbbf33aaf15d6eb4e6303f1c80f135809952b59da2decdc8f1f2b65487031b7b9b29f969e631afa5bfc124741b385f4adff66d65cc1b0cf983f149
-DIST eternal-lands-1.9.5.3.tar.gz 2814562 BLAKE2B ccb3dd78d12817912293f8babbd5f5dde6f0e3ea0cb34526edd7a3f0371f5313f94ff2d6b22cf472442869dfcf9893c19ec72d7ccf879b0e6a3dbfa05249c38f SHA512 bf0da70080377a76c66d6201da6032aae2967051e23f8aa433d450ec845bcd91145b965632fa63f66feebc15eaa9a65ff8f33884cc1b7c3605125f1536d91563
-EBUILD eternal-lands-1.9.5.3.ebuild 1585 BLAKE2B 81a52c5472b45ca36c2d288e07157b60307baf5e137ad697876b6d54879f5993b581962dc4686ac823fe4d2149ba3548c70bac954e237ce88cac91f66db0b273 SHA512 b9b040232b194b9d63030451c9bf54a7345f07e1e63b2d0f106ca29dc5fe57a52908298c4ece66ce72f46e85023bd072b3c13ee959e3652c986704b026c332ea
+AUX eternal-lands-1.9.5.8-build.patch 2632 BLAKE2B c31b8b0ec050fb9fb9843f5cfc5db21d6a2c843724a4e6e4c683a011a11dc1b8bac4e73125d72f5d012062bbede3377eed7fd81032a8469bbd55b52d84b8d725 SHA512 1c2ee7c49bc703c5cb7a8078930ca1587606d06b7b7147e038e0598ce4c2cd205fc6aa07306544f622ed0c6ff3d4576c316780d1c2db799fd598b060335c346c
+DIST eternal-lands-1.9.5.8.tar.gz 2863932 BLAKE2B f8c4e88b96b4ee73773a2675e7cf2746e5efe6bf029f046a2ce63496b22c217a93eeea9464977710b95c4fe2d928edefd6aa11a712a8fb82d911ee7d1fd993d3 SHA512 e5e89ec6e7df2b1ac80722b6daf5bbb350d2f1bc4c70c819992b528f25c2ac11434d053ff844ff5873deea16c5bbe305834ffeae7b5ecb6daea5638625851ce0
+EBUILD eternal-lands-1.9.5.8.ebuild 1596 BLAKE2B 51bc31d2824cd5c3b4699777ce4b5652d1ba7c82737270a6d2967b8f9b3382c7cc3c61d238bb876fea097f68dc67ad839f1528e6e0e5e122b26ba5df93f2423c SHA512 1003f55fa02512e108c1a6a336d1e3fead3ba95475ac63f371821fc26773639f808f0f9c848ec6a626ee7713d707dce511c5a866545134d9d77b858705e78d2e
 MISC metadata.xml 385 BLAKE2B 5f7b3fd58c620d6dda10b183473856241e1ade18bdd190865a4c0a8432d1bbead7da0801acc99dd9b42c77757625a4cd145f615435317d0329e0028af8ece506 SHA512 a3b44275d69059374a2dbf2761b2ff68afdb3fb195f714f1d797c7551bae5c488249dd5dba9bd370e982e69d7ba347306c64a82d1894bf66fbf55a5db985df9c
diff --git a/games-rpg/eternal-lands/eternal-lands-1.9.5.3.ebuild b/games-rpg/eternal-lands/eternal-lands-1.9.5.8.ebuild
index 9728e4e98156..aae74143d659 100644
--- a/games-rpg/eternal-lands/eternal-lands-1.9.5.3.ebuild
+++ b/games-rpg/eternal-lands/eternal-lands-1.9.5.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,11 +18,11 @@ RDEPEND="app-arch/unzip
 	media-libs/cal3d[-16bit-indices]
 	media-libs/freealut
 	media-libs/libpng:0=
-	media-libs/libsdl[X,opengl,video]
+	media-libs/libsdl2[X,opengl,video]
 	media-libs/libvorbis
 	media-libs/openal
-	media-libs/sdl-image
-	media-libs/sdl-net
+	media-libs/sdl2-image
+	media-libs/sdl2-net
 	sys-libs/zlib[minizip]
 	virtual/glu
 	virtual/opengl
@@ -42,7 +42,7 @@ BDEPEND="${DEPEND}
 S="${WORKDIR}/Eternal-Lands-${PV}"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-1.9.5.3-build.patch"
+	"${FILESDIR}/${PN}-1.9.5.8-build.patch"
 	"${FILESDIR}/${PN}-1.9.5.3-minizip.patch"
 )
 
@@ -66,7 +66,7 @@ src_compile() {
 
 src_install() {
 	dobin el.linux.bin
-	newbin "${FILESDIR}"/el-wrapper el
+	newbin "${FILESDIR}"/el-wrapper-1.9.5.8 el
 	newicon -s 48 elc.png ${PN}.png
 	make_desktop_entry el "Eternal Lands"
 
diff --git a/games-rpg/eternal-lands/files/el-wrapper b/games-rpg/eternal-lands/files/el-wrapper-1.9.5.8
index ab392d334207..3439c2a11625 100644
--- a/games-rpg/eternal-lands/files/el-wrapper
+++ b/games-rpg/eternal-lands/files/el-wrapper-1.9.5.8
@@ -18,8 +18,8 @@ if [[ ! -e $elc ]] || [[ ! -e $datadir ]] || [[ ! -e $elc/servers.lst ]] ||
 
 		tmpdir="`mktemp -d /tmp/eternal-lands.XXXXXXXXXX`"
 		trap "rm -r $tmpdir" EXIT
-		wget https://github.com/raduprv/Eternal-Lands/releases/download/1.9.5.2/el_195_1_data_files.zip -P $tmpdir
-		unzip $tmpdir/el_195_1_data_files.zip -d $elc
+		wget https://github.com/raduprv/Eternal-Lands/releases/download/1.9.5.7/el_195_p7_data_files.zip -P $tmpdir
+		unzip $tmpdir/el_195_p7_data_files.zip -d $elc
 
 		echo
 		echo "The game sound and music are optional, you can download \
diff --git a/games-rpg/eternal-lands/files/eternal-lands-1.9.5.3-build.patch b/games-rpg/eternal-lands/files/eternal-lands-1.9.5.8-build.patch
index 28f4ab0da542..d4aaa2bd415f 100644
--- a/games-rpg/eternal-lands/files/eternal-lands-1.9.5.3-build.patch
+++ b/games-rpg/eternal-lands/files/eternal-lands-1.9.5.8-build.patch
@@ -1,7 +1,7 @@
-From ef13ae006609e51eaddbcdf0495f44cfde797e26 Mon Sep 17 00:00:00 2001
+From 0f93097a58d78e0ba9d51d48f56b470047b27210 Mon Sep 17 00:00:00 2001
 From: Stefan Strogin <steils@gentoo.org>
-Date: Tue, 14 May 2019 20:34:47 +0300
-Subject: [PATCH 1/2] Respect {C,CXX,LD}FLAGS
+Date: Fri, 5 Jun 2020 07:19:47 +0300
+Subject: [PATCH] Respect {C,CXX,LD}FLAGS
 
 Upstream-Status: Inappropriate [Gentoo-specific]
 Signed-off-by: Stefan Strogin <steils@gentoo.org>
@@ -10,7 +10,7 @@ Signed-off-by: Stefan Strogin <steils@gentoo.org>
  1 file changed, 8 insertions(+), 8 deletions(-)
 
 diff --git a/Makefile.linux b/Makefile.linux
-index c57aeeeb..a0839c5c 100644
+index eb57e0e..c9bbc73 100644
 --- a/Makefile.linux
 +++ b/Makefile.linux
 @@ -17,11 +17,11 @@ OPTIONS = -DLINUX -DELC $(foreach FEATURE, $(FEATURES), -D$(FEATURE)) -D_7ZIP_ST
@@ -18,17 +18,17 @@ index c57aeeeb..a0839c5c 100644
  	$(shell pkg-config zlib --cflags)
  
 -CFLAGS=$(PLATFORM) $(CWARN) -O0 -ggdb -pipe $(OPTIONS) -fno-strict-aliasing $(EXTRA_INCLUDES)
-+CFLAGS += $(OPTIONS) -fno-strict-aliasing $(EXTRA_INCLUDES)
++CFLAGS += -pipe $(OPTIONS) -fno-strict-aliasing $(EXTRA_INCLUDES)
  
 -CXXFLAGS=$(PLATFORM) $(CXXWARN) -O0 -ggdb -pipe $(OPTIONS) -fno-strict-aliasing $(EXTRA_INCLUDES)
 +CXXFLAGS += $(OPTIONS) -fno-strict-aliasing $(EXTRA_INCLUDES)
  
--LDFLAGS=$(shell pkg-config sdl --libs) \
-+LDFLAGS += $(shell pkg-config sdl --libs) \
+-LDFLAGS=$(shell pkg-config sdl2 --libs) \
++LDFLAGS += $(shell pkg-config sdl2 --libs) \
  	$(shell pkg-config libxml-2.0 --libs) \
- 	$(shell pkg-config SDL_net --libs) \
- 	$(shell pkg-config SDL_image --libs) \
-@@ -111,7 +111,7 @@ HEADER_DIRS = . books eye_candy io pawn fsaa engine xz
+ 	$(shell pkg-config SDL2_net --libs) \
+ 	$(shell pkg-config SDL2_image --libs) \
+@@ -112,7 +112,7 @@ HEADER_DIRS = . books eye_candy io pawn fsaa engine xz
  DEP_FILES=$(foreach OBJ, $(COBJS), .deps/$(OBJ).P) $(foreach OBJ, $(CXXOBJS), .deps/$(OBJ).P)
  #(shell echo $OBJ |sed s/\.o/\.P/))
  
@@ -37,7 +37,7 @@ index c57aeeeb..a0839c5c 100644
  
  ifndef CC
  CC=gcc
-@@ -127,8 +127,8 @@ all: $(EXE)
+@@ -128,8 +128,8 @@ all: $(EXE)
  
  # the compile targets
  $(EXE): $(OBJS)
@@ -48,7 +48,7 @@ index c57aeeeb..a0839c5c 100644
  
  #recompile on Makefile or conf change
  #.depend $(OBJS): Makefile.linux make.conf
-@@ -136,14 +136,14 @@ $(EXE): $(OBJS)
+@@ -137,14 +137,14 @@ $(EXE): $(OBJS)
  DEPS_MAGIC := $(shell mkdir .deps .deps/io .deps/shader .deps/eye_candy .deps/exceptions .deps/xz .deps/xml .deps/fsaa .deps/engine > /dev/null 2>&1 || :)
  
  $(COBJS): %.o: %.c Makefile.linux make.conf
@@ -66,5 +66,5 @@ index c57aeeeb..a0839c5c 100644
  		mv ".deps/$@.pp" ".deps/$@.P"; \
  	else rm -f ".deps/$@.pp"; exit 1; \
 -- 
-2.21.0
+2.27.0
 
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}
 }