1 |
commit: 40c751e9ebb33ae439d7513bc8ac7fbd72da6202 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jun 30 18:40:01 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jun 30 18:40:01 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40c751e9 |
7 |
|
8 |
games-server/crossfire-server: add missing libcrypt, zlib dependencies, EAPI 8 |
9 |
|
10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
11 |
|
12 |
...0-r1.ebuild => crossfire-server-1.71.0-r2.ebuild} | 20 ++++++++++++++------ |
13 |
1 file changed, 14 insertions(+), 6 deletions(-) |
14 |
|
15 |
diff --git a/games-server/crossfire-server/crossfire-server-1.71.0-r1.ebuild b/games-server/crossfire-server/crossfire-server-1.71.0-r2.ebuild |
16 |
similarity index 77% |
17 |
rename from games-server/crossfire-server/crossfire-server-1.71.0-r1.ebuild |
18 |
rename to games-server/crossfire-server/crossfire-server-1.71.0-r2.ebuild |
19 |
index 3012afe88c9..addefb17ecb 100644 |
20 |
--- a/games-server/crossfire-server/crossfire-server-1.71.0-r1.ebuild |
21 |
+++ b/games-server/crossfire-server/crossfire-server-1.71.0-r2.ebuild |
22 |
@@ -1,7 +1,7 @@ |
23 |
-# Copyright 1999-2018 Gentoo Foundation |
24 |
+# Copyright 1999-2021 Gentoo Authors |
25 |
# Distributed under the terms of the GNU General Public License v2 |
26 |
|
27 |
-EAPI=6 |
28 |
+EAPI=8 |
29 |
|
30 |
MY_P="${P/-server/}" |
31 |
DESCRIPTION="Server for the crossfire clients" |
32 |
@@ -18,6 +18,8 @@ RESTRICT="test" |
33 |
|
34 |
RDEPEND=" |
35 |
net-misc/curl |
36 |
+ sys-libs/zlib |
37 |
+ virtual/libcrypt:= |
38 |
X? ( |
39 |
x11-libs/libXaw |
40 |
media-libs/libpng:0= |
41 |
@@ -27,8 +29,11 @@ DEPEND="${RDEPEND}" |
42 |
|
43 |
src_prepare() { |
44 |
default |
45 |
- rm -f "${WORKDIR}"/maps/Info/combine.pl # bug #236205 |
46 |
- ln -s "${WORKDIR}/arch" "${S}/lib" || die |
47 |
+ |
48 |
+ # bug #236205 |
49 |
+ rm -f "${WORKDIR}"/maps/Info/combine.pl || die |
50 |
+ ln -s "${WORKDIR}"/arch "${S}"/lib || die |
51 |
+ |
52 |
eapply "${FILESDIR}"/${P}-format.patch |
53 |
} |
54 |
|
55 |
@@ -44,8 +49,11 @@ src_compile() { |
56 |
|
57 |
src_install() { |
58 |
default |
59 |
+ |
60 |
keepdir /var/lib/crossfire/{account,datafiles,maps,players,template-maps,unique-items} |
61 |
+ |
62 |
insinto /usr/share/crossfire |
63 |
- doins -r "${WORKDIR}/maps" |
64 |
- find "${D}" -name '*.la' -delete || die |
65 |
+ doins -r "${WORKDIR}"/maps |
66 |
+ |
67 |
+ find "${ED}" -name '*.la' -delete || die |
68 |
} |