From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E52EC15800A for ; Sat, 12 Apr 2025 20:59:49 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id D1CDB34306D for ; Sat, 12 Apr 2025 20:59:49 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id ED0A41104B8; Sat, 12 Apr 2025 20:59:40 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id E2ED81104B8 for ; Sat, 12 Apr 2025 20:59:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 778AB342FF9 for ; Sat, 12 Apr 2025 20:59:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0A3A22615 for ; Sat, 12 Apr 2025 20:59:39 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1744491445.0c87983827e2c75fd33cf41f88292ead9ec0c5eb.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-cpp/string-theory/files/, dev-cpp/string-theory/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-cpp/string-theory/Manifest dev-cpp/string-theory/files/string-theory-3.9-unbundle-gtest.patch dev-cpp/string-theory/string-theory-3.9.ebuild X-VCS-Directories: dev-cpp/string-theory/ dev-cpp/string-theory/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 0c87983827e2c75fd33cf41f88292ead9ec0c5eb X-VCS-Branch: master Date: Sat, 12 Apr 2025 20:59:39 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 946ce4e7-c3aa-49e3-a461-8986558025bb X-Archives-Hash: 22210eac3e047fa39989cf3babb69c15 commit: 0c87983827e2c75fd33cf41f88292ead9ec0c5eb Author: NHOrus yahoo com> AuthorDate: Sun Mar 23 19:28:39 2025 +0000 Commit: Sam James gentoo org> CommitDate: Sat Apr 12 20:57:25 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c879838 dev-cpp/string-theory: add 3.9 Fixes for CMake4, failing tests inside. Closes: https://bugs.gentoo.org/880353 Closes: https://bugs.gentoo.org/951904 Signed-off-by: NHOrus yahoo.com> Closes: https://github.com/gentoo/gentoo/pull/41247 Signed-off-by: Sam James gentoo.org> dev-cpp/string-theory/Manifest | 1 + .../files/string-theory-3.9-unbundle-gtest.patch | 18 +++++++++++ dev-cpp/string-theory/string-theory-3.9.ebuild | 36 ++++++++++++++++++++++ 3 files changed, 55 insertions(+) diff --git a/dev-cpp/string-theory/Manifest b/dev-cpp/string-theory/Manifest index b1a156c5f269..2dc8ad7b7d75 100644 --- a/dev-cpp/string-theory/Manifest +++ b/dev-cpp/string-theory/Manifest @@ -1,2 +1,3 @@ DIST string-theory-3.5.tar.gz 589905 BLAKE2B c2bc926b8568efc1fbe27861619bd8249ad788297dd537cff393d212b3bb12a529847b740fc8ba82dc28501fb05800eb8debf3e4832cf145b5c13882ac45e900 SHA512 30300155e64ace8197ed531baffe4e835c269ac10d6857ac9f29501e0a1f69965994d6f2fa2e64544e7d441de635e2d370be24efcf00a0d24066730d19f022a6 DIST string-theory-3.6.tar.gz 590461 BLAKE2B e8441ead9b13e8f107c47d0695ca669f40558567590b85310903f550edf2d4cbb8622f36857b9563d33a629398358e33024c97b97a8f151a3899f9cee30ee237 SHA512 2bbd8e6c5c2501cc9616ee6a77b60a7cac5e7c9fa58d6616f6ba39cfdee33dc1b072c5d1b34bd2f88726fb4d65d32032595be7a67854a2e894eb3d81d4a8eea9 +DIST string-theory-3.9.tar.gz 68952 BLAKE2B f18c558b38b346d5cfcaa18ae6ea28c223571c8c016b686f5ed787c17c34cb6bec62e064072adf8a5ebc7d2eab89173d171f02a180f3664f36f05cf8d7845808 SHA512 a36825ab22be64c7c7b54861e88dea0bde5f0b80d32fc86b863e4409c820a25fea17cfbf2d068c1fdf4fb371714337dff390d31c983ea898fbdc37a09c469b4a diff --git a/dev-cpp/string-theory/files/string-theory-3.9-unbundle-gtest.patch b/dev-cpp/string-theory/files/string-theory-3.9-unbundle-gtest.patch new file mode 100644 index 000000000000..3ebb410b224e --- /dev/null +++ b/dev-cpp/string-theory/files/string-theory-3.9-unbundle-gtest.patch @@ -0,0 +1,18 @@ +Use system GTest instead of fetching it +https://bugs.gentoo.org/880353 +--- a/test/CMakeLists.txt 2025-03-23 22:20:35.060895402 +0300 ++++ b/test/CMakeLists.txt 2025-03-23 22:22:29.964436254 +0300 +@@ -33,12 +33,7 @@ + set(BUILD_GMOCK OFF CACHE INTERNAL "Override gtest default" FORCE) + set(INSTALL_GTEST OFF CACHE INTERNAL "Override gtest default" FORCE) + +-include(FetchContent) +-FetchContent_Declare(gtest +- GIT_REPOSITORY https://github.com/google/googletest.git +- GIT_TAG v1.15.2 +-) +-FetchContent_MakeAvailable(gtest) ++find_package(GTest REQUIRED) + + add_executable(st_gtests "") + target_link_libraries(st_gtests PRIVATE gtest gtest_main string_theory) diff --git a/dev-cpp/string-theory/string-theory-3.9.ebuild b/dev-cpp/string-theory/string-theory-3.9.ebuild new file mode 100644 index 000000000000..784371a60ea5 --- /dev/null +++ b/dev-cpp/string-theory/string-theory-3.9.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="A flexible modern C++ library for string manipulation and storage" +HOMEPAGE="https://github.com/zrax/string_theory/" +SRC_URI="https://github.com/zrax/string_theory/archive/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/string_theory-${PV}" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + +DEPEND=" + test? ( >=dev-cpp/gtest-1.15.2 ) +" + +PATCHES=( "${FILESDIR}/${P}-unbundle-gtest.patch" ) + +src_configure() { + local mycmakeargs=( + -DST_BUILD_TESTS=$(usex test) + ) + + cmake_src_configure +} + +src_test() { + cd "${BUILD_DIR}/test" || die + ./st_gtests || die +}