commit:     db67267782e6fc775d83041ad0237767c4a861b3
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 13 20:56:47 2020 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Sep 13 21:02:23 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db672677

games-action/descent1-demodata: Use arj instead of unarj, EAPI 7

unarj has a problematic license. arj is better anyway as it handles
multiple volumes for us.

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

 .../descent1-demodata/descent1-demodata-1.4-r1.ebuild   | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/games-action/descent1-demodata/descent1-demodata-1.4-r1.ebuild 
b/games-action/descent1-demodata/descent1-demodata-1.4-r1.ebuild
index 8a61ba5c297..700a2496dec 100644
--- a/games-action/descent1-demodata/descent1-demodata-1.4-r1.ebuild
+++ b/games-action/descent1-demodata/descent1-demodata-1.4-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit unpacker
 
@@ -17,21 +17,16 @@ KEYWORDS="~amd64 ~x86"
 
 RDEPEND="!games-action/descent1-data"
 
-DEPEND="app-arch/unzip
-       app-arch/unarj"
+BDEPEND="app-arch/unzip
+       app-arch/arj"
 
 S="${WORKDIR}"
 
 src_unpack() {
        unpack_zip ${A}
 
-       unarj e DESCENT1.SOW || die
-       mv descent.pig{,1} || die
-       unarj e DESCENT2.SOW || die
-       mv descent.pig{,2} || die
-
-       # From the sows, big porkie pies shall grow
-       cat descent.pig{1,2} > descent.pig || die
+       mv DESCENT2.SOW DESCENT1.S01 || die
+       arj e -v -y -_ DESCENT1.SOW || die
 }
 
 src_install() {

Reply via email to