app-emulation/xtrs: Merge changes from Portage tree. Remove old.

Package-Manager: portage-2.2.18

3 files changed, 8 insertions, 65 deletions

diff --git a/app-emulation/xtrs/ChangeLog b/app-emulation/xtrs/ChangeLog
index 8e96076..d1cd278 100644
--- a/app-emulation/xtrs/ChangeLog
+++ b/app-emulation/xtrs/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for app-emulation/xtrs
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  07 Mar 2015; Ulrich Müller <ulm@gentoo.org> -xtrs-4.9d-r50.ebuild,
+  xtrs-4.9d-r51.ebuild:
+  Merge changes from Portage tree. Remove old.
+
   13 Apr 2014; Ulrich Müller <ulm@gentoo.org> xtrs-4.9d-r51.ebuild:
   Fix dependency on xdelta:3. Don't try in-place binary patching.
 
diff --git a/app-emulation/xtrs/xtrs-4.9d-r50.ebuild b/app-emulation/xtrs/xtrs-4.9d-r50.ebuild
deleted file mode 100644
index 8d691b6..0000000
--- a/app-emulation/xtrs/xtrs-4.9d-r50.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# 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 )"
-
-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 )"
-
-src_prepare() {
-	sed -i -e 's/$(CC) -o/$(CC) $(LDFLAGS) -o/' Makefile || die
-	epatch "${FILESDIR}/${P}-ulm.patch"
-}
-
-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
-}
diff --git a/app-emulation/xtrs/xtrs-4.9d-r51.ebuild b/app-emulation/xtrs/xtrs-4.9d-r51.ebuild
index b3ed5b0..0a18570 100644
--- a/app-emulation/xtrs/xtrs-4.9d-r51.ebuild
+++ b/app-emulation/xtrs/xtrs-4.9d-r51.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -18,9 +18,10 @@ LICENSE="xtrs ls-dos? ( freedist )"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
 IUSE="ls-dos"
+RESTRICT="ls-dos? ( bindist )"
 
 RDEPEND="sys-libs/ncurses
-	sys-libs/readline
+	sys-libs/readline:0
 	>=x11-libs/libX11-1.0.0"
 DEPEND="${RDEPEND}
 	ls-dos? ( app-arch/unzip dev-util/xdelta:3 )"