gentoo resync : 22.01.2021

3 files changed, 90 insertions, 2 deletions

diff --git a/net-misc/bfgminer/Manifest b/net-misc/bfgminer/Manifest
index b7f582bdd4f1..77038fba587f 100644
--- a/net-misc/bfgminer/Manifest
+++ b/net-misc/bfgminer/Manifest
@@ -1,5 +1,6 @@
+AUX bfgminer-5.5.0-fno-common.patch 2746 BLAKE2B 6954f9016289a6e0f4f5fb68e3c08013f3ad422f6d1710709df3103bb03551d40926d0e4469cf91fcdbe5c6064b9d66bf47309c014a662ef5778a2b5bb301bec SHA512 f59ff668c8deb63e6276129be6e88ad2a347994f3de2a6389e353f61ef677fb73be6f45b090d40cc3546f8456ae291a60bce8645e85f5e39d1d7eed531c5db82
 DIST bfgminer-5.4.2.tar.xz 1039200 BLAKE2B f63a7fa2c85d352a366794a39619599db6ccc3f98508ccd90387b315374227d74edfcfd2329db8b57c96539b194b0d2ee746cbea032c241dab1cf93e717b137d SHA512 b5ae8ae44df166d5576f89683ce9ee0832ca1f506b2522da7e3cd432abc5e218e9080e2a79f4da29e40db0d3179e63c9a8907d5d6b60d5d4895d6cac2b15d8ca
 DIST bfgminer-5.5.0.tar.xz 1054664 BLAKE2B db841a73bca10b19205744be531c13f2c4435bd69c9f2af7b8aba84381af640028cc4db33df399cf05dd0bbec7b79a5b65679bcb2a8bec7624f6fbc47e9ebd79 SHA512 d1adae473e01fcf1cd0efde74d3e8ce10609e520397d688bf4e226c1113c1606c782e3cfdba6847f1a3886cac30de6b5baa03b731aca86287d53bf01ef705cdb
 EBUILD bfgminer-5.4.2.ebuild 5051 BLAKE2B 9d00b36077d11bb18eb719e7b8d2addb77bf3bdb737ed8d0317f96e89106ccbe8363a166a18b487f6df5903c35b0eadd4b21116b037d5c61a38f8beebb894949 SHA512 a68f64e7151bca5a3213b917e9bbb755dff0004ae9c5a6a2f6c4dcda7194bae5a504f41492f1a5f8d3f860b9bd585783718351d92329815e504a69a888cf4461
-EBUILD bfgminer-5.5.0.ebuild 5113 BLAKE2B b1b2eb32c4e1dbbcd404189f76da4e89159837304184ca5ba977bac976f970aab872c3ceb4d31fa5447c8eb0f9410f1158eceab1f49252ac260124b891352183 SHA512 c7741ccc9997b1420d27478e76cb9d5e5543fa73f572455e4a175667a7af67f12d0c9336f0b8c51f40bff5070effe4e5ee234bb0a1d9ad993c3fc5d2d01921fa
+EBUILD bfgminer-5.5.0.ebuild 5170 BLAKE2B 6ecd2bd4c5ed8fb7037244d990f57402ba3fc1aceb9104ddddeefc4da3c371948bb8ba5f2d97df3ac1c761864f0b9b1247303cbb88a4a478ac65e38e3962d26f SHA512 c679f140eeb9adc18a5d23f04ae031f5dccd03152e8a750fe9e771889ca768826fd3a29c51c8444e0399fe5e97f49416112ca802d91950a26622594425f00eb1
 MISC metadata.xml 4029 BLAKE2B b9ed1a1c14386e3c4c3d11d40ae60988e2d7170c2363418b1dd9f33e0e32516bcf45ea08c96310d598173b43cd0fa23d7c1f6033656c3914ded0e685f39b6de6 SHA512 17f36d0d7f9055d1860acf7fe83f036184303cfa095d872f40877fd2f78cfb3433bdb01eba6c39058117dcbdbe5c7645e6b5eb0d24922288d34256c80624fa21
diff --git a/net-misc/bfgminer/bfgminer-5.5.0.ebuild b/net-misc/bfgminer/bfgminer-5.5.0.ebuild
index 1f145b5ad199..e58b26ba420d 100644
--- a/net-misc/bfgminer/bfgminer-5.5.0.ebuild
+++ b/net-misc/bfgminer/bfgminer-5.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -120,6 +120,10 @@ DEPEND="${DEPEND}
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}/${PN}-5.5.0-fno-common.patch"
+)
+
 src_configure() {
 	local CFLAGS="${CFLAGS}"
 	local with_curses
diff --git a/net-misc/bfgminer/files/bfgminer-5.5.0-fno-common.patch b/net-misc/bfgminer/files/bfgminer-5.5.0-fno-common.patch
new file mode 100644
index 000000000000..bd804e173909
--- /dev/null
+++ b/net-misc/bfgminer/files/bfgminer-5.5.0-fno-common.patch
@@ -0,0 +1,83 @@
+https://bugs.gentoo.org/727008
+--- a/adl.h
++++ b/adl.h
+@@ -4,10 +4,10 @@
+ 
+ #include <stdbool.h>
+ 
+-bool adl_active;
+-bool opt_reorder;
+-const int opt_targettemp;
+-const int opt_overheattemp;
++extern bool adl_active;
++extern bool opt_reorder;
++extern const int opt_targettemp;
++extern const int opt_overheattemp;
+ void init_adl(int nDevs);
+ float gpu_temp(int gpu);
+ int gpu_engineclock(int gpu);
+--- a/driver-cpu.c
++++ b/driver-cpu.c
+@@ -43,6 +43,8 @@
+ 
+ BFG_REGISTER_DRIVER(cpu_drv)
+ 
++struct cgpu_info *cpus;
++
+ #if defined(__linux) && defined(CPU_ZERO)  /* Linux specific policy and affinity management */
+ #include <sched.h>
+ static inline void drop_policy(void)
+--- a/driver-opencl.c
++++ b/driver-opencl.c
+@@ -795,7 +795,6 @@ char *print_ndevs_and_exit(int *ndevs)
+ 
+ 
+ struct cgpu_info gpus[MAX_GPUDEVICES]; /* Maximum number apparently possible */
+-struct cgpu_info *cpus;
+ 
+ 
+ /* In dynamic mode, only the first thread of each device will be in use.
+--- a/miner.c
++++ b/miner.c
+@@ -3762,10 +3762,6 @@ static int statusy;
+ static int devsummaryYOffset;
+ static int total_lines;
+ #endif
+-#ifdef USE_OPENCL
+-struct cgpu_info gpus[MAX_GPUDEVICES]; /* Maximum number apparently possible */
+-#endif
+-struct cgpu_info *cpus;
+ 
+ bool _bfg_console_cancel_disabled;
+ int _bfg_console_prev_cancelstate;
+--- a/sha256_sse2_amd64.c
++++ b/sha256_sse2_amd64.c
+@@ -48,7 +48,6 @@ static uint32_t g_sha256_k[]__attribute__((aligned(0x100))) = {
+ const uint32_t sha256_init_sse2[8]__asm__("sha256_init_sse2")__attribute__((aligned(0x100))) =
+ {0x6a09e667, 0xbb67ae85, 0x3c6ef372, 0xa54ff53a, 0x510e527f, 0x9b05688c, 0x1f83d9ab, 0x5be0cd19};
+ 
+-__m128i g_4sha256_k[64];
+ __m128i sha256_consts_m128i[64]__asm__("sha256_consts_m128i")__attribute__((aligned(0x1000)));
+ 
+ bool scanhash_sse2_64(struct thr_info * const thr, struct work * const work,
+--- a/sha256_sse2_i386.c
++++ b/sha256_sse2_i386.c
+@@ -48,7 +48,6 @@ static uint32_t g_sha256_k[]__attribute__((aligned(0x100))) = {
+ const uint32_t sha256_32init[8]__attribute__((aligned(0x100))) =
+ {0x6a09e667, 0xbb67ae85, 0x3c6ef372, 0xa54ff53a, 0x510e527f, 0x9b05688c, 0x1f83d9ab, 0x5be0cd19};
+ 
+-__m128i g_4sha256_k[64];
+ __m128i sha256_consts_m128i[64]__asm__("sha256_consts_m128i")__attribute__((aligned(0x1000)));
+ 
+ bool scanhash_sse2_32(struct thr_info * const thr, struct work * const work,
+--- a/util.h
++++ b/util.h
+@@ -217,7 +217,7 @@ void cgsleep_us(int64_t us);
+ #define cgtimer_time(ts_start) timer_set_now(ts_start)
+ #define cgsleep_prepare_r(ts_start) cgtimer_time(ts_start)
+ void cgsleep_ms_r(cgtimer_t *ts_start, int ms);
+-void (*cgsleep_us_r)(cgtimer_t *ts_start, int64_t us);
++extern void (*cgsleep_us_r)(cgtimer_t *ts_start, int64_t us);
+ 
+ static inline
+ int cgtimer_to_ms(cgtimer_t *cgt)