gentoo resync : 15.06.2021

5 files changed, 69 insertions, 53 deletions

diff --git a/games-puzzle/biniax2/Manifest b/games-puzzle/biniax2/Manifest
index 574da8e3dffc..187c8e805838 100644
--- a/games-puzzle/biniax2/Manifest
+++ b/games-puzzle/biniax2/Manifest
@@ -1,6 +1,7 @@
-AUX biniax2-1.30-build.patch 529 BLAKE2B 4c1a391a9d4534d83b017962c62d8cc776cf44a53f942d468f5e033287158ad7781451a174901e06103f73af216eb1792bb0f18f7941367c2ba9d1d2eaf7ec63 SHA512 3f335b2e71c81f46298c188a1cd3fc5e74210ddb79c4ec514156bfc581125aaf3aaee792f1f86b2b87edc6f8507cee577d817d3c15ce6691c45624c9def11b50
+AUX biniax2-1.30-build.patch 244 BLAKE2B 03dc0143569127afd2d52c5242d6e8fa83f1e5a09d1616d6b96789d88effa6b38820fa219674b28a3a11351f8e403310d1fe8c3e33b22eca5974d2ffbcdc6589 SHA512 e070bbaa29099aeafb192742fd5907e146fc93b3214a585da09a9d2bf2ade06f7acbfc0951fb721f0d0bd8139a40ee0a7fdf949a576611f3067009d373a83a1f
 AUX biniax2-1.30-dotfiles.patch 1372 BLAKE2B 2e33067d9fa951d371093ef33c61303e93760707730ce513f951235b3dad0ff146c6b8132f722da29ec05c61fb5a50eeb58e92ea50251a09e56bfcbd538a1b19 SHA512 7cc2c04ee62931038afe7b89eaeffef33e7e9312a206b987817760c6537c1923945634243abc380b059fc332d12b220d83660f5158f832d1dadb854dc1ea5fa3
+AUX biniax2-1.30-fno-common.patch 389 BLAKE2B 0b871740561bcd0a30b7f820bfc8a3f18180d12afd33623da5e15343f987acf3cd8b2a1282bce259dedf6a9a0663a37e3ddf16d42ec92d9b4adb2be152970b7f SHA512 22f5c509133b65ef12358298ab1486f69805e7a40475c598087f512e4a2fbf84086e2d98864a055c67703ffbe0c7dd89d885506b7b14d10b86c06c9a0c8c3a8d
 AUX biniax2.xpm 1292 BLAKE2B de60ee16f9229155b2a31682f759b025822eed85bfbe2b7c3d83cd18df230dd3a62bff7d5a5c11e496715a4e3565bee1e565cfbfae15b634993a3c26ec29b070 SHA512 5a53233b27f5e8dd792cd697d8233c8d34adaf00dda51944caad186deb50311e55bd76916f4aa6e352973fe14855d34a27bcf9a91a8f6a56238f5fe18f5d3b58
 DIST biniax2-1.30-fullsrc.tar.gz 3072220 BLAKE2B 7a62f9cf625e7f7d59ac6b84528911f939e489da131a7b414fcdc7cb4acffe1877363983a190aacbc2ce8ca87ae5a631ecc1f9bc937c103b65b6c0543c3cb641 SHA512 180564b24051b629c29bc6245664a36b7ff9881ac5003b03b91eeebff86c89b9507c028c1155387c42debaa51482d8f1e2b08e9e9236b77da1c3f286b78be8b5
-EBUILD biniax2-1.30-r1.ebuild 805 BLAKE2B e3277770de490616fa92e5e2f6bfac4f469a2ae6c31726f9e6e1818702a39248026550c7c4282df0a224d298ba8717e4d44facc43868159e81fcb33f0788f87d SHA512 d8f89846c14ff7232284a097032674d164ede3ce12b563be2a0afce5305deddcd1c460f42f299d798da235c56e098c31ee376dda47b0e41f190f5c3968a3b245
+EBUILD biniax2-1.30-r2.ebuild 907 BLAKE2B e5b996f119a23ba06ac2faafe9db3c89a947f69ee500fcf2265b4ba675e6b0bebc987cc3822cecd9d34e50fca008312f07ac5c8552c71c31498813378c4b918c SHA512 32c3c56c5b2d7190fb2ee3f72f8fbe61a2ae25629b090a74ba7d802a6c10320dd100d5f2d723b84e3db55fa177b0b3c7b163201fad72353227a5d5fc08629aec
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/biniax2/biniax2-1.30-r1.ebuild b/games-puzzle/biniax2/biniax2-1.30-r1.ebuild
deleted file mode 100644
index e4710407e8e7..000000000000
--- a/games-puzzle/biniax2/biniax2-1.30-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-DESCRIPTION="Logic game with arcade and tactics modes"
-HOMEPAGE="http://biniax.com/"
-SRC_URI="http://mordred.dir.bg/biniax/${P}-fullsrc.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl
-	media-libs/sdl-image[png]
-	media-libs/sdl-mixer[mod]"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	default
-
-	rm -f data/Thumbs.db
-	sed -i \
-		-e "s:data/:/usr/share/${PN}/:" \
-		desktop/{gfx,snd}.c \
-		|| die
-	eapply \
-		"${FILESDIR}"/${P}-build.patch \
-		"${FILESDIR}"/${P}-dotfiles.patch
-}
-
-src_install() {
-	dobin ${PN}
-	insinto "/usr/share/${PN}"
-	doins -r data/*
-	doicon "${FILESDIR}"/${PN}.xpm
-	make_desktop_entry ${PN} Biniax-2
-}
diff --git a/games-puzzle/biniax2/biniax2-1.30-r2.ebuild b/games-puzzle/biniax2/biniax2-1.30-r2.ebuild
new file mode 100644
index 000000000000..533449cd9a87
--- /dev/null
+++ b/games-puzzle/biniax2/biniax2-1.30-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop toolchain-funcs
+
+DESCRIPTION="Logic game with arcade and tactics modes"
+HOMEPAGE="http://biniax.com/"
+SRC_URI="http://www.tuzsuzov.com/biniax/${P}-fullsrc.tar.gz"
+S="${WORKDIR}"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	media-libs/libsdl[sound,video]
+	media-libs/sdl-image[png]
+	media-libs/sdl-mixer[mod]"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-build.patch
+	"${FILESDIR}"/${P}-dotfiles.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+)
+
+src_prepare() {
+	default
+
+	rm data/Thumbs.db || die
+
+	sed -i "s|data/|${EPREFIX}/usr/share/${PN}/|" desktop/{gfx,snd}.c || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	dobin ${PN}
+
+	insinto /usr/share/${PN}
+	doins -r data/.
+
+	doicon "${FILESDIR}"/${PN}.xpm
+	make_desktop_entry ${PN} Biniax-2
+}
diff --git a/games-puzzle/biniax2/files/biniax2-1.30-build.patch b/games-puzzle/biniax2/files/biniax2-1.30-build.patch
index cce8abe91a93..168ba6bfa794 100644
--- a/games-puzzle/biniax2/files/biniax2-1.30-build.patch
+++ b/games-puzzle/biniax2/files/biniax2-1.30-build.patch
@@ -1,14 +1,5 @@
 --- a/makefile
 +++ b/makefile
-@@ -4,7 +4,7 @@
- # To execute the game you need the runtimes of SDL, SDL_mixer and SDL_image.
- 
- FLAGS=-W -WALL
--CC=gcc
-+CC?=gcc
- FILES=biniax.c hof.c desktop/cfg.c desktop/gfx.c desktop/snd.c desktop/inp.c desktop/sys.c
- INCLUDES=-I . -I desktop
- LINKTO=-lSDL -lSDL_mixer -lSDL_image
 @@ -12,4 +12,4 @@
  TARGET=biniax2
  
diff --git a/games-puzzle/biniax2/files/biniax2-1.30-fno-common.patch b/games-puzzle/biniax2/files/biniax2-1.30-fno-common.patch
new file mode 100644
index 000000000000..73206f0c78d8
--- /dev/null
+++ b/games-puzzle/biniax2/files/biniax2-1.30-fno-common.patch
@@ -0,0 +1,17 @@
+https://bugs.gentoo.org/795078
+--- a/desktop/inp.c
++++ b/desktop/inp.c
+@@ -37,4 +37,5 @@
+ ******************************************************************************/

+ 

++BNX_INP _Inp;

+ 

+ BNX_BOOL inpInit()

+--- a/desktop/inp.h
++++ b/desktop/inp.h
+@@ -70,5 +70,4 @@
+ } BNX_INP;

+ 

+-BNX_INP _Inp;

+ 

+ /******************************************************************************