gentoo resync : 03.07.2021

6 files changed, 141 insertions, 2 deletions

diff --git a/games-board/scid/Manifest b/games-board/scid/Manifest
index 7e527bd4c315..682bce4159d5 100644
--- a/games-board/scid/Manifest
+++ b/games-board/scid/Manifest
@@ -1,9 +1,14 @@
 AUX scid-4.6.2-gentoo.patch 4508 BLAKE2B ea08a9b215e7e80a33912db552cf3d5e79c8c252f6c9dc557d997b9df43f4dffcd9e74aa06a9a7eca064ec1304b66b3d9495ef152cebb0bd30a507641b321006 SHA512 52a32a6250b293a0fe145ebd45cf6b4d283f3d883cffa278e9599e36a57c129e0b6ccc2a637f200b5fa1e4b8c8a7956fa63a60ceb5d83ba877ca54920346de83
-AUX scid-4.6.2-pgnfix-python3.patch 3475 BLAKE2B 45da2f9c0c3f4d7db045d00e0bb9028b383ae4067c2ce5e104bb9a54d9e6831e90dd0015a40a87ee481f37a039ad7ccca1d71ad91f6413a9f962157bc045d8c4 SHA512 620f9610675236c688b818274bbb2f1b5e6dc7ed7e984721e84318a6fc35ce921dce3c3c8e76b53b89a04d0e6cfa6b46035f6de64ff3d7828e2e1606da1b90e1
+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 photos.zip 1007488 BLAKE2B 8b0f9b0402d9102bda4cfe1333cafdf048592004b2b8cb7f8f085eacc10b6b89811afd39c3d849a4f6288ad63145fc760e60bcd70867ae339459a451c537cbf3 SHA512 c04fc810b457d4dbd9a9cfaac90feaa8c32a2abee05e28a79042ae81cb01e8580e2a1cf0abeff230ec2928da883f862b8901d679cb1448fd9ca0923323fbddd6
 DIST ratings.zip 969347 BLAKE2B 47d050f7c0e00e96aa0371db7f328e699cd0e34eafa3652664f00df7fe08b98adc4197c5235303d6df2c5bcf7ea568c753d23ac5fffe3616de6db9dae21a31a3 SHA512 9b2a7280a7e72e2b464cc3da6be82ec9825b11d3c7e2219ab03a711c69f185f7d954eb3acdd441bff210e9296613df79a7e147a2ccbb4ed37b50af762abbd243
 DIST scid-4.6.2.zip 9768139 BLAKE2B 8e9baf2fe67c3566111f23ead005cba34d32f986afbaaed2117dc46aab65190dd8675df721c6fff3e7c5f338a07d7b787265dee63480141258625f6b6f54ec6d SHA512 d33f730857362dfefe55aaf395b0fc42087e190743ed63072128509fc6ac33791a4c2f67f89f03ec39170660fc6b7a6804fea084b383cf97cbb21661ce0569b2
+DIST scid-4.7.0_x64_linux.tar.gz 129771457 BLAKE2B 65ad7b58685a498954ebcf5216287216e2d2805bf0379784195b096c9eb04b333a8bbfb6c020c321b66c63d7bad2cfba724750b4d26f8172f620047219f98a73 SHA512 c9fb6f19741d60fe4952c643240f7e2eaa476eab35379c0a053b35217fe7a4b9ecfbc68edc45df4c9a2354babe8e0ddd2211db014d5396ce9bbb59db531c1179
+DIST scid-code-4.7.0.zip 15782104 BLAKE2B f1b927a1b23478d2e27a098e2ec99acb9a2061c373686cfcfa14ac219a1dce47468c3e46b3fe786655792177c86180bbe8e1dc91927b3ad2a80ea9b0bdb17fd3 SHA512 3c43fb8877da4a8dda9c99b1b856fe3f3840c7013041d53c31c8411ecf2e9ccbaf3b7c098e35cb23f5d0d7cac6b7514ca3bfb719fcbc111f5e1ef07f765f2708
 DIST scidlet40k.zip 242632 BLAKE2B a16c5a3c04f721a40221db33f9ff7192dba724203ff81a61286903c2f4ab8a33b442503882550a7a59ab0a0e6d735a74b3f34bf9dd89f9677f2b7a8b8082d398 SHA512 e8cb4ca276ca94378f224fad972b0659f3e8159668fa395dcae4be1de6cdd9d29082fdddba393bbea6c909bab4f388042ea05c7dff41edf850d731bc7479850d
 DIST spelling.zip 3147998 BLAKE2B 40b33e0c5fab487247af13b0e3fa22d91b17cfb1dbc7d3fafd080db306700e684b30bf46a7222dd7ae16dc1407239973be8de1ee619b31cbcb373684a7f1487c SHA512 394a8835f23336b6f4bebe4e33ab9f64ffa505e9d9bb984de82396e671df0b57b088aab28c5cf648c1a11bc28370b431cb6db54765ac4ab6056a707276ba8f42
 EBUILD scid-4.6.2-r1.ebuild 2034 BLAKE2B 296bf9cf1ffbff498384d6180fee8044f52264e819f50f7f123cde6f370d7cd5888f99b25b11f02f0dc338d7c006f7957bb51458bfa644c3f287a521c2bc0ec7 SHA512 3f378785327d18b48f89df66564d89854a15240740055f91eaa77b7541a587ef5b8826eaffb505be64d39aff80dbf598d74ee5dc89f099a0effea65d5c581792
-MISC metadata.xml 327 BLAKE2B 26037c210c23b4fc0936c22b8ae22f33622b2b19a183bcbb69de69c4ed2b02aec5121198ba555cd7049421ae9a0e9824ed1115725bc0e4c9deff9639f88fcd6b SHA512 b3551509e319eba4e682673f363044c3f3b7973299618405e6aa29f44a86527e0f397a6baaface9d95806da7ec2c361c152729b753741694fb9c13760433e5c1
+EBUILD scid-4.7.0.ebuild 2329 BLAKE2B be62e4b5e217f7d29f70a4ca7834fcd22963072b28cdb753473a90b53a97bee7e480332156cbd2d37192c4d98d574cf5c38e31c703dd99686ee8f0d78a326bbc SHA512 47041df9cbc4b6578b447ebb830ec331c6183257dd74886980ac2dcd3de5760d2ea035bf51fe3e260ef665cafa82589cf6408bf3f7f9b9cca374a81c32609732
+MISC metadata.xml 495 BLAKE2B b95f4fda2aa1a4eac092d783da03fc25100f0acaadbca1fd2d86bbf0c5f28e863918ddaeb79df7fc07a9dcf9f05eebeacdc981b05933cc4fa22a52aee927f673 SHA512 309c0ff70e6ad565e673658ede83e0d36888d9ea25c9cf35385917b9b6c1fb9443902b75e26d585f8af8d57a5d36892e429ce19a0348fbc5645cc38a6a520a9b
diff --git a/games-board/scid/files/scid-4.6.2-pgnfix-python3.patch b/games-board/scid/files/scid-4.6.2-pgnfix-python3.patch
index 79b64e5ef6f3..264849c0eb30 100644
--- a/games-board/scid/files/scid-4.6.2-pgnfix-python3.patch
+++ b/games-board/scid/files/scid-4.6.2-pgnfix-python3.patch
@@ -1,3 +1,4 @@
+https://sourceforge.net/p/scid/patches/8/
 --- a/scripts/pgnfix.py
 +++ b/scripts/pgnfix.py
 @@ -12,7 +12,6 @@
diff --git a/games-board/scid/files/scid-4.7.0-system-gtest.patch b/games-board/scid/files/scid-4.7.0-system-gtest.patch
new file mode 100644
index 000000000000..4e4a38cdc934
--- /dev/null
+++ b/games-board/scid/files/scid-4.7.0-system-gtest.patch
@@ -0,0 +1,16 @@
+--- a/gtest/CMakeLists.txt
++++ b/gtest/CMakeLists.txt
+@@ -19,8 +19,3 @@
+ # googletest
+-if(NOT IS_DIRECTORY "${CMAKE_BINARY_DIR}/googletest")
+-  find_package(Git)
+-  execute_process(COMMAND ${GIT_EXECUTABLE} clone https://github.com/google/googletest.git)
+-endif()
+-set(gtest_force_shared_crt ON CACHE BOOL "Always use msvcrt.dll")
+-add_subdirectory(${CMAKE_BINARY_DIR}/googletest ${CMAKE_BINARY_DIR}/googletest/Build EXCLUDE_FROM_ALL)
++find_package(GTest REQUIRED)
+ 
+@@ -48,2 +43,2 @@
+ target_compile_definitions(scid_tests PRIVATE -DSCID_TESTDIR=\"${CMAKE_CURRENT_LIST_DIR}/\")
+-target_link_libraries(scid_tests PRIVATE scid_base gtest_main)
++target_link_libraries(scid_tests PRIVATE scid_base ${GTEST_BOTH_LIBRARIES})
diff --git a/games-board/scid/files/scid-4.7.0-tcl-start-path.patch b/games-board/scid/files/scid-4.7.0-tcl-start-path.patch
new file mode 100644
index 000000000000..361700d7bc84
--- /dev/null
+++ b/games-board/scid/files/scid-4.7.0-tcl-start-path.patch
@@ -0,0 +1,7 @@
+--- a/src/ui_tcltk.h
++++ b/src/ui_tcltk.h
+@@ -59,3 +59,3 @@
+ 		else dirname += 1;
+-		strcpy (dirname, "tcl/start.tcl");
++		strcpy (dirname, "../share/scid/tcl/start.tcl");
+ 		if (0 != Tcl_Access(sourceFileName, 4)) {
diff --git a/games-board/scid/metadata.xml b/games-board/scid/metadata.xml
index 2e8ed33ebd1b..2d032ffeb5ec 100644
--- a/games-board/scid/metadata.xml
+++ b/games-board/scid/metadata.xml
@@ -5,6 +5,10 @@
 		<email>games@gentoo.org</email>
 		<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>
 		<remote-id type="sourceforge">scid</remote-id>
 	</upstream>
diff --git a/games-board/scid/scid-4.7.0.ebuild b/games-board/scid/scid-4.7.0.ebuild
new file mode 100644
index 000000000000..ab2ebaf38302
--- /dev/null
+++ b/games-board/scid/scid-4.7.0.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake desktop optfeature python-single-r1
+
+DESCRIPTION="Shane's Chess Information Database"
+HOMEPAGE="http://scid.sourceforge.net/"
+SRC_URI="
+	mirror://sourceforge/scid/${PN}-code-${PV}.zip
+	mirror://sourceforge/scid/${P}_x64_linux.tar.gz"
+S="${WORKDIR}/${PN}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~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
+}