gentoo resync : 20.03.2021

4 files changed, 46 insertions, 30 deletions

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"
+}