[gentoo-commits] repo/gentoo:master commit in: games-server/crossfire-server/

[Sam James]

commit:     40c751e9ebb33ae439d7513bc8ac7fbd72da6202
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 30 18:40:01 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jun 30 18:40:01 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40c751e9

games-server/crossfire-server: add missing libcrypt, zlib dependencies, EAPI 8

Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...0-r1.ebuild => crossfire-server-1.71.0-r2.ebuild} | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

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
similarity index 77%
rename from games-server/crossfire-server/crossfire-server-1.71.0-r1.ebuild
rename to games-server/crossfire-server/crossfire-server-1.71.0-r2.ebuild
index 3012afe88c9..addefb17ecb 100644
--- a/games-server/crossfire-server/crossfire-server-1.71.0-r1.ebuild
+++ b/games-server/crossfire-server/crossfire-server-1.71.0-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 MY_P="${P/-server/}"
 DESCRIPTION="Server for the crossfire clients"
@@ -18,6 +18,8 @@ RESTRICT="test"
 
 RDEPEND="
 	net-misc/curl
+	sys-libs/zlib
+	virtual/libcrypt:=
 	X? (
 		x11-libs/libXaw
 		media-libs/libpng:0=
@@ -27,8 +29,11 @@ DEPEND="${RDEPEND}"
 
 src_prepare() {
 	default
-	rm -f "${WORKDIR}"/maps/Info/combine.pl # bug #236205
-	ln -s "${WORKDIR}/arch" "${S}/lib" || die
+
+	# bug #236205
+	rm -f "${WORKDIR}"/maps/Info/combine.pl || die
+	ln -s "${WORKDIR}"/arch "${S}"/lib || die
+
 	eapply "${FILESDIR}"/${P}-format.patch
 }
 
@@ -44,8 +49,11 @@ src_compile() {
 
 src_install() {
 	default
+
 	keepdir /var/lib/crossfire/{account,datafiles,maps,players,template-maps,unique-items}
+
 	insinto /usr/share/crossfire
-	doins -r "${WORKDIR}/maps"
-	find "${D}" -name '*.la' -delete || die
+	doins -r "${WORKDIR}"/maps
+
+	find "${ED}" -name '*.la' -delete || die
 }