New version, see bug #192702

(Portage version: 2.1.3.9)

3 files changed, 124 insertions, 1 deletions

diff --git a/app-emulation/bochs/ChangeLog b/app-emulation/bochs/ChangeLog
index 670f48699be3..7d058ad8ba08 100644
--- a/app-emulation/bochs/ChangeLog
+++ b/app-emulation/bochs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/bochs
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/bochs/ChangeLog,v 1.71 2007/09/16 15:08:03 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/bochs/ChangeLog,v 1.72 2007/09/16 18:51:05 lu_zero Exp $
+
+*bochs-2.3.5 (16 Sep 2007)
+
+  16 Sep 2007; Luca Barbato <lu_zero@gentoo.org> +bochs-2.3.5.ebuild:
+  New version, ebuild provided by Carlo Marcelo Arenas Belon
+  <carenas@sajinet.com.pe>
 
   16 Sep 2007; Christoph Mende <angelos@gentoo.org> bochs-2.3.ebuild:
   Stable on amd64 wrt security bug #188148
diff --git a/app-emulation/bochs/bochs-2.3.5.ebuild b/app-emulation/bochs/bochs-2.3.5.ebuild
new file mode 100644
index 000000000000..76f68eb9485e
--- /dev/null
+++ b/app-emulation/bochs/bochs-2.3.5.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/bochs/bochs-2.3.5.ebuild,v 1.1 2007/09/16 18:51:05 lu_zero Exp $
+
+inherit eutils wxwidgets
+
+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="debugger readline sdl svga wxwindows X ncurses vnc"
+
+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}
+	sed -i \
+		-e "s:\$(WGET) \$(DLXLINUX_TAR_URL):cp ${DISTDIR}/dlxlinux4.tar.gz .:" \
+		-e "s:BOCHSDIR=:BOCHSDIR=/usr/$(get_libdir)/bochs#:" \
+		-e 's: $(BOCHSDIR): $(DESTDIR)$(BOCHSDIR):g' Makefile.in || \
+			die "sed Makefile.in failed"
+
+# Make it use the correct path to gtk-2
+	sed -i -e "s:/opt/gnome:/usr:" configure
+# Fix some bad coding for gcc-4.1 compliance
+	sed -i -e "s:\#ifndef PARANOID:\#if 0:" iodev/hdimage.h
+# 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
+}
+
+src_compile() {
+	export WX_GTK_VER=2.6
+
+	use wxwindows && \
+		need-wxwidgets gtk2
+
+	[[ "$ARCH" == "x86" ]] \
+		&& myconf="--enable-idle-hack --enable-fast-function-calls"
+	[[ "$ARCH" == "amd64" ]] \
+	    && myconf="--enable-x86-64"
+	myconf="${myconf} `use_with sdl`"
+	myconf="${myconf} `use_with svga`"
+	myconf="${myconf} `use_enable readline`"
+	use wxwindows && \
+		myconf="${myconf} --with-wx"
+	use wxwindows || \
+		myconf="${myconf} --without-wx"
+
+	if use debugger
+	then
+		myconf="$myconf --enable-debugger --enable-disasm \
+				--enable-x86-debugger --enable-iodebug"
+	else
+		myconf="$myconf --enable-gdb-stub --disable-smp"
+	fi
+
+	use vnc && \
+		myconf="$myconf --with-rfb"
+
+	use X && \
+		myconf="$myconf --with-x11"
+
+	use ncurses && \
+		myconf="$myconf --with-term"
+
+	if ! use X && ! use ncurses && ! use vnc && ! use sdl
+	then
+		myconf="$myconf --with-nogui"
+	fi
+
+# needed to use gtk2 includes and libs
+	autoconf
+	./configure \
+		--enable-usb --enable-pci --enable-vbe \
+		--enable-sse=4 --enable-3dnow --enable-plugins \
+		--enable-cpu-level=6 --enable-all-optimizations \
+		--enable-ne2000 --enable-sb16=linux --enable-clgd54xx \
+		--enable-apic --enable-compressed-hd \
+		--enable-sep --host=${CHOST} \
+		--libdir=/usr/$(get_libdir) --prefix=/usr \
+		${myconf} || die "configure 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 README TESTFORM.txt || die "dodoc failed"
+}
diff --git a/app-emulation/bochs/files/digest-bochs-2.3.5 b/app-emulation/bochs/files/digest-bochs-2.3.5
new file mode 100644
index 000000000000..cb3e531ca1de
--- /dev/null
+++ b/app-emulation/bochs/files/digest-bochs-2.3.5
@@ -0,0 +1,6 @@
+MD5 2d9b2c1e17b4eba2d46b208be09df4a9 bochs-2.3.5.tar.gz 3916867
+RMD160 a254b6e04857d7078b6b982d466a3ba95bb071ee bochs-2.3.5.tar.gz 3916867
+SHA256 ff6b7d7eb950d05ade2f5fee00b3bd50542d5d22dc5c7ea564a0d02001e0fb16 bochs-2.3.5.tar.gz 3916867
+MD5 21c153f5aa391395c35f0c2f660da972 dlxlinux4.tar.gz 1504868
+RMD160 29fd31dd0f77edacecabd9f053206a486635e7f1 dlxlinux4.tar.gz 1504868
+SHA256 68b35f850ce69f4050ed85064e15d756245d57e84ddc1d52678b0e2a97dbf73e dlxlinux4.tar.gz 1504868