summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Jezak <josejx@gentoo.org>2006-05-26 00:32:14 +0000
committerJoseph Jezak <josejx@gentoo.org>2006-05-26 00:32:14 +0000
commitf20d6cff9f30f4d73b84459e777e251cd3f6f71e (patch)
tree5d986fee664282baa33c18c06735a94fb46f7acd /app-emulation/mol
parentCleanup (diff)
downloadgentoo-2-f20d6cff9f30f4d73b84459e777e251cd3f6f71e.tar.gz
gentoo-2-f20d6cff9f30f4d73b84459e777e251cd3f6f71e.tar.bz2
gentoo-2-f20d6cff9f30f4d73b84459e777e251cd3f6f71e.zip
Cleanup
(Portage version: 2.1_rc2-r3) (Unsigned Manifest commit)
Diffstat (limited to 'app-emulation/mol')
-rw-r--r--app-emulation/mol/Manifest51
-rw-r--r--app-emulation/mol/files/digest-mol-0.9.701
-rw-r--r--app-emulation/mol/files/digest-mol-0.9.70-r11
-rw-r--r--app-emulation/mol/files/digest-mol-0.9.71_pre1-r33
-rw-r--r--app-emulation/mol/files/digest-mol-0.9.71_pre61
-rw-r--r--app-emulation/mol/files/digest-mol-0.9.71_pre71
-rw-r--r--app-emulation/mol/files/mol-0.9.70-makefile-fix.patch20
-rw-r--r--app-emulation/mol/files/mol-0.9.70-nopriority.patch63
-rw-r--r--app-emulation/mol/files/mol-0.9.71_pre1-big-filesystem.patch292
-rw-r--r--app-emulation/mol/files/mol-0.9.71_pre1-linux-2.6.9.patch80
-rw-r--r--app-emulation/mol/files/mol-0.9.71_pre1-nopriority.patch63
-rw-r--r--app-emulation/mol/files/mol-0.9.71_pre1-tmp-offset.patch18
-rw-r--r--app-emulation/mol/files/mol-module-fix.patch12
-rw-r--r--app-emulation/mol/files/mol-tiger.patch126
-rw-r--r--app-emulation/mol/files/mol-uname.diff20
-rw-r--r--app-emulation/mol/files/mol-verify_area.diff157
-rw-r--r--app-emulation/mol/mol-0.9.70-r1.ebuild112
-rw-r--r--app-emulation/mol/mol-0.9.70.ebuild116
-rw-r--r--app-emulation/mol/mol-0.9.71_pre1-r3.ebuild157
-rw-r--r--app-emulation/mol/mol-0.9.71_pre6.ebuild129
-rw-r--r--app-emulation/mol/mol-0.9.71_pre7.ebuild139
21 files changed, 18 insertions, 1544 deletions
diff --git a/app-emulation/mol/Manifest b/app-emulation/mol/Manifest
index 796eb8e7c20a..d56a0dcad681 100644
--- a/app-emulation/mol/Manifest
+++ b/app-emulation/mol/Manifest
@@ -1,35 +1,20 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 9dda54135d0adefb7f3c72b9fbb0441e ChangeLog 11718
-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 d6145e861bd41a10d4cb82f59a3f5208 files/digest-mol-0.9.71_pre6 69
-MD5 85144068fb4f48136c17b1283d08d605 files/digest-mol-0.9.71_pre7 69
-MD5 aacfe38b80253da91ea8f0328f69801a files/digest-mol-0.9.71_pre8 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
-MD5 f0299c003ac50a8f73bd8264889116d7 files/mol-0.9.71_pre1-linux-2.6.9.patch 2571
-MD5 3bf68312e4299f777065f55eea5297fa files/mol-0.9.71_pre1-nopriority.patch 1861
-MD5 8eb2c97c995cba996b31b0ba38ef4fd0 files/mol-0.9.71_pre1-tmp-offset.patch 864
-MD5 2f8f758938db9b3cb5a13c0b33d989e3 files/mol-module-fix.patch 327
+AUX mol-pciproxy-dump.patch 8603 RMD160 efe5e1889b040f531ce57d11d5f56753780c1bd5 SHA1 39961bcdafd31559d70c2d650863959e2292d42d SHA256 881df3036bd257250526c8c507d84542fe89648e2345e9f830ba7a1f6617fafe
MD5 7f5de70ffe0bddda1e6ea19faaacddfe files/mol-pciproxy-dump.patch 8603
-MD5 1b1d52b69bcae00d0339c0f3f4ae9a6d files/mol-tiger.patch 3681
-MD5 c0056d18f99396ba8607109a26dc9188 files/mol-uname.diff 618
-MD5 11a4255ad58825f89d459519290217c2 files/mol-verify_area.diff 4696
-MD5 3263d375abba2d098c636efc2b135ea5 metadata.xml 333
-MD5 17cd94d375a868aa1424c87c33d451e8 mol-0.9.70-r1.ebuild 3939
-MD5 56f8a1561157a28124d55347470da6c8 mol-0.9.70.ebuild 4047
-MD5 457d88cf9e8da3a70ef024b28d6032a0 mol-0.9.71_pre1-r3.ebuild 5208
-MD5 3c0e6ce5f0ac9868762ae4d9bf635071 mol-0.9.71_pre6.ebuild 4401
-MD5 8e31a3b3cfd38c9e3f58c1e16434e973 mol-0.9.71_pre7.ebuild 4608
+RMD160 efe5e1889b040f531ce57d11d5f56753780c1bd5 files/mol-pciproxy-dump.patch 8603
+SHA256 881df3036bd257250526c8c507d84542fe89648e2345e9f830ba7a1f6617fafe files/mol-pciproxy-dump.patch 8603
+DIST mol-0.9.71_pre8.tar.bz2 1933742 RMD160 b21ebffe2cd10bea2a7ced1f77a0ab8a5b65802d SHA1 8d38e54377f88e5831044467fe4de33e4e405838 SHA256 3831a38668141adbdc1b56f3c684e23ddefe7bbffe7c2f603b051b41678bd019
+EBUILD mol-0.9.71_pre8.ebuild 4562 RMD160 59b100fca9f8aeb9829762b97ae304e3c5c3b5ab SHA1 07cb315f09b8056c55b12a754fdfc566b015829e SHA256 3a5720a1d1c6b6a8a0c193bf287510b8e17e0e7bcf59c87e255ab9fafbc50812
MD5 76ce7ee9e79d1d27063825da2ced451f mol-0.9.71_pre8.ebuild 4562
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFD2nKZcsIHjyDViGQRApQeAKCN+I3IKaGD2B0eZm4/GVxZYYya+ACguMqA
-DaGcUyQeMPuHQlZ3zuMCfQg=
-=54w8
------END PGP SIGNATURE-----
+RMD160 59b100fca9f8aeb9829762b97ae304e3c5c3b5ab mol-0.9.71_pre8.ebuild 4562
+SHA256 3a5720a1d1c6b6a8a0c193bf287510b8e17e0e7bcf59c87e255ab9fafbc50812 mol-0.9.71_pre8.ebuild 4562
+MISC ChangeLog 12264 RMD160 174432bd9bb391cc574dceaa3cc53ca5dbe5350c SHA1 8a30027d7dedcfa9e9582da69feccefbc1ffab07 SHA256 dd7580f4e956407641065fd89b5ceb0a23b01c323c6e6255286d8478ce5a6932
+MD5 7bfad8cbbb127f784dfb1ee628b0e12c ChangeLog 12264
+RMD160 174432bd9bb391cc574dceaa3cc53ca5dbe5350c ChangeLog 12264
+SHA256 dd7580f4e956407641065fd89b5ceb0a23b01c323c6e6255286d8478ce5a6932 ChangeLog 12264
+MISC metadata.xml 333 RMD160 352414b728f14eac7f0c1392389a79d59ed63b7d SHA1 ccacf3b3fb0d53aadb5b520878f918d3c77d0819 SHA256 cf0a1bb4341e07e4dc7ab4c55e99696173742b2ba7bacad9b21a831b047ef30b
+MD5 3263d375abba2d098c636efc2b135ea5 metadata.xml 333
+RMD160 352414b728f14eac7f0c1392389a79d59ed63b7d metadata.xml 333
+SHA256 cf0a1bb4341e07e4dc7ab4c55e99696173742b2ba7bacad9b21a831b047ef30b metadata.xml 333
+MD5 b96d73d75a36b9b5145e1138a92b52b4 files/digest-mol-0.9.71_pre8 253
+RMD160 ff0d78754328a0afaf14450c917c16d5552312e6 files/digest-mol-0.9.71_pre8 253
+SHA256 c8c50fd80ac9092beeb95c2d09625aea2352252cc63c8dd8973b6b66d407aa26 files/digest-mol-0.9.71_pre8 253
diff --git a/app-emulation/mol/files/digest-mol-0.9.70 b/app-emulation/mol/files/digest-mol-0.9.70
deleted file mode 100644
index 77c5311411e1..000000000000
--- a/app-emulation/mol/files/digest-mol-0.9.70
+++ /dev/null
@@ -1 +0,0 @@
-MD5 16f801f3c1db1d75dd3fcb8f4bb06d55 mol-0.9.70.tar.bz2 1640430
diff --git a/app-emulation/mol/files/digest-mol-0.9.70-r1 b/app-emulation/mol/files/digest-mol-0.9.70-r1
deleted file mode 100644
index 77c5311411e1..000000000000
--- a/app-emulation/mol/files/digest-mol-0.9.70-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 16f801f3c1db1d75dd3fcb8f4bb06d55 mol-0.9.70.tar.bz2 1640430
diff --git a/app-emulation/mol/files/digest-mol-0.9.71_pre1-r3 b/app-emulation/mol/files/digest-mol-0.9.71_pre1-r3
deleted file mode 100644
index 9b3d5b0e849d..000000000000
--- a/app-emulation/mol/files/digest-mol-0.9.71_pre1-r3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b12e3beca8c90b56af09cb41f66920b0 mol-0.9.71_pre1.tar.bz2 1768219
-MD5 e4f4fb6e63380997c1ab6d554ca93c00 bootx.gz 33043
-MD5 b2f4c10dcadfa689cc54834f3d154884 mol-pciproxy.patch.bz2 16226
diff --git a/app-emulation/mol/files/digest-mol-0.9.71_pre6 b/app-emulation/mol/files/digest-mol-0.9.71_pre6
deleted file mode 100644
index a9cee22f9762..000000000000
--- a/app-emulation/mol/files/digest-mol-0.9.71_pre6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 28ef51af29717d1782edc0b43f4f5c70 mol-0.9.71_pre6.tar.bz2 1936383
diff --git a/app-emulation/mol/files/digest-mol-0.9.71_pre7 b/app-emulation/mol/files/digest-mol-0.9.71_pre7
deleted file mode 100644
index dced2c7f799a..000000000000
--- a/app-emulation/mol/files/digest-mol-0.9.71_pre7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 72734ff2deee3079c27f4c80c9d06cc6 mol-0.9.71_pre7.tar.bz2 1966472
diff --git a/app-emulation/mol/files/mol-0.9.70-makefile-fix.patch b/app-emulation/mol/files/mol-0.9.70-makefile-fix.patch
deleted file mode 100644
index 0ec3c9e0f892..000000000000
--- a/app-emulation/mol/files/mol-0.9.70-makefile-fix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/kmod/Linux/Makefile.26-orig 2004-05-12 16:53:54.412715816 +0200
-+++ src/kmod/Linux/Makefile.26 2004-05-12 16:56:08.325358000 +0200
-@@ -9,7 +9,7 @@
- obj-m := _kuname.o mol.o
-
- PERFOBJS = $(addprefix $(obj)/, $(PERFOBJS_))
--MOL_ASMFLAGS = $(ASMFLAGS) $(INCLUDES) -D__ASSEMBLY__
-+MOL_ASMFLAGS = $(CPPFLAGS) $(ASMFLAGS) $(INCLUDES) -D__ASSEMBLY__
-
-
- $(obj)/hook.o: $(src)/reloc_table.h
-@@ -37,7 +37,7 @@
- $(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) $(CFLAGS) -I$(src) -Wall -S $(src)/tmp-offsets.c
-+ @$(CC) $(CPPFLAGS) $(CFLAGS) -I$(src) -Wall -S $(src)/tmp-offsets.c
- @echo "/* WARNING! Automatically generated from 'shared/asm_offsets.c' - DO NOT EDIT! */" > $@
- @grep '^#' tmp-offsets.s >> $@
- @$(RM) $(src)/tmp-offsets.*
diff --git a/app-emulation/mol/files/mol-0.9.70-nopriority.patch b/app-emulation/mol/files/mol-0.9.70-nopriority.patch
deleted file mode 100644
index 9f0a5883a5c0..000000000000
--- a/app-emulation/mol/files/mol-0.9.70-nopriority.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -Naur src/drivers/disk/ablk.c src/drivers/disk/ablk.c
---- src/drivers/disk/ablk.c 2005-01-07 16:25:34.540100128 +1100
-+++ src/drivers/disk/ablk.c 2005-01-07 16:28:05.243189776 +1100
-@@ -216,7 +216,7 @@
- io_thread( void *dummy )
- {
- char ch;
-- setpriority( PRIO_PROCESS, getpid(), -19 );
-+ /* setpriority( PRIO_PROCESS, getpid(), -19 ); */
-
- for( ;; ) {
- read( ablk.ctrl_pipe[0], &ch, 1 );
-diff -Naur src/drivers/osi_sound.c src/drivers/osi_sound.c
---- src/drivers/osi_sound.c 2005-01-07 16:25:34.491107576 +1100
-+++ src/drivers/osi_sound.c 2005-01-07 16:27:30.586458400 +1100
-@@ -676,7 +676,7 @@
- static void
- audio_thread( void *dummy )
- {
-- setpriority( PRIO_PROCESS, getpid(), -20 );
-+ /* setpriority( PRIO_PROCESS, getpid(), -20 ); */
-
- LOCK;
- if( ss.ringbuf )
-@@ -695,7 +695,7 @@
- ss.startboingbuf = NULL;
- }
- UNLOCK;
-- setpriority( PRIO_PROCESS, getpid(), 0 );
-+ /* setpriority( PRIO_PROCESS, getpid(), 0 ); */
- }
-
-
-@@ -770,7 +770,7 @@
- ss.started = 0;
-
- LOCK;
-- setpriority( PRIO_PROCESS, getpid(), ss.save_priority );
-+ /* setpriority( PRIO_PROCESS, getpid(), ss.save_priority ); */
-
- ss.thread_running = -1;
- irq_line_low( ss.irq );
-@@ -795,7 +795,7 @@
- ss.dbuf_go = 0;
-
- ss.save_priority = getpriority( PRIO_PROCESS, pid );
-- setpriority( PRIO_PROCESS, pid, -12 );
-+ /* setpriority( PRIO_PROCESS, pid, -12 ); */
-
- if( ss.thread_running ) {
- /* jump start already running thread */
-diff -Naur src/main/async.c src/main/async.c
---- src/main/async.c 2005-01-07 16:25:34.661081736 +1100
-+++ src/main/async.c 2005-01-07 16:26:15.242912360 +1100
-@@ -191,7 +191,7 @@
- char ack_char;
-
- /* Increase priority to reduce latency */
-- setpriority( PRIO_PROCESS, getpid(), -17 );
-+ /* setpriority( PRIO_PROCESS, getpid(), -17 ); */
-
- while( !cancel_poll_thread ) {
- if( (num_pending=poll(ufds, num_poll, -1)) < 0 ) {
diff --git a/app-emulation/mol/files/mol-0.9.71_pre1-big-filesystem.patch b/app-emulation/mol/files/mol-0.9.71_pre1-big-filesystem.patch
deleted file mode 100644
index 4539a1a72c61..000000000000
--- a/app-emulation/mol/files/mol-0.9.71_pre1-big-filesystem.patch
+++ /dev/null
@@ -1,292 +0,0 @@
---- src/drivers/oldworld/scsi_main.c-orig 2004-03-21 23:20:39.000000000 +0100
-+++ src/drivers/oldworld/scsi_main.c 2004-12-13 19:14:53.286913872 +0100
-@@ -14,6 +14,10 @@
- *
- */
-
-+#ifdef __linux__
-+#define _FILE_OFFSET_BITS 64
-+#define _LARGE_FILES
-+#endif
- #include "mol_config.h"
-
- #include "booter.h"
---- src/drivers/oldworld/include/scsi_main.h-orig 2004-03-21 23:20:39.000000000 +0100
-+++ src/drivers/oldworld/include/scsi_main.h 2004-12-13 19:14:59.434979224 +0100
-@@ -14,6 +14,11 @@
- *
- */
-
-+#ifdef __linux__
-+#define _FILE_OFFSET_BITS 64
-+#define _LARGE_FILES
-+#endif
-+
- #ifndef _H_SCSI_MAIN
- #define _H_SCSI_MAIN
-
---- src/drivers/oldworld/scsi-unit.c-orig 2004-03-21 23:20:39.000000000 +0100
-+++ src/drivers/oldworld/scsi-unit.c 2004-12-13 19:15:05.629037584 +0100
-@@ -14,6 +14,11 @@
- *
- */
-
-+#ifdef __linux__
-+#define _FILE_OFFSET_BITS 64
-+#define _LARGE_FILES
-+#endif
-+
- #include "mol_config.h"
-
- /* #define VERBOSE */
---- src/drivers/oldworld/swim3.c-orig 2004-03-21 23:20:39.000000000 +0100
-+++ src/drivers/oldworld/swim3.c 2004-12-13 19:15:15.750498888 +0100
-@@ -20,6 +20,11 @@
- *
- */
-
-+#ifdef __linux__
-+#define _FILE_OFFSET_BITS 64
-+#define _LARGE_FILES
-+#endif
-+
- #include "mol_config.h"
- #include <pthread.h>
-
---- src/drivers/nvram.c-orig 2004-03-21 23:20:39.000000000 +0100
-+++ src/drivers/nvram.c 2004-12-13 19:15:22.200518336 +0100
-@@ -14,6 +14,11 @@
- *
- */
-
-+#ifdef __linux__
-+#define _FILE_OFFSET_BITS 64
-+#define _LARGE_FILES
-+#endif
-+
- #include "mol_config.h"
-
- #include <sys/param.h>
---- src/drivers/include/swim_hw.h-orig 2004-03-21 23:20:39.000000000 +0100
-+++ src/drivers/include/swim_hw.h 2004-12-13 19:15:27.816664552 +0100
-@@ -14,6 +14,11 @@
- *
- */
-
-+#ifdef __linux__
-+#define _FILE_OFFSET_BITS 64
-+#define _LARGE_FILES
-+#endif
-+
- #ifndef _H_SWIM_HW
- #define _H_SWIM_HW
-
---- src/drivers/osi_driver.c-orig 2004-03-21 23:20:39.000000000 +0100
-+++ src/drivers/osi_driver.c 2004-12-13 19:15:32.895892392 +0100
-@@ -15,6 +15,11 @@
- *
- */
-
-+#ifdef __linux__
-+#define _FILE_OFFSET_BITS 64
-+#define _LARGE_FILES
-+#endif
-+
- #include "mol_config.h"
- #include "promif.h"
- #include "booter.h"
---- src/drivers/disk/ablk.c-orig 2004-03-21 23:20:39.000000000 +0100
-+++ src/drivers/disk/ablk.c 2004-12-13 19:15:39.655864720 +0100
-@@ -14,6 +14,11 @@
- *
- */
-
-+#ifdef __linux__
-+#define _FILE_OFFSET_BITS 64
-+#define _LARGE_FILES
-+#endif
-+
- #include "mol_config.h"
- #include <sys/uio.h>
- #include <sys/resource.h>
---- src/drivers/disk/disk_open.c-orig 2004-12-13 19:09:16.799067000 +0100
-+++ src/drivers/disk/disk_open.c 2004-12-13 19:15:45.009050912 +0100
-@@ -14,6 +14,11 @@
- *
- */
-
-+#ifdef __linux__
-+#define _FILE_OFFSET_BITS 64
-+#define _LARGE_FILES
-+#endif
-+
- #include "mol_config.h"
-
- #include <sys/ioctl.h>
---- src/drivers/disk/blkdev.c-orig 2004-03-21 23:20:39.000000000 +0100
-+++ src/drivers/disk/blkdev.c 2004-12-13 19:15:57.653128720 +0100
-@@ -15,6 +15,11 @@
- *
- */
-
-+#ifdef __linux__
-+#define _FILE_OFFSET_BITS 64
-+#define _LARGE_FILES
-+#endif
-+
- #include "mol_config.h"
-
- #include <sys/time.h>
---- src/drivers/disk/ablk-cd.c-orig 2004-03-21 23:20:39.000000000 +0100
-+++ src/drivers/disk/ablk-cd.c 2004-12-13 19:16:04.395103784 +0100
-@@ -14,6 +14,11 @@
- *
- */
-
-+#ifdef __linux__
-+#define _FILE_OFFSET_BITS 64
-+#define _LARGE_FILES
-+#endif
-+
- #include "mol_config.h"
- #include <sys/uio.h>
- #include <sys/ioctl.h>
---- src/drivers/disk/pseudofs.c-orig 2004-03-21 23:20:39.000000000 +0100
-+++ src/drivers/disk/pseudofs.c 2004-12-13 19:16:09.277361568 +0100
-@@ -14,6 +14,11 @@
- *
- */
-
-+#ifdef __linux__
-+#define _FILE_OFFSET_BITS 64
-+#define _LARGE_FILES
-+#endif
-+
- #include "mol_config.h"
- #include <sys/stat.h>
- #include "pseudofs.h"
---- src/cpu/mpc107/init.c-orig 2004-03-21 23:20:39.000000000 +0100
-+++ src/cpu/mpc107/init.c 2004-12-13 19:16:14.513565544 +0100
-@@ -14,6 +14,11 @@
- *
- */
-
-+#ifdef __linux__
-+#define _FILE_OFFSET_BITS 64
-+#define _LARGE_FILES
-+#endif
-+
- #include "mol_config.h"
- #include <sys/mman.h>
- #include <sys/file.h>
---- src/booter/elf.c-orig 2004-03-21 23:20:39.000000000 +0100
-+++ src/booter/elf.c 2004-12-13 19:16:18.943892032 +0100
-@@ -14,6 +14,11 @@
- *
- */
-
-+#ifdef __linux__
-+#define _FILE_OFFSET_BITS 64
-+#define _LARGE_FILES
-+#endif
-+
- #include "mol_config.h"
- #include <sys/param.h>
- #include "booter.h"
---- src/main/promif.c-orig 2004-03-21 23:20:39.000000000 +0100
-+++ src/main/promif.c 2004-12-13 19:16:23.810152248 +0100
-@@ -14,6 +14,11 @@
- *
- */
-
-+#ifdef __linux__
-+#define _FILE_OFFSET_BITS 64
-+#define _LARGE_FILES
-+#endif
-+
- #include "mol_config.h"
- #include <sys/param.h>
- #include <stdarg.h>
---- src/main/memory.c-orig 2004-03-21 23:20:39.000000000 +0100
-+++ src/main/memory.c 2004-12-13 19:16:29.296318224 +0100
-@@ -13,6 +13,11 @@
- * as published by the Free Software Foundation
- */
-
-+#ifdef __linux__
-+#define _FILE_OFFSET_BITS 64
-+#define _LARGE_FILES
-+#endif
-+
- #include "mol_config.h"
- #include <sys/mman.h>
- #include "debugger.h"
---- src/main/session.c-orig 2004-03-21 23:20:39.000000000 +0100
-+++ src/main/session.c 2004-12-13 19:16:34.306556552 +0100
-@@ -14,6 +14,11 @@
- *
- */
-
-+#ifdef __linux__
-+#define _FILE_OFFSET_BITS 64
-+#define _LARGE_FILES
-+#endif
-+
- #include "mol_config.h"
- #include "session.h"
- #include "verbose.h"
---- src/include/llseek.h-orig 2004-03-21 23:20:39.000000000 +0100
-+++ src/include/llseek.h 2004-12-13 19:16:42.670285072 +0100
-@@ -14,6 +14,11 @@
- *
- */
-
-+#ifdef __linux__
-+#define _FILE_OFFSET_BITS 64
-+#define _LARGE_FILES
-+#endif
-+
- #ifndef _H_LONG_LSEEK
- #define _H_LONG_LSEEK
-
---- src/lib/llseek.c-orig 2004-12-13 19:09:16.798067000 +0100
-+++ src/lib/llseek.c 2004-12-13 19:16:52.386807936 +0100
-@@ -14,6 +14,11 @@
- *
- */
-
-+#ifdef __linux__
-+#define _FILE_OFFSET_BITS 64
-+#define _LARGE_FILES
-+#endif
-+
- #include "mol_config.h"
- #include <sys/ioctl.h>
- #include <sys/file.h>
---- src/lib/elfload.c-orig 2004-03-21 23:20:40.000000000 +0100
-+++ src/lib/elfload.c 2004-12-13 19:17:08.754319696 +0100
-@@ -29,6 +29,11 @@
- (at your option) any later version.
- */
-
-+#ifdef __linux__
-+#define _FILE_OFFSET_BITS 64
-+#define _LARGE_FILES
-+#endif
-+
- #include "mol_config.h"
- #include "elfload.h"
- #include "byteorder.h"
---- util/nvs/nvs.c-orig 2004-03-21 23:20:39.000000000 +0100
-+++ util/nvs/nvs.c 2004-12-13 19:17:18.003913544 +0100
-@@ -1,5 +1,10 @@
- /* Modified version of nvsetenv */
-
-+#ifdef __linux__
-+#define _FILE_OFFSET_BITS 64
-+#define _LARGE_FILES
-+#endif
-+
- #include "mol_config.h"
- #include <stdio.h>
- #include <fcntl.h>
diff --git a/app-emulation/mol/files/mol-0.9.71_pre1-linux-2.6.9.patch b/app-emulation/mol/files/mol-0.9.71_pre1-linux-2.6.9.patch
deleted file mode 100644
index dbff915ed248..000000000000
--- a/app-emulation/mol/files/mol-0.9.71_pre1-linux-2.6.9.patch
+++ /dev/null
@@ -1,80 +0,0 @@
---- mol-0.9.70.orig/src/netdriver/sheep.c
-+++ mol-0.9.70/src/netdriver/sheep.c
-@@ -25,12 +25,20 @@
- #include <linux/in.h>
- #include <linux/wait.h>
-
-+MODULE_AUTHOR("Marc Hellwig and Christian Bauer");
-+MODULE_DESCRIPTION("SheepShaver/Basilisk II networking");
- MODULE_LICENSE("GPL");
-
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
- #define LINUX_26
- #endif
-
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,9)
-+#define ETH_HDR(skb) eth_hdr((skb))
-+#else
-+#define ETH_HDR(skb) (skb)->mac.ethernet
-+#endif
-+
- #define DEBUG 0
-
- #define bug printk
-@@ -151,7 +159,7 @@
- static int
- sheep_net_receiver( struct sk_buff *skb, struct net_device *dev, struct packet_type *pt )
- {
-- int multicast = (skb->mac.ethernet->h_dest[0] & ETH_ADDR_MULTICAST);
-+ int multicast = (ETH_HDR(skb)->h_dest[0] & ETH_ADDR_MULTICAST);
- const char *laddr = dev->dev_addr;
- struct sk_buff *skb2;
- struct SheepVars *v = (struct SheepVars*)pt;
-@@ -165,7 +173,7 @@
-
- if( !multicast ) {
- // Drop, unless this is a localhost -> MOL transmission */
-- if( addrcmp((char*)&skb->mac.ethernet->h_dest, v->fake_addr) )
-+ if( addrcmp((char*)&ETH_HDR(skb)->h_dest, v->fake_addr) )
- goto drop;
-
- /* XXX: If it were possible, we would prevent the packet from beeing sent out
-@@ -176,16 +184,16 @@
- * the controller. This way, the packet ought to be discarded by
- * switches.
- */
-- cpyaddr( &skb->mac.ethernet->h_dest[0], laddr );
-+ cpyaddr( &ETH_HDR(skb)->h_dest[0], laddr );
- }
- } else {
- // is this a packet to the local host from MOL?
-- if( !addrcmp((char*)&skb->mac.ethernet->h_source, v->fake_addr) )
-+ if( !addrcmp((char*)&ETH_HDR(skb)->h_source, v->fake_addr) )
- goto drop;
-
- if( !multicast ) {
- // if the packet is not meant for this host, discard it
-- if( addrcmp((char*)&skb->mac.ethernet->h_dest, laddr) )
-+ if( addrcmp((char*)&ETH_HDR(skb)->h_dest, laddr) )
- goto drop;
-
- // filter IP-traffic
-@@ -213,7 +221,7 @@
- skb = skb2;
-
- if( !multicast )
-- cpyaddr( &skb->mac.ethernet->h_dest[0], v->fake_addr );
-+ cpyaddr( &ETH_HDR(skb)->h_dest[0], v->fake_addr );
-
- // We also want the Ethernet header
- skb_push( skb, skb->data - skb->mac.raw );
-@@ -394,7 +402,7 @@
- skb->mac.raw = skb->data;
-
- // Base the IP-filter on the IP address of outgoing ARPs
-- if( skb->mac.ethernet->h_proto == htons(ETH_P_ARP) ) {
-+ if( ETH_HDR(skb)->h_proto == htons(ETH_P_ARP) ) {
- char *s = &skb->data[14+14]; /* source IP-address */
- int n[4];
- if( *(long*)s != v->ipfilter ) {
---- mol-0.9.70.orig/debian/debian.mol-modules-source/control.m4
diff --git a/app-emulation/mol/files/mol-0.9.71_pre1-nopriority.patch b/app-emulation/mol/files/mol-0.9.71_pre1-nopriority.patch
deleted file mode 100644
index 43017d938640..000000000000
--- a/app-emulation/mol/files/mol-0.9.71_pre1-nopriority.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -Naur src/drivers/disk/ablk.c src/drivers/disk/ablk.c
---- src/drivers/disk/ablk.c 2005-01-07 16:25:34.540100128 +1100
-+++ src/drivers/disk/ablk.c 2005-01-07 16:28:05.243189776 +1100
-@@ -216,7 +216,7 @@
- io_thread( void *dummy )
- {
- char ch;
-- setpriority( PRIO_PROCESS, getpid(), -19 );
-+ /* setpriority( PRIO_PROCESS, getpid(), -19 ); */
-
- for( ;; ) {
- read( ablk.ctrl_pipe[0], &ch, 1 );
-diff -Naur src/drivers/sound/sound.c src/drivers/sound/sound.c
---- src/drivers/sound/sound.c 2005-01-07 16:25:34.491107576 +1100
-+++ src/drivers/sound/sound.c 2005-01-07 16:27:30.586458400 +1100
-@@ -248,7 +248,7 @@
- static void
- audio_thread( void *dummy )
- {
-- setpriority( PRIO_PROCESS, getpid(), -20 );
-+ /* setpriority( PRIO_PROCESS, getpid(), -20 ); */
-
- LOCK;
- if( ss.ringbuf )
-@@ -267,7 +267,7 @@
- ss.startboingbuf = NULL;
- }
- UNLOCK;
-- setpriority( PRIO_PROCESS, getpid(), 0 );
-+ /* setpriority( PRIO_PROCESS, getpid(), 0 ); */
- }
-
-
-@@ -341,7 +341,7 @@
- ss.started = 0;
-
- LOCK;
-- setpriority( PRIO_PROCESS, getpid(), ss.save_priority );
-+ /* setpriority( PRIO_PROCESS, getpid(), ss.save_priority ); */
-
- ss.thread_running = -1;
- irq_line_low( ss.irq );
-@@ -366,7 +366,7 @@
- ss.dbuf_go = 0;
-
- ss.save_priority = getpriority( PRIO_PROCESS, pid );
-- setpriority( PRIO_PROCESS, pid, -12 );
-+ /* setpriority( PRIO_PROCESS, pid, -12 ); */
-
- if( ss.thread_running ) {
- /* jump start already running thread */
-diff -Naur src/main/async.c src/main/async.c
---- src/main/async.c 2005-01-07 16:25:34.661081736 +1100
-+++ src/main/async.c 2005-01-07 16:26:15.242912360 +1100
-@@ -195,7 +195,7 @@
- char ack_char;
-
- /* Increase priority to reduce latency */
-- setpriority( PRIO_PROCESS, getpid(), -17 );
-+ /* setpriority( PRIO_PROCESS, getpid(), -17 ); */
-
- while( !cancel_poll_thread ) {
- if( (num_pending=poll(ufds, num_poll, -1)) < 0 ) {
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
deleted file mode 100644
index 201823771e90..000000000000
--- a/app-emulation/mol/files/mol-0.9.71_pre1-tmp-offset.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- 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/files/mol-module-fix.patch b/app-emulation/mol/files/mol-module-fix.patch
deleted file mode 100644
index 7fd7467be9ae..000000000000
--- a/app-emulation/mol/files/mol-module-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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/files/mol-tiger.patch b/app-emulation/mol/files/mol-tiger.patch
deleted file mode 100644
index 806537f4c2c0..000000000000
--- a/app-emulation/mol/files/mol-tiger.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-diff -Naur src/kmod/ptaccess.c mol-rsync/src/kmod/ptaccess.c
---- src/kmod/ptaccess.c 2004-07-24 18:44:02.000000000 +0200
-+++ mol-rsync/src/kmod/ptaccess.c 2005-07-15 00:38:28.000000000 +0200
-@@ -22,6 +22,7 @@
- #include "performance.h"
-
- extern int do_intercept_tlbie( kernel_vars_t *kv, ulong pte0, ulong pte1, ulong pteoffs );
-+extern int do_intercept_tlbie_block( kernel_vars_t *kv, ulong pteoffs, ulong length );
-
- #define MMU (kv->mmu)
- #define MREGS (kv->mregs)
-@@ -49,6 +50,37 @@
- return RVEC_NOP;
- }
-
-+int
-+do_intercept_tlbie_block( kernel_vars_t *kv, ulong pteoffs, ulong length )
-+{
-+ unsigned int finish;
-+
-+ //printk("do_intercept_tlbie_block: pteoffs %08lX length %08lX\n", pteoffs, length);
-+
-+ if (pteoffs + length > MMU.hash_mask) {
-+ printk("do_intercept_tlbie_block: length exceeding hash!\n");
-+ finish = MMU.hash_mask + 1;
-+ } else
-+ finish = pteoffs + length;
-+
-+ if (MMU.pthash_inuse_bits == NULL)
-+ return RVEC_NOP;
-+
-+ while (pteoffs < finish) {
-+ if (check_bit_mol(pteoffs >> 3, MMU.pthash_inuse_bits)) {
-+ ulong pte0, pte1;
-+
-+ pte0 = *((unsigned int *) (MMU.hash_base + pteoffs));
-+ pte1 = *((unsigned int *) (MMU.hash_base + pteoffs + 4));
-+ do_intercept_tlbie(kv, pte0, pte1, pteoffs);
-+ }
-+
-+ pteoffs += 8;
-+ }
-+
-+ return RVEC_NOP;
-+}
-+
- #ifdef EMULATE_603
-
- extern int do_tlbli( kernel_vars_t *kv, ulong ea );
-diff -Naur src/kmod/ptintercept.S mol-rsync/src/kmod/ptintercept.S
---- src/kmod/ptintercept.S 2004-07-24 18:44:02.000000000 +0200
-+++ mol-rsync/src/kmod/ptintercept.S 2005-07-15 00:31:21.000000000 +0200
-@@ -157,7 +157,6 @@
- do_stfiw:
- do_stswi:
- do_stswx:
--do_stmw:
- lwz r6,xNIP(r1)
- DEBUGGER_SAVE(0x1882) // unimplemented store instruction
-
-@@ -258,3 +257,47 @@
- // r4=PTE0, r5=PTE1
- LOADI r3,EXTERN(do_intercept_tlbie)
- b call_kernel
-+
-+ // stmw uses another emulator entry point because it might overwrite a bunch of PTEs
-+do_stmw:
-+ mtlr r4
-+
-+ // save some debugging info
-+// stw r2,xDBG_TRACE_SPACE(r1)
-+
-+ SET_MSR_DR /**/ r6
-+
-+ // now do the stmw. we do that manually since we have to access emulator regs.
-+ mr r4,r2 // r4: memory pointer
-+ srwi r6,r5,3 // r6: rS
-+1: cmpwi r5,32 << 3 // loop condition
-+ bge 2f
-+ EMU_LOAD_GPR r5, /**/ R3 // r0 = value
-+ stw r0,0(r4) // store the value
-+ addi r5,r5,1 << 3 // update register counter
-+ addi r4,r4,4 // and memory pointer
-+ b 1b
-+
-+2: CLEAR_MSR_DR /**/ r0
-+
-+ // load up r4 and r5 for do_intercept_tlbie_block (see below)
-+ subfic r5,r6,32 // number of registers (=words) stored
-+ slwi r5,r5,2 // number of bytes stored
-+ add r4,r2,r5 // last byte stored
-+ addi r4,r4,7 // alignment to
-+ rlwinm r5,r4,0,~0x7 // PTE size
-+ rlwinm r4,r2,0,~0x7 // pte block pointer
-+ sub r5,r5,r4 // substract block pointer -> length (in bytes)
-+ lwz r3,K_TLBHASH_BASE_EA(r1) // calculate tlb offset
-+ sub r4,r4,r3 // tlb offset
-+ b st_block_continue
-+
-+ // transfer to C-function [r2=dar, r4=pte block offset, r5=pte block length]
-+st_block_continue:
-+ BUMP("pt_intercept_taken")
-+ lwz r6,xNIP(r1)
-+ addi r6,r6,4 // inc NIP
-+ bl save_middle_regs
-+
-+ LOADI r3,EXTERN(do_intercept_tlbie_block)
-+ b call_kernel
-diff -Naur src/kmod/include/misc.h mol-rsync/kmod/include/misc.h
---- src/kmod/include/misc.h 2004-07-24 18:44:02.000000000 +0200
-+++ mol-rsync/src/kmod/include/misc.h 2005-06-19 18:56:51.000000000 +0200
-@@ -62,6 +68,14 @@
- *p &= ~mask;
- }
-
-+static inline int
-+check_bit_mol( int nr, char *addr )
-+{
-+ ulong mask = 1 << (nr & 0x1f);
-+ ulong *p = ((ulong*)addr) + (nr >> 5);
-+ return (*p & mask) != 0;
-+}
-+
- /* typesafe min/max (stolen from kernel.h) */
- #define min_mol(x,y) ({ \
- const typeof(x) _x = (x); \
diff --git a/app-emulation/mol/files/mol-uname.diff b/app-emulation/mol/files/mol-uname.diff
deleted file mode 100644
index 97b3fa6bd1b8..000000000000
--- a/app-emulation/mol/files/mol-uname.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- scripts/mol_uname.bak 2005-09-28 21:41:58.000000000 -0400
-+++ scripts/mol_uname 2005-09-28 21:42:24.000000000 -0400
-@@ -54,16 +54,7 @@
- # Determine the version string of the running kernel
- ###########################################################
-
--unset SMP ALTIVEC
--cat /proc/version | grep SMP > /dev/null
--[ $? == 0 ] && SMP="-smp"
--
--#only bother about altivec in 2.4
--if [ -f /proc/ksyms ] ; then
-- grep altivec /proc/ksyms > /dev/null
-- [ $? != 0 ] && ALTIVEC="-noav"
--fi
--THIS_UNAME=`uname -r`$SMP$ALTIVEC
-+THIS_UNAME=`uname -r`
-
-
- ###########################################################
diff --git a/app-emulation/mol/files/mol-verify_area.diff b/app-emulation/mol/files/mol-verify_area.diff
deleted file mode 100644
index 6f1a30d9a90c..000000000000
--- a/app-emulation/mol/files/mol-verify_area.diff
+++ /dev/null
@@ -1,157 +0,0 @@
-diff -ur src/kmod/include/misc.h src/kmod/include/misc.h
---- src/kmod/include/misc.h 2005-09-14 13:30:23.362968000 +0200
-+++ src/kmod/include/misc.h 2005-09-14 13:31:26.170893250 +0200
-@@ -17,6 +17,21 @@
- #ifndef _H_MOD
- #define _H_MOD
-
-+/*
-+ * * Nico
-+ * */
-+
-+#include <linux/version.h>
-+#include <asm/uaccess.h>
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+#define compat_verify_area(a,b,c) ( ! access_ok(a,b,c) )
-+#else
-+#define compat_verify_area(a,b,c) verify_area(a,b,c)
-+#endif
-+
-+
-+
- extern int g_num_sessions; /* number of active sessions */
-
- struct kernel_vars;
-diff -ur src/kmod/Linux/dev.c src/kmod/Linux/dev.c
---- src/kmod/Linux/dev.c 2005-09-14 13:30:23.302964250 +0200
-+++ src/kmod/Linux/dev.c 2005-09-14 13:31:38.319652500 +0200
-@@ -153,7 +153,7 @@
-
- switch( cmd ) {
- case MOL_IOCTL_GET_DIRTY_FBLINES: /* short *retbuf, int size -- npairs */
-- if( verify_area(VERIFY_WRITE, (short*)p1, p2) )
-+ if( compat_verify_area(VERIFY_WRITE, (short*)p1, p2) )
- break;
- ret = get_dirty_fb_lines( kv, (short*)p1, p2 );
- break;
-@@ -188,7 +188,7 @@
- break;
-
- case MOL_IOCTL_SET_RAM: /* void ( char *lvbase, size_t size ) */
-- if( verify_area(VERIFY_WRITE, (char*)p1, p2) )
-+ if( compat_verify_area(VERIFY_WRITE, (char*)p1, p2) )
- break;
- kv->mmu.linux_ram_base = (char*)p1;
- kv->mmu.ram_size = p2;
-diff -ur src/netdriver/sheep.c src/netdriver/sheep.c
---- src/netdriver/sheep.c 2005-09-14 13:30:24.479037750 +0200
-+++ src/netdriver/sheep.c 2005-09-14 13:31:11.169955750 +0200
-@@ -80,7 +80,13 @@
- */
-
- #ifdef LINUX_26
-+
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12))
-+#define compat_sk_alloc(a,b,c) sk_alloc( (a), (b), &mol_proto, 1 )
-+#else
- #define compat_sk_alloc(a,b,c) sk_alloc( (a), (b), (c), NULL )
-+#endif
-+
- #define skt_set_dead(skt) do {} while(0)
- #define wmem_alloc sk_wmem_alloc
- #else
-@@ -156,8 +162,14 @@
- * the IP address is wrong.)
- */
-
-+
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,14))
-+static int
-+sheep_net_receiver( struct sk_buff *skb, struct net_device *dev, struct packet_type *pt, struct net_device *orig_dev )
-+#else
- static int
- sheep_net_receiver( struct sk_buff *skb, struct net_device *dev, struct packet_type *pt )
-+#endif
- {
- int multicast = (ETH_HDR(skb)->h_dest[0] & ETH_ADDR_MULTICAST);
- const char *laddr = dev->dev_addr;
-@@ -242,6 +254,15 @@
- /************************************************************************/
- /* misc device ops */
- /************************************************************************/
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12))
-+static struct proto mol_proto =
-+{
-+ .name = "MOL",
-+ .owner = THIS_MODULE,
-+ .obj_size = sizeof(struct sock)
-+};
-+#endif
-+
-
- static int
- sheep_net_open( struct inode *inode, struct file *f )
-@@ -286,6 +318,10 @@
- while( (skb=skb_dequeue(&v->queue)) )
- kfree_skb(skb);
-
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12))
-+ proto_unregister(&mol_proto);
-+#endif
-+
- // Free private variables
- kfree(v);
- return 0;
-diff -ur src/netdriver/tun.c src/netdriver/tun.c
---- src/netdriver/tun.c 2005-09-14 13:30:24.471037250 +0200
-+++ src/netdriver/tun.c 2005-09-14 13:31:15.082200250 +0200
-@@ -240,7 +240,7 @@
- DBG(KERN_INFO "%s: tun_chr_write %d\n", tun->name, count);
-
- for (i = 0, len = 0; i < count; i++) {
-- if (verify_area(VERIFY_READ, iv[i].iov_base, iv[i].iov_len))
-+ if (compat_verify_area(VERIFY_READ, iv[i].iov_base, iv[i].iov_len))
- return -EFAULT;
- len += iv[i].iov_len;
- }
-@@ -304,7 +304,7 @@
- DBG(KERN_INFO "%s: tun_chr_read\n", tun->name);
-
- for (i = 0, len = 0; i < count; i++) {
-- if (verify_area(VERIFY_WRITE, iv[i].iov_base, iv[i].iov_len))
-+ if (compat_verify_area(VERIFY_WRITE, iv[i].iov_base, iv[i].iov_len))
- return -EFAULT;
- len += iv[i].iov_len;
- }
-diff -ur src/netdriver/sheep.c src/netdriver/sheep.c
---- src/netdriver/sheep.c 2005-09-28 22:10:36.000000000 -0400
-+++ src/netdriver/sheep.c 2005-09-28 22:13:44.000000000 -0400
-@@ -271,14 +271,25 @@
- struct SheepVars *v;
- D(bug("sheep_net: open\n"));
-
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12))
-+ if (proto_register(&mol_proto,0) < 0)
-+ {
-+ printk(KERN_INFO "Unable to register protocol type\n");
-+ return -1;
-+ }
-+#endif
-+
- // Must be opened with read permissions
- if( (f->f_flags & O_ACCMODE) == O_WRONLY )
- return -EPERM;
-
- // Allocate private variables
-- f->private_data = v = (struct SheepVars *)kmalloc( sizeof(*v), GFP_USER );
-- if( !v )
-+ f->private_data = kmalloc(sizeof(struct SheepVars), GPF_USER);
-+ if( f->private_data == NULL)
- return -ENOMEM;
-+
-+ v = (struct SheepVars *) f->private_data;
-+
- memset( v, 0, sizeof(*v) );
- memcpy( v->fake_addr, fake_addr_, 6 );
-
diff --git a/app-emulation/mol/mol-0.9.70-r1.ebuild b/app-emulation/mol/mol-0.9.70-r1.ebuild
deleted file mode 100644
index cb06af39bf18..000000000000
--- a/app-emulation/mol/mol-0.9.70-r1.ebuild
+++ /dev/null
@@ -1,112 +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.70-r1.ebuild,v 1.2 2005/08/06 21:05:49 carlo Exp $
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="MOL (Mac-on-Linux) lets PPC users run MacOS (X) under Linux"
-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"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-DEPEND=""
-RDEPEND="net-misc/dhcp
- net-firewall/iptables
- alsa? ( virtual/alsa )
- vnc? ( net-misc/vnc )
- X? ( virtual/x11 )"
-
-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
-}
-
-src_unpack() {
- unpack ${A}
-
- # 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
-
- 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
- epatch ${FILESDIR}/${P}-nopriority.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
- 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
- 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
- use vnc || sed -i "s:CONFIG_VNC=y:# CONFIG_VNC is not set:" .config
-
- einfo "The configuration has been altered according to your USE-flags."
- # reinitialize our changed configuration
- make oldconfig
-
- addwrite "/usr/src/${FK}"
- make || die "Build mol with: FEATURES=\"-userpriv -usersandbox\" emerge mol"
-}
-
-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/*
-}
-
-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 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
-}
diff --git a/app-emulation/mol/mol-0.9.70.ebuild b/app-emulation/mol/mol-0.9.70.ebuild
deleted file mode 100644
index ff7a1b2c1c6d..000000000000
--- a/app-emulation/mol/mol-0.9.70.ebuild
+++ /dev/null
@@ -1,116 +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.70.ebuild,v 1.15 2005/08/06 21:05:49 carlo Exp $
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="MOL (Mac-on-Linux) lets PPC users run MacOS (X) under Linux"
-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"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-DEPEND=""
-RDEPEND="net-misc/dhcp
- net-firewall/iptables
- alsa? ( virtual/alsa )
- vnc? ( net-misc/vnc )
- X? ( virtual/x11 )"
-
-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
-}
-
-src_unpack() {
- unpack ${A}
-
- # 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
-
- 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
-echo -- "$LDFLAGS"
- # See bug #70367, remove -Wl,-O? from LDFLAGS as it causes
- # the compilation to fail.
- filter-ldflags "-Wl,-O?"
-echo -- "$LDFLAGS"
-
- export KERNEL_SOURCE="/usr/src/${FK}"
- export LDFLAGS=""
-
- # initialize all needed build-files
- ./autogen.sh
- #workaround
- ./configure --disable-png
- 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
- 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
- use vnc || sed -i "s:CONFIG_VNC=y:# CONFIG_VNC is not set:" .config
-
- einfo "The configuration has been altered according to your USE-flags."
- # reinitialize our changed configuration
- make oldconfig
-
- addwrite "/usr/src/${FK}"
- make || die "Build mol with: FEATURES=\"-userpriv -usersandbox\" emerge mol"
-}
-
-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/*
-}
-
-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 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
-}
diff --git a/app-emulation/mol/mol-0.9.71_pre1-r3.ebuild b/app-emulation/mol/mol-0.9.71_pre1-r3.ebuild
deleted file mode 100644
index 77c582a6b327..000000000000
--- a/app-emulation/mol/mol-0.9.71_pre1-r3.ebuild
+++ /dev/null
@@ -1,157 +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.71_pre1-r3.ebuild,v 1.1 2005/09/29 03:05:43 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
- mirror://gentoo/bootx.gz
- mirror://gentoo/mol-pciproxy.patch.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)
- 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() {
- unpack ${A}
-
- cd ${S}
- epatch ${FILESDIR}/${PN}-module-fix.patch
- epatch ${FILESDIR}/${P}-nopriority.patch
-
- # Fixes bug 79428
- epatch ${FILESDIR}/${P}-linux-2.6.9.patch
-
- # 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
-
- # Add tiger support to MOL
- epatch ${FILESDIR}/${PN}-tiger.patch
-
- # Add new bootloader
- # Boot loader courtesy of http://www-user.rkrk.uni-kl.de/~nissler/mol/
- cp ${WORKDIR}/bootx ${S}/libimport/drivers/bootx
- cp ${WORKDIR}/bootx ${S}/mollib/drivers/bootx
-
- # PCI Proxy Patch
- epatch ${WORKDIR}/${PN}-pciproxy.patch
- # PCI Debugging Patch
- if use debug; then
- epatch ${FILESDIR}/${PN}-pciproxy-dump.patch
- fi
-
- # uname fix
- epatch ${FILESDIR}/${PN}-uname.diff
-
- # Kernel 2.12+ patch
- epatch ${FILESDIR}/${PN}-verify_area.diff
-}
-
-src_compile() {
- filter-flags -fsigned-char
-
- 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
- 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 is not set:CONFIG_PCIPROXY=y:" .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
-}
-
-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 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.71_pre6.ebuild b/app-emulation/mol/mol-0.9.71_pre6.ebuild
deleted file mode 100644
index 4d757ac0dee2..000000000000
--- a/app-emulation/mol/mol-0.9.71_pre6.ebuild
+++ /dev/null
@@ -1,129 +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.71_pre6.ebuild,v 1.2 2005/12/31 22:41:12 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
-}
diff --git a/app-emulation/mol/mol-0.9.71_pre7.ebuild b/app-emulation/mol/mol-0.9.71_pre7.ebuild
deleted file mode 100644
index 646ba40c5a6c..000000000000
--- a/app-emulation/mol/mol-0.9.71_pre7.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# 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_pre7.ebuild,v 1.2 2006/01/25 03:49:18 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
-}
-
-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
-}