commit: fd85398e7193cb40f5e37c2e2f1d81d89a72cca1
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 26 12:32:05 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Mar 26 12:38:33 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd85398e
dev-games/freecell-solver: 5.20.1 version bump
Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-games/freecell-solver/Manifest | 1 +
.../files/freecell-solver-5.20.1-cmake.patch | 19 ++++++++
.../files/freecell-solver-5.20.1-pkgconfig.patch | 25 ++++++++++
.../freecell-solver/freecell-solver-5.20.1.ebuild | 57 ++++++++++++++++++++++
4 files changed, 102 insertions(+)
diff --git a/dev-games/freecell-solver/Manifest
b/dev-games/freecell-solver/Manifest
index 80f3b031567..2a28afd7b36 100644
--- a/dev-games/freecell-solver/Manifest
+++ b/dev-games/freecell-solver/Manifest
@@ -1 +1,2 @@
DIST freecell-solver-5.14.0.tar.xz 407912 BLAKE2B
c9da3557d9d073e017215cb0e0c64bfabeeb001c6e8373cc7e35aac40b2722f18966bb7ebf041e869c9e5c1fdbf0fc24e652fef688707c3ee69b300d8fdc246c
SHA512
21c8898673e402514c6d40ae0045d6e9077b1606430465bfb146507fbe098be6ca4f88d976e2dafadbc8e84b5aeb9325b58ce8a384ea4ed6de4f5fec485d51ea
+DIST freecell-solver-5.20.1.tar.xz 420748 BLAKE2B
5322567ba4246f11deb74d298f069cfa0f093f7d15dda2132c97d04546fac47f979d3e3b69ee2ee0bdef92b3ff10aba27efda5782dc9ffdd9c7eb91ad7c419cd
SHA512
439c55713f5fdb98fa90b203fb5a0d135e7f3aa249ee59e659ed371f7d4de03cc16945b3170f3c1fc4e2afe3733866a6db80945868e129589a4fdde00df51335
diff --git a/dev-games/freecell-solver/files/freecell-solver-5.20.1-cmake.patch
b/dev-games/freecell-solver/files/freecell-solver-5.20.1-cmake.patch
new file mode 100644
index 00000000000..ad90727b60f
--- /dev/null
+++ b/dev-games/freecell-solver/files/freecell-solver-5.20.1-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.20.1"
+-)
+-
+ SET (dest "include/freecell-solver")
+ INSTALL(
+ FILES
diff --git
a/dev-games/freecell-solver/files/freecell-solver-5.20.1-pkgconfig.patch
b/dev-games/freecell-solver/files/freecell-solver-5.20.1-pkgconfig.patch
new file mode 100644
index 00000000000..967cd1139e9
--- /dev/null
+++ b/dev-games/freecell-solver/files/freecell-solver-5.20.1-pkgconfig.patch
@@ -0,0 +1,25 @@
+From f5801e70d0ade110e23595d00c62221f6dcd8845 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <ast...@gentoo.org>
+Date: Thu, 26 Mar 2020 13:28:29 +0100
+Subject: [PATCH] Fix pkgconfig libdir path
+
+Needs to respect LIB_SUFFIX to work.
+---
+ libfreecell-solver.pc.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libfreecell-solver.pc.in b/libfreecell-solver.pc.in
+index 2eb1fe68f..4fc3c7fbb 100644
+--- a/libfreecell-solver.pc.in
++++ b/libfreecell-solver.pc.in
+@@ -1,6 +1,6 @@
+ prefix="@CMAKE_INSTALL_PREFIX@"
+ exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
++libdir=${exec_prefix}/lib@LIB_SUFFIX@
+ includedir=${prefix}/include
+
+ Name: Freecell Solver
+--
+2.26.0
+
diff --git a/dev-games/freecell-solver/freecell-solver-5.20.1.ebuild
b/dev-games/freecell-solver/freecell-solver-5.20.1.ebuild
new file mode 100644
index 00000000000..f038e398acc
--- /dev/null
+++ b/dev-games/freecell-solver/freecell-solver-5.20.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit cmake python-single-r1
+
+DESCRIPTION="C library for automatically solving Freecell and some other
solitaire variants"
+HOMEPAGE="https://fc-solve.shlomifish.org/";
+SRC_URI="https://fc-solve.shlomifish.org/downloads/fc-solve/${P}.tar.xz";
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="tcmalloc"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+ $(python_gen_cond_dep '
+ dev-python/pysol_cards[${PYTHON_MULTI_USEDEP}]
+ dev-python/random2[${PYTHON_MULTI_USEDEP}]
+ dev-python/six[${PYTHON_MULTI_USEDEP}]
+ ')
+ tcmalloc? ( dev-util/google-perftools )
+"
+DEPEND="${RDEPEND}
+ dev-perl/Path-Tiny
+ dev-perl/Template-Toolkit
+"
+
+DOCS=( README.html )
+
+PATCHES=(
+ "${FILESDIR}/${P}-cmake.patch"
+ "${FILESDIR}/${P}-pkgconfig.patch"
+)
+
+src_prepare() {
+ sed -i -e "s|share/doc/freecell-solver/|share/doc/${P}|" CMakeLists.txt
|| die
+
+ python_fix_shebang board_gen
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_STATIC_LIBRARY=OFF
+ -DFCS_BUILD_DOCS=OFF
+ -DFCS_WITH_TEST_SUITE=OFF #requires unpackaged dependencies
+ -DFCS_AVOID_TCMALLOC=$(usex !tcmalloc)
+ )
+
+ cmake_src_configure
+}
