From 11824574477f8b46388c6bc44a14bbe463346ec0 Mon Sep 17 00:00:00 2001
From: James Le Cuirot <chewi@gentoo.org>
Date: Sun, 6 Sep 2020 00:03:36 +0100
Subject: games-action/descent2-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.5, Repoman-3.0.1
Signed-off-by: James Le Cuirot <chewi@gentoo.org>
---
 .../descent2-demodata-1.0-r1.ebuild                | 24 +++++++---------------
 1 file changed, 7 insertions(+), 17 deletions(-)

(limited to 'games-action')

diff --git a/games-action/descent2-demodata/descent2-demodata-1.0-r1.ebuild b/games-action/descent2-demodata/descent2-demodata-1.0-r1.ebuild
index 79abcc78e76..2faad49ef87 100644
--- a/games-action/descent2-demodata/descent2-demodata-1.0-r1.ebuild
+++ b/games-action/descent2-demodata/descent2-demodata-1.0-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
 
 MY_PN="d2demo"
 DEMO="${MY_PN}${PV//.}.zip"
@@ -17,27 +17,17 @@ KEYWORDS="~amd64 ~x86"
 RDEPEND="!<games-action/d2x-0.2.5-r3
 	!games-action/descent2-data"
 
-DEPEND="app-arch/unzip
-	app-arch/unarj"
+BDEPEND="app-arch/unzip
+	app-arch/arj"
 
 S="${WORKDIR}"
 
 src_unpack() {
 	default
 
-	# This is much more fun than simply downloading
-	# http://www.icculus.org/d2x/data/d2shar10.tar.gz
-	unarj e D2_1.SOW || die
-	mv ${MY_PN}.ham{,1} || die
-	unarj e D2_2.SOW || die
-	mv ${MY_PN}.ham{,2} || die
-	mv ${MY_PN}.pig{,2} || die
-	unarj e D2_3.SOW || die
-	mv ${MY_PN}.pig{,3} || die
-
-	# From the sows, big porkie pies shall grow
-	cat ${MY_PN}.ham{1,2} > ${MY_PN}.ham || die
-	cat ${MY_PN}.pig{2,3} > ${MY_PN}.pig || die
+	mv D2_2.SOW D2_1.S01 || die
+	mv D2_3.SOW D2_1.S02 || die
+	arj e -v -y -_ D2_1.SOW || die
 }
 
 src_install() {
-- 
cgit v1.2.3