From: "James Le Cuirot" <chewi@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: games-fps/xonotic/
Date: Sun, 26 Jul 2020 20:23:22 +0000 (UTC) [thread overview]
Message-ID: <1595794982.56f871d0d81ca821c66c2a7172d8386775afcc7c.chewi@gentoo> (raw)
commit: 56f871d0d81ca821c66c2a7172d8386775afcc7c
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri Jul 3 09:30:23 2020 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Jul 26 20:23:02 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56f871d0
games-fps/xonotic: EAPI7, fix #710894, use HTTPS, fix LICENSE
Closes: https://bugs.gentoo.org/710894
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/16566
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
games-fps/xonotic/xonotic-0.8.2.ebuild | 30 +++++++++++++++++-------------
1 file changed, 17 insertions(+), 13 deletions(-)
diff --git a/games-fps/xonotic/xonotic-0.8.2.ebuild b/games-fps/xonotic/xonotic-0.8.2.ebuild
index 32b2eab5bb4..41f326a1322 100644
--- a/games-fps/xonotic/xonotic-0.8.2.ebuild
+++ b/games-fps/xonotic/xonotic-0.8.2.ebuild
@@ -1,15 +1,16 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-inherit eutils check-reqs toolchain-funcs
+EAPI=7
+
+inherit desktop check-reqs toolchain-funcs
MY_PN="${PN^}"
DESCRIPTION="Fork of Nexuiz, Deathmatch FPS based on DarkPlaces, an advanced Quake 1 engine"
-HOMEPAGE="http://www.xonotic.org/"
-SRC_URI="http://dl.xonotic.org/${P}.zip"
+HOMEPAGE="https://www.xonotic.org/"
+SRC_URI="https://dl.xonotic.org/${P}.zip"
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="alsa debug dedicated doc ode sdl"
@@ -42,6 +43,9 @@ RDEPEND="
!dedicated? ( ${UIRDEPEND} )"
DEPEND="${RDEPEND}
!dedicated? ( ${UIDEPEND} )"
+BDEPEND="app-arch/unzip"
+
+DOCS="Docs/*.txt"
CHECKREQS_DISK_BUILD="1200M"
CHECKREQS_DISK_USR="950M"
@@ -60,15 +64,15 @@ src_prepare() {
default
sed -i \
- -e "/^EXE_/s:darkplaces:${PN}:" \
- -e "s:-O3:${CFLAGS}:" \
- -e "/-lm/s:$: ${LDFLAGS}:" \
- -e '/^STRIP/s/strip/true/' \
+ -e "/^EXE_/s|darkplaces|${PN}|" \
+ -e "s|-O3|${CFLAGS}|" \
+ -e "/-lm/s|$| ${LDFLAGS}|" \
+ -e '/^STRIP/s|strip|true|' \
source/darkplaces/makefile.inc || die
if ! use alsa; then
sed -i \
- -e "/DEFAULT_SNDAPI/s:ALSA:OSS:" \
+ -e "/DEFAULT_SNDAPI/s|ALSA|OSS|" \
source/darkplaces/makefile || die
fi
}
@@ -102,8 +106,8 @@ src_install() {
fi
dobin source/darkplaces/${PN}-dedicated
- dodoc Docs/*.txt
- use doc && dohtml -r Docs
+ use doc && local HTML_DOCS=( Docs/htmlfiles Docs/faq.html )
+ einstalldocs
insinto "/usr/share/${PN}"
doins -r key_0.d0pk server data
next reply other threads:[~2020-07-26 20:23 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-26 20:23 James Le Cuirot [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-08-06 4:32 [gentoo-commits] repo/gentoo:master commit in: games-fps/xonotic/ Ionen Wolkens
2023-07-20 12:02 Ionen Wolkens
2023-07-20 12:02 Ionen Wolkens
2022-07-04 15:56 Ionen Wolkens
2022-07-04 15:56 Ionen Wolkens
2021-12-14 9:04 Sam James
2018-05-06 19:03 Matt Turner
2017-12-10 21:41 Michał Górny
2017-05-31 7:51 Lars Wendler
2017-05-19 6:49 Lars Wendler
2017-05-18 9:02 Lars Wendler
2017-05-18 9:01 Lars Wendler
2015-12-18 0:47 Michael Sterrett
2015-12-18 0:47 Michael Sterrett
2015-12-03 13:28 Agostino Sarubbo
2015-12-02 14:29 Agostino Sarubbo
2015-10-08 8:36 Michael Sterrett
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1595794982.56f871d0d81ca821c66c2a7172d8386775afcc7c.chewi@gentoo \
--to=chewi@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox