New version

4 files changed, 83 insertions, 10 deletions

diff --git a/app-emulation/bochs/ChangeLog b/app-emulation/bochs/ChangeLog
index 81074b60a969..185341614749 100644
--- a/app-emulation/bochs/ChangeLog
+++ b/app-emulation/bochs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/bochs
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/bochs/ChangeLog,v 1.20 2004/01/13 02:50:57 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/bochs/ChangeLog,v 1.21 2004/02/29 03:31:13 lu_zero Exp $
+
+*bochs-2.1.1 (29 Feb 2004)
+
+  29 Feb 2004; Luca Barbato <lu_zero@gentoo.org> bochs-2.1.1.ebuild:
+  Version bump
 
 *bochs-2.1 (13 Jan 2004)
 
diff --git a/app-emulation/bochs/Manifest b/app-emulation/bochs/Manifest
index 202d7a89704c..908f78d4b517 100644
--- a/app-emulation/bochs/Manifest
+++ b/app-emulation/bochs/Manifest
@@ -1,12 +1,14 @@
-MD5 76adc3fb9ca3cf960533bf7ff6434454 ChangeLog 2087
-MD5 52d414e1720908a4311bd01e35d7d3ce bochs-1.4.1.ebuild 1592
-MD5 f7b1a1aa2089c83646d11d66b3354030 bochs-1.4.ebuild 1522
-MD5 3da30d1acb41616b34cd1319b3962f4a bochs-2.0.2.ebuild 2091
-MD5 e59c2f25bdb05e58f8003fae01d53d81 bochs-2.0.ebuild 1497
-MD5 db9bc6204266b2a7b54c25c25913b4fa bochs-2.1.ebuild 2141
-MD5 98e5b3f35a6f0ad02450764b07b344f6 files/digest-bochs-1.4 124
+MD5 3d5091c714ca0069e0f79d977ed964f5 bochs-2.1.1.ebuild 1957
+MD5 5cc02c44d8a2c983e24c382ce59d31c3 bochs-2.1.ebuild 2140
+MD5 beb3e059ec236a901d4a45405782334a ChangeLog 2199
+MD5 f5a68e22ea598d3b4a4e4d35d6725178 bochs-1.4.ebuild 1521
+MD5 795d33bffaff8800c87c73690992c655 bochs-2.0.2.ebuild 2090
+MD5 7439ec219e01ed8ba6914afce9ae7e9d bochs-1.4.1.ebuild 1591
+MD5 309e595e519f63be5bc49f3825cc78f6 bochs-2.0.ebuild 1496
+MD5 8e9513ab2651bd41c0529405d45d3da1 files/digest-bochs-2.1 124
 MD5 45eecf87d56bd4562cffd0c8cfe666f9 files/digest-bochs-1.4.1 126
+MD5 82bbe1a668c392d41dab00e073bf4e05 files/bochs-2.0.2-gcc3.patch 2206
+MD5 207a406a1a47e2650e396ea0976f5206 files/digest-bochs-2.1.1 126
 MD5 b16ead839f74b3e086e97173022acc75 files/digest-bochs-2.0 124
+MD5 98e5b3f35a6f0ad02450764b07b344f6 files/digest-bochs-1.4 124
 MD5 58d96725e3bd04fed299304c5d6d8d9f files/digest-bochs-2.0.2 126
-MD5 82bbe1a668c392d41dab00e073bf4e05 files/bochs-2.0.2-gcc3.patch 2206
-MD5 8e9513ab2651bd41c0529405d45d3da1 files/digest-bochs-2.1 124
diff --git a/app-emulation/bochs/bochs-2.1.1.ebuild b/app-emulation/bochs/bochs-2.1.1.ebuild
new file mode 100644
index 000000000000..73da16080413
--- /dev/null
+++ b/app-emulation/bochs/bochs-2.1.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/bochs/bochs-2.1.1.ebuild,v 1.1 2004/02/29 03:31:13 lu_zero Exp $
+
+inherit eutils
+
+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="~x86 ~ppc ~alpha ~sparc"
+IUSE="sdl gtk readline"
+
+DEPEND=">=sys-libs/glibc-2.1.3
+	>=x11-base/xfree-4.0.1
+	>=sys-apps/sed-4
+	sdl? media-libs/libsdl
+	gtk?  x11-libs/wxGTK
+	readline? sys-libs/readline"
+
+src_unpack() {
+#	unpack ${A}
+	unpack ${P}.tar.gz
+	cd ${S}
+# 		-e 's:MAN_PAGE_1_LIST=bochs bximage bochs-dlx:MAN_PAGE_1_LIST=bochs bximage:'
+	sed -i \
+		-e "s:\$(WGET) \$(DLXLINUX_TAR_URL):cp ${DISTDIR}/dlxlinux4.tar.gz .:" \
+		-e 's:BOCHSDIR=:BOCHSDIR=/usr/lib/bochs#:' \
+		-e 's: $(BOCHSDIR): $(DESTDIR)$(BOCHSDIR):g' Makefile.in || \
+			die "sed Makefile.in failed"
+#	epatch ${FILESDIR}/${P}-gcc3.patch || die
+}
+
+src_compile() {
+	[ "$ARCH" == "x86" ] \
+		&& myconf="--enable-idle-hack --enable-fast-function-calls"
+	myconf="${myconf} `use_with sdl`"
+	myconf="${myconf} `use_with gtk wx`"
+	myconf="${myconf} `use_enable readline`"
+
+	./configure \
+		--enable-fpu --enable-cdrom --enable-control-panel \
+		--enable-usb --enable-pci --enable-mmx --enable-sse\
+		--enable-cpu-level=6 \
+		--enable-repeat-speedups --enable-guest2host-tlb \
+		--enable-plugins --enable-debugger \
+		--enable-ne2000 --enable-sb16=linux --enable-slowdown --prefix=/usr \
+		--infodir=/usr/share/info --mandir=/usr/share/man --host=${CHOST} \
+		--with-x11 $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.1.1 b/app-emulation/bochs/files/digest-bochs-2.1.1
new file mode 100644
index 000000000000..8c7cc31594ab
--- /dev/null
+++ b/app-emulation/bochs/files/digest-bochs-2.1.1
@@ -0,0 +1,2 @@
+MD5 7b21efbe2b56cc15d110993234259b33 bochs-2.1.1.tar.gz 3653487
+MD5 21c153f5aa391395c35f0c2f660da972 dlxlinux4.tar.gz 1504868