commit: 8d1381e95c7c4a122a3f41d7ff3c39a41b4a4031 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Sat Jul 3 14:22:30 2021 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Sat Jul 3 15:04:26 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d1381e9
games-board/scid: add 4.7.0 - migrated to cmake, EAPI 6->7, and added tests - add USE=scripts to make python targets and other scripts optional - install missing photo files but behind USE=photos due to being large - give incompatibility warning regarding ~/.scid -> ~/.scid4.7 Fetching the binary tarball for additional assets due to upstream's .zip for other files being an unstable "latest" type. Closes: https://bugs.gentoo.org/710464 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> games-board/scid/Manifest | 2 + .../scid/files/scid-4.6.2-pgnfix-python3.patch | 1 + .../scid/files/scid-4.7.0-system-gtest.patch | 16 ++++ .../scid/files/scid-4.7.0-tcl-start-path.patch | 7 ++ games-board/scid/metadata.xml | 4 + games-board/scid/scid-4.7.0.ebuild | 106 +++++++++++++++++++++ 6 files changed, 136 insertions(+) diff --git a/games-board/scid/Manifest b/games-board/scid/Manifest index a3af0578eb8..9fe9859e527 100644 --- a/games-board/scid/Manifest +++ b/games-board/scid/Manifest @@ -1,5 +1,7 @@ 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 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 79b64e5ef6f..264849c0eb3 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 00000000000..4e4a38cdc93 --- /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 00000000000..361700d7bc8 --- /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 2e8ed33ebd1..2d032ffeb5e 100644 --- a/games-board/scid/metadata.xml +++ b/games-board/scid/metadata.xml @@ -5,6 +5,10 @@ <email>ga...@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 00000000000..ab2ebaf3830 --- /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 +}
