public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "James Le Cuirot" <chewi@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: games-action/descent2-data/
Date: Sat,  5 Sep 2020 23:08:05 +0000 (UTC)	[thread overview]
Message-ID: <1599347245.5076a5d39849249f0ddc424bf5e36b69aa167892.chewi@gentoo> (raw)

commit:     5076a5d39849249f0ddc424bf5e36b69aa167892
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Sep  5 23:05:16 2020 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Sep  5 23:07:25 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5076a5d3

games-action/descent2-data: Use arj instead of unarj

unarj has a problematic license. Unlike descent2-demodata, this is
untested as I don't have the CD but this case is much simpler so it
should work.

Bug: https://bugs.gentoo.org/694746
Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 games-action/descent2-data/descent2-data-1.2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-action/descent2-data/descent2-data-1.2.ebuild b/games-action/descent2-data/descent2-data-1.2.ebuild
index 4ca0152d5ff..175865f367a 100644
--- a/games-action/descent2-data/descent2-data-1.2.ebuild
+++ b/games-action/descent2-data/descent2-data-1.2.ebuild
@@ -28,7 +28,7 @@ RDEPEND="!<games-action/d2x-0.2.5-r3
 	!games-action/descent2-demodata"
 
 DEPEND="cdinstall? (
-		app-arch/unarj
+		app-arch/arj
 		dev-util/xdelta:3
 	)
 	!cdinstall? (
@@ -52,7 +52,7 @@ src_unpack() {
 		case ${CDROM_SET} in
 			0)
 				einfo "Found Descent 2 CD"
-				unarj e "${CDROM_ABSMATCH}" || die ;;
+				arj e -y -_ "${CDROM_ABSMATCH}" || die ;;
 			1)
 				einfo "Found Descent 2 installation"
 				cd "${CDROM_ABSMATCH%/*}" || die ;;


             reply	other threads:[~2020-09-05 23:08 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-05 23:08 James Le Cuirot [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-02-28 10:00 [gentoo-commits] repo/gentoo:master commit in: games-action/descent2-data/ Arthur Zamarin
2024-06-14 22:26 James Le Cuirot
2024-06-09 11:34 James Le Cuirot
2023-07-05 20:49 Conrad Kostecki
2022-11-22 14:00 Arthur Zamarin
2021-10-19  0:19 Sam James
2020-02-12 21:04 David Seifert
2018-09-16  9:34 James Le Cuirot
2017-12-18  9:33 James Le Cuirot
2017-12-10 21:41 Michał Górny
2017-04-27 21:41 James Le Cuirot

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1599347245.5076a5d39849249f0ddc424bf5e36b69aa167892.chewi@gentoo \
    --to=chewi@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox