gentoo (valentine's day) resync : 14.02.2021

5 files changed, 37 insertions, 3 deletions

diff --git a/games-puzzle/Manifest.gz b/games-puzzle/Manifest.gz
index 6c5374197247..2257af4333c4 100644
--- a/games-puzzle/Manifest.gz
+++ b/games-puzzle/Manifest.gz
diff --git a/games-puzzle/brainparty/Manifest b/games-puzzle/brainparty/Manifest
index 84e8324bb1d8..1b26e6bc9d42 100644
--- a/games-puzzle/brainparty/Manifest
+++ b/games-puzzle/brainparty/Manifest
@@ -1,6 +1,8 @@
+AUX brainparty-0.61-clang-11.patch 455 BLAKE2B 49d5d63dd3c12f0171a106dabcff298e310c60fc64dff8d2a660462f0dbcdfa2483d39465c1b9fa3564cc943888bce30906280ad0db116b6b2962af511422d40 SHA512 ac64cd8d43ae8ba63bb5717d5064d304c8565f4b47fb1a82dca3fed149ad517d1dd8f5783b6e3527f9e497871718720c46fafb3e01f893b39c375410564a324a
+AUX brainparty-0.61-gcc-11.patch 314 BLAKE2B b439d5b4cb10c0953f24bfe9d873c70a61215ab16a5247b3a0fc54d9269d010f60e26b46e15e1f2af8df9e2711bd821b8d20759f0dda4f04e58243c964701def SHA512 cc787c3f19c9bcbc79ad3fcfa8cd653533615b9dd96078cd30c73b2ed03b42ff84e02ae29246f1f95a2b7210eecf0020bff448e8be0b7a3b40b10d0691403377
 AUX brainparty-0.61-gcc49.patch 489 BLAKE2B f4f317679669fca33429e19a967945691e8baa24ec7ccea2d7a943e1ea4eed0108ea13c30208ac75b80d253b7166540556b20a7b47443e644bf8af8eeee78a82 SHA512 9859614d97c9fe8efd8cefedd8ef935cbdf4344154f2e272e0624268e48533b620a55654c9d0097e3726579ce1a7028ad44eb705c2e86bbc983cb490faec6295
 AUX brainparty-0.61-gnu_cxx-hash.patch 219 BLAKE2B 8a0570732bc55c2a0fe5b703e947650fe92200582581bc39857eb5a4898bdd9925ebd5e8568efc0e0c1765db26b4c9d5c15afab7fba49aa2a2016573e56be539 SHA512 d42cb49d0c320d91fc9c31706e2fb3e8cffcd0b08803b1a016ff30e283f35f86bbbdaae98a1f0ee3cece82d027dd767ce0a30ca8565887a2d2d619789ce51e30
 AUX brainparty-0.61-savegame.patch 674 BLAKE2B 051698e4fde8dab50ff591657705c32e5926d74ca83833ed0e901c6cc11bf82c66a6b7b5ef201d3e0ec2e27be0e8e0991c41216cfe34ece92ad21933606aaf0e SHA512 9e158b97ff15cfb4b6b8e4f6eb8006335841c48ff94b5da8bbb0cba03868b8ead92d2520bc8adae887d4baabac93c8104e44b46d87b6c4258792ab64376ce34a
 DIST brainparty0.61.tar.gz 40676905 BLAKE2B cfa1a408a66438491e6053be0e76ca64d1d78724be86379cb06e750fc842e9835b624af7b98163c232ee6e205a4c2f9478f9d42fe0eaa28d18b45e218db75971 SHA512 bc8578a551ce4b7f40e212d9ab9910b2435b88d8b7b7e90a1c088e37d5f26b5c6126fcb9ffee7e39981eff34c13144c8f3204e020532b5abf1c4815cc8074eb9
-EBUILD brainparty-0.61-r1.ebuild 1223 BLAKE2B eab12dfb377265408a9192c02ff20a0308d780acd7beee685dddfbec805aa4635e22f1cb09777f4b092cfdd4ecb58cd0f3f8f12993d4d25fa401add2a76dee11 SHA512 2dd1e3071749fe87480d37c3d4e8eebf0c24479cdbb624c28e0960b9dfd08eb830c5fe5dc25f3d987a02adbc141c2b3cc75fdc785ee40c734ca4bdb56dc99e4b
+EBUILD brainparty-0.61-r1.ebuild 1320 BLAKE2B c937cc1f04628ed768bdd6c99eb399d1d78b97fcfaf5ee34056a537c7efebf38aab345fdae7bb5fc485413fd6a3b15a8f4669526467ab256b6173a0bf69b4538 SHA512 cc36a6ad2439142594e82cb8a01e8d9331116563737838598a92def51aa8681d389c64d3a38f5d48b8626ebae1dc1b0bd96ab259da0c6bd3c7b2c8ea73972c7d
 MISC metadata.xml 331 BLAKE2B e2ed6c3f26c4637f2ca40dd55ecda347ffd596dc9c55db194668bd546f362bf37e41e52ba94a6777da6bcfa4d53513b865a6acb615b60b2a6ce8f6e6634087ac SHA512 bcea1853cf01102eb88c58723e585f81c55b4208be24b46bc421b62afa84405539116b33289e94c7b1da5c259ca91d0fc6553e6441e59ec5d41326525742a404
diff --git a/games-puzzle/brainparty/brainparty-0.61-r1.ebuild b/games-puzzle/brainparty/brainparty-0.61-r1.ebuild
index 97d4b35c28aa..6f6b8eeb9c5a 100644
--- a/games-puzzle/brainparty/brainparty-0.61-r1.ebuild
+++ b/games-puzzle/brainparty/brainparty-0.61-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 DESCRIPTION="A puzzle-solving, brain-stretching game for all ages"
 HOMEPAGE="http://www.tuxradar.com/brainparty"
@@ -28,6 +28,8 @@ PATCHES=(
 	"${FILESDIR}"/${P}-savegame.patch
 	"${FILESDIR}"/${P}-gcc49.patch
 	"${FILESDIR}"/${P}-gnu_cxx-hash.patch
+	"${FILESDIR}"/${P}-gcc-11.patch
+	"${FILESDIR}"/${P}-clang-11.patch
 )
 
 src_prepare() {
@@ -42,6 +44,8 @@ src_prepare() {
 	sed -i \
 		"/^int main(/ a\\\\tchdir(\"/usr/share/${PN}\");\n" \
 		main.cpp || die
+
+	tc-export CXX
 }
 
 src_install() {
diff --git a/games-puzzle/brainparty/files/brainparty-0.61-clang-11.patch b/games-puzzle/brainparty/files/brainparty-0.61-clang-11.patch
new file mode 100644
index 000000000000..07c1b9709932
--- /dev/null
+++ b/games-puzzle/brainparty/files/brainparty-0.61-clang-11.patch
@@ -0,0 +1,14 @@
+clang-11 needs explicit cast
+
+https://bugs.gentoo.org/739284
+--- a/BPGame.cpp
++++ b/BPGame.cpp
+@@ -1507,7 +1507,7 @@ int BPGame::DivRem(int Num, int Div, int* Rem) {
+ }
+ 
+ void BPGame::DrawLine(int fromx, int fromy, int tox, int toy, Colour* col, float width) {	
+-	GLfloat vertices[] = { fromx, fromy, tox, toy }; 
++	GLfloat vertices[] = { (GLfloat)fromx, (GLfloat)fromy, (GLfloat)tox, (GLfloat)toy }; 
+ 
+ 	glDisable(GL_TEXTURE_2D);
+ 	glLineWidth(width);
diff --git a/games-puzzle/brainparty/files/brainparty-0.61-gcc-11.patch b/games-puzzle/brainparty/files/brainparty-0.61-gcc-11.patch
new file mode 100644
index 000000000000..695fc0b674c3
--- /dev/null
+++ b/games-puzzle/brainparty/files/brainparty-0.61-gcc-11.patch
@@ -0,0 +1,14 @@
+gcc-11 needs const operator()
+
+https://bugs.gentoo.org/768204
+--- a/BPGame.h
++++ b/BPGame.h
+@@ -53,7 +53,7 @@ class BPMiniGame;
+ class SpriteFont;
+ 
+ struct cmp_str {
+-	bool operator()(char const *a, char const *b) {
++	bool operator()(char const *a, char const *b) const {
+ 		return std::strcmp(a, b) < 0;
+ 	}
+ };