monthly mol snapshot (and cleaning up unneeded files)

7 files changed, 36 insertions, 106 deletions

diff --git a/app-emulation/mol/Manifest b/app-emulation/mol/Manifest
index 1a7289e39ade..a5be4c992da6 100644
--- a/app-emulation/mol/Manifest
+++ b/app-emulation/mol/Manifest
@@ -1,8 +1,8 @@
-MD5 e05a072884b11f6ba7e7f511e9e38051 ChangeLog 4544
+MD5 6aa11090399dceb9a10287ad2d98d333 ChangeLog 4544
 MD5 3263d375abba2d098c636efc2b135ea5 metadata.xml 333
 MD5 916962c262a207a28e8e9e9fa27f8538 mol-0.9.69_pre3.ebuild 2256
 MD5 84c32ed763ae9c3851d03607a6bd1684 mol-0.9.68-r4.ebuild 2217
-MD5 f7cf6d5d339c86f0c340b86c95711bad mol-0.9.69_pre4.ebuild 2881
+MD5 b9ac3a800f25f33551d158f9af0a0f62 mol-0.9.69_pre4.ebuild 2983
 MD5 fe988b32af2da567155820691a274880 files/digest-mol-0.9.69_pre3 69
 MD5 32944ce88a08b361c10f393faf031edf files/digest-mol-0.9.69_pre4 69
 MD5 d4bc3f0122eb77fbfbfcf584f442049d files/digest-mol-0.9.68-r4 67
diff --git a/app-emulation/mol/files/dhcpd-mol.conf.patch b/app-emulation/mol/files/dhcpd-mol.conf.patch
deleted file mode 100644
index f99bf820389a..000000000000
--- a/app-emulation/mol/files/dhcpd-mol.conf.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- Doc/config/dhcpd-mol.conf.orig	2003-02-07 03:29:08.000000000 +0000
-+++ Doc/config/dhcpd-mol.conf	2003-02-07 03:30:04.000000000 +0000
-@@ -56,8 +56,12 @@
- subnet 192.168.6.0 netmask 255.255.255.0 {
- 	option domain-name-servers	192.168.6.1;
- 	option routers			192.168.6.1;
--	host mol4 { 
-+	host mol5 { 
- 		hardware ethernet	00:00:0D:EA:DB:EE;
- 		fixed-address		192.168.6.2;
- 	}
- }
-+
-+# Without this dhcpd fails
-+ddns-update-style               ad-hoc;
-+
diff --git a/app-emulation/mol/files/digest-mol-0.9.69_pre1 b/app-emulation/mol/files/digest-mol-0.9.69_pre1
deleted file mode 100644
index fae98d49c967..000000000000
--- a/app-emulation/mol/files/digest-mol-0.9.69_pre1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 74a86e79153cbc402d0152b5144680f7 /files/dhcpd-mol.conf.patch 455
-MD5 3e92e69e9838e7a492e0518a49e3a3d6 /mol-0.9.69_pre1.ebuild 2302
-MD5 c759ab27e18d4af3b0e2186568d88fe0 mol-0.9.69_pre1.tar.bz2 596225
diff --git a/app-emulation/mol/files/digest-mol-0.9.69_pre2 b/app-emulation/mol/files/digest-mol-0.9.69_pre2
deleted file mode 100644
index 48d6aa4c487c..000000000000
--- a/app-emulation/mol/files/digest-mol-0.9.69_pre2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 27262a8ca144fd17435b58bf8fd6a2eb mol-0.9.69_pre2.tar.bz2 2117117
diff --git a/app-emulation/mol/files/digest-mol-0.9.69_pre4 b/app-emulation/mol/files/digest-mol-0.9.69_pre4
new file mode 100644
index 000000000000..ccdbefa6125f
--- /dev/null
+++ b/app-emulation/mol/files/digest-mol-0.9.69_pre4
@@ -0,0 +1 @@
+MD5 34bba6adf8f14cf813776e6027c98932 mol-0.9.69_pre4.tar.bz2 1502672
diff --git a/app-emulation/mol/mol-0.9.69_pre1.ebuild b/app-emulation/mol/mol-0.9.69_pre1.ebuild
deleted file mode 100644
index 7d5dcf428f51..000000000000
--- a/app-emulation/mol/mol-0.9.69_pre1.ebuild
+++ /dev/null
@@ -1,69 +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_pre1.ebuild,v 1.2 2003/06/09 22:08:43 msterret 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="http://cvs.gentoo.org/~pylon/distfiles/${P}.tar.bz2"
-HOMEPAGE="http://www.maconlinux.net/"
-
-DEPEND=">=sys-kernel/ppc-sources-benh-2.4.20-r10
-	>=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_pre2.ebuild b/app-emulation/mol/mol-0.9.69_pre4.ebuild
index 632aacca9d8b..9bffe6d49441 100644
--- a/app-emulation/mol/mol-0.9.69_pre2.ebuild
+++ b/app-emulation/mol/mol-0.9.69_pre4.ebuild
@@ -1,25 +1,37 @@
 # 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_pre2.ebuild,v 1.2 2003/06/09 22:08:43 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/mol/mol-0.9.69_pre4.ebuild,v 1.1 2003/08/31 07:04:03 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="http://cvs.gentoo.org/~lu_zero/distfiles/${P}.tar.bz2"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
 HOMEPAGE="http://www.maconlinux.net/"
 
-DEPEND=">=sys-kernel/ppc-sources-benh-2.4.20-r10
-	>=sys-apps/sed-4"
+DEPEND=">=sys-apps/sed-4"
 RDEPEND="net-misc/dhcp
-	net-firewall/iptables"
+	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=""
+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
@@ -28,17 +40,20 @@ src_compile() {
 	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"
+	./configure ${myconf} --prefix=/usr || die "This is a ppc-only package (time to buy that iBook, no?)"
 
 }
 
 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 COPYING COPYRIGHT CREDITS Doc/*
+	dodoc 0README BUILDING COPYRIGHT CREDITS Doc/*
 
 }
 
@@ -47,14 +62,14 @@ pkg_postinst() {
 	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 "              http://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."
+	ewarn "For networking and sound you might install the drivers in the"
+	ewarn "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:"
+	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)"
@@ -66,4 +81,7 @@ pkg_postinst() {
 	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
 }