1 |
commit: 0208f7470700328cd665f09d508a53b7e16ff885 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Feb 28 09:11:34 2021 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Feb 28 12:26:10 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0208f747 |
7 |
|
8 |
games-rpg/zsdx: cmake.eclass, xdg.eclass, https, fix tarball SRC_URI |
9 |
|
10 |
Add missing || die |
11 |
|
12 |
Need to set CMAKE_MAKEFILE_GENERATOR=emake, otherwise ninja fails with: |
13 |
ninja: error: build.ninja:125: bad $-escape (literal $ must be written as $$) |
14 |
|
15 |
Bug: https://bugs.gentoo.org/691358 |
16 |
Package-Manager: Portage-3.0.16, Repoman-3.0.2 |
17 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
18 |
|
19 |
games-rpg/zsdx/Manifest | 2 +- |
20 |
games-rpg/zsdx/zsdx-1.9.0-r1.ebuild | 39 +++++++++++++++++-------------------- |
21 |
2 files changed, 19 insertions(+), 22 deletions(-) |
22 |
|
23 |
diff --git a/games-rpg/zsdx/Manifest b/games-rpg/zsdx/Manifest |
24 |
index fd719a8a1e3..e3748e6db7c 100644 |
25 |
--- a/games-rpg/zsdx/Manifest |
26 |
+++ b/games-rpg/zsdx/Manifest |
27 |
@@ -1 +1 @@ |
28 |
-DIST zsdx-1.9.0.tar.gz 20757184 BLAKE2B 392aa36cfddaa82367cd3aa6769ffeb95f5e7235b5574d2793af629f289da107a67b70bfc2ad7d86651d2145a3f956bc000102919ca65ee18a1d83eac282d119 SHA512 2fc540d19856734050674945dd4903f254b325cab08ae0199722ae014447523ad9e979b54ddfd59d5cbc290b783481c79d5e155115c90f24feab5587d52804ee |
29 |
+DIST zsdx-zsdx-1.9.0.tar.gz 20760682 BLAKE2B 7063b7bc34a03c5e1879eaae78d28dcf28ae9799eed2ef2b4422f3fad709234ae6ebb67f641d76df370b27b72eb6f9ed6d611b8bead37b87287637cb28b072cb SHA512 673a7db1dadfae09df23b189b9e18af1182cb731897e4067f47867387c04b21308991116c6f840cb228adee9c459565c2f5e6f1a01e885ea23c00347d4d64540 |
30 |
|
31 |
diff --git a/games-rpg/zsdx/zsdx-1.9.0-r1.ebuild b/games-rpg/zsdx/zsdx-1.9.0-r1.ebuild |
32 |
index dc00fda4954..ac6267f86cb 100644 |
33 |
--- a/games-rpg/zsdx/zsdx-1.9.0-r1.ebuild |
34 |
+++ b/games-rpg/zsdx/zsdx-1.9.0-r1.ebuild |
35 |
@@ -1,12 +1,15 @@ |
36 |
-# Copyright 1999-2018 Gentoo Foundation |
37 |
+# Copyright 1999-2021 Gentoo Authors |
38 |
# Distributed under the terms of the GNU General Public License v2 |
39 |
|
40 |
-EAPI=6 |
41 |
-inherit cmake-utils eutils gnome2-utils |
42 |
+EAPI=7 |
43 |
|
44 |
-DESCRIPTION="A free 2D Zelda fangame" |
45 |
-HOMEPAGE="http://www.solarus-games.org/" |
46 |
-SRC_URI="http://www.zelda-solarus.com/downloads/${PN}/${P}.tar.gz" |
47 |
+CMAKE_MAKEFILE_GENERATOR=emake |
48 |
+inherit cmake desktop xdg |
49 |
+ |
50 |
+DESCRIPTION="Free 2D Zelda fangame" |
51 |
+HOMEPAGE="https://www.solarus-games.org/" |
52 |
+SRC_URI="https://gitlab.com/solarus-games/${PN}/-/archive/${PN}-${PV}/${PN}-${PN}-${PV}.tar.gz" |
53 |
+S="${WORKDIR}/${PN}-${PN}-${PV}" |
54 |
|
55 |
LICENSE="all-rights-reserved CC-BY-SA-3.0 GPL-3" |
56 |
SLOT="0" |
57 |
@@ -20,34 +23,28 @@ RDEPEND=" |
58 |
" |
59 |
DEPEND="app-arch/zip" |
60 |
|
61 |
+DOCS=( ChangeLog readme.txt ) |
62 |
+ |
63 |
+src_prepare() { |
64 |
+ cmake_src_prepare |
65 |
+} |
66 |
+ |
67 |
src_configure() { |
68 |
local mycmakeargs=( |
69 |
-DSOLARUS_INSTALL_DATAROOTDIR="/usr/share" |
70 |
-DSOLARUS_INSTALL_BINDIR="/usr/bin" |
71 |
) |
72 |
- cmake-utils_src_configure |
73 |
+ cmake_src_configure |
74 |
} |
75 |
|
76 |
src_install() { |
77 |
- cmake-utils_src_install |
78 |
+ cmake_src_install |
79 |
newicon -s 48 build/icons/${PN}_icon_48.png ${PN}.png |
80 |
newicon -s 256 build/icons/${PN}_icon_256.png ${PN}.png |
81 |
|
82 |
# install proper wrapper script |
83 |
- rm -f "${ED}"/usr/bin/${PN} |
84 |
+ rm "${ED}"/usr/bin/${PN} || die |
85 |
make_wrapper ${PN} "solarus \"/usr/share/solarus/${PN}\"" |
86 |
|
87 |
make_desktop_entry "${PN}" "Zelda: Mystery of Solarus DX" |
88 |
} |
89 |
- |
90 |
-pkg_preinst() { |
91 |
- gnome2_icon_savelist |
92 |
-} |
93 |
- |
94 |
-pkg_postinst() { |
95 |
- gnome2_icon_cache_update |
96 |
-} |
97 |
- |
98 |
-pkg_postrm() { |
99 |
- gnome2_icon_cache_update |
100 |
-} |