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 <u...@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 <u...@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 }
