multilib+modular X

(Portage version: 2.1_pre4-r1)

7 files changed, 20 insertions, 174 deletions

diff --git a/app-emulation/bochs/ChangeLog b/app-emulation/bochs/ChangeLog
index f7bcafa2934e..30c2f19037de 100644
--- a/app-emulation/bochs/ChangeLog
+++ b/app-emulation/bochs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/bochs
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/bochs/ChangeLog,v 1.52 2006/01/25 21:32:38 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/bochs/ChangeLog,v 1.53 2006/02/05 18:34:18 lu_zero Exp $
+
+  05 Feb 2006; Luca Barbato <lu_zero@gentoo.org> bochs-2.1.1.ebuild,
+  -bochs-2.2.1.ebuild, -bochs-2.2.1-r1.ebuild, bochs-2.2.5-r1.ebuild:
+  modular X on stable system...
+
+  05 Feb 2006; Luca Barbato <lu_zero@gentoo.org> bochs-2.2.5-r1.ebuild:
+  multilib fixes from Stefaan De Roeck <stefaan@gentoo.org>
 
   25 Jan 2006; Luca Barbato <lu_zero@gentoo.org> +bochs-2.2.5-r1.ebuild:
   Support different ui - solves bug #87921 and bug #63771 - thanks to Alex
diff --git a/app-emulation/bochs/bochs-2.1.1.ebuild b/app-emulation/bochs/bochs-2.1.1.ebuild
index 054998e40044..41de058299be 100644
--- a/app-emulation/bochs/bochs-2.1.1.ebuild
+++ b/app-emulation/bochs/bochs-2.1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # 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.25 2005/11/17 13:17:00 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/bochs/bochs-2.1.1.ebuild,v 1.26 2006/02/05 18:34:18 lu_zero Exp $
 
 inherit eutils wxwidgets
 
@@ -15,11 +15,17 @@ KEYWORDS="x86 ppc alpha sparc amd64"
 IUSE="debugger readline sdl wxwindows"
 
 RDEPEND="virtual/libc
-	virtual/x11
+	|| ( virtual/x11
+		( 	x11-libs/libICE
+			x11-libs/libSM
+			x11-libs/libX11
+			x11-libs/libXpm ) )
 	sdl? ( media-libs/libsdl )
 	wxwindows? ( =x11-libs/wxGTK-2.4* )
 	readline? ( sys-libs/readline )"
 DEPEND="${RDEPEND}
+	|| ( virtual/x11
+		x11-proto/xproto )
 	>=sys-apps/sed-4
 	>=app-text/opensp-1.5"
 
diff --git a/app-emulation/bochs/bochs-2.2.1-r1.ebuild b/app-emulation/bochs/bochs-2.2.1-r1.ebuild
deleted file mode 100644
index 1fe9dd022676..000000000000
--- a/app-emulation/bochs/bochs-2.2.1-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# 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.2 2005/11/17 13:22:01 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 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/bochs-2.2.1.ebuild b/app-emulation/bochs/bochs-2.2.1.ebuild
deleted file mode 100644
index 044851a22dc3..000000000000
--- a/app-emulation/bochs/bochs-2.2.1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# 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.ebuild,v 1.5 2005/09/02 12:15:41 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 gtk2 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 && \
-	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 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/bochs-2.2.5-r1.ebuild b/app-emulation/bochs/bochs-2.2.5-r1.ebuild
index 4d66936d021d..035100c3058b 100644
--- a/app-emulation/bochs/bochs-2.2.5-r1.ebuild
+++ b/app-emulation/bochs/bochs-2.2.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/bochs/bochs-2.2.5-r1.ebuild,v 1.1 2006/01/25 21:32:38 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/bochs/bochs-2.2.5-r1.ebuild,v 1.2 2006/02/05 18:34:18 lu_zero Exp $
 
 inherit eutils wxwidgets
 
@@ -38,7 +38,7 @@ src_unpack() {
 # 		-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=:BOCHSDIR=/usr/$(get_libdir)/bochs#:" \
 		-e 's: $(BOCHSDIR): $(DESTDIR)$(BOCHSDIR):g' Makefile.in || \
 			die "sed Makefile.in failed"
 
@@ -89,6 +89,7 @@ src_compile() {
 		--enable-ignore-bad-msr \
 		--enable-ne2000 --enable-sb16=linux --enable-slowdown --prefix=/usr \
 		--infodir=/usr/share/info --mandir=/usr/share/man --host=${CHOST} \
+		--libdir=/usr/$(get_libdir) \
 		${myconf} || die "configure failed"
 
 
diff --git a/app-emulation/bochs/files/digest-bochs-2.2.1 b/app-emulation/bochs/files/digest-bochs-2.2.1
deleted file mode 100644
index 10f6284fdb3e..000000000000
--- a/app-emulation/bochs/files/digest-bochs-2.2.1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 50484c75d8175fcd97a81432ac18fb71 bochs-2.2.1.tar.gz 3785329
-MD5 21c153f5aa391395c35f0c2f660da972 dlxlinux4.tar.gz 1504868
diff --git a/app-emulation/bochs/files/digest-bochs-2.2.1-r1 b/app-emulation/bochs/files/digest-bochs-2.2.1-r1
deleted file mode 100644
index 10f6284fdb3e..000000000000
--- a/app-emulation/bochs/files/digest-bochs-2.2.1-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 50484c75d8175fcd97a81432ac18fb71 bochs-2.2.1.tar.gz 3785329
-MD5 21c153f5aa391395c35f0c2f660da972 dlxlinux4.tar.gz 1504868