Gentoo Archives: gentoo-commits

From: Ionen Wolkens <ionen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-arcade/apricots/files/, games-arcade/apricots/
Date: Sat, 18 Sep 2021 04:21:26
Message-Id: 1631938846.3c503cc09585fe79216a773176d9fe25e87e6dd7.ionen@gentoo
1 commit: 3c503cc09585fe79216a773176d9fe25e87e6dd7
2 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
3 AuthorDate: Sat Sep 18 03:51:55 2021 +0000
4 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
5 CommitDate: Sat Sep 18 04:20:46 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c503cc0
7
8 games-arcade/apricots: add 0.2.7 (new upstream)
9
10 Now using SDL2, and new ebuild.
11
12 Closes: https://bugs.gentoo.org/626524
13 Closes: https://bugs.gentoo.org/679038
14 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
15
16 games-arcade/apricots/Manifest | 2 ++
17 games-arcade/apricots/apricots-0.2.7.ebuild | 40 ++++++++++++++++++++++
18 .../apricots/files/apricots-0.2.7-sign-undef.patch | 10 ++++++
19 3 files changed, 52 insertions(+)
20
21 diff --git a/games-arcade/apricots/Manifest b/games-arcade/apricots/Manifest
22 index aca5a715847..b2b36ece927 100644
23 --- a/games-arcade/apricots/Manifest
24 +++ b/games-arcade/apricots/Manifest
25 @@ -1 +1,3 @@
26 DIST apricots-0.2.6.tar.gz 768568 BLAKE2B 82fa6d4be5f1a9ed86e968a4645822cbf558ea37df956d54d0f07e3260ca2e7ff561ae6ea357dabb2c35b7bfd4ff0d806dda5cf51cbb3a956ebdba52f6ef526a SHA512 cf8a988d316382469e4b13a86315c760b702b3d490398cf2fe96f119ba743c1ff707c09228dbbf4eb601189fece708913a621b04c44e9d93162639ccbd502cf5
27 +DIST apricots-0.2.7.tar.gz 388024 BLAKE2B 5d16cb2637580ae728aa4f1b3911801effa6c79faabf7f3a1c026de8d91aaa582c8063ae33152c44fc9878ae0f7126fdb6ab0363b562e90c7359bcfe6ac78391 SHA512 7f97759402703962f660cdf609f50bb9a4465cc727d3fd17751eb5863b0b9131d9014eab50632c1638130f7e4223c89c45c12cecbc9fe2639943def2ce80ae25
28 +DIST apricots.png 1965 BLAKE2B 164e06ec9856273077636b347cac555cc49f5f38faffeea6f43b9032edee9dfebedce24470f70b185707ee2e467d861164a9c90c370ada5ff89d5c4854b99e7c SHA512 5d637707d7cfa775e5f3d3416a51abbbb39369cf0bfd9be871295ca3079530c25b893076c2cb6a6621586d67860920e079cb4f491d2c67ff13ce80e56a2cf4e5
29
30 diff --git a/games-arcade/apricots/apricots-0.2.7.ebuild b/games-arcade/apricots/apricots-0.2.7.ebuild
31 new file mode 100644
32 index 00000000000..b7c7ed81881
33 --- /dev/null
34 +++ b/games-arcade/apricots/apricots-0.2.7.ebuild
35 @@ -0,0 +1,40 @@
36 +# Copyright 2021 Gentoo Authors
37 +# Distributed under the terms of the GNU General Public License v2
38 +
39 +EAPI=8
40 +
41 +inherit desktop
42 +
43 +DESCRIPTION="Fly a plane around and bomb/shoot the enemy (port of Planegame from Amiga)"
44 +HOMEPAGE="https://github.com/moggers87/apricots"
45 +SRC_URI="
46 + https://github.com/moggers87/apricots/releases/download/v${PV}/${P}.tar.gz
47 + https://dev.gentoo.org/~ionen/distfiles/${PN}.png"
48 +
49 +LICENSE="GPL-2"
50 +SLOT="0"
51 +KEYWORDS="~amd64 ~x86"
52 +
53 +RESTRICT="test" # this is only static analysis / linter tests
54 +
55 +RDEPEND="
56 + media-libs/freealut
57 + media-libs/libsdl2[sound,video]
58 + media-libs/openal"
59 +DEPEND="${RDEPEND}"
60 +
61 +PATCHES=(
62 + "${FILESDIR}"/${P}-sign-undef.patch
63 +)
64 +
65 +src_install() {
66 + emake DESTDIR="${D}" datadir="${ED}/usr/share" install
67 + einstalldocs
68 +
69 + insinto /etc
70 + doins ${PN}/${PN}.cfg
71 + rm "${ED}"/usr/share/${PN}/apricots.cfg
72 +
73 + doicon "${DISTDIR}"/${PN}.png
74 + make_desktop_entry ${PN} ${PN^}
75 +}
76
77 diff --git a/games-arcade/apricots/files/apricots-0.2.7-sign-undef.patch b/games-arcade/apricots/files/apricots-0.2.7-sign-undef.patch
78 new file mode 100644
79 index 00000000000..c1904ea9f8b
80 --- /dev/null
81 +++ b/games-arcade/apricots/files/apricots-0.2.7-sign-undef.patch
82 @@ -0,0 +1,10 @@
83 +Undefined reference to sign() when using -O1 or above.
84 +--- a/apricots/all.cpp
85 ++++ b/apricots/all.cpp
86 +@@ -19,5 +19,5 @@
87 + // Sign function
88 +
89 +-inline int sign(int n) { return (0 < n) - (n < 0); }
90 ++int sign(int n) { return (0 < n) - (n < 0); }
91 +
92 + // Error message for switch statements that shouldn't ever get to default