From 948d557b4a61dc14722668b6b11a4cf3cee07b01 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Fri, 13 Sep 2019 17:56:30 +0100
Subject: gentoo resync : 13.09.2019

---
 dev-games/freecell-solver/Manifest                 |  3 +-
 .../files/freecell-solver-5.6.0-cmake.patch        | 19 ++++++++
 .../freecell-solver-5.6.0-r1.ebuild                | 46 -------------------
 .../freecell-solver-5.6.0-r2.ebuild                | 52 ++++++++++++++++++++++
 4 files changed, 73 insertions(+), 47 deletions(-)
 create mode 100644 dev-games/freecell-solver/files/freecell-solver-5.6.0-cmake.patch
 delete mode 100644 dev-games/freecell-solver/freecell-solver-5.6.0-r1.ebuild
 create mode 100644 dev-games/freecell-solver/freecell-solver-5.6.0-r2.ebuild

(limited to 'dev-games/freecell-solver')

diff --git a/dev-games/freecell-solver/Manifest b/dev-games/freecell-solver/Manifest
index 25f6da532794..477960d3f6b6 100644
--- a/dev-games/freecell-solver/Manifest
+++ b/dev-games/freecell-solver/Manifest
@@ -1,4 +1,5 @@
+AUX freecell-solver-5.6.0-cmake.patch 462 BLAKE2B f1ca838179c2bfdfe8d2d3d49eb062bfb0e337a534cb6b3122b57d21373fdc595e7f88781c17d8f6cc877d03248887e32b8ec4fff85870e5a89e9684c26c4325 SHA512 b2bdeac670f110011fe5c1ab332d285b13bdeadeebe422482beae999e295fd94d58cc2578744064eca69cd86d0ea6b595147f942c60da94a9638137ef7b23328
 DIST freecell-solver-5.6.0.tar.xz 392468 BLAKE2B 9b8a22eca95da8675a252bec947dc5edad35a492ce9b04db5bf956e9a8c7051a9ca38902f9704e1f789fe28ce3326515690b2070cbb0318d299fdb8446ec9d1a SHA512 aac86e9bfb5849ffd99c669d8cfdd79272bc2f2a9a7f085e22f775b26fa45fc404efbb7520d23469e96c54c3596e776c8f459e679127de9ec0bc065c82bff246
-EBUILD freecell-solver-5.6.0-r1.ebuild 1046 BLAKE2B 31702eaf480bdccb3a3e3edb88de47036f2d9d8826a3372eb78e2d3d3f017ffe1c4ef84ef9b567e7ca9d24dc20c0a894e206faae39b153d272057d8320d06789 SHA512 875bf53ed93a52c03f76fb4006f424d61f2006ac344f743bc4900c9193b8488fda5bca7e4d4a743d5e4fcd823597145f495400e35ab61f1919c66e1e79ed94f8
+EBUILD freecell-solver-5.6.0-r2.ebuild 1202 BLAKE2B 54978bbc9db08745705ced3dcef0a1446ee8813a9cd32d4e2b705e4d548de53afdc8a1c5c3af5261cb1d41ed346e4486868f3d86ba8de28afe7b35131dd32cb7 SHA512 b2395415225498a9832def6e944b4f7d3f64dddd4eb413f7563b362b7e69e88195114942af7a919bd205366e054ad0a89302e68f50879dbfd29f7e868c3a4abc
 EBUILD freecell-solver-5.6.0.ebuild 1039 BLAKE2B 085ed7a82910b9840e9c7a1a6bea7857e61969c9ffe5e124b78440d3b33aa0575ac79246b0ebd5adbdafa86f835905a00d17380dd73c05913405b8b7c5f485b1 SHA512 bb1dbc40f0627815ddbd8ac4f50a2cb3ef8958c652205de6a247f8358333a267fda9ba54cf03065643b8316bff4826d8a15d39337c1743deb0406e5b14732ed7
 MISC metadata.xml 330 BLAKE2B 2d2fad43c972b00253e7740bb472027d4edc54537d6d2564f2804b13c7b02b43a34598bf698255d0f42962b14e207da31cf69f021793d0ae16e198d0a1765e8a SHA512 8e5d4cfa7283a489ea757e3dede6b82334b2ceee2a28a98a8dd3b269a2f8bba02e2f0e6a169712e5ff890dcb7bec2feeedef496143bde90ad587771c87a12726
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
index 000000000000..322482ce6dee
--- /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-r1.ebuild
deleted file mode 100644
index 159cc4f198b0..000000000000
--- a/dev-games/freecell-solver/freecell-solver-5.6.0-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit cmake-utils 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=""
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/pysol_cards[${PYTHON_USEDEP}]
-	dev-python/random2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-perl/Path-Tiny
-	dev-perl/Template-Toolkit
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_prepare() {
-	sed -i -e "s|share/doc/freecell-solver/|share/doc/${P}|" CMakeLists.txt || die
-
-	python_fix_shebang board_gen
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_STATIC_LIBRARY=OFF
-		-DFCS_BUILD_DOCS=OFF
-		-DFCS_WITH_TEST_SUITE=OFF #requires unpackaged dependencies
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/dev-games/freecell-solver/freecell-solver-5.6.0-r2.ebuild b/dev-games/freecell-solver/freecell-solver-5.6.0-r2.ebuild
new file mode 100644
index 000000000000..681a115f0356
--- /dev/null
+++ b/dev-games/freecell-solver/freecell-solver-5.6.0-r2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+inherit cmake-utils 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}
+	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
+"
+
+DOCS=( README.html )
+
+PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
+
+src_prepare() {
+	sed -i -e "s|share/doc/freecell-solver/|share/doc/${P}|" CMakeLists.txt || die
+
+	python_fix_shebang board_gen
+
+	cmake-utils_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-utils_src_configure
+}
-- 
cgit v1.2.3