gentoo resync : 25.08.2020

6 files changed, 258 insertions, 44 deletions

diff --git a/games-arcade/xtux/Manifest b/games-arcade/xtux/Manifest
index d43713bb9226..ce5b9a87831c 100644
--- a/games-arcade/xtux/Manifest
+++ b/games-arcade/xtux/Manifest
@@ -1,5 +1,7 @@
-AUX xtux-20030306-ldflags.patch 805 BLAKE2B 1d3cda6f7bfb2619507caad5fb5fb769dbfe89fd7e377c9e747e0ec4a515f03079d9c4d34c9ac204f21d504812662676322c643feae68f80ddb9eded0c10668b SHA512 089d03e2ef4072b0d134940771820f151e4e51d95c8f01230a78933e0160fa204dd277b4b0bbd7a4288dbb6fabf1ebe7a976f0ead2096b8eaa21daf82f6c97eb
+AUX xtux-20030306-Makefile.patch 4842 BLAKE2B 19245914aa0716e5fe2c6f106f069d5a1c96ef38c5fb19edd53b03704c2ed9d407341ecb03438f694bdba10b971df0fae66e9369707c2e3c912e7077614cde3d SHA512 f4ba92ececd31a75fcfc80d958493f56f7b822bef5e8ecf2b1269087a8d7b46f836068dc034a6af66ff3ed4b17980e5413d9fff07e02e24b4bb05abf14554d4c
+AUX xtux-20030306-missing-include.patch 585 BLAKE2B 38dffdde1593454d241736572bb37ef6cefbb714aa0006daa1c236df2d68c6daf7f80c42357ec4fac45d3804c53a6af29bba175bea89413eb8516abc53a73b8d SHA512 eeca0a0d7e337a8ed103343e4a25bfdc64614b1ebc06899a8d8b3e2aa467c508ddd6c7c8bab546f7079d6417705dbc2e8516bb85340ed7dd36e02ad5a4994a26
 AUX xtux-20030306-particles.patch 1411 BLAKE2B 22db279e8bdca02029be6a115dc0329893dc69ffd39fcbf773fead770db1cac85c52086bf9bf7e5b23774981f94c86b6858653673f797f082aa3b205bf165443 SHA512 4288325e2e24cbbc2b0407c526d733b028d670d4ce182957392d16675b666c2a9ef44c23227f3acae526bcb439df1e73f13772612ee2c25ac5f373c7863927fd
+AUX xtux-20030306-tux_serv-path.patch 307 BLAKE2B 64f7b9f7156abe6e642eb5205ff75c07e8f69c267139d0523b5b77be13adaa379077bf87f9253ba9df60977aaf5c7d5f8e0283550307b6b1a8dc6e713ccf75a6 SHA512 cf86b26ab078a72591735bbc291449c17ab845149100e0f99480ca7fdef0913eb2be840de8f73e0a9aac3206c6040989cb69184ad8d47973770e2976070814ca
 DIST xtux-src-20030306.tar.gz 1640928 BLAKE2B 0db135f741a978a943035df5b78773bbb3fbbeecc2fd740525614e4f942e7e23b67a6fa5640fa82c2c32d2aa2abe73badc9d341ab0ec06922513a8ed0783ce7a SHA512 edb137b4d6b0fe7d673e8eedffbd9c521800a8e51aff0a36e5aa02d46a157d42142326b334b9c7358cfb5debf4b78a2a9951f82121dd538cfe288cf292a269d4
-EBUILD xtux-20030306-r1.ebuild 1237 BLAKE2B e16eb5e050ddfc154876f12ac5bfb353b85340eaeaa70da1d02a495ddfd4a4ff9a35438ca7c0380b8331f9dcfe752c3752e4934d5e2d194846783c295a0c173c SHA512 c13276f39c98a9c51542716164e4ebe271fb8081cae232cd935f96f5925fcdb094444196b985428bc7fe9ebb86de6ce62b28f787c144d134b4d0453620578ba3
+EBUILD xtux-20030306-r1.ebuild 1169 BLAKE2B b074627a344e7a56dc987c39e59040d860502b89f024b11845d006f3ed1fe2dd2c137253ee0b468fd4c5d2e33f9a70230fcff3c427cd604e050980f5a4403e1f SHA512 1c5c342a2254a32cd680b78277af217c8e150e83a661c0d5fcdc700506c6f4f2de4891fc9457e916909d8332be542a664405f382f30fc264af5fb71e83539b31
 MISC metadata.xml 327 BLAKE2B c3a5163b1311672e516ad8cec744bc8813705ef58da277f566101f8699cf1db7bd519bf80d35b5410ee32185ba3a38ae3f4a04dacd49ed5cfda24dfa45ddea19 SHA512 cda1520a7e746d0b8e78cfe62b83466123b01bc02186b63d365f170bce8477be0f408a73d1436b916538c7c1906a77e73114f8d81fb799d48e7bdb4b0fd5c418
diff --git a/games-arcade/xtux/files/xtux-20030306-Makefile.patch b/games-arcade/xtux/files/xtux-20030306-Makefile.patch
new file mode 100644
index 000000000000..7340dbfd187a
--- /dev/null
+++ b/games-arcade/xtux/files/xtux-20030306-Makefile.patch
@@ -0,0 +1,190 @@
+--- a/src/client/Makefile
++++ b/src/client/Makefile
+@@ -16,13 +16,12 @@
+ 
+ # Programs used in building process
+ MAKE = make
+-CC = gcc
+ 
+ # Where to put the XTux client binary.
+ BINARY = $(TOPLEVEL_PATH)/xtux
+ 
+ # Flags used when compiling
+-CFLAGS = -g -Wall -O2 -DDATADIR=\"$(DATADIR)\"
++CPPFLAGS += -DDATADIR=\"$(DATADIR)\"
+ 
+ # Paths to header files
+ X11_INC = -I$(X11_PATH)/include
+@@ -48,8 +47,8 @@
+ 
+ #Apps
+ client: $(OBJECTS)
+-	$(CC) -o $(BINARY) $(CFLAGS) $(OBJECTS) $(XTUXLIB) $(MATHLIB) $(X11LIB) $(XPMLIB) $(SOCKLIB) $(GGZLIB)
++	$(CC) $(LDFLAGS) -o $(BINARY) $(CFLAGS) $(OBJECTS) $(XTUXLIB) $(MATHLIB) $(X11LIB) $(XPMLIB) $(SOCKLIB) $(GGZLIB)
+ 
+ # OBJECTS
+ .c.o:	client.h $*.c
+-	$(CC) $(CFLAGS) -c $*.c $(COMMON_INC) $(X11_INC) $(GGZ_INC)
++	$(CC) $(CFLAGS) $(CPPFLAGS) -c $*.c $(COMMON_INC) $(X11_INC) $(GGZ_INC)
+--- a/src/common/Makefile
++++ b/src/common/Makefile
+@@ -1,9 +1,6 @@
+ # Makefile for stuff that's common between server & client.
+ 
+-CC	= gcc
+-CFLAGS	= -g -Wall -O2 -DDATADIR=\"$(DATADIR)\"
+-AR	= ar
+-RANLIB	= ranlib
++CPPFLAGS += -DDATADIR=\"$(DATADIR)\"
+ 
+ OBJECTS	= common.o timing.o net.o entity_type.o weapon_type.o map.o maths.o datafile.o
+ XTUXLIB = xtuxlib.a
+@@ -18,4 +15,4 @@
+ 	${RANLIB} $@
+ 
+ .c.o:	xtux.h $*.c $*.h
+-	$(CC) $(CFLAGS) -c $*.c $(COMMON_INC)
++	$(CC) $(CFLAGS) $(CPPFLAGS) -c $*.c $(COMMON_INC)
+--- a/src/ggz/client/Makefile
++++ b/src/ggz/client/Makefile
+@@ -61,7 +61,6 @@
+ host_alias = i586-pc-linux-gnu
+ host_triplet = i586-pc-linux-gnu
+ AS = @AS@
+-CC = gcc
+ CPP = gcc -E
+ DLLTOOL = @DLLTOOL@
+ EASYSOCK_MAJOR_VERSION = 0
+@@ -79,7 +78,6 @@
+ NM = /usr/bin/nm -B
+ OBJDUMP = @OBJDUMP@
+ PACKAGE = easysock
+-RANLIB = ranlib
+ VERSION = 0.2.0
+ 
+ noinst_LIBRARIES = libggz.a
+@@ -92,13 +90,9 @@
+ 
+ 
+ DEFS = -DHAVE_CONFIG_H -I. -I$(srcdir) -I..
+-CPPFLAGS = 
+-LDFLAGS = 
+ LIBS = 
+ libggz_a_LIBADD = 
+ libggz_a_OBJECTS =  ggz.o
+-AR = ar
+-CFLAGS = -g -O2
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+--- a/src/ggz/easysock/Makefile
++++ b/src/ggz/easysock/Makefile
+@@ -61,7 +61,6 @@
+ host_alias = i586-pc-linux-gnu
+ host_triplet = i586-pc-linux-gnu
+ AS = @AS@
+-CC = gcc
+ CPP = gcc -E
+ DLLTOOL = @DLLTOOL@
+ EASYSOCK_MAJOR_VERSION = 0
+@@ -79,7 +78,6 @@
+ NM = /usr/bin/nm -B
+ OBJDUMP = @OBJDUMP@
+ PACKAGE = easysock
+-RANLIB = ranlib
+ VERSION = 0.2.0
+ 
+ noinst_LIBRARIES = libeasysock.a
+@@ -92,13 +90,9 @@
+ 
+ 
+ DEFS = -DHAVE_CONFIG_H -I. -I$(srcdir) -I..
+-CPPFLAGS = 
+-LDFLAGS = 
+ LIBS = 
+ libeasysock_a_LIBADD = 
+ libeasysock_a_OBJECTS =  easysock.o
+-AR = ar
+-CFLAGS = -g -O2
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+--- a/src/ggz/Makefile
++++ b/src/ggz/Makefile
+@@ -61,7 +61,6 @@
+ host_alias = i586-pc-linux-gnu
+ host_triplet = i586-pc-linux-gnu
+ AS = @AS@
+-CC = gcc
+ CPP = gcc -E
+ DLLTOOL = @DLLTOOL@
+ EASYSOCK_MAJOR_VERSION = 0
+@@ -79,7 +78,6 @@
+ NM = /usr/bin/nm -B
+ OBJDUMP = @OBJDUMP@
+ PACKAGE = easysock
+-RANLIB = ranlib
+ VERSION = 0.2.0
+ 
+ SUBDIRS = easysock server client
+--- a/src/ggz/server/Makefile
++++ b/src/ggz/server/Makefile
+@@ -61,7 +61,6 @@
+ host_alias = i586-pc-linux-gnu
+ host_triplet = i586-pc-linux-gnu
+ AS = @AS@
+-CC = gcc
+ CPP = gcc -E
+ DLLTOOL = @DLLTOOL@
+ EASYSOCK_MAJOR_VERSION = 0
+@@ -79,7 +78,6 @@
+ NM = /usr/bin/nm -B
+ OBJDUMP = @OBJDUMP@
+ PACKAGE = easysock
+-RANLIB = ranlib
+ VERSION = 0.2.0
+ 
+ INCLUDES = -I$(top_srcdir)/easysock
+@@ -94,13 +92,9 @@
+ 
+ 
+ DEFS = -DHAVE_CONFIG_H -I. -I$(srcdir) -I..
+-CPPFLAGS = 
+-LDFLAGS = 
+ LIBS = 
+ libggzd_a_LIBADD = 
+ libggzd_a_OBJECTS =  ggz.o
+-AR = ar
+-CFLAGS = -g -O2
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+--- a/src/server/Makefile
++++ b/src/server/Makefile
+@@ -11,14 +11,11 @@
+ COMMON_PATH = $(TOPLEVEL_PATH)/src/common
+ GGZ_PATH= $(TOPLEVEL_PATH)/src/ggz
+ 
+-# Programs used in building process
+-CC = gcc
+-
+ # Where to put the XTux client binary.
+ BINARY = $(TOPLEVEL_PATH)/tux_serv
+ 
+ # Flags used when compiling
+-CFLAGS = -g -Wall -O2 -DDATADIR=\"$(DATADIR)\"
++CPPFLAGS += -DDATADIR=\"$(DATADIR)\"
+ 
+ # Paths to header files
+ COMMON_INC = -I$(COMMON_PATH)
+@@ -41,8 +38,8 @@
+ 
+ #Apps
+ server:	$(OBJECTS)
+-	$(CC) -o $(BINARY) $(OBJECTS) $(XTUXLIB) $(MATHLIB) $(SOCKLIB) $(GGZLIB)
++	$(CC) $(LDFLAGS) -o $(BINARY) $(OBJECTS) $(XTUXLIB) $(MATHLIB) $(SOCKLIB) $(GGZLIB)
+ 
+ # OBJECTS
+ .c.o:	server.h $*.h $*.c
+-	$(CC) $(CFLAGS) -c $*.c $(COMMON_INC) $(GGZ_INC)
++	$(CC) $(CFLAGS) $(CPPFLAGS) -c $*.c $(COMMON_INC) $(GGZ_INC)
diff --git a/games-arcade/xtux/files/xtux-20030306-ldflags.patch b/games-arcade/xtux/files/xtux-20030306-ldflags.patch
deleted file mode 100644
index 4a4877a6d65a..000000000000
--- a/games-arcade/xtux/files/xtux-20030306-ldflags.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/client/Makefile.old	2010-09-30 18:08:16.000000000 +0200
-+++ b/src/client/Makefile	2010-09-30 18:08:41.000000000 +0200
-@@ -48,7 +48,7 @@
- 
- #Apps
- client: $(OBJECTS)
--	$(CC) -o $(BINARY) $(CFLAGS) $(OBJECTS) $(XTUXLIB) $(MATHLIB) $(X11LIB) $(XPMLIB) $(SOCKLIB) $(GGZLIB)
-+	$(CC) -o $(BINARY) $(LDFLAGS) $(CFLAGS) $(OBJECTS) $(XTUXLIB) $(MATHLIB) $(X11LIB) $(XPMLIB) $(SOCKLIB) $(GGZLIB)
- 
- # OBJECTS
- .c.o:	client.h $*.c
---- a/src/server/Makefile.old	2010-09-30 18:09:55.000000000 +0200
-+++ b/src/server/Makefile	2010-09-30 18:10:16.000000000 +0200
-@@ -41,7 +41,7 @@
- 
- #Apps
- server:	$(OBJECTS)
--	$(CC) -o $(BINARY) $(OBJECTS) $(XTUXLIB) $(MATHLIB) $(SOCKLIB) $(GGZLIB)
-+	$(CC) $(LDFLAGS) -o $(BINARY) $(OBJECTS) $(XTUXLIB) $(MATHLIB) $(SOCKLIB) $(GGZLIB)
- 
- # OBJECTS
- .c.o:	server.h $*.h $*.c
diff --git a/games-arcade/xtux/files/xtux-20030306-missing-include.patch b/games-arcade/xtux/files/xtux-20030306-missing-include.patch
new file mode 100644
index 000000000000..f7a655eecadb
--- /dev/null
+++ b/games-arcade/xtux/files/xtux-20030306-missing-include.patch
@@ -0,0 +1,29 @@
+--- a/src/client/cl_net.c
++++ b/src/client/cl_net.c
+@@ -4,7 +4,7 @@
+  */
+ 
+ #include <unistd.h>
+-#include <sys/signal.h>
++#include <signal.h>
+ #include <fcntl.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+--- a/src/client/misc.c
++++ b/src/client/misc.c
+@@ -1,4 +1,5 @@
+ #include <X11/Xlib.h>
++#include <limits.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+--- a/src/ggz/client/ggz.c
++++ b/src/ggz/client/ggz.c
+@@ -33,6 +33,7 @@
+ #include <unistd.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ 
+ static char *name=NULL;
+ static int ggz_sock;
diff --git a/games-arcade/xtux/files/xtux-20030306-tux_serv-path.patch b/games-arcade/xtux/files/xtux-20030306-tux_serv-path.patch
new file mode 100644
index 000000000000..87e6043f2178
--- /dev/null
+++ b/games-arcade/xtux/files/xtux-20030306-tux_serv-path.patch
@@ -0,0 +1,13 @@
+--- a/src/client/menu.c
++++ b/src/client/menu.c
+@@ -726,8 +726,8 @@
+ 	for( i=0 ; i<3 ; i++ )
+ 	    close(i); /* Close STD-IN, -OUT, -ERR */
+ 
+-	system("./tux_serv -e");
+-	/* execlp( "./tux_serv", "-e" );
++	system("tux_serv -e");
++	/* execlp( "tux_serv", "-e" );
+ 	   perror("execlp"); */
+ 	exit(-1);
+     }
diff --git a/games-arcade/xtux/xtux-20030306-r1.ebuild b/games-arcade/xtux/xtux-20030306-r1.ebuild
index 929e81c88666..55e94f38231a 100644
--- a/games-arcade/xtux/xtux-20030306-r1.ebuild
+++ b/games-arcade/xtux/xtux-20030306-r1.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit desktop
+EAPI=7
+
+inherit desktop toolchain-funcs
 
 DESCRIPTION="Multiplayer Gauntlet-style arcade game"
 HOMEPAGE="http://xtux.sourceforge.net/"
@@ -11,30 +12,27 @@ SRC_URI="mirror://sourceforge/xtux/xtux-src-${PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 DEPEND="x11-libs/libXpm"
 RDEPEND="${DEPEND}
-	media-fonts/font-adobe-75dpi
-"
+	media-fonts/font-adobe-75dpi"
 
 S="${WORKDIR}/${PN}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-Makefile.patch
+	"${FILESDIR}"/${P}-particles.patch
+	"${FILESDIR}"/${P}-tux_serv-path.patch
+	"${FILESDIR}"/${P}-missing-include.patch
+)
+
 src_prepare() {
 	default
+	find data/ -type d -name .xvpics -exec rm -rf \{\} + || die
+}
 
-	find data/ -type d -name .xvpics -exec rm -rf \{\} +
-	sed -i \
-		-e "s:-g -Wall -O2:${CFLAGS}:" \
-		src/{client,common,server}/Makefile \
-		|| die "sed failed"
-	sed -i \
-		-e "s:./tux_serv:tux_serv:" \
-		src/client/menu.c \
-		|| die "sed failed"
-
-	eapply "${FILESDIR}/${P}-particles.patch" \
-		"${FILESDIR}"/${P}-ldflags.patch
+src_configure() {
+	tc-export AR CC RANLIB
 }
 
 src_compile() {
@@ -47,9 +45,13 @@ src_compile() {
 
 src_install() {
 	dobin xtux tux_serv
-	insinto "/usr/share/xtux"
-	doins -r data/
-	dodoc AUTHORS CHANGELOG README README.GGZ doc/*
+
+	einstalldocs
+	dodoc -r doc/.
+
+	insinto /usr/share/xtux
+	doins -r data
+
 	newicon data/images/icon.xpm ${PN}.xpm
 	make_desktop_entry xtux "Xtux"
 }