17 files changed, 126 insertions, 62 deletions
diff --git a/games-board/Manifest.gz b/games-board/Manifest.gz
index 365c2a89c576..13dcb2e19289 100644
--- a/games-board/Manifest.gz
+++ b/games-board/Manifest.gz
diff --git a/games-board/cockatrice/Manifest b/games-board/cockatrice/Manifest
index 80cffed75577..8c8103a374be 100644
--- a/games-board/cockatrice/Manifest
+++ b/games-board/cockatrice/Manifest
@@ -1,3 +1,3 @@
 DIST cockatrice-20200823.tar.gz 8503044 BLAKE2B a987418b25db53e5fc42627e3efa93ee7348ff341d7cf844647c6655b00bb76f2929cff91c6a1d199525fba2785f4d5da533c934ad483636af1979d52f8eea94 SHA512 0fa919009536238cd540db6ef01271a41f96aa40a3d40b468fbc400905dbdfe914cfb785f62f8135355c64cc8fef19a83604aee1ad4420bb73c8f31b9d48e48b
 EBUILD cockatrice-20200823.ebuild 1523 BLAKE2B f33ae793f11c6e009b244a8f5b6dda2fce4a9d6186de0eb8d876d91cb30eb066c8f55a11dfc5943888b36fa1cf08278683897b686e2d03023d0cb235df028dde SHA512 abb3107c2129fb064f4b93b06705aebbff02ed8d5da5e431425705b80492ce8f85111c82188fef31f8ae1353eef798262681a8c9550ced5d3deb6ade4f0e16a4
-MISC metadata.xml 1420 BLAKE2B 60fb5e1f9c453bc764b05d9b90f73894b6d7d404cfdcf16bb8ea1cd5400ab1b862f95f43f1db2a30fe032ddd2916cf7cc0dbbc8651007efa924341fce3aa0a48 SHA512 8d12c234759230fdca9d534a334b745cd5cf87ac341c7f9c95c0870e391342de747534ec083ee0c65d83952a842294e3c90ec5fdbeb3013fe90bc7be45a78e08
+MISC metadata.xml 1450 BLAKE2B c4a364258aa2fdc7c82aedd69abed77a7c6715ea5e3124b4980c4067731b044fc5377b8aac137e168f5aff1b728bded8560b660d0690e5dfb3cc1561e8f07a54 SHA512 2ce5c04a36ab4af86f9dcf76f8ca031eb22dd9f6277f47c227bc8658298a40f8f72a6aa655224956073992bd787a865350ed0152c1663c6234075cb652c357bf
diff --git a/games-board/cockatrice/metadata.xml b/games-board/cockatrice/metadata.xml
index 36a79b8d8abf..bee76b4537da 100644
--- a/games-board/cockatrice/metadata.xml
+++ b/games-board/cockatrice/metadata.xml
@@ -1,15 +1,15 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>guillaumeseren@gmail.com</email>
 		<name>Guillaume Seren</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/games-board/goatee-gtk/Manifest b/games-board/goatee-gtk/Manifest
index 514656ce6998..6aff451a5349 100644
--- a/games-board/goatee-gtk/Manifest
+++ b/games-board/goatee-gtk/Manifest
@@ -1,3 +1,5 @@
 DIST goatee-gtk-0.3.1.1.tar.gz 60560 BLAKE2B f58420c1b625b0be47da43ea006cbe68d465ed2ed44e640ad7ffd9f17d738f612321c42bb9bbf76404b1bfd91ae4baee73381881e5185afe653dd10992417dfc SHA512 d745e981171fb1267d4765d90e4906b51a0cd7e7e3804c7f418feea21cc6f047e5e4e70f86f3ed3abbe11800e91ecd4669d566c194ad9b340941e509e6061f70
+DIST goatee-gtk-0.4.0.tar.gz 60655 BLAKE2B 628a43c4e55f7d5d16052a798c5bf7b829aca08a0c27ae176548dbb908508cb5d8bb24d3ee48d8fc8a96e89b59200672a0ed1ab6d811312c7949cbaec4353fb0 SHA512 cb95f2703d21b83e86a5a31ec2a9896170a18e8e7660c657f72e85779af92beb07dea015f3608a6bab58d2ce745f6338a0a7e8c03f46f300bf357d5392672b68
 EBUILD goatee-gtk-0.3.1.1.ebuild 1148 BLAKE2B d5d6710a13f69b4bddd0b319cfd97ebfca2cd94566d026a6296a12cae230e389e236d31eebb4fe252978c22941d0f2d0b065e6941a0803672269fef43e5e2c3a SHA512 0c0b4fdafdab2f947ed21279557fa9ec3df0747473eeb562246dd1d9eb7f9c59bddd367aed73c29ba8ac61ececc05774766f59456537ca12cb3011cc4f8ff6b8
-MISC metadata.xml 808 BLAKE2B 9d09adbd3d47ff4ff59389062d67cb8c9419465646e42d46cfe3e5273446723967979d42f10ac93fc447586b4c13ac9c8c206dee05a9ae3580b5b3d59301aa9d SHA512 513240a99caaf62bbb711d95e10ddaa546d59f4846c5bf707d19440893bf628f0e08e80bf7ec85c3e2cb62c360800b0fbd1dd1dce9f171e38534fd7bc0751599
+EBUILD goatee-gtk-0.4.0.ebuild 1048 BLAKE2B 8d46fadfdfc3bc6df42497c7cb67efdbe7348f00e5cdae11307a466a541e73ff741cdd66be2cea0f33d0718bb0cfd1dbd7a855cb88992dd9ab85b6a21ffeadcc SHA512 35629be6bb0f60611f0e46236687371fa0b4c1c0003013924bd2cb38e9b6818d3da4499a574b7050ea33ff10d7f3fdb76955ee71978343b8b88d56f95d871b32
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/games-board/goatee-gtk/goatee-gtk-0.4.0.ebuild b/games-board/goatee-gtk/goatee-gtk-0.4.0.ebuild
new file mode 100644
index 000000000000..16c70308b226
--- /dev/null
+++ b/games-board/goatee-gtk/goatee-gtk-0.4.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A monadic take on a 2,500-year-old board game - GTK+ UI"
+HOMEPAGE="http://khumba.net/projects/goatee"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-games/goatee-0.4:=[profile?] <dev-games/goatee-0.5:=[profile?]
+	>=dev-haskell/cairo-0.13:=[profile?] <dev-haskell/cairo-0.14:=[profile?]
+	>=dev-haskell/glib-0.13:=[profile?] <dev-haskell/glib-0.14:=[profile?]
+	>=dev-haskell/gtk-0.13:=[profile?] <dev-haskell/gtk-0.16:=[profile?]
+	>=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.7 )
+"
diff --git a/games-board/goatee-gtk/metadata.xml b/games-board/goatee-gtk/metadata.xml
index 97b194b9e0c6..b7878815d80d 100644
--- a/games-board/goatee-gtk/metadata.xml
+++ b/games-board/goatee-gtk/metadata.xml
@@ -2,20 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Goatee is a Go library and game editor, written in Haskell.  It provides a
-		GUI for recording, studying, and editing game records.  Underneath this is a
-		portable library for manipulating SGF files to build UIs and tools.  Goatee
-		aims to be full-featured by supporting all of the SGF spec and allowing for
-		full and easy customization of the game records you create.
-
-		This package is the GTK+ UI.
-	</longdescription>
 </pkgmetadata>
diff --git a/games-board/maitretarot/Manifest b/games-board/maitretarot/Manifest
index 2b4a95860f96..a36f27c50dff 100644
--- a/games-board/maitretarot/Manifest
+++ b/games-board/maitretarot/Manifest
@@ -1,4 +1,4 @@
-AUX maitretarot-0.1.98-format.patch 428 BLAKE2B 70110e2592282654ffd9bfc1a54c0bb12fc43f4ff6cd575535f59151d16a87b047e22165ef099b6f13e48ee189f32b61fb3f7bbf91b6fba7a3e2e17867b6cdb2 SHA512 a6dfc1a6dc027b80076d29b1ffbe28f6dae6f0737f51e760edbf963e31f91b0367120b90a8cb69188307bf91537e14b28ae7202ebd3b9aad80f48684204d94df
+AUX maitretarot-0.1.98-format.patch 356 BLAKE2B 9fa408ddad772bfdaa4b92096d1493d8dfa702dadbed5412ff8702d8a76f6006c0fc9ecefbe6c38db5baedd54aa62ca6abb4db933c311f1e54c9f4787d8c2b96 SHA512 c539adc46e0d61034266ccf0128a9c278c970a82f67ddc5d750c74642c3ad219da0aca69e276692896cb64bd20a266c01484d2c2c31540800bdaad9db6bcf03e
 DIST maitretarot-0.1.98.tar.bz2 92050 BLAKE2B eaf38974482043b1f8008fac455b75d7e429f4f9ead26de6a50705ef7f3b8995c0b84b37f0ae95f24df7df2e438e5062763eb62ef526033f1e62aaff9c2ef272 SHA512 99cfe8e99b2214f729d6dc175064f827a258d008c2f67a16a77bbf18ebf73da87fae4d58b9597b582cc450762f2cc497cded26d84bb4ce3e7c25f9891bb72e03
-EBUILD maitretarot-0.1.98-r1.ebuild 580 BLAKE2B 2f964dc58e01b71577029c87735bf4ac55381eed3ff13cceeed7740875cd9798a66b9c23dd00aa1c4b7cad5b4ddf960572aa4bccad32290976926b558a20bd68 SHA512 9c872d8f81fffa7ac6539df1d8e1561e741916844258f252d71144184b3b70ef633f39483a6781f297a7e6c5e5d8efb5f3a119a801997fd4d17f85f3fc2062e4
+EBUILD maitretarot-0.1.98-r2.ebuild 899 BLAKE2B 4b7d613f1c0db1f3aae436423637642fdff315f399a47d02437c87ec5fa45865a0204d7d7d8b9eed11b37cbf95013a0638ff02aea88589b7f5a902f2e2d81948 SHA512 385b134822603b207974b450cf3d18dc5ce08aed031bb2d4ebde126a2c3cb5ecc8331dde27e4334739b5aa6ac8313b2283087af72fbc3b198a8594a28d24c077
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-board/maitretarot/files/maitretarot-0.1.98-format.patch b/games-board/maitretarot/files/maitretarot-0.1.98-format.patch
index d7b5ca55b093..f01f4917553f 100644
--- a/games-board/maitretarot/files/maitretarot-0.1.98-format.patch
+++ b/games-board/maitretarot/files/maitretarot-0.1.98-format.patch
@@ -1,5 +1,5 @@
---- a/src/game.c	2015-12-16 21:59:49.400430743 +0100
-+++ b/src/game.c	2015-12-16 21:59:11.085058332 +0100
+--- a/src/game.c
++++ b/src/game.c
 @@ -642,7 +642,7 @@
  		  (game, prev_winner, c, ((i + prev_winner) % 4),
  		   game->players[((i + prev_winner) % 4)]->turn, &err))
diff --git a/games-board/maitretarot/maitretarot-0.1.98-r1.ebuild b/games-board/maitretarot/maitretarot-0.1.98-r1.ebuild
deleted file mode 100644
index ab3167b6fe21..000000000000
--- a/games-board/maitretarot/maitretarot-0.1.98-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="server for the french tarot game maitretarot"
-HOMEPAGE="http://www.nongnu.org/maitretarot/"
-SRC_URI="https://savannah.nongnu.org/download/maitretarot/${PN}.pkg/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/glib:2
-	dev-libs/libxml2
-	dev-games/libmaitretarot"
-RDEPEND=${DEPEND}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-format.patch
-)
-
-src_configure() {
-	econf --with-default-config-file="/etc/maitretarotrc.xml"
-}
diff --git a/games-board/maitretarot/maitretarot-0.1.98-r2.ebuild b/games-board/maitretarot/maitretarot-0.1.98-r2.ebuild
new file mode 100644
index 000000000000..a53f75ae021d
--- /dev/null
+++ b/games-board/maitretarot/maitretarot-0.1.98-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Server for the french tarot game maitretarot"
+HOMEPAGE="http://www.nongnu.org/maitretarot/"
+SRC_URI="https://savannah.nongnu.org/download/maitretarot/${PN}.pkg/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="dev-libs/glib:2
+	dev-libs/libxml2
+	dev-games/libmaitretarot"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-format.patch
+)
+
+src_prepare() {
+	default
+
+	mv configure.{in,ac} || die
+
+	# Remove bundled macros (avoid patching same file multiple times)
+	rm -rf m4/{libmaitretarot,libmt_client}.m4 || die
+
+	# Ensure we generate auto* with the fixed macros in tree
+	# (not bundled)
+	# bug #739142
+	eautoreconf
+}
+
+src_configure() {
+	econf --with-default-config-file="/etc/maitretarotrc.xml"
+}
diff --git a/games-board/metadata.xml b/games-board/metadata.xml
index fb63e54520b5..55f3af25731c 100644
--- a/games-board/metadata.xml
+++ b/games-board/metadata.xml
@@ -29,4 +29,3 @@
 		Kategoria games-board zawiera gry planszowe.
 	</longdescription>
 </catmetadata>
-
diff --git a/games-board/mt_dolphin_ia/Manifest b/games-board/mt_dolphin_ia/Manifest
index 14b761480363..fb92c15d88c8 100644
--- a/games-board/mt_dolphin_ia/Manifest
+++ b/games-board/mt_dolphin_ia/Manifest
@@ -1,4 +1,4 @@
 AUX mt_dolphin_ia-0.1.98-formatsecurity.patch 311 BLAKE2B 8b92264e591637fc337561e294cb473e03bb1370243b217dab73c3f5c67df4cd90529f3050528e29113e9f71f92a0e5381eb290e4cd9c2ab4e38e259e6fe9242 SHA512 c919fb834459d435f1648cbefe4bc36c1628586da06162b49282d650c667ab579fb1a2c53e292c0508d286c3cc6ba7ed8e1a0b9ea456c75a191486919c7191e3
 DIST mt_dolphin_ia-0.1.98.tar.bz2 92625 BLAKE2B d4b2373ad100466270f09f854337a098baf9a6744b7223786ed4cb7c4955a3e44020d61a7c331ed6fe796ffc9e787f38d814470a78a56a7a4dac0d3cdf04f38c SHA512 17ba198d344bb8ef499d6844e949155a18f8942266392150d77e5c53dc0ee32bcf6a297153f85d7a964b02de8a82f3d156e899f4d25ef1940dbc794d9b44979c
-EBUILD mt_dolphin_ia-0.1.98-r1.ebuild 532 BLAKE2B a294a8e5e791f60aacd33b24067e9ce90a52b118faa12ba602b96c00a38dfd06440704cd12f8af163e10c4f19611e5d7831d8e188609c90320709f6d363d30aa SHA512 72401906f7173853ecaf854840170abe9f47ffb2d728b7c5f18754a04015f6c16330d14a679adae5439545c7581043790dcac0053b8f7a2fc94e7ed7adb84759
+EBUILD mt_dolphin_ia-0.1.98-r2.ebuild 851 BLAKE2B de94c7d0be31313c658113827fddc4ab1255c26773b56cae94b0d0e3cf04a5d78c9e49ec35379b04fa21740e894702538945f7891ca78e549a593622b10c6776 SHA512 3fb2c50b090312cf23006dd30e224a2123ff879721eb6d3c742ca9ce704cb3419f756dacb66fb5815ef0bd2b73b6ebf79d92943ced18e66dee79a5e530be461a
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-board/mt_dolphin_ia/mt_dolphin_ia-0.1.98-r1.ebuild b/games-board/mt_dolphin_ia/mt_dolphin_ia-0.1.98-r2.ebuild
index c548718e2f1d..c6858bfa1ff3 100644
--- a/games-board/mt_dolphin_ia/mt_dolphin_ia-0.1.98-r1.ebuild
+++ b/games-board/mt_dolphin_ia/mt_dolphin_ia-0.1.98-r2.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="client for the french tarot game maitretarot"
 HOMEPAGE="http://www.nongnu.org/maitretarot/"
@@ -10,14 +12,28 @@ SRC_URI="https://savannah.nongnu.org/download/maitretarot/${PN}.pkg/${PV}/${P}.t
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
+BDEPEND="virtual/pkgconfig"
 DEPEND="dev-libs/glib:2
 	dev-libs/libxml2
 	dev-games/libmaitretarot
 	dev-games/libmt_client"
-RDEPEND=${DEPEND}
+RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-formatsecurity.patch
 )
+
+src_prepare() {
+	default
+
+	mv configure.{in,ac} || die
+
+	# Remove bundled macros (avoid patching same file multiple times)
+	rm -rf m4/{libmaitretarot,libmt_client}.m4 || die
+
+	# Ensure we generate auto* with the fixed macros in tree
+	# (not bundled)
+	# bug #715582
+	eautoreconf
+}
diff --git a/games-board/mt_ncurses_client/Manifest b/games-board/mt_ncurses_client/Manifest
index 2c588ad07bbb..1b28146020b6 100644
--- a/games-board/mt_ncurses_client/Manifest
+++ b/games-board/mt_ncurses_client/Manifest
@@ -1,4 +1,4 @@
 AUX mt_ncurses_client-0.1.98-format.patch 309 BLAKE2B f6d112c9a3b401c39642a8218dbf1c97e3b8376b68948d2558905f1ce6c55945a9b3f7dda6e9db03d5f8f962d5bec7197f981f37bfa38d2603753f82453231a8 SHA512 0c6a09dd4b3ad1e64c1997a7b82414666c715dd56aaa0c986fe190aaf96f49f1f4a5f773a915480503ed410a8fe15080f0cf0636c0e91854f5a5cf94893f81cc
 DIST mt_ncurses_client-0.1.98.tar.bz2 97156 BLAKE2B 48e58107dc070a35216bf755fb206b7ed1b02c7585ab0e0472acbb33432c7ef7b5671f7e5c0c33b749f975ce5ba360b51686e89a1dd3e391c040436f8229e6f8 SHA512 cb2c8d23e3e2c536d24fb9beacb35577229eae016998fb7c57204284336a53a2378ce0d7b940bec7662766f679502c7d9cbfe4118235300072e648b83c5244b6
-EBUILD mt_ncurses_client-0.1.98-r1.ebuild 651 BLAKE2B 82c57b1bbc6b73817d0667c6f073e14fdd516b2a6d61b2cddd031e4a17f9cc2e67e271e061beff4f795610bcfda52b05ebf09de9a0b49148fe303f7a8adbb55a SHA512 02ee37544430905c37aa6c34d840f149be5ec4c4e20c2b5ff9b27c1b9ee05227ca7197116bd5ffee0f205235b944d6cacc8b91292d1c87d7b82d60d842783a20
+EBUILD mt_ncurses_client-0.1.98-r1.ebuild 964 BLAKE2B 4b9dc8ddf2626aa7878b229299f83424a3788261a852e2c81b2899b4837b934eb30839da6aa09e00bb5888dbecd48ae4996a7184517cf6befd51d8ae559cc539 SHA512 8f607af4c8ca939e664fc230e7be0d416734cec7997e421f8b7e6b1d75db4731451a51c135f6c866dcc0d2d3756d9f73cbf59509f9f33193e814c745941ce167
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-board/mt_ncurses_client/mt_ncurses_client-0.1.98-r1.ebuild b/games-board/mt_ncurses_client/mt_ncurses_client-0.1.98-r1.ebuild
index f2228134f6dd..b9aba21f1406 100644
--- a/games-board/mt_ncurses_client/mt_ncurses_client-0.1.98-r1.ebuild
+++ b/games-board/mt_ncurses_client/mt_ncurses_client-0.1.98-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit toolchain-funcs
+inherit autotools toolchain-funcs
 
 DESCRIPTION="client for the french tarot game maitretarot"
 HOMEPAGE="http://www.nongnu.org/maitretarot/"
@@ -12,19 +12,33 @@ SRC_URI="https://savannah.nongnu.org/download/maitretarot/${PN}.pkg/${PV}/${P}.t
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
+BDEPEND="virtual/pkgconfig"
 DEPEND="dev-libs/glib:2
 	dev-libs/libxml2
 	dev-games/libmaitretarot
 	dev-games/libmt_client
 	sys-libs/ncurses:0"
-RDEPEND=${DEPEND}
+RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-format.patch
 )
 
+src_prepare() {
+	default
+
+	mv configure.{in,ac} || die
+
+	# Remove bundled macros (avoid patching same file multiple times)
+	rm -rf m4/{libmaitretarot,libmt_client}.m4 || die
+
+	# Ensure we generate auto* with the fixed macros in tree
+	# (not bundled)
+	# bug #716102
+	eautoreconf
+}
+
 src_configure() {
 	export LIBS="$( $(tc-getPKG_CONFIG) --libs ncurses )"
 	default
diff --git a/games-board/tablebase-syzygy/Manifest b/games-board/tablebase-syzygy/Manifest
index ce513e3a96bd..9584477d66a7 100644
--- a/games-board/tablebase-syzygy/Manifest
+++ b/games-board/tablebase-syzygy/Manifest
@@ -1020,4 +1020,4 @@ DIST KRvKR.rtbw 12944 BLAKE2B 42839f64c0e8ec8b3be09c128ee2e8d768ce5d77ca06c3cf90
 DIST KRvKR.rtbz 3408 BLAKE2B e56df50b368a89acb767a827f17d83ec028a87c06e9ad9d18826db9ce8da6024cbc69f961cad24846ed48e839ef5e6f95bd0798455ee2e1cc6e625df573c7309 SHA512 729068cb50ed6abff51a2b8f4041edfb0d109f163d961db9240a0c74069a7e792f3904a7d712882ad25d356059917a64a84f511914f05c20d41185815f23e3d9
 EBUILD tablebase-syzygy-0_pre20131213-r100.ebuild 1598 BLAKE2B 5750013dbb20b436b231b711bf0e76b7c0c2e304a4b4d13891c8a48dfca390a987048ca84d8a5e3550fdbb90eca2f11af3b437f9ef1b28de325aecbc8a900a8e SHA512 86f0df3e6ad0364cf70d73215cca12be43517af545c60be714d79d4422c98079a4469949232dd0deae28578e2e476861454898460eabd8245357f6f262c6fdc6
 EBUILD tablebase-syzygy-0_pre20131213.ebuild 1550 BLAKE2B 25081190ea10704e5ba3151d3806c694b8308a203f3763e6a6daca825e7b58ce2643aef6bb5a27f7b4b27cee186f388736a97db0e28cb5b71ee8fb5decc2a4dd SHA512 e0b53e707638ead230bac7e856c5e8a2acc7c0cc1b88a3b2668b7350d8637113f15d7f42a74683a65cb7faac4156667445ef70aff4a80027452e889a8d9b5c66
-MISC metadata.xml 296 BLAKE2B 5d6b6728206eb5fd9aaeef1f5bce9ce5a750b51f2fd61b6777f74c3d3b130644fbfb206859d18686e6ee933149ad322dca7c23d432202a4093bbb3a3a823b147 SHA512 9b6cb3427a2633074cd27495a4053b48383ee9ad08376d6309f190d7d3833c33adc787ba5394d458be84100bea97424b0256f2c8e749b69d35d502ff8547e26e
+MISC metadata.xml 296 BLAKE2B 2cb0bcbbfe8cf198a7f2c79be211763cad76fbd427b777f02bf1553a5826598aef2854a1f40ac0e3f68f1fbd4ec847f858bcb62bee372890f2f578d0949f9fff SHA512 d1f7a5c632b9a9ad3fcddfa09fd25d41790a84e0763dc053eec3fcce884db7efe08575d3ac3b94a2605a0f8d985004d60f1b8a1119052efc42632bd6caffa299
diff --git a/games-board/tablebase-syzygy/metadata.xml b/games-board/tablebase-syzygy/metadata.xml
index 6b080aa60cc4..87d2788fe2c7 100644
--- a/games-board/tablebase-syzygy/metadata.xml
+++ b/games-board/tablebase-syzygy/metadata.xml
@@ -5,6 +5,6 @@
   <email>ulm@gentoo.org</email>
 </maintainer>
 <use>
-  <flag name='6-pieces'>Install tablebases for 6 pieces (huge!)</flag>
+  <flag name="6-pieces">Install tablebases for 6 pieces (huge!)</flag>
 </use>
 </pkgmetadata>