diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-03-20 14:27:17 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-03-20 14:27:17 +0000 |
| commit | 5bb9ff1ee56d2b5e75e01a7f066d8b0cec84ec02 (patch) | |
| tree | 66e860a5099bcad013f1cf667255dc372a7c11b3 /dev-games/libmaitretarot | |
| parent | 7218e1b46bceac05841e90472501742d905fb3fc (diff) | |
gentoo resync : 20.03.2021
Diffstat (limited to 'dev-games/libmaitretarot')
| -rw-r--r-- | dev-games/libmaitretarot/Manifest | 3 | ||||
| -rw-r--r-- | dev-games/libmaitretarot/files/libmaitretarot-0.1.98-libdir.patch | 18 | ||||
| -rw-r--r-- | dev-games/libmaitretarot/libmaitretarot-0.1.98-r2.ebuild (renamed from dev-games/libmaitretarot/libmaitretarot-0.1.98.ebuild) | 19 |
3 files changed, 35 insertions, 5 deletions
diff --git a/dev-games/libmaitretarot/Manifest b/dev-games/libmaitretarot/Manifest index a6a97ecec37e..f714348b3e64 100644 --- a/dev-games/libmaitretarot/Manifest +++ b/dev-games/libmaitretarot/Manifest @@ -1,3 +1,4 @@ +AUX libmaitretarot-0.1.98-libdir.patch 633 BLAKE2B 8fec5587a940744b9abb2981db49cf703376657b40d6367764daaf02ba7153d81a06b7802edb602ad3c893e198b656e89ecabf83777b3c06aa2a40cc716156e0 SHA512 88efa5708c79112e145cc3706e9e457017f7c7f9a63bd70291a4d0a0afcf7a1e66f22b1e0f0368ff911a5aa50b7a1b650c34801bab8d455c3c70a3de6687134b DIST libmaitretarot-0.1.98.tar.bz2 158060 BLAKE2B 0883c6232e53caa633091022e9f2488362b400723e78c71b836cf79a0189d304e5aaeadff0de4d3a67f9316c37a848ef5ae56312c79a6f20c287f196dec5675f SHA512 1626f7cd8d53be97b70f4258e83fccefc8edc0605e8850466e94a09f9cfbecf9f763ca7b9154f1fb77da15e9856398b8fce12b12064463a0a9293f8273e95d90 -EBUILD libmaitretarot-0.1.98.ebuild 548 BLAKE2B e532686a607a812bcf9768ac06a9764b321f60d8a5fc1735511c236e534b59dfcf1b99b1b7493466d6d1e98723b191e850a36c91ccc1635d6f0a2621baafcf17 SHA512 1ddaaacab565778268409087b2d208a0943892e4c266147cc01157eb1ca2fb82eadd275c9e7b219f4056a19338c40b68bd808d730fbf6249441546195308b668 +EBUILD libmaitretarot-0.1.98-r2.ebuild 734 BLAKE2B 7c1faffff1b9a1e7892f163fb678eee952d32813cb26ed2a9bfa0c219f1e96563a750f5370d4e26d3b5ec74cff4cb39fafa0c0a19389c649091e2890e038eb99 SHA512 4f04e100138eda8bb9b55879bb7fbae6e3d9504a3ac8c8c573911cdffd894a8e1fd8a743951b2773844c021dc7e3ac41c35ebbbe1f5242f556acf889a2b0d16d MISC metadata.xml 910 BLAKE2B 8faa891eaa254f955ca28de28073d7d3d2026a5fad5a296e0f196d1e1087f4dd0ec08a4a613c28de345bb4ae626b292e5432640513a35dfed8a031ba5c452a99 SHA512 7721bd73046e7215f409f070ba0eb222ab05b84db6152cece5ac0fa9b1fd6259805b1c241cd515c62ed78567bce4fa5ef2bd3f9a01a5f2ad2ab7cc2d15ebde3b diff --git a/dev-games/libmaitretarot/files/libmaitretarot-0.1.98-libdir.patch b/dev-games/libmaitretarot/files/libmaitretarot-0.1.98-libdir.patch new file mode 100644 index 000000000000..635ba1e437fa --- /dev/null +++ b/dev-games/libmaitretarot/files/libmaitretarot-0.1.98-libdir.patch @@ -0,0 +1,18 @@ +https://bugs.gentoo.org/729734 + +--- a/libmaitretarot.m4 ++++ b/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" diff --git a/dev-games/libmaitretarot/libmaitretarot-0.1.98.ebuild b/dev-games/libmaitretarot/libmaitretarot-0.1.98-r2.ebuild index ef9389f6791c..2004dba61357 100644 --- a/dev-games/libmaitretarot/libmaitretarot-0.1.98.ebuild +++ b/dev-games/libmaitretarot/libmaitretarot-0.1.98-r2.ebuild @@ -1,7 +1,8 @@ -# 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 + DESCRIPTION="backend library for the maitretarot games" HOMEPAGE="http://www.nongnu.org/maitretarot/" SRC_URI="https://savannah.nongnu.org/download/maitretarot/${PN}.pkg/${PV}/${P}.tar.bz2" @@ -10,10 +11,14 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 x86" +BDEPEND="virtual/pkgconfig" RDEPEND="dev-libs/glib:2 dev-libs/libxml2" -DEPEND="${RDEPEND} - virtual/pkgconfig" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-0.1.98-libdir.patch +) src_configure() { econf --disable-static @@ -21,5 +26,11 @@ src_configure() { src_install() { default + + # Needed for consumers like dev-games/libmt_client + # bug #729734 + insinto /usr/share/aclocal + doins libmaitretarot.m4 + find "${ED}" -name '*.la' -delete || die } |