* [gentoo-commits] dev/ulm:master commit in: app-emulation/xtrs/
@ 2014-01-31 21:19 Ulrich Müller
0 siblings, 0 replies; 7+ messages in thread
From: Ulrich Müller @ 2014-01-31 21:19 UTC (permalink / raw
To: gentoo-commits
commit: 962af2d093e9c1f2cda5eca544d0710f104db0cd
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 31 21:23:25 2014 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Jan 31 21:23:25 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/ulm.git;a=commit;h=962af2d0
Fix filename of patch in previous commit.
Package-Manager: portage-2.2.8-r1
---
app-emulation/xtrs/xtrs-4.9d-r50.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-emulation/xtrs/xtrs-4.9d-r50.ebuild b/app-emulation/xtrs/xtrs-4.9d-r50.ebuild
index dd9459a..7f8b204 100644
--- a/app-emulation/xtrs/xtrs-4.9d-r50.ebuild
+++ b/app-emulation/xtrs/xtrs-4.9d-r50.ebuild
@@ -23,7 +23,7 @@ RDEPEND="${DEPEND}"
src_prepare() {
sed -i -e 's/$(CC) -o/$(CC) $(LDFLAGS) -o/' Makefile || die
- epatch "${FILESDIR}/${PN}-4.9c-ulm.patch"
+ epatch "${FILESDIR}/${P}-ulm.patch"
}
src_compile() {
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] dev/ulm:master commit in: app-emulation/xtrs/
@ 2014-04-12 12:55 Ulrich Müller
0 siblings, 0 replies; 7+ messages in thread
From: Ulrich Müller @ 2014-04-12 12:55 UTC (permalink / raw
To: gentoo-commits
commit: 7b797057ceedd17264f3bad6878600d4a91960c0
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 12 13:02:25 2014 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Apr 12 13:02:25 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/ulm.git;a=commit;h=7b797057
Rename ldos USE flag to ls-dos.
Package-Manager: portage-2.2.10
---
app-emulation/xtrs/ChangeLog | 4 ++++
app-emulation/xtrs/metadata.xml | 2 +-
app-emulation/xtrs/xtrs-4.9d-r50.ebuild | 8 ++++----
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/app-emulation/xtrs/ChangeLog b/app-emulation/xtrs/ChangeLog
index 2e2692a..ca941ba 100644
--- a/app-emulation/xtrs/ChangeLog
+++ b/app-emulation/xtrs/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 12 Apr 2014; Ulrich Müller <ulm@gentoo.org> xtrs-4.9d-r50.ebuild,
+ metadata.xml:
+ Rename ldos USE flag to ls-dos.
+
*xtrs-4.9d-r50 (31 Jan 2014)
31 Jan 2014; Ulrich Müller <ulm@gentoo.org> +xtrs-4.9d-r50.ebuild,
diff --git a/app-emulation/xtrs/metadata.xml b/app-emulation/xtrs/metadata.xml
index 7f1c7c6..8f00a04 100644
--- a/app-emulation/xtrs/metadata.xml
+++ b/app-emulation/xtrs/metadata.xml
@@ -18,6 +18,6 @@
bit spartan, but it gets the job done.
</longdescription>
<use>
- <flag name='ldos'>Install disk images for Model 4P</flag>
+ <flag name='ls-dos'>Install LS-DOS disk images for Model 4P</flag>
</use>
</pkgmetadata>
diff --git a/app-emulation/xtrs/xtrs-4.9d-r50.ebuild b/app-emulation/xtrs/xtrs-4.9d-r50.ebuild
index 7f8b204..b5fac8f 100644
--- a/app-emulation/xtrs/xtrs-4.9d-r50.ebuild
+++ b/app-emulation/xtrs/xtrs-4.9d-r50.ebuild
@@ -9,12 +9,12 @@ 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
- ldos? ( http://www.tim-mann.org/trs80/ld4-631.zip )"
+ ls-dos? ( http://www.tim-mann.org/trs80/ld4-631.zip )"
-LICENSE="xtrs ldos? ( freedist )"
+LICENSE="xtrs ls-dos? ( freedist )"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-IUSE="ldos"
+IUSE="ls-dos"
DEPEND="sys-libs/ncurses
sys-libs/readline
@@ -39,7 +39,7 @@ src_install() {
insinto /usr/share/xtrs/disks
doins cpmutil.dsk utility.dsk
- if use ldos; then
+ 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
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] dev/ulm:master commit in: app-emulation/xtrs/
@ 2014-04-12 22:23 Ulrich Müller
0 siblings, 0 replies; 7+ messages in thread
From: Ulrich Müller @ 2014-04-12 22:23 UTC (permalink / raw
To: gentoo-commits
commit: b05bb67dfbb9671da49a7ff6c3bfc945212430db
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 12 22:30:03 2014 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Apr 12 22:30:03 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/ulm.git;a=commit;h=b05bb67d
Add missing dependency on app-arch/unzip. Fix LS-DOS date bug.
---
app-emulation/xtrs/ChangeLog | 6 +++
app-emulation/xtrs/xtrs-4.9d-r51.ebuild | 69 +++++++++++++++++++++++++++++++++
2 files changed, 75 insertions(+)
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/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
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] dev/ulm:master commit in: app-emulation/xtrs/
@ 2014-04-12 22:36 Ulrich Müller
0 siblings, 0 replies; 7+ messages in thread
From: Ulrich Müller @ 2014-04-12 22:36 UTC (permalink / raw
To: gentoo-commits
commit: 15bca8adc5d6819b96eb66d01f6872f5c8279ece
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 12 22:38:07 2014 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Apr 12 22:38:07 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/ulm.git;a=commit;h=15bca8ad
Add missing dependency on app-arch/unzip. Fix LS-DOS date bug.
Package-Manager: portage-2.2.10
---
app-emulation/xtrs/ChangeLog | 6 ++++++
app-emulation/xtrs/Manifest | 1 +
app-emulation/xtrs/xtrs-4.9d-r50.ebuild | 5 +++--
.../xtrs/{xtrs-4.9d-r50.ebuild => xtrs-4.9d-r51.ebuild} | 14 +++++++++++---
4 files changed, 21 insertions(+), 5 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-r50.ebuild b/app-emulation/xtrs/xtrs-4.9d-r51.ebuild
similarity index 84%
copy from app-emulation/xtrs/xtrs-4.9d-r50.ebuild
copy to app-emulation/xtrs/xtrs-4.9d-r51.ebuild
index b5fac8f..8f3e0e4 100644
--- a/app-emulation/xtrs/xtrs-4.9d-r50.ebuild
+++ b/app-emulation/xtrs/xtrs-4.9d-r51.ebuild
@@ -9,21 +9,29 @@ 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 )"
+ 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"
-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 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() {
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] dev/ulm:master commit in: app-emulation/xtrs/
@ 2014-04-12 22:55 Ulrich Müller
0 siblings, 0 replies; 7+ messages in thread
From: Ulrich Müller @ 2014-04-12 22:55 UTC (permalink / raw
To: gentoo-commits
commit: 6c28e69ca87cad7f0d1196ad1388a4e746015f30
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 12 23:01:47 2014 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Apr 12 23:01:47 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/ulm.git;a=commit;h=6c28e69c
Rename xdelta file, version is 6.3, patchlevel 1L.
Package-Manager: portage-2.2.10
---
app-emulation/xtrs/Manifest | 2 +-
app-emulation/xtrs/xtrs-4.9d-r51.ebuild | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/app-emulation/xtrs/Manifest b/app-emulation/xtrs/Manifest
index e77c415..85a2ef1 100644
--- a/app-emulation/xtrs/Manifest
+++ b/app-emulation/xtrs/Manifest
@@ -1,3 +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 ld4-631l.xdelta 692 SHA256 5632011428c48169a70408c4c70e00bfb496005d615895a76a6d81a4e787055c SHA512 401d36fdfbceaf90673c5e9f821d26aa0a58b901d7e950d34361e5cde3252a070ff902019fcc1eb820fb1b2d3277e4c1da57ccc442ee407b0be4e5ca26dc2d13 WHIRLPOOL fc1fcbdde453dfd03409fed5978eadad5969c59cbab486a8de315a303fcd0a236a1d18356b3373cef6b27e9234053730db76a90cc79ded977522ee5fc487fb2a
DIST xtrs-4.9d.tar.gz 455355 SHA256 d309b83cf6fee5acfc063401c4506974647154841f37aa18cf145811575234d4 SHA512 5d6a2e1d4c2f2df63eaec8d015ea9e485615d82b7923af5c03c394862a31b1e6be2329aca18c0fa0c7d6b984164bb9b4d18f94a3d8cd140a683c5197ddff2249 WHIRLPOOL 9776dce7365e61b95c8921f22bb752ad0c77af3467c991436b578c3e18e34a431a237526ee893612e954efc517890b28d7726f2f118ea9e64fdd37f90a969d8d
diff --git a/app-emulation/xtrs/xtrs-4.9d-r51.ebuild b/app-emulation/xtrs/xtrs-4.9d-r51.ebuild
index 8f3e0e4..7e5fe94 100644
--- a/app-emulation/xtrs/xtrs-4.9d-r51.ebuild
+++ b/app-emulation/xtrs/xtrs-4.9d-r51.ebuild
@@ -11,7 +11,7 @@ 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
+ http://dev.gentoo.org/~ulm/distfiles/ld4-631l.xdelta
)"
LICENSE="xtrs ls-dos? ( freedist )"
@@ -29,7 +29,7 @@ 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 \
+ xdelta3 -dfs "${WORKDIR}"/ld4-631.dsk "${DISTDIR}"/ld4-631l.xdelta \
"${WORKDIR}"/ld4-631.dsk || die
fi
}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] dev/ulm:master commit in: app-emulation/xtrs/
@ 2014-04-13 7:21 Ulrich Müller
0 siblings, 0 replies; 7+ messages in thread
From: Ulrich Müller @ 2014-04-13 7:21 UTC (permalink / raw
To: gentoo-commits
commit: c7f04864c4838c7b741665c24f0c0c5cfa514edb
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 13 07:07:46 2014 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 13 07:07:46 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/ulm.git;a=commit;h=c7f04864
Fix dependency on xdelta:3. Don't try in-place binary patching.
Package-Manager: portage-2.2.10
---
app-emulation/xtrs/ChangeLog | 3 +++
app-emulation/xtrs/Manifest | 2 +-
app-emulation/xtrs/xtrs-4.9d-r51.ebuild | 9 +++++----
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/app-emulation/xtrs/ChangeLog b/app-emulation/xtrs/ChangeLog
index 2264cc2..8e96076 100644
--- a/app-emulation/xtrs/ChangeLog
+++ b/app-emulation/xtrs/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 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.
+
*xtrs-4.9d-r51 (12 Apr 2014)
12 Apr 2014; Ulrich Müller <ulm@gentoo.org> xtrs-4.9d-r50.ebuild,
diff --git a/app-emulation/xtrs/Manifest b/app-emulation/xtrs/Manifest
index 85a2ef1..c1505d6 100644
--- a/app-emulation/xtrs/Manifest
+++ b/app-emulation/xtrs/Manifest
@@ -1,3 +1,3 @@
DIST ld4-631.zip 106955 SHA256 06a093c42bd5c10b431239d52c1beb1360cc41dd09fa3849ed19fbc0706f1f1d SHA512 8c6a24bc0af9326b5b935d7cdb1932b4cb714ab336167fed36f4f6d976cd80fe1d4d6a76e6374366fdc3fce623b2bdd6f9059a964bd6d29f59d6a052a1924c4a WHIRLPOOL 6ecdfc85c2415976f564579f7403bccf37865183e4a62372e9fdb9189ff1923ee56b3dcc779a8cad398c0465c8ebe1daaa1b22bf7213ae0ad81d1dbc4c83a782
-DIST ld4-631l.xdelta 692 SHA256 5632011428c48169a70408c4c70e00bfb496005d615895a76a6d81a4e787055c SHA512 401d36fdfbceaf90673c5e9f821d26aa0a58b901d7e950d34361e5cde3252a070ff902019fcc1eb820fb1b2d3277e4c1da57ccc442ee407b0be4e5ca26dc2d13 WHIRLPOOL fc1fcbdde453dfd03409fed5978eadad5969c59cbab486a8de315a303fcd0a236a1d18356b3373cef6b27e9234053730db76a90cc79ded977522ee5fc487fb2a
+DIST ld4-631l.xd3 692 SHA256 5632011428c48169a70408c4c70e00bfb496005d615895a76a6d81a4e787055c SHA512 401d36fdfbceaf90673c5e9f821d26aa0a58b901d7e950d34361e5cde3252a070ff902019fcc1eb820fb1b2d3277e4c1da57ccc442ee407b0be4e5ca26dc2d13 WHIRLPOOL fc1fcbdde453dfd03409fed5978eadad5969c59cbab486a8de315a303fcd0a236a1d18356b3373cef6b27e9234053730db76a90cc79ded977522ee5fc487fb2a
DIST xtrs-4.9d.tar.gz 455355 SHA256 d309b83cf6fee5acfc063401c4506974647154841f37aa18cf145811575234d4 SHA512 5d6a2e1d4c2f2df63eaec8d015ea9e485615d82b7923af5c03c394862a31b1e6be2329aca18c0fa0c7d6b984164bb9b4d18f94a3d8cd140a683c5197ddff2249 WHIRLPOOL 9776dce7365e61b95c8921f22bb752ad0c77af3467c991436b578c3e18e34a431a237526ee893612e954efc517890b28d7726f2f118ea9e64fdd37f90a969d8d
diff --git a/app-emulation/xtrs/xtrs-4.9d-r51.ebuild b/app-emulation/xtrs/xtrs-4.9d-r51.ebuild
index 7e5fe94..b3ed5b0 100644
--- a/app-emulation/xtrs/xtrs-4.9d-r51.ebuild
+++ b/app-emulation/xtrs/xtrs-4.9d-r51.ebuild
@@ -11,7 +11,7 @@ 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-631l.xdelta
+ http://dev.gentoo.org/~ulm/distfiles/ld4-631l.xd3
)"
LICENSE="xtrs ls-dos? ( freedist )"
@@ -23,14 +23,15 @@ RDEPEND="sys-libs/ncurses
sys-libs/readline
>=x11-libs/libX11-1.0.0"
DEPEND="${RDEPEND}
- ls-dos? ( app-arch/unzip dev-util/xdelta )"
+ ls-dos? ( app-arch/unzip dev-util/xdelta:3 )"
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-631l.xdelta \
- "${WORKDIR}"/ld4-631.dsk || die
+ cd "${WORKDIR}" || die
+ xdelta3 -d -s ld4-631.dsk "${DISTDIR}"/ld4-631l.xd3 out.dsk || die
+ mv out.dsk ld4-631.dsk || die
fi
}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] dev/ulm:master commit in: app-emulation/xtrs/
@ 2015-03-07 21:31 Ulrich Müller
0 siblings, 0 replies; 7+ messages in thread
From: Ulrich Müller @ 2015-03-07 21:31 UTC (permalink / raw
To: gentoo-commits
commit: 169a61d1a7523274a630366aefbbdfff390950f7
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 7 21:25:55 2015 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Mar 7 21:25:55 2015 +0000
URL: https://gitweb.gentoo.org/dev/ulm.git/commit/?id=169a61d1
app-emulation/xtrs: Merge changes from Portage tree. Remove old.
Package-Manager: portage-2.2.18
app-emulation/xtrs/ChangeLog | 6 +++-
app-emulation/xtrs/xtrs-4.9d-r50.ebuild | 62 ---------------------------------
app-emulation/xtrs/xtrs-4.9d-r51.ebuild | 5 +--
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 )"
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2015-03-07 21:31 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-01-31 21:19 [gentoo-commits] dev/ulm:master commit in: app-emulation/xtrs/ Ulrich Müller
-- strict thread matches above, loose matches on Subject: below --
2014-04-12 12:55 Ulrich Müller
2014-04-12 22:23 Ulrich Müller
2014-04-12 22:36 Ulrich Müller
2014-04-12 22:55 Ulrich Müller
2014-04-13 7:21 Ulrich Müller
2015-03-07 21:31 Ulrich Müller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox