1 |
commit: d9bf4ffc7dbce29041e670e2462001998dd8c417 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Apr 1 01:54:00 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Apr 1 21:17:03 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9bf4ffc |
7 |
|
8 |
app-emulation/spim: EAPI 7, MissingInherits (desktop) |
9 |
|
10 |
Closes: https://bugs.gentoo.org/726562 |
11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
12 |
|
13 |
app-emulation/spim/spim-8.0-r3.ebuild | 32 ++++++++++++++++++-------------- |
14 |
1 file changed, 18 insertions(+), 14 deletions(-) |
15 |
|
16 |
diff --git a/app-emulation/spim/spim-8.0-r3.ebuild b/app-emulation/spim/spim-8.0-r3.ebuild |
17 |
index 2b2aacf0d76..05f6fcdf21f 100644 |
18 |
--- a/app-emulation/spim/spim-8.0-r3.ebuild |
19 |
+++ b/app-emulation/spim/spim-8.0-r3.ebuild |
20 |
@@ -1,8 +1,9 @@ |
21 |
# Copyright 1999-2021 Gentoo Authors |
22 |
# Distributed under the terms of the GNU General Public License v2 |
23 |
|
24 |
-EAPI=6 |
25 |
-inherit toolchain-funcs |
26 |
+EAPI=7 |
27 |
+ |
28 |
+inherit desktop toolchain-funcs |
29 |
|
30 |
DESCRIPTION="MIPS Simulator" |
31 |
HOMEPAGE="http://spimsimulator.sourceforge.net/" |
32 |
@@ -16,23 +17,26 @@ IUSE="doc X" |
33 |
RDEPEND=" |
34 |
X? ( |
35 |
media-fonts/font-adobe-100dpi |
36 |
- x11-libs/libXaw ) |
37 |
-" |
38 |
-DEPEND="${RDEPEND} |
39 |
- X? ( |
40 |
- x11-base/xorg-proto |
41 |
- x11-misc/imake |
42 |
+ x11-libs/libXaw |
43 |
) |
44 |
+" |
45 |
+DEPEND=" |
46 |
+ ${RDEPEND} |
47 |
+ X? ( x11-base/xorg-proto ) |
48 |
+" |
49 |
+BDEPEND=" |
50 |
sys-devel/bison |
51 |
+ X? ( x11-misc/imake ) |
52 |
" |
53 |
+ |
54 |
# test hangs forever, disabling it |
55 |
RESTRICT="test" |
56 |
|
57 |
src_prepare() { |
58 |
- # fix bugs 240005 and 243588 |
59 |
+ # fix bug #240005 and bug #243588 |
60 |
eapply "${FILESDIR}/${P}-r1-respect_env.patch" |
61 |
|
62 |
- #fix bug 330389 |
63 |
+ # fix bug #330389 |
64 |
sed -i -e 's:-12-\*-75-:-14-\*-100-:g' xspim/xspim.c || die |
65 |
|
66 |
default |
67 |
@@ -56,6 +60,10 @@ src_compile() { |
68 |
fi |
69 |
} |
70 |
|
71 |
+src_test() { |
72 |
+ emake -C spim test |
73 |
+} |
74 |
+ |
75 |
src_install() { |
76 |
emake DESTDIR="${ED}" -C spim install |
77 |
newman Documentation/spim.man spim.1 |
78 |
@@ -74,7 +82,3 @@ src_install() { |
79 |
dodoc Documentation/TeX/{cycle,spim}.ps |
80 |
fi |
81 |
} |
82 |
- |
83 |
-src_test() { |
84 |
- emake -C spim test |
85 |
-} |