From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1281570-garchives=archives.gentoo.org@lists.gentoo.org> 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 2407613835A for <garchives@archives.gentoo.org>; Thu, 13 May 2021 19:50:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 39B84E0801; Thu, 13 May 2021 19:50:10 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 15CA6E0801 for <gentoo-commits@lists.gentoo.org>; Thu, 13 May 2021 19:50:10 +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 B9A4F335D9E for <gentoo-commits@lists.gentoo.org>; Thu, 13 May 2021 19:50:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 065335D2 for <gentoo-commits@lists.gentoo.org>; Thu, 13 May 2021 19:50:07 +0000 (UTC) From: "Marek Szuba" <marecki@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Marek Szuba" <marecki@gentoo.org> Message-ID: <1620935382.1c479c9eb50d03e9d11aecb3ef9f8847eb0f25b5.marecki@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/fuse/files/, app-emulation/fuse/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/fuse/Manifest app-emulation/fuse/files/multiple-definition.patch app-emulation/fuse/fuse-1.5.7.ebuild X-VCS-Directories: app-emulation/fuse/files/ app-emulation/fuse/ X-VCS-Committer: marecki X-VCS-Committer-Name: Marek Szuba X-VCS-Revision: 1c479c9eb50d03e9d11aecb3ef9f8847eb0f25b5 X-VCS-Branch: master Date: Thu, 13 May 2021 19:50:07 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 387e0046-ff88-49fa-87d2-570525ef50e7 X-Archives-Hash: de242bc976653fde94f58cd0f2ab2c23 commit: 1c479c9eb50d03e9d11aecb3ef9f8847eb0f25b5 Author: Marek Szuba <marecki <AT> gentoo <DOT> org> AuthorDate: Thu May 13 19:19:20 2021 +0000 Commit: Marek Szuba <marecki <AT> gentoo <DOT> org> CommitDate: Thu May 13 19:49:42 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c479c9e app-emulation/fuse: drop 1.5.7 Signed-off-by: Marek Szuba <marecki <AT> gentoo.org> app-emulation/fuse/Manifest | 1 - app-emulation/fuse/files/multiple-definition.patch | 13 ---- app-emulation/fuse/fuse-1.5.7.ebuild | 81 ---------------------- 3 files changed, 95 deletions(-) diff --git a/app-emulation/fuse/Manifest b/app-emulation/fuse/Manifest index 62b174565f7..127daceb5a3 100644 --- a/app-emulation/fuse/Manifest +++ b/app-emulation/fuse/Manifest @@ -1,2 +1 @@ -DIST fuse-1.5.7.tar.gz 1634568 BLAKE2B 9d2f3c310132dc57336995c31adeb37d727506719d1089b2009a2f44cbfa59fc9c4e9252aeff64cdd22b7326328518b5da33af51be687f321b891b9d1dd2b646 SHA512 ac11e03fc203f98433253fb72d7700cf6285ad8662147f318bb4ceda3888bc865b80d85473a3b2bda9e0971989b1579fc928f41ddabbf01d58358362066be13d DIST fuse-1.6.0.tar.gz 1686171 BLAKE2B d1e6b166f2f649f408349b16a5eb40dd414750ed7a805eb6505b6c81be6ed7bcaa4e6f0b14057645172add1b1a77881f90b64767390fe1a64a486168f452d29d SHA512 5096b24b5b3d812942a7ad401b886b6a99f5493686912cb4aff18ede65404ae97a9bcafa6337aaed4378382f2a170918797d7d4570bb809476be5aa9fc625b8b diff --git a/app-emulation/fuse/files/multiple-definition.patch b/app-emulation/fuse/files/multiple-definition.patch deleted file mode 100644 index 8a8e9d7d175..00000000000 --- a/app-emulation/fuse/files/multiple-definition.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Naur fuse-1.5.7/ui/widget/widget.c fuse-1.5.7-patched/ui/widget/widget.c ---- fuse-1.5.7/ui/widget/widget.c 2018-08-06 15:36:04.000000000 +0200 -+++ fuse-1.5.7-patched/ui/widget/widget.c 2020-09-20 15:27:42.045382588 +0200 -@@ -90,9 +90,6 @@ - - static widget_recurse_t widget_return[10]; /* The stack to recurse on */ - --/* The settings used whilst playing with an options dialog box */ --settings_info widget_options_settings; -- - static int widget_read_font( const char *filename ) - { - utils_file file; diff --git a/app-emulation/fuse/fuse-1.5.7.ebuild b/app-emulation/fuse/fuse-1.5.7.ebuild deleted file mode 100644 index 063ecf27471..00000000000 --- a/app-emulation/fuse/fuse-1.5.7.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools - -DESCRIPTION="Free Unix Spectrum Emulator by Philip Kendall" -HOMEPAGE="http://fuse-emulator.sourceforge.net" -SRC_URI="mirror://sourceforge/fuse-emulator/${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="alsa ao backend-fbcon backend-sdl backend-svga backend-X gpm joystick memlimit png xml" - -# Only one UI back-end can be enabled at a time -REQUIRED_USE="?? ( backend-fbcon backend-sdl backend-svga backend-X )" - -RDEPEND=" - >=app-emulation/libspectrum-1.4.4 - dev-libs/glib:2 - alsa? ( media-libs/alsa-lib ) - ao? ( media-libs/libao ) - backend-sdl? ( media-libs/libsdl ) - backend-svga? ( media-libs/svgalib ) - 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? ( !backend-sdl? ( media-libs/libjsw ) ) - png? ( media-libs/libpng:0= sys-libs/zlib ) - xml? ( dev-libs/libxml2:2 )" -DEPEND="${RDEPEND} - backend-fbcon? ( virtual/linux-sources ) - dev-lang/perl - virtual/pkgconfig" - -DOCS=( AUTHORS ChangeLog README THANKS ) - -PATCHES=( - "${FILESDIR}"/multiple-definition.patch - "${FILESDIR}"/remove-local-prefix.patch -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - local myconf=( - --without-win32 - $(use_with alsa) - $(use_with ao libao) - $(use_with gpm) - $(use_with joystick) - $(use_enable memlimit smallmem) - $(use_with png) - $(use_with xml libxml2) - ) - - if use backend-sdl; then - myconf+=("--with-sdl") - elif use backend-X; then - myconf+=("--without-gtk") - elif use backend-svga; then - myconf+=("--with-svgalib") - elif use backend-fbcon; then - myconf+=("--with-fb") - else - myconf+=("--with-gtk") - fi - - use joystick && myconf+=( $(use_enable backend-sdl ui-joystick) ) - - econf "${myconf[@]}" -} - -src_test() { - emake test -}