Specify LICENSE more precisely. Install non-free LDOS/LS-DOS disk images for Model 4P only with USE=ldos.

Package-Manager: portage-2.1.11.23/cvs/Linux x86_64

4 files changed, 101 insertions, 4 deletions

diff --git a/app-emulation/xtrs/ChangeLog b/app-emulation/xtrs/ChangeLog
index fd7f8ad37c5c..4271ec5b832c 100644
--- a/app-emulation/xtrs/ChangeLog
+++ b/app-emulation/xtrs/ChangeLog
@@ -1,6 +1,13 @@
 # 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.39 2010/12/23 10:50:25 ulm Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xtrs/ChangeLog,v 1.40 2012/09/28 20:34:00 ulm Exp $
+
+*xtrs-4.9d-r1 (28 Sep 2012)
+
+  28 Sep 2012; Ulrich Müller <ulm@gentoo.org> +xtrs-4.9d-r1.ebuild,
+  metadata.xml:
+  Specify LICENSE more precisely. Install non-free LDOS/LS-DOS disk images for
+  Model 4P only with USE=ldos.
 
   23 Dec 2010; Ulrich Mueller <ulm@gentoo.org> xtrs-4.9d.ebuild:
   Fix bug 337941 properly.
diff --git a/app-emulation/xtrs/Manifest b/app-emulation/xtrs/Manifest
index 234582624a46..db33f15433b9 100644
--- a/app-emulation/xtrs/Manifest
+++ b/app-emulation/xtrs/Manifest
@@ -1,5 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST ld4-631.zip 106955 SHA256 06a093c42bd5c10b431239d52c1beb1360cc41dd09fa3849ed19fbc0706f1f1d SHA512 8c6a24bc0af9326b5b935d7cdb1932b4cb714ab336167fed36f4f6d976cd80fe1d4d6a76e6374366fdc3fce623b2bdd6f9059a964bd6d29f59d6a052a1924c4a WHIRLPOOL 6ecdfc85c2415976f564579f7403bccf37865183e4a62372e9fdb9189ff1923ee56b3dcc779a8cad398c0465c8ebe1daaa1b22bf7213ae0ad81d1dbc4c83a782
 DIST xtrs-4.9d.tar.gz 455355 SHA256 d309b83cf6fee5acfc063401c4506974647154841f37aa18cf145811575234d4 SHA512 5d6a2e1d4c2f2df63eaec8d015ea9e485615d82b7923af5c03c394862a31b1e6be2329aca18c0fa0c7d6b984164bb9b4d18f94a3d8cd140a683c5197ddff2249 WHIRLPOOL 9776dce7365e61b95c8921f22bb752ad0c77af3467c991436b578c3e18e34a431a237526ee893612e954efc517890b28d7726f2f118ea9e64fdd37f90a969d8d
+EBUILD xtrs-4.9d-r1.ebuild 2142 SHA256 88120617ae780b1777a98591722bbfe6f897237fe4f30f23f2713c6e10cec669 SHA512 0ab699c9034113db53a7c36f6822599fcee7d4f63dc3f525a314f5f6b960509464eac88c8266c8d66b24b55eb1a5e176c9f5d377be69a7a0275509882dae4f39 WHIRLPOOL 81dc4051eae1cfd5b167f711691f8e63ce241e20814e89e9134bd382d096ef845a0dc13af0432ee5cef81cb6843718dddffb9fdc54ed7e8a46a470b26b74cc52
 EBUILD xtrs-4.9d.ebuild 2152 SHA256 1908b518447fe261036becfb6d53fdc4c1984230d5f352dbf1a9c8b3ce710676 SHA512 08366f63d679d8bfe8196083b9d8c8bcff565cbfd4cfc2a6034ffce5e805137a2ca6c693b338c34055f7d89bcddb5f88a35e2fb726c3a49f7cd10449d872503c WHIRLPOOL 1998fbd37141675e384a361b412e10a76166d0a2fafa15b2eedb29fa5e7593cb3eeb377d9da933108598dab4db59b52bf149e5c7f66e798947eaf02b3c153355
-MISC ChangeLog 5031 SHA256 5c48643cd6d5e5113be4af50f6a411c8055f76dea9de94b39a7369ab239620d1 SHA512 22acc075369b188c3c7e7e3961523991e85834e66114518859af0ef2160c97b8e3c104fd6cb80605ddc62c4c2c312d718ad1257e223d1a0684550af0a15d1448 WHIRLPOOL 4d60361e91c2e7a050c3aa1b8d86747ed4c515b6f30a73c10fce5b36551e0ec6350bb2e3e4cca6178e516884df98312b781e61c9997552da0a1c212e1d490816
-MISC metadata.xml 1073 SHA256 ec5e1ad70125b999a77d34de9c5ec39a7eb25aee88077d47c577a1f84f22e5ab SHA512 bcd78aaad84f4cfe436791d3c417cc4821e6e0310b5a87b6ffdd0a12c7ac1dc102210325984dd3087c990a42a386e7616185677be8727aa2a187f463fc75cb89 WHIRLPOOL eac400a840df7b77f9d75bb57307d55500f969a5d7978d066cdb98990590ba73c9bb5dc439aec8020affe56986387ab7d5faca48d5719fae6f56c8f804df0e04
+MISC ChangeLog 5256 SHA256 d8b0af68646a77e5a48b1aa4d9d7191f15e34082db45cd90e158b1d44fa4fb44 SHA512 ac3538ce1ad7ff71bfaa2fc7ca17403d04068e092e6a1ad141ffb101a22b4bdbc553c090268451fedd4796cb327593525e5150341b919dbb1462a654e8978fb3 WHIRLPOOL 8105772dd2f4cac5c66908761dc0451dc350a1f9a66b3ede5118c589de6d560b85c416df4c372e325ab4d159890e4009a09403841e3f90484ff7acdf992af5b2
+MISC metadata.xml 1146 SHA256 8918249c846b29320a2bae389cad698d6f220857e372aab8c55d730599ea1385 SHA512 2331b363cb554aaca246ea8aea2ba3b0470370b2a3810d0d4b2d9a9707705e217bbea550aca7cdf5a0370712892c659bbb21ff49f44684e8cfaa5e0c4814d683 WHIRLPOOL 835ee4fe12f6f6c927e0f79533052a95489cedd56e8ff9e659562e78b25a4460f5ad64359e64ded5ddab50f4a41803a2844c2ed1c4cbc1591b5ca7a82d139067
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJQZgvbAAoJEDxpGckxwJCB4foP/RzkkHr7s0Sr5tV41NjKDIql
+oHij3fUqE99+Je900rSr36KcNm/MEPIEmY+tXSRj08Nz1WR7pM4UNJ99nUv3xRbc
+BuxZ+REDrNKR+jIhG0V+quwBfd++OOAkD/SRDfXzcwXuG7zHwdiTLhTaVb8uLFdN
+DNB1VQ2D++IJNfZjonePIHe4En1AJ+p9MEoYVZFQ1hrB3DQCzRFAeSEHN+X4Ut+1
+V8t9z9VK9wA3rYNo+gEbNZyC1ggpAUyWmI7uRAfl5bzzxCbqo3o8kDAj6KsiQ1d1
+HN138NFhguvqciQa50waMHJ+ob+xQgkhomCt9OlD7IeOtn3iNrEruogbiku7rTfW
+8hwa8g7YQA2G+NXxEOn5cMoxZd0mrcO79PCMN3oz4l13HXF+h5Hr4cxcXrTnf4sy
+2SRMkdIkJ8vcVz51d0ZKSBRWcQFSXstzxfi/m6LT4fkK3BuKxLiFUrayMTEfki5T
+j60MeMyJox8ExPPmTh0T5oe0Wmuj+T2y9nV5Qg0Ns9ucfqeQS2RSin/Wyo5ucaii
+6uzed8dpGsm1QOhCWDpMcdUPjiH9PqpcWJcJveat7uflwwEZ1F6Irh9R4086m3AY
+LTCY72bKIuz0+5aqR5sF8I2+OPNcA7Iftjl2/QxjhzqAP1gVDuyF/PJ6U7vc9lRf
+1oncO3pgi1tMkHQ1wJJo
+=ORMT
+-----END PGP SIGNATURE-----
diff --git a/app-emulation/xtrs/metadata.xml b/app-emulation/xtrs/metadata.xml
index 157f8da42e22..9a63d0ed7bb4 100644
--- a/app-emulation/xtrs/metadata.xml
+++ b/app-emulation/xtrs/metadata.xml
@@ -20,4 +20,7 @@
   Physical cassettes can be read and written too. The user interface is a
   bit spartan, but it gets the job done.
 </longdescription>
+<use>
+  <flag name='ldos'>Install disk images for Model 4P</flag>
+</use>
 </pkgmetadata>
diff --git a/app-emulation/xtrs/xtrs-4.9d-r1.ebuild b/app-emulation/xtrs/xtrs-4.9d-r1.ebuild
new file mode 100644
index 000000000000..c39c325e064f
--- /dev/null
+++ b/app-emulation/xtrs/xtrs-4.9d-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xtrs/xtrs-4.9d-r1.ebuild,v 1.1 2012/09/28 20:34:00 ulm Exp $
+
+EAPI=4
+
+inherit 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
+	ldos? ( http://www.tim-mann.org/trs80/ld4-631.zip )"
+
+LICENSE="xtrs ldos? ( freedist )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE="ldos"
+
+DEPEND="sys-libs/ncurses
+	sys-libs/readline
+	>=x11-libs/libX11-1.0.0"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	sed -i -e 's/$(CC) -o/$(CC) $(LDFLAGS) -o/' Makefile || die
+}
+
+src_compile() {
+	use ppc && append-flags -Dbig_endian
+	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\"' \
+			-DDEFAULT_ROM4P='\"/usr/share/xtrs/romimage.m4p\"'"
+}
+
+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 ldos; 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
+}
+
+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."
+}