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 6AF9D158086 for ; Wed, 20 Oct 2021 02:04:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 704B1E0841; Wed, 20 Oct 2021 02:04:41 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 55F46E0841 for ; Wed, 20 Oct 2021 02:04:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 370433438E5 for ; Wed, 20 Oct 2021 02:04:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A603A15F for ; Wed, 20 Oct 2021 02:04:38 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1634695468.139c9ff844ca4bb077fa1f69b574fea83fd72b33.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/bochs/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/bochs/bochs-2.7.ebuild app-emulation/bochs/bochs-9999.ebuild X-VCS-Directories: app-emulation/bochs/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 139c9ff844ca4bb077fa1f69b574fea83fd72b33 X-VCS-Branch: master Date: Wed, 20 Oct 2021 02:04:38 +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: b66e4d6b-7996-4b59-b499-a1bd516d2568 X-Archives-Hash: 61b931619efc1ae4276d960581c1f6e4 commit: 139c9ff844ca4bb077fa1f69b574fea83fd72b33 Author: Sam James gentoo org> AuthorDate: Wed Oct 20 02:01:52 2021 +0000 Commit: Sam James gentoo org> CommitDate: Wed Oct 20 02:04:28 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=139c9ff8 app-emulation/bochs: adapt to upstream changes svga support is gone and disasm is no longer a configure option. Bug: https://bugs.gentoo.org/774195 See: https://github.com/gentoo/gentoo/pull/21944 Signed-off-by: Sam James gentoo.org> app-emulation/bochs/bochs-2.7.ebuild | 24 +++++++++++------------- app-emulation/bochs/bochs-9999.ebuild | 27 ++++++++++++--------------- 2 files changed, 23 insertions(+), 28 deletions(-) diff --git a/app-emulation/bochs/bochs-2.7.ebuild b/app-emulation/bochs/bochs-2.7.ebuild index 0f90dbea151..0191aeeca22 100644 --- a/app-emulation/bochs/bochs-2.7.ebuild +++ b/app-emulation/bochs/bochs-2.7.ebuild @@ -11,7 +11,7 @@ LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86" -IUSE="3dnow avx debugger doc gdb ncurses readline svga sdl +smp vnc X +x86-64" +IUSE="3dnow avx debugger doc gdb ncurses readline sdl +smp vnc X +x86-64" REQUIRED_USE=" avx? ( x86-64 ) gdb? ( !debugger !smp ) @@ -19,26 +19,27 @@ REQUIRED_USE=" " RDEPEND=" - X? ( x11-libs/libICE + ncurses? ( sys-libs/ncurses:= ) + readline? ( sys-libs/readline:= ) + sdl? ( media-libs/libsdl ) + X? ( + x11-libs/libICE x11-libs/libSM x11-libs/libX11 - x11-libs/libXpm ) - sdl? ( media-libs/libsdl ) - svga? ( media-libs/svgalib ) - readline? ( sys-libs/readline:= ) - ncurses? ( sys-libs/ncurses:= ) + x11-libs/libXpm + ) " DEPEND="${RDEPEND} X? ( x11-base/xorg-proto ) " BDEPEND=" - doc? ( app-text/docbook-sgml-utils ) - sys-apps/sed >=app-text/opensp-1.5 + doc? ( app-text/docbook-sgml-utils ) " src_prepare() { default + sed -i "s:^docdir.*:docdir = ${EPREFIX}/usr/share/doc/${PF}:" \ Makefile.in || die } @@ -50,7 +51,6 @@ src_configure() { --enable-cdrom \ --enable-clgd54xx \ --enable-cpu-level=6 \ - --enable-disasm \ --enable-e1000 \ --enable-gameport \ --enable-iodebug \ @@ -77,9 +77,7 @@ src_configure() { $(use_enable x86-64) \ $(use_with ncurses term) \ $(use_with sdl) \ - $(use_with svga) \ $(use_with vnc rfb) \ $(use_with X x) \ - $(use_with X x11) \ - ${myconf} + $(use_with X x11) } diff --git a/app-emulation/bochs/bochs-9999.ebuild b/app-emulation/bochs/bochs-9999.ebuild index fa7208ddc58..2ddaf54249b 100644 --- a/app-emulation/bochs/bochs-9999.ebuild +++ b/app-emulation/bochs/bochs-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,9 +12,8 @@ ESVN_REPO_URI="svn://svn.code.sf.net/p/bochs/code/trunk/bochs" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="" -IUSE="3dnow avx debugger doc gdb ncurses readline svga sdl +smp vnc X +x86-64" +IUSE="3dnow avx debugger doc gdb ncurses readline sdl +smp vnc X +x86-64" REQUIRED_USE=" avx? ( x86-64 ) gdb? ( !debugger !smp ) @@ -22,26 +21,27 @@ REQUIRED_USE=" " RDEPEND=" - X? ( x11-libs/libICE + ncurses? ( sys-libs/ncurses:= ) + readline? ( sys-libs/readline:= ) + sdl? ( media-libs/libsdl ) + X? ( + x11-libs/libICE x11-libs/libSM x11-libs/libX11 - x11-libs/libXpm ) - sdl? ( media-libs/libsdl ) - svga? ( media-libs/svgalib ) - readline? ( sys-libs/readline:= ) - ncurses? ( sys-libs/ncurses:= ) + x11-libs/libXpm + ) " DEPEND="${RDEPEND} X? ( x11-base/xorg-proto ) " BDEPEND=" - doc? ( app-text/docbook-sgml-utils ) - sys-apps/sed >=app-text/opensp-1.5 + doc? ( app-text/docbook-sgml-utils ) " src_prepare() { default + sed -i "s:^docdir.*:docdir = ${EPREFIX}/usr/share/doc/${PF}:" \ Makefile.in || die } @@ -53,7 +53,6 @@ src_configure() { --enable-cdrom \ --enable-clgd54xx \ --enable-cpu-level=6 \ - --enable-disasm \ --enable-e1000 \ --enable-gameport \ --enable-iodebug \ @@ -80,9 +79,7 @@ src_configure() { $(use_enable x86-64) \ $(use_with ncurses term) \ $(use_with sdl) \ - $(use_with svga) \ $(use_with vnc rfb) \ $(use_with X x) \ - $(use_with X x11) \ - ${myconf} + $(use_with X x11) }