Some updates from upstream (e.g. MOL acceleration for 10.3). Furthermore fixes for the iBook G4. Tested on CLT04

4 files changed, 122 insertions, 8 deletions

diff --git a/app-emulation/mol/ChangeLog b/app-emulation/mol/ChangeLog
index b7bff1c2d53f..3f44a3c8cf20 100644
--- a/app-emulation/mol/ChangeLog
+++ b/app-emulation/mol/ChangeLog
@@ -1,11 +1,16 @@
 # 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.31 2004/01/30 02:23:45 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/mol/ChangeLog,v 1.32 2004/03/07 14:45:11 pylon Exp $
+
+*mol-0.9.70_rc2-r1 (07 Mar 2004)
+
+  07 Mar 2004; Lars Weiler <pylon@gentoo.org> :mol-0.9.70_rc2-r1.ebuild
+  Some updates from upstream (e.g. MOL acceleration for 10.3). Furthermore fixes
+  for the iBook G4.
 
   30 Jan 2004; Lars Weiler <pylon@gentoo.org> mol-0.9.70_rc2.ebuild:
-  Notify the user to set the use-flagorlag "fbcon" if mol should
-  be installed with support on a virtual terminal. Otherwise molvconfig would
-  not be installed.
+  Notify the user to set the use-flag "fbcon" if mol should be installed with
+  support on a virtual terminal. Otherwise molvconfig would not be installed.
 
 *mol-0.9.70_rc2 (26 Jan 2004)
 
diff --git a/app-emulation/mol/Manifest b/app-emulation/mol/Manifest
index 24429cd4e7b9..0bc3b19d3279 100644
--- a/app-emulation/mol/Manifest
+++ b/app-emulation/mol/Manifest
@@ -1,9 +1,11 @@
-MD5 1e85a1830f336896de2c07ceed6e8f10 ChangeLog 6588
 MD5 3263d375abba2d098c636efc2b135ea5 metadata.xml 333
 MD5 d94a2198277e731eb998ec4aa4c432d1 mol-0.9.68-r4.ebuild 2219
-MD5 13e5e7351f67b64fd4d712c8e87ef8bc mol-0.9.70_rc2.ebuild 3809
 MD5 191f6330f6d1c4707577b2e209586e87 mol-0.9.69_pre7.ebuild 3013
-MD5 d4bc3f0122eb77fbfbfcf584f442049d files/digest-mol-0.9.68-r4 67
-MD5 8bfb4d64b16a75c8d0dc3fe711694e3a files/digest-mol-0.9.70_rc2 64
+MD5 59203691b38eff09fb0f6de185977531 ChangeLog 6774
+MD5 13e5e7351f67b64fd4d712c8e87ef8bc mol-0.9.70_rc2.ebuild 3809
+MD5 75425cc5c03658ce6730f9e9b19024c4 mol-0.9.70_rc2-r1.ebuild 3767
 MD5 98990df6bb9f196021dea0b77d2d912d files/26-arch-fix.patch 2320
+MD5 d4bc3f0122eb77fbfbfcf584f442049d files/digest-mol-0.9.68-r4 67
 MD5 98518db8270d9c4b005c3a530930dfe4 files/digest-mol-0.9.69_pre7 69
+MD5 8bfb4d64b16a75c8d0dc3fe711694e3a files/digest-mol-0.9.70_rc2 64
+MD5 9250d5f1a7e9cbe52e9e3621d14294c8 files/digest-mol-0.9.70_rc2-r1 71
diff --git a/app-emulation/mol/files/digest-mol-0.9.70_rc2-r1 b/app-emulation/mol/files/digest-mol-0.9.70_rc2-r1
new file mode 100644
index 000000000000..75a2d32bd959
--- /dev/null
+++ b/app-emulation/mol/files/digest-mol-0.9.70_rc2-r1
@@ -0,0 +1 @@
+MD5 3c0edab78e20e34e765870bf6c29ba20 mol-0.9.70_rc2-r1.tar.bz2 2439194
diff --git a/app-emulation/mol/mol-0.9.70_rc2-r1.ebuild b/app-emulation/mol/mol-0.9.70_rc2-r1.ebuild
new file mode 100644
index 000000000000..1962b1881626
--- /dev/null
+++ b/app-emulation/mol/mol-0.9.70_rc2-r1.ebuild
@@ -0,0 +1,106 @@
+# 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.70_rc2-r1.ebuild,v 1.1 2004/03/07 14:45:11 pylon Exp $
+
+inherit flag-o-matic
+
+S=${WORKDIR}/${P}-r1
+DESCRIPTION="MOL (Mac-on-Linux) lets PPC users run MacOS (X) under Linux (rsync snapshot)"
+SRC_URI="mirror://gentoo/${P}-r1.tar.bz2"
+HOMEPAGE="http://www.maconlinux.net/"
+
+DEPEND=""
+RDEPEND="net-misc/dhcp
+	net-firewall/iptables
+	alsa? ( virtual/alsa )
+	esd? ( media-sound/esound )
+	X? ( virtual/x11 )"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="ppc ~ppc64 -x86 -sparc -alpha -mips"
+IUSE="alsa oss debug fbcon X oldworld"
+
+pkg_setup() {
+	echo
+	einfo "If you want to use MOL fullscreen on a virtual console"
+	einfo "be sure to have the USE-flag \"fbcon\" set!"
+	echo
+}
+
+src_unpack() {
+	unpack ${A}
+
+	# 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
+
+	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
+
+	export KERNEL_SOURCE="/usr/src/${FK}"
+
+	# initialize all needed build-files
+	./autogen.sh
+
+	emake defconfig || die "This is a ppc-only package (time to buy that iBook, no?)"
+
+	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
+
+	einfo "The configuration has been altered according to your USE-flags."
+	# reinitialize our changed configuration
+	emake oldconfig
+
+	addwrite "/usr/src/${FK}"
+	emake || die "Build mol with: FEATURES=\"-userpriv -strict\" emerge mol"
+}
+
+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."
+
+	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
+}