Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-rpg/soltys/
Date: Mon, 07 May 2018 07:42:14
Message-Id: 1525678908.bda6d06a6ac9e522a8f432c8bfe2284ac44a6de0.mgorny@gentoo
1 commit: bda6d06a6ac9e522a8f432c8bfe2284ac44a6de0
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sun May 6 20:32:24 2018 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Mon May 7 07:41:48 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bda6d06a
7
8 games-rpg/soltys: Remove unnecessary use of unpacker
9
10 Replace the unnecessary use of unpacker.eclass with built-in EAPI
11 unpacking. This also fixes missing dependency on app-arch/unzip
12 due to unpacker.eclass being broken with complex SRC_URIs in EAPI 6.
13
14 games-rpg/soltys/soltys-1.0-r2.ebuild | 10 +++++-----
15 1 file changed, 5 insertions(+), 5 deletions(-)
16
17 diff --git a/games-rpg/soltys/soltys-1.0-r2.ebuild b/games-rpg/soltys/soltys-1.0-r2.ebuild
18 index e709836c31e..f3e8b8ccb22 100644
19 --- a/games-rpg/soltys/soltys-1.0-r2.ebuild
20 +++ b/games-rpg/soltys/soltys-1.0-r2.ebuild
21 @@ -2,7 +2,7 @@
22 # Distributed under the terms of the GNU General Public License v2
23
24 EAPI=6
25 -inherit unpacker eutils
26 +inherit eutils
27
28 DESCRIPTION="Classic adventure game"
29 HOMEPAGE="http://wiki.scummvm.org/index.php/Soltys"
30 @@ -18,24 +18,24 @@ KEYWORDS="~amd64 ~x86"
31 IUSE="l10n_en l10n_es l10n_pl"
32
33 RDEPEND=">=games-engines/scummvm-1.5"
34 -DEPEND="$(unpacker_src_uri_depends)"
35 +DEPEND="app-arch/unzip"
36
37 S="${WORKDIR}"
38
39 src_unpack() {
40 if use l10n_en || ( ! use l10n_en && ! use l10n_es && ! use l10n_pl ) ; then
41 mkdir -p en || die
42 - unpacker ${PN}-en-v${PV}.zip
43 + unpack ${PN}-en-v${PV}.zip
44 mv vol.{cat,dat} en/ || die
45 fi
46 if use l10n_es ; then
47 mkdir -p es || die
48 - unpacker ${PN}-es-v${PV}.zip
49 + unpack ${PN}-es-v${PV}.zip
50 mv soltys-es-v1-0/vol.{cat,dat} es/ || die
51 fi
52 if use l10n_pl ; then
53 mkdir -p pl || die
54 - unpacker ${PN}-pl-v${PV}.zip
55 + unpack ${PN}-pl-v${PV}.zip
56 mv vol.{cat,dat} pl/ || die
57 fi
58 }