From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/bochs/
Date: Wed, 20 Oct 2021 02:04:38 +0000 (UTC) [thread overview]
Message-ID: <1634695468.139c9ff844ca4bb077fa1f69b574fea83fd72b33.sam@gentoo> (raw)
commit: 139c9ff844ca4bb077fa1f69b574fea83fd72b33
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 20 02:01:52 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> 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 <sam <AT> 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)
}
next reply other threads:[~2021-10-20 2:04 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-20 2:04 Sam James [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-10-20 2:04 [gentoo-commits] repo/gentoo:master commit in: app-emulation/bochs/ Sam James
2021-03-27 2:42 John Helmert III
2020-02-24 11:11 Luca Barbato
2019-12-17 7:14 Luca Barbato
2017-07-15 9:46 Pacho Ramos
2017-07-05 12:27 Pacho Ramos
2016-11-25 18:57 Pacho Ramos
2016-03-18 19:11 Michał Górny
2015-10-31 22:33 Luca Barbato
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1634695468.139c9ff844ca4bb077fa1f69b574fea83fd72b33.sam@gentoo \
--to=sam@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox