diff options
Diffstat (limited to 'dev-games')
-rw-r--r-- | dev-games/libmt_client/files/libmt_client-0.1.98-format.patch | 4 | ||||
-rw-r--r-- | dev-games/libmt_client/files/libmt_client-0.1.98-libdir.patch | 18 | ||||
-rw-r--r-- | dev-games/libmt_client/libmt_client-0.1.98-r1.ebuild (renamed from dev-games/libmt_client/libmt_client-0.1.98.ebuild) | 26 |
3 files changed, 41 insertions, 7 deletions
diff --git a/dev-games/libmt_client/files/libmt_client-0.1.98-format.patch b/dev-games/libmt_client/files/libmt_client-0.1.98-format.patch index 5173853849cc..76c329d388d6 100644 --- a/dev-games/libmt_client/files/libmt_client-0.1.98-format.patch +++ b/dev-games/libmt_client/files/libmt_client-0.1.98-format.patch @@ -1,5 +1,5 @@ ---- src/mt_client_game.c.old 2015-12-22 08:51:19.858561807 +0100 -+++ src/mt_client_game.c 2015-12-22 08:52:48.934904973 +0100 +--- a/src/mt_client_game.c ++++ b/src/mt_client_game.c @@ -56,7 +56,7 @@ } else diff --git a/dev-games/libmt_client/files/libmt_client-0.1.98-libdir.patch b/dev-games/libmt_client/files/libmt_client-0.1.98-libdir.patch new file mode 100644 index 000000000000..cc56eb09be45 --- /dev/null +++ b/dev-games/libmt_client/files/libmt_client-0.1.98-libdir.patch @@ -0,0 +1,18 @@ +https://bugs.gentoo.org/729734 + +--- a/libmt_client.m4 ++++ b/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/dev-games/libmt_client/libmt_client-0.1.98.ebuild b/dev-games/libmt_client/libmt_client-0.1.98-r1.ebuild index 611635f26520..997ade02a0e2 100644 --- a/dev-games/libmt_client/libmt_client-0.1.98.ebuild +++ b/dev-games/libmt_client/libmt_client-0.1.98-r1.ebuild @@ -1,12 +1,13 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit eutils +inherit autotools DESCRIPTION="backend library for the maitretarot clients" HOMEPAGE="http://www.nongnu.org/maitretarot/" + SRC_URI="https://savannah.nongnu.org/download/maitretarot/${PN}.pkg/${PV}/${P}.tar.bz2" LICENSE="GPL-2" @@ -16,10 +17,20 @@ KEYWORDS="amd64 x86" DEPEND="dev-libs/glib:2 dev-libs/libxml2 dev-games/libmaitretarot" -RDEPEND=${DEPEND} +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-format.patch + "${FILESDIR}"/${PN}-0.1.98-libdir.patch +) src_prepare() { - epatch "${FILESDIR}"/${P}-format.patch + default + + mv configure.{in,ac} || die + + # For the m4 libdir patch, bug #729734 + eautoreconf } src_configure() { @@ -28,5 +39,10 @@ src_configure() { src_install() { default + + # bug #716102 + insinto /usr/share/aclocal + doins libmt_client.m4 + find "${ED}" -name '*.la' -delete || die } |