From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 92F9B13835D for ; Sat, 10 Oct 2020 07:23:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D25F4E08F4; Sat, 10 Oct 2020 07:23:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B92DFE08F2 for ; Sat, 10 Oct 2020 07:23:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 46819340FB4 for ; Sat, 10 Oct 2020 07:23:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6E6E63A6 for ; Sat, 10 Oct 2020 07:22:57 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1602314553.03e710ad54f820ad9491e7e7255a56aed30cfaeb.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/fuse/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/fuse/fuse-1.5.7.ebuild X-VCS-Directories: app-emulation/fuse/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: 03e710ad54f820ad9491e7e7255a56aed30cfaeb X-VCS-Branch: master Date: Sat, 10 Oct 2020 07:22:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7f2721d3-d642-4d92-8c4f-8d97c4a6fe97 X-Archives-Hash: 775d32f8e813832aba8680e6af3d4c78 commit: 03e710ad54f820ad9491e7e7255a56aed30cfaeb Author: Jan Ziak <0xe2.0x9a.0x9b gmail com> AuthorDate: Sun Sep 20 13:51:26 2020 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Sat Oct 10 07:22:33 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03e710ad app-emulation/fuse: use libjsw if not using SDL Closes: https://bugs.gentoo.org/743394 Signed-off-by: Jan Ziak <0xe2.0x9a.0x9b gmail.com> Closes: https://github.com/gentoo/gentoo/pull/17615 Signed-off-by: Joonas Niilola gentoo.org> app-emulation/fuse/fuse-1.5.7.ebuild | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app-emulation/fuse/fuse-1.5.7.ebuild b/app-emulation/fuse/fuse-1.5.7.ebuild index b75ae1134c5..063ecf27471 100644 --- a/app-emulation/fuse/fuse-1.5.7.ebuild +++ b/app-emulation/fuse/fuse-1.5.7.ebuild @@ -27,7 +27,7 @@ RDEPEND=" backend-X? ( x11-libs/libX11 x11-libs/libXext ) !backend-fbcon? ( !backend-sdl? ( !backend-svga? ( !backend-X? ( x11-libs/gtk+:3 ) ) ) ) gpm? ( sys-libs/gpm ) - joystick? ( media-libs/libjsw ) + joystick? ( !backend-sdl? ( media-libs/libjsw ) ) png? ( media-libs/libpng:0= sys-libs/zlib ) xml? ( dev-libs/libxml2:2 )" DEPEND="${RDEPEND} @@ -54,7 +54,6 @@ src_configure() { $(use_with ao libao) $(use_with gpm) $(use_with joystick) - $(use_enable joystick ui-joystick) $(use_enable memlimit smallmem) $(use_with png) $(use_with xml libxml2) @@ -72,6 +71,8 @@ src_configure() { myconf+=("--with-gtk") fi + use joystick && myconf+=( $(use_enable backend-sdl ui-joystick) ) + econf "${myconf[@]}" }