version bump. See ChangeLog for detailed improvements

9 files changed, 66 insertions, 205 deletions

diff --git a/app-emulation/mol/ChangeLog b/app-emulation/mol/ChangeLog
index efa27d3d75e6..92830463125d 100644
--- a/app-emulation/mol/ChangeLog
+++ b/app-emulation/mol/ChangeLog
@@ -1,6 +1,32 @@
 # ChangeLog for app-emulation/mol
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/mol/ChangeLog,v 1.29 2004/01/16 04:00:08 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/mol/ChangeLog,v 1.30 2004/01/26 04:12:06 pylon Exp $
+
+*mol-0.9.70_rc2 (26 Jan 2004)
+
+  26 Jan 2004; Lars Weiler <pylon@gentoo.org> mol-0.9.69_pre3.ebuild,
+  mol-0.9.69_pre5.ebuild, mol-0.9.69_pre6.ebuild, mol-0.9.70_rc2.ebuild:
+  A new rsync snapshot and release candidate for an official version bump.
+
+  (taken from <20040108144104.GA23519@ibrium.se> at mol-general@lists.maconlinux.org)
+  Certainly; here is a summary of all changes since the last point
+  release (0.9.68 back in March): 
+
+  - ALSA support
+  - sound driver rewrite
+  - support for the 2.6 kernel
+  - fixes for SMP
+  - debugger improvements
+  - bootx bugfixes (10.3 won't boot without this one)
+  - improved tunconfig script
+  - virtualization engine fixes (makes it possible to run OSX on 604 cpus)
+  - reduced latency
+  - USB support
+  - generic SCSI support (and support for IDE burners)
+  - improved XDGA support (XDGA is obsolete though)
+  - sheep_net improvements
+  - performance improvements
+  - misc bugfixes
 
   16 Jan 2004; Luca Barbato <lu_zero@gentoo.org> :
   Digest fixed
diff --git a/app-emulation/mol/Manifest b/app-emulation/mol/Manifest
index 275909c4ff5b..d69b59a3b1c3 100644
--- a/app-emulation/mol/Manifest
+++ b/app-emulation/mol/Manifest
@@ -1,13 +1,9 @@
-MD5 191f6330f6d1c4707577b2e209586e87 mol-0.9.69_pre7.ebuild 3013
-MD5 131681a159704924e9c3ba75b0632aff ChangeLog 5409
 MD5 3263d375abba2d098c636efc2b135ea5 metadata.xml 333
-MD5 f6f3a86ce2df00004b9bfd5a8b309bf7 mol-0.9.69_pre3.ebuild 2255
 MD5 84c32ed763ae9c3851d03607a6bd1684 mol-0.9.68-r4.ebuild 2217
-MD5 d7e93f442ec1c3255e5db4e50fc74228 mol-0.9.69_pre5.ebuild 3064
-MD5 8b4045ce37e898fc09e32c369a13239e mol-0.9.69_pre6.ebuild 3156
+MD5 191f6330f6d1c4707577b2e209586e87 mol-0.9.69_pre7.ebuild 3013
+MD5 fbb984b5475d44cd56c4a36813710091 ChangeLog 6340
+MD5 4577843969396ab88aacac14136f3d14 mol-0.9.70_rc2.ebuild 3663
 MD5 98990df6bb9f196021dea0b77d2d912d files/26-arch-fix.patch 2320
-MD5 fe988b32af2da567155820691a274880 files/digest-mol-0.9.69_pre3 69
 MD5 d4bc3f0122eb77fbfbfcf584f442049d files/digest-mol-0.9.68-r4 67
-MD5 73f8102dcdc9e7701ece91d0f38fb513 files/digest-mol-0.9.69_pre5 69
-MD5 0b4f9e316898f5acca2d63d5ea69fc3b files/digest-mol-0.9.69_pre6 69
 MD5 98518db8270d9c4b005c3a530930dfe4 files/digest-mol-0.9.69_pre7 69
+MD5 8bfb4d64b16a75c8d0dc3fe711694e3a files/digest-mol-0.9.70_rc2 64
diff --git a/app-emulation/mol/files/digest-mol-0.9.69_pre3 b/app-emulation/mol/files/digest-mol-0.9.69_pre3
deleted file mode 100644
index b8eaa78fdac1..000000000000
--- a/app-emulation/mol/files/digest-mol-0.9.69_pre3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b93db130b13d7a7631fcdc5943296855 mol-0.9.69_pre3.tar.bz2 2765800
diff --git a/app-emulation/mol/files/digest-mol-0.9.69_pre5 b/app-emulation/mol/files/digest-mol-0.9.69_pre5
deleted file mode 100644
index cf13cf817fd2..000000000000
--- a/app-emulation/mol/files/digest-mol-0.9.69_pre5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 64afe105369fed34cce96222d11df3d0 mol-0.9.69_pre5.tar.bz2 1536318
diff --git a/app-emulation/mol/files/digest-mol-0.9.69_pre6 b/app-emulation/mol/files/digest-mol-0.9.69_pre6
deleted file mode 100644
index 51cd41ff85d4..000000000000
--- a/app-emulation/mol/files/digest-mol-0.9.69_pre6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cfc8b4679228c11572dce29748135bfa mol-0.9.69_pre6.tar.bz2 1584478
diff --git a/app-emulation/mol/files/digest-mol-0.9.70_rc2 b/app-emulation/mol/files/digest-mol-0.9.70_rc2
new file mode 100644
index 000000000000..88253e9d77d9
--- /dev/null
+++ b/app-emulation/mol/files/digest-mol-0.9.70_rc2
@@ -0,0 +1 @@
+MD5 214bb38bb3702c2483429fe9e5ca50ed mol-0.9.70-rc2.tgz 1717319
diff --git a/app-emulation/mol/mol-0.9.69_pre3.ebuild b/app-emulation/mol/mol-0.9.69_pre3.ebuild
deleted file mode 100644
index 6fac5a586647..000000000000
--- a/app-emulation/mol/mol-0.9.69_pre3.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/mol/mol-0.9.69_pre3.ebuild,v 1.1 2003/07/10 09:47:18 pylon Exp $
-
-inherit flag-o-matic
-
-S=${WORKDIR}/${P}
-DESCRIPTION="MOL (Mac-on-Linux) lets PPC users run MacOS (X) under Linux (rsync snapshot)"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-HOMEPAGE="http://www.maconlinux.net/"
-
-DEPEND=">=sys-apps/sed-4"
-RDEPEND="net-misc/dhcp
-	net-firewall/iptables"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~ppc -x86 -sparc -alpha -mips"
-IUSE=""
-
-src_compile() {
-
-	filter-flags -fsigned-char
-
-	# dhcp config fix and show dchpd messages on starting mol
-	cd ${S}
-	sed -i "s:#ddns-update-style:ddns-update-style:g" Doc/config/dhcpd-mol.conf || die
-	sed -i "s:DHCPD\ -q\ -cf:DHCPD\ -cf:g" Doc/config/tunconfig || die
-
-	./autogen.sh
-	./configure --prefix=/usr || die "This is a ppc-only package (time to buy that iBook, no?)"
-	make || die "Failed to compile MOL"
-	#make libimport || die "Failed to compile MOL"
-
-}
-
-src_install() {
-
-	emake DESTDIR=${D} install || die "Failed to install MOL"
-
-	dodoc 0README BUILDING COPYING COPYRIGHT CREDITS Doc/*
-
-}
-
-pkg_postinst() {
-	echo
-	einfo "Mac-on-Linux is now installed.  To run, use the command startmol."
-	einfo "You might want to configure video modes first with molvconfig."
-	einfo "Other configuration is in /etc/molrc.  For more info see:"
-	einfo "              www.maconlinux.net"
-	einfo "Also try man molrc, man molvconfig, man startmol"
-	echo
-	einfo "For networking and sound you might install the drivers in the"
-	einfo "folder \"MOL-Install\" on your Mac OS X-Desktop."
-	echo
-	einfo "If errors with networking occur, make sure you have the following"
-	einfo "kernel functions enabled:"
-	einfo "For the dhcp server:"
-	einfo "    Socket Filtering (CONFIG_FILTER)"
-	einfo "    Packet Socket (CONFIG_PACKET)"
-	einfo "For NAT:"
-	einfo "    Network packet filtering (CONFIG_NETFILTER)"
-	einfo "    Connection tracking (CONFIG_IP_NF_CONNTRACK)"
-	einfo "    IP tables support (CONFIG_IP_NF_IPTABLES)"
-	einfo "    Packet filtering (CONFIG_IP_NF_FILTER)"
-	einfo "    Full NAT (CONFIG_IP_NF_NAT)"
-	einfo "    MASQUERADE target support (CONFIG_IP_NF_TARGET_MASQUERADE)"
-	echo
-}
diff --git a/app-emulation/mol/mol-0.9.69_pre5.ebuild b/app-emulation/mol/mol-0.9.69_pre5.ebuild
deleted file mode 100644
index f228b81f9914..000000000000
--- a/app-emulation/mol/mol-0.9.69_pre5.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/mol/mol-0.9.69_pre5.ebuild,v 1.2 2003/11/14 20:07:36 lu_zero Exp $
-
-inherit flag-o-matic
-
-S=${WORKDIR}/${P}
-DESCRIPTION="MOL (Mac-on-Linux) lets PPC users run MacOS (X) under Linux (rsync snapshot)"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-HOMEPAGE="http://www.maconlinux.net/"
-
-DEPEND=">=sys-apps/sed-4"
-RDEPEND="net-misc/dhcp
-	net-firewall/iptables
-	alsa? ( virtual/alsa )
-	esd? ( media-sound/esound )
-	X? ( virtual/x11 )"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~ppc -x86 -sparc -alpha -mips"
-IUSE="alsa esd debug oldworld X"
-
-src_compile() {
-
-	local myconf
-	use alsa     || myconf="${myconf} --disable-alsa"
-	use debug    || myconf="${myconf} --disable-debugger"
-	use esd      && myconf="${myconf} --enable-esd"
-	use oldworld || myconf="${myconf} --disable-oldworld"
-	use X        && myconf="${myconf} --with-x"
-
-	einfo "MOL will be build with the following options:"
-	einfo "${myconf}"
-
-	filter-flags -fsigned-char
-
-	# dhcp config fix and show dchpd messages on starting mol
-	cd ${S}
-	sed -i "s:#ddns-update-style:ddns-update-style:g" Doc/config/dhcpd-mol.conf || die
-	sed -i "s:DHCPD\ -q\ -cf:DHCPD\ -cf:g" Doc/config/tunconfig || die
-	export KERNEL_SOURCE="/usr/src/linux"
-	export ARCH=ppc
-	./autogen.sh
-	./configure ${myconf} --prefix=/usr || die "This is a ppc-only package (time to buy that iBook, no?)"
-
-	addwrite "/usr/src/${FK}"
-
-	emake ARCH=ppc || die
-}
-
-src_install() {
-
-	# MOL needs write access to some .depend-files in the kernel-dir
-	# (at least arch/ppc/) to build the kernel-modules.  With
-	# sandboxing enabled this would result in an access violation.
-
-	emake DESTDIR=${D} install || die "Failed to install MOL"
-
-	dodoc 0README BUILDING COPYRIGHT CREDITS Doc/*
-
-}
-
-pkg_postinst() {
-	echo
-	einfo "Mac-on-Linux is now installed.  To run, use the command startmol."
-	einfo "You might want to configure video modes first with molvconfig."
-	einfo "Other configuration is in /etc/molrc.  For more info see:"
-	einfo "              http://www.maconlinux.net"
-	einfo "Also try man molrc, man molvconfig, man startmol"
-	echo
-	ewarn "For networking and sound you might install the drivers in the"
-	ewarn "folder \"MOL-Install\" on your Mac OS X-Desktop."
-	echo
-	ewarn "If errors with networking occur, make sure you have the following"
-	ewarn "kernel functions enabled:"
-	einfo "For the dhcp server:"
-	einfo "    Socket Filtering (CONFIG_FILTER)"
-	einfo "    Packet Socket (CONFIG_PACKET)"
-	einfo "For NAT:"
-	einfo "    Network packet filtering (CONFIG_NETFILTER)"
-	einfo "    Connection tracking (CONFIG_IP_NF_CONNTRACK)"
-	einfo "    IP tables support (CONFIG_IP_NF_IPTABLES)"
-	einfo "    Packet filtering (CONFIG_IP_NF_FILTER)"
-	einfo "    Full NAT (CONFIG_IP_NF_NAT)"
-	einfo "    MASQUERADE target support (CONFIG_IP_NF_TARGET_MASQUERADE)"
-	echo
-	ewarn "ALSA support on Gentoo hasn't been tested yet.  If you have ALSA"
-	ewarn "working, we would like to hear your results with MOL."
-	echo
-}
diff --git a/app-emulation/mol/mol-0.9.69_pre6.ebuild b/app-emulation/mol/mol-0.9.70_rc2.ebuild
index 413b2ae4d257..90f24a94aec7 100644
--- a/app-emulation/mol/mol-0.9.69_pre6.ebuild
+++ b/app-emulation/mol/mol-0.9.70_rc2.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/mol/mol-0.9.69_pre6.ebuild,v 1.4 2003/12/07 05:56:48 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/mol/mol-0.9.70_rc2.ebuild,v 1.1 2004/01/26 04:12:06 pylon Exp $
 
 inherit flag-o-matic
 
-S=${WORKDIR}/${P}
+S=${WORKDIR}/${P/_rc2/}
 DESCRIPTION="MOL (Mac-on-Linux) lets PPC users run MacOS (X) under Linux (rsync snapshot)"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
+SRC_URI="ftp://ftp.nada.kth.se/pub/home/f95-sry/Public/mac-on-linux/${P/_/-}.tgz"
 HOMEPAGE="http://www.maconlinux.net/"
 
-DEPEND=">=sys-apps/sed-4"
+DEPEND=""
 RDEPEND="net-misc/dhcp
 	net-firewall/iptables
 	alsa? ( virtual/alsa )
@@ -17,60 +17,59 @@ RDEPEND="net-misc/dhcp
 	X? ( virtual/x11 )"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~ppc -x86 -sparc -alpha -mips"
-IUSE="alsa esd debug oldworld X"
+KEYWORDS="~ppc ~ppc64 -x86 -sparc -alpha -mips"
+IUSE="alsa oss debug fbcon X oldworld"
 
 src_unpack() {
 	unpack ${A}
+
+	# dhcp config fix and show dchpd messages on starting mol
 	cd ${S}
-	epatch ${FILESDIR}/26-arch-fix.patch || die
+	sed -i "s:#ddns-update-style:ddns-update-style:g" Doc/config/dhcpd-mol.conf || die
+	sed -i "s:DHCPD\ -q\ -cf:DHCPD\ -cf:g" Doc/config/tunconfig || die
+
+	sed -i "s:prefix		= /usr/local:prefix		= /usr:" Makefile.top || die
+	sed -i "s#VENDOR		:=#VENDOR		:= -gentoo#" Makefile.top || die
+
 }
 
 src_compile() {
+	filter-flags -fsigned-char
 
-	local myconf
-	use alsa     || myconf="${myconf} --disable-alsa"
-	use debug    || myconf="${myconf} --disable-debugger"
-	use esd      && myconf="${myconf} --enable-esd"
-	use oldworld || myconf="${myconf} --disable-oldworld"
-	use X        && myconf="${myconf} --with-x"
+	export KERNEL_SOURCE="/usr/src/${FK}"
 
-	#workaround
-	[ "`echo ${KV}|grep 2.6`" ] \
-	&& myconf="${myconf} --disable-sheep" \
-	&& einfo "sheep.ko module won't build, disabling"
+	# initialize all needed build-files
+	./autogen.sh
 
-	einfo "MOL will be build with the following options:"
-	einfo "${myconf}"
+	emake defconfig || die "This is a ppc-only package (time to buy that iBook, no?)"
 
-	filter-flags -fsigned-char
+	sed -i "s:CONFIG_XDGA=y:# CONFIG_XDGA is not set:" .config
+	sed -i "s:CONFIG_TAP=y:# CONFIG_TAP is not set:" .config
+	use alsa     || sed -i "s:CONFIG_ALSA=y:# CONFIG_ALSA is not set:" .config
+	use debug    && sed -i "s:# CONFIG_DEBUGGER is not set:CONFIG_DEBUGGER=y:" .config
+	use oss      || sed -i "s:CONFIG_OSS=y:# CONFIG_OSS is not set:" .config
+	use oldworld || sed -i "s:CONFIG_OLDWORLD=y:# CONFIG_OLDWORLD is not set:" .config
+	use oldworld || sed -i "s:CONFIG_SHEEP=y:# CONFIG_SHEEP is not set:" .config
+	use X        || sed -i "s:CONFIG_X11=y:# CONFIG_X11 is not set:" .config
+	use fbcon    || sed -i "s:CONFIG_FBDEV=y:# CONFIG_FBDEV is not set:" .config
 
-	# dhcp config fix and show dchpd messages on starting mol
-	cd ${S}
-	sed -i "s:#ddns-update-style:ddns-update-style:g" Doc/config/dhcpd-mol.conf || die
-	sed -i "s:DHCPD\ -q\ -cf:DHCPD\ -cf:g" Doc/config/tunconfig || die
-	export KERNEL_SOURCE="/usr/src/linux"
-	./autogen.sh
-	./configure ${myconf} --prefix=/usr || die "This is a ppc-only package (time to buy that iBook, no?)"
+	einfo "The configuration has been altered according to your USE-flags."
+	# reinitialize our changed configuration
+	emake oldconfig
 
 	addwrite "/usr/src/${FK}"
-
-	emake || die
+	emake || die "mol can't build with FEATURES 'userpriv' and 'strict' set."
 }
 
 src_install() {
-
 	# MOL needs write access to some .depend-files in the kernel-dir
 	# (at least arch/ppc/) to build the kernel-modules.  With
 	# sandboxing enabled this would result in an access violation.
 
 	addwrite "/usr/src/${FK}"
-	emake DESTDIR=${D} install || die "Failed to install MOL"
-
-	#workaround
+	emake DESTDIR=${D} install || die "Failed to install MOL."
 
 	dodoc 0README BUILDING COPYRIGHT CREDITS Doc/*
-
 }
 
 pkg_postinst() {