Fixed OSX 10.2 support, building with 2.6.15 and a few other patches.

(Portage version: 2.0.53_rc7)

4 files changed, 139 insertions, 12 deletions

diff --git a/app-emulation/mol/ChangeLog b/app-emulation/mol/ChangeLog
index f4eee8519f29..9c2117cc22cd 100644
--- a/app-emulation/mol/ChangeLog
+++ b/app-emulation/mol/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/mol
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/mol/ChangeLog,v 1.53 2005/10/10 17:49:22 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/mol/ChangeLog,v 1.54 2005/11/26 23:17:58 josejx Exp $
+
+*mol-0.9.71_pre5 (26 Nov 2005)
+
+  26 Nov 2005; Joseph Jezak <josejx@gentoo.org> +mol-0.9.71_pre5.ebuild:
+  Fixed OSX 10.2 support, building with 2.6.15 and a few other patches.
 
 *mol-0.9.71_pre3 (10 Oct 2005)
 
diff --git a/app-emulation/mol/Manifest b/app-emulation/mol/Manifest
index 47276343c245..876d0d59b44e 100644
--- a/app-emulation/mol/Manifest
+++ b/app-emulation/mol/Manifest
@@ -1,12 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 ab30b9a2ae19c325467a65c4d3308ae2 ChangeLog 10607
+MD5 103b6a6997e0cff2fb60145c7a8a757c ChangeLog 10785
 MD5 3944510308e77b92ac85c07708947ad0 files/digest-mol-0.9.70 64
 MD5 3944510308e77b92ac85c07708947ad0 files/digest-mol-0.9.70-r1 64
 MD5 8d619246101648133ade3b39a2269e47 files/digest-mol-0.9.71_pre1-r3 187
 MD5 74a6f40961448f1afaad0c8feeca09e2 files/digest-mol-0.9.71_pre2 69
 MD5 12008a6b0dab64cb3eecdb7c54f5fa22 files/digest-mol-0.9.71_pre3 69
+MD5 561cf7ef46a0c3a6f139ddd9aa2736f0 files/digest-mol-0.9.71_pre5 69
 MD5 0ea7bd65a5ff4666665a71fb9652aae8 files/mol-0.9.70-makefile-fix.patch 924
 MD5 934e9ecf483ff3c4e34bb6307212d776 files/mol-0.9.70-nopriority.patch 1853
 MD5 37a24cbf6bb78c4d9bd4c79b18aab9d6 files/mol-0.9.71_pre1-big-filesystem.patch 6554
@@ -24,10 +22,4 @@ MD5 56f8a1561157a28124d55347470da6c8 mol-0.9.70.ebuild 4047
 MD5 457d88cf9e8da3a70ef024b28d6032a0 mol-0.9.71_pre1-r3.ebuild 5208
 MD5 9f8834a0ad9b34a43e9e14e9818fbf3f mol-0.9.71_pre2.ebuild 4217
 MD5 1dff2c90ae1356d1174d0f7af2f5e485 mol-0.9.71_pre3.ebuild 4273
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDSqnFcsIHjyDViGQRArN/AJ9oY4Fl9FaJxT+JWOOmr+zYvxRKEACgzsf0
-hsHo37mY8YnZLTMq8WYeACo=
-=WDBX
------END PGP SIGNATURE-----
+MD5 5d3b35798a09bad7bd0da986374bb096 mol-0.9.71_pre5.ebuild 4402
diff --git a/app-emulation/mol/files/digest-mol-0.9.71_pre5 b/app-emulation/mol/files/digest-mol-0.9.71_pre5
new file mode 100644
index 000000000000..d985dfd530ce
--- /dev/null
+++ b/app-emulation/mol/files/digest-mol-0.9.71_pre5
@@ -0,0 +1 @@
+MD5 59d6e60d944425b2f7f36a0f12de8f28 mol-0.9.71_pre5.tar.bz2 1935604
diff --git a/app-emulation/mol/mol-0.9.71_pre5.ebuild b/app-emulation/mol/mol-0.9.71_pre5.ebuild
new file mode 100644
index 000000000000..17a7ce42e620
--- /dev/null
+++ b/app-emulation/mol/mol-0.9.71_pre5.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/mol/mol-0.9.71_pre5.ebuild,v 1.1 2005/11/26 23:17:58 josejx Exp $
+
+inherit flag-o-matic eutils linux-mod
+
+DESCRIPTION="MOL (Mac-on-Linux) lets PPC users run MacOS (X) under Linux (rsync snapshot)"
+HOMEPAGE="http://www.maconlinux.org/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~ppc"
+IUSE="vnc alsa oss fbcon X oldworld sheep debug dga usb pci"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+
+DEPEND=""
+RDEPEND="net-misc/dhcp
+	net-firewall/iptables
+	alsa? ( virtual/alsa )
+	vnc? ( net-misc/vnc )
+	X? ( virtual/x11 )"
+
+
+MODULE_NAMES="mol(mol:${S}/src/kmod/Linux)
+			  sheep(net:${S}/src/netdriver)"
+
+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
+
+	linux-mod_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	# PCI Debugging Patch
+	if use debug; then
+		epatch ${FILESDIR}/${PN}-pciproxy-dump.patch
+	fi
+}
+
+src_compile() {
+	filter-flags -fsigned-char
+	append-flags -D_FILE_OFFSET_BITS=64
+	append-flags -D_LARGE_FILES
+
+	export KERNEL_SOURCE="/usr/src/${FK}"
+	export LDFLAGS=""
+
+	# initialize all needed build-files
+	./autogen.sh
+	./configure --prefix="/usr" || die "Configure failed."
+
+	# workaround for proper module-building
+	emake defconfig || die "Make failed."
+
+	sed -i "s:CONFIG_XDGA=y:# CONFIG_XDGA is not set:" .config-ppc
+	sed -i "s:CONFIG_TAP=y:# CONFIG_TAP is not set:" .config-ppc
+	sed -i "s:CONFIG_TUN=y:# CONFIG_TUN is not set:" .config-ppc
+	use alsa     || sed -i "s:CONFIG_ALSA=y:# CONFIG_ALSA is not set:" .config-ppc
+	use debug    && sed -i "s:# CONFIG_DEBUGGER is not set:CONFIG_DEBUGGER=y:" .config-ppc
+	use oss      || sed -i "s:CONFIG_OSS=y:# CONFIG_OSS is not set:" .config-ppc
+	use oldworld || sed -i "s:CONFIG_OLDWORLD=y:# CONFIG_OLDWORLD is not set:" .config-ppc
+	use sheep    || sed -i "s:CONFIG_SHEEP=y:# CONFIG_SHEEP is not set:" .config-ppc
+	use X        || sed -i "s:CONFIG_X11=y:# CONFIG_X11 is not set:" .config-ppc
+	use fbcon    || sed -i "s:CONFIG_FBDEV=y:# CONFIG_FBDEV is not set:" .config-ppc
+	use vnc      || sed -i "s:CONFIG_VNC=y:# CONFIG_VNC is not set:" .config-ppc
+	use dga      || sed -i "s:CONFIG_XDGA=y:# CONFIG_XDGA is not set:" .config-ppc
+	use usb      || sed -i "s:CONFIG_USBDEV=y:# CONFIG_USBDEV is not set:" .config-ppc
+	use pci		 || sed -i "s:CONFIG_PCIPROXY=y:# CONFIG_PCIPROXY is not set:" .config-ppc
+
+	einfo "The configuration has been altered according to your USE-flags."
+	# reinitialize our changed configuration
+	emake oldconfig
+
+	cd ${S}
+	emake BUILD_MODS=n || die "Build failed."
+
+	# Build the modules too!
+	BUILD_PARAMS="KERNEL_SOURCE=${KV_DIR} LV=${KV_MAJOR}${KV_MINOR} MP=${KV_OBJ}
+				  KUNAME=${KV}"
+	BUILD_TARGETS=all
+	linux-mod_src_compile
+}
+
+src_install() {
+	#linux-mod_src_install
+	cd ${S}
+	emake DESTDIR=${D} install || die "Failed to install"
+	dodoc CREDITS Doc/Boot-ROM Doc/NewWorld-ROM Doc/Sound Doc/Video
+	dodoc Doc/Networking Doc/Dev/Debugger Doc/Dev/Addresses
+	dodoc Doc/man/molvconfig.1 Doc/man/startmol.1 Doc/man/molrc.5
+	insinto /var/lib/mol
+	doins ${S}/mollib/nvram/nvram.x
+}
+
+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.org"
+	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 connecting to Linux:"
+	einfo "    Universal TUN/TAP device driver support (CONFIG_TUN)"
+	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
+}