Cleanup

11 files changed, 7 insertions, 310 deletions

diff --git a/app-emulation/bochs/ChangeLog b/app-emulation/bochs/ChangeLog
index 69454d89d81b..7fe4d88fbe58 100644
--- a/app-emulation/bochs/ChangeLog
+++ b/app-emulation/bochs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/bochs
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/bochs/ChangeLog,v 1.34 2004/11/20 20:41:13 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/bochs/ChangeLog,v 1.35 2004/11/26 17:57:08 lu_zero Exp $
+
+  26 Nov 2004; Luca Barbato <lu_zero@gentoo.org>
+  -files/bochs-2.0.2-gcc3.patch, -bochs-1.4.1.ebuild, -bochs-1.4.ebuild,
+  -bochs-2.0.2.ebuild, -bochs-2.0.ebuild:
+  Cleanup
 
   20 Nov 2004; Luca Barbato <lu_zero@gentoo.org> bochs-2.1.1.ebuild:
   Added vbe support, as requested in bug #71876
diff --git a/app-emulation/bochs/Manifest b/app-emulation/bochs/Manifest
index a4fdc44920a0..967570ffd88b 100644
--- a/app-emulation/bochs/Manifest
+++ b/app-emulation/bochs/Manifest
@@ -1,15 +1,6 @@
 MD5 09f3e216c27691210bfdeb978284166d bochs-2.1.1.ebuild 2338
 MD5 43dd35ccd8425d7946691db41c79d9de bochs-2.1.ebuild 2138
-MD5 5cebea4d1f988581ffe795ebfdd5c8d6 ChangeLog 3643
-MD5 099a43e5f7fbd47b87e5111225933b89 bochs-1.4.ebuild 1273
-MD5 6e3bf01bfb4ea35465d38add722e4164 bochs-2.0.2.ebuild 2287
+MD5 cb6357e8c0c0bfb2c940e80bbb2163d1 ChangeLog 3818
 MD5 898131aae735c3477ff2f9c6882f1178 metadata.xml 223
-MD5 6f81998c1fcbae9c39bca0103fd89864 bochs-1.4.1.ebuild 1352
-MD5 af9239d516e33b8be4107bb890a63f7f bochs-2.0.ebuild 1258
 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
diff --git a/app-emulation/bochs/bochs-1.4.1.ebuild b/app-emulation/bochs/bochs-1.4.1.ebuild
deleted file mode 100644
index 58b416422071..000000000000
--- a/app-emulation/bochs/bochs-1.4.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/bochs/bochs-1.4.1.ebuild,v 1.12 2004/06/27 23:01:44 vapier Exp $
-
-DESCRIPTION="a pc emulator"
-HOMEPAGE="http://bochs.sourceforge.net/"
-SRC_URI="mirror://sourceforge/bochs/${P}.tar.gz
-	 http://bochs.sourceforge.net/guestos/dlxlinux3.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="x86 ppc ~alpha"
-IUSE=""
-
-DEPEND="virtual/libc
-	virtual/x11"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-
-	cd ${S}
-	sed -i \
-		-e "s:\$(WGET) \$(DLXLINUX_TAR_URL):cp ${DISTDIR}/dlxlinux3.tar.gz .:" \
-		-e 's: $(prefix): $(DESTDIR)$(prefix):g' \
-		-e 's: $(bindir): $(DESTDIR)$(bindir):g' \
-		-e 's:BOCHSDIR=:BOCHSDIR=/usr/lib/bochs#:' \
-		-e 's: $(BOCHSDIR): $(DESTDIR)$(BOCHSDIR):g' \
-		Makefile.in
-}
-
-src_compile() {
-	[ "$ARCH" == "x86" ] && myconf="--enable-idle-hack"
-
-	./configure --enable-fpu --enable-cdrom --enable-control-panel \
-	--enable-ne2000 --enable-sb16=linux --enable-slowdown --prefix=/usr \
-	--infodir=/usr/share/info --mandir=/usr/share/man --host=${CHOST} --with-x11 $myconf || die
-
-	# there's an sdl interface now, but since we an only compile 1 interface at a time
-	# i'd rather have xwindows.
-
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	dodoc CHANGES CVS README TESTFORM.txt
-}
diff --git a/app-emulation/bochs/bochs-1.4.ebuild b/app-emulation/bochs/bochs-1.4.ebuild
deleted file mode 100644
index c88fbbef7c1c..000000000000
--- a/app-emulation/bochs/bochs-1.4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/bochs/bochs-1.4.ebuild,v 1.18 2004/06/27 23:01:44 vapier Exp $
-
-MY_P=${P/_/.}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="a pc emulator"
-HOMEPAGE="http://bochs.sourceforge.net"
-SRC_URI="mirror://sourceforge/bochs/${MY_P}.tar.gz
-	 http://bochs.sourceforge.net/guestos/dlxlinux3.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="x86 ppc"
-IUSE=""
-
-DEPEND="virtual/libc
-	virtual/x11"
-
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-
-	cd ${S}
-	sed -i \
-		-e "s:\$(WGET) \$(DLXLINUX_TAR_URL):cp ${DISTDIR}/dlxlinux3.tar.gz .:" \
-		-e 's: $(prefix): $(DESTDIR)$(prefix):g' \
-		-e 's: $(bindir): $(DESTDIR)$(bindir):g' \
-		-e 's: $(BOCHSDIR): $(DESTDIR)$(BOCHSDIR):g' \
-		Makefile.in
-}
-
-src_compile() {
-	./configure --enable-fpu --enable-cdrom --enable-control-panel \
-	--enable-ne2000 --enable-sb16=linux -enable-slowdown --prefix=/usr \
-	--infodir=/usr/share/info --mandir=/usr/share/man --host=${CHOST} --with-x11 || die
-
-	# there's an sdl interface now, but since we an only compile 1 interface at a time
-	# i'd rather have xwindows.
-
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	dodoc CHANGES CVS README TESTFORM.txt
-}
diff --git a/app-emulation/bochs/bochs-2.0.2.ebuild b/app-emulation/bochs/bochs-2.0.2.ebuild
deleted file mode 100644
index 4b0675c592ba..000000000000
--- a/app-emulation/bochs/bochs-2.0.2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/bochs/bochs-2.0.2.ebuild,v 1.17 2004/11/07 20:46:42 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="x86 ppc alpha sparc"
-IUSE="sdl wxwindows readline gtk2 debugger"
-
-RDEPEND="virtual/libc
-	virtual/x11
-	sdl? ( media-libs/libsdl )
-	wxwindows? ( x11-libs/wxGTK )
-	readline? sys-libs/readline"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
-
-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() {
-	if ! use gtk2 ; then
-		need-wxwidgets gtk
-	else
-		need-wxwidgets gtk2
-	fi
-	[ "$ARCH" == "x86" ] \
-		&& myconf="--enable-idle-hack --enable-fast-function-calls"
-	myconf="${myconf} `use_with sdl`"
-	myconf="${myconf} `use_enable readline`"
-	use wxwindows && \
-		myconf="${myconf} --with-gtk --with-wx"
-	use wxwindows || \
-		myconf="${myconf} --without-gtk --without-wx"
-	use bochs-debugger && \
-		myconf="$myconf --enable-debugger --enable-disasm
-	--enable-x86-debugger"
-
-	./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-ignore-bad-msr \
-		--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/bochs-2.0.ebuild b/app-emulation/bochs/bochs-2.0.ebuild
deleted file mode 100644
index ec33b0c318e7..000000000000
--- a/app-emulation/bochs/bochs-2.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/bochs/bochs-2.0.ebuild,v 1.9 2004/06/27 23:01:44 vapier Exp $
-
-DESCRIPTION="a pc emulator"
-HOMEPAGE="http://bochs.sourceforge.net/"
-SRC_URI="mirror://sourceforge/bochs/${P}.tar.gz
-	 http://bochs.sourceforge.net/guestos/dlxlinux3.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="x86 ~ppc ~alpha"
-IUSE="sdl"
-
-DEPEND="virtual/libc
-	virtual/x11
-	sdl? ( media-libs/libsdl )"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-
-	cd ${S}
-	sed -i \
-		-e "s:\$(WGET) \$(DLXLINUX_TAR_URL):cp ${DISTDIR}/dlxlinux3.tar.gz .:" \
-		-e 's:BOCHSDIR=:BOCHSDIR=/usr/lib/bochs#:' \
-		-e 's: $(BOCHSDIR): $(DESTDIR)$(BOCHSDIR):g' \
-		Makefile.in
-}
-
-src_compile() {
-	[ "$ARCH" == "x86" ] && myconf="--enable-idle-hack"
-	use sdl && myconf="${myconf} --with-sdl" \
-		|| myconf="${myconf} --without-sdl"
-	./configure --enable-fpu --enable-cdrom --enable-control-panel \
-	--enable-ne2000 --enable-sb16=linux --enable-slowdown --prefix=/usr \
-	--infodir=/usr/share/info --mandir=/usr/share/man --host=${CHOST} --with-x11 $myconf || die
-
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	dodoc CHANGES CVS README TESTFORM.txt
-}
diff --git a/app-emulation/bochs/files/bochs-2.0.2-gcc3.patch b/app-emulation/bochs/files/bochs-2.0.2-gcc3.patch
deleted file mode 100644
index a343125df9b5..000000000000
--- a/app-emulation/bochs/files/bochs-2.0.2-gcc3.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff -Naur bochs-2.0.2-orig/cpu/fetchdecode.cc bochs-2.0.2/cpu/fetchdecode.cc
---- bochs-2.0.2-orig/cpu/fetchdecode.cc	2003-01-22 14:18:30.000000000 +0100
-+++ bochs-2.0.2/cpu/fetchdecode.cc	2003-09-24 18:25:28.000000000 +0200
-@@ -160,53 +160,53 @@
- } BxOpcodeInfo_t;
- 
- static BxOpcodeInfo_t opcodesADD_EwIw[2] = {
--  { 0,  { &BX_CPU_C::ADD_EEwIw } },
--  { 0,  { &BX_CPU_C::ADD_EGwIw } }
-+  { 0,  &BX_CPU_C::ADD_EEwIw },
-+  { 0,  &BX_CPU_C::ADD_EGwIw }
-   };
- 
- static BxOpcodeInfo_t opcodesADD_EdId[2] = {
--  { 0,  { &BX_CPU_C::ADD_EEdId } },
--  { 0,  { &BX_CPU_C::ADD_EGdId } }
-+  { 0,  &BX_CPU_C::ADD_EEdId },
-+  { 0,  &BX_CPU_C::ADD_EGdId }
-   };
- 
- static BxOpcodeInfo_t opcodesADD_GwEw[2] = {
--  { 0,  { &BX_CPU_C::ADD_GwEEw } },
--  { 0,  { &BX_CPU_C::ADD_GwEGw } }
-+  { 0,  &BX_CPU_C::ADD_GwEEw },
-+  { 0,  &BX_CPU_C::ADD_GwEGw }
-   };
- 
- static BxOpcodeInfo_t opcodesADD_GdEd[2] = {
--  { 0,  { &BX_CPU_C::ADD_GdEEd } },
--  { 0,  { &BX_CPU_C::ADD_GdEGd } }
-+  { 0,  &BX_CPU_C::ADD_GdEEd },
-+  { 0,  &BX_CPU_C::ADD_GdEGd }
-   };
- 
- static BxOpcodeInfo_t opcodesMOV_GbEb[2] = {
--  { 0,  { &BX_CPU_C::MOV_GbEEb } },
--  { 0,  { &BX_CPU_C::MOV_GbEGb } }
-+  { 0,  &BX_CPU_C::MOV_GbEEb },
-+  { 0,  &BX_CPU_C::MOV_GbEGb }
-   };
- 
- static BxOpcodeInfo_t opcodesMOV_GwEw[2] = {
--  { 0,  { &BX_CPU_C::MOV_GwEEw } },
--  { 0,  { &BX_CPU_C::MOV_GwEGw } }
-+  { 0,  &BX_CPU_C::MOV_GwEEw },
-+  { 0,  &BX_CPU_C::MOV_GwEGw }
-   };
- 
- static BxOpcodeInfo_t opcodesMOV_GdEd[2] = {
--  { 0,  { &BX_CPU_C::MOV_GdEEd } },
--  { 0,  { &BX_CPU_C::MOV_GdEGd } }
-+  { 0,  &BX_CPU_C::MOV_GdEEd },
-+  { 0,  &BX_CPU_C::MOV_GdEGd }
-   };
- 
- static BxOpcodeInfo_t opcodesMOV_EbGb[2] = {
--  { 0,  { &BX_CPU_C::MOV_EEbGb } },
--  { 0,  { &BX_CPU_C::MOV_EGbGb } }
-+  { 0,  &BX_CPU_C::MOV_EEbGb },
-+  { 0,  &BX_CPU_C::MOV_EGbGb }
-   };
- 
- static BxOpcodeInfo_t opcodesMOV_EwGw[2] = {
--  { 0,  { &BX_CPU_C::MOV_EEwGw } },
--  { 0,  { &BX_CPU_C::MOV_EGwGw } }
-+  { 0,  &BX_CPU_C::MOV_EEwGw },
-+  { 0,  &BX_CPU_C::MOV_EGwGw }
-   };
- 
- static BxOpcodeInfo_t opcodesMOV_EdGd[2] = {
--  { 0,  { &BX_CPU_C::MOV_EEdGd } },
--  { 0,  { &BX_CPU_C::MOV_EGdGd } }
-+  { 0,  &BX_CPU_C::MOV_EEdGd },
-+  { 0,  &BX_CPU_C::MOV_EGdGd }
-   };
- 
- /* ********** */
diff --git a/app-emulation/bochs/files/digest-bochs-1.4 b/app-emulation/bochs/files/digest-bochs-1.4
deleted file mode 100644
index 5ee259410713..000000000000
--- a/app-emulation/bochs/files/digest-bochs-1.4
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 e8a6ad67f78c63423545806886f8c66a bochs-1.4.tar.gz 1389919
-MD5 b1c1592f105fa7aa0ffaba349d38fcaa dlxlinux3.tar.gz 1504727
diff --git a/app-emulation/bochs/files/digest-bochs-1.4.1 b/app-emulation/bochs/files/digest-bochs-1.4.1
deleted file mode 100644
index 75238a5b93fc..000000000000
--- a/app-emulation/bochs/files/digest-bochs-1.4.1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 12e591b5cec2e0051e18605483f64678 bochs-1.4.1.tar.gz 1395173
-MD5 b1c1592f105fa7aa0ffaba349d38fcaa dlxlinux3.tar.gz 1504727
diff --git a/app-emulation/bochs/files/digest-bochs-2.0 b/app-emulation/bochs/files/digest-bochs-2.0
deleted file mode 100644
index 7bedb9d7adb6..000000000000
--- a/app-emulation/bochs/files/digest-bochs-2.0
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 11f613f0383791a958d6528d30ab8e1d bochs-2.0.tar.gz 3266323
-MD5 b1c1592f105fa7aa0ffaba349d38fcaa dlxlinux3.tar.gz 1504727
diff --git a/app-emulation/bochs/files/digest-bochs-2.0.2 b/app-emulation/bochs/files/digest-bochs-2.0.2
deleted file mode 100644
index 6701b229f0dc..000000000000
--- a/app-emulation/bochs/files/digest-bochs-2.0.2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 11bb4e7804f9fef3cda3822f03641b55 bochs-2.0.2.tar.gz 3269299
-MD5 21c153f5aa391395c35f0c2f660da972 dlxlinux4.tar.gz 1504868