summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2021-03-17 05:31:41 +0000
committerSam James <sam@gentoo.org>2021-03-17 05:40:27 +0000
commita2edc121314581cc76968273cff5586b07ab5b9a (patch)
tree8e18f547511845f0d40c84f644164e0b26ab66a7 /games-board/mt_ncurses_client
parentdev-games/libmt_client: port to EAPI 7, install M4 macro, fix libdir (diff)
downloadgentoo-a2edc121314581cc76968273cff5586b07ab5b9a.tar.gz
gentoo-a2edc121314581cc76968273cff5586b07ab5b9a.tar.bz2
gentoo-a2edc121314581cc76968273cff5586b07ab5b9a.zip
games-board/mt_ncurses_client: regenerate against fixed macros
We don't need to patch our local copy of the macros for dev-games/libmt_client, dev-games/libmaitretarot if we just install fixed system versions. Closes: https://bugs.gentoo.org/729734 Closes: https://bugs.gentoo.org/716102 Closes: https://bugs.gentoo.org/715582 Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'games-board/mt_ncurses_client')
-rw-r--r--games-board/mt_ncurses_client/files/mt_ncurses_client-0.1.98-libdir.patch34
-rw-r--r--games-board/mt_ncurses_client/mt_ncurses_client-0.1.98-r1.ebuild17
2 files changed, 15 insertions, 36 deletions
diff --git a/games-board/mt_ncurses_client/files/mt_ncurses_client-0.1.98-libdir.patch b/games-board/mt_ncurses_client/files/mt_ncurses_client-0.1.98-libdir.patch
deleted file mode 100644
index 73c5b184ca9f..000000000000
--- a/games-board/mt_ncurses_client/files/mt_ncurses_client-0.1.98-libdir.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-https://bugs.gentoo.org/739148
-
---- a/m4/libmaitretarot.m4
-+++ b/m4/libmaitretarot.m4
-@@ -9,10 +9,10 @@ AC_DEFUN([AM_LIB_MAITRETAROT],
- --with-libmaitretarot path to libmaitretarot libraries,
- [
- LIBMT_CFLAGS="-I${withval}/include"
-- LIBMT_LIBS="-L${withval}/lib -lmaitretarot"
-+ LIBMT_LIBS="-L${withval}/${libdir} -lmaitretarot"
- ],[
-- LIBMT_CFLAGS="-I/usr/local/include -I/usr/include"
-- LIBMT_LIBS="-L/usr/local/lib -L/usr/lib -lmaitretarot"
-+ LIBMT_CFLAGS="-I/usr/include"
-+ LIBMT_LIBS="-L${libdir} -lmaitretarot"
- ])
- ac_save_CPPFLAGS="$CPPFLAGS"
- ac_save_CFLAGS="$CFLAGS"
---- a/m4/libmt_client.m4
-+++ b/m4/libmt_client.m4
-@@ -9,10 +9,10 @@ AC_DEFUN([AM_LIB_MT_CLIENT],
- --with-libmt_client path to libmt_client libraries,
- [
- LIBMT_CFLAGS="-I${withval}/include"
-- LIBMT_LIBS="-L${withval}/lib -lmt_client"
-+ LIBMT_LIBS="-L${withval}/${libdir} -lmt_client"
- ],[
-- LIBMT_CFLAGS="-I/usr/local/include -I/usr/include"
-- LIBMT_LIBS="-L/usr/local/lib -L/usr/lib -lmt_client"
-+ LIBMT_CFLAGS="-I/usr/include"
-+ LIBMT_LIBS="-L${libdir} -lmt_client"
- ])
- ac_save_CPPFLAGS="$CPPFLAGS"
- ac_save_CFLAGS="$CFLAGS"
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 bde4eab1f3d2..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
@@ -3,7 +3,7 @@
EAPI=7
-inherit toolchain-funcs
+inherit autotools toolchain-funcs
DESCRIPTION="client for the french tarot game maitretarot"
HOMEPAGE="http://www.nongnu.org/maitretarot/"
@@ -23,9 +23,22 @@ RDEPEND="${DEPEND}"
PATCHES=(
"${FILESDIR}"/${P}-format.patch
- "${FILESDIR}"/${PN}-0.1.98-libdir.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