1 |
commit: e3f5ce5524d48cd371d579fb535ea8c874b5d5b0 |
2 |
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed May 2 18:10:39 2018 +0000 |
4 |
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed May 2 19:27:56 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3f5ce55 |
7 |
|
8 |
games-strategy/liquidwar: Stop using games.eclass |
9 |
|
10 |
Package-Manager: Portage-2.3.31, Repoman-2.3.9 |
11 |
|
12 |
.../files/liquidwar-5.6.4-exec-stack.patch | 12 ++-- |
13 |
.../liquidwar/files/liquidwar-5.6.4-ovflfix.patch | 4 +- |
14 |
.../files/liquidwar-5.6.4-underlink.patch | 4 +- |
15 |
games-strategy/liquidwar/liquidwar-5.6.4-r2.ebuild | 64 ++++++++++++++++++++++ |
16 |
4 files changed, 74 insertions(+), 10 deletions(-) |
17 |
|
18 |
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 |
19 |
index 83e733b28a0..a1e93c9b738 100644 |
20 |
--- a/games-strategy/liquidwar/files/liquidwar-5.6.4-exec-stack.patch |
21 |
+++ b/games-strategy/liquidwar/files/liquidwar-5.6.4-exec-stack.patch |
22 |
@@ -1,5 +1,5 @@ |
23 |
---- src/glouglou.s |
24 |
-+++ src/glouglou.s |
25 |
+--- a/src/glouglou.s |
26 |
++++ b/src/glouglou.s |
27 |
@@ -240,3 +240,6 @@ |
28 |
|
29 |
ret |
30 |
@@ -7,8 +7,8 @@ |
31 |
+#ifdef __ELF__ |
32 |
+.section .note.GNU-stack,"",%progbits |
33 |
+#endif |
34 |
---- src/monster.s |
35 |
-+++ src/monster.s |
36 |
+--- a/src/monster.s |
37 |
++++ b/src/monster.s |
38 |
@@ -972,3 +972,6 @@ |
39 |
ret # retour au c |
40 |
|
41 |
@@ -16,8 +16,8 @@ |
42 |
+#ifdef __ELF__ |
43 |
+.section .note.GNU-stack,"",%progbits |
44 |
+#endif |
45 |
---- src/spread.s |
46 |
-+++ src/spread.s |
47 |
+--- a/src/spread.s |
48 |
++++ b/src/spread.s |
49 |
@@ -957,3 +957,6 @@ |
50 |
|
51 |
|
52 |
|
53 |
diff --git a/games-strategy/liquidwar/files/liquidwar-5.6.4-ovflfix.patch b/games-strategy/liquidwar/files/liquidwar-5.6.4-ovflfix.patch |
54 |
index 446385624cf..c092f02beab 100644 |
55 |
--- a/games-strategy/liquidwar/files/liquidwar-5.6.4-ovflfix.patch |
56 |
+++ b/games-strategy/liquidwar/files/liquidwar-5.6.4-ovflfix.patch |
57 |
@@ -1,5 +1,5 @@ |
58 |
---- src/wwwsrv.c.old 2010-10-26 14:16:31.000000000 +0200 |
59 |
-+++ src/wwwsrv.c 2010-10-26 14:17:35.000000000 +0200 |
60 |
+--- a/src/wwwsrv.c.old 2010-10-26 14:16:31.000000000 +0200 |
61 |
++++ b/src/wwwsrv.c 2010-10-26 14:17:35.000000000 +0200 |
62 |
@@ -100,12 +100,12 @@ |
63 |
|
64 |
data->privacy = privacy; |
65 |
|
66 |
diff --git a/games-strategy/liquidwar/files/liquidwar-5.6.4-underlink.patch b/games-strategy/liquidwar/files/liquidwar-5.6.4-underlink.patch |
67 |
index 2bc53e0cacc..d80e349bf1b 100644 |
68 |
--- a/games-strategy/liquidwar/files/liquidwar-5.6.4-underlink.patch |
69 |
+++ b/games-strategy/liquidwar/files/liquidwar-5.6.4-underlink.patch |
70 |
@@ -1,5 +1,5 @@ |
71 |
---- src/Makefile.in.old 2011-06-22 07:45:05.756127862 +0200 |
72 |
-+++ src/Makefile.in 2011-06-22 07:46:00.681613957 +0200 |
73 |
+--- a/src/Makefile.in.old 2011-06-22 07:45:05.756127862 +0200 |
74 |
++++ b/src/Makefile.in 2011-06-22 07:46:00.681613957 +0200 |
75 |
@@ -223,7 +223,7 @@ |
76 |
EXTERN_LIBS = `allegro-config --static $(ALLEGRO_LIBRARY)` $(EFENCE_LIBRARY) |
77 |
else |
78 |
|
79 |
diff --git a/games-strategy/liquidwar/liquidwar-5.6.4-r2.ebuild b/games-strategy/liquidwar/liquidwar-5.6.4-r2.ebuild |
80 |
new file mode 100644 |
81 |
index 00000000000..8899b512aa1 |
82 |
--- /dev/null |
83 |
+++ b/games-strategy/liquidwar/liquidwar-5.6.4-r2.ebuild |
84 |
@@ -0,0 +1,64 @@ |
85 |
+# Copyright 1999-2018 Gentoo Foundation |
86 |
+# Distributed under the terms of the GNU General Public License v2 |
87 |
+ |
88 |
+EAPI=6 |
89 |
+inherit desktop |
90 |
+ |
91 |
+DESCRIPTION="Unique multiplayer wargame" |
92 |
+HOMEPAGE="http://www.ufoot.org/liquidwar/" |
93 |
+SRC_URI="https://savannah.nongnu.org/download/liquidwar/${P}.tar.gz" |
94 |
+ |
95 |
+LICENSE="GPL-2" |
96 |
+SLOT="0" |
97 |
+KEYWORDS="~amd64 ~ppc64 ~x86" |
98 |
+IUSE="" |
99 |
+RESTRICT="test" |
100 |
+ |
101 |
+RDEPEND=">=media-libs/allegro-4.2:0[X]" |
102 |
+DEPEND="${RDEPEND}" |
103 |
+ |
104 |
+src_prepare() { |
105 |
+ default |
106 |
+ |
107 |
+ eapply "${FILESDIR}"/${P}-exec-stack.patch \ |
108 |
+ "${FILESDIR}"/${P}-ovflfix.patch |
109 |
+ sed -i \ |
110 |
+ -e 's:/games::' \ |
111 |
+ -e '/^MANDIR/ s:=.*:= $(mandir)/man6:' \ |
112 |
+ -e '/^PIXDIR/ s:=.*:= /usr/share/pixmaps:' \ |
113 |
+ -e '/^DESKTOPDIR/ s:=.*:= /usr/share/applications/:' \ |
114 |
+ -e '/^INFODIR/ s/=.*/= $(infodir)/' \ |
115 |
+ -e '/^GAMEDIR/ s/exec_prefix/bindir/' \ |
116 |
+ -e '/install/s:-s ::' \ |
117 |
+ -e 's:$(DOCDIR)/txt:$(DOCDIR):g' \ |
118 |
+ -e 's:$(GMAKE):$(MAKE):' \ |
119 |
+ -e '/^DOCDIR/ s:=.*:= /usr/share/doc/$(PF):' Makefile.in \ |
120 |
+ || die 'sed Makefile.in failed' |
121 |
+ sed -i \ |
122 |
+ -e '/^GAMEDIR/ s/$(exec_prefix)/@bindir@/' \ |
123 |
+ -e 's:/games::' src/Makefile.in \ |
124 |
+ || die "sed src/Makefile.in failed" |
125 |
+ eapply "${FILESDIR}"/${P}-underlink.patch |
126 |
+} |
127 |
+ |
128 |
+src_configure() { |
129 |
+ econf \ |
130 |
+ --disable-doc-ps \ |
131 |
+ --disable-doc-pdf \ |
132 |
+ --disable-target-opt \ |
133 |
+ $(use_enable x86 asm) |
134 |
+} |
135 |
+ |
136 |
+src_compile() { |
137 |
+ # skip build_doc target wrt bug 460344 |
138 |
+ emake build_bin build_data |
139 |
+} |
140 |
+ |
141 |
+src_install() { |
142 |
+ emake DESTDIR="${D}" install_nolink |
143 |
+ einstalldocs |
144 |
+ rm -f "${ED}"/usr/share/doc/${PF}/COPYING |
145 |
+ # Provided desktop file is completely obsolete |
146 |
+ rm -f "${ED}"/usr/share/applications/liquidwar.desktop |
147 |
+ make_desktop_entry ${PN} "Liquid War" /usr/share/pixmaps/${PN}.xpm |
148 |
+} |