diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2011-09-15 07:39:28 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-09-15 07:39:28 +0000 |
commit | e97c95983bd6950e399a6e2fafcebae084da8805 (patch) | |
tree | a84451c3ba497a4829d38ec2159a4ef07bcf95fd /app-emulation | |
parent | [This is a placeholder. Please ignore.] (diff) | |
download | historical-e97c95983bd6950e399a6e2fafcebae084da8805.tar.gz historical-e97c95983bd6950e399a6e2fafcebae084da8805.tar.bz2 historical-e97c95983bd6950e399a6e2fafcebae084da8805.zip |
[This is a placeholder. Please ignore.]
Package-Manager: portage-2.2.0_alpha55/cvs/Linux x86_64
Diffstat (limited to 'app-emulation')
-rw-r--r-- | app-emulation/bochs/ChangeLog | 10 | ||||
-rw-r--r-- | app-emulation/bochs/Manifest | 23 | ||||
-rw-r--r-- | app-emulation/bochs/bochs-2.3.6.ebuild | 123 | ||||
-rw-r--r-- | app-emulation/bochs/bochs-2.3.7.ebuild | 155 | ||||
-rw-r--r-- | app-emulation/bochs/bochs-2.3.ebuild | 104 | ||||
-rw-r--r-- | app-emulation/bochs/files/bochs-2.3-floppy.patch | 35 | ||||
-rw-r--r-- | app-emulation/bochs/files/bochs-2.3-ne2k.patch | 19 | ||||
-rw-r--r-- | app-emulation/bochs/files/bochs-2.3-redog.patch | 11 | ||||
-rw-r--r-- | app-emulation/bochs/files/bochs-2.3.7-gcc43.patch | 12 | ||||
-rw-r--r-- | app-emulation/bochs/files/bochs-2.3.7-typos.patch | 24 |
10 files changed, 19 insertions, 497 deletions
diff --git a/app-emulation/bochs/ChangeLog b/app-emulation/bochs/ChangeLog index c9a12996a3e6..896ca8bf1183 100644 --- a/app-emulation/bochs/ChangeLog +++ b/app-emulation/bochs/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-emulation/bochs -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/bochs/ChangeLog,v 1.88 2010/09/04 09:22:32 lu_zero Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/bochs/ChangeLog,v 1.89 2011/09/15 07:39:28 ssuominen Exp $ + + 15 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> -bochs-2.3.ebuild, + -bochs-2.3.6.ebuild, -bochs-2.3.7.ebuild, -files/bochs-2.3.7-gcc43.patch, + -files/bochs-2.3.7-typos.patch, -files/bochs-2.3-floppy.patch, + -files/bochs-2.3-ne2k.patch, -files/bochs-2.3-redog.patch: + [This is a placeholder. Please ignore.] *bochs-2.4.5 (04 Sep 2010) diff --git a/app-emulation/bochs/Manifest b/app-emulation/bochs/Manifest index 8cf9e6b2278b..897bf6554be9 100644 --- a/app-emulation/bochs/Manifest +++ b/app-emulation/bochs/Manifest @@ -1,18 +1,17 @@ -AUX bochs-2.3-floppy.patch 1356 RMD160 753655013f512d8e47245913727c996a3a2314a9 SHA1 7a7d5246a179d88e096d2eda5981036a32fc26b1 SHA256 01323056edbbfa4d142d7a81ee3725404bd5464372aa4e3507af58890a22b7fe -AUX bochs-2.3-ne2k.patch 557 RMD160 9094800e0d427ae9b13b69d39da5f569816c50ca SHA1 39df13629909535104a7febc52b8749d4414000a SHA256 c68d8bfc3759e031474e3f144d2780c62ada633b97721bee78f3c996255e9527 -AUX bochs-2.3-redog.patch 507 RMD160 7840dee3b03a040882655ea7f5e63fb44e9cd4fe SHA1 1658fa72d8d1e8e6ea687e22ade722cba15bbfa9 SHA256 d7013f39972bc989ad3663a6849b72169b4d1d41d36a9ffc25b83c62033ba002 -AUX bochs-2.3.7-gcc43.patch 258 RMD160 76217a4e8f3641cb971f53712cddd54ba077f1e3 SHA1 25a6dedbb9ff6fea76f3d6f11a94824032c02feb SHA256 9d1945a7500f89d2ba46566019ba5772ed5bca133d27e781d6aadda955956d6f -AUX bochs-2.3.7-typos.patch 1375 RMD160 d966955c9313d2ef6e961b48b24f65af10d2f29e SHA1 c55f317484117dfa59c71e95f95aed4d700d1bb4 SHA256 8ace7f1238702e9e973cabcb847673b5d2c63155c3efd572bf75a094819cdd49 -DIST bochs-2.3.6.tar.gz 3951132 RMD160 b81c8093c147d0d75cb18a954407ed3f7451aa3f SHA1 3675b1c5a324854b998bb7518c7279db2fecd8c3 SHA256 11b4026f0717266d01c59a3f95046077bc046949aa752d0f0773b2b20dfb16aa -DIST bochs-2.3.7.tar.gz 3989982 RMD160 b4c9cb8e777c4e484f653085783bce9645804fe0 SHA1 e687c697a8be8396ae75106d0cd6149bd52ca67d SHA256 77f27fedadc6431df0a06ee226259a80443524ae9d221c97c5986e3f7927bb04 -DIST bochs-2.3.tar.gz 3812273 RMD160 545e0bf3edd0fdd073a107e835f90c65451c100e SHA1 2fe0dbdebd7fe9fe07d697bcbe1736bdaeb64aaf SHA256 fd926f3915d0619ddde8dedd02dac661f3233d77f3fc2ec7f94e1e028398497a +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + DIST bochs-2.4.1.tar.gz 4046505 RMD160 c1b71ba4f6cef8710aa66a5e6862c7ccaf13d7eb SHA1 80a85bb7b8598298615db1216c4a8c3597666309 SHA256 d4fd63e328870d8a9452d8397c83a295b093d5d158386d1ef9b98f161f520ab3 DIST bochs-2.4.5.tar.gz 4059598 RMD160 a5a52d8f58b8ad7b1d544d4f89043244d99fa242 SHA1 e334d31efd79c80454018c9cdafaa0eb75cb018a SHA256 b948622a364c2e7da4221a6a4640ba2efa68422e1411ac377c69d37f46f67616 DIST dlxlinux4.tar.gz 1504868 RMD160 29fd31dd0f77edacecabd9f053206a486635e7f1 SHA1 b3f441cd71c54c71a8c21aa405e949bde02c1783 SHA256 68b35f850ce69f4050ed85064e15d756245d57e84ddc1d52678b0e2a97dbf73e -EBUILD bochs-2.3.6.ebuild 2620 RMD160 b336ad665166636b95291b20a836794ebd462afa SHA1 a9875205066c317a2f3a4401ca0d4c6e950c9953 SHA256 394f7dd99cbe54ac0d5fb451b17228af10698c861d29d9e17e4f62b9b611559d -EBUILD bochs-2.3.7.ebuild 3351 RMD160 862cbff09be4cd5b71b5592176389cf66049a033 SHA1 c75a76538e770ae25648b2a3cdd8b4b75aa54944 SHA256 71e6c4b89485ab21819a487c95c99835b799431f0b4f6ceed37f048ace26ec5c -EBUILD bochs-2.3.ebuild 2927 RMD160 8e9fcf8c8a241821bc19b317c159237822158ae3 SHA1 add4b907308e57dd6db754d090b4e74a6eac2ecf SHA256 1a494ff7f2375d49e47f45cf598bf41052f083257adf0134589259830721adbd EBUILD bochs-2.4.1.ebuild 3189 RMD160 98bb7fe1e3ae3cc64ac99591610c0d049d133e9b SHA1 4f3d5323ae3230feef021814f3765f2fbfb4026c SHA256 5f0cdd4bf342c4af2e3c8901a92996d0762d97a68366fdddee733b7ef06d94ba EBUILD bochs-2.4.5.ebuild 2913 RMD160 cb4e56c3194e2a48a5f5b934af1d672d5404c73b SHA1 d740734784d1cb2b71a12556b6c17071f07b2108 SHA256 e9b24500ea26802d5500dc09830e4c5c4a0779ff229d7c434a1e80572f5f9295 -MISC ChangeLog 11393 RMD160 7a71dd00eba1060f5201fad12ec81261c3831cc4 SHA1 60d59c411932748f949315d6313c3954007fc78f SHA256 2984defbb22b08bc522a7f1f182d9eded2edf6217d5e23cc4d149d9b6be9a886 +MISC ChangeLog 11713 RMD160 89c91016e371cb209430711e431b7f52118252d5 SHA1 71b892b72e43b902934b8afd28661f3f660bbac0 SHA256 163b6159fe219c532a32f34bf6ea5a0e137131df2946cb85b9487999897d8fbe MISC metadata.xml 292 RMD160 763d8dd9333f7e318c659a073bd837405d528e00 SHA1 8886f39ce9788c2d0a908106704ea9552ca3d78c SHA256 0d8960adac2ec04d372e9317aff221b788071bb3d31852560e4bebe1d2272a65 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.18 (GNU/Linux) + +iF4EAREIAAYFAk5xq+gACgkQXkR9YqOcLPGXwQD/dNY4JWVWOvXqrgWpkg/vFXL7 +FZmg2OtlTiow/6ccK5cBAKLaCi+gloSpJ9vjePfjXwMi2RkOH2tNfhCEUdpu6KiP +=kBTB +-----END PGP SIGNATURE----- diff --git a/app-emulation/bochs/bochs-2.3.6.ebuild b/app-emulation/bochs/bochs-2.3.6.ebuild deleted file mode 100644 index e8f811eb3a13..000000000000 --- a/app-emulation/bochs/bochs-2.3.6.ebuild +++ /dev/null @@ -1,123 +0,0 @@ -# Copyright 1999-2010 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.6 2010/02/10 06:32:50 dirtyepic 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="X debugger readline usb wxwidgets svga sdl ncurses vnc acpi" - -RDEPEND="X? ( x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXpm ) - sdl? ( media-libs/libsdl ) - svga? ( media-libs/svgalib ) - wxwidgets? ( =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" -} - -src_compile() { - WX_GTK_VER=2.6 - - use wxwidgets && \ - need-wxwidgets ansi - - use x86 && \ - myconf="--enable-idle-hack --enable-fast-function-calls" - - use amd64 && \ - myconf="--enable-x86-64" - - use wxwidgets && \ - myconf="${myconf} --with-wx" - use wxwidgets || \ - myconf="${myconf} --without-wx" - - use vnc && \ - myconf="${myconf} --with-rfb" - - use X && \ - myconf="${myconf} --with-x11" - - use ncurses && \ - myconf="${myconf} --with-term" - - # --enable-all-optimizations causes bus error on sparc :( - use sparc || \ - myconf="${myconf} --enable-all-optimizations" - - econf \ - --prefix=/usr \ - --enable-ne2000 \ - --enable-sb16=linux \ - --enable-plugins \ - --enable-cdrom \ - --enable-pci \ - --enable-mmx \ - --enable-sse=2 \ - --enable-3dnow \ - --enable-cpu-level=6 \ - --with-nogui \ - $(use_enable usb) \ - $(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 wxwidgets ] - then - dodoc README-wxWindows || die "dodoc failed" - fi -} diff --git a/app-emulation/bochs/bochs-2.3.7.ebuild b/app-emulation/bochs/bochs-2.3.7.ebuild deleted file mode 100644 index 8d1363d1e337..000000000000 --- a/app-emulation/bochs/bochs-2.3.7.ebuild +++ /dev/null @@ -1,155 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/bochs/bochs-2.3.7.ebuild,v 1.8 2010/02/10 06:32:50 dirtyepic 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="X debugger readline usb wxwidgets svga sdl ncurses vnc acpi" - -RDEPEND="X? ( x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXpm ) - sdl? ( media-libs/libsdl ) - svga? ( media-libs/svgalib ) - wxwidgets? ( =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}" - - epatch "${FILESDIR}/bochs-2.3.7-typos.patch" - epatch "${FILESDIR}/bochs-2.3.7-gcc43.patch" - - # 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" -} - -src_compile() { - WX_GTK_VER=2.6 - - use wxwidgets && \ - need-wxwidgets ansi - - use x86 && \ - myconf="--enable-idle-hack --enable-fast-function-calls" - - use amd64 && \ - myconf="--enable-x86-64" - - use wxwidgets && \ - myconf="${myconf} --with-wx" - use wxwidgets || \ - myconf="${myconf} --without-wx" - - use vnc && \ - myconf="${myconf} --with-rfb" - - use X && \ - myconf="${myconf} --with-x11" - - use ncurses && \ - myconf="${myconf} --with-term" - - # --enable-all-optimizations causes bus error on sparc :( - use sparc || \ - myconf="${myconf} --enable-all-optimizations" - - econf \ - --enable-pae \ - --enable-large-pages \ - --enable-global-pages \ - --enable-mtrr \ - --enable-guest2host-tlb \ - --enable-repeat-speedups \ - --enable-trace-cache \ - --enable-icache \ - --enable-fast-function-calls \ - --enable-ignore-bad-msr \ - --enable-port-e9-hack \ - --enable-disasm \ - --enable-logging \ - --enable-raw-serial \ - --enable-vbe \ - --enable-clgd54xx \ - --enable-fpu \ - --enable-vme \ - --enable-alignment-check \ - --enable-sep \ - --enable-popcnt \ - --enable-monitor-mwait \ - --enable-gameport \ - --enable-iodebug \ - --prefix=/usr \ - --enable-ne2000 \ - --enable-sb16=linux \ - --enable-plugins \ - --enable-cdrom \ - --enable-pci \ - --enable-pcidev \ - --enable-pnic \ - --enable-mmx \ - --enable-sse=2 \ - --enable-3dnow \ - --enable-cpu-level=6 \ - --enable-smp \ - --with-nogui \ - --enable-xsave \ - --enable-aes \ - $(use_enable usb) \ - $(use_enable readline) \ - $(use_enable debugger) \ - $(use_with X) \ - $(use_with sdl) \ - $(use_with svga) \ - $(use_enable 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 wxwidgets ] - then - dodoc README-wxWindows || die "dodoc failed" - fi -} diff --git a/app-emulation/bochs/bochs-2.3.ebuild b/app-emulation/bochs/bochs-2.3.ebuild deleted file mode 100644 index 131326699841..000000000000 --- a/app-emulation/bochs/bochs-2.3.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/bochs/bochs-2.3.ebuild,v 1.10 2010/02/10 06:32:50 dirtyepic 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="debugger readline sdl wxwidgets X ncurses vnc" - -RDEPEND="X? ( x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXpm ) - sdl? ( media-libs/libsdl ) - wxwidgets? ( =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 -# wx unicode patches from fedora and bits the fedora missed -# epatch ${DISTDIR}/${P}-unicode.patch.gz - epatch ${FILESDIR}/${P}-redog.patch - epatch ${FILESDIR}/${P}-floppy.patch - epatch ${FILESDIR}/${P}-ne2k.patch - eautoconf -} - -src_compile() { - WX_GTK_VER=2.6 - - use wxwidgets && \ - need-wxwidgets ansi - - [[ "$ARCH" == "x86" ]] \ - && myconf="--enable-idle-hack --enable-fast-function-calls" - myconf="${myconf} `use_with sdl`" - myconf="${myconf} `use_enable readline`" - use wxwidgets && \ - myconf="${myconf} --with-wx" - use wxwidgets || \ - myconf="${myconf} --without-wx" - use debugger && \ - myconf="$myconf --enable-debugger --enable-disasm \ - --enable-x86-debugger --enable-iodebug" - use debugger || \ - myconf="$myconf --enable-gdb-stub" - 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 - - ./configure \ - --enable-usb --enable-pci --enable-vbe \ - --enable-sse=2 --enable-3dnow --enable-plugins \ - --enable-cpu-level=6 --enable-all-optimizations \ - --enable-ne2000 --enable-sb16=linux --enable-clgd54xx \ - --enable-apic --enable-compressed-hd \ - --enable-pni --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/bochs-2.3-floppy.patch b/app-emulation/bochs/files/bochs-2.3-floppy.patch deleted file mode 100644 index 0e0ae6a9d924..000000000000 --- a/app-emulation/bochs/files/bochs-2.3-floppy.patch +++ /dev/null @@ -1,35 +0,0 @@ -Index: iodev/floppy.cc -=================================================================== -RCS file: /cvsroot/bochs/bochs/iodev/floppy.cc,v -retrieving revision 1.106 -retrieving revision 1.107 -diff -u -p -r1.106 -r1.107 ---- iodev/floppy.cc 6 Apr 2007 15:22:17 -0000 1.106 -+++ iodev/floppy.cc 21 Aug 2007 14:18:16 -0000 1.107 -@@ -1785,7 +1785,7 @@ bx_bool bx_floppy_ctrl_c::evaluate_media - } - media->sectors = media->heads * media->tracks * media->sectors_per_track; - } -- return(1); // success -+ return (media->sectors > 0); // success - } - - else if ( S_ISCHR(stat_buf.st_mode) -@@ -1805,7 +1805,7 @@ bx_bool bx_floppy_ctrl_c::evaluate_media - media->heads = floppy_type[type_idx].hd; - media->sectors_per_track = floppy_type[type_idx].spt; - media->sectors = floppy_type[type_idx].sectors; -- return 1; -+ return (media->sectors > 0); - } - media->tracks = floppy_geom.track; - media->heads = floppy_geom.head; -@@ -1822,7 +1822,7 @@ bx_bool bx_floppy_ctrl_c::evaluate_media - media->sectors_per_track = floppy_type[type_idx].spt; - media->sectors = floppy_type[type_idx].sectors; - #endif -- return 1; // success -+ return (media->sectors > 0); // success - } else { - // unknown file type - BX_ERROR(("unknown mode type")); diff --git a/app-emulation/bochs/files/bochs-2.3-ne2k.patch b/app-emulation/bochs/files/bochs-2.3-ne2k.patch deleted file mode 100644 index 558cf636a8f7..000000000000 --- a/app-emulation/bochs/files/bochs-2.3-ne2k.patch +++ /dev/null @@ -1,19 +0,0 @@ -Index: iodev/ne2k.cc -=================================================================== -RCS file: /cvsroot/bochs/bochs/iodev/ne2k.cc,v -retrieving revision 1.91 -retrieving revision 1.92 -diff -u -p -r1.91 -r1.92 ---- iodev/ne2k.cc 3 Feb 2007 17:56:35 -0000 1.91 -+++ iodev/ne2k.cc 10 Mar 2007 15:17:31 -0000 1.92 -@@ -1278,8 +1278,8 @@ void bx_ne2k_c::rx_handler(void *arg, co - */ - void bx_ne2k_c::rx_frame(const void *buf, unsigned io_len) - { -- unsigned pages; -- unsigned avail; -+ int pages; -+ int avail; - unsigned idx; - int wrapped; - int nextpage; diff --git a/app-emulation/bochs/files/bochs-2.3-redog.patch b/app-emulation/bochs/files/bochs-2.3-redog.patch deleted file mode 100644 index e1bdb3bf4d17..000000000000 --- a/app-emulation/bochs/files/bochs-2.3-redog.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- bochs-2.3.orig/iodev/hdimage.cc 2006-09-17 02:28:23.000000000 +0300 -+++ bochs-2.3/iodev/hdimage.cc 2006-09-17 02:28:53.000000000 +0300 -@@ -1586,7 +1586,7 @@ - sprintf (logname, "%s%s", pathname, UNDOABLE_REDOLOG_EXTENSION); - } - -- if (redolog->open(logname,REDOLOG_SUBTYPE_UNDOABLE,size) < 0) -+ if (redolog->open(logname, REDOLOG_SUBTYPE_UNDOABLE) < 0) - { - if (redolog->create(logname, REDOLOG_SUBTYPE_UNDOABLE, size) < 0) - { diff --git a/app-emulation/bochs/files/bochs-2.3.7-gcc43.patch b/app-emulation/bochs/files/bochs-2.3.7-gcc43.patch deleted file mode 100644 index 4646edf6762e..000000000000 --- a/app-emulation/bochs/files/bochs-2.3.7-gcc43.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- bochs-2.3.7.orig/bx_debug/symbols.cc 2008/03/30 14:32:14 1.11 -+++ bochs-2.3.7/bx_debug/symbols.cc 2008/06/16 17:09:52 1.12 -@@ -95,6 +95,9 @@ - #endif - - using namespace std; -+#ifdef __GNUC__ -+using namespace __gnu_cxx; -+#endif - - struct symbol_entry_t - { diff --git a/app-emulation/bochs/files/bochs-2.3.7-typos.patch b/app-emulation/bochs/files/bochs-2.3.7-typos.patch deleted file mode 100644 index c9fb168e438b..000000000000 --- a/app-emulation/bochs/files/bochs-2.3.7-typos.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -NaurwB bochs-2.3.7.orig/cpu/ia_opcodes.h bochs-2.3.7/cpu/ia_opcodes.h ---- bochs-2.3.7.orig/cpu/ia_opcodes.h 2008-05-30 22:35:08.000000000 +0200 -+++ bochs-2.3.7/cpu/ia_opcodes.h 2008-06-04 14:56:46.000000000 +0200 -@@ -891,7 +891,7 @@ - bx_define_opcode(BX_IA_PF2ID_PqQq, BX_CPU_C::PF2ID_PqQq) - bx_define_opcode(BX_IA_PF2IW_PqQq, BX_CPU_C::PF2IW_PqQq) - bx_define_opcode(BX_IA_PFACC_PqQq, BX_CPU_C::PFACC_PqQq) --bx_define_opcode(BX_IA_PFADD_PqQq, BX_CPU_C::BX_PFADD_PqQq) -+bx_define_opcode(BX_IA_PFADD_PqQq, BX_CPU_C::PFADD_PqQq) - bx_define_opcode(BX_IA_PFCMPEQ_PqQq, BX_CPU_C::PFCMPEQ_PqQq) - bx_define_opcode(BX_IA_PFCMPGE_PqQq, BX_CPU_C::PFCMPGE_PqQq) - bx_define_opcode(BX_IA_PFCMPGT_PqQq, BX_CPU_C::PFCMPGT_PqQq) -diff -NaurwB bochs-2.3.7.orig/iodev/iodebug.h bochs-2.3.7/iodev/iodebug.h ---- bochs-2.3.7.orig/iodev/iodebug.h 2008-05-01 22:46:58.000000000 +0200 -+++ bochs-2.3.7/iodev/iodebug.h 2008-06-04 14:45:50.000000000 +0200 -@@ -18,7 +18,7 @@ - virtual void init(void); - virtual void reset (unsigned type) {} - static void mem_write(BX_CPU_C *cpu, bx_phy_address addr, unsigned len, void *data); -- static void mem_read(BX_CPU_C *cpu, bx_phy_addressu addr, unsigned len, void *data); -+ static void mem_read(BX_CPU_C *cpu, bx_phy_address addr, unsigned len, void *data); - - private: - static Bit32u read_handler(void *this_ptr, Bit32u address, unsigned io_len); |