diff -ur xtrs-4.9c/ChangeLog xtrs-4.9c-new/ChangeLog
--- xtrs-4.9c/ChangeLog	2006-05-14 18:55:28.000000000 -0600
+++ xtrs-4.9c-new/ChangeLog	2007-02-13 12:44:50.000000000 -0700
@@ -1,3 +1,12 @@
+4.9c-Gentoo -- Tue Feb 13 12:42:00 MST 2007  Joe Peterson <joe@skyrush.com>
+
+* Patched for Gentoo Linux ebuild
+  - Changed default romtype to Model 4P OSS Freeware ROM Image
+    to avoid potential copyright infringement (same patch from
+    previous ebuild xtrs-4.9-r1)
+  - Disabled compiler optimization to allow "delay" option to work
+    (allows near-actual speed emulation)
+
 4.9c -- Sun May 14 17:54:25 PDT 2006 -- Tim Mann
 
 * Fixed the new -e flag on import/cmd and export/cmd to actually
diff -ur xtrs-4.9c/main.c xtrs-4.9c-new/main.c
--- xtrs-4.9c/main.c	2002-04-14 01:03:43.000000000 -0600
+++ xtrs-4.9c-new/main.c	2007-02-13 10:44:49.000000000 -0700
@@ -26,7 +26,7 @@
 #include "trs_disk.h"
 #include "load_cmd.h"
 
-int trs_model = 1;
+int trs_model = 5;
 int trs_paused = 1;
 int trs_autodelay = 0;
 char *program_name;
diff -ur xtrs-4.9c/Makefile.local xtrs-4.9c-new/Makefile.local
--- xtrs-4.9c/Makefile.local	2006-05-13 15:10:36.000000000 -0600
+++ xtrs-4.9c-new/Makefile.local	2007-02-13 12:12:47.000000000 -0700
@@ -25,25 +25,25 @@
 # is included in this package.  This ROM cannot boot a Model III mode
 # operating system.
 
-# for -model I
-BUILT_IN_ROM = fakerom.hex
-# for -model III and -model 4
-BUILT_IN_ROM3 = fakerom.hex
-# for -model 4P
-BUILT_IN_ROM4P = xtrsrom4p.hex
+## for -model I
+#BUILT_IN_ROM = fakerom.hex
+## for -model III and -model 4
+#BUILT_IN_ROM3 = fakerom.hex
+## for -model 4P
+#BUILT_IN_ROM4P = xtrsrom4p.hex
 
 # If you would like the application to load a default ROM file at startup
 # time, use these lines (with the appropriate file names).  The default file
 # name is ignored and can be omitted if the ROM for that model is built in.
 
-DEFAULT_ROM = -DDEFAULT_ROM='"/usr/local/lib/xtrs/level2rom.hex"' \
-              -DDEFAULT_ROM3='"/usr/local/lib/xtrs/romimage.m3"' \
-              -DDEFAULT_ROM4P='"/usr/local/lib/xtrs/romimage.m4p"'
+DEFAULT_ROM = -DDEFAULT_ROM='"/usr/share/xtrs/fakerom.hex"' \
+              -DDEFAULT_ROM3='"/usr/share/xtrs/fakerom.hex"' \
+              -DDEFAULT_ROM4P='"/usr/share/xtrs/xtrsrom4p.hex"'
 
 # If you would like to change where xtrs looks for disk?-? files, edit
 # this line.  "." of course means the current working directory.
 
-DISKDIR = -DDISKDIR='"."'
+DISKDIR = -DDISKDIR='"/usr/share/xtrs/"'
 
 # If you have the GNU readline package (the README file tells you where to
 # get it) and would like to use it with the built-in Z-80 debugger, use
@@ -54,10 +54,14 @@
 
 # If you want to debug the emulator, use the -g flag instead:
 
-DEBUG = -O2 -g
+#DEBUG = -O2 -g
 #DEBUG = -g -DKBDEBUG -DXDEBUG
 #DEBUG = -g
 #DEBUG = -Wall
+# We do not want to optimize, since this causes the "delay" option
+# to have no effect.  This option can be used to slow the emulator
+# to near-actual TRS-80 speed, and therefore is a good thing to have.
+DEBUG=
 
 # If you have gcc, and you want to use it:
 
@@ -89,7 +93,7 @@
 
 # prefix directory
 
-PREFIX=/usr/local
+PREFIX=${D}/usr
 #If included in distribution: PREFIX=/usr
 
 # Set these to where you want installed stuff to go, if you install them.
@@ -103,8 +107,6 @@
 INSTALL = install
 
 # If you are building in a subdirectory:
-#vpath %.c ..
-#vpath %.h ..
-#vpath %.man ..
-#old way:
-#VPATH = ..
+vpath %.c $(PREFIX)/bin
+vpath %.h $(PREFIX)/bin
+vpath %.man $(PREFIX)/share/man