Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/xearth/
Date: Fri, 16 Apr 2021 04:47:40
Message-Id: 1618548413.1b292faf45d4683059b8c70e4f90b4f58e3b7126.sam@gentoo
1 commit: 1b292faf45d4683059b8c70e4f90b4f58e3b7126
2 Author: Ionen Wolkens <sudinave <AT> gmail <DOT> com>
3 AuthorDate: Thu Apr 15 17:21:40 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Fri Apr 16 04:46:53 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b292faf
7
8 x11-misc/xearth: EAPI-7 bump, eutils drop, tidy
9
10 Signed-off-by: Ionen Wolkens <sudinave <AT> gmail.com>
11 Signed-off-by: Sam James <sam <AT> gentoo.org>
12
13 x11-misc/xearth/xearth-1.1-r1.ebuild | 39 ++++++++++++++++++------------------
14 1 file changed, 20 insertions(+), 19 deletions(-)
15
16 diff --git a/x11-misc/xearth/xearth-1.1-r1.ebuild b/x11-misc/xearth/xearth-1.1-r1.ebuild
17 index cbd3a60f818..542041ede4a 100644
18 --- a/x11-misc/xearth/xearth-1.1-r1.ebuild
19 +++ b/x11-misc/xearth/xearth-1.1-r1.ebuild
20 @@ -1,34 +1,33 @@
21 # Copyright 1999-2021 Gentoo Authors
22 # Distributed under the terms of the GNU General Public License v2
23
24 -EAPI=5
25 +EAPI=7
26
27 -inherit eutils toolchain-funcs
28 +inherit toolchain-funcs
29
30 +DESCRIPTION="Set the X root window to an image of the Earth"
31 HOMEPAGE="https://hewgill.com/xearth/original/"
32 -DESCRIPTION="Xearth sets the X root window to an image of the Earth"
33 SRC_URI="ftp://cag.lcs.mit.edu/pub/tuna/${P}.tar.gz
34 ftp://ftp.cs.colorado.edu/users/tuna/${P}.tar.gz"
35
36 -SLOT="0"
37 LICENSE="xearth"
38 +SLOT="0"
39 KEYWORDS="~alpha amd64 ppc ppc64 x86"
40 -IUSE=""
41
42 RDEPEND="
43 x11-libs/libX11
44 x11-libs/libXext
45 - x11-libs/libXt
46 -"
47 -DEPEND="${RDEPEND}
48 - x11-base/xorg-proto
49 - >=x11-misc/imake-1.0.8-r1
50 + x11-libs/libXt"
51 +DEPEND="${RDEPEND}"
52 +BDEPEND="
53 app-text/rman
54 -"
55 + x11-base/xorg-proto
56 + >=x11-misc/imake-1.0.8-r1"
57
58 -src_prepare() {
59 - epatch "${FILESDIR}"/${P}-include.patch
60 -}
61 +PATCHES=(
62 + "${FILESDIR}"/${P}-include.patch
63 +)
64 +DOCS=( BUILT-IN GAMMA-TEST HISTORY README )
65
66 src_configure() {
67 CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
68 @@ -36,14 +35,16 @@ src_configure() {
69 }
70
71 src_compile() {
72 - emake \
73 - CC="$(tc-getCC)" \
74 - CDEBUGFLAGS="${CFLAGS}" \
75 + local myemakeargs=(
76 + CC="$(tc-getCC)"
77 + CDEBUGFLAGS="${CFLAGS}"
78 EXTRA_LDOPTIONS="${LDFLAGS}"
79 + )
80 + emake "${myemakeargs[@]}"
81 }
82
83 src_install() {
84 - newman xearth.man xearth.1
85 dobin xearth
86 - dodoc BUILT-IN GAMMA-TEST HISTORY README
87 + newman xearth.man xearth.1
88 + einstalldocs
89 }