1 |
commit: 60cc5cc4d8e954225b6c57c98741d7477217e23d |
2 |
Author: Austin English <wizardedit <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Oct 28 17:29:17 2016 +0000 |
4 |
Commit: Austin English <wizardedit <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Oct 28 17:35:10 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60cc5cc4 |
7 |
|
8 |
games-rpg/zsxd: remove deprecated games eclass |
9 |
|
10 |
Also update to EAPI 6 |
11 |
|
12 |
Gentoo-Bug: https://bugs.gentoo.org/574082 |
13 |
|
14 |
Package-Manager: portage-2.3.2 |
15 |
|
16 |
.../{zsxd-1.9.0.ebuild => zsxd-1.9.0-r1.ebuild} | 21 +++++++++------------ |
17 |
games-rpg/zsxd/zsxd-1.9.0.ebuild | 5 ++--- |
18 |
2 files changed, 11 insertions(+), 15 deletions(-) |
19 |
|
20 |
diff --git a/games-rpg/zsxd/zsxd-1.9.0.ebuild b/games-rpg/zsxd/zsxd-1.9.0-r1.ebuild |
21 |
similarity index 68% |
22 |
copy from games-rpg/zsxd/zsxd-1.9.0.ebuild |
23 |
copy to games-rpg/zsxd/zsxd-1.9.0-r1.ebuild |
24 |
index a699d5f..044c939 100644 |
25 |
--- a/games-rpg/zsxd/zsxd-1.9.0.ebuild |
26 |
+++ b/games-rpg/zsxd/zsxd-1.9.0-r1.ebuild |
27 |
@@ -1,10 +1,10 @@ |
28 |
-# Copyright 1999-2015 Gentoo Foundation |
29 |
+# Copyright 1999-2016 Gentoo Foundation |
30 |
# Distributed under the terms of the GNU General Public License v2 |
31 |
# $Id$ |
32 |
|
33 |
-EAPI=5 |
34 |
+EAPI=6 |
35 |
|
36 |
-inherit eutils gnome2-utils cmake-utils games |
37 |
+inherit eutils gnome2-utils cmake-utils |
38 |
|
39 |
DESCRIPTION="A free 2D Zelda fangame parody" |
40 |
HOMEPAGE="http://www.solarus-games.org/" |
41 |
@@ -12,11 +12,11 @@ SRC_URI="http://www.zelda-solarus.com/downloads/${PN}/${P}.tar.gz" |
42 |
|
43 |
LICENSE="all-rights-reserved CC-BY-SA-3.0 GPL-3" |
44 |
SLOT="0" |
45 |
-KEYWORDS="amd64 x86" |
46 |
+KEYWORDS="~amd64 ~x86" |
47 |
IUSE="" |
48 |
RESTRICT="mirror bindist" |
49 |
|
50 |
-RDEPEND=">=games-engines/solarus-1.3.0 |
51 |
+RDEPEND=">=games-engines/solarus-1.3.1-r1 |
52 |
<games-engines/solarus-1.4.0" |
53 |
DEPEND="app-arch/zip" |
54 |
|
55 |
@@ -28,8 +28,8 @@ src_prepare() { |
56 |
|
57 |
src_configure() { |
58 |
local mycmakeargs=( |
59 |
- -DSOLARUS_INSTALL_DATAROOTDIR="${GAMES_DATADIR}" |
60 |
- -DSOLARUS_INSTALL_BINDIR="${GAMES_BINDIR}" |
61 |
+ -DSOLARUS_INSTALL_DATAROOTDIR="/usr/share" |
62 |
+ -DSOLARUS_INSTALL_BINDIR="/usr/bin" |
63 |
) |
64 |
cmake-utils_src_configure |
65 |
} |
66 |
@@ -44,19 +44,16 @@ src_install() { |
67 |
newicon -s 256 build/icons/${PN}_icon_256.png ${PN}.png |
68 |
|
69 |
# install proper wrapper script |
70 |
- rm -f "${ED%/}${GAMES_BINDIR}"/${PN} |
71 |
- games_make_wrapper ${PN} "solarus \"${GAMES_DATADIR}/solarus/${PN}\"" |
72 |
+ rm -f "${ED%/}/usr/bin/${PN} |
73 |
+ make_wrapper ${PN} "solarus \"/usr/share/solarus/${PN}\" |
74 |
|
75 |
make_desktop_entry "${PN}" "Zelda: Mystery of Solarus XD" |
76 |
- prepgamesdirs |
77 |
} |
78 |
|
79 |
pkg_preinst() { |
80 |
- games_pkg_preinst |
81 |
gnome2_icon_savelist |
82 |
} |
83 |
|
84 |
pkg_postinst() { |
85 |
- games_pkg_postinst |
86 |
gnome2_icon_cache_update |
87 |
} |
88 |
|
89 |
diff --git a/games-rpg/zsxd/zsxd-1.9.0.ebuild b/games-rpg/zsxd/zsxd-1.9.0.ebuild |
90 |
index a699d5f..916fd94 100644 |
91 |
--- a/games-rpg/zsxd/zsxd-1.9.0.ebuild |
92 |
+++ b/games-rpg/zsxd/zsxd-1.9.0.ebuild |
93 |
@@ -1,4 +1,4 @@ |
94 |
-# Copyright 1999-2015 Gentoo Foundation |
95 |
+# Copyright 1999-2016 Gentoo Foundation |
96 |
# Distributed under the terms of the GNU General Public License v2 |
97 |
# $Id$ |
98 |
|
99 |
@@ -16,8 +16,7 @@ KEYWORDS="amd64 x86" |
100 |
IUSE="" |
101 |
RESTRICT="mirror bindist" |
102 |
|
103 |
-RDEPEND=">=games-engines/solarus-1.3.0 |
104 |
- <games-engines/solarus-1.4.0" |
105 |
+RDEPEND="=games-engines/solarus-1.3.1" |
106 |
DEPEND="app-arch/zip" |
107 |
|
108 |
DOCS=( ChangeLog readme.txt ) |