gentoo resync : 20.10.2021

3 files changed, 98 insertions, 16 deletions

diff --git a/app-emulation/bochs/Manifest b/app-emulation/bochs/Manifest
index dd0c78a8f2a0..63d82ccfd162 100644
--- a/app-emulation/bochs/Manifest
+++ b/app-emulation/bochs/Manifest
@@ -1,4 +1,6 @@
 DIST bochs-2.6.10.tar.gz 5282176 BLAKE2B 9f75d5afd6bad9f91eb18dc0bd5c9ed998bf12077d3e8d944769055f0def1eed019756346071d3809d492c54177ec798e739259ee13f67ff4760744377dc877c SHA512 eff422cadc3e0db7a47c4015a59ca0fa8caf88ed3026706c1f766e802449ec8e4798e5f147a583e1cfbbc578f71da8800542c0e1f4d04bc2dea77955855e8689
+DIST bochs-2.7.tar.gz 5298413 BLAKE2B 570ac0fec74b8e79a8e78d32a1a8655b8e3a202a3247407a45b66991598486bd6c566711a1f8e18e717d4f2119b82ae03bf4a792eebdd25a6e7ca4dedb3901ab SHA512 d43bd557316dc370ba1c317f5c3292f724460515db01316614b2d585b2760120cadd1d27a286083ac3e6f57466ed889959abd7fe960c219c149dab9a053c6967
 EBUILD bochs-2.6.10.ebuild 1785 BLAKE2B a19e6aa898f4aaea6ed3f4874a31e28f1e01c513409de2fe6d1fd00a2badb64dbb5d980d7127841c93789af72a28a18a011481afc34232d6cd166e5f162e207e SHA512 e6c2fddefdba565ec2686ad6503be3304463007a918f9693b30ed4883932b4662e951a3f11a5d2438abc0b862fea02126eaac1bb314f63f1ebf428ff41d33750
-EBUILD bochs-9999.ebuild 1839 BLAKE2B ef1221afa5924d0acbc0473d3d7cb41c8574f8c22783efffad4525da3bf516c537e1142cfad4cc6f01704430dc35fd3bf6916693a02ea588dd808b1da5550db3 SHA512 e2d8d015b657a336b6a77b6b37609ff7d99c119f9c6f3831b366b17e5356cceb7f3af30c5104f0ddc5b0b40ec980023ac1d2e1862ac77ef582b60f119257aaae
+EBUILD bochs-2.7.ebuild 1685 BLAKE2B 25647c7c79dae40aeac097e90912feed37f958f01f051282a8630f0c5e51e0879cc322204e6488a54351b189f6227dfaec963561ef90f30866faf0f701c9c7bd SHA512 5293f7a01a36ffeecdfeff31eca46f87249724080a40fbd0fdfe9e8d569c28e470486834a31c3cd3881b779227a586be0096682928bb387eac339a44ebd94ca4
+EBUILD bochs-9999.ebuild 1727 BLAKE2B bb1574d3d72fd95be53898a774af9c26d16818c9b391c3d7565fc96ac7abdc1d5aeeec44c7c36febbfe62f754409249201437ae37960d613c49246f466f85827 SHA512 ec789e02da4974935eca97873c1f07ff2d2cfb3edbbaeaf7d05f766d3664044f4f3421e26a230d681a099a455ffa990b3f387475f99f5ce3ece9dc213435b6cd
 MISC metadata.xml 695 BLAKE2B 1244650b8c78b9033f108a560b132ec94bbdeffe69b697ba3721b8ce1d0f403def90af2767fde56573e16d6b8ae5f3ec47745e207094d19bb02b7ca4ddf4204c SHA512 30ec8cb8083f493bd0d46cd5ceeba0a8f38c667026f3d6bea171ed350b7370fc080d5cadfa257d8ab47368a9e88849309451c24f461d8e46eab21901f9869fb4
diff --git a/app-emulation/bochs/bochs-2.7.ebuild b/app-emulation/bochs/bochs-2.7.ebuild
new file mode 100644
index 000000000000..0191aeeca226
--- /dev/null
+++ b/app-emulation/bochs/bochs-2.7.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="LGPL-ed pc emulator"
+HOMEPAGE="http://bochs.sourceforge.net/"
+SRC_URI="mirror://sourceforge/bochs/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+
+IUSE="3dnow avx debugger doc gdb ncurses readline sdl +smp vnc X +x86-64"
+REQUIRED_USE="
+	avx? ( x86-64 )
+	gdb? ( !debugger !smp )
+	debugger? ( !gdb )
+"
+
+RDEPEND="
+	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
+	)
+"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )
+"
+BDEPEND="
+	>=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
+}
+
+src_configure() {
+	econf \
+		--enable-all-optimizations \
+		--enable-idle-hack \
+		--enable-cdrom \
+		--enable-clgd54xx \
+		--enable-cpu-level=6 \
+		--enable-e1000 \
+		--enable-gameport \
+		--enable-iodebug \
+		--enable-monitor-mwait \
+		--enable-ne2000 \
+		--enable-plugins \
+		--enable-pci \
+		--enable-pnic \
+		--enable-raw-serial \
+		--enable-sb16=linux \
+		--enable-usb \
+		--enable-usb-ohci \
+		--enable-usb-xhci \
+		--prefix=/usr \
+		--with-nogui \
+		--without-wx \
+		$(use_enable 3dnow) \
+		$(use_enable avx) \
+		$(use_enable debugger) \
+		$(use_enable doc docbook) \
+		$(use_enable gdb gdb-stub) \
+		$(use_enable readline) \
+		$(use_enable smp) \
+		$(use_enable x86-64) \
+		$(use_with ncurses term) \
+		$(use_with sdl) \
+		$(use_with vnc rfb) \
+		$(use_with X x) \
+		$(use_with X x11)
+}
diff --git a/app-emulation/bochs/bochs-9999.ebuild b/app-emulation/bochs/bochs-9999.ebuild
index fa7208ddc58f..2ddaf54249b1 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)
 }