summaryrefslogtreecommitdiff
path: root/dev-games/libmt_client
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2021-03-20 14:27:17 +0000
committerV3n3RiX <venerix@redcorelinux.org>2021-03-20 14:27:17 +0000
commit5bb9ff1ee56d2b5e75e01a7f066d8b0cec84ec02 (patch)
tree66e860a5099bcad013f1cf667255dc372a7c11b3 /dev-games/libmt_client
parent7218e1b46bceac05841e90472501742d905fb3fc (diff)
gentoo resync : 20.03.2021
Diffstat (limited to 'dev-games/libmt_client')
-rw-r--r--dev-games/libmt_client/Manifest5
-rw-r--r--dev-games/libmt_client/files/libmt_client-0.1.98-format.patch4
-rw-r--r--dev-games/libmt_client/files/libmt_client-0.1.98-libdir.patch18
-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
4 files changed, 44 insertions, 9 deletions
diff --git a/dev-games/libmt_client/Manifest b/dev-games/libmt_client/Manifest
index af17aa22b919..a3853e746fb1 100644
--- a/dev-games/libmt_client/Manifest
+++ b/dev-games/libmt_client/Manifest
@@ -1,4 +1,5 @@
-AUX libmt_client-0.1.98-format.patch 2325 BLAKE2B 01827a1a89ae4ad36c6c655b1bfa6a0391cb0e556777873fcf01840ab13ef133dde7e0330b9ef266d3a6b0eb5c5a85fe731bff03ec8be6e7ffbb499edd8b9dd1 SHA512 c4ee6b5a5ef2a62f8022fe6672c2cf9769e9f120fad3abcbbd86c1ff12bc66c5d36ba285b8576eb410cb337c9bbb3e11c9941761a024f0d445b143a1d3de4d65
+AUX libmt_client-0.1.98-format.patch 2253 BLAKE2B 12527fce0c4a9d0c2fe719e783f7d650e7851da2edce0d99b1ad85014158fb398e191c115a67fd30ee1b4ea2738fc9799e1f8f2491436a3e0d2cf644d7ebfeb1 SHA512 0c380ff0864b922815c56fb287e8bf3b6c0485e13747f5c2641a4e5fdeb96e24901a135960f36f71d21a95cba9a90bafcb31c00928b5c175dc2a995fdb289567
+AUX libmt_client-0.1.98-libdir.patch 615 BLAKE2B e0077f5d6fbc5d21aeebd9d6fb0389a068b09fae2b7d6cf0552f9ef82acbab535b18b32976872c10f32fe4d9aeaa053684c26617ceef7cdf9260851be775da2f SHA512 0847661d4c64be724b08a9d83cbccab4508d1aabc663699284db232487894174e3da6ec5269f50e797a81dd6792b14467af0d46f3458dceeaab0f9ccae598715
DIST libmt_client-0.1.98.tar.bz2 146319 BLAKE2B 0edd2690f8139f62a9f31a19bd869e98f213b613a76ca735b5b95fdc7fb01f8d3e4739828f0d5c3ab0f0f4597875c1334304b1888e3dd237d0e2f6fb19c553ba SHA512 1eb53bd36a171dbc3138942ec8314aaf8a71ca207060ea6d7499d18c2680fe8ebc822d8ec9843675a7c329039d2c985783f239b74b13c004e47a38250a8c4411
-EBUILD libmt_client-0.1.98.ebuild 630 BLAKE2B 5d8377f1f2364e0c5859005223a977355c35f311ffeb1ff70c5266205123da90f1c0183bfcab9d1d93a18246861f2059968da97af3a570b58547b4c76ece85ce SHA512 dee8355439cc7fe7cbfd346c196ac6f80afd0e8da6ed26fbe6325c2f5f9dee302c892c0dcb6aa83ce1f1716dde5dbbd7abc574e685c4759ed654b9d8e4954b55
+EBUILD libmt_client-0.1.98-r1.ebuild 844 BLAKE2B cb0d70adb9568b3ee4910cef1a0bf8cdc0953eeeb4c6ec1daadbc5ecd89e8423e10e5195bc32f5bf7877a0be941df3404d0c760b2e001cc883c505a151c65763 SHA512 f3eb568c0c5cf425197496b002209d2234647badc6b88c8083227aed3e08313054d35c2e64fbab9c5d66b707af874cd9e75db4bdcbc5a077a4f3f301f227f255
MISC metadata.xml 910 BLAKE2B 8faa891eaa254f955ca28de28073d7d3d2026a5fad5a296e0f196d1e1087f4dd0ec08a4a613c28de345bb4ae626b292e5432640513a35dfed8a031ba5c452a99 SHA512 7721bd73046e7215f409f070ba0eb222ab05b84db6152cece5ac0fa9b1fd6259805b1c241cd515c62ed78567bce4fa5ef2bd3f9a01a5f2ad2ab7cc2d15ebde3b
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
}