gentoo resync : 13.06.2020

7 files changed, 53 insertions, 61 deletions

diff --git a/games-puzzle/Manifest.gz b/games-puzzle/Manifest.gz
index 750b494119a0..f590ae7a8bcb 100644
--- a/games-puzzle/Manifest.gz
+++ b/games-puzzle/Manifest.gz
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)"
diff --git a/games-puzzle/quadrapassel/Manifest b/games-puzzle/quadrapassel/Manifest
index 351470871890..15343c503c00 100644
--- a/games-puzzle/quadrapassel/Manifest
+++ b/games-puzzle/quadrapassel/Manifest
@@ -1,5 +1,3 @@
-DIST quadrapassel-3.32.0.tar.xz 478332 BLAKE2B c685ecdc542ea29dea145fb93409d951a058a7451cc0f6795a6c7e61387d891f6941e8569f4e61b4f473f72b4045d348669920d5847ba6165e891fac58bfa42c SHA512 c618d4b35888122fcdecb6085773d30198907d09dd234283650c96f1e7a5994f51e1ef33f7df2732c1ab28cf73f5fb3a4e35bd8780e782714c3faeb0eb46d24d
 DIST quadrapassel-3.36.00.tar.xz 308000 BLAKE2B 9decfce3573cd301d716cd0e5433113869118efc6935bcf1f1ed38a2c8cd26aec3b84d782f1b907a972cf9aeaf940d10c85de45e2d111e19c215a06e49aced15 SHA512 4e27011855e29b4703d5d1b82d9cc5a334ee60bd8e2a9ee8cdebd931a029df76407da02edffc9c1bdf5e845aee92291d09fe3c17fd0622a4e77d6eddd2ed5a4e
-EBUILD quadrapassel-3.32.0.ebuild 938 BLAKE2B 077a7dd4a6ed7413090298ee134e54114abf41bb6dfcf52c46f88c4644d6afa3c411ce47dcbbe798293a2eccd837441da024888221fed5cd363ef62aa13826c9 SHA512 575353193a9aa6ea200edae46e73b97dfeb207bdca8b946c7d8cc22ef728805cf9e088a631ff2149cf76a8c5d013039ffc94e6902705591d278d4d7643b12eba
-EBUILD quadrapassel-3.36.00.ebuild 948 BLAKE2B e730f34451e2117f4d0ef628cd871f3a38eedfa460e4c4e9f684506011ce9e54ee3c5b71b7546e78236567bf7475ae646f44379144ab43d2886dc0b81a6f7754 SHA512 374f474eab0176d7f114609d30d31e3b553b67904aceb40bc682f5956f7d5303631b929f9eb2411fc8b6b3191a87e0ac5c57cdf833d66f9fe7adb1f7d1aad6cd
+EBUILD quadrapassel-3.36.00.ebuild 953 BLAKE2B 76fca33db0bb3c34b0b9c2d8a3e2fed8f0510dd312d08987f38a52eb3c6bb10067f40409cf641fc4798499eb42f30aad0db3a5f26beb69f6f6a428a5006da3bb SHA512 eb3edd31e93aca93b74488371dcbe3900ce17f71421c6e221ee3dc0108edb76bfa41b06211e585de67d4e02e9e95209dd0172aa4e3a68d8588893da9c454e217
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-puzzle/quadrapassel/quadrapassel-3.32.0.ebuild b/games-puzzle/quadrapassel/quadrapassel-3.32.0.ebuild
deleted file mode 100644
index 9e567600ad00..000000000000
--- a/games-puzzle/quadrapassel/quadrapassel-3.32.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson vala xdg
-
-DESCRIPTION="Fit falling blocks together"
-HOMEPAGE="https://wiki.gnome.org/Apps/Quadrapassel"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-RDEPEND="
-	>=media-libs/libcanberra-0.26[gtk3]
-	media-libs/cogl:1.0=
-	>=media-libs/clutter-1:1.0
-	>=media-libs/clutter-gtk-0.91.6:1.0
-	>=x11-libs/gtk+-3.12.0:3
-	>=dev-libs/libmanette-0.2.0
-	x11-libs/pango
-	>=gnome-base/librsvg-2.32.0:2
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/appstream-glib
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	$(vala_depend)
-	dev-libs/libmanette[vala]
-	gnome-base/librsvg:2[vala]
-"
-
-src_prepare() {
-	xdg_src_prepare
-	vala_src_prepare
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/games-puzzle/quadrapassel/quadrapassel-3.36.00.ebuild b/games-puzzle/quadrapassel/quadrapassel-3.36.00.ebuild
index 45a88d8f0990..368d3a28e733 100644
--- a/games-puzzle/quadrapassel/quadrapassel-3.36.00.ebuild
+++ b/games-puzzle/quadrapassel/quadrapassel-3.36.00.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Quadrapassel"
 
 LICENSE="GPL-2+ CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 RDEPEND="