gentoo resync : 25.11.2020

4 files changed, 45 insertions, 11 deletions

diff --git a/games-puzzle/rezerwar/Manifest b/games-puzzle/rezerwar/Manifest
index 3a57c79814b9..83af69888aa5 100644
--- a/games-puzzle/rezerwar/Manifest
+++ b/games-puzzle/rezerwar/Manifest
@@ -1,3 +1,5 @@
+AUX rezerwar-0.4.2-gcc-CC.patch 367 BLAKE2B e5da75ae47666450309d35c5ba909ffc12abaf0b9a6adaad3cd87ab14c6630a1673590137351a7c3fd12396561776846f93acb6bcaa74a8b510358aaf29556e2 SHA512 d701bd079a0bed9974a5b39cbd72b3c422500262d324c3a2bbe2b2b1565e3b52d2e8931087fbeef9f162251c97142ce15d8659f2e54f0cf6f1b50cf5d53ad1b4
+AUX rezerwar-0.4.2-gcc10.patch 307 BLAKE2B 4a7d48b98c3d932db43cfb1b5b0155e591bbdff80f16cb075c1de5a7082074511b4a5d70c02cfb56ef14fee5eb0e7cc53a01f802e2b01d5b348042a01ebc5914 SHA512 e9dbe0a8fae0f1068cf0e6c0469dc530f07f4cb3bc7027819bd4ad4fd2d4b34be570fd52f2085349db4112c96426382a8dfa6a585d5bd7225cc5fb3fa8a0ab19
 DIST rezerwar-0.4.2.tar.gz 4332498 BLAKE2B d1eab4137fe56ba39c81c04ab75b9b0b9dac7baaf01e861d84801aee255074c4dc0c24662aa61993af7b80f0dbe831dfef1574fd1b2686ecb8500aaa68b6c279 SHA512 0ab1b00d982a96f2fd1346ff822efc68ae0e6c14a4d190ba0e8720fb119d7750851803c1387e83b93eee9cd43e332631360a67534495c20969366c885e2297ee
-EBUILD rezerwar-0.4.2-r1.ebuild 1063 BLAKE2B 9ede59c7616f3f397e476e10fe8a9589ae38512d0f613300ec7bd35f973652b1fcc00d94c6baeeb7120033273b58bd8568179b2ac520823652349a745fbe320f SHA512 ff9bcd00ab7dde9ac9f740eafcd21921ffb3df533c4c6cb755038f40a03ac725646da5dbfb7fa301008f28c71ec2bc088a7d5b18a31b703c1672c71ea06ce0cf
+EBUILD rezerwar-0.4.2-r2.ebuild 1198 BLAKE2B a4df042bbc23ec7088f2e6e30acaad5982b39327d15cbff42c3c9bcd5ffe602f1132e0744abd9b4df1b8ef7ac5ced25037d6647fd355b8f17a9a4624afddbdfe SHA512 de6a8a9c2c9a9e0bc40a3ed7749c652661daa9fa71505f0df9f7763e1a770b1286c9825b8f239ae231e9fb3ab99603c06b90cc37ee84f9e4ecf0509686a17c4d
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/rezerwar/files/rezerwar-0.4.2-gcc-CC.patch b/games-puzzle/rezerwar/files/rezerwar-0.4.2-gcc-CC.patch
new file mode 100644
index 000000000000..18471a8d3007
--- /dev/null
+++ b/games-puzzle/rezerwar/files/rezerwar-0.4.2-gcc-CC.patch
@@ -0,0 +1,12 @@
+diff -r 4e0421547ae0 configure
+--- a/configure	Sat Oct 03 14:28:50 2020 +0000
++++ b/configure	Sat Oct 03 14:41:42 2020 +0000
+@@ -58,7 +58,7 @@
+ }
+ EOF
+ 
+-	if ! gcc `sdl-config --cflags` test_sdl_mixer.c -o test_sdl_mixer; then
++	if ! $CC `sdl-config --cflags` test_sdl_mixer.c -o test_sdl_mixer; then
+ 		echo "SDL_mixer not found =/"
+ 		rm -f test_sdl_mixer*
+ 		exit
diff --git a/games-puzzle/rezerwar/files/rezerwar-0.4.2-gcc10.patch b/games-puzzle/rezerwar/files/rezerwar-0.4.2-gcc10.patch
new file mode 100644
index 000000000000..d219301b8aa1
--- /dev/null
+++ b/games-puzzle/rezerwar/files/rezerwar-0.4.2-gcc10.patch
@@ -0,0 +1,12 @@
+diff -r 3f22f3a0051b src/events.c
+--- a/src/events.c	Sat Oct 03 14:42:28 2020 +0000
++++ b/src/events.c	Sat Oct 03 14:42:42 2020 +0000
+@@ -38,7 +38,7 @@
+ 
+ extern Board *board;
+ extern Configuration *conf;
+-SDL_Surface *screen;
++extern SDL_Surface *screen;
+ Cube *speedy;			// currently accelerated cube
+ 
+ 
diff --git a/games-puzzle/rezerwar/rezerwar-0.4.2-r1.ebuild b/games-puzzle/rezerwar/rezerwar-0.4.2-r2.ebuild
index 042921d7df86..bead5c2cecc7 100644
--- a/games-puzzle/rezerwar/rezerwar-0.4.2-r1.ebuild
+++ b/games-puzzle/rezerwar/rezerwar-0.4.2-r2.ebuild
@@ -1,22 +1,28 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit desktop
+EAPI=7
+
+inherit desktop toolchain-funcs
 
 DESCRIPTION="Puzzle game like the known tetromino and the average pipe games"
-HOMEPAGE="http://tamentis.com/projects/rezerwar/"
-SRC_URI="http://tamentis.com/projects/rezerwar/files/${P}.tar.gz"
+HOMEPAGE="https://tamentis.com/projects/rezerwar/"
+SRC_URI="https://tamentis.com/projects/rezerwar/files/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-DEPEND="media-libs/libsdl[sound,joystick,video]
+DEPEND="
+	media-libs/libsdl[sound,joystick,video]
 	media-libs/sdl-mixer[vorbis]"
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc-CC.patch
+	"${FILESDIR}"/${P}-gcc10.patch
+)
+
 src_prepare() {
 	default
 	sed -i \
@@ -31,10 +37,12 @@ src_prepare() {
 }
 
 src_configure() {
+	tc-export CC
+
 	SDLCONFIG=sdl-config \
-	TARGET_BIN="/usr/bin" \
-	TARGET_DOC=/usr/share/doc/${PF} \
-	TARGET_DATA="/usr/share/${PN}" \
+	TARGET_BIN="${EPREFIX}/usr/bin" \
+	TARGET_DOC="${EPREFIX}/usr/share/doc/${PF}" \
+	TARGET_DATA="${EPREFIX}/usr/share/${PN}" \
 		./configure || die "configure failed"
 	sed -i \
 		-e '/TARGET_DOC/d' \