gentoo resync : 16.04.2022

5 files changed, 75 insertions, 3 deletions

diff --git a/games-board/Manifest.gz b/games-board/Manifest.gz
index 253b1591585a..f732e93df0dd 100644
--- a/games-board/Manifest.gz
+++ b/games-board/Manifest.gz
diff --git a/games-board/gnubg/Manifest b/games-board/gnubg/Manifest
index f565639c99f8..10b6a1d5796d 100644
--- a/games-board/gnubg/Manifest
+++ b/games-board/gnubg/Manifest
@@ -1,3 +1,3 @@
 DIST gnubg-release-1.06.002-sources.tar.gz 13163681 BLAKE2B 1b631af8b268c722624012f86318844376bb21158f231d807cbfbb101ecef03ed90f7f253121844dd4221dc8026af5619fe9f62aff64e20d6c2b84450f9705d0 SHA512 77594209032a0d81deb802da249d7f40812127dd1e080413eda75015f324fec9592b1b51772403f501b21e39d3dd371931d82b43c24f614a7d16c5234d271948
-EBUILD gnubg-1.06.002-r3.ebuild 2232 BLAKE2B 67b732caad198aa922e0fd7c82095c766f203cc80b73037fa20f3a79ae3ad59b039f2c2fa1cd6c1fb9743cf1801fd27aaa60cc502c18acee74243131057d4266 SHA512 fb7d9eb23e238c5db6dac54d3b036ee0ceb5ff61a78a02407df03b0d7d258316e3b4d0454472ef4983813221895e0cdef4d8646c1f3247d57590aa55657b0300
+EBUILD gnubg-1.06.002-r3.ebuild 2225 BLAKE2B e51dfbbc4c8d5ed4df023e87860fa77f3c7e23003276956b37275210c30d4b798a7491dfae46d329693056481da47bfcbba4f653610aa6ec769aee1665023010 SHA512 354b81aaf5fb2ff7b96b42978d4805c21a8c463d8222b000bd4f7843b84cca4952bfdc589f3fd125e97cc119137e8802131194583607935087b277af1a65dcac
 MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/games-board/gnubg/gnubg-1.06.002-r3.ebuild b/games-board/gnubg/gnubg-1.06.002-r3.ebuild
index 008587c59fe6..089ad905569b 100644
--- a/games-board/gnubg/gnubg-1.06.002-r3.ebuild
+++ b/games-board/gnubg/gnubg-1.06.002-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,7 +8,7 @@ inherit autotools desktop python-single-r1 xdg
 
 DESCRIPTION="GNU BackGammon"
 HOMEPAGE="https://www.gnu.org/software/gnubg/"
-SRC_URI="https://ftp.gnu.org/gnu/gnubg/${PN}-release-${PV}-sources.tar.gz"
+SRC_URI="mirror://gnu/gnu/${PN}/${PN}-release-${PV}-sources.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
diff --git a/games-board/pysolfc/Manifest b/games-board/pysolfc/Manifest
index c5916e774997..854cd751fa30 100644
--- a/games-board/pysolfc/Manifest
+++ b/games-board/pysolfc/Manifest
@@ -1,5 +1,9 @@
 DIST PySolFC-2.14.1.tar.xz 4359204 BLAKE2B 48b336b67608e14a2d45923367527564d8c4fcf99f8a80e2a231f7885bd84276ad0b86db8cc31c0b33573ea4232334277458753ce72a727af293cb3f1bd6738c SHA512 e1ef4024d61aa9d86fd5e54ccacf12466e05038ad46e814e066ac3e81839c7ff03a59ace6e50aed8c44887a3620c3b36d25b9916ea564fec8a579e473c3684c0
+DIST PySolFC-2.15.0.tar.xz 5022972 BLAKE2B c27dc73478f908e1ebfa4dd1ebff12744bb54a88886245aeab2f48605327231c44d27886b74612bfd233cc614ec55de6e4ba1f5fac0bb0b21ced9d46fc411bc5 SHA512 d50c416814beb1d9ef669923f87ea9493ad4aa30cf9c7dbc1e52c2f2fa89d9d6dcde9a7c4d4b8ab7d0fb36e5953ac27718fc7cc547ab3989cf2babc42844af9a
 DIST PySolFC-Cardsets--Minimal-2.0.2.tar.xz 6969096 BLAKE2B 50e87073cf4ab69031e1e4116115ddb1771197da176ac609c09e2f5fab1cc48ccb6f3ba40d7b581f67013835893106f7ab579a2cbc744aad98095944fbd2d5d9 SHA512 5317866d6259b154219ec6efea349af3f9cb0fe9309a895ee55f7be87ebc8c34df12b81a08e1dee907a3f475f4e623c3609fdbd7e357890c2ade418ec5d68cb2
+DIST PySolFC-Cardsets--Minimal-2.1.0.tar.xz 28484652 BLAKE2B a7537557ce978d296d1a11253a5bfa80a19fc67b495948e35d43d64bcc1283812e753ccf9ee1828461b723e6a21070b3003435f046a590507a7fa6f95bae09c2 SHA512 cc83a26470c2fb13e70741bd8caccb8bd3b0491672eae0caf7437cf38d57e324d225186dde3be49c091d6960dbaefaa23814bcdd7326b07f0f1e32dda15b251c
+DIST PySolFC-Cardsets-2.1.tar.bz2 61214563 BLAKE2B 06bf69f22fdcdfbd652bbe75f05722a452609da435a688a04227d235f7a4bd618cb3832e9143d224571eb20c1948014a456d697923623354c81ec12eff365bd9 SHA512 64909dec3d7f0a683e3c0d536f2c3435d0b021b390e411bcd6c9774562483413864105837e57c3210168330f17eda779055a1ec3b52d91aa05f405b990bd6fca
 DIST PySolFC-Cardsets-2.1PRE.tar.bz2 34399177 BLAKE2B 12f577e67e858b96e9d76bb3aceafaaf1cb267b1805c91f36a51ae0b92652cc265d675543bc16923b216b125142b36aee858b54c2dc8f2eeccdd0d6c3e435fe7 SHA512 7fb83450fb3579d9a4e3e0ec1404d5da779c3e99d0ceaaad9d35adf599e2d9ef173f9d2bbf272ff08dc3c3e043a5dda78ae054c95c6fad828e80dff4c9011314
 EBUILD pysolfc-2.14.1.ebuild 1639 BLAKE2B 0ff4f6252bc334cb9b9924c85c1e5cb485dc6f1ad5ddc25992ab64e67351c3373657f5166d9263e24549f429cc2f4d899594d781eee90245b77449f45bca1cf3 SHA512 a027e5b38719c949a631a87044f14cdc619a3c9bbd2d3d35599a7b4c7f57ed1b1cdcdb21cc66442177b0e051944067ec95f74bd6e5151c6c3d6602f0c5ce3477
+EBUILD pysolfc-2.15.0.ebuild 1968 BLAKE2B 7750651ced992116a252e1d160d20de8ed18431244b319dc05be09c76a9d5ab12f09231036868e2dbb4c6d72f4293089da11b0fbbaa10d53980b65bc6db55cb8 SHA512 6b56a7cd1910d1a1a870627d2b2325bb898dcab57db34a18373179d80f828d360fff9a101c621fd2c08b75dfd2550a5b0e91ee9fea0091b562da335b3ede263a
 MISC metadata.xml 563 BLAKE2B 3b59b69697c8e2e34a4dad3f042639eeaf78e93167299d68ee17e7a0efb9417d78efb4d85be54b2dfa9710767abd4f1de5d9579e9f2ece656e39c286149eb5cc SHA512 6f27d71460517af500de23bc137225272c9ea45bf727725f2964a104ba48ac2a5464a930071d85e67ebf4f83b29a3359041ff8b4966b19459ed8e6cd7a24cb3f
diff --git a/games-board/pysolfc/pysolfc-2.15.0.ebuild b/games-board/pysolfc/pysolfc-2.15.0.ebuild
new file mode 100644
index 000000000000..d7a6144a6a87
--- /dev/null
+++ b/games-board/pysolfc/pysolfc-2.15.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="tk"
+inherit distutils-r1 xdg
+
+MY_PN="PySolFC"
+MY_P="${MY_PN}-${PV}"
+PS_CARD_P="${MY_PN}-Cardsets-2.1"
+PS_CARD_MIN_P="${MY_PN}-Cardsets--Minimal-2.1.0"
+
+DESCRIPTION="Exciting collection of more than 1000 solitaire card games"
+HOMEPAGE="https://pysolfc.sourceforge.io/"
+SRC_URI="mirror://sourceforge/pysolfc/${MY_P}.tar.xz
+	extra-cardsets? ( mirror://sourceforge/pysolfc/${PS_CARD_P}.tar.bz2 )
+	!extra-cardsets? ( mirror://sourceforge/pysolfc/${PS_CARD_MIN_P}.tar.xz )"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-3+ GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="extra-cardsets minimal +sound"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/attrs[${PYTHON_USEDEP}]
+		dev-python/configobj[${PYTHON_USEDEP}]
+		dev-python/pysol_cards[${PYTHON_USEDEP}]
+		dev-python/random2[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		sound? ( dev-python/pygame[${PYTHON_USEDEP}] )
+		!minimal? ( dev-python/pillow[jpeg,tk,${PYTHON_USEDEP}] )')
+	!minimal? ( dev-tcltk/tktable )"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# make pip check happier, pycotap is not needed
+	sed -i "/'pycotap'/d" setup.py || die
+
+	if use extra-cardsets; then
+		find ../${PS_CARD_P} -type d -name .thumbnails -exec rm -r {} + || die
+	fi
+}
+
+python_install_all() {
+	local DOCS=( AUTHORS.md NEWS.asciidoc README.md )
+	distutils-r1_python_install_all
+
+	doman docs/pysol{,fc}.6
+
+	insinto /usr/share/${MY_PN}
+	doins -r ../$(usex extra-cardsets ${PS_CARD_P} ${PS_CARD_MIN_P})/.
+
+	# html files are used at runtime, keep at default location
+	dosym -r /usr/share/{${MY_PN},doc/${PF}}/html
+
+	# russian translation is not currently displaying right
+	# https://forums.gentoo.org/viewtopic-t-1142910.html
+	rm "${ED}"/usr/share/locale/ru/LC_MESSAGES/pysol.mo || die
+}