Converted to linux-mod.

Package-Manager: portage-2.0.51.19

4 files changed, 58 insertions, 19 deletions

diff --git a/app-emulation/mol/ChangeLog b/app-emulation/mol/ChangeLog
index 9b082b876b3c..4bb6c87bc6a9 100644
--- a/app-emulation/mol/ChangeLog
+++ b/app-emulation/mol/ChangeLog
@@ -1,6 +1,10 @@
 # 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.46 2005/03/08 00:01:40 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/mol/ChangeLog,v 1.47 2005/03/28 13:22:16 josejx Exp $
+
+  28 Mar 2005; Joseph Jezak <josejx@gentoo.org>
+  +files/mol-0.9.71_pre1-tmp-offset.patch, mol-0.9.71_pre1.ebuild:
+  Converted ebuild to linux-mod.
 
   08 Mar 2005; Joseph Jezak <josejx@gentoo.org>
   files/mol-0.9.71_pre1-big-filesystem.patch:
diff --git a/app-emulation/mol/Manifest b/app-emulation/mol/Manifest
index 6e359ff9c8fe..78e521135445 100644
--- a/app-emulation/mol/Manifest
+++ b/app-emulation/mol/Manifest
@@ -1,8 +1,8 @@
-MD5 1aae2fe015b299eacd5765d16188fbaa ChangeLog 9146
+MD5 7b47fd97d7ed4b9b6f146d52fbd1f2b5 ChangeLog 9295
 MD5 37e2c58edef99f3f2be0803169d89bcd mol-0.9.70.ebuild 4048
 MD5 3263d375abba2d098c636efc2b135ea5 metadata.xml 333
 MD5 7b1c05be512e22dbfb69b67e87d6d2f7 mol-0.9.70-r1.ebuild 3940
-MD5 f89d7deb6015b207e4d936fbb487bff5 mol-0.9.71_pre1.ebuild 4217
+MD5 5674dc422930ad165912ce5d91cafff8 mol-0.9.71_pre1.ebuild 4518
 MD5 f0299c003ac50a8f73bd8264889116d7 files/mol-0.9.71_pre1-linux-2.6.9.patch 2571
 MD5 934e9ecf483ff3c4e34bb6307212d776 files/mol-0.9.70-nopriority.patch 1853
 MD5 3944510308e77b92ac85c07708947ad0 files/digest-mol-0.9.70-r1 64
@@ -11,4 +11,5 @@ MD5 2f8f758938db9b3cb5a13c0b33d989e3 files/mol-module-fix.patch 327
 MD5 453e05b555f037270dd6da665e100aa8 files/digest-mol-0.9.71_pre1 69
 MD5 0ea7bd65a5ff4666665a71fb9652aae8 files/mol-0.9.70-makefile-fix.patch 924
 MD5 3944510308e77b92ac85c07708947ad0 files/digest-mol-0.9.70 64
+MD5 8eb2c97c995cba996b31b0ba38ef4fd0 files/mol-0.9.71_pre1-tmp-offset.patch 864
 MD5 3bf68312e4299f777065f55eea5297fa files/mol-0.9.71_pre1-nopriority.patch 1861
diff --git a/app-emulation/mol/files/mol-0.9.71_pre1-tmp-offset.patch b/app-emulation/mol/files/mol-0.9.71_pre1-tmp-offset.patch
new file mode 100644
index 000000000000..201823771e90
--- /dev/null
+++ b/app-emulation/mol/files/mol-0.9.71_pre1-tmp-offset.patch
@@ -0,0 +1,18 @@
+--- src/kmod/Linux/Makefile.old	2005-03-28 20:16:13.000000000 +1000
++++ src/kmod/Linux/Makefile.26	2005-03-28 20:16:47.000000000 +1000
+@@ -34,11 +34,11 @@
+ 
+ $(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) $(src)/tmp-offsets.c $@ ; cat $^ > $(src)/tmp-offsets.c
+-	@$(CC) $(CPPFLAGS) $(CFLAGS) -I$(src) -Wall -S $(src)/tmp-offsets.c
++	@$(RM) ${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 '^#' tmp-offsets.s >> $@
+-	@$(RM) $(src)/tmp-offsets.*
++	@grep '^#' ${T}/tmp-offsets.s >> $@
++	@$(RM) ${T}/tmp-offsets.*
+ 
+ 
+ $(src)/_performance.c: $(PERFOBJS)
diff --git a/app-emulation/mol/mol-0.9.71_pre1.ebuild b/app-emulation/mol/mol-0.9.71_pre1.ebuild
index 7b5b35a1abe1..baf155364db4 100644
--- a/app-emulation/mol/mol-0.9.71_pre1.ebuild
+++ b/app-emulation/mol/mol-0.9.71_pre1.ebuild
@@ -1,8 +1,8 @@
 # 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_pre1.ebuild,v 1.4 2005/02/20 04:59:31 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/mol/mol-0.9.71_pre1.ebuild,v 1.5 2005/03/28 13:22:16 josejx Exp $
 
-inherit flag-o-matic eutils
+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.net/"
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~ppc"
+KEYWORDS="-* ~ppc"
 IUSE="vnc alsa oss fbcon X oldworld sheep debug dga usb"
 
 MAKEOPTS="${MAKEOPTS} -j1"
@@ -22,11 +22,19 @@ RDEPEND="net-misc/dhcp
 	vnc? ( net-misc/vnc )
 	X? ( virtual/x11 )"
 
+
+MODULE_NAMES="mol(mol:${S}/src/kmod/Linux)
+			  sheep(net:${S}/src/netdriver)
+			  tun(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() {
@@ -42,6 +50,9 @@ src_unpack() {
 	# Adds big filesystem (>2Gb) image support, bug #80098
 	epatch ${FILESDIR}/${P}-big-filesystem.patch
 
+	# Fixes bug tmp-offset access violation
+	epatch ${FILESDIR}/${P}-tmp-offset.patch
+
 	# dhcp config fix and show dchpd messages on starting mol
 	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
@@ -56,10 +67,10 @@ src_compile() {
 
 	# initialize all needed build-files
 	./autogen.sh
-	./configure --prefix="/usr" || die "configure failed"
+	./configure --prefix="/usr" || die "Configure failed."
 
 	# workaround for proper module-building
-	make defconfig || die "This is a ppc-only package (time to buy that iBook, no?)"
+	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
@@ -76,21 +87,25 @@ src_compile() {
 
 	einfo "The configuration has been altered according to your USE-flags."
 	# reinitialize our changed configuration
-	make oldconfig
+	emake oldconfig
 
-	addwrite "/usr/src/${FK}"
-	make || die "Build mol with: FEATURES=\"-userpriv -usersandbox\" emerge mol"
+	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() {
-	# 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}"
-	make DESTDIR=${D} install || die "Failed to install MOL."
-
-	dodoc 0README BUILDING COPYRIGHT CREDITS Doc/*
+	#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
 }
 
 pkg_postinst() {
@@ -107,6 +122,7 @@ pkg_postinst() {
 	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)"