gentoo resync : 22.12.2021

3 files changed, 9 insertions, 52 deletions

diff --git a/games-puzzle/freesweep/Manifest b/games-puzzle/freesweep/Manifest
index 06175e0813b2..7f51b69e4a8b 100644
--- a/games-puzzle/freesweep/Manifest
+++ b/games-puzzle/freesweep/Manifest
@@ -1,4 +1,3 @@
-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
+DIST freesweep-1.0.2.tar.gz 93986 BLAKE2B 306c0e87448534c23c7754f9bedbaf9d72ee705bfdb3cc08a004076bd56a117f4bbb19f4676282edccc57286b5135d6714d6ad2e94a903235c8f4bb9a305ad77 SHA512 1695bb29efbaed5e6baf5faadcbd685e8e6b4ccb5d52567a833b5f5eeb69200fc220579fea7d6907bffc92a06e9b220bca494e8597394820a421f81f0af1d3aa
+EBUILD freesweep-1.0.2.ebuild 594 BLAKE2B 82eb1012fe39bb870aa1019d9a499740eb69443f3e4f62e1bd2c3cf963ea2e6f9d329426e8479b19ee50c6daafb9b069f752a0006c9b05e4c8531904be385543 SHA512 9d337152160815f391343763391d0aaa0a19eb71d3f51b873c75ef6763cfa9756d46add5e2900540efcede45d35eef35cea85e7f90f633a1831c28d03e7ff97c
 MISC metadata.xml 338 BLAKE2B a77722d450cf98aefc1863f0ae843136c7d0846947422884bbe565033566bd17fecdbe67fde708c624a3989c2082e9b07797d3ddf87c4ad01c579ba896d970cb SHA512 5cf55926ac66e6476db9ffde0ca7370f11348bd3785913794c2226706e42de3e045a8d33b39f68598f47b4e9f59885751dced131e9389c12a0db16908eb8bf38
diff --git a/games-puzzle/freesweep/files/freesweep-1.0.1-gcc10.patch b/games-puzzle/freesweep/files/freesweep-1.0.1-gcc10.patch
deleted file mode 100644
index 4288c8b26a2c..000000000000
--- a/games-puzzle/freesweep/files/freesweep-1.0.1-gcc10.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-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-1.0.1.ebuild b/games-puzzle/freesweep/freesweep-1.0.2.ebuild
index 3a27c3f4f0b9..abe5e0cb0e2b 100644
--- a/games-puzzle/freesweep/freesweep-1.0.1.ebuild
+++ b/games-puzzle/freesweep/freesweep-1.0.2.ebuild
@@ -1,31 +1,28 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
 inherit toolchain-funcs
 
 DESCRIPTION="Console Minesweeper"
 HOMEPAGE="https://github.com/rwestlund/freesweep"
 SRC_URI="https://github.com/rwestlund/freesweep/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~ppc-macos"
 
-RDEPEND="sys-libs/ncurses:0="
+RDEPEND="sys-libs/ncurses:="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
-PATCHES=(
-	"${FILESDIR}/${P}-gcc10.patch"
-)
-
 src_compile() {
-	emake LIBS="$( $(tc-getPKG_CONFIG) --libs ncurses)"
+	emake LIBS="$($(tc-getPKG_CONFIG) --libs ncurses || die)"
 }
 
 src_install() {
 	dobin freesweep
-	einstalldocs
 	doman freesweep.6
+	einstalldocs
 }