gentoo Easter resync : 12.04.2020

4 files changed, 105 insertions, 0 deletions

diff --git a/dev-games/freecell-solver/Manifest b/dev-games/freecell-solver/Manifest
index 590eebb02854..6ace8c854154 100644
--- a/dev-games/freecell-solver/Manifest
+++ b/dev-games/freecell-solver/Manifest
@@ -1,4 +1,8 @@
 AUX freecell-solver-5.14.0-cmake.patch 463 BLAKE2B 12d0f5bd556a2ab70f8795b567d5e11346945828977ec0291b5010c3e6d872a66bb68816d712c444a8aac3c9010fa4052eea3241e0f2d581205b484351b453cc SHA512 61dfa3c7ceed310bf4056a5bb1cfe7775efe170f2ff8b171ef58db76040cc4c490e6bf6d36db5cc31f6aa6e82bc703193f2cbf3a9735f912cb1cd4fb8a6739d9
+AUX freecell-solver-5.20.1-cmake.patch 463 BLAKE2B 4e15db2e19f190a0f2d7b7ee1aa430387452591c36e1a9f88a9194e1023b2de19df5b62bb55becc27313ad8ee2af8685c235b106c3d05776ceb9afa84c9409aa SHA512 f5b70f325c4968fc631892a8827c5292b66bd7b08effef9662d6202dccd2e4adb520fbde66d793de9dbb4e74b3d965647fcd324bd553a7dce346248b7cd6d1b9
+AUX freecell-solver-5.20.1-pkgconfig.patch 689 BLAKE2B edec07360417ffcc62c110a4f5c6510276409c902a0f254e23475c75fb887ee8e5dbda17456554dbddf52243af782e9be569eec089a9092cb9b9ac905be69e1d SHA512 2328bfc42daea93e8a330f29e343a2edf794987280381b2865860b9027a5a21d5c944b036528353c0fd5a591da2423703c1cc4447db6fef4d8460179d89b9718
 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
 EBUILD freecell-solver-5.14.0-r1.ebuild 1233 BLAKE2B 438cef0cda4e7965ca1cc97d8e2f3680aae85d2378d27073a18b329dc773329bd54866d3b3e237d584e030998cc2ec79fe81bffc3ae723e8b46bd423d088f250 SHA512 cdc14824041218a932ad4c8326f171af15aa083694dc102caa01ed417831664e4c761b09cb8efc983af9e6e8842fe72c9a0fe646b9e3e2931dc5c7fb0d145d74
+EBUILD freecell-solver-5.20.1.ebuild 1273 BLAKE2B 79dd1a86a82db2afcb0e421a105c4fe39a188d764ced7494bf5b0740425cdf723f1e03953b38f386749632f59c1976ceea99467b95875613b5d158532f37ab44 SHA512 a0521d1f08d26d8f923bd300e5a6fe2d6ee81e6d8293d3746ae80c9ee813b9782dc27280e77996ef6e74617e23b9add1643fb9b6bdfb5027d97dec0e8a052c05
 MISC metadata.xml 330 BLAKE2B 2d2fad43c972b00253e7740bb472027d4edc54537d6d2564f2804b13c7b02b43a34598bf698255d0f42962b14e207da31cf69f021793d0ae16e198d0a1765e8a SHA512 8e5d4cfa7283a489ea757e3dede6b82334b2ceee2a28a98a8dd3b269a2f8bba02e2f0e6a169712e5ff890dcb7bec2feeedef496143bde90ad587771c87a12726
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 000000000000..ad90727b60f4
--- /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 000000000000..967cd1139e9d
--- /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 <asturm@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 000000000000..f038e398acc9
--- /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
+}