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 A9CD21382C5 for ; Wed, 14 Mar 2018 17:27:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 836CBE0858; Wed, 14 Mar 2018 17:27:37 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 45502E0858 for ; Wed, 14 Mar 2018 17:27:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 9D9D0335C7F for ; Wed, 14 Mar 2018 17:27:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0625F24C for ; Wed, 14 Mar 2018 17:27:34 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1521048408.cbd244ceaa2dac69a38c50b70e18456455efc384.mgorny@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.1.ebuild app-emulation/fuse/metadata.xml X-VCS-Directories: app-emulation/fuse/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: cbd244ceaa2dac69a38c50b70e18456455efc384 X-VCS-Branch: master Date: Wed, 14 Mar 2018 17:27:34 +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-Archives-Salt: fbec9091-c437-4d6a-b537-9039b3e27155 X-Archives-Hash: 6ec4a1552eb1abc717b1089345fe2d16 commit: cbd244ceaa2dac69a38c50b70e18456455efc384 Author: Jan Ziak <0xe2.0x9a.0x9b gmail com> AuthorDate: Wed Mar 14 15:39:10 2018 +0000 Commit: Michał Górny gentoo org> CommitDate: Wed Mar 14 17:26:48 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbd244ce app-emulation/fuse: make USE flags satisfiable Makes default backend USE flags non-contradictory. Closes: https://bugs.gentoo.org/649180 Closes: https://github.com/gentoo/gentoo/pull/7372 app-emulation/fuse/fuse-1.5.1.ebuild | 25 ++++++++++++------------- app-emulation/fuse/metadata.xml | 7 +++++++ 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/app-emulation/fuse/fuse-1.5.1.ebuild b/app-emulation/fuse/fuse-1.5.1.ebuild index 4b8b2fa01d8..ab203809cef 100644 --- a/app-emulation/fuse/fuse-1.5.1.ebuild +++ b/app-emulation/fuse/fuse-1.5.1.ebuild @@ -10,26 +10,25 @@ SRC_URI="mirror://sourceforge/fuse-emulator/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" -IUSE="alsa ao fbcon gpm gtk joystick memlimit png sdl svga X xml" +IUSE="alsa ao backend-fbcon +backend-gtk backend-sdl backend-svga backend-X gpm joystick memlimit png xml" # Only one UI back-end can be enabled at a time -REQUIRED_USE="^^ ( X fbcon gtk sdl svga )" +REQUIRED_USE="^^ ( backend-fbcon backend-gtk backend-sdl backend-svga backend-X )" RDEPEND=">=app-emulation/libspectrum-1.4.1 dev-libs/glib:2 alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) gpm? ( sys-libs/gpm ) - gtk? ( x11-libs/gtk+:3 ) joystick? ( media-libs/libjsw ) png? ( media-libs/libpng:0= sys-libs/zlib ) - sdl? ( media-libs/libsdl ) - svga? ( media-libs/svgalib ) - X? ( x11-libs/libX11 - x11-libs/libXext ) + backend-gtk? ( x11-libs/gtk+:3 ) + backend-sdl? ( media-libs/libsdl ) + backend-svga? ( media-libs/svgalib ) + backend-X? ( x11-libs/libX11 x11-libs/libXext ) xml? ( dev-libs/libxml2:2 )" DEPEND="${RDEPEND} - fbcon? ( virtual/linux-sources ) + backend-fbcon? ( virtual/linux-sources ) dev-lang/perl virtual/pkgconfig" @@ -48,15 +47,15 @@ src_configure() { $(use_with xml libxml2) ) - if use gtk; then + if use backend-gtk; then : - elif use sdl; then + elif use backend-sdl; then myconf+=("--with-sdl") - elif use X; then + elif use backend-X; then myconf+=("--without-gtk") - elif use svga; then + elif use backend-svga; then myconf+=("--with-svgalib") - elif use fbcon; then + elif use backend-fbcon; then myconf+=("--with-fb") fi diff --git a/app-emulation/fuse/metadata.xml b/app-emulation/fuse/metadata.xml index 3687ac68007..bb6d65be18a 100644 --- a/app-emulation/fuse/metadata.xml +++ b/app-emulation/fuse/metadata.xml @@ -12,4 +12,11 @@ fuse-emulator + + Use framebuffer rendering backend + Use GTK+ rendering backend + Use SDL rendering backend + Use svgalib rendering backend + Use X11 rendering backend +