gentoo resync : 25.11.2020

8 files changed, 179 insertions, 98 deletions

diff --git a/games-strategy/liquidwar/Manifest b/games-strategy/liquidwar/Manifest
index 9ac03e77fc48..c93473a9a0c6 100644
--- a/games-strategy/liquidwar/Manifest
+++ b/games-strategy/liquidwar/Manifest
@@ -1,6 +1,6 @@
-AUX liquidwar-5.6.4-exec-stack.patch 442 BLAKE2B 21e0cdd8bb36ff7ce4bacb9bf9c5bd046803c953818eb73e58f372eb431a368dfd97530b22d3352eceecbb503975ccf3fa041d2776a48f63c15dcb4ef809a6fd SHA512 9759a6ae5805871ccbe2161e295449efc268403094d96360596e6043c1583e9ee18d2fdefbbf6bc695dadfe5f57170a5badf930a0fe8aa637b10215014c9561a
-AUX liquidwar-5.6.4-ovflfix.patch 700 BLAKE2B d0a46b244008d78eaa67cba8f8a39a710c8b75d64876a9e7eae86b168c94f8111326739795b061a2209c70fbb05399291cfdfa6f580c3439e7a68768e9049def SHA512 0d242ff7ba17af4b5d61e040b37fbf363d5c4bec615af21e2b2ea77f7cef4633f66a870196e40b590c6609ed15c90208172154b4e613b6ea0d4fe0f2189bb294
-AUX liquidwar-5.6.4-underlink.patch 442 BLAKE2B bfd7beea85546fca013de4229bbd0b1a658f87a608d1340e2463304c72b1d6e82917a95052488f53be40e3bfcafcf23b13007d8f86d541c8236e6dbaeec1c948 SHA512 3835cad62e8141774c5675d1dbc22103cb41a6af0d4a0a70b23e96d88fe72f49b872823bfb9f35294b8d1bec5d6e89942b37928ee92bb53ecb177a560fe8559d
-DIST liquidwar-5.6.4.tar.gz 3268432 BLAKE2B 9b74b057ecb065e18c355c92e9b71bcd257997d9b9874c37a77352b1df83fe17d130c6ac1394368eeb40957ff81d26e973f0677035949d84c357829dc40875f6 SHA512 7145a8362c46a0f39662327edf81b341659a3ce8216f9fb3bb32e483de618c0f46169ed916fe2c4c651ebc5925ecdc534b372c381e16c3ddae9a50fb48f98ed7
-EBUILD liquidwar-5.6.4-r2.ebuild 1650 BLAKE2B 92597eae770aa2a1063101a383eb406922c969b9adf8187b812fa98ae04d6135b29dcb90440190c0a02d2637d3f06752894c7a122aac3c88a62a3a67fa08558f SHA512 4adc6c05c0f9c319ba75c3720679040bdf5e2b2e269ed1208cf155a44b26b14d015943b5520233adcb86156f007b16840f8696d1d150933b1e8cc1b89f5c86c9
+AUX liquidwar-5.6.5-exec-stack.patch 442 BLAKE2B 21e0cdd8bb36ff7ce4bacb9bf9c5bd046803c953818eb73e58f372eb431a368dfd97530b22d3352eceecbb503975ccf3fa041d2776a48f63c15dcb4ef809a6fd SHA512 9759a6ae5805871ccbe2161e295449efc268403094d96360596e6043c1583e9ee18d2fdefbbf6bc695dadfe5f57170a5badf930a0fe8aa637b10215014c9561a
+AUX liquidwar-5.6.5-gcc10.patch 1084 BLAKE2B 9d22731a10775c42009ab97c1cc1c7ddd92f32373e148af0a6fc2753486c88c95518c6e657038c2fa444fdf4f149b18bacf9ad8138f9e37b8fd09e519206d56c SHA512 e2880aa19c869ccc7774f7a8f5f22e82be0235f41a9fc3aa39bf287a577ee1765b75259b6d804dce5d2c8a7c9dbc02421561aa6273e498b1981df67b2d8c5b53
+AUX liquidwar-5.6.5-makefile.patch 4909 BLAKE2B 3154d05b02ed7d38150f4456299abcbb5b383837f43f5b6bfb27c64c3f1a2b496eafe6f4fc448a8480a1d6b3180a4fff23e3b556da5d1561d565c177094ae1d9 SHA512 b61c7728543939d98c303af912162c3a433374c4e19d19eac7784b2cc05f7c0f03e18e8736063faa932eac254d980b7a3767cecd9af6254b29d36e503be9fa85
+DIST liquidwar-5.6.5.tar.gz 6508987 BLAKE2B 26411f3c79a407a467f14a0c18b4ff320ab522ed96e43d00fdf4ccc8feab72e786361ac367349336e0478b6cbd187d9ce7c12e28be7896476557beb7b2f65327 SHA512 15dc2cacd1f3b00f8dcac4318cbaf5c713f2d0e111392d14dd56eec7ae97a64af1487a11038dc108743baf3c995e9136100d56331fadc4cf19dc5702d5051a25
+EBUILD liquidwar-5.6.5.ebuild 1039 BLAKE2B fecb93b52cad359ee53b1796533ae9633ae42b1e717bfc3c21f30a56252be4f3120d67078f09db6bf25b6dea91f3ce8b2b96219de0c4d934467ded50791f97cc SHA512 18818b92a64733411efbd4b57b27eeb8a08330b7252927ce38d7fafaffb322d9fbdf112181b1fdd3dd32dd3b8199ed4f3dfc11aadf46b69b39abbbb68269bcd5
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-strategy/liquidwar/files/liquidwar-5.6.4-ovflfix.patch b/games-strategy/liquidwar/files/liquidwar-5.6.4-ovflfix.patch
deleted file mode 100644
index c092f02beabe..000000000000
--- a/games-strategy/liquidwar/files/liquidwar-5.6.4-ovflfix.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/src/wwwsrv.c.old	2010-10-26 14:16:31.000000000 +0200
-+++ b/src/wwwsrv.c	2010-10-26 14:17:35.000000000 +0200
-@@ -100,12 +100,12 @@
- 
-   data->privacy = privacy;
-   data->log = log;
--  strncpy (data->metaserver, metaserver, URL_SIZE);
-+  strncpy (data->metaserver, metaserver, sizeof(data->metaserver));
-   data->port = port;
-   data->busy_players = busy_players;
-   data->max_players = max_players;
--  strncpy (data->password, password, URL_SIZE);
--  strncpy (data->comment, comment, URL_SIZE);
-+  strncpy (data->password, password, sizeof(data->password));
-+  strncpy (data->comment, comment, sizeof(data->comment));
- }
- 
- /*------------------------------------------------------------------*/
diff --git a/games-strategy/liquidwar/files/liquidwar-5.6.4-underlink.patch b/games-strategy/liquidwar/files/liquidwar-5.6.4-underlink.patch
deleted file mode 100644
index d80e349bf1b1..000000000000
--- a/games-strategy/liquidwar/files/liquidwar-5.6.4-underlink.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/Makefile.in.old	2011-06-22 07:45:05.756127862 +0200
-+++ b/src/Makefile.in	2011-06-22 07:46:00.681613957 +0200
-@@ -223,7 +223,7 @@
-     EXTERN_LIBS = `allegro-config --static $(ALLEGRO_LIBRARY)` $(EFENCE_LIBRARY)
- else
-     LINK_OPTIONS = 
--    EXTERN_LIBS = `allegro-config --libs $(ALLEGRO_LIBRARY)` $(EFENCE_LIBRARY)
-+    EXTERN_LIBS = `allegro-config --libs $(ALLEGRO_LIBRARY)` $(EFENCE_LIBRARY) -lm
- endif
- 
- CONFIG_OPTIONS = \
diff --git a/games-strategy/liquidwar/files/liquidwar-5.6.4-exec-stack.patch b/games-strategy/liquidwar/files/liquidwar-5.6.5-exec-stack.patch
index a1e93c9b738c..a1e93c9b738c 100644
--- a/games-strategy/liquidwar/files/liquidwar-5.6.4-exec-stack.patch
+++ b/games-strategy/liquidwar/files/liquidwar-5.6.5-exec-stack.patch
diff --git a/games-strategy/liquidwar/files/liquidwar-5.6.5-gcc10.patch b/games-strategy/liquidwar/files/liquidwar-5.6.5-gcc10.patch
new file mode 100644
index 000000000000..7d69c705e0c8
--- /dev/null
+++ b/games-strategy/liquidwar/files/liquidwar-5.6.5-gcc10.patch
@@ -0,0 +1,30 @@
+Author: Reiner Herrmann <reiner@reiner-h.de>
+Description: Fix FTBFS with GCC 10
+Bug-Debian: https://bugs.debian.org/957493
+
+--- a/src/fighter.h
++++ b/src/fighter.h
+@@ -59,8 +59,8 @@
+ /* variables globales                                               */
+ /*==================================================================*/
+ 
+-int FIGHTER_MOVE_X[2][NB_DIRS][5];
+-int FIGHTER_MOVE_Y[2][NB_DIRS][5];
++extern int FIGHTER_MOVE_X[2][NB_DIRS][5];
++extern int FIGHTER_MOVE_Y[2][NB_DIRS][5];
+ 
+ /*==================================================================*/
+ /* fonctions globales                                               */
+--- a/src/random.h
++++ b/src/random.h
+@@ -66,8 +66,8 @@
+ /* variables globales                                               */
+ /*==================================================================*/
+ 
+-void *LW_RANDOM_RAW_MAP;
+-int LW_RANDOM_ON;
++extern void *LW_RANDOM_RAW_MAP;
++extern int LW_RANDOM_ON;
+ 
+ /*==================================================================*/
+ /* fonctions globales                                               */
diff --git a/games-strategy/liquidwar/files/liquidwar-5.6.5-makefile.patch b/games-strategy/liquidwar/files/liquidwar-5.6.5-makefile.patch
new file mode 100644
index 000000000000..b034a2947265
--- /dev/null
+++ b/games-strategy/liquidwar/files/liquidwar-5.6.5-makefile.patch
@@ -0,0 +1,93 @@
+Fix paths. Don't install COPYING and obsolete .desktop
+
+diff --git a/Makefile.in b/Makefile.in
+index 45f13ec..d27dddc 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -27,21 +27,19 @@ mandir =          @mandir@
+ infodir =         @infodir@
+ 
+ BINDIR =          $(bindir)
+-GAMEDIR =         $(exec_prefix)/games
+-DATADIR =         $(datadir)/games/liquidwar
++GAMEDIR =         $(bindir)
++DATADIR =         $(datadir)/liquidwar
+ PIXDIR =          $(datadir)/pixmaps
+ DOCDIR =          $(datadir)/doc/liquidwar
+ DESKTOPDIR =           $(datadir)/applications
+ # We don't use the autoconf default mandir=$(prefix)/man man
+ # directory since the FHS (File Hierarchy Standard recommends
+ # to place man pages in $(datadir)/man (ie /usr/share/man).
+-# MANDIR =          $(mandir)/man6
+-MANDIR =          $(datadir)/man/man6
++MANDIR =          $(mandir)/man6
+ # We don't use the autoconf default infodir=$(prefix)/info info
+ # directory since the FHS (File Hierarchy Standard recommends
+ # to place info pages in $(datadir)/info (ie /usr/share/info).
+-# INFODDIR =        $(infodir)
+-INFODIR =         $(datadir)/info
++INFODDIR =        $(infodir)
+ INFODIRDIR =      $(infodir)
+ 
+ HOST =          @host@
+@@ -123,7 +121,7 @@ build_doc:
+ 
+ install: install_link install_nolink
+ 
+-# the install_nolink is for distribs where $(prefix)/games is in the PATH,
++# the install_nolink is for distribs where $(prefix) is in the PATH,
+ # for instance Debian, where a link in $(prefix)/bin is pretty much useless
+ install_nolink: install_bin install_data install_custom_map install_custom_texture install_custom_music install_icon install_doc install_gpl install_desktop install_readme
+ 	@echo 
+@@ -136,9 +134,9 @@ install_nolink: install_bin install_data install_custom_map install_custom_textu
+ install_bin: src/liquidwar src/liquidwar-server src/liquidwar-mapgen
+ 	@echo "Installing liquidwar binaries in $(GAMEDIR)."
+ 	@install -d $(DESTDIR)$(GAMEDIR)
+-	@install -c -s src/liquidwar $(DESTDIR)$(GAMEDIR)
+-	@install -c -s src/liquidwar-server $(DESTDIR)$(GAMEDIR)
+-	@install -c -s src/liquidwar-mapgen $(DESTDIR)$(GAMEDIR)
++	@install -c src/liquidwar $(DESTDIR)$(GAMEDIR)
++	@install -c src/liquidwar-server $(DESTDIR)$(GAMEDIR)
++	@install -c src/liquidwar-mapgen $(DESTDIR)$(GAMEDIR)
+ 
+ install_link:
+ 	@echo "Installing link in $(BINDIR)."
+@@ -174,7 +172,7 @@ install_custom_music:
+ 	@install -c -m 0644 custom/music/*.* $(DESTDIR)$(DATADIR)/music
+ 
+ install_doc:
+-	@if [ -f $(MAKE_DOC_DIR)/txt/rules.txt ]; then echo "Installing liquidwar plain text doc in $(DOCDIR)/txt."; install -d $(DESTDIR)$(DOCDIR)/txt; install -c -m 0644 $(MAKE_DOC_DIR)/txt/*.txt $(DESTDIR)$(DOCDIR)/txt; fi
++	@if [ -f $(MAKE_DOC_DIR)/txt/rules.txt ]; then echo "Installing liquidwar plain text doc in $(DOCDIR)."; install -d $(DESTDIR)$(DOCDIR); install -c -m 0644 $(MAKE_DOC_DIR)/txt/*.txt $(DESTDIR)$(DOCDIR); fi
+ 	@if [ -f $(MAKE_DOC_DIR)/html/rules.html ]; then echo "Installing liquidwar HTML doc in $(DOCDIR)/html."; install -d $(DESTDIR)$(DOCDIR)/html; install -c -m 0644 $(MAKE_DOC_DIR)/html/*.html $(DESTDIR)$(DOCDIR)/html; fi
+ 	@if [ -f $(MAKE_DOC_DIR)/man/liquidwar.6.gz ]; then echo "Installing liquidwar man page in $(MANDIR)."; install -d $(DESTDIR)$(MANDIR); install -c -m 0644 $(MAKE_DOC_DIR)/man/liquidwar.6.gz $(DESTDIR)$(MANDIR); ln -s -f liquidwar.6.gz $(DESTDIR)$(MANDIR)/liquidwar-server.6.gz; ln -s -f liquidwar.6.gz $(DESTDIR)$(MANDIR)/liquidwar-mapgen.6.gz; fi
+ 	@if [ -f $(MAKE_DOC_DIR)/info/liquidwar.info.gz ]; then echo "Installing info page $(INFODIR)/liquidwar.info.gz."; install -d $(DESTDIR)$(INFODIR); install -c -m 644 $(MAKE_DOC_DIR)/info/liquidwar.info* $(DESTDIR)$(INFODIR); if which install-info; then if test -d $(DESTDIR)$(INFODIRDIR); then if test -f $(DESTDIR)$(INFODIRDIR)/dir; then echo "Installing liquidwar info entry."; install-info --info-dir=$(DESTDIR)$(INFODIRDIR) $(MAKE_DOC_DIR)/info/liquidwar.info.gz; fi; fi; fi; fi
+@@ -189,12 +187,12 @@ install_icon:
+ install_desktop:
+ 	@echo "Installing desktop file in $(DESKTOPDIR)."
+ 	@install -d $(DESTDIR)$(DESKTOPDIR)
+-	@install -c -m 0644 misc/liquidwar.desktop $(DESTDIR)$(DESKTOPDIR)
++	#@install -c -m 0644 misc/liquidwar.desktop $(DESTDIR)$(DESKTOPDIR)
+ 
+ install_gpl:
+ 	@echo "Installing GPL in $(DOCDIR)."
+ 	@install -d $(DESTDIR)$(DOCDIR)
+-	@install -c -m 0644 COPYING $(DESTDIR)$(DOCDIR)
++	#@install -c -m 0644 COPYING $(DESTDIR)$(DOCDIR)
+ 
+ install_readme:
+ 	@echo "Installing README in $(DOCDIR)."
+diff --git a/src/Makefile.in b/src/Makefile.in
+index f9a471a..deb6692 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -4,8 +4,8 @@ exec_prefix =     @exec_prefix@
+ datarootdir =     @datarootdir@
+ datadir =         @datadir@
+ 
+-DATADIR =         $(datadir)/games/liquidwar
+-GAMEDIR =         $(exec_prefix)/games
++DATADIR =         $(datadir)/liquidwar
++GAMEDIR =         @bindir@
+ 
+ HOST_OPT =        @HOST_OPT@
+ STATIC =          @STATIC@
diff --git a/games-strategy/liquidwar/liquidwar-5.6.4-r2.ebuild b/games-strategy/liquidwar/liquidwar-5.6.4-r2.ebuild
deleted file mode 100644
index 8899b512aa19..000000000000
--- a/games-strategy/liquidwar/liquidwar-5.6.4-r2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-DESCRIPTION="Unique multiplayer wargame"
-HOMEPAGE="http://www.ufoot.org/liquidwar/"
-SRC_URI="https://savannah.nongnu.org/download/liquidwar/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-RESTRICT="test"
-
-RDEPEND=">=media-libs/allegro-4.2:0[X]"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-
-	eapply "${FILESDIR}"/${P}-exec-stack.patch \
-		"${FILESDIR}"/${P}-ovflfix.patch
-	sed -i \
-		-e 's:/games::' \
-		-e '/^MANDIR/ s:=.*:= $(mandir)/man6:' \
-		-e '/^PIXDIR/ s:=.*:= /usr/share/pixmaps:' \
-		-e '/^DESKTOPDIR/ s:=.*:= /usr/share/applications/:' \
-		-e '/^INFODIR/ s/=.*/= $(infodir)/' \
-		-e '/^GAMEDIR/ s/exec_prefix/bindir/' \
-		-e '/install/s:-s ::' \
-		-e 's:$(DOCDIR)/txt:$(DOCDIR):g' \
-		-e 's:$(GMAKE):$(MAKE):' \
-		-e '/^DOCDIR/ s:=.*:= /usr/share/doc/$(PF):' Makefile.in \
-		|| die 'sed Makefile.in failed'
-	sed -i \
-		-e '/^GAMEDIR/ s/$(exec_prefix)/@bindir@/' \
-		-e 's:/games::' src/Makefile.in \
-		|| die "sed src/Makefile.in failed"
-	eapply "${FILESDIR}"/${P}-underlink.patch
-}
-
-src_configure() {
-	econf \
-		--disable-doc-ps \
-		--disable-doc-pdf \
-		--disable-target-opt \
-		$(use_enable x86 asm)
-}
-
-src_compile() {
-	# skip build_doc target wrt bug 460344
-	emake build_bin build_data
-}
-
-src_install() {
-	emake DESTDIR="${D}" install_nolink
-	einstalldocs
-	rm -f "${ED}"/usr/share/doc/${PF}/COPYING
-	# Provided desktop file is completely obsolete
-	rm -f "${ED}"/usr/share/applications/liquidwar.desktop
-	make_desktop_entry ${PN} "Liquid War" /usr/share/pixmaps/${PN}.xpm
-}
diff --git a/games-strategy/liquidwar/liquidwar-5.6.5.ebuild b/games-strategy/liquidwar/liquidwar-5.6.5.ebuild
new file mode 100644
index 000000000000..47a0e6ddf7a1
--- /dev/null
+++ b/games-strategy/liquidwar/liquidwar-5.6.5.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop toolchain-funcs
+
+DESCRIPTION="Unique multiplayer wargame"
+HOMEPAGE="https://ufoot.org/liquidwar/"
+SRC_URI="https://ufoot.org/download/liquidwar/v5/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+RDEPEND=">=media-libs/allegro-4.2:0[X]"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-exec-stack.patch
+	"${FILESDIR}"/${P}-gcc10.patch
+	"${FILESDIR}"/${P}-makefile.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e 's:$(GMAKE):$(MAKE):' \
+		-e "/^DOCDIR/ s:=.*:= ${EPREFIX}/usr/share/doc/\$(PF):" Makefile.in \
+		|| die 'sed Makefile.in failed'
+}
+
+src_configure() {
+	tc-export CC
+	econf \
+		--disable-doc-ps \
+		--disable-doc-pdf \
+		$(use_enable x86 asm)
+}
+
+src_compile() {
+	# skip build_doc target wrt bug 460344
+	emake build_bin build_data
+}
+
+src_install() {
+	emake DESTDIR="${D}" install_nolink
+	einstalldocs
+	make_desktop_entry ${PN} "Liquid War" /usr/share/pixmaps/${PN}.xpm
+}