Gentoo Archives: gentoo-commits

From: Theo Anderson <telans@××××××.de>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/guru:master commit in: media-gfx/grafx2/
Date: Tue, 27 Apr 2021 23:24:26
Message-Id: 1619554806.5b3e3ac052dd9fb24c85703b63548b00072449f8.telans@gentoo
1 commit: 5b3e3ac052dd9fb24c85703b63548b00072449f8
2 Author: Marco Scardovi <marco <AT> scardovi <DOT> com>
3 AuthorDate: Tue Apr 27 20:20:06 2021 +0000
4 Commit: Theo Anderson <telans <AT> posteo <DOT> de>
5 CommitDate: Tue Apr 27 20:20:06 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=5b3e3ac0
7
8 media-gfx/grafx2: fix build
9
10 Closes: https://bugs.gentoo.org/259896
11 ^ this bug is really old and grafx2 is in GURU now
12
13 Closes: https://bugs.gentoo.org/784419
14 ^ sed is not required
15
16 Package-Manager: Portage-3.0.18, Repoman-3.0.3
17 Signed-off-by: Marco Scardovi <marco <AT> scardovi.com>
18
19 media-gfx/grafx2/grafx2-2.7.2978-r100.ebuild | 8 ++++----
20 1 file changed, 4 insertions(+), 4 deletions(-)
21
22 diff --git a/media-gfx/grafx2/grafx2-2.7.2978-r100.ebuild b/media-gfx/grafx2/grafx2-2.7.2978-r100.ebuild
23 index 32440b6e0..2e5d34f33 100644
24 --- a/media-gfx/grafx2/grafx2-2.7.2978-r100.ebuild
25 +++ b/media-gfx/grafx2/grafx2-2.7.2978-r100.ebuild
26 @@ -1,4 +1,4 @@
27 -# Copyright 2020 Gentoo Authors
28 +# Copyright 1999-2021 Gentoo Authors
29 # Distributed under the terms of the GNU General Public License v2
30
31 EAPI=7
32 @@ -16,6 +16,7 @@ SLOT="0"
33 KEYWORDS="~amd64 ~x86"
34 IUSE="lua ttf"
35 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
36 +
37 # Test phase fails: make: *** [Makefile:1146: ../bin/tests-sdl] Error 1
38 RESTRICT="test"
39
40 @@ -34,16 +35,15 @@ PATCHES=( "${FILESDIR}/${PN}-desktop-file.patch" )
41
42 src_prepare() {
43 pushd ../ && default && popd
44 - sed -i s/lua5\.1/lua/g Makefile || die "sed failed"
45 }
46
47 src_compile() {
48 use ttf || MYCNF="NOTTF=1"
49 use lua || MYCNF="${MYCNF} NOLUA=1"
50
51 - emake ${MYCNF} || die "emake failed"
52 + emake ${MYCNF}
53 }
54
55 src_install() {
56 - emake ${MYCNF} DESTDIR="${D}" PREFIX="/usr" install || die "Install failed"
57 + emake ${MYCNF} DESTDIR="${ED}" PREFIX="/usr" install
58 }