Gentoo Archives: gentoo-commits

From: James Le Cuirot <chewi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-strategy/lightyears/
Date: Fri, 02 Aug 2019 21:43:14
Message-Id: 1564782165.74f1923749f790d26dc46a0e92c0b308f98aabdf.chewi@gentoo
1 commit: 74f1923749f790d26dc46a0e92c0b308f98aabdf
2 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
3 AuthorDate: Fri Aug 2 21:20:31 2019 +0000
4 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
5 CommitDate: Fri Aug 2 21:42:45 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74f19237
7
8 games-strategy/lightyears: Fix dependencies, https, EAPI 7
9
10 Closes: https://bugs.gentoo.org/685662
11 Package-Manager: Portage-2.3.70, Repoman-2.3.16
12 Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
13
14 ...ears-1.4-r2.ebuild => lightyears-1.4-r3.ebuild} | 28 +++++++++++++---------
15 1 file changed, 17 insertions(+), 11 deletions(-)
16
17 diff --git a/games-strategy/lightyears/lightyears-1.4-r2.ebuild b/games-strategy/lightyears/lightyears-1.4-r3.ebuild
18 similarity index 66%
19 rename from games-strategy/lightyears/lightyears-1.4-r2.ebuild
20 rename to games-strategy/lightyears/lightyears-1.4-r3.ebuild
21 index 7e7344951fc..4d4cfa964e4 100644
22 --- a/games-strategy/lightyears/lightyears-1.4-r2.ebuild
23 +++ b/games-strategy/lightyears/lightyears-1.4-r3.ebuild
24 @@ -1,34 +1,37 @@
25 -# Copyright 1999-2018 Gentoo Foundation
26 +# Copyright 1999-2019 Gentoo Authors
27 # Distributed under the terms of the GNU General Public License v2
28
29 -EAPI=6
30 +EAPI=7
31 +
32 PYTHON_COMPAT=( python2_7 )
33
34 -inherit desktop python-single-r1
35 +inherit desktop python-single-r1 xdg-utils
36
37 DESCRIPTION="A single-player game with a science-fiction theme"
38 -HOMEPAGE="http://www.jwhitham.org/20kly/"
39 -SRC_URI="http://www.jwhitham.org/20kly/${P}.tar.bz2"
40 -
41 +HOMEPAGE="https://www.jwhitham.org/20kly/"
42 +SRC_URI="https://www.jwhitham.org/20kly/${P}.tar.bz2"
43 LICENSE="GPL-2"
44 SLOT="0"
45 KEYWORDS="~amd64 ~x86"
46 -
47 -IUSE=""
48 -REQUIRED_USE=${PYTHON_REQUIRED_USE}
49 +REQUIRED_USE="${PYTHON_REQUIRED_USE}"
50
51 RDEPEND="${PYTHON_DEPS}
52 dev-python/pygame[${PYTHON_USEDEP}]
53 "
54 -RDEPEND="${DEPEND}"
55 +DEPEND="${RDEPEND}"
56 +
57 +PATCHES=(
58 + "${FILESDIR}/${P}"-gentoo.patch
59 +)
60
61 src_prepare() {
62 default
63 - eapply "${FILESDIR}/${P}"-gentoo.patch
64 +
65 sed -i \
66 -e "s:@GENTOO_LIBDIR@:/usr/$(get_libdir)/${PN}:" \
67 -e "s:@GENTOO_DATADIR@:/usr/share/${PN}:" \
68 ${PN} || die
69 +
70 python_fix_shebang .
71 }
72
73 @@ -48,3 +51,6 @@ src_install() {
74 newicon data/32.png ${PN}.png
75 make_desktop_entry ${PN} "Light Years Into Space"
76 }
77 +
78 +pkg_postinst() { xdg_icon_cache_update; }
79 +pkg_postrm() { xdg_icon_cache_update; }