gentoo auto-resync : 11:10:2022 - 13:38:21

5 files changed, 74 insertions, 2 deletions

diff --git a/games-board/Manifest.gz b/games-board/Manifest.gz
index ba2bb12d94fb..6a02ef915a3e 100644
--- a/games-board/Manifest.gz
+++ b/games-board/Manifest.gz
diff --git a/games-board/pysolfc/Manifest b/games-board/pysolfc/Manifest
index b53881a2e6a2..0833d27d6a6e 100644
--- a/games-board/pysolfc/Manifest
+++ b/games-board/pysolfc/Manifest
@@ -1,5 +1,7 @@
 DIST PySolFC-2.16.0.tar.xz 6391048 BLAKE2B 94f25033cf5b15af002d924cd2bfff5f90a1165ac9c23ba72a204d424e1678d904c37b13f16695f60c26d9e93a0b00f33e3f59d4b5bf4846d2570ed8c19d7725 SHA512 8f327b621d7c964abcf3e64a866e4a0153f4d6c2347f06eda1535df4effec1d7b7391e55c9ff42a1da6764473a246c0d646a589a4aa6b225076f97fd22381acd
+DIST PySolFC-2.18.0.tar.xz 9134632 BLAKE2B 68d777afa058ce73d6888b40e5fef060257f7449e3c1dbf2ec02c4ab35c5917000be3d2ec815e02b2353b793d6a7e010721f498098786f7f172181cda01039a0 SHA512 6e8b46cf3271f8695da6b6fd3090a32839beeed237d35a77f47ad95dfe1690ea471f35e722af65dba9d908f74ace109d1c06d7dd37889962ca0d610c62215397
 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
 EBUILD pysolfc-2.16.0.ebuild 1968 BLAKE2B 7750651ced992116a252e1d160d20de8ed18431244b319dc05be09c76a9d5ab12f09231036868e2dbb4c6d72f4293089da11b0fbbaa10d53980b65bc6db55cb8 SHA512 6b56a7cd1910d1a1a870627d2b2325bb898dcab57db34a18373179d80f828d360fff9a101c621fd2c08b75dfd2550a5b0e91ee9fea0091b562da335b3ede263a
+EBUILD pysolfc-2.18.0.ebuild 1968 BLAKE2B 7750651ced992116a252e1d160d20de8ed18431244b319dc05be09c76a9d5ab12f09231036868e2dbb4c6d72f4293089da11b0fbbaa10d53980b65bc6db55cb8 SHA512 6b56a7cd1910d1a1a870627d2b2325bb898dcab57db34a18373179d80f828d360fff9a101c621fd2c08b75dfd2550a5b0e91ee9fea0091b562da335b3ede263a
 MISC metadata.xml 563 BLAKE2B 3b59b69697c8e2e34a4dad3f042639eeaf78e93167299d68ee17e7a0efb9417d78efb4d85be54b2dfa9710767abd4f1de5d9579e9f2ece656e39c286149eb5cc SHA512 6f27d71460517af500de23bc137225272c9ea45bf727725f2964a104ba48ac2a5464a930071d85e67ebf4f83b29a3359041ff8b4966b19459ed8e6cd7a24cb3f
diff --git a/games-board/pysolfc/pysolfc-2.18.0.ebuild b/games-board/pysolfc/pysolfc-2.18.0.ebuild
new file mode 100644
index 000000000000..d7a6144a6a87
--- /dev/null
+++ b/games-board/pysolfc/pysolfc-2.18.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
+}
diff --git a/games-board/xgammon/Manifest b/games-board/xgammon/Manifest
index 06afc75da820..562867d88b32 100644
--- a/games-board/xgammon/Manifest
+++ b/games-board/xgammon/Manifest
@@ -3,5 +3,5 @@ AUX xgammon-0.98-fno-common.patch 2284 BLAKE2B 88dcb8c85d4659a7f381ade1b4197ba9c
 AUX xgammon-0.98-glibc-2.32.patch 440 BLAKE2B 593dfaf0ecea283d5843b8864e9aeee9b1d3f5d8000f938b8dab733b93688e129c04055030446a844021845006e1a41d166d911f7cafd23a91c031e48a8d269b SHA512 d39dd68fcda62a4f1d57dc6a24aca9a5df4f3849ec96460dbcd07b50adfa10db99557e2f713a5b59ed0ad79cd315baaa3212190c635c42088d9111c0dbd3fe67
 AUX xgammon-0.98-r2-config.patch 819 BLAKE2B c9a31a1592065f439cedb89c9ca29da0c55e47e8621788dcc8b2c3c3aa4a6cf8ab509a40cf74b550725ecf248653f354dc10db74957adeaa489baae42f41c16a SHA512 f76d5217409b39e998f6f172a7dacaff400272e13b837ea3a839e463d46eeabd5bab0e88d6ad7d3133d3e66300e6f4f1ed7880abada4cf0071f740475574ed78
 DIST xgammon-0.98a.tar.gz 76415 BLAKE2B 617ca76b8ebe22f753f20f94fc536008c119237e24ad1011a88780416405db95c5155759548e6719c328067387e1cbc052b0ebbbc020ad8e028f564cfcd3c3f1 SHA512 1176146d7cf4d5cbf47e911190de329d87650084044d1a2e5a53ed367d2b90ec63c0e906946c4523c2fb21b68df8b86cf0567527a91058e8db66a76086a02092
-EBUILD xgammon-0.98-r3.ebuild 1300 BLAKE2B a28f2f422e408c14afdc5662df67ad9bd62f695a180478962b9c3f4ff4f1bd7be5a94e8f55c387dd08b5606edd17ab1c5536f423e6066d5d9ffa66095021aec6 SHA512 22f2a11cfe069df66780233d5bef00d94b489af2cb8a4e55a5788fb50aada4e971f0f45634146d509200682f8842b1cdb6d4aa8c45ee4225fb24d34590476a18
+EBUILD xgammon-0.98-r3.ebuild 1378 BLAKE2B a2020c1e6b4bef6645e088e01358cd97abbf037ac0f6c5718d123dc61cd11db8ddadeb0eae6cab26ba0b0df3271d6239f319ea5d59e39756494dddf74442d062 SHA512 0ee5b0bb96190bd3853504afe30d27a9bef0f73c2a441a919d0bd537896d2434078cb19ed7f2037b1e5c3bf9ded4b32eee19624e813a57d02cdacaed2557df71
 MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/games-board/xgammon/xgammon-0.98-r3.ebuild b/games-board/xgammon/xgammon-0.98-r3.ebuild
index 7d116d14a8e6..b5c4afd2beec 100644
--- a/games-board/xgammon/xgammon-0.98-r3.ebuild
+++ b/games-board/xgammon/xgammon-0.98-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="very nice backgammon game for X"
 HOMEPAGE="http://fawn.unibw-hamburg.de/steuer/xgammon/xgammon.html"
@@ -34,6 +34,8 @@ PATCHES=(
 )
 
 src_configure() {
+	append-cflags -std=gnu89 # old codebase, incompatible with c2x
+
 	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
 		IMAKECPP="${IMAKECPP:-${CHOST}-gcc -E}" xmkmf || die
 }