Gentoo Archives: gentoo-commits

From: Joonas Niilola <juippis@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/fuse/
Date: Sat, 10 Oct 2020 07:23:06
Message-Id: 1602314553.03e710ad54f820ad9491e7e7255a56aed30cfaeb.juippis@gentoo
1 commit: 03e710ad54f820ad9491e7e7255a56aed30cfaeb
2 Author: Jan Ziak <0xe2.0x9a.0x9b <AT> gmail <DOT> com>
3 AuthorDate: Sun Sep 20 13:51:26 2020 +0000
4 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
5 CommitDate: Sat Oct 10 07:22:33 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03e710ad
7
8 app-emulation/fuse: use libjsw if not using SDL
9
10 Closes: https://bugs.gentoo.org/743394
11 Signed-off-by: Jan Ziak <0xe2.0x9a.0x9b <AT> gmail.com>
12 Closes: https://github.com/gentoo/gentoo/pull/17615
13 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
14
15 app-emulation/fuse/fuse-1.5.7.ebuild | 5 +++--
16 1 file changed, 3 insertions(+), 2 deletions(-)
17
18 diff --git a/app-emulation/fuse/fuse-1.5.7.ebuild b/app-emulation/fuse/fuse-1.5.7.ebuild
19 index b75ae1134c5..063ecf27471 100644
20 --- a/app-emulation/fuse/fuse-1.5.7.ebuild
21 +++ b/app-emulation/fuse/fuse-1.5.7.ebuild
22 @@ -27,7 +27,7 @@ RDEPEND="
23 backend-X? ( x11-libs/libX11 x11-libs/libXext )
24 !backend-fbcon? ( !backend-sdl? ( !backend-svga? ( !backend-X? ( x11-libs/gtk+:3 ) ) ) )
25 gpm? ( sys-libs/gpm )
26 - joystick? ( media-libs/libjsw )
27 + joystick? ( !backend-sdl? ( media-libs/libjsw ) )
28 png? ( media-libs/libpng:0= sys-libs/zlib )
29 xml? ( dev-libs/libxml2:2 )"
30 DEPEND="${RDEPEND}
31 @@ -54,7 +54,6 @@ src_configure() {
32 $(use_with ao libao)
33 $(use_with gpm)
34 $(use_with joystick)
35 - $(use_enable joystick ui-joystick)
36 $(use_enable memlimit smallmem)
37 $(use_with png)
38 $(use_with xml libxml2)
39 @@ -72,6 +71,8 @@ src_configure() {
40 myconf+=("--with-gtk")
41 fi
42
43 + use joystick && myconf+=( $(use_enable backend-sdl ui-joystick) )
44 +
45 econf "${myconf[@]}"
46 }