commit:     5920d8d69674ce438e01432cff064b8ad2abea04
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 17 05:37:04 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Mar 17 05:40:30 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5920d8d6

games-board/mt_dolphin_ia: EAPI 7, regenerate against fixed macros

Closes: https://bugs.gentoo.org/729734
Closes: https://bugs.gentoo.org/716102
Closes: https://bugs.gentoo.org/715582
Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...98-r1.ebuild => mt_dolphin_ia-0.1.98-r2.ebuild} | 24 ++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

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
similarity index 53%
rename from games-board/mt_dolphin_ia/mt_dolphin_ia-0.1.98-r1.ebuild
rename to games-board/mt_dolphin_ia/mt_dolphin_ia-0.1.98-r2.ebuild
index c548718e2f1..c6858bfa1ff 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
+}

Reply via email to