Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-games/freecell-solver/files/, dev-games/freecell-solver/
Date: Thu, 12 Sep 2019 21:41:08
Message-Id: 1568324452.baaafb987b9d961c77d0488711c50456ee1c2c92.asturm@gentoo
1 commit: baaafb987b9d961c77d0488711c50456ee1c2c92
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Thu Sep 12 21:08:48 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Thu Sep 12 21:40:52 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=baaafb98
7
8 dev-games/freecell-solver: Add USE tcmalloc, fix doc install dir
9
10 Package-Manager: Portage-2.3.76, Repoman-2.3.17
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 .../files/freecell-solver-5.6.0-cmake.patch | 19 +++++++++++++++++++
14 ....6.0-r1.ebuild => freecell-solver-5.6.0-r2.ebuild} | 10 ++++++++--
15 2 files changed, 27 insertions(+), 2 deletions(-)
16
17 diff --git a/dev-games/freecell-solver/files/freecell-solver-5.6.0-cmake.patch b/dev-games/freecell-solver/files/freecell-solver-5.6.0-cmake.patch
18 new file mode 100644
19 index 00000000000..322482ce6de
20 --- /dev/null
21 +++ b/dev-games/freecell-solver/files/freecell-solver-5.6.0-cmake.patch
22 @@ -0,0 +1,19 @@
23 +Package wants to install all kinds of doc files. It does not help us.
24 +
25 +--- a/CMakeLists.txt 2019-09-12 23:04:19.628187073 +0200
26 ++++ b/CMakeLists.txt 2019-09-12 23:06:38.928231282 +0200
27 +@@ -858,14 +858,6 @@
28 + INSTALL_MAN ("${fc_solve_manpage}" 6)
29 + ENDIF ()
30 +
31 +-INSTALL(
32 +- FILES
33 +- ${docs_to_install}
34 +- "README.win32.txt"
35 +- DESTINATION
36 +- "share/doc/freecell-solver-5.6.0"
37 +-)
38 +-
39 + SET (dest "include/freecell-solver")
40 + INSTALL(
41 + FILES
42
43 diff --git a/dev-games/freecell-solver/freecell-solver-5.6.0-r1.ebuild b/dev-games/freecell-solver/freecell-solver-5.6.0-r2.ebuild
44 similarity index 86%
45 rename from dev-games/freecell-solver/freecell-solver-5.6.0-r1.ebuild
46 rename to dev-games/freecell-solver/freecell-solver-5.6.0-r2.ebuild
47 index 159cc4f198b..681a115f035 100644
48 --- a/dev-games/freecell-solver/freecell-solver-5.6.0-r1.ebuild
49 +++ b/dev-games/freecell-solver/freecell-solver-5.6.0-r2.ebuild
50 @@ -13,19 +13,24 @@ SRC_URI="https://fc-solve.shlomifish.org/downloads/fc-solve/${P}.tar.xz"
51 LICENSE="MIT"
52 SLOT="0"
53 KEYWORDS="~amd64 ~arm64 ~x86"
54 -IUSE=""
55 +IUSE="tcmalloc"
56 +
57 +REQUIRED_USE="${PYTHON_REQUIRED_USE}"
58
59 RDEPEND="${PYTHON_DEPS}
60 dev-python/pysol_cards[${PYTHON_USEDEP}]
61 dev-python/random2[${PYTHON_USEDEP}]
62 dev-python/six[${PYTHON_USEDEP}]
63 + tcmalloc? ( dev-util/google-perftools )
64 "
65 DEPEND="${RDEPEND}
66 dev-perl/Path-Tiny
67 dev-perl/Template-Toolkit
68 "
69
70 -REQUIRED_USE="${PYTHON_REQUIRED_USE}"
71 +DOCS=( README.html )
72 +
73 +PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
74
75 src_prepare() {
76 sed -i -e "s|share/doc/freecell-solver/|share/doc/${P}|" CMakeLists.txt || die
77 @@ -40,6 +45,7 @@ src_configure() {
78 -DBUILD_STATIC_LIBRARY=OFF
79 -DFCS_BUILD_DOCS=OFF
80 -DFCS_WITH_TEST_SUITE=OFF #requires unpackaged dependencies
81 + -DFCS_AVOID_TCMALLOC=$(usex !tcmalloc)
82 )
83
84 cmake-utils_src_configure