gentoo resync : 29.06.2020

5 files changed, 51 insertions, 39 deletions

diff --git a/games-board/gnugo/Manifest b/games-board/gnugo/Manifest
index ee0822387eb5..2652507211c4 100644
--- a/games-board/gnugo/Manifest
+++ b/games-board/gnugo/Manifest
@@ -1,6 +1,7 @@
+AUX gnugo-3.9.1-autotools.patch 171 BLAKE2B 158e2fa553952be116466eae58ea1f7f9793a9cd22e763afd8479d26c693b8137f88d039ebcaf25a54d6c4185536f6de71ee4ed230716d26130c40ecc34db86b SHA512 5b29b62d7d2b6bf80b3d863931c8bad46fa005cd1a183a96dbdc229d47fd4fc44279f66b5659dbb27a69e4811e60fef573df767b7a37d9b9a05a6295b208c706
+AUX gnugo-3.9.1-fno-common.patch 635 BLAKE2B 922834d23e953bf5fb28b74c22e59a764c92098b72abc6cda9bbbc0965e53487c15a7cfce0cac3236768ca6b0b1ee740bb9ea66a9c7d9713ce888ff5756073bc SHA512 2677082b6e5ab78444c600e240f5a06a36d8f9cdc201db1e29a10f0cda8dd83e703d7d6181f9ac4c3de32e08f16e72e25063c7b76c304eed95fb2be6032e98f4
 AUX gnugo-3.9.1-format-security.patch 1943 BLAKE2B 2dd1c6f7b69da62baac53336e1b017136b16392b85a343aeb41d47fd10f5464a98eee1c8383e31531b21f72456a037bf72fb206752818f2fb39939d46bccb35a SHA512 5d53c53173980c9e73ce1f19c5c5e9228308cb00a61a623e942a3cc8598b73cc188ef24fda0b44feddcf0f381dbebdccf85716a187de730a9bb6412d1f9d61a7
 AUX gnugo-3.9.1-invalid-move.patch 727 BLAKE2B 5c5a13e3b00175627a45a4ef1d32b4a3dc049114281219ec70a22985c2deb027938b2e4ee1c0a58c1da8759800fdd9f98d6bb4981405f51af6269e0a01dedb74 SHA512 a1f20761e714670e2173b36390492304252bf30e46f93e37dee3cc72de346a59a8daaaaa6f0cf2e20834637598831f0f55d4c6c0825021d6fd00055a57db2bdb
 DIST gnugo-3.9.1.tar.gz 3207748 BLAKE2B 4251e125eac20188926210db8640f1ae4ff2b79f6a59b429af9e10fcfd6b0d34f9bf180b32194c519a7b59905a4b5e8bc1a2e45a071a8b8696bf16dd04f6a342 SHA512 b2b215fb8c1ebb0b58e54d14dcc02af3b76bde3a1b84a842a11a0a6018c77a2464c44b26fe0e7ad73b2b2e7fa22005466821bf762108c2c2e04428d3d459af97
-EBUILD gnugo-3.9.1-r1.ebuild 662 BLAKE2B 48296b632f9c05b031b7550e76af9a25217e21c7503a17f65fd859b4170ef8436251fa8ec911278cf4c469c5544f41c79975a197612c0938169211a89554de73 SHA512 287f9f4e6b7a7daa14cbfa7efe45d8f784c08fd4805a1b6f249e269156d9320a9d490ae1204a7c7bf52881e4bfd3b9e4982b3428a73f1cbae2f4db45f452fc58
-EBUILD gnugo-3.9.1-r2.ebuild 631 BLAKE2B c3d6006c4c0d1204237e44e81665b7cb9d8255f0e51a883ce78474eef683c4e4b208af7167c170164eebac16f15c7572b031681932cf1b5d2c0ac5dae362508c SHA512 2822f4e6e0c11a8bbd1d8b8c0c23bb500f874ba5d23671222deae93174e1b8b5e1e422beee4d18f164333193898a9ba35e7cb6973e4b6c4cadb10943ea1d9e51
+EBUILD gnugo-3.9.1-r2.ebuild 792 BLAKE2B f43cfd7efea54f57086f24f526818e36a924d8b62172f33dfc6800227ed8919665d06fe61cba563a28e43bbbb74b5c04b586e53f6d206c1a47b3c306f32187bd SHA512 8acf607deae33d1b9c8d8589c3b57ed1130a726bc8980ccd2b50723dfc7ab17009d50e407dbad5b9848a3e399748400ccda01605a6920d2f0f0c989b8a8f05df
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-board/gnugo/files/gnugo-3.9.1-autotools.patch b/games-board/gnugo/files/gnugo-3.9.1-autotools.patch
new file mode 100644
index 000000000000..79e28fa9b7bf
--- /dev/null
+++ b/games-board/gnugo/files/gnugo-3.9.1-autotools.patch
@@ -0,0 +1,10 @@
+--- a/configure.in
++++ b/configure.in
+@@ -151,6 +151,7 @@
+ 
+ AC_PROG_CPP
+ AC_PROG_RANLIB
++AM_PROG_AR
+ 
+ dnl required since we use SUBDIRS in Makefile.am
+ AC_PROG_MAKE_SET
diff --git a/games-board/gnugo/files/gnugo-3.9.1-fno-common.patch b/games-board/gnugo/files/gnugo-3.9.1-fno-common.patch
new file mode 100644
index 000000000000..db8215ecf90f
--- /dev/null
+++ b/games-board/gnugo/files/gnugo-3.9.1-fno-common.patch
@@ -0,0 +1,25 @@
+--- a/engine/globals.c
++++ b/engine/globals.c
+@@ -136,6 +136,9 @@
+ 				 * move generation is enabled.
+ 				 */
+ 
++int meaningless_white_moves[BOARDMAX];
++int meaningless_black_moves[BOARDMAX];
++
+ float best_move_values[10];
+ int   best_moves[10];
+ float white_score;
+--- a/engine/liberty.h
++++ b/engine/liberty.h
+@@ -859,8 +859,8 @@
+ extern struct worm_data worm[BOARDMAX];
+ 
+ /* Unconditionally meaningless moves. */
+-int meaningless_black_moves[BOARDMAX];
+-int meaningless_white_moves[BOARDMAX];
++extern int meaningless_black_moves[BOARDMAX];
++extern int meaningless_white_moves[BOARDMAX];
+ 
+ /* Surround cache (see surround.c) */
+ 
diff --git a/games-board/gnugo/gnugo-3.9.1-r1.ebuild b/games-board/gnugo/gnugo-3.9.1-r1.ebuild
deleted file mode 100644
index aba4225ac342..000000000000
--- a/games-board/gnugo/gnugo-3.9.1-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-DESCRIPTION="A Go-playing program"
-HOMEPAGE="https://www.gnu.org/software/gnugo/devel.html"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="readline"
-
-DEPEND="readline? ( sys-libs/readline:0= )
-	>=sys-libs/ncurses-5.2-r3:0="
-RDEPEND=${DEPEND}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-invalid-move.patch
-}
-
-src_configure() {
-	egamesconf \
-		$(use_with readline) \
-		--enable-cache-size=32
-}
-
-src_install() {
-	default
-	prepgamesdirs
-}
diff --git a/games-board/gnugo/gnugo-3.9.1-r2.ebuild b/games-board/gnugo/gnugo-3.9.1-r2.ebuild
index cfcbcca0fbbb..b0bf4b8a8278 100644
--- a/games-board/gnugo/gnugo-3.9.1-r2.ebuild
+++ b/games-board/gnugo/gnugo-3.9.1-r2.ebuild
@@ -1,7 +1,9 @@
-# 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 autotools
 
 DESCRIPTION="A Go-playing program"
 HOMEPAGE="https://www.gnu.org/software/gnugo/devel.html"
@@ -14,15 +16,22 @@ IUSE="readline"
 
 RDEPEND="
 	readline? ( sys-libs/readline:0= )
-	>=sys-libs/ncurses-5.2-r3:0=
-"
+	>=sys-libs/ncurses-5.2-r3:0="
 DEPEND="${RDEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-invalid-move.patch
 	"${FILESDIR}"/${P}-format-security.patch
+	"${FILESDIR}"/${P}-autotools.patch
+	"${FILESDIR}"/${P}-fno-common.patch
 )
 
+src_prepare() {
+	default
+	mv configure.{in,ac} || die
+	eautoreconf
+}
+
 src_configure() {
 	econf \
 		$(use_with readline) \