[gentoo-commits] repo/gentoo:master commit in: app-emulation/xtrs/files/, app-emulation/xtrs/

[Ulrich Müller]

commit:     fd0d20bc091480525dc631c123e9f043dd090557
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Jul  6 17:34:09 2017 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Jul  6 17:37:28 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd0d20bc

app-emulation/xtrs: Fix CG 2 font.

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 app-emulation/xtrs/files/xtrs-4.9d-lcmod.patch | 68 ++++++++++++++++++++++
 app-emulation/xtrs/xtrs-4.9d-r5.ebuild         | 80 ++++++++++++++++++++++++++
 2 files changed, 148 insertions(+)

diff --git a/app-emulation/xtrs/files/xtrs-4.9d-lcmod.patch b/app-emulation/xtrs/files/xtrs-4.9d-lcmod.patch
new file mode 100644
index 00000000000..4fde6ad7375
--- /dev/null
+++ b/app-emulation/xtrs/files/xtrs-4.9d-lcmod.patch
@@ -0,0 +1,68 @@
+Fix CG 2 font.
+
+--- xtrs-4.9d-orig/trs_chars.c
++++ xtrs-4.9d/trs_chars.c
+@@ -304,3 +304,4 @@
+      II ROM. All characters without descenders are moved up one row.
+-     I'm not sure I got all the changes exactly right -- help?  
++     Backquote (position 0x60) and tilde (position 0x7e) have been
++     replaced by Pound sign and Yen sign, respectively.
+   */
+@@ -337,3 +338,3 @@
+   { 0x00,0x04,0x08,0x1f,0x08,0x04,0x00,0x00,0x00,0x00,0x00,0x00 },
+-  { 0x00,0x00,0x00,0x00,0x00,0x00,0x1f,0x00,0x00,0x00,0x00,0x00 },
++  { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1f,0x00,0x00,0x00,0x00 },
+   { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 },
+@@ -350,3 +351,3 @@
+   { 0x00,0x04,0x04,0x1f,0x04,0x04,0x00,0x00,0x00,0x00,0x00,0x00 },
+-  { 0x00,0x00,0x00,0x06,0x06,0x02,0x01,0x00,0x00,0x00,0x00,0x00 },
++  { 0x00,0x00,0x00,0x00,0x06,0x06,0x02,0x01,0x00,0x00,0x00,0x00 },
+   { 0x00,0x00,0x00,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 },
+@@ -361,3 +362,3 @@
+   { 0x0c,0x02,0x01,0x0f,0x11,0x11,0x0e,0x00,0x00,0x00,0x00,0x00 },
+-  { 0x1f,0x10,0x08,0x04,0x02,0x01,0x01,0x00,0x00,0x00,0x00,0x00 },
++  { 0x1f,0x10,0x08,0x04,0x02,0x02,0x02,0x00,0x00,0x00,0x00,0x00 },
+   { 0x0e,0x11,0x11,0x0e,0x11,0x11,0x0e,0x00,0x00,0x00,0x00,0x00 },
+@@ -365,3 +366,3 @@
+   { 0x00,0x06,0x06,0x00,0x06,0x06,0x00,0x00,0x00,0x00,0x00,0x00 },
+-  { 0x06,0x06,0x00,0x06,0x06,0x02,0x01,0x00,0x00,0x00,0x00,0x00 },
++  { 0x00,0x06,0x06,0x00,0x06,0x06,0x02,0x01,0x00,0x00,0x00,0x00 },
+   { 0x08,0x04,0x02,0x01,0x02,0x04,0x08,0x00,0x00,0x00,0x00,0x00 },
+@@ -401,4 +402,4 @@
+   { 0x00,0x04,0x08,0x1f,0x08,0x04,0x00,0x00,0x00,0x00,0x00,0x00 },
+-  { 0x00,0x00,0x00,0x00,0x00,0x00,0x1f,0x00,0x00,0x00,0x00,0x00 },
+-  { 0x0c,0x0c,0x04,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 },
++  { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1f,0x00,0x00,0x00,0x00 },
++  { 0x04,0x0a,0x02,0x07,0x02,0x12,0x0f,0x00,0x00,0x00,0x00,0x00 },
+   { 0x00,0x00,0x0e,0x10,0x1e,0x11,0x1e,0x00,0x00,0x00,0x00,0x00 },
+@@ -409,7 +410,7 @@
+   { 0x08,0x14,0x04,0x0e,0x04,0x04,0x04,0x00,0x00,0x00,0x00,0x00 },
+-  { 0x00,0x00,0x16,0x19,0x19,0x16,0x10,0x0e,0x00,0x00,0x00,0x00 },
++  { 0x00,0x00,0x0e,0x11,0x11,0x1e,0x10,0x0e,0x00,0x00,0x00,0x00 },
+   { 0x01,0x01,0x0d,0x13,0x11,0x11,0x11,0x00,0x00,0x00,0x00,0x00 },
+   { 0x04,0x00,0x06,0x04,0x04,0x04,0x0e,0x00,0x00,0x00,0x00,0x00 },
+-  { 0x10,0x00,0x10,0x10,0x10,0x10,0x11,0x0e,0x00,0x00,0x00,0x00 },
+-  { 0x01,0x01,0x09,0x05,0x03,0x05,0x09,0x00,0x00,0x00,0x00,0x00 },
++  { 0x10,0x00,0x18,0x10,0x10,0x10,0x12,0x0c,0x00,0x00,0x00,0x00 },
++  { 0x02,0x02,0x12,0x0a,0x06,0x0a,0x12,0x00,0x00,0x00,0x00,0x00 },
+   { 0x06,0x04,0x04,0x04,0x04,0x04,0x0e,0x00,0x00,0x00,0x00,0x00 },
+@@ -422,3 +423,3 @@
+   { 0x00,0x00,0x1e,0x01,0x0e,0x10,0x0f,0x00,0x00,0x00,0x00,0x00 },
+-  { 0x04,0x04,0x1f,0x04,0x04,0x14,0x08,0x00,0x00,0x00,0x00,0x00 },
++  { 0x04,0x04,0x0e,0x04,0x04,0x14,0x08,0x00,0x00,0x00,0x00,0x00 },
+   { 0x00,0x00,0x11,0x11,0x11,0x19,0x16,0x00,0x00,0x00,0x00,0x00 },
+@@ -432,4 +433,4 @@
+   { 0x02,0x04,0x04,0x08,0x04,0x04,0x02,0x00,0x00,0x00,0x00,0x00 },
+-  { 0x02,0x15,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 },
+-  { 0x0a,0x15,0x0a,0x15,0x0a,0x15,0x0a,0x00,0x00,0x00,0x00,0x00 },
++  { 0x11,0x0a,0x04,0x1f,0x04,0x1f,0x04,0x00,0x00,0x00,0x00,0x00 },
++  { 0x15,0x0a,0x15,0x0a,0x15,0x0a,0x15,0x0a,0x00,0x00,0x00,0x00 },
+ },
+--- xtrs-4.9d-orig/xtrs.man
++++ xtrs-4.9d/xtrs.man
+@@ -775,4 +775,3 @@
+ set in the replacement character generator that was supplied with the
+-Radio Shack lower case modification.  (It was reconstructed partly
+-from memory and may have some minor bit errors.)  \fIstock\fP is the
++Radio Shack lower case modification.  \fIstock\fP is the
+ character set in the stock character generator supplied with most

diff --git a/app-emulation/xtrs/xtrs-4.9d-r5.ebuild b/app-emulation/xtrs/xtrs-4.9d-r5.ebuild
new file mode 100644
index 00000000000..a61a8c7997e
--- /dev/null
+++ b/app-emulation/xtrs/xtrs-4.9d-r5.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic toolchain-funcs readme.gentoo-r1
+
+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
+	ls-dos? (
+		http://www.tim-mann.org/trs80/ld4-631.zip
+		https://dev.gentoo.org/~ulm/distfiles/ld4-631l.xd3
+	)"
+
+LICENSE="xtrs ls-dos? ( freedist )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE="ls-dos"
+RESTRICT="ls-dos? ( bindist )"
+
+RDEPEND="sys-libs/ncurses:0=
+	sys-libs/readline:0=
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	ls-dos? ( app-arch/unzip dev-util/xdelta:3 )"
+
+PATCHES=("${FILESDIR}"/${P}-lcmod.patch)
+
+src_prepare() {
+	default
+	sed -i -e 's/$(CC) -o/$(CC) $(LDFLAGS) -o/' Makefile || die
+	if use ls-dos; then
+		cd "${WORKDIR}" || die
+		xdelta3 -d -s ld4-631.dsk "${DISTDIR}"/ld4-631l.xd3 out.dsk || die
+		mv out.dsk ld4-631.dsk || die
+	fi
+}
+
+src_compile() {
+	case $(tc-endian) in
+		little) ;;
+		big) append-flags -Dbig_endian ;;
+		*) die ;;
+	esac
+	emake CC="$(tc-getCC)" DEBUG="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	dodir /usr/bin /usr/share/xtrs/disks /usr/share/man/man1
+	emake PREFIX="${D}"/usr install
+
+	insopts -m0444
+	insinto /usr/share/xtrs/disks
+	doins cpmutil.dsk utility.dsk
+
+	if use ls-dos; then
+		doins "${WORKDIR}"/ld4-631.dsk
+		dosym disks/ld4-631.dsk /usr/share/xtrs/disk4p-0
+		dosym disks/utility.dsk /usr/share/xtrs/disk4p-1
+	fi
+
+	dodoc ChangeLog README xtrsrom4p.README cpmutil.html dskspec.html
+
+	DOC_CONTENTS="For copyright reasons, xtrs does not include actual ROM
+		images. Because of this, unless you supply your own ROM, xtrs will
+		not function in any mode except 'Model 4p' mode (a minimal free ROM
+		is included for this), which can be run like this:
+		\n\nxtrs -model 4p -diskdir /usr/share/xtrs
+		\n\nIf you already own a copy of the ROM software (e.g., if you have
+		a TRS-80 with this ROM), then you can make yourself a copy of this
+		for use with xtrs, using utilities available on the web. To load
+		your own ROM, specify the '-romfile' option, or the 'Xtrs.romfile'
+		X resource. ROM files can be in Intel hex or binary format."
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}