New snapshot, fix to build on linux 2.6 (~ppc)

5 files changed, 107 insertions, 7 deletions

diff --git a/app-emulation/mol/ChangeLog b/app-emulation/mol/ChangeLog
index 4fcf29f45931..92af80938c79 100644
--- a/app-emulation/mol/ChangeLog
+++ b/app-emulation/mol/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/mol
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/mol/ChangeLog,v 1.24 2003/09/17 18:24:40 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/mol/ChangeLog,v 1.25 2003/11/14 20:07:36 lu_zero Exp $
+
+*mol-0.9.69_pre6 (14 Nov 2003)
+
+  14 Nov 2003; Luca Barbato <lu_zero@gentoo.org> mol-0.9.69_pre5.ebuild,
+  mol-0.9.69_pre6.ebuild:
+  linux 2.6 fixes and newer snapshot
 
 *mol-0.9.69_pre5 (17 Sep 2003)
 
diff --git a/app-emulation/mol/Manifest b/app-emulation/mol/Manifest
index 2ec5ba7c112c..2e4fc5ca9933 100644
--- a/app-emulation/mol/Manifest
+++ b/app-emulation/mol/Manifest
@@ -1,9 +1,9 @@
-MD5 49c731051fdeae7eb0ffcb4b95499d62 ChangeLog 4907
+MD5 6c6484c67f6e56708f51f73c96ee2cdc ChangeLog 4909
 MD5 3263d375abba2d098c636efc2b135ea5 metadata.xml 333
 MD5 f6f3a86ce2df00004b9bfd5a8b309bf7 mol-0.9.69_pre3.ebuild 2255
 MD5 84c32ed763ae9c3851d03607a6bd1684 mol-0.9.68-r4.ebuild 2217
-MD5 0db1588bac27dee7445f33fb6c441de7 mol-0.9.69_pre5.ebuild 3062
-MD5 0db1588bac27dee7445f33fb6c441de7 mol-0.9.69_pre6.ebuild 3062
+MD5 d7e93f442ec1c3255e5db4e50fc74228 mol-0.9.69_pre5.ebuild 3064
+MD5 366f5d044905c938585e2100a14aa221 mol-0.9.69_pre6.ebuild 3064
 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
diff --git a/app-emulation/mol/files/digest-mol-0.9.69_pre6 b/app-emulation/mol/files/digest-mol-0.9.69_pre6
new file mode 100644
index 000000000000..51cd41ff85d4
--- /dev/null
+++ b/app-emulation/mol/files/digest-mol-0.9.69_pre6
@@ -0,0 +1 @@
+MD5 cfc8b4679228c11572dce29748135bfa mol-0.9.69_pre6.tar.bz2 1584478
diff --git a/app-emulation/mol/mol-0.9.69_pre5.ebuild b/app-emulation/mol/mol-0.9.69_pre5.ebuild
index 10a11ecc5ae2..f228b81f9914 100644
--- a/app-emulation/mol/mol-0.9.69_pre5.ebuild
+++ b/app-emulation/mol/mol-0.9.69_pre5.ebuild
@@ -1,6 +1,6 @@
 # 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.1 2003/09/17 18:24:40 pylon Exp $
+# $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
 
@@ -38,10 +38,14 @@ src_compile() {
 	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() {
@@ -49,7 +53,6 @@ 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"
 
diff --git a/app-emulation/mol/mol-0.9.69_pre6.ebuild b/app-emulation/mol/mol-0.9.69_pre6.ebuild
new file mode 100644
index 000000000000..188b62427f9b
--- /dev/null
+++ b/app-emulation/mol/mol-0.9.69_pre6.ebuild
@@ -0,0 +1,90 @@
+# 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_pre6.ebuild,v 1.1 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
+}