gentoo resync : 13.06.2020

3 files changed, 51 insertions, 8 deletions

diff --git a/games-puzzle/freesweep/Manifest b/games-puzzle/freesweep/Manifest
index 8148621888c8..95bcb1dbf689 100644
--- a/games-puzzle/freesweep/Manifest
+++ b/games-puzzle/freesweep/Manifest
@@ -1,3 +1,4 @@
-DIST freesweep-0.92.tar.gz 87353 BLAKE2B 8775a5c135e5a7faba00af2e2fd279c619a8092ad905c8dfa3d3ac7755d0b6337cb39f4b93e0c4bb1e905a87770e946cb728256bc5a2897794802424fa5ebdc2 SHA512 9f7f33ba5fab62d1ea3a6a57b9a60323281c91255218afb51251c4e20500c123769f003ae1a3622205be34fa7cfe11b691e58ad8787782da4d0a7045d4f41122
-EBUILD freesweep-0.92-r1.ebuild 558 BLAKE2B a877030695cc0b1a80c6729d82109bc625d29fa72794ec47a72467eab9b24ca5e22abdb77edccc6951ce7bcf0489ec002551a8dd94efce975a22dd44593b4870 SHA512 833a7623da04b5b2647148ebd3e3124503d35cef749a38b6d41223e34cd3b648ee10c6192b6c50775431fc964684d67243468b665eeea635b575d70ed90b44b7
+AUX freesweep-1.0.1-gcc10.patch 952 BLAKE2B ca47bd9364ce4af021a1e7387cb72e2649eec763461565a8fe2defaf097821a19a78c71927470645a51a8cdb500ac1ef87fa62758bd861580e4fc25c0ff9a6b1 SHA512 599979daf9d7a902d2c164a4355ccdc6be7cf2fa82a56cbbbd7ff958c4fb19ffceff0dec11bb0d27ae5b14525fff3392ed6302e912601f89fc7870a63202cb5e
+DIST freesweep-1.0.1.tar.gz 93966 BLAKE2B 8eab63930e41067e2e5626a4504bef00db58bfde54a43c4512bed2e8ae186d165b5b15acf8c1074a8b02e1d63876fb4e36b8c78f181c7d86d055976a15b8ec83 SHA512 8270c77940225c8ebf0912ac896eaaaabd81775a82877650f3b9c2e0cf3b6a296b73f02ebc26e8fe526fc56f3807d9a2809f46e44b3d8507f011f9cf2c794099
+EBUILD freesweep-1.0.1.ebuild 632 BLAKE2B 2c03220ac3e6c6c879e0885ceef5ccdf44906d4faf1a873e51d1506f73a116e804fca1590d0f7dce231baa660b276d3b406a51ec7be56ac81c97f3db92862c69 SHA512 8938944353bc412ff2420f2587ba0ff161afba39f706fa33a2335de022b34fdb531c88dc6c74bd390e803a02e2540aab2856251dad88cfe431acb2626734f1da
 MISC metadata.xml 337 BLAKE2B 42fe008d056ce075283d5b33fef8e25dd2906a6e0ede15e43a1dbb811d421fd2cadd7a3d8c5899baf8aef9136a77e75f753c13a732a17284d26d220d2a6aaa03 SHA512 74ed16cc2bea198caa2990a28bd7b5cf20f28fbf91e85cb7748869929670f989fd22a5467f8f0df185595f54acdac48d9f7e5cc94683e8b84fb47f7f3fc207b7
diff --git a/games-puzzle/freesweep/files/freesweep-1.0.1-gcc10.patch b/games-puzzle/freesweep/files/freesweep-1.0.1-gcc10.patch
new file mode 100644
index 000000000000..4288c8b26a2c
--- /dev/null
+++ b/games-puzzle/freesweep/files/freesweep-1.0.1-gcc10.patch
@@ -0,0 +1,39 @@
+From a86245df4f3ff276a393f799d737d28a5cb0a5a8 Mon Sep 17 00:00:00 2001
+From: Reiner Herrmann <reiner@reiner-h.de>
+Date: Thu, 23 Apr 2020 00:46:58 +0200
+Subject: [PATCH] Fix build with GCC 10
+
+mark variable declaration in sweep.h as extern, as otherwise
+linker would complain about multiple definitions.
+keep actual declaration in a C file.
+---
+ main.c     | 2 ++
+ sweep.h.in | 2 +-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/main.c b/main.c
+index 6411dcb..8d5cbe7 100644
+--- a/main.c
++++ b/main.c
+@@ -10,6 +10,8 @@
+ 
+ #include "sweep.h"
+ 
++DrawChars CharSet;
++
+ int main(int argc, char** argv)
+ {
+ 	GameStats* Game;
+diff --git a/sweep.h.in b/sweep.h.in
+index f30c133..7f398de 100644
+--- a/sweep.h.in
++++ b/sweep.h.in
+@@ -246,7 +246,7 @@ struct FileBuf
+ FILE* DebugLog;
+ #endif /* DEBUG_LOG */
+ 
+-DrawChars CharSet;
++extern DrawChars CharSet;
+ 
+ /* These are the functions defined in files.c */
+ int SourceHomeFile(GameStats* Game);
diff --git a/games-puzzle/freesweep/freesweep-0.92-r1.ebuild b/games-puzzle/freesweep/freesweep-1.0.1.ebuild
index 735c8ac84abb..3a27c3f4f0b9 100644
--- a/games-puzzle/freesweep/freesweep-0.92-r1.ebuild
+++ b/games-puzzle/freesweep/freesweep-1.0.1.ebuild
@@ -1,21 +1,24 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit toolchain-funcs
 
 DESCRIPTION="Console Minesweeper"
 HOMEPAGE="https://github.com/rwestlund/freesweep"
-SRC_URI="http://www.upl.cs.wisc.edu/~hartmann/sweep/${P}.tar.gz"
+SRC_URI="https://github.com/rwestlund/freesweep/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~ppc-macos"
 
 RDEPEND="sys-libs/ncurses:0="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${P}-gcc10.patch"
+)
 
 src_compile() {
 	emake LIBS="$( $(tc-getPKG_CONFIG) --libs ncurses)"