New version, thanks to mastamind@users.sourceforge.net for proposing an ebuild on bug #224885

Package-Manager: portage-2.1.5.3

5 files changed, 198 insertions, 9 deletions

diff --git a/app-emulation/bochs/ChangeLog b/app-emulation/bochs/ChangeLog
index 7b39c4a9784f..ddd0a729e58d 100644
--- a/app-emulation/bochs/ChangeLog
+++ b/app-emulation/bochs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/bochs
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/bochs/ChangeLog,v 1.75 2008/03/31 12:54:20 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/bochs/ChangeLog,v 1.76 2008/06/05 02:22:51 lu_zero Exp $
+
+*bochs-2.3.7 (05 Jun 2008)
+
+  05 Jun 2008; Luca Barbato <lu_zero@gentoo.org>
+  +files/bochs-2.3.7-typos.patch, bochs-2.3.6.ebuild, +bochs-2.3.7.ebuild:
+  New version, thanks to mastamind@users.sourceforge.net for proposing an
+  ebuild on bug #224885
 
   31 Mar 2008; Luca Barbato <lu_zero@gentoo.org> bochs-2.3.6.ebuild:
   Update ebuild, remove wrongly used flags
diff --git a/app-emulation/bochs/Manifest b/app-emulation/bochs/Manifest
index 640e2d456bf5..8359946102fa 100644
--- a/app-emulation/bochs/Manifest
+++ b/app-emulation/bochs/Manifest
@@ -1,15 +1,18 @@
 AUX bochs-2.3-floppy.patch 1356 RMD160 753655013f512d8e47245913727c996a3a2314a9 SHA1 7a7d5246a179d88e096d2eda5981036a32fc26b1 SHA256 01323056edbbfa4d142d7a81ee3725404bd5464372aa4e3507af58890a22b7fe
 AUX bochs-2.3-ne2k.patch 557 RMD160 9094800e0d427ae9b13b69d39da5f569816c50ca SHA1 39df13629909535104a7febc52b8749d4414000a SHA256 c68d8bfc3759e031474e3f144d2780c62ada633b97721bee78f3c996255e9527
 AUX bochs-2.3-redog.patch 507 RMD160 7840dee3b03a040882655ea7f5e63fb44e9cd4fe SHA1 1658fa72d8d1e8e6ea687e22ade722cba15bbfa9 SHA256 d7013f39972bc989ad3663a6849b72169b4d1d41d36a9ffc25b83c62033ba002
+AUX bochs-2.3.7-typos.patch 1375 RMD160 d966955c9313d2ef6e961b48b24f65af10d2f29e SHA1 c55f317484117dfa59c71e95f95aed4d700d1bb4 SHA256 8ace7f1238702e9e973cabcb847673b5d2c63155c3efd572bf75a094819cdd49
 DIST bochs-2.2.6-unicode.patch.gz 25811 RMD160 5e6c6b093901bd80d23e1ec23d89fc496b674d23 SHA1 22f7f46453cfb03f339ecf0a150900cfe6c22242 SHA256 109f8b0fd1174b565004524f82abcd5d74c51e43ea9a3ecf9084b4ce0d248abd
 DIST bochs-2.2.6.tar.gz 3765867 RMD160 9eda125b4eeaba8fe26693ebfa783edc6b8c5f4e SHA1 ce62142c5b6f38afd43f92c90241daef75e3ea08 SHA256 25447ca196794bb2e00d314038f75ad8aeead87dcf34e9501598b900dea639ee
 DIST bochs-2.3.5.tar.gz 3916867 RMD160 a254b6e04857d7078b6b982d466a3ba95bb071ee SHA1 854bc37ee621212b6c73f5c5c194a97b6b4369f0 SHA256 ff6b7d7eb950d05ade2f5fee00b3bd50542d5d22dc5c7ea564a0d02001e0fb16
 DIST bochs-2.3.6.tar.gz 3951132 RMD160 b81c8093c147d0d75cb18a954407ed3f7451aa3f SHA1 3675b1c5a324854b998bb7518c7279db2fecd8c3 SHA256 11b4026f0717266d01c59a3f95046077bc046949aa752d0f0773b2b20dfb16aa
+DIST bochs-2.3.7.tar.gz 3989982 RMD160 b4c9cb8e777c4e484f653085783bce9645804fe0 SHA1 e687c697a8be8396ae75106d0cd6149bd52ca67d SHA256 77f27fedadc6431df0a06ee226259a80443524ae9d221c97c5986e3f7927bb04
 DIST bochs-2.3.tar.gz 3812273 RMD160 545e0bf3edd0fdd073a107e835f90c65451c100e SHA1 2fe0dbdebd7fe9fe07d697bcbe1736bdaeb64aaf SHA256 fd926f3915d0619ddde8dedd02dac661f3233d77f3fc2ec7f94e1e028398497a
 DIST dlxlinux4.tar.gz 1504868 RMD160 29fd31dd0f77edacecabd9f053206a486635e7f1 SHA1 b3f441cd71c54c71a8c21aa405e949bde02c1783 SHA256 68b35f850ce69f4050ed85064e15d756245d57e84ddc1d52678b0e2a97dbf73e
 EBUILD bochs-2.2.6.ebuild 3029 RMD160 ee0c974d91c49cfbf4b1ecfd30034d30c461431c SHA1 8a11b647fa2d3bc13e016e7b8c87de25cc143291 SHA256 579a2d9eecaa65af4889cfac533a87fd9c5ebcd50f6fc82f50fe50c5ae10c511
 EBUILD bochs-2.3.5.ebuild 3021 RMD160 33c93e6267daf5dd8d9e1b12a77388c8ec071143 SHA1 44fea066ffc6aacfe0daa92e64c1ecf1eefd31dd SHA256 731ce8194f890f1aa3f65967e9fe982955e8ab8d0c1aabd6d27ccd11b8f33a84
-EBUILD bochs-2.3.6.ebuild 2871 RMD160 0dd3c91d68e1436d16e99d320e690248d7bf2f39 SHA1 397a7926842fe6d57f1361b10da0955633028669 SHA256 281a16563c27a1c598e2234ec707f956392e9217e400d7ef149ae6f1ddfd8b89
+EBUILD bochs-2.3.6.ebuild 2788 RMD160 46e494d7ed36d389852d4c48eef75cebe9c7d2be SHA1 2f9cd828e8993035b7ae00e542e4d188cdf7adbc SHA256 380b52ccbfb7ea2d43ac7ff662c3d52755483aad41959da2c7bd3299bd805bb4
+EBUILD bochs-2.3.7.ebuild 3477 RMD160 f128ae9737bf404b53b67795d4493d406f751e43 SHA1 b770e2d49b7fcae79e64f82ffa6540a2de24d2b1 SHA256 524e52f4e186cdca3629a03ffa8da60f2d9b5cdf16188623ef7691a1c310364c
 EBUILD bochs-2.3.ebuild 3098 RMD160 3a465bbfa9579ccc9786c67d38e567e9591499fc SHA1 302c23593db42aa2913f61ef8a8f4d966f710aa3 SHA256 a5f3a80d6a700bc19d8559ee7c0176a7f6ac80d86f0d0a27b039ce657443525f
-MISC ChangeLog 9410 RMD160 cbc9fadf26b7e7aa85a75ab4fe0cef7f6fb8c1e2 SHA1 93abf9346b285a9ebdd2f53b50de4e05a2851f73 SHA256 4463a1afbc0e996f0fb3e9343db7066eff0b9851ccd38c8d4998001cab630c17
+MISC ChangeLog 9661 RMD160 09c0304e605f8bb1050bdad4e299a42d3afc650e SHA1 be8199f881da7e0600700287fe88d38b5723e1d3 SHA256 37592540d5a1c1267f91910942d2538d15f3c26fa19ac3e33807b44250816a17
 MISC metadata.xml 223 RMD160 f054e67dff10c87ea1d0b5753124445be6bd4610 SHA1 fcf66d2b271369d296150dde06603d850623ed27 SHA256 64a96c3c9929aec46b50a63ae1fd8c46cef4a8423f448d6f6fff09e20510c98b
diff --git a/app-emulation/bochs/bochs-2.3.6.ebuild b/app-emulation/bochs/bochs-2.3.6.ebuild
index b25536111c77..9947f43cfe96 100644
--- a/app-emulation/bochs/bochs-2.3.6.ebuild
+++ b/app-emulation/bochs/bochs-2.3.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/bochs/bochs-2.3.6.ebuild,v 1.2 2008/03/31 12:54:20 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/bochs/bochs-2.3.6.ebuild,v 1.3 2008/06/05 02:22:51 lu_zero Exp $
 
 inherit eutils wxwidgets autotools
 
@@ -72,11 +72,6 @@ src_compile() {
 	use ncurses && \
 		myconf="${myconf} --with-term"
 
-	if ! use X && ! use ncurses && ! use vnc && ! use sdl
-	then
-		myconf="${myconf} --with-nogui"
-	fi
-
 	# --enable-all-optimizations causes bus error on sparc :(
 	use sparc || \
 		myconf="${myconf} --enable-all-optimizations"
@@ -92,6 +87,7 @@ src_compile() {
 		--enable-sse=2 \
 		--enable-3dnow \
 		--enable-cpu-level=6 \
+		--with-nogui \
 		$(use_enable usb) \
 		$(use_enable readline) \
 		$(use_enable debugger) \
diff --git a/app-emulation/bochs/bochs-2.3.7.ebuild b/app-emulation/bochs/bochs-2.3.7.ebuild
new file mode 100644
index 000000000000..59db59de42c7
--- /dev/null
+++ b/app-emulation/bochs/bochs-2.3.7.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/bochs/bochs-2.3.7.ebuild,v 1.1 2008/06/05 02:22:51 lu_zero Exp $
+
+inherit eutils wxwidgets autotools
+
+DESCRIPTION="a LGPL-ed pc emulator"
+HOMEPAGE="http://bochs.sourceforge.net/"
+SRC_URI="mirror://sourceforge/bochs/${P}.tar.gz
+		http://bochs.sourceforge.net/guestos/dlxlinux4.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE="X debugger readline usb wxwindows svga sdl ncurses vnc acpi"
+
+RDEPEND="virtual/libc
+	X? ( x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXpm )
+	sdl? ( media-libs/libsdl )
+	svga? ( media-libs/svgalib )
+	wxwindows? ( =x11-libs/wxGTK-2.6* )
+	readline? ( sys-libs/readline )
+	ncurses? ( sys-libs/ncurses )"
+
+DEPEND="${RDEPEND}
+	X? ( x11-proto/xproto )
+	>=sys-apps/sed-4
+	>=app-text/opensp-1.5"
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+	cd "${S}"
+
+	epatch "${FILESDIR}/bochs-2.3.7-typos.patch"
+
+	# we already downloaded dlxlinux4.tar.gz so let the Makefile cp it instead
+	# of downloading it again
+	sed -i \
+		-e "s:\$(WGET) \$(DLXLINUX_TAR_URL):cp ${DISTDIR}/dlxlinux4.tar.gz .:" \
+		Makefile.in || \
+		die "sed Makefile.in failed"
+
+	# Make sure wxwindows 2.6 is used in case both 2.6 and 2.4 are installed
+	sed -i -e "s:wx-config:wx-config-2.6:" configure.in
+	eautoconf
+}
+
+src_compile() {
+	export WX_GTK_VER=2.6
+
+	use wxwindows && \
+		need-wxwidgets gtk2
+
+	use x86 && \
+		myconf="--enable-idle-hack --enable-fast-function-calls"
+
+	use amd64 && \
+		myconf="--enable-x86-64"
+
+	use wxwindows && \
+		myconf="${myconf} --with-wx"
+	use wxwindows || \
+		myconf="${myconf} --without-wx"
+
+	use vnc && \
+		myconf="${myconf} --with-rfb"
+
+	use X && \
+		myconf="${myconf} --with-x11"
+
+	use ncurses && \
+		myconf="${myconf} --with-term"
+
+	# --enable-all-optimizations causes bus error on sparc :(
+	use sparc || \
+		myconf="${myconf} --enable-all-optimizations"
+
+	econf \
+		--enable-pae \
+		--enable-large-pages \
+		--enable-global-pages \
+		--enable-mtrr \
+		--enable-guest2host-tlb \
+		--enable-repeat-speedups \
+		--enable-trace-cache \
+		--enable-icache \
+		--enable-fast-function-calls \
+		--enable-ignore-bad-msr \
+		--enable-port-e9-hack \
+		--enable-disasm \
+		--enable-logging \
+		--enable-raw-serial \
+		--enable-vbe \
+		--enable-clgd54xx \
+		--enable-fpu \
+		--enable-vme \
+		--enable-alignment-check \
+		--enable-sep \
+		--enable-popcnt \
+		--enable-monitor-mwait \
+		--enable-gameport \
+		--enable-iodebug \
+		--prefix=/usr \
+		--enable-ne2000 \
+		--enable-sb16=linux \
+		--enable-plugins \
+		--enable-cdrom \
+		--enable-pci \
+		--enable-pcidev \
+		--enable-pnic \
+		--enable-mmx \
+		--enable-sse=2 \
+		--enable-3dnow \
+		--enable-cpu-level=6 \
+		--enable-smp \
+		--with-nogui \
+		--enable-xsave \
+		--enable-aes \
+		$(use_enable usb) \
+		$(use_enable readline) \
+		$(use_enable debugger) \
+		$(use_with X) \
+		$(use_with sdl) \
+		$(use_with svga) \
+		$(use_enable acpi) \
+		${myconf} || \
+		die "econf failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install unpack_dlx || die "make install failed"
+
+	# workaround
+	make prefix="${D}/usr" install_dlx
+
+	dodoc \
+		CHANGES \
+		PARAM_TREE.txt \
+		README \
+		README-plugins \
+		TESTFORM.txt \
+		TODO || \
+		die "doco failed"
+
+	if [ use vnc ]
+	then
+		dodoc README.rfb || die "dodoc failed"
+	fi
+
+	if [ use wxwindows ]
+	then
+		dodoc README-wxWindows || die "dodoc failed"
+	fi
+}
diff --git a/app-emulation/bochs/files/bochs-2.3.7-typos.patch b/app-emulation/bochs/files/bochs-2.3.7-typos.patch
new file mode 100644
index 000000000000..c9fb168e438b
--- /dev/null
+++ b/app-emulation/bochs/files/bochs-2.3.7-typos.patch
@@ -0,0 +1,24 @@
+diff -NaurwB bochs-2.3.7.orig/cpu/ia_opcodes.h bochs-2.3.7/cpu/ia_opcodes.h
+--- bochs-2.3.7.orig/cpu/ia_opcodes.h	2008-05-30 22:35:08.000000000 +0200
++++ bochs-2.3.7/cpu/ia_opcodes.h	2008-06-04 14:56:46.000000000 +0200
+@@ -891,7 +891,7 @@
+ bx_define_opcode(BX_IA_PF2ID_PqQq, BX_CPU_C::PF2ID_PqQq)
+ bx_define_opcode(BX_IA_PF2IW_PqQq, BX_CPU_C::PF2IW_PqQq)
+ bx_define_opcode(BX_IA_PFACC_PqQq, BX_CPU_C::PFACC_PqQq)
+-bx_define_opcode(BX_IA_PFADD_PqQq, BX_CPU_C::BX_PFADD_PqQq)
++bx_define_opcode(BX_IA_PFADD_PqQq, BX_CPU_C::PFADD_PqQq)
+ bx_define_opcode(BX_IA_PFCMPEQ_PqQq, BX_CPU_C::PFCMPEQ_PqQq)
+ bx_define_opcode(BX_IA_PFCMPGE_PqQq, BX_CPU_C::PFCMPGE_PqQq)
+ bx_define_opcode(BX_IA_PFCMPGT_PqQq, BX_CPU_C::PFCMPGT_PqQq)
+diff -NaurwB bochs-2.3.7.orig/iodev/iodebug.h bochs-2.3.7/iodev/iodebug.h
+--- bochs-2.3.7.orig/iodev/iodebug.h	2008-05-01 22:46:58.000000000 +0200
++++ bochs-2.3.7/iodev/iodebug.h	2008-06-04 14:45:50.000000000 +0200
+@@ -18,7 +18,7 @@
+   virtual void init(void);
+   virtual void reset (unsigned type) {}
+   static void mem_write(BX_CPU_C *cpu, bx_phy_address addr, unsigned len, void *data);
+-  static void mem_read(BX_CPU_C *cpu, bx_phy_addressu addr, unsigned len, void *data);
++  static void mem_read(BX_CPU_C *cpu, bx_phy_address addr, unsigned len, void *data);
+ 
+ private:
+   static Bit32u read_handler(void *this_ptr, Bit32u address, unsigned io_len);