Gentoo Archives: gentoo-commits

From: Tim Harder <radhermit@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/sxiv/files/, media-gfx/sxiv/
Date: Tue, 02 Apr 2019 19:17:40
Message-Id: 1554232584.6c561663751de7275cc4e9dcb4650ef84fca99da.radhermit@gentoo
1 commit: 6c561663751de7275cc4e9dcb4650ef84fca99da
2 Author: Tim Harder <radhermit <AT> gentoo <DOT> org>
3 AuthorDate: Tue Apr 2 19:16:24 2019 +0000
4 Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
5 CommitDate: Tue Apr 2 19:16:24 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c561663
7
8 media-gfx/sxiv: don't try to rebuild sxiv during install phase
9
10 Closes: https://bugs.gentoo.org/677684
11
12 Signed-off-by: Tim Harder <radhermit <AT> gentoo.org>
13
14 media-gfx/sxiv/files/sxiv-25-makefile.patch | 13 +++++++++++++
15 media-gfx/sxiv/sxiv-25.ebuild | 2 ++
16 2 files changed, 15 insertions(+)
17
18 diff --git a/media-gfx/sxiv/files/sxiv-25-makefile.patch b/media-gfx/sxiv/files/sxiv-25-makefile.patch
19 new file mode 100644
20 index 00000000000..01a8ddf2c19
21 --- /dev/null
22 +++ b/media-gfx/sxiv/files/sxiv-25-makefile.patch
23 @@ -0,0 +1,13 @@
24 +Don't try to rebuild sxiv during install.
25 +
26 +--- sxiv-25/Makefile
27 ++++ sxiv-25/Makefile
28 +@@ -62,7 +62,7 @@
29 + clean:
30 + rm -f *.o sxiv
31 +
32 +-install: all
33 ++install:
34 + @echo "INSTALL bin/sxiv"
35 + mkdir -p $(DESTDIR)$(PREFIX)/bin
36 + cp sxiv $(DESTDIR)$(PREFIX)/bin/
37
38 diff --git a/media-gfx/sxiv/sxiv-25.ebuild b/media-gfx/sxiv/sxiv-25.ebuild
39 index 3b3917053a8..d1cdfacac94 100644
40 --- a/media-gfx/sxiv/sxiv-25.ebuild
41 +++ b/media-gfx/sxiv/sxiv-25.ebuild
42 @@ -29,6 +29,8 @@ RDEPEND="
43 "
44 DEPEND="${RDEPEND}"
45
46 +PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
47 +
48 src_prepare() {
49 restore_config config.h
50 default