gentoo resync : 25.08.2020

5 files changed, 106 insertions, 42 deletions

diff --git a/games-action/koth/Manifest b/games-action/koth/Manifest
index f7ccf1659781..7fd79394ea24 100644
--- a/games-action/koth/Manifest
+++ b/games-action/koth/Manifest
@@ -1,4 +1,5 @@
-AUX koth-0.8.0-r1-gcc-3.4.patch 628 BLAKE2B e62daab926595507618cc9215612bd11bd901218448cf2a192023ddbd4c13fce70a49f853a50df628adb12c077cd6597b22cbafb67e1ca42394d90defbab6676 SHA512 ca6bfe40d9ab0a08bae833684628422d2b69047ec4aa80df43e0c093184680f8d202180f0ae3d89099b4c45aa481ac28055a1a5deb5afb69e8c397508e46e08e
+AUX koth-0.8.0-autotools.patch 467 BLAKE2B be5f9342bf18bbe292ae4b2f89d94011b81e88e8c80e37aa8da8f39db546a93dd106aa423a09b2b276b6226df09b8eed9c2a5dba9460adff0d75b1e4aaaed65f SHA512 4e3aa06f1dd73505ba4e1ac084e8d71999f41bb6823179cdf3224cc29d976d80b857aac9e0051b70ea27148cb9923a37bf1f29ea8fb763e60c36865ea7c14384
+AUX koth-0.8.0-gcc.patch 1415 BLAKE2B c9ae5cd2e138a0de64f102d39e11328c7353d7114ca8a102559546345a0f7b23b5f5b6f68d6bf6ad6505c877cbe6e7e8279aa3092e32fcf79a20da0006fbfda9 SHA512 382d47fc3c967d461c72ac63668ff32b4ed597cd367301e10fa2cfc89ff672be78427e653af7e29b5aaeb56056740233b2c8743802c74070a800b956e609e3a5
 DIST koth-0.8.0.tar.bz2 140569 BLAKE2B cfcbba838238fbe45bccc800c258290531341623d4a57825f389a01278febe3b99d9459f4294cea9f4520c0dc76ad945266640c89687ab0b77a5348d2b88685a SHA512 edda377be9074298c63e85cad5f37f55dc67f0e9a7d075a94207559265ffbf8a5eadbd2dc0e4a06e535e6da9fcfd309d01141ba8be04cf8960b0229e0ce4ab9f
-EBUILD koth-0.8.0-r1.ebuild 828 BLAKE2B 14d101e06a6a5335fa74bf1a539af2e840df09a5f7921401ebd6fcf980a0aef1e7a52e665ad25db51cb0e06e819f167f5b1bef04192d5410a81e7ab06f1433b2 SHA512 80f209fc59b29c54f13d7fe951841b2be96cd81d6204caa6597cc4ff2c84e3c8f42f29ec9dd5893e2a6519e354edb0473338a4b3afd0b372f467ab767b1e33e0
+EBUILD koth-0.8.0-r1.ebuild 675 BLAKE2B 27900ac6455fac60b0ddd19c33f82c1d2a2090795ae46388746d69d6c2cee92166f86123a3f65d38b14ae370f56cba5c85b815defe8e103f9d34abc482ffa65c SHA512 5809786260ca8abda3e772800da94633f53865c0c42d321b5623ce11a6d2e519216cb5c386ed26ad59a3a710aa0df5a16f70a9a2fa14a59592469e4bebdfd239
 MISC metadata.xml 562 BLAKE2B f5d44dfcf5ed0fa77163ea4ac24d010fe3236130fb0dce1c68b8cb5804e6a5cd088a3b0d14bc573279ed23165d829a2f49516123e57158fd054469271bb20bd5 SHA512 c9bf2b0f6d97e56b9b8d3667fecd9a18bc971f2a396c7bb9a2904ea3e86eec4b625ff73630b4c6a45eea30418e8cfd8b3774a699e45b98b4e44bbb205365d333
diff --git a/games-action/koth/files/koth-0.8.0-autotools.patch b/games-action/koth/files/koth-0.8.0-autotools.patch
new file mode 100644
index 000000000000..0303a0e0bec6
--- /dev/null
+++ b/games-action/koth/files/koth-0.8.0-autotools.patch
@@ -0,0 +1,20 @@
+--- a/configure.in
++++ b/configure.in
+@@ -4,15 +4,14 @@
+ AM_CONFIG_HEADER(config.h)
+ AC_PROG_MAKE_SET
+ 
+-USER_CFLAGS=$CFLAGS
+-
+ dnl Checks for programs.
+ AC_PROG_CC
+ AC_ISC_POSIX
++AM_PROG_AR
+ AC_PROG_RANLIB
+ 
+ 
+-CFLAGS="-g -O2 -Wall -Wimplicit $USER_CFLAGS"
++CFLAGS="${CFLAGS} -Wall -Wimplicit"
+ dnl Checks for library functions.
+ AC_ARG_ENABLE(client, [  --disable-client        disable libggi detection (can only build server)],
+ 			if test $enableval == no; then 
diff --git a/games-action/koth/files/koth-0.8.0-gcc.patch b/games-action/koth/files/koth-0.8.0-gcc.patch
new file mode 100644
index 000000000000..999498da7005
--- /dev/null
+++ b/games-action/koth/files/koth-0.8.0-gcc.patch
@@ -0,0 +1,72 @@
+--- a/src/ballistics.c
++++ b/src/ballistics.c
+@@ -92,6 +92,7 @@
+ 	    break;
+ 	case WALL_LAST:
+ 	    /* just to satisfy gcc -Wall */
++	    ;
+     }
+ }
+ 
+@@ -210,7 +211,7 @@
+ 		break;
+ 	    case WALL_RANDOM:	/* both of this can't happen, */
+ 	    case WALL_LAST:	/* so they are here to satisfy gcc -Wall */
+-
++	    	;
+ 	}
+     }
+     return FLYING;
+--- a/src/gfx.c
++++ b/src/gfx.c
+@@ -51,7 +51,7 @@
+ int gfx_armorBar=0;
+ 
+ /* The maximum value for a color. */
+-#define CMAX ((uint16)(~0))
++#define CMAX ((uint16_t)(~0))
+ #define MAX(a, b)  (((a) > (b)) ? (a) : (b))
+ #define MIN(a, b)  (((a) < (b)) ? (a) : (b))
+ 
+--- a/src/gfx.h
++++ b/src/gfx.h
+@@ -24,7 +24,7 @@
+ #include "terrain.h"
+ 
+ /* The maximum value for a color. */
+-#define CMAX ((uint16)(~0))
++#define CMAX ((uint16_t)(~0))
+ #define MAX_WALLS 6
+ 
+ extern ggi_visual_t gfx_vis;
+--- a/src/log.c
++++ b/src/log.c
+@@ -26,7 +26,7 @@
+ 
+ Levels_log log_level = INTERESTING;
+ 
+-inline void logPrintf(Levels_log level, char *fmt, ...)
++void logPrintf(Levels_log level, char *fmt, ...)
+ {
+     if(log_level < level)
+ 	return;
+--- a/src/log.h
++++ b/src/log.h
+@@ -25,6 +25,6 @@
+ 
+ extern Levels_log log_level;
+ 
+-inline void logPrintf(Levels_log level, char *fmt, ...);
++void logPrintf(Levels_log level, char *fmt, ...);
+ 
+ #endif
+--- a/src/relay.c
++++ b/src/relay.c
+@@ -260,6 +260,7 @@
+ 		    else goto bail;
+ 		    goto nextpkt;
+ 		bail:
++		    ;
+ 		}
+ 	    }	
+ 	}
diff --git a/games-action/koth/files/koth-0.8.0-r1-gcc-3.4.patch b/games-action/koth/files/koth-0.8.0-r1-gcc-3.4.patch
deleted file mode 100644
index 145f17dbccdd..000000000000
--- a/games-action/koth/files/koth-0.8.0-r1-gcc-3.4.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/src/relay.c	2004-11-01 09:19:04.835537536 +0000
-+++ b/src/relay.c	2004-11-01 09:19:59.453234384 +0000
-@@ -260,6 +260,7 @@
- 		    else goto bail;
- 		    goto nextpkt;
- 		bail:
-+		    ;
- 		}
- 	    }	
- 	}
---- a/src/ballistics.c	2004-11-01 09:19:33.132235784 +0000
-+++ b/src/ballistics.c	2004-11-01 09:20:16.849589736 +0000
-@@ -92,6 +92,7 @@
- 	    break;
- 	case WALL_LAST:
- 	    /* just to satisfy gcc -Wall */
-+	    ;
-     }
- }
- 
-@@ -210,7 +211,7 @@
- 		break;
- 	    case WALL_RANDOM:	/* both of this can't happen, */
- 	    case WALL_LAST:	/* so they are here to satisfy gcc -Wall */
--
-+	    	;
- 	}
-     }
-     return FLYING;
diff --git a/games-action/koth/koth-0.8.0-r1.ebuild b/games-action/koth/koth-0.8.0-r1.ebuild
index 988f9bf485dc..3030dcd88d94 100644
--- a/games-action/koth/koth-0.8.0-r1.ebuild
+++ b/games-action/koth/koth-0.8.0-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils flag-o-matic
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="Multiplayer, networked game of little tanks with really big weapons"
 HOMEPAGE="http://www.nongnu.org/koth/"
@@ -11,26 +12,25 @@ SRC_URI="https://savannah.nongnu.org/download/${PN}/default.pkg/${PV}/${P}.tar.b
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~x86"
-IUSE=""
 
 DEPEND="media-libs/libggi"
 RDEPEND="${DEPEND}"
 
 PATCHES=(
-	"${FILESDIR}"/${PF}-gcc-3.4.patch
+	"${FILESDIR}"/${P}-autotools.patch
+	"${FILESDIR}"/${P}-gcc.patch
 )
 
 src_prepare() {
 	default
-	sed -i 's:-g -O2::' configure || die
-	sed -i 's:(uint16):(uint16_t):' src/gfx.c src/gfx.h || die
-	append-cflags -std=gnu89 # build with gcc5 (bug #570730)
+	mv configure.{in,ac} || die
+	eautoreconf
 }
 
 src_install() {
-	DOCS="AUTHORS ChangeLog NEWS README doc/*.txt" \
-		default
-	dodir /etc/koth
+	default
+	dodoc doc/*.txt
+
 	insinto /etc/koth
 	doins src/koth.cfg
 }