gentoo resync : 28.04.2021

3 files changed, 61 insertions, 6 deletions

diff --git a/app-crypt/scute/Manifest b/app-crypt/scute/Manifest
index 8dff716d5d4f..3b6710f52e4a 100644
--- a/app-crypt/scute/Manifest
+++ b/app-crypt/scute/Manifest
@@ -1,4 +1,5 @@
-DIST scute-1.6.0-manual-eps-images.tar.xz 236968 BLAKE2B 27b834f95dbd7a00193b55a8ff55c34e9bc65b31d9de09199b6bad62d2718d247717a461b58ccd55acb0331f6d980ac01cd62de7729ddafd368ebf08cbe2edde SHA512 dc7d622207f1979e5b527e3213f191f14322af9745462bf0803563711f0cb4b4c03f920742ca425987e1c8f632a05772dd5cc2f1d5afec2616ca93de74402deb
-DIST scute-1.6.0.tar.bz2 1008407 BLAKE2B 3ef4e1870c52007fc7f838f31c4102aeee23e6e59fe13ad1990ed9c7eb4eda948a698bea475daa2d965d1c23f65940aae9b4ded518cb9268af4ec442414932db SHA512 dd9f9d9da7979a8f4766af34b0d6d6fea63d43feb4d7e5e82cca25c792d5ec87f6d9604e7eafa822ddddfaa8541bff616c0c19c73cf3f12b21ffa1c3128bcb4c
-EBUILD scute-1.6.0.ebuild 1339 BLAKE2B e8c100d0b8fbc78e945676a3928b5c2b0229b5682154ccb99f46b4eb6f7c929a9c38bdcc3e544b2e5e230beebf7e976ddd193de7c408e496ac9d01753e350331 SHA512 7043cf69f48fda7398ace90282f4551911d4037728d380212b311a6f88a067637cf0de2b9dab9f70dd4a51a7d692ba66ea102fba181ccef98da95ee966fff4fe
+AUX scute-1.7.0-fno-common.patch 1207 BLAKE2B 1dd361484b82786d00c2883913c0f1492df22c8d0d02cccaa1f4d4186d43a55058a9ebe2f0c61ec9cc02e22b0c43b26036147e385a28b25e5163b98031166174 SHA512 3e8074a9ba910069da5c4f84d4c779baf070a3ac656ddcccb8defacd0af9e1aaf522d1eb9745caa84483bc1f6da13fd177fa8c587865797b42868002196cec64
+DIST scute-1.7.0-manual-eps-images.tar.xz 236940 BLAKE2B 499207d9059bd4505f426b75f292e66755919d3e4e0d04d2f2420e2e0ceafa14ee47f0a3d7fd2846478dd0878eb01a776582a8299014728f4508a982fec36a28 SHA512 d227111456e664a295ee466dc990364423734170bc82d9a9d38ff72e79abca84775f164c2cf0dd893b9dfb63ff5035334f1740f80601a04dbc9fcb0877f50da7
+DIST scute-1.7.0.tar.bz2 851177 BLAKE2B 9a459fc07c53e44d6b194f0f7786644dae7c37402f69cc511ed7e6cc387236cfe01b13400779a90a123461a28e69629abc260f0fad9c302a9b630e23cb8b4293 SHA512 d58771a8e45632f468b60ec2255f84ef5f2f4cc5e11cf8b0fcd0cec60cc8fe0c49bdd523e855998d5aa6f126138981b2316ee825cf33ec14e723f158e36283d3
+EBUILD scute-1.7.0.ebuild 1382 BLAKE2B 2e272267d6ab5332b16dd221be3df005b4850667e6578bc013a3eb67821a1d7effd42ea5ed022a7de2e87a9377518885058e72d615edc2e419aecf8a33b651d9 SHA512 44226957eac57f9b78a60b4eea29977d22dc0f7f1c4df37f4c35687256f33a59f0daabf0cbcf4d309a5dda76e6acfc6785a16ff0c85df43740956a7e03fa6848
 MISC metadata.xml 757 BLAKE2B bc297f21ac2f337328a17748b0c874b6290465c49391bf44bd6e8e192f657d4335284b50786a0574801d19f0a3debb3f917bd4821bbb07ce9214d4b8ebf7d234 SHA512 26940589b3a8436c7bf4dfb0b3de4d6834c8d6e617671967d0cf639870545fd44682e1a1ce12d0a0358f9cecf640f256a9278c58597ef41240a341de94f09382
diff --git a/app-crypt/scute/files/scute-1.7.0-fno-common.patch b/app-crypt/scute/files/scute-1.7.0-fno-common.patch
new file mode 100644
index 000000000000..1554d8d0dfec
--- /dev/null
+++ b/app-crypt/scute/files/scute-1.7.0-fno-common.patch
@@ -0,0 +1,52 @@
+From 49ad2b0e05e3fcb8c8c2e23bb1c6063b390dee02 Mon Sep 17 00:00:00 2001
+From: Damien Goutte-Gattat <dgouttegattat@incenp.org>
+Date: Tue, 30 Mar 2021 22:31:40 +0100
+Subject: [PATCH] Do not declare global variable in header file.
+
+* src/options.h (_scute_opt_t): New typedef.
+(_scute_opt): Declare as extern and move definition to ...
+* src/readconf.c (_scute_opt): here.
+--
+
+This fixes build with gcc-10, which has -fno-common enabled by
+default.
+
+GnuPG-bug-id: 5360
+Signed-off-by: Damien Goutte-Gattat <dgouttegattat@incenp.org>
+---
+ src/options.h  | 6 ++++--
+ src/readconf.c | 2 ++
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/src/options.h b/src/options.h
+index 10667db..d74071d 100644
+--- a/src/options.h
++++ b/src/options.h
+@@ -22,10 +22,12 @@
+ #define OPTIONS_H 1
+ 
+ /* Global options.  */
+-struct {
++typedef struct {
+   char *user;
+   int debug_flags;
+-} _scute_opt;
++} _scute_opt_t;
++
++extern _scute_opt_t _scute_opt;
+ 
+ 
+ /*-- readconf.c --*/
+diff --git a/src/readconf.c b/src/readconf.c
+index 387a44f..5af2336 100644
+--- a/src/readconf.c
++++ b/src/readconf.c
+@@ -31,6 +31,8 @@
+ 
+ #include "options.h"
+ 
++_scute_opt_t _scute_opt;
++
+ static const char *
+ my_strusage (int level)
+ {
diff --git a/app-crypt/scute/scute-1.6.0.ebuild b/app-crypt/scute/scute-1.7.0.ebuild
index 597dcf357385..6aee8c85a67a 100644
--- a/app-crypt/scute/scute-1.6.0.ebuild
+++ b/app-crypt/scute/scute-1.7.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=7
@@ -29,12 +29,14 @@ RDEPEND="
 BDEPEND+="
 	sys-apps/texinfo"
 
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
+
 src_unpack() {
 	default
 
 	# have to use pregenerated EPS files required for the texinfo documentation,
 	# due to bug 664236 preventing even converting *to* eps.
-	mv scute-eps/*.eps "${S}"/doc/manual/ || die
+	mv scute-eps/*.eps "${S}"/doc/ || die
 }
 
 src_configure() {
@@ -48,5 +50,5 @@ src_install() {
 	default
 
 	# only building plugins
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 }