| 1 |
commit: 139c9ff844ca4bb077fa1f69b574fea83fd72b33 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Oct 20 02:01:52 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Oct 20 02:04:28 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=139c9ff8 |
| 7 |
|
| 8 |
app-emulation/bochs: adapt to upstream changes |
| 9 |
|
| 10 |
svga support is gone and disasm is no longer a configure option. |
| 11 |
|
| 12 |
Bug: https://bugs.gentoo.org/774195 |
| 13 |
See: https://github.com/gentoo/gentoo/pull/21944 |
| 14 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 15 |
|
| 16 |
app-emulation/bochs/bochs-2.7.ebuild | 24 +++++++++++------------- |
| 17 |
app-emulation/bochs/bochs-9999.ebuild | 27 ++++++++++++--------------- |
| 18 |
2 files changed, 23 insertions(+), 28 deletions(-) |
| 19 |
|
| 20 |
diff --git a/app-emulation/bochs/bochs-2.7.ebuild b/app-emulation/bochs/bochs-2.7.ebuild |
| 21 |
index 0f90dbea151..0191aeeca22 100644 |
| 22 |
--- a/app-emulation/bochs/bochs-2.7.ebuild |
| 23 |
+++ b/app-emulation/bochs/bochs-2.7.ebuild |
| 24 |
@@ -11,7 +11,7 @@ LICENSE="LGPL-2.1" |
| 25 |
SLOT="0" |
| 26 |
KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86" |
| 27 |
|
| 28 |
-IUSE="3dnow avx debugger doc gdb ncurses readline svga sdl +smp vnc X +x86-64" |
| 29 |
+IUSE="3dnow avx debugger doc gdb ncurses readline sdl +smp vnc X +x86-64" |
| 30 |
REQUIRED_USE=" |
| 31 |
avx? ( x86-64 ) |
| 32 |
gdb? ( !debugger !smp ) |
| 33 |
@@ -19,26 +19,27 @@ REQUIRED_USE=" |
| 34 |
" |
| 35 |
|
| 36 |
RDEPEND=" |
| 37 |
- X? ( x11-libs/libICE |
| 38 |
+ ncurses? ( sys-libs/ncurses:= ) |
| 39 |
+ readline? ( sys-libs/readline:= ) |
| 40 |
+ sdl? ( media-libs/libsdl ) |
| 41 |
+ X? ( |
| 42 |
+ x11-libs/libICE |
| 43 |
x11-libs/libSM |
| 44 |
x11-libs/libX11 |
| 45 |
- x11-libs/libXpm ) |
| 46 |
- sdl? ( media-libs/libsdl ) |
| 47 |
- svga? ( media-libs/svgalib ) |
| 48 |
- readline? ( sys-libs/readline:= ) |
| 49 |
- ncurses? ( sys-libs/ncurses:= ) |
| 50 |
+ x11-libs/libXpm |
| 51 |
+ ) |
| 52 |
" |
| 53 |
DEPEND="${RDEPEND} |
| 54 |
X? ( x11-base/xorg-proto ) |
| 55 |
" |
| 56 |
BDEPEND=" |
| 57 |
- doc? ( app-text/docbook-sgml-utils ) |
| 58 |
- sys-apps/sed |
| 59 |
>=app-text/opensp-1.5 |
| 60 |
+ doc? ( app-text/docbook-sgml-utils ) |
| 61 |
" |
| 62 |
|
| 63 |
src_prepare() { |
| 64 |
default |
| 65 |
+ |
| 66 |
sed -i "s:^docdir.*:docdir = ${EPREFIX}/usr/share/doc/${PF}:" \ |
| 67 |
Makefile.in || die |
| 68 |
} |
| 69 |
@@ -50,7 +51,6 @@ src_configure() { |
| 70 |
--enable-cdrom \ |
| 71 |
--enable-clgd54xx \ |
| 72 |
--enable-cpu-level=6 \ |
| 73 |
- --enable-disasm \ |
| 74 |
--enable-e1000 \ |
| 75 |
--enable-gameport \ |
| 76 |
--enable-iodebug \ |
| 77 |
@@ -77,9 +77,7 @@ src_configure() { |
| 78 |
$(use_enable x86-64) \ |
| 79 |
$(use_with ncurses term) \ |
| 80 |
$(use_with sdl) \ |
| 81 |
- $(use_with svga) \ |
| 82 |
$(use_with vnc rfb) \ |
| 83 |
$(use_with X x) \ |
| 84 |
- $(use_with X x11) \ |
| 85 |
- ${myconf} |
| 86 |
+ $(use_with X x11) |
| 87 |
} |
| 88 |
|
| 89 |
diff --git a/app-emulation/bochs/bochs-9999.ebuild b/app-emulation/bochs/bochs-9999.ebuild |
| 90 |
index fa7208ddc58..2ddaf54249b 100644 |
| 91 |
--- a/app-emulation/bochs/bochs-9999.ebuild |
| 92 |
+++ b/app-emulation/bochs/bochs-9999.ebuild |
| 93 |
@@ -1,4 +1,4 @@ |
| 94 |
-# Copyright 1999-2020 Gentoo Authors |
| 95 |
+# Copyright 1999-2021 Gentoo Authors |
| 96 |
# Distributed under the terms of the GNU General Public License v2 |
| 97 |
|
| 98 |
EAPI=7 |
| 99 |
@@ -12,9 +12,8 @@ ESVN_REPO_URI="svn://svn.code.sf.net/p/bochs/code/trunk/bochs" |
| 100 |
|
| 101 |
LICENSE="LGPL-2.1" |
| 102 |
SLOT="0" |
| 103 |
-KEYWORDS="" |
| 104 |
|
| 105 |
-IUSE="3dnow avx debugger doc gdb ncurses readline svga sdl +smp vnc X +x86-64" |
| 106 |
+IUSE="3dnow avx debugger doc gdb ncurses readline sdl +smp vnc X +x86-64" |
| 107 |
REQUIRED_USE=" |
| 108 |
avx? ( x86-64 ) |
| 109 |
gdb? ( !debugger !smp ) |
| 110 |
@@ -22,26 +21,27 @@ REQUIRED_USE=" |
| 111 |
" |
| 112 |
|
| 113 |
RDEPEND=" |
| 114 |
- X? ( x11-libs/libICE |
| 115 |
+ ncurses? ( sys-libs/ncurses:= ) |
| 116 |
+ readline? ( sys-libs/readline:= ) |
| 117 |
+ sdl? ( media-libs/libsdl ) |
| 118 |
+ X? ( |
| 119 |
+ x11-libs/libICE |
| 120 |
x11-libs/libSM |
| 121 |
x11-libs/libX11 |
| 122 |
- x11-libs/libXpm ) |
| 123 |
- sdl? ( media-libs/libsdl ) |
| 124 |
- svga? ( media-libs/svgalib ) |
| 125 |
- readline? ( sys-libs/readline:= ) |
| 126 |
- ncurses? ( sys-libs/ncurses:= ) |
| 127 |
+ x11-libs/libXpm |
| 128 |
+ ) |
| 129 |
" |
| 130 |
DEPEND="${RDEPEND} |
| 131 |
X? ( x11-base/xorg-proto ) |
| 132 |
" |
| 133 |
BDEPEND=" |
| 134 |
- doc? ( app-text/docbook-sgml-utils ) |
| 135 |
- sys-apps/sed |
| 136 |
>=app-text/opensp-1.5 |
| 137 |
+ doc? ( app-text/docbook-sgml-utils ) |
| 138 |
" |
| 139 |
|
| 140 |
src_prepare() { |
| 141 |
default |
| 142 |
+ |
| 143 |
sed -i "s:^docdir.*:docdir = ${EPREFIX}/usr/share/doc/${PF}:" \ |
| 144 |
Makefile.in || die |
| 145 |
} |
| 146 |
@@ -53,7 +53,6 @@ src_configure() { |
| 147 |
--enable-cdrom \ |
| 148 |
--enable-clgd54xx \ |
| 149 |
--enable-cpu-level=6 \ |
| 150 |
- --enable-disasm \ |
| 151 |
--enable-e1000 \ |
| 152 |
--enable-gameport \ |
| 153 |
--enable-iodebug \ |
| 154 |
@@ -80,9 +79,7 @@ src_configure() { |
| 155 |
$(use_enable x86-64) \ |
| 156 |
$(use_with ncurses term) \ |
| 157 |
$(use_with sdl) \ |
| 158 |
- $(use_with svga) \ |
| 159 |
$(use_with vnc rfb) \ |
| 160 |
$(use_with X x) \ |
| 161 |
- $(use_with X x11) \ |
| 162 |
- ${myconf} |
| 163 |
+ $(use_with X x11) |
| 164 |
} |
Archives