Several changes. See ChangeLog for details.

10 files changed, 72 insertions, 178 deletions

diff --git a/app-emulation/mol/ChangeLog b/app-emulation/mol/ChangeLog
index 1d0d3bc84426..4de98b94cb44 100644
--- a/app-emulation/mol/ChangeLog
+++ b/app-emulation/mol/ChangeLog
@@ -1,6 +1,18 @@
 # 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.40 2005/01/01 14:14:55 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/mol/ChangeLog,v 1.41 2005/01/18 12:04:42 pylon Exp $
+
+*mol-0.9.71_pre1 (18 Jan 2005)
+
+  18 Jan 2005; Lars Weiler <pylon@gentoo.org> -files/26-arch-fix.patch,
+  +files/mol-module-fix.patch, -mol-0.9.68-r4.ebuild, mol-0.9.70.ebuild, 
+  -mol-0.9.70_rc2-r1.ebuild, +mol-0.9.71_pre1.ebuild:
+
+  mol-0.9.71_pre1.ebuild: A new rsync-snapshot with minor improvements.
+  mol-0.9.70.ebuild: Patched to compile modules on linux-2.6.10; bug #77386.
+  Stripped LDFLAGS as they break compilation.
+
+  Removed old versions.
 
   01 Oct 2004; Luca Barbato <lu_zero@gentoo.org> mol-0.9.70.ebuild:
   Workaround for issue with libpng.
diff --git a/app-emulation/mol/Manifest b/app-emulation/mol/Manifest
index 989305640824..24dbe1728616 100644
--- a/app-emulation/mol/Manifest
+++ b/app-emulation/mol/Manifest
@@ -1,10 +1,8 @@
 MD5 2ce590826bff55e20ec5870aff1d2c94 ChangeLog 7665
 MD5 3263d375abba2d098c636efc2b135ea5 metadata.xml 333
-MD5 8b3b9a11943cabb2c0ee8ca02e04007d mol-0.9.68-r4.ebuild 2211
-MD5 144c79424101c5d1f8dae8ccc9e449fc mol-0.9.70.ebuild 3883
-MD5 1e2cef1d122e0cff0b078cdebb8c4f2f mol-0.9.70_rc2-r1.ebuild 3733
-MD5 98990df6bb9f196021dea0b77d2d912d files/26-arch-fix.patch 2320
-MD5 d4bc3f0122eb77fbfbfcf584f442049d files/digest-mol-0.9.68-r4 67
+MD5 165711d1bb9c74aeedfe5d17417204db mol-0.9.70.ebuild 3896
+MD5 ea1036af4ab94a10cb6807fbb9b8a391 mol-0.9.71_pre1.ebuild 4005
 MD5 3944510308e77b92ac85c07708947ad0 files/digest-mol-0.9.70 64
-MD5 9250d5f1a7e9cbe52e9e3621d14294c8 files/digest-mol-0.9.70_rc2-r1 71
 MD5 0ea7bd65a5ff4666665a71fb9652aae8 files/mol-0.9.70-makefile-fix.patch 924
+MD5 2f8f758938db9b3cb5a13c0b33d989e3 files/mol-module-fix.patch 327
+MD5 453e05b555f037270dd6da665e100aa8 files/digest-mol-0.9.71_pre1 69
diff --git a/app-emulation/mol/files/26-arch-fix.patch b/app-emulation/mol/files/26-arch-fix.patch
deleted file mode 100644
index 99e6459ce871..000000000000
--- a/app-emulation/mol/files/26-arch-fix.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-diff -ruN mol-0.9.69_pre6.orig/configure.in mol-0.9.69_pre6/configure.in
---- mol-0.9.69_pre6.orig/configure.in	2003-11-18 22:35:10.000000000 +0100
-+++ mol-0.9.69_pre6/configure.in	2003-11-18 23:02:40.000000000 +0100
-@@ -96,30 +96,30 @@
- case "$host_cpu-$host_os" in 
-      i?86-*linux*)
- 	Arch=Linux
--        ARCH=i386-linux ;;
-+        ARCH_=i386-linux ;;
-      powerpc-*linux* | ppc-*linux*)
- 	Arch=Linux
--        ARCH=ppc-linux
-+        ARCH_=ppc-linux
-         AC_DEFINE(NATIVE_PPC, 1, [Define if native PPC] ) ;;
-      powerpc-*darwin*)
- 	Arch=Darwin
- 	AC_DEFINE(__darwin__, 1, [Define if running Darwin] ) 
--        ARCH=darwin ;;
-+        ARCH_=darwin ;;
-      *)
-         AC_MSG_ERROR([Unsupported architecture $host_cpu-$host_os ]) ;;
- esac
- 
- case "$host_os" in *linux*) OS=linux ;; esac
- 
--AM_CONDITIONAL(ARCH_386_LINUX, test $ARCH = i386-linux )
--AM_CONDITIONAL(ARCH_PPC_LINUX, test $ARCH = ppc-linux )
--AM_CONDITIONAL(ARCH_DARWIN, test $ARCH = darwin )
-+AM_CONDITIONAL(ARCH_386_LINUX, test $ARCH_ = i386-linux )
-+AM_CONDITIONAL(ARCH_PPC_LINUX, test $ARCH_ = ppc-linux )
-+AM_CONDITIONAL(ARCH_DARWIN, test $ARCH_ = darwin )
- AM_CONDITIONAL(CPU_386, test $CPU = i386 )
- AM_CONDITIONAL(CPU_PPC, test $CPU = ppc )
- AM_CONDITIONAL(LINUX, test "$OS" = linux )
- 
- AC_SUBST(Arch)
--AC_SUBST(ARCH)
-+AC_SUBST(ARCH_)
- AC_SUBST(CPU)
- 
- 
-@@ -206,7 +206,7 @@
- ################################################################################
- 
- AC_ARG_ENABLE(oldworld, [  --disable-oldworld      don not include oldworld support], [], [])
--test $ARCH = darwin && enable_oldworld=no
-+test $ARCH_ = darwin && enable_oldworld=no
- 
- AM_CONDITIONAL(OLDWORLD_SUPPORT, test "$enable_oldworld" != no )
- test "$enable_oldworld" != no && {
-@@ -231,7 +231,7 @@
- #}
- 
- AC_ARG_ENABLE(esound, [  --disable-alsa          disable ALSA sound driver support], [], [])
--test $ARCH = darwin && enable_alsa=no
-+test $ARCH_ = darwin && enable_alsa=no
- 
- test "$enable_alsa" != no && {
-      AC_CHECK_LIB(asound, snd_pcm_open, [LIB_ALSA=-lasound], [enable_alsa=no])
-@@ -510,7 +510,7 @@
- 
- CFLAGS="$CFLAGS -Wall -Wmissing-prototypes "'$(UNIMPORTANT_CFLAGS)'
- #CFLAGS="$CFLAGS -fno-strict-aliasing"
--test $ARCH = darwin && CFLAGS="$CFLAGS -traditional-cpp"
-+test $ARCH_ = darwin && CFLAGS="$CFLAGS -traditional-cpp"
- 
- ASMFLAGS=
- AC_SUBST(ASMFLAGS)
diff --git a/app-emulation/mol/files/digest-mol-0.9.68-r4 b/app-emulation/mol/files/digest-mol-0.9.68-r4
deleted file mode 100644
index 64d5b3bfa735..000000000000
--- a/app-emulation/mol/files/digest-mol-0.9.68-r4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b30405981af0b9ac76852ea5334245f8 mol-0.9.68-r4.tar.bz2 1484678
diff --git a/app-emulation/mol/files/digest-mol-0.9.70_rc2-r1 b/app-emulation/mol/files/digest-mol-0.9.70_rc2-r1
deleted file mode 100644
index 75a2d32bd959..000000000000
--- a/app-emulation/mol/files/digest-mol-0.9.70_rc2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3c0edab78e20e34e765870bf6c29ba20 mol-0.9.70_rc2-r1.tar.bz2 2439194
diff --git a/app-emulation/mol/files/digest-mol-0.9.71_pre1 b/app-emulation/mol/files/digest-mol-0.9.71_pre1
new file mode 100644
index 000000000000..93c85dd426d1
--- /dev/null
+++ b/app-emulation/mol/files/digest-mol-0.9.71_pre1
@@ -0,0 +1 @@
+MD5 b12e3beca8c90b56af09cb41f66920b0 mol-0.9.71_pre1.tar.bz2 1768219
diff --git a/app-emulation/mol/files/mol-module-fix.patch b/app-emulation/mol/files/mol-module-fix.patch
new file mode 100644
index 000000000000..7fd7467be9ae
--- /dev/null
+++ b/app-emulation/mol/files/mol-module-fix.patch
@@ -0,0 +1,12 @@
+--- src/kmod/Linux/alloc.h.orig	2004-03-21 16:20:39.000000000 -0600
++++ src/kmod/Linux/alloc.h	2005-01-16 15:23:17.583148592 -0600
+@@ -24,6 +24,9 @@
+ 
+ #ifdef LINUX_26
+ #include <asm/cacheflush.h>
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,10)
++#include <asm/io.h>
++#endif
+ #endif
+ 
+ #define	spin_lock_mol(x)			spin_lock(x)
diff --git a/app-emulation/mol/mol-0.9.68-r4.ebuild b/app-emulation/mol/mol-0.9.68-r4.ebuild
deleted file mode 100644
index 84765f590a07..000000000000
--- a/app-emulation/mol/mol-0.9.68-r4.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# 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.68-r4.ebuild,v 1.5 2005/01/01 14:14:55 eradicator Exp $
-
-inherit flag-o-matic
-
-S=${WORKDIR}/${P}-${PR}
-DESCRIPTION="MOL (Mac-on-Linux) lets PPC users run MacOS (X) under Linux"
-SRC_URI="http://cvs.gentoo.org/~gerk/distfiles/${P}-${PR}.tar.bz2"
-HOMEPAGE="http://www.maconlinux.net/"
-
-DEPEND=""
-RDEPEND="net-misc/dhcp
-	net-firewall/iptables
-	>=sys-apps/sed-4.0.5"
-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
-
-	./configure --prefix=/usr || die "This is a ppc-only package (time to buy that iBook, no?)"
-	emake || 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.70.ebuild b/app-emulation/mol/mol-0.9.70.ebuild
index c3043b5b3455..205b85514045 100644
--- a/app-emulation/mol/mol-0.9.70.ebuild
+++ b/app-emulation/mol/mol-0.9.70.ebuild
@@ -1,6 +1,6 @@
 # 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.70.ebuild,v 1.10 2005/01/01 14:14:55 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/mol/mol-0.9.70.ebuild,v 1.11 2005/01/18 12:04:42 pylon Exp $
 
 inherit flag-o-matic eutils
 
@@ -40,18 +40,20 @@ src_unpack() {
 	sed -i "s:prefix		= /usr/local:prefix		= /usr:" Makefile.top || die
 	sed -i "s#VENDOR		:=#VENDOR		:= -gentoo#" Makefile.top || die
 	epatch ${FILESDIR}/${P}-makefile-fix.patch
+	epatch ${FILESDIR}/${PN}-module-fix.patch
 }
 
 src_compile() {
 	filter-flags -fsigned-char
 
 	export KERNEL_SOURCE="/usr/src/${FK}"
+	export LDFLAGS=""
 
 	# initialize all needed build-files
 	./autogen.sh
 	#workaround
 	./configure --disable-png
-	emake defconfig || die "This is a ppc-only package (time to buy that iBook, no?)"
+	make defconfig || die "This is a ppc-only package (time to buy that iBook, no?)"
 
 	sed -i "s:CONFIG_XDGA=y:# CONFIG_XDGA is not set:" .config
 	sed -i "s:CONFIG_TAP=y:# CONFIG_TAP is not set:" .config
@@ -66,10 +68,10 @@ src_compile() {
 
 	einfo "The configuration has been altered according to your USE-flags."
 	# reinitialize our changed configuration
-	emake oldconfig
+	make oldconfig
 
 	addwrite "/usr/src/${FK}"
-	emake || die "Build mol with: FEATURES=\"-userpriv -strict\" emerge mol"
+	make || die "Build mol with: FEATURES=\"-userpriv -usersandbox\" emerge mol"
 }
 
 src_install() {
@@ -78,7 +80,7 @@ src_install() {
 	# sandboxing enabled this would result in an access violation.
 
 	addwrite "/usr/src/${FK}"
-	emake DESTDIR=${D} install || die "Failed to install MOL."
+	make DESTDIR=${D} install || die "Failed to install MOL."
 
 	dodoc 0README BUILDING COPYRIGHT CREDITS Doc/*
 }
@@ -97,7 +99,6 @@ 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)"
diff --git a/app-emulation/mol/mol-0.9.70_rc2-r1.ebuild b/app-emulation/mol/mol-0.9.71_pre1.ebuild
index 5e4bf929bc37..db2e068a9362 100644
--- a/app-emulation/mol/mol-0.9.70_rc2-r1.ebuild
+++ b/app-emulation/mol/mol-0.9.71_pre1.ebuild
@@ -1,23 +1,26 @@
 # 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.70_rc2-r1.ebuild,v 1.5 2005/01/01 14:14:55 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/mol/mol-0.9.71_pre1.ebuild,v 1.1 2005/01/18 12:04:42 pylon Exp $
 
-inherit flag-o-matic
+inherit flag-o-matic eutils
 
-S=${WORKDIR}/${P}-r1
 DESCRIPTION="MOL (Mac-on-Linux) lets PPC users run MacOS (X) under Linux (rsync snapshot)"
-SRC_URI="mirror://gentoo/${P}-r1.tar.bz2"
 HOMEPAGE="http://www.maconlinux.net/"
+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"
+
+MAKEOPTS="${MAKEOPTS} -j1"
 
 DEPEND=""
 RDEPEND="net-misc/dhcp
 	net-firewall/iptables
 	alsa? ( virtual/alsa )
+	vnc? ( net-misc/vnc )
 	X? ( virtual/x11 )"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="ppc -x86 -sparc -alpha -mips"
-IUSE="alsa oss fbcon X oldworld sheep debug"
 
 pkg_setup() {
 	echo
@@ -29,42 +32,47 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 
-	# dhcp config fix and show dchpd messages on starting mol
 	cd ${S}
+	epatch ${FILESDIR}/${PN}-module-fix.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
 
-	sed -i "s:prefix		= /usr/local:prefix		= /usr:" Makefile.top || die
-	sed -i "s#VENDOR		:=#VENDOR		:= -gentoo#" Makefile.top || die
-
 }
 
 src_compile() {
 	filter-flags -fsigned-char
 
 	export KERNEL_SOURCE="/usr/src/${FK}"
+	export LDFLAGS=""
 
 	# initialize all needed build-files
 	./autogen.sh
-
-	emake defconfig || die "This is a ppc-only package (time to buy that iBook, no?)"
-
-	sed -i "s:CONFIG_XDGA=y:# CONFIG_XDGA is not set:" .config
-	sed -i "s:CONFIG_TAP=y:# CONFIG_TAP is not set:" .config
-	use alsa     || sed -i "s:CONFIG_ALSA=y:# CONFIG_ALSA is not set:" .config
-	use debug    && sed -i "s:# CONFIG_DEBUGGER is not set:CONFIG_DEBUGGER=y:" .config
-	use oss      || sed -i "s:CONFIG_OSS=y:# CONFIG_OSS is not set:" .config
-	use oldworld || sed -i "s:CONFIG_OLDWORLD=y:# CONFIG_OLDWORLD is not set:" .config
-	use sheep    || sed -i "s:CONFIG_SHEEP=y:# CONFIG_SHEEP is not set:" .config
-	use X        || sed -i "s:CONFIG_X11=y:# CONFIG_X11 is not set:" .config
-	use fbcon    || sed -i "s:CONFIG_FBDEV=y:# CONFIG_FBDEV is not set:" .config
+	./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?)"
+
+	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
+	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
 
 	einfo "The configuration has been altered according to your USE-flags."
 	# reinitialize our changed configuration
-	emake oldconfig
+	make oldconfig
 
 	addwrite "/usr/src/${FK}"
-	emake || die "Build mol with: FEATURES=\"-userpriv -strict\" emerge mol"
+	make || die "Build mol with: FEATURES=\"-userpriv -usersandbox\" emerge mol"
 }
 
 src_install() {
@@ -73,7 +81,7 @@ src_install() {
 	# sandboxing enabled this would result in an access violation.
 
 	addwrite "/usr/src/${FK}"
-	emake DESTDIR=${D} install || die "Failed to install MOL."
+	make DESTDIR=${D} install || die "Failed to install MOL."
 
 	dodoc 0README BUILDING COPYRIGHT CREDITS Doc/*
 }
@@ -92,7 +100,6 @@ 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)"