Masked _pre9 and added a compile fix only patch for pre8.

(Portage version: 2.1.1_rc1-r2)

5 files changed, 288 insertions, 4 deletions

diff --git a/app-emulation/mol/ChangeLog b/app-emulation/mol/ChangeLog
index a17fa0be7411..79484b1deed1 100644
--- a/app-emulation/mol/ChangeLog
+++ b/app-emulation/mol/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/mol
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/mol/ChangeLog,v 1.62 2006/09/05 14:32:21 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/mol/ChangeLog,v 1.63 2006/09/05 18:46:59 josejx Exp $
+
+*mol-0.9.71_pre8-r1 (05 Sep 2006)
+
+  05 Sep 2006; Joseph Jezak <josejx@gentoo.org>
+  +files/mol-0.9.71_pre8-to-pre9.patch, +mol-0.9.71_pre8-r1.ebuild:
+  Masked _pre9 and added a compile fix only patch for pre8.
 
 *mol-0.9.71_pre9 (05 Sep 2006)
 
diff --git a/app-emulation/mol/files/digest-mol-0.9.71_pre8-r1 b/app-emulation/mol/files/digest-mol-0.9.71_pre8-r1
new file mode 100644
index 000000000000..6180f10fbae2
--- /dev/null
+++ b/app-emulation/mol/files/digest-mol-0.9.71_pre8-r1
@@ -0,0 +1,3 @@
+MD5 9afd248b681d1ca67c7a28d392ad32fd mol-0.9.71_pre8.tar.bz2 1933742
+RMD160 b21ebffe2cd10bea2a7ced1f77a0ab8a5b65802d mol-0.9.71_pre8.tar.bz2 1933742
+SHA256 3831a38668141adbdc1b56f3c684e23ddefe7bbffe7c2f603b051b41678bd019 mol-0.9.71_pre8.tar.bz2 1933742
diff --git a/app-emulation/mol/files/digest-mol-0.9.71_pre9 b/app-emulation/mol/files/digest-mol-0.9.71_pre9
index e2700040f24f..924b3f9118e9 100644
--- a/app-emulation/mol/files/digest-mol-0.9.71_pre9
+++ b/app-emulation/mol/files/digest-mol-0.9.71_pre9
@@ -1,3 +1,3 @@
-MD5 12183922e35894974ff8fa275b7d176c mol-0.9.71_pre9.tar.bz2 2042974
-RMD160 73662d126112aa236f10717508b0feb6a676986e mol-0.9.71_pre9.tar.bz2 2042974
-SHA256 d93e6659cfc81096e311fa8316061e99558e300908098839546385b4251087b3 mol-0.9.71_pre9.tar.bz2 2042974
+MD5 d52087b3765a09b54e2b5e506b4fd477 mol-0.9.71_pre9.tar.bz2 2045253
+RMD160 3d90fcd484ea4b892781b5713cf1d3b84b417842 mol-0.9.71_pre9.tar.bz2 2045253
+SHA256 48ef2e31adaaee115a6a8001e0fd0a1f7c02bb307de357ff90f03c5a125dc571 mol-0.9.71_pre9.tar.bz2 2045253
diff --git a/app-emulation/mol/files/mol-0.9.71_pre8-to-pre9.patch b/app-emulation/mol/files/mol-0.9.71_pre8-to-pre9.patch
new file mode 100644
index 000000000000..1c4c586c24e0
--- /dev/null
+++ b/app-emulation/mol/files/mol-0.9.71_pre8-to-pre9.patch
@@ -0,0 +1,135 @@
+diff -Naur mol-0.9.71_pre8/CHANGELOG ../../mol-0.9.71_pre9/work/mol-0.9.71_pre9/CHANGELOG
+--- mol-0.9.71_pre8/CHANGELOG	2006-01-27 14:10:05.000000000 -0500
++++ ../../mol-0.9.71_pre9/work/mol-0.9.71_pre9/CHANGELOG	2006-09-05 01:49:27.000000000 -0400
+@@ -1,5 +1,7 @@
+ MOL Changelog
+ 
++mol-0.9.71_pre9 - 2006-09-05 Joseph Jezak <josejx@gentoo.org>
++	* Compile fixes for kernels 2.6.17 and newer
+ mol-0.9.71_pre8 - 2006-01-26 Joseph Jezak <josejx@gentoo.org>
+ 	* Fixed mol kmod naming issue, same as last version's netdev fix
+ 	* Added video resolution settings for new PBs and Apple Cinema Displays 
+diff -Naur mol-0.9.71_pre8/config/Makefile.top ../../mol-0.9.71_pre9/work/mol-0.9.71_pre9/config/Makefile.top
+--- mol-0.9.71_pre8/config/Makefile.top	2006-01-27 14:09:29.000000000 -0500
++++ ../../mol-0.9.71_pre9/work/mol-0.9.71_pre9/config/Makefile.top	2006-09-05 02:42:52.000000000 -0400
+@@ -24,7 +24,6 @@
+ export		ARCH
+ BUILDDIR	:= $(top_srcdir)/obj-$(ARCH)
+ 
+-
+ #################################################################
+ # INSTALL dirs
+ #################################################################
+@@ -56,7 +55,7 @@
+ #################################################################
+ 
+ VERSION		:= 0.9.71
+-EXTRA_VERSION	:= -pre8$(VENDOR)
++EXTRA_VERSION	:= -pre9$(VENDOR)
+ RELEASENAME	:= $(VERSION)$(EXTRA_VERSION)$(VENDOR)
+ 
+ _prefix		= $(DESTDIR)$(prefix)
+diff -Naur mol-0.9.71_pre8/src/drivers/net/if-tap.c ../../mol-0.9.71_pre9/work/mol-0.9.71_pre9/src/drivers/net/if-tap.c
+--- mol-0.9.71_pre8/src/drivers/net/if-tap.c	2005-01-17 18:07:06.000000000 -0500
++++ ../../mol-0.9.71_pre9/work/mol-0.9.71_pre9/src/drivers/net/if-tap.c	2006-09-05 00:39:25.000000000 -0400
+@@ -21,6 +21,11 @@
+ #include <linux/netlink.h>
+ #include "enet.h"
+ #include "res_manager.h"
++#include <linux/version.h>
++
++#ifndef NETLINK_GENERIC
++#define NETLINK_GENERIC 16
++#endif
+ 
+ static const char		def_hw_addr[6] = { 0, 0, 0xDE, 0xAD, 0xBE, 0xEF };
+ 
+@@ -61,7 +66,7 @@
+ 	if( check_netdev(is->iface_name) )
+ 		return 1;
+ 
+-	if( (fd=socket(PF_NETLINK, SOCK_RAW, NETLINK_TAPBASE+tapnum)) < 0 ) {
++	if( (fd=socket(PF_NETLINK, SOCK_RAW, NETLINK_GENERIC+tapnum)) < 0 ) {
+ 		perrorm("socket");
+ 		printm("Does the kernel lack netlink support (CONFIG_NETLINK)?\n");
+ 		return 1;
+diff -Naur mol-0.9.71_pre8/src/kmod/Linux/Makefile.26 ../../mol-0.9.71_pre9/work/mol-0.9.71_pre9/src/kmod/Linux/Makefile.26
+--- mol-0.9.71_pre8/src/kmod/Linux/Makefile.26	2005-10-09 21:22:50.000000000 -0400
++++ ../../mol-0.9.71_pre9/work/mol-0.9.71_pre9/src/kmod/Linux/Makefile.26	2006-09-05 08:17:40.000000000 -0400
+@@ -25,30 +25,30 @@
+ 
+ $(obj)/_%.o: $(src)/%.S
+ 	@echo "  AS [x]   $@"
+-	@$(RM) $@ $@.s
++	@rm -f $@ $@.s
+ 	@$(CPP) $(MOL_ASMFLAGS) $< | m4 -s > $@.m4
+ 	@ASFILTER="./asfilter" ; test -x $$ASFILTER || ASFILTER="tr ';' '\n'" ; \
+ 	cat $@.m4 | $$ASFILTER > $@.s
+ 	@$(AS) $@.s $(AS_FLAGS) -o $@
+-	@$(RM) $@.s $@.m4
++	@rm -f $@.s $@.m4
+ 
+ 
+ $(src)/asm_offsets.h:	$(src)/archinclude.h $(src)/kernel_vars.h $(src)/mac_registers.h
+ $(src)/asm_offsets.h:	$(src)/asm_offsets.c $(src)/asm_offsets.inc
+-	@$(RM) ${T}/tmp-offsets.c $@ ; cat $^ > ${T}/tmp-offsets.c
++	@rm -f ${T}/tmp-offsets.c $@ ; cat $^ > ${T}/tmp-offsets.c
+ 	@$(CC) $(CPPFLAGS) $(CFLAGS) -I$(src) -Wall -S ${T}/tmp-offsets.c -o ${T}/tmp-offsets.s
+ 	@echo "/* WARNING! Automatically generated from 'shared/asm_offsets.c' - DO NOT EDIT! */" > $@
+ 	@grep '^#' ${T}/tmp-offsets.s >> $@
+-	@$(RM) ${T}/tmp-offsets.*
++	@rm -f ${T}/tmp-offsets.*
+ 
+ 
+ $(src)/_performance.c: $(PERFOBJS)
+-	@$(RM) $@ $@.tmp; echo "/* WARNING! DO NOT EDIT! AUTOMATICALLY GENERATED! */" > $@.tmp
++	@rm -f $@ $@.tmp; echo "/* WARNING! DO NOT EDIT! AUTOMATICALLY GENERATED! */" > $@.tmp
+ 	@echo "#include \"performance.h\"" >> $@.tmp
+ 	@$(NM) $(PERFOBJS) | awk -- '/gPerf__/ { print "unsigned long "$$2";" }' >> $@.tmp
+ 	@echo "perf_info_t g_perf_info_table[] = {" >> $@.tmp
+ 	@$(NM) $(PERFOBJS) | awk -- '/gPerf__/ { print "  { \""$$2"\",&"$$2"}," }' >> $@.tmp
+ 	@echo "  {0,0} };" >> $@.tmp
+ 	@cat $@.tmp | sed s/_gPerf/gPerf/g > $@
+-	@$(RM) $@.tmp
++	@rm -f $@.tmp
+ 
+diff -Naur mol-0.9.71_pre8/src/kmod/Linux/kuname.c ../../mol-0.9.71_pre9/work/mol-0.9.71_pre9/src/kmod/Linux/kuname.c
+--- mol-0.9.71_pre8/src/kmod/Linux/kuname.c	2006-01-27 13:00:11.000000000 -0500
++++ ../../mol-0.9.71_pre9/work/mol-0.9.71_pre9/src/kmod/Linux/kuname.c	2006-09-05 02:36:47.000000000 -0400
+@@ -16,6 +16,9 @@
+ 
+ #include <linux/config.h>
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
++#include <linux/utsrelease.h>
++#endif
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
+ 
+diff -Naur mol-0.9.71_pre8/src/kmod/Linux/mmu.c ../../mol-0.9.71_pre9/work/mol-0.9.71_pre9/src/kmod/Linux/mmu.c
+--- mol-0.9.71_pre8/src/kmod/Linux/mmu.c	2005-01-17 18:07:06.000000000 -0500
++++ ../../mol-0.9.71_pre9/work/mol-0.9.71_pre9/src/kmod/Linux/mmu.c	2006-09-05 02:39:32.000000000 -0400
+@@ -32,6 +32,10 @@
+ int
+ arch_mmu_init( kernel_vars_t *kv )
+ {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
++	MMU.emulator_context = current->mm->context.id;
++#else
+ 	MMU.emulator_context = current->mm->context;
++#endif
+ 	return 0;
+ }
+diff -Naur mol-0.9.71_pre8/src/netdriver/kuname.c ../../mol-0.9.71_pre9/work/mol-0.9.71_pre9/src/netdriver/kuname.c
+--- mol-0.9.71_pre8/src/netdriver/kuname.c	2006-01-10 00:46:42.000000000 -0500
++++ ../../mol-0.9.71_pre9/work/mol-0.9.71_pre9/src/netdriver/kuname.c	2006-09-05 02:36:54.000000000 -0400
+@@ -16,6 +16,9 @@
+ 
+ #include <linux/config.h>
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
++#include <linux/utsrelease.h>
++#endif
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
+ 
diff --git a/app-emulation/mol/mol-0.9.71_pre8-r1.ebuild b/app-emulation/mol/mol-0.9.71_pre8-r1.ebuild
new file mode 100644
index 000000000000..8b61ddd6b08b
--- /dev/null
+++ b/app-emulation/mol/mol-0.9.71_pre8-r1.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2006 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_pre8-r1.ebuild,v 1.1 2006/09/05 18:46:59 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"
+RDEPEND="net-misc/dhcp
+	net-firewall/iptables
+	alsa? ( virtual/alsa )
+	vnc? ( net-misc/vnc )
+	X? ( || ( ( x11-libs/libXext
+				dga? ( x11-libs/libXxf86dga )
+			  )
+			  virtual/x11
+			)
+	)"
+DEPEND="${RDEPEND}
+	X? ( || ( ( x11-libs/libXt
+			    x11-proto/xextproto
+				dga? ( x11-proto/xf86dgaproto )
+			  )
+			  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
+
+	epatch ${FILESDIR}/${P}-to-pre9.patch
+}
+
+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 "    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
+}