New version, see bug #209183

(Portage version: 2.1.4.1)

2 files changed, 138 insertions, 2 deletions

diff --git a/app-emulation/bochs/ChangeLog b/app-emulation/bochs/ChangeLog
index 199543737e83..a1f0105cef90 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.73 2007/09/28 23:38:51 dirtyepic Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/bochs/ChangeLog,v 1.74 2008/02/06 23:12:29 lu_zero Exp $
+
+*bochs-2.3.6 (06 Feb 2008)
+
+  06 Feb 2008; Luca Barbato <lu_zero@gentoo.org> +bochs-2.3.6.ebuild:
+  New version, ebuild kindly provided by Friedrich Oslage
+  <bluebird@porno-bullen.de> in bug #209183
 
   28 Sep 2007; Ryan Hill <dirtyepic@gentoo.org> bochs-2.2.6.ebuild,
   bochs-2.3.ebuild, bochs-2.3.5.ebuild:
diff --git a/app-emulation/bochs/bochs-2.3.6.ebuild b/app-emulation/bochs/bochs-2.3.6.ebuild
new file mode 100644
index 000000000000..e61bd64b56ce
--- /dev/null
+++ b/app-emulation/bochs/bochs-2.3.6.ebuild
@@ -0,0 +1,130 @@
+# 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.1 2008/02/06 23:12:29 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 mmx sse usb 3dnow 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}"
+
+	# 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
+
+	[[ "$ARCH" == "x86" ]] \
+		&& myconf="--enable-idle-hack --enable-fast-function-calls"
+
+	[[ "$ARCH" == "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"
+
+	if ! use X && ! use ncurses && ! use vnc && ! use sdl
+	then
+		myconf="${myconf} --with-nogui"
+	fi
+
+	# --enable-all-optimizations causes bus error on sparc :(
+	[[ "$ARCH" != "sparc" ]] \
+		&& myconf="${myconf} --enable-all-optimizations"
+
+	econf \
+		--prefix=/usr \
+		--enable-ne2000 \
+		--enable-sb16=linux \
+		--enable-plugins \
+		--enable-cdrom \
+		--enable-pci \
+		$(use_enable usb) \
+		$(use_enable sse) \
+		$(use_enable 3dnow) \
+		$(use_enable readline) \
+		$(use_enable debugger) \
+		$(use_with X) \
+		$(use_with sdl) \
+		$(use_with svga) \
+		$(use_with 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
+}