gentoo resync : 05.02.2020

5 files changed, 58 insertions, 3 deletions

diff --git a/app-emulation/ski/Manifest b/app-emulation/ski/Manifest
index 86b9ac7472af..9b1d92d32318 100644
--- a/app-emulation/ski/Manifest
+++ b/app-emulation/ski/Manifest
@@ -1,6 +1,8 @@
 AUX ski-1.3.2-AC_C_BIGENDIAN.patch 2266 BLAKE2B 26ca07d5e23acd9c3e0a7b3fba78e5b16e2957aa657340b1886458d17f2b97f21c1eca0bff9319d667a28b10efbb72666788d39ca5ba7068eef867302c6945dd SHA512 0970007c99f29dd19d4e64f433cd7addec8a316ec68a7e3c07c11ec3849d70086ba262883eb82f66c0517b9bf2c77399d69d72345ca0e8d9cb3723086fe4a6a0
+AUX ski-1.3.2-binutils-2.34.patch 706 BLAKE2B 194f293bcf45acc1c5678004e36dfeb974f645367e32460f7382b8b29dc436e93105883ec40acc6c0918334a6a43b9b879b901df955586d3313a8c7ea4edb955 SHA512 97ec902f92c51d1158975c9ad44586f293c7602d2c17d0fbaa1911294b5f145526b64f186bfa23778e4e33460d4d8b2a285ca1065cf13170f41d40e8a33d5233
 AUX ski-1.3.2-binutils.patch 1039 BLAKE2B 72a03fc70b3473ba760297f97cd8722c6f3b9a2dc247f57c07669ab16c112edff5250b5c79bff192ea28bdbc2024bd746a4139863904c32916f969e6e97f4b83 SHA512 b473ed658a5496c849cbb82dfeaa1913834dde60e2da17d09a4a882e87067236ecf25b807281921c86fc4a2cca5461f2a608e1a4c301d4cfda39507bdfcc4d6a
 AUX ski-1.3.2-configure-withval.patch 634 BLAKE2B 3a32acdfd37d7b2622f6add89ebdb5ca0d55a9ef6bb13f78bc4b6d82638ba63c2473bf12f1971a1aaca83f10ad0061a2d16a031bee50f9dcba5cc2c01efcd86f SHA512 38e612baf0a3fee74c3d3fa0f106b6169eb5d5594b5cfd437ab65f888dfaf151863a0d5b312ebe0b4ff882937fa4a5c2a3b6b0064fc0dabe6fd57990de4eb9ec
+AUX ski-1.3.2-gcc-10.patch 538 BLAKE2B aed07964852d344b9d2888dd4c86a31fd7b2b0c89067fb01cf2c513289faccee1f4bfffafda98298e7a2268d5b4a4c8abdc54c089408b94df0dd7dba0275e25b SHA512 9e4e4c852fce92c6566df35d95e9b35d9c655ab8fe0eb3fb8eef6a76a8241a6b882b2587ec99510368a905e2ddb5d29ffa8aef19316cd7078d94ca87ed258844
 AUX ski-1.3.2-glibc-2.28.patch 240 BLAKE2B 279fe68c7ddb734554fbe7e098eb049d710439c9f3cc63dda231c5f8f1e9551909017bd9945f390a4fe1acd82d8bb9f7ead5ac75bfea4103b4af908397df8d40 SHA512 84913716d3b6ed9ccdfac4bb15ddece97013967c5ae4e22dd6ddc7235e013832131e3f21bcba76bc07cbce4d949e149c8b8df6a59ff2141308f7a550eedbfcdc
 AUX ski-1.3.2-ncurses-config.patch 584 BLAKE2B a6876394e368f1f793bce339618c668e9d117c9206455e7d3cf74372b3214c9984fde52753fb453e73d390a3f57011c7a3406a40daaaee04fc8231fbb40d34d1 SHA512 64bd0b4ee7d7e9117f9907eaf71f92b0b74dc4d1c4724845de31820a9853199f8834d3d01afdfb725c389d45f353e2d8b99264aa5ddff5c3067c22e990cd967e
 AUX ski-1.3.2-no-local-ltdl.patch 366 BLAKE2B 1d4de13c62a474c41aa77ec91db2c6c0da51d65992d2d1dcc15518dd34fbdcd101c9df2a50585ef6cc54b71197d9354ad1f4092b80de2e1714986e7744ae83c6 SHA512 70ecc14b4449065ade95b00b18b79cd6106f3efc1553310b2ae3b6df10f1f31886c9d7c3832e727daf51bd0ce22d53f818fb30b9e8c11dea597315bbeb442f81
@@ -9,5 +11,5 @@ AUX ski-1.3.2-remove-hayes.patch 682 BLAKE2B 5a304115ac6353b1c61ae4ddeeebc821ced
 AUX ski-1.3.2-syscall-linux-includes.patch 397 BLAKE2B dfb72fef3be8110ab5acacb8fa0f33e8c68fc5de873b92398dd4a048307f3d4db47eb2d04a8323ce3748e893e190d42ca5168de442c892edff92834544edad52 SHA512 f0784af8eb8ecc8df92f96f1ce2f714f4cb1a9e60409a06c02cf300316a9680b01be6b6d1f83854b1fb3bd364cf0b08262a99a63190695fd9722691ef1fa3d6f
 AUX ski-1.3.2-uselib.patch 582 BLAKE2B b0d91fed1a01c6d4c2db464a1dbe6c4855a0302eacb21367865a3510b081a95756f1b09f79a015a1e20b3cb87d31e08785a5abed4a661203aec82a4a311538bf SHA512 f119e1a18ef08f40758fa1ddde61a88533b432c75111bba38ffc134edfee66f28ee01336509ed106461bddfc438d1eac48213ab4940e82f5128b924e584b974e
 DIST ski-1.3.2.tar.gz 2715791 BLAKE2B 5e6b237ea21bf410e44dbaa88150d980f2af66728effeab4e8bcef02f27c24069c4bcaf42d3814ad15c3bd759819d468f163b6c64a89408c09d1ffbdc9302c0f SHA512 21f2e1dd87cb517602d4d6ef62707ec6042c1b6ec5dfd063db7315d13bbc3fb47b491c15b7efb0433fc82f27c7924e2d50b2f57fe24e49aeb864ce2c3c2c8bd0
-EBUILD ski-1.3.2-r3.ebuild 1317 BLAKE2B a7f1161ff8d57d89a372b5894fdeb46c9566ffa6b8569e867c85c8dc996e5f3f1564be1ee01c965bfbb85cab5b060c8906f9e5a1b92defe00e5d9faa481ed89b SHA512 25a3a024cb671dcc013c529036923a833e7795079205228687d588b3c649596e0ead8a323a76a192d0c61ff93be02cdade3dff66ca554fc398a165fb2c627b68
-MISC metadata.xml 335 BLAKE2B 079d4ba6e17a3d3351d2ca5021c67a7a87489358d5d0541e60e41105511b36f203713605fb76b84cdda6a799d63a51af0923ca4c58c7c482ca13626d3938136f SHA512 4b9ac18f2d0cbb672eb1af814e0f09a8bcd5b2f9f4cd1f1c30efff18ae2eccd2ea4f166cc3446756733e2bcc581b9a1f7ab62a96234fe9e02f649eac2a011b20
+EBUILD ski-1.3.2-r3.ebuild 1472 BLAKE2B b82c5fe3ae85a93c00fc4faf8acf14d7f44d293b9cb688d73a71cb57ffa573c6128b1a45a1e9ea943fdc98d70dd16619b6a2c658892f0ad26c23c4d438a8b1bc SHA512 cfbc6cadbe87131f283d3a5c062962da10c082f470c1dd10fcbd4f544d5346190625b67f9a98841c745720996c3b4aac222df878693444f56b16ab23fd757248
+MISC metadata.xml 447 BLAKE2B 2c30d29e331f442d9cd41f0ccc5c5d60080a9cea2cf48e6eb60059ee09a7fc647be36957e44cd5d716dde93dfec61bd004e4acfc13c2ad50ba9912a99c1523ca SHA512 b03c5087c9860670af605aa8bed7ad83d9ea9c5b8181395900bec510ac883413053895d83850b07213e9ae31596e301cd45ca622a13ca56ce26c8f0828b84ebb
diff --git a/app-emulation/ski/files/ski-1.3.2-binutils-2.34.patch b/app-emulation/ski/files/ski-1.3.2-binutils-2.34.patch
new file mode 100644
index 000000000000..dcb3f6793fba
--- /dev/null
+++ b/app-emulation/ski/files/ski-1.3.2-binutils-2.34.patch
@@ -0,0 +1,22 @@
+diff --git a/src/linux/dwarf-linux.c b/src/linux/dwarf-linux.c
+index 73be0e6..c4051a3 100644
+--- a/src/linux/dwarf-linux.c
++++ b/src/linux/dwarf-linux.c
+@@ -116,14 +116,14 @@ find_in_section (bfd * bfd, asection * sect, PTR obj)
+   /*
+    * we're looking at loadable code only
+    */
+-  if ((bfd_get_section_flags (bfd, sect) & (SEC_CODE | SEC_ALLOC)) == 0)
++  if ((bfd_section_flags (sect) & (SEC_CODE | SEC_ALLOC)) == 0)
+     return;
+ 
+   /*
+    * check if address belongs to this section
+    */
+-  vma = bfd_get_section_vma (bfd, sect);
+-  size = bfd_section_size (bfd, sect);
++  vma = bfd_section_vma (sect);
++  size = bfd_section_size (sect);
+ 
+   offset = info->address - vma;
+   if (offset >= size)
diff --git a/app-emulation/ski/files/ski-1.3.2-gcc-10.patch b/app-emulation/ski/files/ski-1.3.2-gcc-10.patch
new file mode 100644
index 000000000000..bfe5de33acbf
--- /dev/null
+++ b/app-emulation/ski/files/ski-1.3.2-gcc-10.patch
@@ -0,0 +1,22 @@
+--- a/src/linux/syscall-linux.c
++++ b/src/linux/syscall-linux.c
+@@ -538,7 +538,7 @@ pid_t cons_pid = -1;
+ static int cfd = -1;
+ BOOL trace_syscalls;
+ char *consLog = NULL;
+-extern BOOL noConsole;
++BOOL noConsole;
+ extern BOOL userint;
+ static struct termios sane_ttyIos;
+ 
+--- a/src/platform.c
++++ b/src/platform.c
+@@ -29,7 +29,7 @@
+ #include "platform.h"
+ #include "state.h"
+ 
+-BOOL autoAlloc, noConsole;
++extern BOOL autoAlloc, noConsole;
+ extern char *consLog;
+ extern unsigned va_len, pa_len, rid_len, key_len;
+ extern unsigned mips;
diff --git a/app-emulation/ski/metadata.xml b/app-emulation/ski/metadata.xml
index a82c03848dd3..36a9f93ec0bb 100644
--- a/app-emulation/ski/metadata.xml
+++ b/app-emulation/ski/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>slyfox@gentoo.org</email>
+		<name>Sergei Trofimovich</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>ia64@gentoo.org</email>
 		<name>Gentoo Linux IA-64 Development</name>
diff --git a/app-emulation/ski/ski-1.3.2-r3.ebuild b/app-emulation/ski/ski-1.3.2-r3.ebuild
index 1063017aad06..7fa7d9227e06 100644
--- a/app-emulation/ski/ski-1.3.2-r3.ebuild
+++ b/app-emulation/ski/ski-1.3.2-r3.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=6
@@ -38,11 +38,16 @@ PATCHES=(
 	"${FILESDIR}"/${P}-ncurses-config.patch
 	"${FILESDIR}"/${P}-prototypes.patch
 	"${FILESDIR}"/${P}-glibc-2.28.patch
+	"${FILESDIR}"/${P}-gcc-10.patch #707144
 )
 
 src_prepare() {
 	default
 
+	if has_version ">=sys-libs/binutils-libs-2.34"; then
+		eapply "${FILESDIR}"/${PN}-1.3.2-binutils-2.34.patch
+	fi
+
 	rm -rf libltdl src/ltdl.[ch] macros/ltdl.m4
 
 	AT_M4DIR="macros" eautoreconf