New version, see bug #192702

Package-Manager: portage-2.1.3.9

4 files changed, 136 insertions, 15 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/Manifest b/app-emulation/bochs/Manifest
index 514380a6b7f2..b9189c928d33 100644
--- a/app-emulation/bochs/Manifest
+++ b/app-emulation/bochs/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX bochs-2.3-floppy.patch 1356 RMD160 753655013f512d8e47245913727c996a3a2314a9 SHA1 7a7d5246a179d88e096d2eda5981036a32fc26b1 SHA256 01323056edbbfa4d142d7a81ee3725404bd5464372aa4e3507af58890a22b7fe
 MD5 2e2efe9bcfcecfc723e43efb0aaf11aa files/bochs-2.3-floppy.patch 1356
 RMD160 753655013f512d8e47245913727c996a3a2314a9 files/bochs-2.3-floppy.patch 1356
@@ -15,20 +12,25 @@ RMD160 7840dee3b03a040882655ea7f5e63fb44e9cd4fe files/bochs-2.3-redog.patch 507
 SHA256 d7013f39972bc989ad3663a6849b72169b4d1d41d36a9ffc25b83c62033ba002 files/bochs-2.3-redog.patch 507
 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.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 3022 RMD160 29ccf054da7beaa5a46b308803fd99f507fbf86e SHA1 97bb541b54f412c4e947c0caa21399e0f45341e0 SHA256 0fd7f5e27f7fddee00dec7962c941605002aa1d92face801f811d177c7a8e044
 MD5 57e9b246dacb8ee5bd90f0af3025d075 bochs-2.2.6.ebuild 3022
 RMD160 29ccf054da7beaa5a46b308803fd99f507fbf86e bochs-2.2.6.ebuild 3022
 SHA256 0fd7f5e27f7fddee00dec7962c941605002aa1d92face801f811d177c7a8e044 bochs-2.2.6.ebuild 3022
+EBUILD bochs-2.3.5.ebuild 3019 RMD160 32cf1f67de4d82d4920f9d11b7bc9154828a5355 SHA1 5051bd2067e599699cee6dca25a7bb83f795f138 SHA256 3986556fc47ef2e837fc34b13d0d61b10ccde3d96829c8e26d06c922aa966faf
+MD5 f746e65e0f6d6e509eb165ae5483d378 bochs-2.3.5.ebuild 3019
+RMD160 32cf1f67de4d82d4920f9d11b7bc9154828a5355 bochs-2.3.5.ebuild 3019
+SHA256 3986556fc47ef2e837fc34b13d0d61b10ccde3d96829c8e26d06c922aa966faf bochs-2.3.5.ebuild 3019
 EBUILD bochs-2.3.ebuild 3096 RMD160 db1afbd0ead711092aff98fb77c03efb206cb046 SHA1 c8b39a49813a1f38e4179693386fbe32fc6bcbc8 SHA256 75c0bf2be73ceb7ec98805232c353c65e19762de6a780027e4971be0cfc590d4
 MD5 df9eb8a89140a262dcf259aaed86121a bochs-2.3.ebuild 3096
 RMD160 db1afbd0ead711092aff98fb77c03efb206cb046 bochs-2.3.ebuild 3096
 SHA256 75c0bf2be73ceb7ec98805232c353c65e19762de6a780027e4971be0cfc590d4 bochs-2.3.ebuild 3096
-MISC ChangeLog 8779 RMD160 d6493bd602ee0211d14d605662fa0e9656ea59de SHA1 4fbbe42eb061865870700df2164bf66e395c295d SHA256 2ca734ec29b597f3c5060e13d49a3419eca89253f6279a10e2964786af1d14dd
-MD5 0b032bce293cfe78b6d42122198fee4d ChangeLog 8779
-RMD160 d6493bd602ee0211d14d605662fa0e9656ea59de ChangeLog 8779
-SHA256 2ca734ec29b597f3c5060e13d49a3419eca89253f6279a10e2964786af1d14dd ChangeLog 8779
+MISC ChangeLog 8966 RMD160 1de3e9274fd328815dc313edc4e25c8b98346c98 SHA1 df7f78943b1319f1404bc0bc58959be2189d9a02 SHA256 5171bbfd937c844368b2eff26ccaca5dfe3383657a4b3897a5e046e86d73f155
+MD5 21e2c4684a8a9f5840602ab831fe5595 ChangeLog 8966
+RMD160 1de3e9274fd328815dc313edc4e25c8b98346c98 ChangeLog 8966
+SHA256 5171bbfd937c844368b2eff26ccaca5dfe3383657a4b3897a5e046e86d73f155 ChangeLog 8966
 MISC metadata.xml 223 RMD160 f054e67dff10c87ea1d0b5753124445be6bd4610 SHA1 fcf66d2b271369d296150dde06603d850623ed27 SHA256 64a96c3c9929aec46b50a63ae1fd8c46cef4a8423f448d6f6fff09e20510c98b
 MD5 898131aae735c3477ff2f9c6882f1178 metadata.xml 223
 RMD160 f054e67dff10c87ea1d0b5753124445be6bd4610 metadata.xml 223
@@ -39,10 +41,6 @@ SHA256 a2b52f27de06243a805575b8c37bd1af72d324d01f2eb0bb4d00688e3c2365f9 files/di
 MD5 8e0b9c719aad575929ecdc81db63b65f files/digest-bochs-2.3 464
 RMD160 d6f2d22e53895fc43a1a9d6f8c7d8352908444df files/digest-bochs-2.3 464
 SHA256 f2a3b381d90090d78c3c5dcef3503400c3537dd3e72c1aa74c8945c16df17fd3 files/digest-bochs-2.3 464
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFG7UbYKhnDs22gwa8RAklfAKDa3Bi5cPBQik1sanEoqEC1FcuCiwCeP5t4
-X36Of2OGvPf57ZAFq8RcgOw=
-=pDaK
------END PGP SIGNATURE-----
+MD5 b7421b7c6834a899be64a100eea087a3 files/digest-bochs-2.3.5 470
+RMD160 3199802b3ce3f3313be6ce78016cd887efce2977 files/digest-bochs-2.3.5 470
+SHA256 24057ec49d18db7933c59e174459ffc19f9016239a92658092b0c98a2d5ca028 files/digest-bochs-2.3.5 470
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