Respect LDFLAGS, bug 337941. Remove old.

(Portage version: 2.2_rc83/cvs/Linux x86_64)

5 files changed, 8 insertions, 196 deletions

diff --git a/app-emulation/xtrs/ChangeLog b/app-emulation/xtrs/ChangeLog
index 7aabef5a051e..4cad4f3bee8d 100644
--- a/app-emulation/xtrs/ChangeLog
+++ b/app-emulation/xtrs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/xtrs
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xtrs/ChangeLog,v 1.37 2010/01/13 01:01:12 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xtrs/ChangeLog,v 1.38 2010/09/18 15:01:37 ulm Exp $
+
+  18 Sep 2010; Ulrich Mueller <ulm@gentoo.org> -xtrs-4.9c-r2.ebuild,
+  -files/xtrs-4.9c-gentoo.patch, -files/xtrs-4.9c-newdos-datetime.patch,
+  xtrs-4.9d.ebuild:
+  Respect LDFLAGS, bug 337941. Remove old.
 
   13 Jan 2010; Joe Peterson <lavajoe@gentoo.org> xtrs-4.9d.ebuild:
   Change SRC_URI of LS-DOS disk image (the old one no longer exists)
diff --git a/app-emulation/xtrs/files/xtrs-4.9c-gentoo.patch b/app-emulation/xtrs/files/xtrs-4.9c-gentoo.patch
deleted file mode 100644
index 27f1ee1a0fcc..000000000000
--- a/app-emulation/xtrs/files/xtrs-4.9c-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/files/xtrs-4.9c-newdos-datetime.patch b/app-emulation/xtrs/files/xtrs-4.9c-newdos-datetime.patch
deleted file mode 100644
index 1e58f8125dbc..000000000000
--- a/app-emulation/xtrs/files/xtrs-4.9c-newdos-datetime.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff -Nur xtrs-4.9c~newdos-datetime/trs_interrupt.c xtrs-4.9c/trs_interrupt.c
---- xtrs-4.9c~newdos-datetime/trs_interrupt.c	2008-03-06 14:49:43.000000000 -0700
-+++ xtrs-4.9c/trs_interrupt.c	2008-03-06 14:50:00.000000000 -0700
-@@ -62,6 +62,34 @@
- #define LDOS4_DAY   0x0034
- #define LDOS4_YEAR  0x0033
- 
-+/* Kludge, continued: On NEWDOS/80, both date and time are stored in memory
-+   across reboots, but a test is done on boot to decide whether to use the
-+   stored values.  Here's how it works: NEWDOS/80 writes a special byte value
-+   to the memory address right before the stored date and time.  On reboot,
-+   this address is checked, and if it contains that special byte, the stored
-+   date and time are considered valid and are therefore used.
-+
-+   By putting this info in memory on powerup, NEWDOS/80 gets initialized
-+   with the system date and time.
-+ */
-+#define NEWDOS_DATETIME_VALID_BYTE  0xa5
-+// Model 1
-+#define NEWDOS_DATETIME_VALID_ADDR  0x43ab
-+#define NEWDOS_MONTH                0x43b1
-+#define NEWDOS_DAY                  0x43b0
-+#define NEWDOS_YEAR                 0x43af
-+#define NEWDOS_HOUR                 0x43ae
-+#define NEWDOS_MIN                  0x43ad
-+#define NEWDOS_SEC                  0x43ac
-+// Model 3
-+#define NEWDOS3_DATETIME_VALID_ADDR 0x42cb
-+#define NEWDOS3_MONTH               0x42d1
-+#define NEWDOS3_DAY                 0x42d0
-+#define NEWDOS3_YEAR                0x42cf
-+#define NEWDOS3_HOUR                0x42ce
-+#define NEWDOS3_MIN                 0x42cd
-+#define NEWDOS3_SEC                 0x42cc
-+
- static int timer_on = 1;
- #ifdef IDEBUG
- long lost_timer_interrupts = 0;
-@@ -398,10 +426,27 @@
-       mem_write(LDOS_MONTH, (lt->tm_mon + 1) ^ 0x50);
-       mem_write(LDOS_DAY, lt->tm_mday);
-       mem_write(LDOS_YEAR, lt->tm_year - 80);
-+
-+      mem_write(NEWDOS_DATETIME_VALID_ADDR, NEWDOS_DATETIME_VALID_BYTE);
-+      mem_write(NEWDOS_MONTH, lt->tm_mon + 1);
-+      mem_write(NEWDOS_DAY, lt->tm_mday);
-+      mem_write(NEWDOS_YEAR, lt->tm_year % 100);
-+      mem_write(NEWDOS_HOUR, lt->tm_hour);
-+      mem_write(NEWDOS_MIN, lt->tm_min);
-+      mem_write(NEWDOS_SEC, lt->tm_sec);
-   } else {
-       mem_write(LDOS3_MONTH, (lt->tm_mon + 1) ^ 0x50);
-       mem_write(LDOS3_DAY, lt->tm_mday);
-       mem_write(LDOS3_YEAR, lt->tm_year - 80);
-+
-+      mem_write(NEWDOS3_DATETIME_VALID_ADDR, NEWDOS_DATETIME_VALID_BYTE);
-+      mem_write(NEWDOS3_MONTH, lt->tm_mon + 1);
-+      mem_write(NEWDOS3_DAY, lt->tm_mday);
-+      mem_write(NEWDOS3_YEAR, lt->tm_year % 100);
-+      mem_write(NEWDOS3_HOUR, lt->tm_hour);
-+      mem_write(NEWDOS3_MIN, lt->tm_min);
-+      mem_write(NEWDOS3_SEC, lt->tm_sec);
-+
-       if (trs_model >= 4) {
-         extern Uchar memory[];
- 	memory[LDOS4_MONTH] = lt->tm_mon + 1;
diff --git a/app-emulation/xtrs/xtrs-4.9c-r2.ebuild b/app-emulation/xtrs/xtrs-4.9c-r2.ebuild
deleted file mode 100644
index 3127246df1b9..000000000000
--- a/app-emulation/xtrs/xtrs-4.9c-r2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2009 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.5 2009/04/27 13:24:48 lavajoe 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"
-RDEPEND="${DEPEND}"
-
-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() {
-	ewarn "For copyright reasons, xtrs does not include actual ROM images."
-	ewarn "Because of this, unless you supply your own ROM, xtrs will"
-	ewarn "not function in any mode except 'Model 4p' mode (a minimal"
-	ewarn "free ROM is included for this), which can be run like this:"
-	ewarn "    xtrs -model 4p"
-	elog ""
-	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 using utilities available on the web.  You can"
-	elog "also often find various ROMs elsewhere.  To load your own ROM,"
-	elog "specify the '-romfile' option."
-}
diff --git a/app-emulation/xtrs/xtrs-4.9d.ebuild b/app-emulation/xtrs/xtrs-4.9d.ebuild
index 2aed3f93ecc0..a62a1516789c 100644
--- a/app-emulation/xtrs/xtrs-4.9d.ebuild
+++ b/app-emulation/xtrs/xtrs-4.9d.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xtrs/xtrs-4.9d.ebuild,v 1.5 2010/01/13 01:01:12 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xtrs/xtrs-4.9d.ebuild,v 1.6 2010/09/18 15:01:37 ulm Exp $
 
 inherit flag-o-matic toolchain-funcs
 
@@ -21,7 +21,7 @@ RDEPEND="${DEPEND}"
 
 src_compile() {
 	use ppc && append-flags -Dbig_endian
-	emake CC="$(tc-getCC)" DEBUG="${CFLAGS}" \
+	emake CC="$(tc-getCC)" DEBUG="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
 		DISKDIR="-DDISKDIR='\"/usr/share/xtrs\"'" \
 		DEFAULT_ROM="-DDEFAULT_ROM='\"/usr/share/xtrs/romimage\"' \
 			-DDEFAULT_ROM3='\"/usr/share/xtrs/romimage.m3\"' \