commit: a2edc121314581cc76968273cff5586b07ab5b9a Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Wed Mar 17 05:31:41 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Mar 17 05:40:27 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2edc121
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 <AT> gentoo.org> .../files/mt_ncurses_client-0.1.98-libdir.patch | 34 ---------------------- .../mt_ncurses_client-0.1.98-r1.ebuild | 17 +++++++++-- 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 73c5b184ca9..00000000000 --- 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 bde4eab1f3d..b9aba21f140 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
