1 |
commit: eb9328fe3472b826a77241ffe6d01738cae2342e |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Nov 6 04:29:00 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Nov 6 04:29:00 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb9328fe |
7 |
|
8 |
games-rpg/manaplus: drop unnecessary/incorrect src_test |
9 |
|
10 |
- 'make check' won't catch errors and the default src_test implementation |
11 |
works here for us anyway. |
12 |
|
13 |
- sync with live ebuild. |
14 |
|
15 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
16 |
|
17 |
games-rpg/manaplus/manaplus-1.9.3.23-r1.ebuild | 58 ++++++++++++-------------- |
18 |
games-rpg/manaplus/manaplus-9999.ebuild | 10 ++--- |
19 |
2 files changed, 30 insertions(+), 38 deletions(-) |
20 |
|
21 |
diff --git a/games-rpg/manaplus/manaplus-1.9.3.23-r1.ebuild b/games-rpg/manaplus/manaplus-1.9.3.23-r1.ebuild |
22 |
index a319f2a4328..c93acd1164d 100644 |
23 |
--- a/games-rpg/manaplus/manaplus-1.9.3.23-r1.ebuild |
24 |
+++ b/games-rpg/manaplus/manaplus-1.9.3.23-r1.ebuild |
25 |
@@ -1,15 +1,13 @@ |
26 |
-# Copyright 1999-2020 Gentoo Authors |
27 |
+# Copyright 1999-2021 Gentoo Authors |
28 |
# Distributed under the terms of the GNU General Public License v2 |
29 |
|
30 |
EAPI=7 |
31 |
|
32 |
-inherit autotools |
33 |
- |
34 |
DESCRIPTION="OpenSource 2D MMORPG client for Evol Online and The Mana World" |
35 |
HOMEPAGE="https://manaplus.org" |
36 |
if [[ ${PV} == 9999 ]] ; then |
37 |
- inherit git-r3 |
38 |
- EGIT_REPO_URI="https://github.com/ManaPlus/ManaPlus.git" |
39 |
+ inherit autotools git-r3 |
40 |
+ EGIT_REPO_URI="https://gitlab.com/manaplus/manaplus.git" |
41 |
else |
42 |
SRC_URI="http://download.evolonline.org/manaplus/download/${PV}/${P}.tar.xz" |
43 |
KEYWORDS="~amd64 ~x86" |
44 |
@@ -53,23 +51,21 @@ RDEPEND=" |
45 |
media-libs/sdl-net |
46 |
media-libs/sdl-ttf |
47 |
)" |
48 |
-DEPEND="${RDEPEND}" |
49 |
-BDEPEND=" |
50 |
+DEPEND="${RDEPEND} |
51 |
virtual/pkgconfig |
52 |
nls? ( sys-devel/gettext )" |
53 |
|
54 |
-PATCHES=( |
55 |
- "${FILESDIR}/${P}-metainfo.patch" |
56 |
-) |
57 |
- |
58 |
src_prepare() { |
59 |
default |
60 |
- eautoreconf |
61 |
+ |
62 |
+ if [[ ${PV} == 9999 ]] ; then |
63 |
+ eautoreconf |
64 |
+ fi |
65 |
} |
66 |
|
67 |
src_configure() { |
68 |
local myeconfargs=( |
69 |
- --localedir="${EPREFIX}"/usr/share/locale |
70 |
+ --localedir="${EPREFIX}/usr/share/locale" |
71 |
--without-internalsdlgfx |
72 |
$(use_with mumble) |
73 |
$(use_enable nls) |
74 |
@@ -78,28 +74,26 @@ src_configure() { |
75 |
$(use_with sdl2) |
76 |
$(use_enable test unittests) |
77 |
) |
78 |
- CONFIG_SHELL="/bin/bash" econf "${myeconfargs[@]}" |
79 |
+ |
80 |
+ CONFIG_SHELL="${BROOT}/bin/bash" econf "${myeconfargs[@]}" |
81 |
} |
82 |
|
83 |
src_install() { |
84 |
default |
85 |
|
86 |
- local destpath="/usr/share/${PN}" |
87 |
- dosym ../../../fonts/dejavu/DejaVuSans-Bold.ttf "${destpath}"/data/fonts/dejavusans-bold.ttf |
88 |
- dosym ../../../fonts/dejavu/DejaVuSans.ttf "${destpath}"/data/fonts/dejavusans.ttf |
89 |
- dosym ../../../fonts/dejavu/DejaVuSansMono-Bold.ttf "${destpath}"/data/fonts/dejavusansmono-bold.ttf |
90 |
- dosym ../../../fonts/dejavu/DejaVuSansMono.ttf "${destpath}"/data/fonts/dejavusansmono.ttf |
91 |
- dosym ../../../fonts/dejavu/DejaVuSerifCondensed-Bold.ttf "${destpath}"/data/fonts/dejavuserifcondensed-bold.ttf |
92 |
- dosym ../../../fonts/dejavu/DejaVuSerifCondensed.ttf "${destpath}"/data/fonts/dejavuserifcondensed.ttf |
93 |
- dosym ../../../fonts/liberation-fonts/LiberationMono-Bold.ttf "${destpath}"/data/fonts/liberationsansmono-bold.ttf |
94 |
- dosym ../../../fonts/liberation-fonts/LiberationMono-Regular.ttf "${destpath}"/data/fonts/liberationsansmono.ttf |
95 |
- dosym ../../../fonts/liberation-fonts/LiberationSans-Bold.ttf "${destpath}"/data/fonts/liberationsans-bold.ttf |
96 |
- dosym ../../../fonts/liberation-fonts/LiberationSans-Regular.ttf "${destpath}"/data/fonts/liberationsans.ttf |
97 |
- dosym ../../../fonts/mplus-outline-fonts/mplus-1p-bold.ttf "${destpath}"/data/fonts/mplus-1p-bold.ttf |
98 |
- dosym ../../../fonts/mplus-outline-fonts/mplus-1p-regular.ttf "${destpath}"/data/fonts/mplus-1p-regular.ttf |
99 |
- dosym ../../../fonts/wqy-microhei/wqy-microhei.ttc "${destpath}"/data/fonts/wqy-microhei.ttf |
100 |
-} |
101 |
- |
102 |
-src_test() { |
103 |
- make check |
104 |
+ local srcpath="../../../fonts" |
105 |
+ local destpath="/usr/share/${PN}/data/fonts" |
106 |
+ dosym ${srcpath}/dejavu/DejaVuSans-Bold.ttf "${destpath}"/dejavusans-bold.ttf |
107 |
+ dosym ${srcpath}/dejavu/DejaVuSans.ttf "${destpath}"/dejavusans.ttf |
108 |
+ dosym ${srcpath}/dejavu/DejaVuSansMono-Bold.ttf "${destpath}"/dejavusansmono-bold.ttf |
109 |
+ dosym ${srcpath}/dejavu/DejaVuSansMono.ttf "${destpath}"/dejavusansmono.ttf |
110 |
+ dosym ${srcpath}/dejavu/DejaVuSerifCondensed-Bold.ttf "${destpath}"/dejavuserifcondensed-bold.ttf |
111 |
+ dosym ${srcpath}/dejavu/DejaVuSerifCondensed.ttf "${destpath}"/dejavuserifcondensed.ttf |
112 |
+ dosym ${srcpath}/liberation-fonts/LiberationMono-Bold.ttf "${destpath}"/liberationsansmono-bold.ttf |
113 |
+ dosym ${srcpath}/liberation-fonts/LiberationMono-Regular.ttf "${destpath}"/liberationsansmono.ttf |
114 |
+ dosym ${srcpath}/liberation-fonts/LiberationSans-Bold.ttf "${destpath}"/liberationsans-bold.ttf |
115 |
+ dosym ${srcpath}/liberation-fonts/LiberationSans-Regular.ttf "${destpath}"/liberationsans.ttf |
116 |
+ dosym ${srcpath}/mplus-outline-fonts/mplus-1p-bold.ttf "${destpath}"/mplus-1p-bold.ttf |
117 |
+ dosym ${srcpath}/mplus-outline-fonts/mplus-1p-regular.ttf "${destpath}"/mplus-1p-regular.ttf |
118 |
+ dosym ${srcpath}/wqy-microhei/wqy-microhei.ttc "${destpath}"/wqy-microhei.ttf |
119 |
} |
120 |
|
121 |
diff --git a/games-rpg/manaplus/manaplus-9999.ebuild b/games-rpg/manaplus/manaplus-9999.ebuild |
122 |
index 4682afacd0d..c93acd1164d 100644 |
123 |
--- a/games-rpg/manaplus/manaplus-9999.ebuild |
124 |
+++ b/games-rpg/manaplus/manaplus-9999.ebuild |
125 |
@@ -1,4 +1,4 @@ |
126 |
-# Copyright 1999-2020 Gentoo Authors |
127 |
+# Copyright 1999-2021 Gentoo Authors |
128 |
# Distributed under the terms of the GNU General Public License v2 |
129 |
|
130 |
EAPI=7 |
131 |
@@ -57,6 +57,7 @@ DEPEND="${RDEPEND} |
132 |
|
133 |
src_prepare() { |
134 |
default |
135 |
+ |
136 |
if [[ ${PV} == 9999 ]] ; then |
137 |
eautoreconf |
138 |
fi |
139 |
@@ -73,7 +74,8 @@ src_configure() { |
140 |
$(use_with sdl2) |
141 |
$(use_enable test unittests) |
142 |
) |
143 |
- CONFIG_SHELL="/bin/bash" econf "${myeconfargs[@]}" |
144 |
+ |
145 |
+ CONFIG_SHELL="${BROOT}/bin/bash" econf "${myeconfargs[@]}" |
146 |
} |
147 |
|
148 |
src_install() { |
149 |
@@ -95,7 +97,3 @@ src_install() { |
150 |
dosym ${srcpath}/mplus-outline-fonts/mplus-1p-regular.ttf "${destpath}"/mplus-1p-regular.ttf |
151 |
dosym ${srcpath}/wqy-microhei/wqy-microhei.ttc "${destpath}"/wqy-microhei.ttf |
152 |
} |
153 |
- |
154 |
-src_test() { |
155 |
- make check |
156 |
-} |