Gentoo Archives: gentoo-commits

From: Marek Szuba <marecki@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-strategy/naev/
Date: Tue, 01 Dec 2020 23:05:31
Message-Id: 1606863233.2e1834613e434ec0700d888a7c63bf53da39903b.marecki@gentoo
1 commit: 2e1834613e434ec0700d888a7c63bf53da39903b
2 Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
3 AuthorDate: Tue Dec 1 22:39:04 2020 +0000
4 Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
5 CommitDate: Tue Dec 1 22:53:53 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e183461
7
8 games-strategy/naev-0.7.0: fix SRC_URI, explain BDEPEND/src_unpack
9
10 pkgcheck complains about the lack of app-arch/unzip in BDEPEND but
11 that is not correct - the data file is supposed to be installed zipped,
12 and the custom src_unpack ensures only the source tarball is actually
13 unpacked. Add a comment explaining this.
14
15 More importantly, both SRC_URI wrong had '/${P}/' where '/v${PV}/' should
16 be according to the layout of GitHub upstream as of 5 minutes ago.
17
18 Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
19
20 games-strategy/naev/naev-0.7.0.ebuild | 8 ++++++--
21 1 file changed, 6 insertions(+), 2 deletions(-)
22
23 diff --git a/games-strategy/naev/naev-0.7.0.ebuild b/games-strategy/naev/naev-0.7.0.ebuild
24 index 20d6fd69fb5..1b20e968fdd 100644
25 --- a/games-strategy/naev/naev-0.7.0.ebuild
26 +++ b/games-strategy/naev/naev-0.7.0.ebuild
27 @@ -2,12 +2,13 @@
28 # Distributed under the terms of the GNU General Public License v2
29
30 EAPI=7
31 +
32 inherit xdg-utils
33
34 DESCRIPTION="A 2D space trading and combat game, in a similar vein to Escape Velocity"
35 HOMEPAGE="https://naev.org/ https://github.com/naev/naev"
36 -SRC_URI="https://github.com/naev/naev/releases/download/${P}/${P}.tar.bz2
37 - https://github.com/naev/naev/releases/download/${P}/${P}-ndata.zip"
38 +SRC_URI="https://github.com/naev/naev/releases/download/v${PV}/${P}.tar.bz2
39 + https://github.com/naev/naev/releases/download/v${PV}/${P}-ndata.zip"
40
41 LICENSE="GPL-2 GPL-3 public-domain CC-BY-3.0 CC-BY-SA-3.0"
42 SLOT="0"
43 @@ -30,6 +31,9 @@ RDEPEND="
44 DEPEND="${RDEPEND}"
45 BDEPEND="virtual/pkgconfig"
46
47 +# This is so that only the source tarball is unpacked - the data file
48 +# is supposed to be installed *zipped*. This is why we do not need unzip
49 +# in BDEPEND in spite of what repoman/pkgcheck might say.
50 src_unpack() {
51 unpack ${P}.tar.bz2
52 }