Gentoo Archives: gentoo-commits

From: Pacho Ramos <pacho@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-emulation/gnuboy/, games-emulation/gnuboy/files/
Date: Sun, 29 Apr 2018 11:26:57
Message-Id: 1525001161.1c7f47eda719bb43499bec5dffc3f3e7d3ca95a1.pacho@gentoo
1 commit: 1c7f47eda719bb43499bec5dffc3f3e7d3ca95a1
2 Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
3 AuthorDate: Sun Apr 29 10:12:28 2018 +0000
4 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
5 CommitDate: Sun Apr 29 11:26:01 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c7f47ed
7
8 games-emulation/gnuboy: Stop using games.eclass
9
10 Package-Manager: Portage-2.3.31, Repoman-2.3.9
11
12 .../gnuboy/files/gnuboy-1.0.3-exec-stack.patch | 12 ++---
13 .../gnuboy/files/gnuboy-1.0.3-linux-headers.patch | 36 ++++++-------
14 games-emulation/gnuboy/gnuboy-1.0.3-r2.ebuild | 62 ++++++++++++++++++++++
15 3 files changed, 86 insertions(+), 24 deletions(-)
16
17 diff --git a/games-emulation/gnuboy/files/gnuboy-1.0.3-exec-stack.patch b/games-emulation/gnuboy/files/gnuboy-1.0.3-exec-stack.patch
18 index b8059f915f6..a263ee49599 100644
19 --- a/games-emulation/gnuboy/files/gnuboy-1.0.3-exec-stack.patch
20 +++ b/games-emulation/gnuboy/files/gnuboy-1.0.3-exec-stack.patch
21 @@ -1,5 +1,5 @@
22 ---- asm/i386/cpu.s
23 -+++ asm/i386/cpu.s
24 +--- a/asm/i386/cpu.s
25 ++++ b/asm/i386/cpu.s
26 @@ -2428,3 +2428,6 @@
27
28
29 @@ -7,8 +7,8 @@
30 +#if defined(__linux__) && defined(__ELF__)
31 +.section .note.GNU-stack,"",%progbits
32 +#endif
33 ---- asm/i386/lcd.s
34 -+++ asm/i386/lcd.s
35 +--- a/asm/i386/lcd.s
36 ++++ b/asm/i386/lcd.s
37 @@ -288,3 +288,6 @@
38
39
40 @@ -16,8 +16,8 @@
41 +#if defined(__linux__) && defined(__ELF__)
42 +.section .note.GNU-stack,"",%progbits
43 +#endif
44 ---- asm/i386/refresh.s
45 -+++ asm/i386/refresh.s
46 +--- a/asm/i386/refresh.s
47 ++++ b/asm/i386/refresh.s
48 @@ -283,3 +283,6 @@
49
50
51
52 diff --git a/games-emulation/gnuboy/files/gnuboy-1.0.3-linux-headers.patch b/games-emulation/gnuboy/files/gnuboy-1.0.3-linux-headers.patch
53 index b0dd24a8e50..543bd2434ee 100644
54 --- a/games-emulation/gnuboy/files/gnuboy-1.0.3-linux-headers.patch
55 +++ b/games-emulation/gnuboy/files/gnuboy-1.0.3-linux-headers.patch
56 @@ -1,7 +1,7 @@
57 # -ansi breaks <linux/joystick.h>
58
59 ---- configure.in
60 -+++ configure.in
61 +--- a/configure.in
62 ++++ b/configure.in
63 @@ -133,7 +133,7 @@
64 if test "$enable_warnings" = yes ; then
65 case "$CC" in *gcc*)
66 @@ -11,8 +11,8 @@
67 *)
68 AC_MSG_RESULT(disabling warnings for non-gcc compiler) ;;
69 esac
70 ---- loader.c
71 -+++ loader.c
72 +--- a/loader.c
73 ++++ b/loader.c
74 @@ -11,7 +11,6 @@
75 #include <stdlib.h>
76 #include <string.h>
77 @@ -21,8 +21,8 @@
78
79 static int mbc_table[256] =
80 {
81 ---- main.c
82 -+++ main.c
83 +--- a/main.c
84 ++++ b/main.c
85 @@ -8,7 +8,6 @@
86 #include <stdlib.h>
87 #include <string.h>
88 @@ -31,8 +31,8 @@
89
90 #include <stdarg.h>
91 #include <signal.h>
92 ---- path.c
93 -+++ path.c
94 +--- a/path.c
95 ++++ b/path.c
96 @@ -5,7 +5,6 @@
97 #include <stdlib.h>
98 #include <string.h>
99 @@ -41,8 +41,8 @@
100
101 #ifdef ALT_PATH_SEP
102 #define SEP ';'
103 ---- rckeys.c
104 -+++ rckeys.c
105 +--- a/rckeys.c
106 ++++ b/rckeys.c
107 @@ -4,7 +4,6 @@
108 #include <stdlib.h>
109 #include <string.h>
110 @@ -51,8 +51,8 @@
111
112 #include "defs.h"
113 #include "rc.h"
114 ---- rcvars.c
115 -+++ rcvars.c
116 +--- a/rcvars.c
117 ++++ b/rcvars.c
118 @@ -5,7 +5,6 @@
119 #include <stdlib.h>
120 #include <string.h>
121 @@ -61,8 +61,8 @@
122
123 #include "defs.h"
124 #include "rc.h"
125 ---- sys/linux/fbdev.c
126 -+++ sys/linux/fbdev.c
127 +--- a/sys/linux/fbdev.c
128 ++++ b/sys/linux/fbdev.c
129 @@ -10,7 +10,6 @@
130
131 #include <stdlib.h>
132 @@ -71,8 +71,8 @@
133 #include <unistd.h>
134 #include <sys/mman.h>
135 #include <linux/fb.h>
136 ---- sys/linux/joy.c
137 -+++ sys/linux/joy.c
138 +--- a/sys/linux/joy.c
139 ++++ b/sys/linux/joy.c
140 @@ -2,7 +2,6 @@
141 #include <stdio.h>
142 #include <stdlib.h>
143 @@ -81,8 +81,8 @@
144 #include <linux/joystick.h>
145 #include <sys/types.h>
146 #include <sys/stat.h>
147 ---- sys/oss/oss.c
148 -+++ sys/oss/oss.c
149 +--- a/sys/oss/oss.c
150 ++++ b/sys/oss/oss.c
151 @@ -2,7 +2,6 @@
152
153 #include <stdlib.h>
154
155 diff --git a/games-emulation/gnuboy/gnuboy-1.0.3-r2.ebuild b/games-emulation/gnuboy/gnuboy-1.0.3-r2.ebuild
156 new file mode 100644
157 index 00000000000..3c4e37c0783
158 --- /dev/null
159 +++ b/games-emulation/gnuboy/gnuboy-1.0.3-r2.ebuild
160 @@ -0,0 +1,62 @@
161 +# Copyright 1999-2018 Gentoo Foundation
162 +# Distributed under the terms of the GNU General Public License v2
163 +
164 +EAPI=6
165 +inherit autotools
166 +
167 +DESCRIPTION="Gameboy emulator with multiple renderers"
168 +HOMEPAGE="https://sourceforge.net/projects/gnuboy/"
169 +SRC_URI="mirror://gentoo/${P}.tar.gz"
170 +
171 +LICENSE="GPL-2"
172 +SLOT="0"
173 +KEYWORDS="~amd64 ~x86"
174 +IUSE="X sdl"
175 +
176 +RDEPEND="
177 + sdl? ( media-libs/libsdl )
178 + !X? ( media-libs/libsdl )
179 + X? ( x11-libs/libXext )
180 +"
181 +DEPEND="${RDEPEND}
182 + X? (
183 + x11-proto/xextproto
184 + x11-proto/xproto )
185 +"
186 +
187 +src_prepare() {
188 + default
189 + eapply \
190 + "${FILESDIR}"/${P}-exec-stack.patch \
191 + "${FILESDIR}"/${P}-linux-headers.patch \
192 + "${FILESDIR}"/${P}-include.patch
193 +
194 + mv configure.in configure.ac || die
195 + eautoreconf
196 +}
197 +
198 +src_configure() {
199 + local myconf
200 +
201 + if ! use X ; then
202 + myconf="--with-sdl"
203 + fi
204 +
205 + econf \
206 + $(use_with X x) \
207 + $(use_with sdl) \
208 + $(use_enable x86 asm) \
209 + ${myconf} \
210 + --disable-arch \
211 + --disable-optimize
212 +}
213 +
214 +src_install() {
215 + for f in sdlgnuboy xgnuboy
216 + do
217 + if [[ -f ${f} ]] ; then
218 + dobin ${f}
219 + fi
220 + done
221 + dodoc README docs/{CHANGES,CONFIG,CREDITS,FAQ,HACKING,WHATSNEW}
222 +}