Add missing dependency on app-arch/unzip. Fix LS-DOS date bug.

Package-Manager: portage-2.2.10

4 files changed, 79 insertions, 2 deletions

diff --git a/app-emulation/xtrs/ChangeLog b/app-emulation/xtrs/ChangeLog
index ca941ba..2264cc2 100644
--- a/app-emulation/xtrs/ChangeLog
+++ b/app-emulation/xtrs/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*xtrs-4.9d-r51 (12 Apr 2014)
+
+  12 Apr 2014; Ulrich Müller <ulm@gentoo.org> xtrs-4.9d-r50.ebuild,
+  +xtrs-4.9d-r51.ebuild:
+  Add missing dependency on app-arch/unzip. Fix LS-DOS date bug.
+
   12 Apr 2014; Ulrich Müller <ulm@gentoo.org> xtrs-4.9d-r50.ebuild,
   metadata.xml:
   Rename ldos USE flag to ls-dos.
diff --git a/app-emulation/xtrs/Manifest b/app-emulation/xtrs/Manifest
index 1f4b58e..e77c415 100644
--- a/app-emulation/xtrs/Manifest
+++ b/app-emulation/xtrs/Manifest
@@ -1,2 +1,3 @@
+DIST ld4-631-1l.xdelta 692 SHA256 5632011428c48169a70408c4c70e00bfb496005d615895a76a6d81a4e787055c SHA512 401d36fdfbceaf90673c5e9f821d26aa0a58b901d7e950d34361e5cde3252a070ff902019fcc1eb820fb1b2d3277e4c1da57ccc442ee407b0be4e5ca26dc2d13 WHIRLPOOL fc1fcbdde453dfd03409fed5978eadad5969c59cbab486a8de315a303fcd0a236a1d18356b3373cef6b27e9234053730db76a90cc79ded977522ee5fc487fb2a
 DIST ld4-631.zip 106955 SHA256 06a093c42bd5c10b431239d52c1beb1360cc41dd09fa3849ed19fbc0706f1f1d SHA512 8c6a24bc0af9326b5b935d7cdb1932b4cb714ab336167fed36f4f6d976cd80fe1d4d6a76e6374366fdc3fce623b2bdd6f9059a964bd6d29f59d6a052a1924c4a WHIRLPOOL 6ecdfc85c2415976f564579f7403bccf37865183e4a62372e9fdb9189ff1923ee56b3dcc779a8cad398c0465c8ebe1daaa1b22bf7213ae0ad81d1dbc4c83a782
 DIST xtrs-4.9d.tar.gz 455355 SHA256 d309b83cf6fee5acfc063401c4506974647154841f37aa18cf145811575234d4 SHA512 5d6a2e1d4c2f2df63eaec8d015ea9e485615d82b7923af5c03c394862a31b1e6be2329aca18c0fa0c7d6b984164bb9b4d18f94a3d8cd140a683c5197ddff2249 WHIRLPOOL 9776dce7365e61b95c8921f22bb752ad0c77af3467c991436b578c3e18e34a431a237526ee893612e954efc517890b28d7726f2f118ea9e64fdd37f90a969d8d
diff --git a/app-emulation/xtrs/xtrs-4.9d-r50.ebuild b/app-emulation/xtrs/xtrs-4.9d-r50.ebuild
index b5fac8f..8d691b6 100644
--- a/app-emulation/xtrs/xtrs-4.9d-r50.ebuild
+++ b/app-emulation/xtrs/xtrs-4.9d-r50.ebuild
@@ -16,10 +16,11 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
 IUSE="ls-dos"
 
-DEPEND="sys-libs/ncurses
+RDEPEND="sys-libs/ncurses
 	sys-libs/readline
 	>=x11-libs/libX11-1.0.0"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	ls-dos? ( app-arch/unzip )"
 
 src_prepare() {
 	sed -i -e 's/$(CC) -o/$(CC) $(LDFLAGS) -o/' Makefile || die
diff --git a/app-emulation/xtrs/xtrs-4.9d-r51.ebuild b/app-emulation/xtrs/xtrs-4.9d-r51.ebuild
new file mode 100644
index 0000000..8f3e0e4
--- /dev/null
+++ b/app-emulation/xtrs/xtrs-4.9d-r51.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit eutils flag-o-matic toolchain-funcs readme.gentoo
+
+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
+		http://dev.gentoo.org/~ulm/distfiles/ld4-631-1l.xdelta
+	)"
+
+LICENSE="xtrs ls-dos? ( freedist )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE="ls-dos"
+
+RDEPEND="sys-libs/ncurses
+	sys-libs/readline
+	>=x11-libs/libX11-1.0.0"
+DEPEND="${RDEPEND}
+	ls-dos? ( app-arch/unzip dev-util/xdelta )"
+
+src_prepare() {
+	sed -i -e 's/$(CC) -o/$(CC) $(LDFLAGS) -o/' Makefile || die
+	epatch "${FILESDIR}/${P}-ulm.patch"
+	if use ls-dos; then
+		xdelta3 -dfs "${WORKDIR}"/ld4-631.dsk "${DISTDIR}"/ld4-631-1l.xdelta \
+			"${WORKDIR}"/ld4-631.dsk || die
+	fi
+}
+
+src_compile() {
+	use ppc && append-flags -Dbig_endian
+	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
+}