Remove old.

(Portage version: 2.2_rc6/cvs/Linux 2.6.25-gentoo-r6 i686)

5 files changed, 41 insertions, 185 deletions

diff --git a/app-emulation/xtrs/ChangeLog b/app-emulation/xtrs/ChangeLog
index ee638c3934ef..7ed4883866db 100644
--- a/app-emulation/xtrs/ChangeLog
+++ b/app-emulation/xtrs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/xtrs
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xtrs/ChangeLog,v 1.30 2008/08/08 19:05:37 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xtrs/ChangeLog,v 1.31 2008/08/08 23:06:31 ulm Exp $
+
+  08 Aug 2008; Ulrich Mueller <ulm@gentoo.org> files/xtrs-4.9c-gentoo.patch,
+  -files/xtrs-4.9c-r2-gentoo.patch, -xtrs-4.9c-r1.ebuild,
+  xtrs-4.9c-r2.ebuild:
+  Remove old.
 
   08 Aug 2008; Markus Meier <maekke@gentoo.org> xtrs-4.9c-r2.ebuild:
   amd64/x86 stable, bug #233687
diff --git a/app-emulation/xtrs/files/xtrs-4.9c-gentoo.patch b/app-emulation/xtrs/files/xtrs-4.9c-gentoo.patch
index c9f5029b6afc..27f1ee1a0fcc 100644
--- a/app-emulation/xtrs/files/xtrs-4.9c-gentoo.patch
+++ b/app-emulation/xtrs/files/xtrs-4.9c-gentoo.patch
@@ -1,80 +1,54 @@
-diff -Nur xtrs-4.9c-orig/ChangeLog xtrs-4.9c/ChangeLog
---- xtrs-4.9c-orig/ChangeLog	2006-05-15 02:55:28.000000000 +0200
-+++ xtrs-4.9c/ChangeLog	2007-04-25 22:12:20.000000000 +0200
-@@ -1,3 +1,11 @@
-+4.9c-Gentoo -- Sat Apr 21 14:37:00 MDT 2007  Joe Peterson <joe@skyrush.com>
+diff -Nurp xtrs-4.9c-orig/ChangeLog xtrs-4.9c/ChangeLog
+--- xtrs-4.9c-orig/ChangeLog	2006-05-14 18:55:28.000000000 -0600
++++ xtrs-4.9c/ChangeLog	2008-06-26 16:57:23.000000000 -0600
+@@ -1,3 +1,13 @@
++4.9c-Gentoo -- Thu Jun 26 16:57:16 MDT 2008 -- Joe Peterson <joe@skyrush.com>
 +
 +* Patched for Gentoo ebuild
 +  - Added assignment to volatile variable in the z80 delay loop
 +    (allows near-actual speed emulation with optimization)
 +  - Fixed keyboard wait issue that caused CPU spinning (i.e. max
 +    CPU usage) after using F10 (reset), F7, F8, or F9.
++  - Disable SIGIO
++  - Added NEWDOS/80 system date/time auto-initialization
 +
  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 -Nur xtrs-4.9c-orig/main.c xtrs-4.9c/main.c
---- xtrs-4.9c-orig/main.c	2002-04-14 09:03:43.000000000 +0200
-+++ xtrs-4.9c/main.c	2007-04-25 22:12:20.000000000 +0200
-@@ -26,7 +26,7 @@
- #include "trs_disk.h"
- #include "load_cmd.h"
+diff -Nurp xtrs-4.9c-orig/Makefile xtrs-4.9c/Makefile
+--- xtrs-4.9c-orig/Makefile	2006-05-13 15:10:25.000000000 -0600
++++ xtrs-4.9c/Makefile	2008-06-26 16:48:15.000000000 -0600
+@@ -143,7 +143,7 @@ z80code: $(Z80CODE)
+ include Makefile.local
  
--int trs_model = 1;
-+int trs_model = 5;
- int trs_paused = 1;
- int trs_autodelay = 0;
- char *program_name;
-diff -Nur xtrs-4.9c-orig/trs.h xtrs-4.9c/trs.h
---- xtrs-4.9c-orig/trs.h	2006-05-13 23:05:59.000000000 +0200
-+++ xtrs-4.9c/trs.h	2007-04-25 22:12:20.000000000 +0200
-@@ -67,6 +67,7 @@
- extern void queue_key(int key);
- extern int dequeue_key(void);
- extern void clear_key_queue(void);
-+extern void trs_start_kbwait(void);
- extern void trs_end_kbwait(void);
- extern int stretch_amount;
+ CFLAGS = $(DEBUG) $(ENDIAN) $(DEFAULT_ROM) $(READLINE) $(DISKDIR) $(IFLAGS) \
+-       $(APPDEFAULTS) -DKBWAIT -DHAVE_SIGIO
++       $(APPDEFAULTS) -DKBWAIT
+ LIBS = $(XLIB) $(READLINELIBS) $(EXTRALIBS)
  
-diff -Nur xtrs-4.9c-orig/trs_keyboard.c xtrs-4.9c/trs_keyboard.c
---- xtrs-4.9c-orig/trs_keyboard.c	2006-05-13 22:50:17.000000000 +0200
-+++ xtrs-4.9c/trs_keyboard.c	2007-04-25 22:12:20.000000000 +0200
-@@ -983,6 +983,12 @@
- }
- 
- void
-+trs_start_kbwait()
-+{
-+  key_immediate = 0;
-+}
-+
-+void
- trs_end_kbwait()
- {
-   key_immediate = 1;
-@@ -1003,7 +1009,6 @@
+ ZMACFLAGS = -h
+diff -Nurp xtrs-4.9c-orig/trs_keyboard.c xtrs-4.9c/trs_keyboard.c
+--- xtrs-4.9c-orig/trs_keyboard.c	2006-05-13 14:50:17.000000000 -0600
++++ xtrs-4.9c/trs_keyboard.c	2008-06-26 16:46:03.000000000 -0600
+@@ -998,12 +998,12 @@ int trs_next_key(int wait)
+       if ((z80_state.nmi && !z80_state.nmi_seen) ||
+ 	  (z80_state.irq && z80_state.iff1) ||
+ 	  trs_event_scheduled() || key_immediate) {
++	key_immediate = 0;
+ 	rval = -1;
+ 	break;
        }
        trs_paused = 1;
-       pause();			/* Wait for SIGALRM or SIGIO */
+-      pause();			/* Wait for SIGALRM or SIGIO */
 -      key_immediate = 0;
++      pause();			/* Wait for SIGALRM */
        trs_get_event(0);
      }
      return rval;
-diff -Nur xtrs-4.9c-orig/trs_xinterface.c xtrs-4.9c/trs_xinterface.c
---- xtrs-4.9c-orig/trs_xinterface.c	2006-05-13 23:33:51.000000000 +0200
-+++ xtrs-4.9c/trs_xinterface.c	2007-04-25 22:12:20.000000000 +0200
-@@ -920,6 +920,7 @@
-     (void)trs_uart_check_avail();
-   }
- 
-+  trs_start_kbwait();
-   do {
-     if (wait) {
-       XNextEvent(display, &event);
-diff -Nur xtrs-4.9c-orig/z80.c xtrs-4.9c/z80.c
---- xtrs-4.9c-orig/z80.c	2005-05-22 08:57:01.000000000 +0200
-+++ xtrs-4.9c/z80.c	2007-04-25 22:12:20.000000000 +0200
-@@ -3027,7 +3027,8 @@
+diff -Nurp xtrs-4.9c-orig/z80.c xtrs-4.9c/z80.c
+--- xtrs-4.9c-orig/z80.c	2005-05-22 00:57:01.000000000 -0600
++++ xtrs-4.9c/z80.c	2008-06-26 16:44:32.000000000 -0600
+@@ -3027,7 +3027,8 @@ int z80_run(int continuous)
  #endif
          /* Speed control */
          if ((i = z80_state.delay)) {
diff --git a/app-emulation/xtrs/files/xtrs-4.9c-r2-gentoo.patch b/app-emulation/xtrs/files/xtrs-4.9c-r2-gentoo.patch
deleted file mode 100644
index 27f1ee1a0fcc..000000000000
--- a/app-emulation/xtrs/files/xtrs-4.9c-r2-gentoo.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -Nurp xtrs-4.9c-orig/ChangeLog xtrs-4.9c/ChangeLog
---- xtrs-4.9c-orig/ChangeLog	2006-05-14 18:55:28.000000000 -0600
-+++ xtrs-4.9c/ChangeLog	2008-06-26 16:57:23.000000000 -0600
-@@ -1,3 +1,13 @@
-+4.9c-Gentoo -- Thu Jun 26 16:57:16 MDT 2008 -- Joe Peterson <joe@skyrush.com>
-+
-+* Patched for Gentoo ebuild
-+  - Added assignment to volatile variable in the z80 delay loop
-+    (allows near-actual speed emulation with optimization)
-+  - Fixed keyboard wait issue that caused CPU spinning (i.e. max
-+    CPU usage) after using F10 (reset), F7, F8, or F9.
-+  - Disable SIGIO
-+  - Added NEWDOS/80 system date/time auto-initialization
-+
- 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 -Nurp xtrs-4.9c-orig/Makefile xtrs-4.9c/Makefile
---- xtrs-4.9c-orig/Makefile	2006-05-13 15:10:25.000000000 -0600
-+++ xtrs-4.9c/Makefile	2008-06-26 16:48:15.000000000 -0600
-@@ -143,7 +143,7 @@ z80code: $(Z80CODE)
- include Makefile.local
- 
- CFLAGS = $(DEBUG) $(ENDIAN) $(DEFAULT_ROM) $(READLINE) $(DISKDIR) $(IFLAGS) \
--       $(APPDEFAULTS) -DKBWAIT -DHAVE_SIGIO
-+       $(APPDEFAULTS) -DKBWAIT
- LIBS = $(XLIB) $(READLINELIBS) $(EXTRALIBS)
- 
- ZMACFLAGS = -h
-diff -Nurp xtrs-4.9c-orig/trs_keyboard.c xtrs-4.9c/trs_keyboard.c
---- xtrs-4.9c-orig/trs_keyboard.c	2006-05-13 14:50:17.000000000 -0600
-+++ xtrs-4.9c/trs_keyboard.c	2008-06-26 16:46:03.000000000 -0600
-@@ -998,12 +998,12 @@ int trs_next_key(int wait)
-       if ((z80_state.nmi && !z80_state.nmi_seen) ||
- 	  (z80_state.irq && z80_state.iff1) ||
- 	  trs_event_scheduled() || key_immediate) {
-+	key_immediate = 0;
- 	rval = -1;
- 	break;
-       }
-       trs_paused = 1;
--      pause();			/* Wait for SIGALRM or SIGIO */
--      key_immediate = 0;
-+      pause();			/* Wait for SIGALRM */
-       trs_get_event(0);
-     }
-     return rval;
-diff -Nurp xtrs-4.9c-orig/z80.c xtrs-4.9c/z80.c
---- xtrs-4.9c-orig/z80.c	2005-05-22 00:57:01.000000000 -0600
-+++ xtrs-4.9c/z80.c	2008-06-26 16:44:32.000000000 -0600
-@@ -3027,7 +3027,8 @@ int z80_run(int continuous)
- #endif
-         /* Speed control */
-         if ((i = z80_state.delay)) {
--	    while (--i) /*nothing*/;
-+	    volatile int dummy;
-+	    while (--i) dummy = i;
- 	}
- 
- 	instruction = mem_read(REG_PC++);
diff --git a/app-emulation/xtrs/xtrs-4.9c-r1.ebuild b/app-emulation/xtrs/xtrs-4.9c-r1.ebuild
deleted file mode 100644
index 1c269b2ddb28..000000000000
--- a/app-emulation/xtrs/xtrs-4.9c-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xtrs/xtrs-4.9c-r1.ebuild,v 1.4 2008/05/01 09:19:19 dertobi123 Exp $
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="Radio Shack TRS-80 emulator"
-HOMEPAGE="http://www.tim-mann.org/xtrs.html"
-SRC_URI="http://www.tim-mann.org/trs80/${P}.tar.gz
-	http://home.gwi.net/~plemon/support/disks/xtrs/ld4-631.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="sys-libs/ncurses
-	sys-libs/readline
-	>=x11-libs/libX11-1.0.0"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	tar xzf	"${DISTDIR}/ld4-631.tar.gz" disks || die "tar failed"
-
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-	epatch "${FILESDIR}/${P}-newdos-datetime.patch"
-}
-
-src_compile() {
-	use ppc && append-flags -Dbig_endian
-	emake CC="$(tc-getCC)" DEBUG="${CFLAGS}" \
-		DISKDIR="-DDISKDIR='\"/usr/share/xtrs\"'" \
-		DEFAULT_ROM="-DDEFAULT_ROM='\"/usr/share/xtrs/romimage\"' \
-			-DDEFAULT_ROM3='\"/usr/share/xtrs/romimage.m3\"' \
-			-DDEFAULT_ROM4P='\"/usr/share/xtrs/romimage.m4p\"'" \
-		|| die "emake failed"
-}
-
-src_install() {
-	dodir /usr/bin /usr/share/xtrs/disks /usr/share/man/man1
-	emake PREFIX="${D}"/usr install || die "emake install failed"
-
-	insopts -m0444
-	insinto /usr/share/xtrs/disks
-	doins cpmutil.dsk utility.dsk "${WORKDIR}"/disks/ld4-631.dsk
-	dosym disks/ld4-631.dsk /usr/share/xtrs/disk4p-0
-	dosym disks/utility.dsk /usr/share/xtrs/disk4p-1
-
-	dodoc ChangeLog README xtrsrom4p.README cpmutil.html dskspec.html \
-		|| die "dodoc failed"
-}
-
-pkg_postinst() {
-	elog "For copyright reasons, xtrs does not include ROM images."
-	elog "If you already own a copy of the ROM software (e.g., if you have"
-	elog "a TRS-80 with this ROM), then you can make yourself a copy of this"
-	elog "for use with xtrs. You can get such a copy also from elsewhere on"
-	elog "the web. You may install the ROM images in directory /usr/share/xtrs"
-	elog "as files \"romimage\", \"romimage.m3\", or \"romimage.m4p\", for"
-	elog "Model I, III, or 4P, respectively. (Model 4 uses the same ROM image"
-	elog "as Model III.) The files may be in Intel hex or binary format."
-}
diff --git a/app-emulation/xtrs/xtrs-4.9c-r2.ebuild b/app-emulation/xtrs/xtrs-4.9c-r2.ebuild
index 89d849804969..d4ceb083e81d 100644
--- a/app-emulation/xtrs/xtrs-4.9c-r2.ebuild
+++ b/app-emulation/xtrs/xtrs-4.9c-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xtrs/xtrs-4.9c-r2.ebuild,v 1.3 2008/08/08 19:05:37 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xtrs/xtrs-4.9c-r2.ebuild,v 1.4 2008/08/08 23:06:31 ulm Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -23,7 +23,7 @@ src_unpack() {
 	tar xzf	"${DISTDIR}/ld4-631.tar.gz" disks || die "tar failed"
 
 	cd "${S}"
-	epatch "${FILESDIR}/${PF}-gentoo.patch"
+	epatch "${FILESDIR}/${P}-gentoo.patch"
 	epatch "${FILESDIR}/${P}-newdos-datetime.patch"
 }