New version, see bug #209183

Package-Manager: portage-2.1.4.1

3 files changed, 141 insertions, 3 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/Manifest b/app-emulation/bochs/Manifest
index 8e35a1394728..64d9f15834c2 100644
--- a/app-emulation/bochs/Manifest
+++ b/app-emulation/bochs/Manifest
@@ -4,10 +4,12 @@ AUX bochs-2.3-redog.patch 507 RMD160 7840dee3b03a040882655ea7f5e63fb44e9cd4fe SH
 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.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 2899 RMD160 7dc6ffb5a848d877a293ce65591a707f1cff3be8 SHA1 d8333202712597cbc6939e4ce9f0e1f92cab84dd SHA256 523a60b001eb9ba4cb24104220122f22b950950552dcd10ca00f1e1daf8eec86
 EBUILD bochs-2.3.ebuild 3098 RMD160 3a465bbfa9579ccc9786c67d38e567e9591499fc SHA1 302c23593db42aa2913f61ef8a8f4d966f710aa3 SHA256 a5f3a80d6a700bc19d8559ee7c0176a7f6ac80d86f0d0a27b039ce657443525f
-MISC ChangeLog 9098 RMD160 cbd70317e8285ac3826ae71533a6482b6fd09707 SHA1 7df3ae96fa8ff017802c70fa6ae67152e723c970 SHA256 dd5544f7226343c2d6087383f5a632ed33aa105371f420e8d188440898ac986b
+MISC ChangeLog 9297 RMD160 584f5e35980410387510ee0c4277881724717ad7 SHA1 c07e54302d9b1fa0a706986371bb5feb0fdfcb91 SHA256 81472120c23dcff4ca73741fbb5d5d59c3283fcadc05d6792e772009683b5b85
 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
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
+}