commit: 1974e41546dbea0813e3ac681b295224011aef63 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Thu Oct 9 15:31:21 2025 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Thu Oct 9 15:34:57 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1974e415
dev-cpp/rapidyaml: drop 0.6.0 (no stable ebuild left, intentional) This just came back from last-rites and would rather leave this in ~arch until something needs it stable, and this old version is known broken with cmake-4. Closes: https://bugs.gentoo.org/963014 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> dev-cpp/rapidyaml/Manifest | 4 -- .../files/rapidyaml-0.3.0-tests-no-install.patch | 18 ----- .../files/rapidyaml-0.6.0-no-download.patch | 37 ---------- dev-cpp/rapidyaml/rapidyaml-0.6.0.ebuild | 84 ---------------------- 4 files changed, 143 deletions(-) diff --git a/dev-cpp/rapidyaml/Manifest b/dev-cpp/rapidyaml/Manifest index faa04dcfe84b..e35f06231bce 100644 --- a/dev-cpp/rapidyaml/Manifest +++ b/dev-cpp/rapidyaml/Manifest @@ -1,6 +1,2 @@ -DIST c4fs-0ee9c03d0ef3a7f12db6cb03570aa7606f12ba1b.tar.gz 25156 BLAKE2B 864a6a75c5ebe15d73fb6ffa5a83cd6448f37a0f465bf3992fc5bc1000f06d6e945c99b9a4f8f3625499c47ea719a49dd340d11e37c11ed759d1adcb1ea585be SHA512 58149c055b1f87abb12a01b042600a2927bfe7afeb878ca4523b658b0736aff6f752cd579c748cf9d4c85b4229ea50a1e70d633f85f9041fe157765286fa5233 -DIST c4log-457a2997e8ea26ea2a659b8152621f7fead1eb48.tar.gz 12056 BLAKE2B f0dc357c8beb28b2fa73e77f85918c3285be08a6e6c750317b7babddfc2372532d56b29a01adbc2284b7e850aeb2a45f1b24599acca0d0feccf5d60c00432627 SHA512 f728b34c000bbd58ad02d003697de1185feffc1a349600153a7d851f8dac28b88433e97c81dcb14769a74faa9e3d86b297536e8764d6e00b886f11bb2343518f DIST rapidyaml-0.10.0-src.tgz 10267123 BLAKE2B 6f926dc72a04a89cec858ee1729f08e27f0f1c6c2ee50c975573a5b9b3fd84cf3e394d0ba88ddebb3e85f804ba9f7283a4b8df63011491eb4386b487c4eb2573 SHA512 c512529954b411dc37c7471ecc149687f686ccffb40ea5bec43f4f710f812958462158e5f13b21ab630bea88578c786b8744593c91659e9a414d2db48e7e14af -DIST rapidyaml-0.6.0-src.tgz 7384217 BLAKE2B b81f797dcdac10368231256765bff08fa9d911550b620c286a657b41e74e589701a41d4f6e33317a7149fd1a2aabbad6bac6c66c1e494db053251e20bc5e505c SHA512 6637aa970919d76339ca7d3d131032ca97720650e275f7e285c0fa46671daf8638695c4db6ccb06f93671171110c445781a7f2c8e37f6d9a4951d6e649f60cde DIST rapidyaml-0.9.0-src.tgz 10233562 BLAKE2B 270fa4b2277e978e56d16e173f8ec83691016ffab8911b23528204b88109ae58ca113258681f36fee411f6fe62433fa79e4395c798e10c0b6609ca1e68651c7c SHA512 77c2c27c23274789982a9aaaa54e184a635326ce509ad8c2a4eb1c4e2927cd2f1fa7ad66c71f221677d2d36d69ae0d9a7260872739662a0ee66870fd3421ab54 -DIST yaml-test-suite-6e6c296ae9c9d2d5c4134b4b64d01b29ac19ff6f.tar.gz 99765 BLAKE2B d55a605623c988a4c58daa6dd155980129ffefe86570d55b1ce2514dfa77c352e0467b12e95d6e2bd38cc0454f0b30c3109c088841ddbe423b8bbb7d9e41bc9b SHA512 4ab0e52369d085e696196ef1aab8ecb4f0218e48e8ce33c4ecc863942639141601cb1c83b41027eceddc20a6a4cebfc51abcb83779007e890b87d79c76394946 diff --git a/dev-cpp/rapidyaml/files/rapidyaml-0.3.0-tests-no-install.patch b/dev-cpp/rapidyaml/files/rapidyaml-0.3.0-tests-no-install.patch deleted file mode 100644 index 97aeb72ee1a5..000000000000 --- a/dev-cpp/rapidyaml/files/rapidyaml-0.3.0-tests-no-install.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/ext/c4fs/CMakeLists.txt -+++ b/ext/c4fs/CMakeLists.txt -@@ -18,6 +18,4 @@ - ) - --c4_install_target(c4fs) --c4_install_exports() - - c4_add_dev_targets() ---- a/ext/c4log/CMakeLists.txt -+++ b/ext/c4log/CMakeLists.txt -@@ -21,6 +21,4 @@ - ) - --c4_install_target(c4log) --c4_install_exports() - - c4_add_dev_targets() diff --git a/dev-cpp/rapidyaml/files/rapidyaml-0.6.0-no-download.patch b/dev-cpp/rapidyaml/files/rapidyaml-0.6.0-no-download.patch deleted file mode 100644 index 5af2a87267a3..000000000000 --- a/dev-cpp/rapidyaml/files/rapidyaml-0.6.0-no-download.patch +++ /dev/null @@ -1,37 +0,0 @@ -The release tarball does not include requirements for tests and tries -to fetch them. Override so can handle with SRC_URI+DEPEND instead. ---- a/ext/c4core/cmake/c4Project.cmake -+++ b/ext/c4core/cmake/c4Project.cmake -@@ -2902,4 +2902,7 @@ - c4_log("testing requires googletest") - if(NOT TARGET gtest) -+ find_package(GTest REQUIRED) -+ endif() -+ if(FALSE) - # support for old gcc-4.8 and 4.9 - if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND ---- a/ext/testbm.cmake -+++ b/ext/testbm.cmake -@@ -1,4 +1,2 @@ - # these are used both for testing and benchmarking --c4_require_subproject(c4fs REMOTE -- GIT_REPOSITORY https://github.com/biojppm/c4fs -- GIT_TAG master) -+c4_require_subproject(c4fs SUBDIRECTORY ext/c4fs) ---- a/test/CMakeLists.txt -+++ b/test/CMakeLists.txt -@@ -158,12 +158,8 @@ - set(ed ${CMAKE_CURRENT_BINARY_DIR}/subprojects) # casual ryml extern dir (these projects are not part of ryml and are downloaded and compiled on the fly) - -- c4_require_subproject(c4log REMOTE -- GIT_REPOSITORY https://github.com/biojppm/c4log -- GIT_TAG master) -+ c4_require_subproject(c4log SUBDIRECTORY ../ext/c4log) - - set(tsdir ${ed}/yaml-test-suite) -- c4_download_remote_proj(yaml-test-suite suite_dir -- GIT_REPOSITORY https://github.com/yaml/yaml-test-suite -- GIT_TAG data-2022-01-17) -+ set(suite_dir ${CMAKE_SOURCE_DIR}/ext/yaml-test-suite) - if(NOT EXISTS ${suite_dir}/229Q) - c4_err("cannot find yaml-test-suite at ${suite_dir} -- was there an error downloading the project?") diff --git a/dev-cpp/rapidyaml/rapidyaml-0.6.0.ebuild b/dev-cpp/rapidyaml/rapidyaml-0.6.0.ebuild deleted file mode 100644 index b96202b0016e..000000000000 --- a/dev-cpp/rapidyaml/rapidyaml-0.6.0.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 2022-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -# see no-download.patch, match with release date if "master" -HASH_C4FS=0ee9c03d0ef3a7f12db6cb03570aa7606f12ba1b -HASH_C4LOG=457a2997e8ea26ea2a659b8152621f7fead1eb48 -HASH_YAMLTS=6e6c296ae9c9d2d5c4134b4b64d01b29ac19ff6f - -DESCRIPTION="Library to parse and emit YAML, and do it fast" -HOMEPAGE="https://github.com/biojppm/rapidyaml/"; -SRC_URI=" - https://github.com/biojppm/rapidyaml/releases/download/v${PV}/${P}-src.tgz - test? ( - https://github.com/biojppm/c4fs/archive/${HASH_C4FS}.tar.gz - -> c4fs-${HASH_C4FS}.tar.gz - https://github.com/biojppm/c4log/archive/${HASH_C4LOG}.tar.gz - -> c4log-${HASH_C4LOG}.tar.gz - https://github.com/yaml/yaml-test-suite/archive/${HASH_YAMLTS}.tar.gz - -> yaml-test-suite-${HASH_YAMLTS}.tar.gz - ) -" -S=${WORKDIR}/${P}-src - -LICENSE="MIT Boost-1.0 BSD" -SLOT="0/${PV}" -KEYWORDS="amd64 arm64 ppc64 ~riscv x86" -IUSE="debug test" -RESTRICT="!test? ( test )" - -DEPEND="test? ( dev-cpp/gtest )" - -PATCHES=( - "${FILESDIR}"/${PN}-0.6.0-no-download.patch -) - -DOCS=( README.md ROADMAP.md changelog ) - -src_prepare() { - if use test; then - # also need c4core, symlink the one included in src.tgz - mv ../c4fs-${HASH_C4FS} ext/c4fs && - rmdir ext/c4fs/ext/c4core && - ln -s ../../c4core ext/c4fs/ext || die - - mv ../c4log-${HASH_C4LOG} ext/c4log && - rmdir ext/c4log/ext/c4core && - ln -s ../../c4core ext/c4log/ext || die - - mv ../yaml-test-suite-${HASH_YAMLTS} ext/yaml-test-suite || die - - eapply "${FILESDIR}"/${PN}-0.3.0-tests-no-install.patch - fi - - cmake_src_prepare - - sed -E "/set\(_(ARCHIVE|LIBRARY)_INSTALL/s:lib/:$(get_libdir)/:" \ - -i ext/c4core/cmake/c4Project.cmake || die -} - -src_configure() { - local mycmakeargs=( - -DGIT=false - -DRYML_BUILD_TESTS=$(usex test) - -DRYML_DBG=$(usex debug) - - # TODO?: enable this+tests, should(?) be easier to do with >=0.5.0 but - # still need looking into (please file a bug if actually need this now) - -DRYML_BUILD_API=no - - # rapidyaml sets c++11, but (system) >=gtest-1.13 wants >=c++14, also - # see: https://github.com/biojppm/cmake/commit/e344bf0681 (bug #893272) - -DC4_CXX_STANDARD=17 - ) - - cmake_src_configure -} - -src_test() { - cmake_build test -}
