Gentoo Archives: gentoo-commits

From: Brian Gloyer <brian.gloyer@×××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/guru:dev commit in: games-action/netrek-cow/, games-action/netrek-cow/netrek-cow/, ...
Date: Sat, 08 Jan 2022 06:49:23
Message-Id: 1641624306.a93bdbcec8a28899e3928d4ecf831200a61bc46a.brian.gloyer@gentoo
1 commit: a93bdbcec8a28899e3928d4ecf831200a61bc46a
2 Author: brian gloyer <brian.gloyer <AT> gmail <DOT> com>
3 AuthorDate: Sat Jan 8 06:45:06 2022 +0000
4 Commit: Brian Gloyer <brian.gloyer <AT> gmail <DOT> com>
5 CommitDate: Sat Jan 8 06:45:06 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a93bdbce
7
8 games-action/netrek-cow: patch configure.ac
9
10 Closes: https://bugs.gentoo.org/816534
11 Signed-off-by: brian gloyer <brian.gloyer <AT> gmail.com>
12
13 games-action/netrek-cow/autoupdate.patch | 103 +++++++++++++++++++++
14 games-action/netrek-cow/netrek-cow/Manifest | 4 +
15 .../files/netrek-cow-3.3.2-autoupdate.patch | 103 +++++++++++++++++++++
16 games-action/netrek-cow/netrek-cow/metadata.xml | 16 ++++
17 .../netrek-cow/netrek-cow/netrek-cow-3.3.2.ebuild | 45 +++++++++
18 5 files changed, 271 insertions(+)
19
20 diff --git a/games-action/netrek-cow/autoupdate.patch b/games-action/netrek-cow/autoupdate.patch
21 new file mode 100644
22 index 000000000..e9ededa2f
23 --- /dev/null
24 +++ b/games-action/netrek-cow/autoupdate.patch
25 @@ -0,0 +1,103 @@
26 +diff --git a/configure.ac b/configure.ac
27 +index ce956ee..5bb0866 100644
28 +--- a/configure.ac
29 ++++ b/configure.ac
30 +@@ -1,9 +1,10 @@
31 + dnl This file is an input file used by the GNU "autoconf" program to
32 + dnl generate the file "configure", which is run during Netrek installation
33 + dnl to configure the system for the local environment.
34 +-AC_INIT(name.c)
35 +-AC_CANONICAL_SYSTEM
36 +-AC_CONFIG_HEADER(config.h)
37 ++AC_INIT
38 ++AC_CONFIG_SRCDIR([name.c])
39 ++AC_CANONICAL_TARGET
40 ++AC_CONFIG_HEADERS([config.h])
41 +
42 + AC_PROG_INSTALL
43 +
44 +@@ -11,7 +12,7 @@ AC_PROG_CC
45 + AC_PROG_CPP
46 + AC_PROG_LN_S
47 +
48 +-AC_AIX
49 ++AC_USE_SYSTEM_EXTENSIONS
50 +
51 + AC_C_INLINE
52 +
53 +@@ -26,18 +27,24 @@ AC_C_INLINE
54 + #--------------------------------------------------------------------
55 +
56 + AC_MSG_CHECKING(if fd_set requires sys/select.h)
57 +-AC_TRY_COMPILE( [#include <sys/types.h>], [fd_set readMask, writeMask;],
58 +- AC_MSG_RESULT(no) ,
59 +- AC_EGREP_HEADER(fd_set, sys/select.h,
60 ++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>]], [[fd_set readMask, writeMask;]])],[AC_MSG_RESULT(no) ],[AC_EGREP_HEADER(fd_set, sys/select.h,
61 + AC_DEFINE(NEED_SYS_SELECT_H) AC_MSG_RESULT(yes),
62 +- AC_DEFINE(NO_FD_SET) AC_MSG_RESULT(fd_set missing)))
63 ++ AC_DEFINE(NO_FD_SET) AC_MSG_RESULT(fd_set missing))])
64 +
65 + #--------------------------------------------------------------------
66 + # Check for various typedefs and provide substitutes if
67 + # they don't exist.
68 + #--------------------------------------------------------------------
69 +
70 +-AC_HEADER_STDC
71 ++m4_warn([obsolete],
72 ++[The preprocessor macro `STDC_HEADERS' is obsolete.
73 ++ Except in unusual embedded environments, you can safely include all
74 ++ ISO C90 headers unconditionally.])dnl
75 ++# Autoupdate added the next two lines to ensure that your configure
76 ++# script's behavior did not change. They are probably safe to remove.
77 ++AC_CHECK_INCLUDES_DEFAULT
78 ++AC_PROG_EGREP
79 ++
80 + AC_CHECK_HEADERS(unistd.h memory.h math.h stdlib.h)
81 + AC_CHECK_HEADERS(sys/timeb.h sys/ptyio.h sys/fcntl.h fcntl.h)
82 + AC_CHECK_HEADERS(ctype.h machine/endian.h sys/resource.h)
83 +@@ -46,7 +53,7 @@ AC_CHECK_HEADERS(sys/wait.h netinet/in.h netinet/tcp.h sys/filio.h)
84 + AC_TYPE_PID_T
85 + AC_TYPE_UID_T
86 + AC_TYPE_SIZE_T
87 +-AC_FUNC_VFORK
88 ++AC_FUNC_FORK
89 + AC_STRUCT_TM
90 +
91 + AC_MSG_CHECKING(for itimer in time.h)
92 +@@ -80,7 +87,7 @@ if test -z "$NOX11" ; then
93 + if test -z "$x_libraries" ; then
94 + echo checking for X11 header files
95 + XINCLUDES=""
96 +-AC_TRY_CPP([#include <X11/Intrinsic.h>], , XINCLUDES="nope")
97 ++AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <X11/Intrinsic.h>]])],[],[XINCLUDES="nope"])
98 + if test "$XINCLUDES" = nope; then
99 + dirs="/usr/unsupported/include /usr/local/include /usr/X386/include \
100 + /usr/include/X11R4 /usr/X11R5/include /usr/include/X11R5 \
101 +@@ -165,7 +172,19 @@ AC_CHECK_LIB(sun, main, [LIBS="$LIBS -lsun"])
102 + # Check for type of signals
103 + #--------------------------------------------------------------------
104 +
105 +-AC_TYPE_SIGNAL
106 ++m4_warn([obsolete],
107 ++[your code may safely assume C89 semantics that RETSIGTYPE is void.
108 ++Remove this warning and the `AC_CACHE_CHECK' when you adjust the code.])dnl
109 ++AC_CACHE_CHECK([return type of signal handlers],[ac_cv_type_signal],[AC_COMPILE_IFELSE(
110 ++[AC_LANG_PROGRAM([#include <sys/types.h>
111 ++#include <signal.h>
112 ++],
113 ++ [return *(signal (0, 0)) (0) == 1;])],
114 ++ [ac_cv_type_signal=int],
115 ++ [ac_cv_type_signal=void])])
116 ++AC_DEFINE_UNQUOTED([RETSIGTYPE],[$ac_cv_type_signal],[Define as the return type of signal handlers
117 ++ (`int' or `void').])
118 ++
119 + AC_CHECK_FUNCS(usleep random setstate strftime ftime)
120 + AC_CHECK_LIB(m, main, [LIBS="$LIBS -lm"])
121 + AC_CHECK_FUNCS(nint)
122 +@@ -201,4 +220,5 @@ fi
123 + #--------------------------------------------------------------------
124 + # Emit output
125 + #--------------------------------------------------------------------
126 +-AC_OUTPUT(system.mk)
127 ++AC_CONFIG_FILES([system.mk])
128 ++AC_OUTPUT
129
130 diff --git a/games-action/netrek-cow/netrek-cow/Manifest b/games-action/netrek-cow/netrek-cow/Manifest
131 new file mode 100644
132 index 000000000..564830077
133 --- /dev/null
134 +++ b/games-action/netrek-cow/netrek-cow/Manifest
135 @@ -0,0 +1,4 @@
136 +AUX netrek-cow-3.3.2-autoupdate.patch 3820 BLAKE2B 41e9de377f196e64d8764cacc4e609b11edcfd73ae5f8b3151e7cc9d63603ce4ba9d2a23de215303b49d1914f62688c0bb5f42330595573a3872e3cae435d659 SHA512 b270a4f51720b7bc7ff6a85c076d92bb31fd492528ed12b85fa390b72b9e43d1b14824bbdcea40710c6b409b4f036625d914b9024aab10accb536c6cb4db921c
137 +DIST netrek-cow-3.3.2.tar.gz 2630673 BLAKE2B 1a54b58d112f0893275b57967573ce308e69b99e42a660670f3a5fc7f15f2dc110f2008e496282a58da181252a196feb8218a87f52db16444f1f50cef2a6809f SHA512 9a0ab78ed86d174f52d35d30a409efd985bd2d39062a993c3790f36ade1fa0a9b95b9d914f5c1fa57497f281e88ece0f6bc86abc962bd87ff44f68c1416f07f0
138 +EBUILD netrek-cow-3.3.2.ebuild 767 BLAKE2B 560e534e13708003e905d58d04944b1dc37e956baeae0f2c1dbcff28ce307570e2e10db781c83a2f073bdb77db4bd265677ae371b29443075aa112967e5088a9 SHA512 acc5cded53ba6a7df74c42afcf90a1e02b6a1a85b537e1948305c714f9a0e03e2bb546b665ae9a62c0123c0b1ccc959c46c2aea8c9bd59f78d969e073c13b2c4
139 +MISC metadata.xml 549 BLAKE2B 9f82dafe4f3010a8794c656f0b2d50c2adb18fd0a570c37cdd03dd21a910db089f2ac61ec5abe592fa5c7a47fe00753ea6581b0313665eee75cebeee36000ea8 SHA512 a7723c9a9d4e0ffa94dab929633d795ed3b077e18af3f277a2c0012eb91deb15cb1a9b8f1ac8e927f663fdab23eae26762c7987faa24e991bc49ffe5129ef614
140
141 diff --git a/games-action/netrek-cow/netrek-cow/files/netrek-cow-3.3.2-autoupdate.patch b/games-action/netrek-cow/netrek-cow/files/netrek-cow-3.3.2-autoupdate.patch
142 new file mode 100644
143 index 000000000..e9ededa2f
144 --- /dev/null
145 +++ b/games-action/netrek-cow/netrek-cow/files/netrek-cow-3.3.2-autoupdate.patch
146 @@ -0,0 +1,103 @@
147 +diff --git a/configure.ac b/configure.ac
148 +index ce956ee..5bb0866 100644
149 +--- a/configure.ac
150 ++++ b/configure.ac
151 +@@ -1,9 +1,10 @@
152 + dnl This file is an input file used by the GNU "autoconf" program to
153 + dnl generate the file "configure", which is run during Netrek installation
154 + dnl to configure the system for the local environment.
155 +-AC_INIT(name.c)
156 +-AC_CANONICAL_SYSTEM
157 +-AC_CONFIG_HEADER(config.h)
158 ++AC_INIT
159 ++AC_CONFIG_SRCDIR([name.c])
160 ++AC_CANONICAL_TARGET
161 ++AC_CONFIG_HEADERS([config.h])
162 +
163 + AC_PROG_INSTALL
164 +
165 +@@ -11,7 +12,7 @@ AC_PROG_CC
166 + AC_PROG_CPP
167 + AC_PROG_LN_S
168 +
169 +-AC_AIX
170 ++AC_USE_SYSTEM_EXTENSIONS
171 +
172 + AC_C_INLINE
173 +
174 +@@ -26,18 +27,24 @@ AC_C_INLINE
175 + #--------------------------------------------------------------------
176 +
177 + AC_MSG_CHECKING(if fd_set requires sys/select.h)
178 +-AC_TRY_COMPILE( [#include <sys/types.h>], [fd_set readMask, writeMask;],
179 +- AC_MSG_RESULT(no) ,
180 +- AC_EGREP_HEADER(fd_set, sys/select.h,
181 ++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>]], [[fd_set readMask, writeMask;]])],[AC_MSG_RESULT(no) ],[AC_EGREP_HEADER(fd_set, sys/select.h,
182 + AC_DEFINE(NEED_SYS_SELECT_H) AC_MSG_RESULT(yes),
183 +- AC_DEFINE(NO_FD_SET) AC_MSG_RESULT(fd_set missing)))
184 ++ AC_DEFINE(NO_FD_SET) AC_MSG_RESULT(fd_set missing))])
185 +
186 + #--------------------------------------------------------------------
187 + # Check for various typedefs and provide substitutes if
188 + # they don't exist.
189 + #--------------------------------------------------------------------
190 +
191 +-AC_HEADER_STDC
192 ++m4_warn([obsolete],
193 ++[The preprocessor macro `STDC_HEADERS' is obsolete.
194 ++ Except in unusual embedded environments, you can safely include all
195 ++ ISO C90 headers unconditionally.])dnl
196 ++# Autoupdate added the next two lines to ensure that your configure
197 ++# script's behavior did not change. They are probably safe to remove.
198 ++AC_CHECK_INCLUDES_DEFAULT
199 ++AC_PROG_EGREP
200 ++
201 + AC_CHECK_HEADERS(unistd.h memory.h math.h stdlib.h)
202 + AC_CHECK_HEADERS(sys/timeb.h sys/ptyio.h sys/fcntl.h fcntl.h)
203 + AC_CHECK_HEADERS(ctype.h machine/endian.h sys/resource.h)
204 +@@ -46,7 +53,7 @@ AC_CHECK_HEADERS(sys/wait.h netinet/in.h netinet/tcp.h sys/filio.h)
205 + AC_TYPE_PID_T
206 + AC_TYPE_UID_T
207 + AC_TYPE_SIZE_T
208 +-AC_FUNC_VFORK
209 ++AC_FUNC_FORK
210 + AC_STRUCT_TM
211 +
212 + AC_MSG_CHECKING(for itimer in time.h)
213 +@@ -80,7 +87,7 @@ if test -z "$NOX11" ; then
214 + if test -z "$x_libraries" ; then
215 + echo checking for X11 header files
216 + XINCLUDES=""
217 +-AC_TRY_CPP([#include <X11/Intrinsic.h>], , XINCLUDES="nope")
218 ++AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <X11/Intrinsic.h>]])],[],[XINCLUDES="nope"])
219 + if test "$XINCLUDES" = nope; then
220 + dirs="/usr/unsupported/include /usr/local/include /usr/X386/include \
221 + /usr/include/X11R4 /usr/X11R5/include /usr/include/X11R5 \
222 +@@ -165,7 +172,19 @@ AC_CHECK_LIB(sun, main, [LIBS="$LIBS -lsun"])
223 + # Check for type of signals
224 + #--------------------------------------------------------------------
225 +
226 +-AC_TYPE_SIGNAL
227 ++m4_warn([obsolete],
228 ++[your code may safely assume C89 semantics that RETSIGTYPE is void.
229 ++Remove this warning and the `AC_CACHE_CHECK' when you adjust the code.])dnl
230 ++AC_CACHE_CHECK([return type of signal handlers],[ac_cv_type_signal],[AC_COMPILE_IFELSE(
231 ++[AC_LANG_PROGRAM([#include <sys/types.h>
232 ++#include <signal.h>
233 ++],
234 ++ [return *(signal (0, 0)) (0) == 1;])],
235 ++ [ac_cv_type_signal=int],
236 ++ [ac_cv_type_signal=void])])
237 ++AC_DEFINE_UNQUOTED([RETSIGTYPE],[$ac_cv_type_signal],[Define as the return type of signal handlers
238 ++ (`int' or `void').])
239 ++
240 + AC_CHECK_FUNCS(usleep random setstate strftime ftime)
241 + AC_CHECK_LIB(m, main, [LIBS="$LIBS -lm"])
242 + AC_CHECK_FUNCS(nint)
243 +@@ -201,4 +220,5 @@ fi
244 + #--------------------------------------------------------------------
245 + # Emit output
246 + #--------------------------------------------------------------------
247 +-AC_OUTPUT(system.mk)
248 ++AC_CONFIG_FILES([system.mk])
249 ++AC_OUTPUT
250
251 diff --git a/games-action/netrek-cow/netrek-cow/metadata.xml b/games-action/netrek-cow/netrek-cow/metadata.xml
252 new file mode 100644
253 index 000000000..bf36b0504
254 --- /dev/null
255 +++ b/games-action/netrek-cow/netrek-cow/metadata.xml
256 @@ -0,0 +1,16 @@
257 +<?xml version="1.0" encoding="UTF-8"?>
258 +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
259 +<pkgmetadata>
260 + <maintainer type="person">
261 + <email>brian.gloyer@×××××.com</email>
262 + <name>brian gloyer</name>
263 + </maintainer>
264 + <upstream>
265 + <maintainer status="active">
266 + <email>brian.gloyer@×××××.com</email>
267 + <name>brian gloyer</name>
268 + </maintainer>
269 + <bugs-to>https://github.com/quozl/netrek-client-cow/issues/</bugs-to>
270 + <remote-id type="github">quozl/netrek-client-cow</remote-id>
271 + </upstream>
272 +</pkgmetadata>
273
274 diff --git a/games-action/netrek-cow/netrek-cow/netrek-cow-3.3.2.ebuild b/games-action/netrek-cow/netrek-cow/netrek-cow-3.3.2.ebuild
275 new file mode 100644
276 index 000000000..a552ae655
277 --- /dev/null
278 +++ b/games-action/netrek-cow/netrek-cow/netrek-cow-3.3.2.ebuild
279 @@ -0,0 +1,45 @@
280 +# Copyright 1999-2022 Gentoo Authors
281 +# Distributed under the terms of the GNU General Public License v2
282 +
283 +EAPI=7
284 +inherit autotools
285 +
286 +DESCRIPTION="cow client for netrek"
287 +HOMEPAGE="https://netrek.org"
288 +SRC_URI="https://github.com/quozl/netrek-client-cow/archive/${PV}.tar.gz -> ${P}.tar.gz"
289 +
290 +LICENSE="MIT"
291 +SLOT="0"
292 +KEYWORDS="~amd64"
293 +
294 +S="${WORKDIR}/netrek-client-cow-${PV}"
295 +
296 +# upstream has a file named check that is unrelated to tests
297 +RESTRICT="test"
298 +
299 +RDEPEND="
300 + media-libs/imlib2
301 + media-libs/libsdl
302 + media-libs/sdl-mixer
303 + x11-base/xorg-proto
304 + x11-libs/libX11
305 + x11-libs/libXxf86vm
306 + x11-libs/libXmu
307 +"
308 +DEPEND="
309 + ${RDEPEND}
310 +"
311 +
312 +src_prepare() {
313 + default
314 + ./autogen.sh
315 + eautoreconf
316 +}
317 +
318 +src_install() {
319 + dobin netrek-client-cow
320 +}
321 +
322 +PATCHES=(
323 + "${FILESDIR}/${P}-autoupdate.patch"
324 +)