| 1 |
commit: 11824574477f8b46388c6bc44a14bbe463346ec0 |
| 2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Sep 5 23:03:36 2020 +0000 |
| 4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Sep 5 23:07:22 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11824574 |
| 7 |
|
| 8 |
games-action/descent2-demodata: Use arj instead of unarj, EAPI 7 |
| 9 |
|
| 10 |
unarj has a problematic license. arj is better anyway as it handles |
| 11 |
multiple volumes for us. |
| 12 |
|
| 13 |
Bug: https://bugs.gentoo.org/694746 |
| 14 |
Package-Manager: Portage-3.0.5, Repoman-3.0.1 |
| 15 |
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> |
| 16 |
|
| 17 |
.../descent2-demodata-1.0-r1.ebuild | 24 +++++++--------------- |
| 18 |
1 file changed, 7 insertions(+), 17 deletions(-) |
| 19 |
|
| 20 |
diff --git a/games-action/descent2-demodata/descent2-demodata-1.0-r1.ebuild b/games-action/descent2-demodata/descent2-demodata-1.0-r1.ebuild |
| 21 |
index 79abcc78e76..2faad49ef87 100644 |
| 22 |
--- a/games-action/descent2-demodata/descent2-demodata-1.0-r1.ebuild |
| 23 |
+++ b/games-action/descent2-demodata/descent2-demodata-1.0-r1.ebuild |
| 24 |
@@ -1,7 +1,7 @@ |
| 25 |
-# Copyright 1999-2017 Gentoo Foundation |
| 26 |
+# Copyright 1999-2020 Gentoo Authors |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
|
| 29 |
-EAPI=6 |
| 30 |
+EAPI=7 |
| 31 |
|
| 32 |
MY_PN="d2demo" |
| 33 |
DEMO="${MY_PN}${PV//.}.zip" |
| 34 |
@@ -17,27 +17,17 @@ KEYWORDS="~amd64 ~x86" |
| 35 |
RDEPEND="!<games-action/d2x-0.2.5-r3 |
| 36 |
!games-action/descent2-data" |
| 37 |
|
| 38 |
-DEPEND="app-arch/unzip |
| 39 |
- app-arch/unarj" |
| 40 |
+BDEPEND="app-arch/unzip |
| 41 |
+ app-arch/arj" |
| 42 |
|
| 43 |
S="${WORKDIR}" |
| 44 |
|
| 45 |
src_unpack() { |
| 46 |
default |
| 47 |
|
| 48 |
- # This is much more fun than simply downloading |
| 49 |
- # http://www.icculus.org/d2x/data/d2shar10.tar.gz |
| 50 |
- unarj e D2_1.SOW || die |
| 51 |
- mv ${MY_PN}.ham{,1} || die |
| 52 |
- unarj e D2_2.SOW || die |
| 53 |
- mv ${MY_PN}.ham{,2} || die |
| 54 |
- mv ${MY_PN}.pig{,2} || die |
| 55 |
- unarj e D2_3.SOW || die |
| 56 |
- mv ${MY_PN}.pig{,3} || die |
| 57 |
- |
| 58 |
- # From the sows, big porkie pies shall grow |
| 59 |
- cat ${MY_PN}.ham{1,2} > ${MY_PN}.ham || die |
| 60 |
- cat ${MY_PN}.pig{2,3} > ${MY_PN}.pig || die |
| 61 |
+ mv D2_2.SOW D2_1.S01 || die |
| 62 |
+ mv D2_3.SOW D2_1.S02 || die |
| 63 |
+ arj e -v -y -_ D2_1.SOW || die |
| 64 |
} |
| 65 |
|
| 66 |
src_install() { |
Archives