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-board/fruit/, games-board/fruit/files/
Date: Mon, 28 Jun 2021 16:49:31
Message-Id: 1624898559.e2d347fd03422da521dd933def9982f63b5b889f.ionen@gentoo
1 commit: e2d347fd03422da521dd933def9982f63b5b889f
2 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jun 28 14:12:02 2021 +0000
4 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
5 CommitDate: Mon Jun 28 16:42:39 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2d347fd
7
8 games-board/fruit: EAPI 6->8, versionator--, prefix/cxx fix
9
10 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
11
12 games-board/fruit/files/fruit-2.1-gentoo.patch | 11 -------
13 games-board/fruit/fruit-2.1-r1.ebuild | 43 ++++++++++++--------------
14 2 files changed, 20 insertions(+), 34 deletions(-)
15
16 diff --git a/games-board/fruit/files/fruit-2.1-gentoo.patch b/games-board/fruit/files/fruit-2.1-gentoo.patch
17 deleted file mode 100644
18 index 815b184d9dc..00000000000
19 --- a/games-board/fruit/files/fruit-2.1-gentoo.patch
20 +++ /dev/null
21 @@ -1,11 +0,0 @@
22 ---- a/option.cpp.old 2007-02-07 23:32:25.000000000 +0100
23 -+++ b/option.cpp 2007-02-07 23:32:51.000000000 +0100
24 -@@ -29,7 +29,7 @@
25 - { "Ponder", true, "false", "check", "", NULL },
26 -
27 - { "OwnBook", true, "true", "check", "", NULL },
28 -- { "BookFile", true, "book_small.bin", "string", "", NULL },
29 -+ { "BookFile", true, "@GENTOO_DATADIR@/book_small.bin", "string", "", NULL },
30 -
31 - { "NullMove Pruning", true, "Fail High", "combo", "var Always var Fail High var Never", NULL },
32 - { "NullMove Reduction", true, "3", "spin", "min 1 max 3", NULL },
33
34 diff --git a/games-board/fruit/fruit-2.1-r1.ebuild b/games-board/fruit/fruit-2.1-r1.ebuild
35 index bb8f7635cf1..4794f6bf817 100644
36 --- a/games-board/fruit/fruit-2.1-r1.ebuild
37 +++ b/games-board/fruit/fruit-2.1-r1.ebuild
38 @@ -1,41 +1,38 @@
39 -# Copyright 1999-2018 Gentoo Foundation
40 +# Copyright 1999-2021 Gentoo Authors
41 # Distributed under the terms of the GNU General Public License v2
42
43 -EAPI=6
44 -inherit versionator
45 +EAPI=8
46
47 -MY_PV="$(replace_all_version_separators '')"
48 -MY_P="${PN}_${MY_PV}_linux"
49 +inherit toolchain-funcs
50 +
51 +MY_P="${PN}_$(ver_rs 1- '')_linux"
52
53 DESCRIPTION="UCI-only chess engine"
54 -HOMEPAGE="http://arctrix.com/nas/fruit/"
55 -SRC_URI="http://arctrix.com/nas/${PN}/${MY_P}.zip"
56 +HOMEPAGE="https://arctrix.com/nas/fruit/"
57 +SRC_URI="https://arctrix.com/nas/${PN}/${MY_P}.zip"
58 +S="${WORKDIR}/${MY_P}/src"
59
60 -LICENSE="GPL-2"
61 +LICENSE="GPL-2+"
62 SLOT="0"
63 KEYWORDS="~amd64 ~x86"
64 -IUSE=""
65
66 -RDEPEND=""
67 -DEPEND="app-arch/unzip"
68 -
69 -S="${WORKDIR}/${MY_P}/src"
70 +BDEPEND="app-arch/unzip"
71
72 src_prepare() {
73 default
74 - eapply "${FILESDIR}/${P}"-gentoo.patch
75 - sed -i \
76 - -e "s:@GENTOO_DATADIR@:/usr/share/${PN}:" \
77 - option.cpp || die
78 - sed -i \
79 - -e '/^CXX/d' \
80 - -e '/^LDFLAGS/d' \
81 - Makefile || die
82 +
83 + sed -i "s|book_small|${EPREFIX}/usr/share/${PN}/book_small|" option.cpp || die
84 +}
85 +
86 +src_compile() {
87 + emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS} ${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
88 }
89
90 src_install() {
91 dobin ${PN}
92 - insinto "/usr/share/${PN}"
93 +
94 + insinto /usr/share/${PN}
95 doins ../book_small.bin
96 - dodoc ../readme.txt ../technical_10.txt
97 +
98 + dodoc ../{readme,technical_10}.txt
99 }