gentoo resync : 14.05.2020

4 files changed, 83 insertions, 1 deletions

diff --git a/net-im/spectrum2/Manifest b/net-im/spectrum2/Manifest
index 3f9ad045de4e..169edb810065 100644
--- a/net-im/spectrum2/Manifest
+++ b/net-im/spectrum2/Manifest
@@ -1,6 +1,8 @@
+AUX spectrum2-2.0.12-boost-173-compatibility.patch 652 BLAKE2B 496e0fb33f3e88775f91c028e6e89f74c3d7d72b09cd1818712b2da5a54b315fdbf00ab9a7525cca744070061d79f32fe3764f2700d695b37a8b308de08b8f88 SHA512 999e9330c4f0fbd1883df28d7fbe15fd40b1a492e6b925900734df2f493fa4241f2a234a1fd3db2b7dc77ddfef66026ab1a656806c17ae7f1fd8f75f9cdf0199
+AUX spectrum2-2.0.12-gcc-10-compatibility.patch 1731 BLAKE2B 5c0c828ee2bfc51affbb44e06b6a53414c608173be799e92c5ecc76a7411cd6cba5a818b7a4df80b209c64c8c0d543fa10077fe8e45f2014f84b614231b20c58 SHA512 228ccf52a17a88e18e5fe97da1ef39c207142286abc5b018fab08c2f3bc96f13fac89147406a23fbd986b35ad23da9b34239497a830396ae2864708f82925505
 AUX spectrum2.initd 1332 BLAKE2B ee4a9f62ccb909bb824df485dc56c59fe935e77dcfc0354b94749a577b9121352bd56e5d0adbae161da1afc7c451d18b36689844429b46fe39b2e364ffd8c363 SHA512 d780066a00144f3ec20311b462fd29986a486af7ce5ae88e788113397d6cb6ab0800119a5d71077216ee1637ff49cd2307e9265545357b4de50bf907c80feb9c
 AUX spectrum2.service 222 BLAKE2B 58227bb8d49dac2a43d41d9a1e16b9ad804fb540a1e37fc0ec58e23e7412c5a9e0a931fe41d37430be5b77d0bc33fc17870b885995185e29a7ccd2da73022dc8 SHA512 c50d83e6afadc798b90f4df5b2f473031dadb8e32dff0c1120dc2345a3fe37a86566d6d975d22d310e0dd6d2c602d674f6a17f4df2e730e71aaf484a30aa97c2
 AUX spectrum2.tmpfiles-r1 44 BLAKE2B 262e14134a78bc5955fc8ec750ceec94b6fd99fbb65365e28c6dab6f80b0941197899bec6a99d2c5ae21ecaf750013c5c909791c86a609893a4b431597323a59 SHA512 151c93d490f58309fe25bc3ee13ec9987e024c3aec4e58fe399016307f8b78aa7721f3b86bc51373aee7cebe9ab75273f0c48c7c840562ecd2e69d2ce44eba53
 DIST spectrum2-2.0.12.tar.gz 839711 BLAKE2B 22dbc201135008effbd1aac52a708f5c942bd9a3c4a359622d1eb21ce104bdd3a6be64f1cb2ad5950b51e5f1772d77fce088d4a61a56532d970901656176d3f7 SHA512 bcd2797877583e6b59e5f1da430ed049e5bcdddfa9698f6d845f020847405ff8ee01b595d47d414105153e2a00e9a8fac171f45db5d39f72ddf0f6588bc71a36
-EBUILD spectrum2-2.0.12-r2.ebuild 2632 BLAKE2B ba13a6558905ef07680dee10fc76761cddae36e286730a86ddf430aef0953afe3fd80fe971a5714bf4b5db158a83a91f3973c793a5bcec5fe774a41fc204190e SHA512 2cd0a1bc261e7e821e4d7118cd6fe3c556837a7289ff619a686e5bb041f25a6f2493bc3aba41451a6ed2baa614706e06befab02c1db0d269cb183e31801ae25a
+EBUILD spectrum2-2.0.12-r2.ebuild 2742 BLAKE2B 6a75b45f4ebf98deb7f8061fe99d0c8b15f09d34c5991eaaf2119e6bfe312c702f698a15b7dcd09dbdd931c0d67ce5437f02a2000cdc8bac357fdb1da1902413 SHA512 3301190f242f2aa412a0ff1b22ff3e640e472cc701c8e541ab953d82ade39e6f571aa1dcd61cff5736666a09f956b13f0f301ed8b302ecc5d088249eb3a64efb
 MISC metadata.xml 1140 BLAKE2B 279808a98359761ce2620d44575f320de77b5b19f795d55c9b3b16f13eec2ab5fd900c00adef81ba87aacd41d9527ca998bcd27fc6a7d3c3c61d668791f501a4 SHA512 8adf9a85df87528db06d13c830dd96bb2aa77a3d22bb5701c23db0951ac67d7b6b29c8ffa5af11a6bd15e84e7a0722ea99f18e7b6f9ca00b5b42dfc36d3a1a7d
diff --git a/net-im/spectrum2/files/spectrum2-2.0.12-boost-173-compatibility.patch b/net-im/spectrum2/files/spectrum2-2.0.12-boost-173-compatibility.patch
new file mode 100644
index 000000000000..b9a8adeee5a8
--- /dev/null
+++ b/net-im/spectrum2/files/spectrum2-2.0.12-boost-173-compatibility.patch
@@ -0,0 +1,21 @@
+From 1a6ede2dbf0f621e3e6864675befcbc32e02c8b6 Mon Sep 17 00:00:00 2001
+From: Conrad Kostecki <kostecki@his.de>
+Date: Thu, 14 May 2020 10:34:43 +0200
+Subject: [PATCH] Fix compilation with boost-1.73
+
+Signed-off-by: Conrad Kostecki <conrad@kostecki.com>
+---
+ include/transport/ThreadPool.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/include/transport/ThreadPool.h b/include/transport/ThreadPool.h
+index 5902f965..ffd07c8e 100644
+--- a/include/transport/ThreadPool.h
++++ b/include/transport/ThreadPool.h
+@@ -1,5 +1,6 @@
+ #pragma once 
+ 
++#include <boost/bind.hpp>
+ #include <boost/thread.hpp>
+ #include <boost/thread/mutex.hpp>
+ #include <queue>
diff --git a/net-im/spectrum2/files/spectrum2-2.0.12-gcc-10-compatibility.patch b/net-im/spectrum2/files/spectrum2-2.0.12-gcc-10-compatibility.patch
new file mode 100644
index 000000000000..ad13208b3e13
--- /dev/null
+++ b/net-im/spectrum2/files/spectrum2-2.0.12-gcc-10-compatibility.patch
@@ -0,0 +1,54 @@
+From 95e6968c0f8c95f6bd817e5081e0b10dea9d4269 Mon Sep 17 00:00:00 2001
+From: Conrad Kostecki <kostecki@his.de>
+Date: Wed, 13 May 2020 14:22:27 +0200
+Subject: [PATCH] Fix dfrotz compilation with GCC >= 10
+
+Since GCC enables by default -fno-common,
+the compilation of dfrotz due multiple definitions will fail.
+
+Signed-off-by: Conrad Kostecki <conrad@kostecki.com>
+---
+ backends/frotz/dfrotz/dumb/dumb_init.c   | 2 +-
+ backends/frotz/dfrotz/dumb/dumb_input.c  | 2 +-
+ backends/frotz/dfrotz/dumb/dumb_output.c | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/backends/frotz/dfrotz/dumb/dumb_init.c b/backends/frotz/dfrotz/dumb/dumb_init.c
+index 4b9c6704..35295b74 100644
+--- a/backends/frotz/dfrotz/dumb/dumb_init.c
++++ b/backends/frotz/dfrotz/dumb/dumb_init.c
+@@ -7,7 +7,7 @@
+ 
+ #include "dumb_frotz.h"
+ 
+-f_setup_t f_setup;
++extern f_setup_t f_setup;
+ 
+ #define INFORMATION "\
+ An interpreter for all Infocom and other Z-Machine games.\n\
+diff --git a/backends/frotz/dfrotz/dumb/dumb_input.c b/backends/frotz/dfrotz/dumb/dumb_input.c
+index 4149b2b0..88fc8ae5 100644
+--- a/backends/frotz/dfrotz/dumb/dumb_input.c
++++ b/backends/frotz/dfrotz/dumb/dumb_input.c
+@@ -5,7 +5,7 @@
+  */
+ 
+ #include "dumb_frotz.h"
+-f_setup_t f_setup;
++extern f_setup_t f_setup;
+ 
+ static char runtime_usage[] =
+   "DUMB-FROTZ runtime help:\n"
+diff --git a/backends/frotz/dfrotz/dumb/dumb_output.c b/backends/frotz/dfrotz/dumb/dumb_output.c
+index 9e505167..6dc7db82 100644
+--- a/backends/frotz/dfrotz/dumb/dumb_output.c
++++ b/backends/frotz/dfrotz/dumb/dumb_output.c
+@@ -7,7 +7,7 @@
+ 
+ #include "dumb_frotz.h"
+ 
+-f_setup_t f_setup;
++extern f_setup_t f_setup;
+ 
+ static bool show_line_numbers = FALSE;
+ static bool show_line_types = -1;
diff --git a/net-im/spectrum2/spectrum2-2.0.12-r2.ebuild b/net-im/spectrum2/spectrum2-2.0.12-r2.ebuild
index 0bc829465f94..e2a557eb7113 100644
--- a/net-im/spectrum2/spectrum2-2.0.12-r2.ebuild
+++ b/net-im/spectrum2/spectrum2-2.0.12-r2.ebuild
@@ -64,6 +64,11 @@ DEPEND="
 # Tests are currently restricted, as they do completly fail
 RESTRICT="test"
 
+PATCHES="
+	"${FILESDIR}/${P}-boost-173-compatibility.patch"
+	"${FILESDIR}/${P}-gcc-10-compatibility.patch"
+"
+
 python_check_deps() {
 	has_version "dev-python/sleekxmpp[${PYTHON_USEDEP}]"
 }