1 |
commit: 6120833da2bb7e7f40bf8f23254c6c20d02bb6aa |
2 |
Author: Alexey Sokolov <sokolov <AT> google <DOT> com> |
3 |
AuthorDate: Mon Sep 21 00:25:07 2020 +0000 |
4 |
Commit: Stefan Strogin <steils <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Oct 18 15:57:32 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6120833d |
7 |
|
8 |
games-strategy/liquidwar: drop old 5.6.4 |
9 |
|
10 |
Package-Manager: Portage-3.0.4, Repoman-3.0.1 |
11 |
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org> |
12 |
Closes: https://github.com/gentoo/gentoo/pull/17393 |
13 |
Signed-off-by: Stefan Strogin <steils <AT> gentoo.org> |
14 |
|
15 |
games-strategy/liquidwar/Manifest | 1 - |
16 |
.../files/liquidwar-5.6.4-exec-stack.patch | 27 --------- |
17 |
.../liquidwar/files/liquidwar-5.6.4-ovflfix.patch | 18 ------ |
18 |
.../files/liquidwar-5.6.4-underlink.patch | 11 ---- |
19 |
games-strategy/liquidwar/liquidwar-5.6.4-r2.ebuild | 64 ---------------------- |
20 |
5 files changed, 121 deletions(-) |
21 |
|
22 |
diff --git a/games-strategy/liquidwar/Manifest b/games-strategy/liquidwar/Manifest |
23 |
index 22a50a9213a..c8606349def 100644 |
24 |
--- a/games-strategy/liquidwar/Manifest |
25 |
+++ b/games-strategy/liquidwar/Manifest |
26 |
@@ -1,2 +1 @@ |
27 |
-DIST liquidwar-5.6.4.tar.gz 3268432 BLAKE2B 9b74b057ecb065e18c355c92e9b71bcd257997d9b9874c37a77352b1df83fe17d130c6ac1394368eeb40957ff81d26e973f0677035949d84c357829dc40875f6 SHA512 7145a8362c46a0f39662327edf81b341659a3ce8216f9fb3bb32e483de618c0f46169ed916fe2c4c651ebc5925ecdc534b372c381e16c3ddae9a50fb48f98ed7 |
28 |
DIST liquidwar-5.6.5.tar.gz 6508987 BLAKE2B 26411f3c79a407a467f14a0c18b4ff320ab522ed96e43d00fdf4ccc8feab72e786361ac367349336e0478b6cbd187d9ce7c12e28be7896476557beb7b2f65327 SHA512 15dc2cacd1f3b00f8dcac4318cbaf5c713f2d0e111392d14dd56eec7ae97a64af1487a11038dc108743baf3c995e9136100d56331fadc4cf19dc5702d5051a25 |
29 |
|
30 |
diff --git a/games-strategy/liquidwar/files/liquidwar-5.6.4-exec-stack.patch b/games-strategy/liquidwar/files/liquidwar-5.6.4-exec-stack.patch |
31 |
deleted file mode 100644 |
32 |
index a1e93c9b738..00000000000 |
33 |
--- a/games-strategy/liquidwar/files/liquidwar-5.6.4-exec-stack.patch |
34 |
+++ /dev/null |
35 |
@@ -1,27 +0,0 @@ |
36 |
---- a/src/glouglou.s |
37 |
-+++ b/src/glouglou.s |
38 |
-@@ -240,3 +240,6 @@ |
39 |
- |
40 |
- ret |
41 |
- |
42 |
-+#ifdef __ELF__ |
43 |
-+.section .note.GNU-stack,"",%progbits |
44 |
-+#endif |
45 |
---- a/src/monster.s |
46 |
-+++ b/src/monster.s |
47 |
-@@ -972,3 +972,6 @@ |
48 |
- ret # retour au c |
49 |
- |
50 |
- |
51 |
-+#ifdef __ELF__ |
52 |
-+.section .note.GNU-stack,"",%progbits |
53 |
-+#endif |
54 |
---- a/src/spread.s |
55 |
-+++ b/src/spread.s |
56 |
-@@ -957,3 +957,6 @@ |
57 |
- |
58 |
- |
59 |
- |
60 |
-+#ifdef __ELF__ |
61 |
-+.section .note.GNU-stack,"",%progbits |
62 |
-+#endif |
63 |
|
64 |
diff --git a/games-strategy/liquidwar/files/liquidwar-5.6.4-ovflfix.patch b/games-strategy/liquidwar/files/liquidwar-5.6.4-ovflfix.patch |
65 |
deleted file mode 100644 |
66 |
index c092f02beab..00000000000 |
67 |
--- a/games-strategy/liquidwar/files/liquidwar-5.6.4-ovflfix.patch |
68 |
+++ /dev/null |
69 |
@@ -1,18 +0,0 @@ |
70 |
---- a/src/wwwsrv.c.old 2010-10-26 14:16:31.000000000 +0200 |
71 |
-+++ b/src/wwwsrv.c 2010-10-26 14:17:35.000000000 +0200 |
72 |
-@@ -100,12 +100,12 @@ |
73 |
- |
74 |
- data->privacy = privacy; |
75 |
- data->log = log; |
76 |
-- strncpy (data->metaserver, metaserver, URL_SIZE); |
77 |
-+ strncpy (data->metaserver, metaserver, sizeof(data->metaserver)); |
78 |
- data->port = port; |
79 |
- data->busy_players = busy_players; |
80 |
- data->max_players = max_players; |
81 |
-- strncpy (data->password, password, URL_SIZE); |
82 |
-- strncpy (data->comment, comment, URL_SIZE); |
83 |
-+ strncpy (data->password, password, sizeof(data->password)); |
84 |
-+ strncpy (data->comment, comment, sizeof(data->comment)); |
85 |
- } |
86 |
- |
87 |
- /*------------------------------------------------------------------*/ |
88 |
|
89 |
diff --git a/games-strategy/liquidwar/files/liquidwar-5.6.4-underlink.patch b/games-strategy/liquidwar/files/liquidwar-5.6.4-underlink.patch |
90 |
deleted file mode 100644 |
91 |
index d80e349bf1b..00000000000 |
92 |
--- a/games-strategy/liquidwar/files/liquidwar-5.6.4-underlink.patch |
93 |
+++ /dev/null |
94 |
@@ -1,11 +0,0 @@ |
95 |
---- a/src/Makefile.in.old 2011-06-22 07:45:05.756127862 +0200 |
96 |
-+++ b/src/Makefile.in 2011-06-22 07:46:00.681613957 +0200 |
97 |
-@@ -223,7 +223,7 @@ |
98 |
- EXTERN_LIBS = `allegro-config --static $(ALLEGRO_LIBRARY)` $(EFENCE_LIBRARY) |
99 |
- else |
100 |
- LINK_OPTIONS = |
101 |
-- EXTERN_LIBS = `allegro-config --libs $(ALLEGRO_LIBRARY)` $(EFENCE_LIBRARY) |
102 |
-+ EXTERN_LIBS = `allegro-config --libs $(ALLEGRO_LIBRARY)` $(EFENCE_LIBRARY) -lm |
103 |
- endif |
104 |
- |
105 |
- CONFIG_OPTIONS = \ |
106 |
|
107 |
diff --git a/games-strategy/liquidwar/liquidwar-5.6.4-r2.ebuild b/games-strategy/liquidwar/liquidwar-5.6.4-r2.ebuild |
108 |
deleted file mode 100644 |
109 |
index 8899b512aa1..00000000000 |
110 |
--- a/games-strategy/liquidwar/liquidwar-5.6.4-r2.ebuild |
111 |
+++ /dev/null |
112 |
@@ -1,64 +0,0 @@ |
113 |
-# Copyright 1999-2018 Gentoo Foundation |
114 |
-# Distributed under the terms of the GNU General Public License v2 |
115 |
- |
116 |
-EAPI=6 |
117 |
-inherit desktop |
118 |
- |
119 |
-DESCRIPTION="Unique multiplayer wargame" |
120 |
-HOMEPAGE="http://www.ufoot.org/liquidwar/" |
121 |
-SRC_URI="https://savannah.nongnu.org/download/liquidwar/${P}.tar.gz" |
122 |
- |
123 |
-LICENSE="GPL-2" |
124 |
-SLOT="0" |
125 |
-KEYWORDS="~amd64 ~ppc64 ~x86" |
126 |
-IUSE="" |
127 |
-RESTRICT="test" |
128 |
- |
129 |
-RDEPEND=">=media-libs/allegro-4.2:0[X]" |
130 |
-DEPEND="${RDEPEND}" |
131 |
- |
132 |
-src_prepare() { |
133 |
- default |
134 |
- |
135 |
- eapply "${FILESDIR}"/${P}-exec-stack.patch \ |
136 |
- "${FILESDIR}"/${P}-ovflfix.patch |
137 |
- sed -i \ |
138 |
- -e 's:/games::' \ |
139 |
- -e '/^MANDIR/ s:=.*:= $(mandir)/man6:' \ |
140 |
- -e '/^PIXDIR/ s:=.*:= /usr/share/pixmaps:' \ |
141 |
- -e '/^DESKTOPDIR/ s:=.*:= /usr/share/applications/:' \ |
142 |
- -e '/^INFODIR/ s/=.*/= $(infodir)/' \ |
143 |
- -e '/^GAMEDIR/ s/exec_prefix/bindir/' \ |
144 |
- -e '/install/s:-s ::' \ |
145 |
- -e 's:$(DOCDIR)/txt:$(DOCDIR):g' \ |
146 |
- -e 's:$(GMAKE):$(MAKE):' \ |
147 |
- -e '/^DOCDIR/ s:=.*:= /usr/share/doc/$(PF):' Makefile.in \ |
148 |
- || die 'sed Makefile.in failed' |
149 |
- sed -i \ |
150 |
- -e '/^GAMEDIR/ s/$(exec_prefix)/@bindir@/' \ |
151 |
- -e 's:/games::' src/Makefile.in \ |
152 |
- || die "sed src/Makefile.in failed" |
153 |
- eapply "${FILESDIR}"/${P}-underlink.patch |
154 |
-} |
155 |
- |
156 |
-src_configure() { |
157 |
- econf \ |
158 |
- --disable-doc-ps \ |
159 |
- --disable-doc-pdf \ |
160 |
- --disable-target-opt \ |
161 |
- $(use_enable x86 asm) |
162 |
-} |
163 |
- |
164 |
-src_compile() { |
165 |
- # skip build_doc target wrt bug 460344 |
166 |
- emake build_bin build_data |
167 |
-} |
168 |
- |
169 |
-src_install() { |
170 |
- emake DESTDIR="${D}" install_nolink |
171 |
- einstalldocs |
172 |
- rm -f "${ED}"/usr/share/doc/${PF}/COPYING |
173 |
- # Provided desktop file is completely obsolete |
174 |
- rm -f "${ED}"/usr/share/applications/liquidwar.desktop |
175 |
- make_desktop_entry ${PN} "Liquid War" /usr/share/pixmaps/${PN}.xpm |
176 |
-} |