Gentoo Archives: gentoo-commits

From: Ionen Wolkens <ionen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-action/nighthawk/files/, games-action/nighthawk/
Date: Wed, 22 Sep 2021 22:26:41
Message-Id: 1632349534.729baebfd6c349644e41539c3d9990533a2189f7.ionen@gentoo
1 commit: 729baebfd6c349644e41539c3d9990533a2189f7
2 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
3 AuthorDate: Wed Sep 22 21:41:24 2021 +0000
4 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 22 22:25:34 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=729baebf
7
8 games-action/nighthawk: drop 2.2-r1
9
10 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
11
12 games-action/nighthawk/Manifest | 1 -
13 .../nighthawk/files/nighthawk-2.2-gcc42.patch | 24 -----------
14 games-action/nighthawk/files/nighthawk.patch | 46 ----------------------
15 games-action/nighthawk/nighthawk-2.2-r1.ebuild | 28 -------------
16 4 files changed, 99 deletions(-)
17
18 diff --git a/games-action/nighthawk/Manifest b/games-action/nighthawk/Manifest
19 index cc8ef8758c7..22fd1e1c9ce 100644
20 --- a/games-action/nighthawk/Manifest
21 +++ b/games-action/nighthawk/Manifest
22 @@ -1,2 +1 @@
23 -DIST nighthawk-2.2-1.tar.gz 1079706 BLAKE2B 38b9e2fe6f9fe4b373ddae05f0277eea1dd65f921f99e0f728ca47630378ad865117846945ba5c708cef7120dbda8c5c1ac5a032738d974f2687be34fe561556 SHA512 dca5d0c01ed651dee0c29b939c832ae343ca70ff0eb7779e7c13007881cf75d96cadafbbac6b431cd473ce9b9e1347dd4ba90502627059439b5a9a557cbc3fcf
24 DIST nighthawk-4.0.tar.xz 3212124 BLAKE2B ccd8d97ac03e6d984bdb56cad49ceabb7e6f61dd182d359e1410ff081e3fc456d2a844bc513238d6b10ba8c479661fb890a6c1e41815b7ac6f8f7f761209feb2 SHA512 f1d10026df3a2ab274b81c4e8f28c79c2ba21d6ccab59b217308b076fc7ed3ef4fa5f2b895b72902f72a652c950faa15e43f2e7c91bfc0e2c988ef1aee6859a6
25
26 diff --git a/games-action/nighthawk/files/nighthawk-2.2-gcc42.patch b/games-action/nighthawk/files/nighthawk-2.2-gcc42.patch
27 deleted file mode 100644
28 index a9ad8c98484..00000000000
29 --- a/games-action/nighthawk/files/nighthawk-2.2-gcc42.patch
30 +++ /dev/null
31 @@ -1,24 +0,0 @@
32 ---- a/src_sound/dsp_mixxer.c
33 -+++ b/src_sound/dsp_mixxer.c
34 -@@ -302,10 +302,8 @@
35 - for(sample_no = 0;sample_no < mix_buffer_size;sample_no++)
36 - {
37 - if(chmix[chan_no].funkctrl & 0x2)
38 --#pragma pack(1)
39 - sam = *((sDB *)chmix[chan_no].sample_addr +
40 - (unsigned long)chmix[chan_no].sample_ptr);
41 --#pragma pack()
42 - else
43 - sam = 0;
44 -
45 -@@ -364,10 +362,8 @@
46 - for(sample_no = 0;sample_no < mix_buffer_size;sample_no++)
47 - {
48 - if(chmix[chan_no].funkctrl & 0x2)
49 --#pragma pack(1)
50 - sam = *((sDW *)chmix[chan_no].sample_addr +
51 - (unsigned long)chmix[chan_no].sample_ptr);
52 --#pragma pack()
53 - else
54 - sam = 0;
55 - #ifdef DIGITAL_ECHOING
56
57 diff --git a/games-action/nighthawk/files/nighthawk.patch b/games-action/nighthawk/files/nighthawk.patch
58 deleted file mode 100644
59 index accef759e68..00000000000
60 --- a/games-action/nighthawk/files/nighthawk.patch
61 +++ /dev/null
62 @@ -1,46 +0,0 @@
63 -diff -c -3 -r nighthawk-2.2/src/nighthawk.cc nighthawk.orig/src/nighthawk.cc
64 -*** nighthawk-2.2/src/nighthawk.cc Sun May 23 01:10:59 1999
65 ---- nighthawk.orig/src/nighthawk.cc Fri Jul 12 04:18:38 2002
66 -***************
67 -*** 20,25 ****
68 ---- 20,26 ----
69 - #include <string.h>
70 - #include <signal.h>
71 - #include <pwd.h>
72 -+ #include <time.h>
73 - #include <sys/types.h>
74 - #include <sys/file.h>
75 - #include <sys/stat.h>
76 -diff -c -3 -r nighthawk-2.2/src_sound/Make.common nighthawk.orig/src_sound/Make.common
77 -*** nighthawk-2.2/src_sound/Make.common Sat May 1 18:04:08 1999
78 ---- nighthawk.orig/src_sound/Make.common Fri Jul 12 04:23:51 2002
79 -***************
80 -*** 10,16 ****
81 - endif
82 - endif
83 -
84 -! HOST_SAFE = 0
85 -
86 - ifeq ($(HOSTTYPE),i386)
87 - HOST_SAFE = 1
88 ---- 10,16 ----
89 - endif
90 - endif
91 -
92 -! HOST_SAFE = 1
93 -
94 - ifeq ($(HOSTTYPE),i386)
95 - HOST_SAFE = 1
96 -*** nighthawk-2.2/src/object.cc Mon Sep 30 21:54:56 2002
97 ---- nighthawk-orig/src/object.cc Mon Sep 30 21:55:05 2002
98 -***************
99 -*** 32,37 ****
100 ---- 32,39 ----
101 - #include "tdroid_8xx.h"
102 - #include "tdroid_9xx.h"
103 -
104 -+ #include <string.h>
105 -+
106 - /***************************************************************************
107 - *
108 - ***************************************************************************/
109
110 diff --git a/games-action/nighthawk/nighthawk-2.2-r1.ebuild b/games-action/nighthawk/nighthawk-2.2-r1.ebuild
111 deleted file mode 100644
112 index bba6757c9e1..00000000000
113 --- a/games-action/nighthawk/nighthawk-2.2-r1.ebuild
114 +++ /dev/null
115 @@ -1,28 +0,0 @@
116 -# Copyright 1999-2016 Gentoo Foundation
117 -# Distributed under the terms of the GNU General Public License v2
118 -
119 -EAPI=6
120 -
121 -DESCRIPTION="A tribute to Paradroid by Andrew Braybrook"
122 -HOMEPAGE="http://night-hawk.sourceforge.net/nighthawk.html"
123 -SRC_URI="ftp://metalab.unc.edu/pub/Linux/games/arcade/${P}-1.tar.gz"
124 -
125 -LICENSE="GPL-2"
126 -SLOT="0"
127 -KEYWORDS="~amd64 ~x86"
128 -IUSE=""
129 -
130 -DEPEND="x11-libs/libXpm"
131 -RDEPEND="${DEPEND}"
132 -
133 -PATCHES=(
134 - "${FILESDIR}"/nighthawk.patch
135 - "${FILESDIR}"/${P}-gcc42.patch
136 -)
137 -
138 -src_prepare() {
139 - default
140 -
141 - sed -i -e 's:AC_FD_MSG:6:g' configure || die #218936
142 - sed -i -e '/LDFLAGS = /d' src/Makefile.in || die
143 -}