4 files changed, 18 insertions, 122 deletions
diff --git a/games-board/scid/Manifest b/games-board/scid/Manifest
index 361def3e939e..e009fc157c26 100644
--- a/games-board/scid/Manifest
+++ b/games-board/scid/Manifest
@@ -1,9 +1,6 @@
 AUX scid-4.6.2-pgnfix-python3.patch 3517 BLAKE2B a2745f830f21c29d962cdf14d0b94a097352f36ad25585a245c5e0af001f4e4c9d302ba4d2e2008e0dad2270099e78b391caf493fe72d5f92d36c1f2d469ba7c SHA512 1e1f7c868945d36067de3eeb59f016623bb76ee0c593d4b5b3d81c3f65c0facadd3c018bc245f44079564ad797c1b4fa48c533112aa12adfc6c6f0ba1998f6e7
 AUX scid-4.7.0-system-gtest.patch 720 BLAKE2B 0128d0bbb8df8de3338d7f193a30134d84eba3e6ce79eca73976d422374c2b33bdd4b932a957b3fcb0ce1f5e38655e35a0be95958c861a12291e82a708c8f666 SHA512 96811496bdc258596a81765f1798bf096f9fd2c604bd1fb03d9f3790ffd305598bf46e12ac3a41bc3d32f1b57d82e728a79c72c9949929f2ca00ca8fa3707bdb
 AUX scid-4.7.0-tcl-start-path.patch 217 BLAKE2B 971491ff23cf08b251be358acd97712c3c1511b0805da185ed00c848b1b4b813e6227e0b71e1a57d4c07a19598f7010e0ef9bf0ad5507ccf54302a5dfca5318b SHA512 67880181a80b6efce8a5c4e5deb84964ada2cbb8016e805f1a4e24d73b125a592ce3d8446714d4d26f6200dba42353f7e1deeba90f1aa468ca670d00cc294fc5
-DIST scid-4.7.0_x64_linux.tar.gz 129771457 BLAKE2B 65ad7b58685a498954ebcf5216287216e2d2805bf0379784195b096c9eb04b333a8bbfb6c020c321b66c63d7bad2cfba724750b4d26f8172f620047219f98a73 SHA512 c9fb6f19741d60fe4952c643240f7e2eaa476eab35379c0a053b35217fe7a4b9ecfbc68edc45df4c9a2354babe8e0ddd2211db014d5396ce9bbb59db531c1179
 DIST scid-5.0.2.zip 15661705 BLAKE2B 7d514d0e83b34a873e3c375fc14b83b76df30d7051139a230e82feb21ec7a53308b63a5b5f2ce336443a743014a4f2830dae6bfb9c116b66645aa61d6a67ef6f SHA512 0ccf3833ddc942e0577b5316089019098ba903ecbce011e83e0bf30efcf45fb48bdceb1309160c65bb0fc69696301b00df8d777e860bf31efa44e4aa330e2477
-DIST scid-code-4.7.0.zip 15782104 BLAKE2B f1b927a1b23478d2e27a098e2ec99acb9a2061c373686cfcfa14ac219a1dce47468c3e46b3fe786655792177c86180bbe8e1dc91927b3ad2a80ea9b0bdb17fd3 SHA512 3c43fb8877da4a8dda9c99b1b856fe3f3840c7013041d53c31c8411ecf2e9ccbaf3b7c098e35cb23f5d0d7cac6b7514ca3bfb719fcbc111f5e1ef07f765f2708
-EBUILD scid-4.7.0-r1.ebuild 2364 BLAKE2B 89a1f29b48ef021f28c6c70da8c310612462c50412ef2309ad9a343e533716f24a8febc17ffc4e7ec6fe81408818f6b37eb528aa775ff76aad801d58c3c2d252 SHA512 6a0b10dfed79e9136e5fa63bf51ef672aac8fc1f1fa2ae61f77c020899c99d8608042aa508eacc50a8cf5bf8b55e79d6af3097187850ab1de403c54a9251a5aa
-EBUILD scid-5.0.2.ebuild 1978 BLAKE2B c859471dc847eb6c6d6b70176783f852be5bc84c0ea850150964e393c28cd29165facdacbfabc360b5f8873f0c8a422b197fb455497c58e65b0337c8ca475eab SHA512 3b642db4bc9781b961f787424ddb252f7a8e7e4b8cc4ce91f1b6e7d53d489b879f633983a1bd1a48c2f0418e7ede5fe15008758c9339949e2153bbb7864b7e99
-MISC metadata.xml 496 BLAKE2B 536d16dfd62b6eca9a4b4703999a89d5937463d4985098c39ffd6c3f87b742ae5f0b7a58c47f449257bc48b524acc5f8a42d1867b8e6edb6a38c1026712fc77c SHA512 62cdea46668c185e9a93f0bbd10acac065b0c8b23a03d19683d361e51cc09e0ad5139a87ef33ecda05ecf91e74bde590caee8567f83cd13f44b6ac1997a8f4c6
+EBUILD scid-5.0.2.ebuild 2014 BLAKE2B ef746842629044e6699eb90a60dca40bdbd30b61aa6b4c34df1418201f2fa38d9750e437d3f2d1284f7b73925f8d822e38e6d8805db29a432d2ffdb27ecd41e3 SHA512 3836d6ad0a035e9c9657a69b043ea1b98bee31e48e68aa11641e8e5f69f10e2fbbc1e21637bb27eae9de96fdc95d7b75281ca04f23b40750708f0b05378a204e
+MISC metadata.xml 423 BLAKE2B 8e6e0cb205f5bc246445cf0a8a4813974a956d8ee01748488d041be42c51c7c2bd862bcf300f84ed9349f515a2556e1bf33b90dfa667769f80099645db4e6066 SHA512 040f34294530839aca59859ac162ba9c74080c3b57cb97c24089cd6ebd3a5b166f6cca621b714b6f117cda56751cab95d66b91edd1a04da496867dc9efe972d9
diff --git a/games-board/scid/metadata.xml b/games-board/scid/metadata.xml
index a1736cbc30a5..c85004776688 100644
--- a/games-board/scid/metadata.xml
+++ b/games-board/scid/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<use>
-		<flag name="photos">Install collection of player photos (large)</flag>
 		<flag name="scripts">Install additional python and tcl utility scripts</flag>
 	</use>
 	<upstream>
diff --git a/games-board/scid/scid-4.7.0-r1.ebuild b/games-board/scid/scid-4.7.0-r1.ebuild
deleted file mode 100644
index f3a0ec0d84b7..000000000000
--- a/games-board/scid/scid-4.7.0-r1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake desktop optfeature python-single-r1
-
-DESCRIPTION="Shane's Chess Information Database"
-HOMEPAGE="https://scid.sourceforge.net/"
-SRC_URI="
-	https://downloads.sourceforge.net/scid/${PN}-code-${PV}.zip
-	https://downloads.sourceforge.net/scid/${P}_x64_linux.tar.gz"
-S="${WORKDIR}/${PN}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="photos scripts test"
-REQUIRED_USE="scripts? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	dev-lang/tcl:=
-	dev-lang/tk"
-RDEPEND="
-	${COMMON_DEPEND}
-	dev-tcltk/tkimg
-	scripts? ( ${PYTHON_DEPS} )"
-DEPEND="
-	${COMMON_DEPEND}
-	test? ( dev-cpp/gtest )"
-BDEPEND="
-	app-arch/unzip
-	scripts? ( ${PYTHON_DEPS} )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.6.2-pgnfix-python3.patch
-	"${FILESDIR}"/${P}-system-gtest.patch
-	"${FILESDIR}"/${P}-tcl-start-path.patch
-)
-
-HTML_DOCS=( help/. )
-
-pkg_setup() {
-	use scripts && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	if use scripts; then
-		python_fix_shebang scripts/pgnfix.py
-
-		# cmake build doesn't use "tkscid" anymore but scripts still do
-		sed -i s/tkscid/scid/ scripts/*.tcl || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=off
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr/share
-		-DGTEST=$(usex test)
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	"${BUILD_DIR}"/gtest/scid_tests || die
-}
-
-src_install() {
-	cmake_src_install
-
-	dobin "${BUILD_DIR}"/{phalanx-scid,scid,scidlet}
-
-	if use scripts; then
-		local script
-		# install same set of scripts as pre-cmake
-		for script in pgnfix.py {sc_{epgn,spell,eco,import},scidpgn,spliteco,spf2spi}.tcl sc_remote.tk; do
-			newbin scripts/${script} ${script%.*}
-		done
-	fi
-
-	insinto /usr/share/scid
-	doins scid{,_es,_fr}.eco "${WORKDIR}"/${P}/spelling.ssp
-	use photos && doins -r "${WORKDIR}"/${P}/photos
-
-	newicon resources/svg/scid_app.svg scid.svg
-	make_desktop_entry scid Scid
-
-	# delete re-located files
-	rm -r "${ED}"/usr/share/{bin,scid/{scid,scripts}} || die
-}
-
-pkg_postinst() {
-	optfeature "speech support" dev-tcltk/snack
-
-	if [[ ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 4.7; then
-		elog
-		elog "Warning: this version uses ~/.scid4.7 and is incompatible with older ~/.scid"
-		elog
-	fi
-}
diff --git a/games-board/scid/scid-5.0.2.ebuild b/games-board/scid/scid-5.0.2.ebuild
index 1680f2fe64f6..e59b07edd51c 100644
--- a/games-board/scid/scid-5.0.2.ebuild
+++ b/games-board/scid/scid-5.0.2.ebuild
@@ -1,16 +1,17 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 inherit cmake desktop optfeature python-single-r1
 
 DESCRIPTION="Shane's Chess Information Database"
 HOMEPAGE="https://scid.sourceforge.net/"
-SRC_URI="https://sourceforge.net/projects/scid/files/Scid/Scid%205.0/${PN}_src_${PV}.zip/download -> ${P}.zip"
-
-#S="${WORKDIR}/${PN}"
+SRC_URI="
+	https://sourceforge.net/projects/scid/files/Scid/Scid%205.0/${PN}_src_${PV}.zip/download
+		-> ${P}.zip
+"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -21,21 +22,26 @@ RESTRICT="!test? ( test )"
 
 COMMON_DEPEND="
 	dev-lang/tcl:=
-	dev-lang/tk"
+	dev-lang/tk
+"
 RDEPEND="
 	${COMMON_DEPEND}
 	dev-tcltk/tkimg
-	scripts? ( ${PYTHON_DEPS} )"
+	scripts? ( ${PYTHON_DEPS} )
+"
 DEPEND="
 	${COMMON_DEPEND}
-	test? ( dev-cpp/gtest )"
+	test? ( dev-cpp/gtest )
+"
 BDEPEND="
 	app-arch/unzip
-	scripts? ( ${PYTHON_DEPS} )"
+	scripts? ( ${PYTHON_DEPS} )
+"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.6.2-pgnfix-python3.patch
 	"${FILESDIR}"/${PN}-4.7.0-tcl-start-path.patch
+	"${FILESDIR}"/${PN}-4.7.0-system-gtest.patch
 )
 
 HTML_DOCS=( help/. )
@@ -86,7 +92,7 @@ src_install() {
 	make_desktop_entry scid Scid
 
 	# delete re-located files
-	rm -r "${ED}"/usr/share/{bin,scid/{scid,scripts}} || die
+	rm -r -- "${ED}"/usr/share/{bin,scid/{scid,scripts}} || die
 }
 
 pkg_postinst() {