gentoo Easter resync : 12.04.2020

6 files changed, 23 insertions, 7 deletions

diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index a9bd1d7d534a..5f5442341442 100644
--- a/dev-embedded/Manifest.gz
+++ b/dev-embedded/Manifest.gz
diff --git a/dev-embedded/dc-tool-ip/Manifest b/dev-embedded/dc-tool-ip/Manifest
index 28989cecfc58..3111557b5072 100644
--- a/dev-embedded/dc-tool-ip/Manifest
+++ b/dev-embedded/dc-tool-ip/Manifest
@@ -2,4 +2,4 @@ AUX 1.0.4-bfd-update.patch 909 BLAKE2B 02a5b3be9db1c98e01cbda6e75de14bcefa4c8abb
 AUX dc-tool-ip-1.0.4-headers.patch 487 BLAKE2B bfe1eee99d73a0a37428fa8015f3b073762b3f295f83066de09e3cf7efd00aa904d16c9f1cd111be7c8eaa41c755a93024fa8e0210f87d7f4be09c0181a1eb31 SHA512 a83b3d0f214de12fc25ef250f106e325d39e78afacb56db31a7f4c6033e8c848b934260c589967cb6fe1751ca401584b1b66f3593b4cbc2d7c2bcc108d8ab4c2
 DIST dcload-ip-1.0.4-src.tar.gz 104758 BLAKE2B 4c8c52077b047da81341a133272a5569de9e6b304942c181da01a617a00243ace2847bbd380ac723710d91dc43d6de134d3a34e083ef9fa61471ba49ce5021f3 SHA512 c58f574bf13dd44a00395060af4c718593471242366d09dddb234490d20a6e0322a2c3853613aa1c8a5269802cf6434407d3f6c62c934e8b66f8fc1e86a12536
 EBUILD dc-tool-ip-1.0.4.ebuild 970 BLAKE2B 58708d998ae1c0eb9cdb8d839d457dba421d6df4f43d5c01e4e2bf14910445db7530db58afff29bb5bda61491657646e7fd6d7c2fa849c755d86960a9d993539 SHA512 3d1960b451f08bb823f5755c2c1d3298579bb1edcc0d9a3f3e2f7df7264fa02b3fbce3a4265d33f2e8ed27a1760086ca6247f1b2ab0bd77bddc1d49d9480bd53
-MISC metadata.xml 403 BLAKE2B 22b3c6edfd0bb8b5b254247b738dd9ceeb30dbd0aeeed3f27ea0c9d0fd375c04c809a042510ebc69f84d668bcbb4e753ab1d518c288b433d9a1e5283da1903b8 SHA512 eeac6ac902c1f8f2ca47e218722772725f9d4f1ad13c2e8807a3262e802b2b3bbcfb184d3ccb0827be26be2b453960e1fcc8b0b9d32936b12aa11c8fd4c67127
+MISC metadata.xml 328 BLAKE2B 9964bd2ac60606daf86e3106759f41dcc9475b4f4b5f4c8d3cd4b673c9565bac27b364fafeb5d54053dc548afa784f166a846ef6f7f517d8460a41d3c699b4ab SHA512 fb2b6c7f3cd9c73e6ddbeb92effeeb1d6a2a58884eae0ea33913227403f1fbeda9b9691ec09f0f1f89e092e4f669b43a2e056008ecc397eaec0c9534e6fa49a3
diff --git a/dev-embedded/dc-tool-ip/metadata.xml b/dev-embedded/dc-tool-ip/metadata.xml
index 2244c2885a88..c21655b551e0 100644
--- a/dev-embedded/dc-tool-ip/metadata.xml
+++ b/dev-embedded/dc-tool-ip/metadata.xml
@@ -2,9 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-		<email>sh@gentoo.org</email>
-	</maintainer>
-	<maintainer type="project">
 		<email>embedded@gentoo.org</email>
 		<name>Embedded Gentoo</name>
 	</maintainer>
diff --git a/dev-embedded/xa/Manifest b/dev-embedded/xa/Manifest
index 7cfa49a3fd89..49ec8f72b1b2 100644
--- a/dev-embedded/xa/Manifest
+++ b/dev-embedded/xa/Manifest
@@ -1,3 +1,4 @@
+AUX xa-2.3.10-fix-gcc10-fno-common.patch 203 BLAKE2B 9f503900b016956a02d2d9a1103884297e1545c624cb94c079abbc3e795ce803f35cf1c150ea233c2b78f9719ce2d15283a9ff5551c5adcbed55b6e98bf13747 SHA512 3862cad04136200447486fd6ac76298118d56a53c21f9db7aaf8f7ec248c10bd2f3ae610112a6dc5e99944da03ec52bc7cdb33879e6f1cb8fa6e9221f71472ea
 DIST xa-2.3.10.tar.gz 152433 BLAKE2B af9ab28e6596f6c96abd075779670955e7bfe79b3e9e18c5c75f35ffb166c705a0ebb60dcca1928c49a836eefcd7b15d12437579fbe645c0b5ce51e81da92d8d SHA512 08b9994e295495744d5252fa983b111f41d0447cdb32d0c065f8fbd942ffa0899476d6cfebe1162e4aa08b1d0a2d8df74c2a60987d2509b8bca45da670f4a67f
-EBUILD xa-2.3.10.ebuild 567 BLAKE2B 5aa8a1a9c00810a0ae1039ba92338ce97d0a75642eab6a082fca8db223d38fbc3a9b72b9fa454b7ac7e33e002ada1153a883b82eb89e1f3905e71df441653a1e SHA512 7c3affc4a1b726ca880af4e507433b6858e9b973f6dfecae7e428851a2b5b958ebf672ee207b612bc3cdd9c98244b5e2d528ce83ea18d9bda233ec1357334138
+EBUILD xa-2.3.10.ebuild 665 BLAKE2B 04202bdc5799678f851e623fb95b07d90f3465117c414fc4b27dd93c2e53c24ffdb58123f38eadc1d78cc8365da1a68646e401bde1b275fe26ec1874406f84df SHA512 a5290200cefc0ce149f46b7ced678757d3b4d671836da0dc217efb5efda88c20bc553c4531568270e8379f0486e0c7e80307ad17599d92e7d8a34b306a7e511a
 MISC metadata.xml 547 BLAKE2B b527da76f0bb9f9ee7bb45a48f2f6ded265f296efb4babd2f74c3db9777071ebad2f733a45325115565b3e7932b9b3ec1d87129427aefe149f6871804ece5ffe SHA512 780c7e01126675e679037e97de4ddaaca26929326b5803068abbbf0a84218c02873a4db5bfa42704953a71164b62267f80227924edd3d46755a8d6238c0c94c3
diff --git a/dev-embedded/xa/files/xa-2.3.10-fix-gcc10-fno-common.patch b/dev-embedded/xa/files/xa-2.3.10-fix-gcc10-fno-common.patch
new file mode 100644
index 000000000000..5b3486433885
--- /dev/null
+++ b/dev-embedded/xa/files/xa-2.3.10-fix-gcc10-fno-common.patch
@@ -0,0 +1,12 @@
+--- a/src/xap.h
++++ b/src/xap.h
+@@ -35,7 +35,7 @@
+ long gm_ppm(void);
+ long ga_ppm(void);
+ 
+-Datei *filep;
+-char s[MAXLINE];
++extern Datei *filep;
++extern char s[MAXLINE];
+ 
+ #endif /* __XA65_XAP_H__ */
diff --git a/dev-embedded/xa/xa-2.3.10.ebuild b/dev-embedded/xa/xa-2.3.10.ebuild
index 0b4aabb57139..0504b39d1534 100644
--- a/dev-embedded/xa/xa-2.3.10.ebuild
+++ b/dev-embedded/xa/xa-2.3.10.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=7
@@ -11,7 +11,9 @@ SRC_URI="https://www.floodgap.com/retrotech/${PN}/dists/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.3.10-fix-gcc10-fno-common.patch )
 
 src_compile() {
 	emake \
@@ -21,6 +23,10 @@ src_compile() {
 		LDFLAGS="${LDFLAGS}"
 }
 
+src_test() {
+	emake -j1 test
+}
+
 src_install() {
 	emake install DESTDIR="${ED}/usr"
 	einstalldocs