Gentoo Archives: gentoo-commits

From: James Le Cuirot <chewi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-action/descent2-data/
Date: Sat, 05 Sep 2020 23:08:09
Message-Id: 1599347245.5076a5d39849249f0ddc424bf5e36b69aa167892.chewi@gentoo
1 commit: 5076a5d39849249f0ddc424bf5e36b69aa167892
2 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
3 AuthorDate: Sat Sep 5 23:05:16 2020 +0000
4 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
5 CommitDate: Sat Sep 5 23:07:25 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5076a5d3
7
8 games-action/descent2-data: Use arj instead of unarj
9
10 unarj has a problematic license. Unlike descent2-demodata, this is
11 untested as I don't have the CD but this case is much simpler so it
12 should work.
13
14 Bug: https://bugs.gentoo.org/694746
15 Package-Manager: Portage-3.0.5, Repoman-3.0.1
16 Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
17
18 games-action/descent2-data/descent2-data-1.2.ebuild | 4 ++--
19 1 file changed, 2 insertions(+), 2 deletions(-)
20
21 diff --git a/games-action/descent2-data/descent2-data-1.2.ebuild b/games-action/descent2-data/descent2-data-1.2.ebuild
22 index 4ca0152d5ff..175865f367a 100644
23 --- a/games-action/descent2-data/descent2-data-1.2.ebuild
24 +++ b/games-action/descent2-data/descent2-data-1.2.ebuild
25 @@ -28,7 +28,7 @@ RDEPEND="!<games-action/d2x-0.2.5-r3
26 !games-action/descent2-demodata"
27
28 DEPEND="cdinstall? (
29 - app-arch/unarj
30 + app-arch/arj
31 dev-util/xdelta:3
32 )
33 !cdinstall? (
34 @@ -52,7 +52,7 @@ src_unpack() {
35 case ${CDROM_SET} in
36 0)
37 einfo "Found Descent 2 CD"
38 - unarj e "${CDROM_ABSMATCH}" || die ;;
39 + arj e -y -_ "${CDROM_ABSMATCH}" || die ;;
40 1)
41 einfo "Found Descent 2 installation"
42 cd "${CDROM_ABSMATCH%/*}" || die ;;