gentoo resync : 25.11.2020

3 files changed, 36 insertions, 8 deletions

diff --git a/games-board/gnushogi/Manifest b/games-board/gnushogi/Manifest
index ae083d846cd7..49d6489ea308 100644
--- a/games-board/gnushogi/Manifest
+++ b/games-board/gnushogi/Manifest
@@ -1,3 +1,4 @@
+AUX gnushogi-1.4.1-fno-common.patch 366 BLAKE2B a84ecad2b955c0866ae0bb71bb7efe3c234d3a796ea94b07449e390a1839a52cc0ceb5f4b679cfc03ab20f30e2212c2cde652872ec6045e6e821795473ef3014 SHA512 61a53e379720b7b841f0fbb28972ef0f776c8f34efb45e86741fc023f6f3e439304ac180e116ebf038f99419b60f169c2032c88becbaaa170d4dc06bb9d3c3c8
 DIST gnushogi-1.4.1.tar.gz 542301 BLAKE2B bc2c0c89ca63d4cc617914771f9439d1e99ef89c87d46b3649fde97d521b874c74f049fe5340a5ccab603e7f532441821b7785aef2b50609903e926905d75ba9 SHA512 b997f309bfba85553465ceb262094aa0a9a53dc7ad970f77c0eb0c1558ba12f9dd15b42a6abfc85f5ac08bbfecc7816a6e3e4fb0efe2caabb043fb343b1ebecd
-EBUILD gnushogi-1.4.1-r1.ebuild 1008 BLAKE2B d8cfb1c28cc479e601f74cd71780325c5a7d0a0c9513c70f6c447bf5c73c39ed83dc8c00628af1107d4a7ce08cacc42d7b71834e957821ef2ff30a8f4fd7eecc SHA512 81d6ee8e19542475e1b79c445ed95357aa395bec68d3972f869c3c59c2d1626967740c89068027c387406c81e794c84ed2e43f5a4556c2dc525ed396678e3030
+EBUILD gnushogi-1.4.1-r1.ebuild 1080 BLAKE2B 8484290f582100bcdf648b815e45213f430173d5b4abc1267be1a6d26368a1ee38cfd0938df076c234a253f1208dbd1def2aff18cd5d16c0c8221865ed487e81 SHA512 d7e7ec093b03a11091142f672c8dee5049fd6dce1dc797f1627b4935d0a76d61b01d9090f31d04bdeb0b4f7bd73def71790bc33b58a4397809f3c8fc18a2f074
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-board/gnushogi/files/gnushogi-1.4.1-fno-common.patch b/games-board/gnushogi/files/gnushogi-1.4.1-fno-common.patch
new file mode 100644
index 000000000000..510590b82c09
--- /dev/null
+++ b/games-board/gnushogi/files/gnushogi-1.4.1-fno-common.patch
@@ -0,0 +1,20 @@
+--- a/gnushogi/cursesdsp.c
++++ b/gnushogi/cursesdsp.c
+@@ -71,7 +71,6 @@
+ 
+ unsigned short MV[MAXDEPTH];
+ int MSCORE;
+-char *DRAW;
+ 
+ /* Forward declarations. */
+ /* FIXME: change this name, puh-leeze! */
+--- a/gnushogi/rawdsp.c
++++ b/gnushogi/rawdsp.c
+@@ -48,7 +48,6 @@
+ int MSCORE;
+ 
+ int mycnt1, mycnt2;
+-char *DRAW;
+ extern char *InPtr;
+ extern short pscore[];
+ 
diff --git a/games-board/gnushogi/gnushogi-1.4.1-r1.ebuild b/games-board/gnushogi/gnushogi-1.4.1-r1.ebuild
index ebef0138a0f3..7d1bde2639a8 100644
--- a/games-board/gnushogi/gnushogi-1.4.1-r1.ebuild
+++ b/games-board/gnushogi/gnushogi-1.4.1-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils
+EAPI=7
+
+inherit desktop
 
 DESCRIPTION="Japanese version of chess (commandline + X-Version)"
 HOMEPAGE="https://www.gnu.org/software/gnushogi/"
@@ -13,12 +14,16 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="X"
 
-RDEPEND="sys-libs/ncurses:0
+RDEPEND="
+	sys-libs/ncurses:0=
 	X? ( x11-libs/libXaw )"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	>=sys-devel/bison-1.34
 	>=sys-devel/flex-2.5"
 
+PATCHES=( "${FILESDIR}"/${PN}-1.4.1-fno-common.patch )
+
 src_prepare() {
 	default
 
@@ -40,11 +45,13 @@ src_install() {
 	dobin gnushogi/gnushogi
 	doman doc/gnushogi.6
 	doinfo doc/gnushogi.info
-	if use X ; then
+
+	if use X; then
 		dobin xshogi/xshogi
 		doman doc/xshogi.6
 		make_desktop_entry xshogi XShogi
 	fi
-	dolib gnushogi/gnushogi.bbk
+
+	dolib.a gnushogi/gnushogi.bbk
 	dodoc README NEWS CONTRIB doc/gnushogi/*.html
 }