gtk2 removal

Package-Manager: portage-1.589-cvs

4 files changed, 91 insertions, 2 deletions

diff --git a/app-emulation/bochs/ChangeLog b/app-emulation/bochs/ChangeLog
index 38d4f395edd4..68bdf89b0b13 100644
--- a/app-emulation/bochs/ChangeLog
+++ b/app-emulation/bochs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/bochs
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/bochs/ChangeLog,v 1.46 2005/09/02 12:15:41 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/bochs/ChangeLog,v 1.47 2005/09/19 21:39:45 lu_zero Exp $
+
+*bochs-2.2.1-r1 (19 Sep 2005)
+
+  19 Sep 2005; Luca Barbato <lu_zero@gentoo.org> +bochs-2.2.1-r1.ebuild:
+  gtk2 removal
 
   02 Sep 2005; Luca Barbato <lu_zero@gentoo.org> bochs-2.2.1.ebuild:
   fix for bug #104119
diff --git a/app-emulation/bochs/Manifest b/app-emulation/bochs/Manifest
index 6b07cb7c9e98..844adddefcf4 100644
--- a/app-emulation/bochs/Manifest
+++ b/app-emulation/bochs/Manifest
@@ -1,9 +1,11 @@
 MD5 898131aae735c3477ff2f9c6882f1178 metadata.xml 223
 MD5 b378526dea0a003eeab6481bd2020897 bochs-2.1.ebuild 2144
+MD5 7d8f23294da1c09a51ad2a0da696dbf2 bochs-2.2.1-r1.ebuild 2369
 MD5 273efd5c1f0e06fbb9620b9583d6398c bochs-2.1.1.ebuild 2408
-MD5 cc19688fea0a64ded2a127d90be38c15 ChangeLog 5211
+MD5 f7704e01c4ee9d7a5f3d4262279d5def ChangeLog 5331
 MD5 151fc7b33a1a8c17f862c4b458b7cd2b bochs-2.2.1.ebuild 2424
 MD5 f95b73bcfb4c045d563032c0b0b824c7 files/digest-bochs-2.2.1 126
 MD5 8e9513ab2651bd41c0529405d45d3da1 files/digest-bochs-2.1 124
 MD5 207a406a1a47e2650e396ea0976f5206 files/digest-bochs-2.1.1 126
 MD5 cde4fb61affbffb1c90e04d0a94dacd9 files/bochs-2.1.1-regparm-typo.patch 337
+MD5 f95b73bcfb4c045d563032c0b0b824c7 files/digest-bochs-2.2.1-r1 126
diff --git a/app-emulation/bochs/bochs-2.2.1-r1.ebuild b/app-emulation/bochs/bochs-2.2.1-r1.ebuild
new file mode 100644
index 000000000000..87075281ecc2
--- /dev/null
+++ b/app-emulation/bochs/bochs-2.2.1-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/bochs/bochs-2.2.1-r1.ebuild,v 1.1 2005/09/19 21:39:45 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 ~amd64"
+IUSE="debugger readline sdl wxwindows"
+
+RDEPEND="virtual/libc
+	virtual/x11
+	sdl? ( media-libs/libsdl )
+	wxwindows? ( >=x11-libs/wxGTK-2.6 )
+	readline? ( sys-libs/readline )"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4
+	>=app-text/opensp-1.5"
+
+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"
+
+# Make it use the correct path to gtk-2
+	sed -i -e "s:/opt/gnome:/usr:" configure
+}
+
+src_compile() {
+	export WX_GTK_VER=2.6
+
+	use wxwindows && \
+		need-wxwidgets gtk2
+
+	[ "$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 debugger && \
+		myconf="$myconf --enable-debugger --enable-disasm \
+				--enable-x86-debugger --enable-iodebug"
+
+	./configure \
+		--enable-fpu --enable-cdrom --enable-control-panel \
+		--enable-usb --enable-pci --enable-mmx --enable-sse\
+		--enable-cpu-level=6 --enable-vbe\
+		--enable-repeat-speedups --enable-guest2host-tlb \
+		--enable-plugins \
+		--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/files/digest-bochs-2.2.1-r1 b/app-emulation/bochs/files/digest-bochs-2.2.1-r1
new file mode 100644
index 000000000000..10f6284fdb3e
--- /dev/null
+++ b/app-emulation/bochs/files/digest-bochs-2.2.1-r1
@@ -0,0 +1,2 @@
+MD5 50484c75d8175fcd97a81432ac18fb71 bochs-2.2.1.tar.gz 3785329
+MD5 21c153f5aa391395c35f0c2f660da972 dlxlinux4.tar.gz 1504868