gentoo resync : 15.12.2019

4 files changed, 5 insertions, 52 deletions

diff --git a/dev-games/freecell-solver/Manifest b/dev-games/freecell-solver/Manifest
index 477960d3f6b6..2b4349ed57c4 100644
--- a/dev-games/freecell-solver/Manifest
+++ b/dev-games/freecell-solver/Manifest
@@ -1,5 +1,4 @@
-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-r2.ebuild 1202 BLAKE2B 54978bbc9db08745705ced3dcef0a1446ee8813a9cd32d4e2b705e4d548de53afdc8a1c5c3af5261cb1d41ed346e4486868f3d86ba8de28afe7b35131dd32cb7 SHA512 b2395415225498a9832def6e944b4f7d3f64dddd4eb413f7563b362b7e69e88195114942af7a919bd205366e054ad0a89302e68f50879dbfd29f7e868c3a4abc
-EBUILD freecell-solver-5.6.0.ebuild 1039 BLAKE2B 085ed7a82910b9840e9c7a1a6bea7857e61969c9ffe5e124b78440d3b33aa0575ac79246b0ebd5adbdafa86f835905a00d17380dd73c05913405b8b7c5f485b1 SHA512 bb1dbc40f0627815ddbd8ac4f50a2cb3ef8958c652205de6a247f8358333a267fda9ba54cf03065643b8316bff4826d8a15d39337c1743deb0406e5b14732ed7
+AUX freecell-solver-5.14.0-cmake.patch 463 BLAKE2B 12d0f5bd556a2ab70f8795b567d5e11346945828977ec0291b5010c3e6d872a66bb68816d712c444a8aac3c9010fa4052eea3241e0f2d581205b484351b453cc SHA512 61dfa3c7ceed310bf4056a5bb1cfe7775efe170f2ff8b171ef58db76040cc4c490e6bf6d36db5cc31f6aa6e82bc703193f2cbf3a9735f912cb1cd4fb8a6739d9
+DIST freecell-solver-5.14.0.tar.xz 407912 BLAKE2B c9da3557d9d073e017215cb0e0c64bfabeeb001c6e8373cc7e35aac40b2722f18966bb7ebf041e869c9e5c1fdbf0fc24e652fef688707c3ee69b300d8fdc246c SHA512 21c8898673e402514c6d40ae0045d6e9077b1606430465bfb146507fbe098be6ca4f88d976e2dafadbc8e84b5aeb9325b58ce8a384ea4ed6de4f5fec485d51ea
+EBUILD freecell-solver-5.14.0.ebuild 1199 BLAKE2B 576bda54432a7b955eb314d3ca353dc56d03dbeb0150938f10489588c9400be0fe395346f369f1a2f3950de0f903f28c077a585f99ef02d68d81301a3a205141 SHA512 4d1654cda0f554700d205c4c04b5c6ae55a2b406423981ff099aad1eedc3f8b8d698b0fafbd6232668ba1b1df3b1b651044d8d0456330fe54dbfa9d4a2a374f4
 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.14.0-cmake.patch
index 322482ce6dee..3eef53666837 100644
--- a/dev-games/freecell-solver/files/freecell-solver-5.6.0-cmake.patch
+++ b/dev-games/freecell-solver/files/freecell-solver-5.14.0-cmake.patch
@@ -11,7 +11,7 @@ Package wants to install all kinds of doc files. It does not help us.
 -        ${docs_to_install}
 -        "README.win32.txt"
 -    DESTINATION
--        "share/doc/freecell-solver-5.6.0"
+-        "share/doc/freecell-solver-5.14.0"
 -)
 -
  SET (dest "include/freecell-solver")
diff --git a/dev-games/freecell-solver/freecell-solver-5.6.0-r2.ebuild b/dev-games/freecell-solver/freecell-solver-5.14.0.ebuild
index 681a115f0356..b74bce4f4335 100644
--- a/dev-games/freecell-solver/freecell-solver-5.6.0-r2.ebuild
+++ b/dev-games/freecell-solver/freecell-solver-5.14.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://fc-solve.shlomifish.org/downloads/fc-solve/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="tcmalloc"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-games/freecell-solver/freecell-solver-5.6.0.ebuild b/dev-games/freecell-solver/freecell-solver-5.6.0.ebuild
deleted file mode 100644
index a17473ffab5f..000000000000
--- a/dev-games/freecell-solver/freecell-solver-5.6.0.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 )
-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
-}