dev-games/freecell-solver: Add USE tcmalloc, fix doc install dir

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

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
new file mode 100644 (file)
index 0000000..322482c
--- /dev/null
+++ b/dev-games/freecell-solver/files/freecell-solver-5.6.0-cmake.patch
@@ -0,0 +1,19 @@
+Package wants to install all kinds of doc files. It does not help us.
+
+--- a/CMakeLists.txt   2019-09-12 23:04:19.628187073 +0200
++++ b/CMakeLists.txt   2019-09-12 23:06:38.928231282 +0200
+@@ -858,14 +858,6 @@
+     INSTALL_MAN ("${fc_solve_manpage}" 6)
+ ENDIF ()
+ 
+-INSTALL(
+-    FILES
+-        ${docs_to_install}
+-        "README.win32.txt"
+-    DESTINATION
+-        "share/doc/freecell-solver-5.6.0"
+-)
+-
+ SET (dest "include/freecell-solver")
+ INSTALL(
+     FILES

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
similarity index 86%
rename from dev-games/freecell-solver/freecell-solver-5.6.0-r1.ebuild
rename to dev-games/freecell-solver/freecell-solver-5.6.0-r2.ebuild
index 159cc4f198b09ab07b3254bb3a3f6b65e6a10a86..681a115f0356a7293f0919649fce65bf27e21a2c 100644 (file)
--- a/dev-games/freecell-solver/freecell-solver-5.6.0-r1.ebuild
+++ b/dev-games/freecell-solver/freecell-solver-5.6.0-r2.ebuild
@@ -13,19 +13,24 @@ SRC_URI="https://fc-solve.shlomifish.org/downloads/fc-solve/${P}.tar.xz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
+IUSE="tcmalloc"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
        dev-python/pysol_cards[${PYTHON_USEDEP}]
        dev-python/random2[${PYTHON_USEDEP}]
        dev-python/six[${PYTHON_USEDEP}]
+       tcmalloc? ( dev-util/google-perftools )
 "
 DEPEND="${RDEPEND}
        dev-perl/Path-Tiny
        dev-perl/Template-Toolkit
 "
 
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+DOCS=( README.html )
+
+PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
 
 src_prepare() {
        sed -i -e "s|share/doc/freecell-solver/|share/doc/${P}|" CMakeLists.txt || die
@@ -40,6 +45,7 @@ src_configure() {
                -DBUILD_STATIC_LIBRARY=OFF
                -DFCS_BUILD_DOCS=OFF
                -DFCS_WITH_TEST_SUITE=OFF #requires unpackaged dependencies
+               -DFCS_AVOID_TCMALLOC=$(usex !tcmalloc)
        )
 
        cmake-utils_src_configure