gentoo resync : 25.11.2020

3 files changed, 98 insertions, 9 deletions

diff --git a/games-action/0verkill/0verkill-0.16-r4.ebuild b/games-action/0verkill/0verkill-0.16-r4.ebuild
index e1b5419bf8c6..39ebed3ca4cb 100644
--- a/games-action/0verkill/0verkill-0.16-r4.ebuild
+++ b/games-action/0verkill/0verkill-0.16-r4.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools
 
@@ -18,13 +18,14 @@ DEPEND="X? ( x11-libs/libXpm )"
 RDEPEND=${DEPEND}
 
 PATCHES=(
-		"${FILESDIR}"/${P}-docs.patch
-		"${FILESDIR}"/${P}-home-overflow.patch
-		"${FILESDIR}"/${P}-segv.patch
-		"${FILESDIR}"/${P}-gentoo-paths.patch
-		"${FILESDIR}"/${P}-ovflfix.patch
-		"${FILESDIR}"/${P}-CC.patch
-		"${FILESDIR}"/${P}-underflow-check.patch #136222
+	"${FILESDIR}"/${P}-docs.patch
+	"${FILESDIR}"/${P}-home-overflow.patch
+	"${FILESDIR}"/${P}-segv.patch
+	"${FILESDIR}"/${P}-gentoo-paths.patch
+	"${FILESDIR}"/${P}-ovflfix.patch
+	"${FILESDIR}"/${P}-CC.patch
+	"${FILESDIR}"/${P}-underflow-check.patch #136222
+	"${FILESDIR}"/${P}-fno-common.patch
 )
 
 src_prepare() {
diff --git a/games-action/0verkill/Manifest b/games-action/0verkill/Manifest
index f5900b7dd5d5..87dc92a63a58 100644
--- a/games-action/0verkill/Manifest
+++ b/games-action/0verkill/Manifest
@@ -1,10 +1,11 @@
 AUX 0verkill-0.16-CC.patch 3795 BLAKE2B b780eaaecad8d93e7b2bdba5b54038408b1b1fabe9eb1580524965110387400a8af42bac0ae07dbfddd39a63f6584316a2373f66bbcde8fa920291c540af0af1 SHA512 ea3c848d20e4a3ce197104dac2ff26948c7bdd77eb03a7492f6d62cf6cb316c12a38f3d4555bdac87582692ce4ff15794c2996a6015a2ea18398cb84b8dee022
 AUX 0verkill-0.16-docs.patch 1477 BLAKE2B 814d3974a5017bb3568f6ef9ea28aae51e8915d3028c4b5dc01e126853f46585ced6eb7624320510169b02cc18525f73657791b174fc2613a74e2985760466fb SHA512 a1ce9ca8083855b77747f0ea32587651d9e7bdf3f41406bed6e8f76debd7fe475681a1a59571b3244a65864700db18bc5fe48858113ea22ee00cd7feff13438d
+AUX 0verkill-0.16-fno-common.patch 1719 BLAKE2B d81444dd770ce16de4b0dd52c936ca1a23f9f067568eac0983bbd2e7d0caa91779a58c7217c1ecb5eef8b00a717664ca64df1c03a1d0fa23e42eb5336c750f19 SHA512 29b048a532062d3abf338eb15bf328ae4093c40eb6310c597ffe139e295946e25062a84b99e94a6271ff8cebc53228e7d358c8cc4b4cee85b82d2995368db8f8
 AUX 0verkill-0.16-gentoo-paths.patch 530 BLAKE2B a3d00af6fdf1cdefedc3c673e9defa8b2eae6756a42a11600f2a508d1f7d01190d228c1c7f34442dafd68f4ee4a1bee3476cdfe81b71913494fd718f02200981 SHA512 9419b990df205c93baf4d2e2391269f2543bc2b6ba9a3d0219983be518cce01d4a1384ce9cc0dfd8ffba743e8879658b70859e6f7a4df0b97a47186dd90b3337
 AUX 0verkill-0.16-home-overflow.patch 724 BLAKE2B 186df84d2fdfacfd576eb20db8f61228fd2bfe6e48c9e4e8674584376efe5bec22468c43f4b94e974e5ba2995f1784a0400495286599b1f1a0ddb77989fc14f4 SHA512 379edf4f8f9bd31d38bd39812bd0602429afb4254e040cb9f5677764bfe4e34fede5f6e0d07c27e691c9682e205c78fa53109b8c1e4ca6be509d06e752eb08b5
 AUX 0verkill-0.16-ovflfix.patch 805 BLAKE2B 206ca5dc584e09bdaab577e559bc45cd9f9be2c6256dc27b37eba6db5ad3edf3ac4c9c9778c0691cc812b839045b3c865635ff39cfbcf3716f74d98b72173c4e SHA512 ad4f57d6d44c663af4d7a2b75c680ad287f582a5c7b4038e392bdc6425c5819de719e0dadd38e45d784d077f22eb5d098fd0e65c7ecb8bd29824b4fb81032220
 AUX 0verkill-0.16-segv.patch 1560 BLAKE2B c7ab421261b7168d53c77b7baf800cdc4b4e3bb1c5756078729a17f82c391ce9276ab846b65428eae5f0513facc995b90f182ce810c81dee70eb23ded69d0f19 SHA512 05ce966d80cf199a9602cb7143a2d7e8479ccb4b03da2275dc8a93a9065d387fe15426c48559279acb73eb3c371306a02706de899d5c6a97c123319426b3f6bc
 AUX 0verkill-0.16-underflow-check.patch 675 BLAKE2B 12ebde16b9eb4e825a34259103fec200d174e9b9b3ee3d9b689a47f53406abb7c36e8c5cc9d444cd53d84553cc18658bdc7346c02bced87ed4279189af33dd87 SHA512 3b5bff2c18c1862fadbb3d932be23f35559ed9eb3ffb979cf11c50bbac9fff8928b5ead8349ddfc78c84d07a5d1afe4431af56263568b3b82fd7cb015f442e42
 DIST 0verkill-0.16.tgz 276579 BLAKE2B 125a441bfce8433f750180653323059409495c41ff318cec58c31840102739d7a911cd73c07e64ea459c8dd4062fd8bbdbd4a26b6b280b359fe7f61d52ef5ae2 SHA512 6ab273085f2be3a6d0a2b785a51a9bfd52add0212b3c8522b22255c4e3e48a9470f20d9d678158233da9c9465563279079c29ca5526d322247f2ef1d74107144
-EBUILD 0verkill-0.16-r4.ebuild 1381 BLAKE2B af13b0674049c56dac5832ce656971c4473cd178b719695b283ad5b750a641ecbd0fad55c07466872c7e8abbe7d1f0bc0303c72b7e76b086a3ec6cac1dec9cb0 SHA512 c241a1d91dfb8753c6a55fd19029fe4bdcd0097867e7bc48de73160d568930055fdd6c2944a1654381ca667aaccf35af0d6d42eb555b0246c5733a8decec897c
+EBUILD 0verkill-0.16-r4.ebuild 1411 BLAKE2B 5fd1b57a0d88aaff8f0234638c2783d677c79a2f61bc173bd47e4297b030ecc9ebb0214eb949d8c8b6a44f8f921157f98c05465fb1aff91550c3299342e421ca SHA512 852d2ef98319fadc755311fe27784f13406fc1f05121c86fd54343acfc866589414166b9b1ac360899256796bb6617d0db76776bb3289add9b0e24fab8ddda36
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-action/0verkill/files/0verkill-0.16-fno-common.patch b/games-action/0verkill/files/0verkill-0.16-fno-common.patch
new file mode 100644
index 000000000000..bf03ff424e2f
--- /dev/null
+++ b/games-action/0verkill/files/0verkill-0.16-fno-common.patch
@@ -0,0 +1,87 @@
+--- a/bot.c
++++ b/bot.c
+@@ -104,7 +104,7 @@
+ 
+ /* objects */
+ struct object_list objects;
+-struct object_list *last_obj;
++extern struct object_list *last_obj;
+ struct it* hero;
+ 
+ unsigned long_long game_start_offset; /* time difference between game start on this machine and on server */
+--- a/client.c
++++ b/client.c
+@@ -97,7 +97,7 @@
+ 
+ /* objects */
+ struct object_list objects;
+-struct object_list *last_obj;
++extern struct object_list *last_obj;
+ struct it* hero;
+ 
+ /* important sprites */
+--- a/data.c
++++ b/data.c
+@@ -13,6 +13,9 @@
+ #include "md5.h"
+ #include "error.h"
+ 
++unsigned char *weapon_name[ARMS];
++struct obj_attr_type obj_attr[N_TYPES];
++struct weapon_type weapon[ARMS];
+ 
+ #ifdef TRI_D
+ int tri_d=0;
+--- a/data.h
++++ b/data.h
+@@ -62,7 +62,7 @@
+ 
+ #define ARMS 5
+ 
+-unsigned char *weapon_name[ARMS];
++extern unsigned char *weapon_name[ARMS];
+ 
+ /* STATUS
+ 0: walk
+@@ -91,7 +91,8 @@
+ 		      bit 1=server updates
+ 		      bit 2=server sends updates to clients
+ 		      */
+-}obj_attr[N_TYPES];
++};
++extern struct obj_attr_type obj_attr[N_TYPES];
+ 
+ 
+ /* weapon attribut table */
+@@ -107,7 +108,8 @@
+ 	unsigned char add_ammo;
+ 	unsigned char max_ammo;
+ 	my_double shell_xspeed,shell_yspeed;
+-}weapon[ARMS];
++};
++extern struct weapon_type weapon[ARMS];
+ 
+ 
+ /* object in the game */
+--- a/editor.c
++++ b/editor.c
+@@ -26,7 +26,7 @@
+ int oldx=0,oldy=0;  /* old cursor position */
+ 
+ struct object_list objects;
+-struct object_list *last_obj;
++extern struct object_list *last_obj;
+ int level_number;
+ 
+ 
+--- a/server.c
++++ b/server.c
+@@ -100,7 +100,7 @@
+ struct object_list objects;
+ 
+ struct player_list *last_player;
+-struct object_list *last_obj;
++extern struct object_list *last_obj;
+ 
+ 
+ #ifdef WIN32