gentoo auto-resync : 30:04:2024 - 00:00:01

5 files changed, 130 insertions, 4 deletions

diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 63a032d28117..18250a5ee950 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/rapidyaml/Manifest b/dev-cpp/rapidyaml/Manifest
index 74c4ae70d8e3..9ed130eabbfe 100644
--- a/dev-cpp/rapidyaml/Manifest
+++ b/dev-cpp/rapidyaml/Manifest
@@ -2,9 +2,14 @@ AUX rapidyaml-0.3.0-libdir.patch 450 BLAKE2B 3058bfbeaa85a81396baf3048d32e7289b4
 AUX rapidyaml-0.3.0-system-gtest.patch 287 BLAKE2B 00569e1a19fb791bc0ba1c7a8b2b691db478f7e224a842e33c57d0f11d59275fac137e4a193261db7763e5d9a95b98cf17c2ae467bed29617a1f0c5b4544b607 SHA512 119827a88ccd82e8a78fb82593431f8fbb0efc3155043b9587d5909a7d0a944d01703d8f0a9179e6127c5484a292a94c761ca7f22069aa02f03c2a03ba730b8e
 AUX rapidyaml-0.3.0-tests-no-install.patch 315 BLAKE2B 653c4f80092950636f8ef2ce0f1a4dcb8b3af1af83928ac0f75be35fc6b69805f457370783ef64d577f1a1b1b5992eb252b82092f20d61e2add683b9841007cc SHA512 fcdf198dd628023919579661a09de04f8cc863520cb915069dc850124e2a4baf7304eaa1ac41edaa39cf6085afeb9b3feae4b41b3c7e9d7d4696f109a334c389
 AUX rapidyaml-0.4.0-no-download.patch 821 BLAKE2B 9b4122343ce2afdaffeffe7eaf9193395db2d7fc924e44cd75f735e697276501102d058ba95ced225993f0423b0bdef778c3fdfd95b59dcdcd718d96e6e2a4ae SHA512 4dd4c91704308d931a61f3841297d1f95986fc7bc9ab03d0c44583f061762b0af1240e6f6ad8784de2185c45fe09fb87bcc34f07bed655f13c80395ff6eaf121
+AUX rapidyaml-0.6.0-no-download.patch 1574 BLAKE2B ab5ccb742f4015f9936b760227d43dbe2a9b99a5419117cac5098997b6be51f46b3f473fdfa69a5640a045c7bdb8a5b232639b1df1eb57eb4cbbd8d218adb5e4 SHA512 a3884965fb2a7cf7221645fcd4940a0a523aa46658d516c5fbd3554fa2f9cebe038ce805f41dd464e59b048afb9908092bc5e8a45fb0875ad3421d0544e0d4f3
+DIST c4fs-0ee9c03d0ef3a7f12db6cb03570aa7606f12ba1b.tar.gz 25156 BLAKE2B 864a6a75c5ebe15d73fb6ffa5a83cd6448f37a0f465bf3992fc5bc1000f06d6e945c99b9a4f8f3625499c47ea719a49dd340d11e37c11ed759d1adcb1ea585be SHA512 58149c055b1f87abb12a01b042600a2927bfe7afeb878ca4523b658b0736aff6f752cd579c748cf9d4c85b4229ea50a1e70d633f85f9041fe157765286fa5233
+DIST c4log-457a2997e8ea26ea2a659b8152621f7fead1eb48.tar.gz 12056 BLAKE2B f0dc357c8beb28b2fa73e77f85918c3285be08a6e6c750317b7babddfc2372532d56b29a01adbc2284b7e850aeb2a45f1b24599acca0d0feccf5d60c00432627 SHA512 f728b34c000bbd58ad02d003697de1185feffc1a349600153a7d851f8dac28b88433e97c81dcb14769a74faa9e3d86b297536e8764d6e00b886f11bb2343518f
 DIST rapidyaml-0.5.0-src.tgz 7273101 BLAKE2B b15033ae028c4704178dc4a017b5c1e858288d4713a2b96f5cfc19583e13b62031327f10ab045eec007e427eb7d71ba0e7dde2d743a81c3da0e20bc68aea47f5 SHA512 d7d65e759c466aa4cceed4d02d2c84284b205812be1de10495eef663a0b7d4adb7d8fe5f731f0f9ecba04d5d93cb1af760a83eb6d0630d25ee162f0c36b38e8a
+DIST rapidyaml-0.6.0-src.tgz 7384217 BLAKE2B b81f797dcdac10368231256765bff08fa9d911550b620c286a657b41e74e589701a41d4f6e33317a7149fd1a2aabbad6bac6c66c1e494db053251e20bc5e505c SHA512 6637aa970919d76339ca7d3d131032ca97720650e275f7e285c0fa46671daf8638695c4db6ccb06f93671171110c445781a7f2c8e37f6d9a4951d6e649f60cde
 DIST rapidyaml-c4fs-0130061b804ae2af0d6cd5919275d552eb1f2414.tar.gz 22615 BLAKE2B b774723d35658ffb56b187428089bdf2b5bebd470d0be3122bd1f99248d2537d4b31649c5e8b133b2cb28e8ec97a428a325701830708238878da07426fe7853b SHA512 d18be64060779af1b19ccafbbf26bc6c437ff5ed074bef5919ebef55bb9ad36a7abb183a99a86bada0447b15b8386c991ac9ab975d63aab77c3a57801358bf96
 DIST rapidyaml-c4log-00066ad7f624556f066f3d60766a2c33aeb3c6f0.tar.gz 11978 BLAKE2B 554240c63114f1c0bd22295a39b683a59981f3e80352dce7aebe3af39dd6d1211c2c8df9f84f3f8c30775622e242a95c3a50572b30b557c269d3d9eb2ecca3de SHA512 9399e55e116b87b4ee4583e32c7a72bc3f7fd579fda69c515a5d0df5fc065246aaa1587ed937e7c6eb6df417810284496bb2eafa0879800cecbe17ecdbef5ae9
-DIST rapidyaml-yaml-test-suite-6e6c296ae9c9d2d5c4134b4b64d01b29ac19ff6f.tar.gz 99765 BLAKE2B d55a605623c988a4c58daa6dd155980129ffefe86570d55b1ce2514dfa77c352e0467b12e95d6e2bd38cc0454f0b30c3109c088841ddbe423b8bbb7d9e41bc9b SHA512 4ab0e52369d085e696196ef1aab8ecb4f0218e48e8ce33c4ecc863942639141601cb1c83b41027eceddc20a6a4cebfc51abcb83779007e890b87d79c76394946
-EBUILD rapidyaml-0.5.0.ebuild 2243 BLAKE2B d63cbce26fdab56e1941b1d27c86a790eb393d011de0aba2fd0ab4efeea2c66915fa98356867c26a7e01d526d80ef42901baff516904cd482f5dddcee8456dd8 SHA512 efabb0d91af90981ad2c0caf5fea4c47f1668c59f680c1f5ba0ec6b1490a424a87e705c269055880d604291a5a28d563cccd6abd0157dd89c05dfe4a423fc7c2
+DIST yaml-test-suite-6e6c296ae9c9d2d5c4134b4b64d01b29ac19ff6f.tar.gz 99765 BLAKE2B d55a605623c988a4c58daa6dd155980129ffefe86570d55b1ce2514dfa77c352e0467b12e95d6e2bd38cc0454f0b30c3109c088841ddbe423b8bbb7d9e41bc9b SHA512 4ab0e52369d085e696196ef1aab8ecb4f0218e48e8ce33c4ecc863942639141601cb1c83b41027eceddc20a6a4cebfc51abcb83779007e890b87d79c76394946
+EBUILD rapidyaml-0.5.0.ebuild 2237 BLAKE2B d61cd8f20e501ac14b1ebde2ee0cc4993eb104d7ff7477ab62eaec2e3abe99d27acd88bfc7343fd048c2a4e0d44e380be0bfe506d78234e45031fe336719ac1e SHA512 f8b4225ce34c2f023a69e411942b565903f858b71ea4e2b08c369fa7a6727f27593a5d72ea1f5ba63cfff0b19f27817bcf5463d424708c8b78310c330af96963
+EBUILD rapidyaml-0.6.0.ebuild 2256 BLAKE2B 4d61df1378582e24b914adf39704730bc0c5d7537b867cdce7a1b33210555e6075c1ffadf4f3035f4173be5b44cb30cec11dff2046f008f74c2c74965dc5cd59 SHA512 df04fcdd1251f10afe58d0034921eb03bed28cc956762aa20fb596e670082882bdd40bed4558a964b3269ddbbf551e418749c3b43db986ec91ba9dffa8aab197
 MISC metadata.xml 375 BLAKE2B ae9fc516e43fb6561964a17a58c9c2eefffeaa918a62c325c0b72847c60dad692c107f5ea27a2b6abbf93f73bc27f8a24a00f57dfcbf72bb0f6bd9a5344b6ea2 SHA512 263bb4123527bc4e48c2d9ccc4d797e943be1a5924dd8504c09f028728297c46d3e17e0716ea50a6a35fbfd3561043711ac554776a6c538543ae51ba11ab72a1
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
new file mode 100644
index 000000000000..5af2a87267a3
--- /dev/null
+++ b/dev-cpp/rapidyaml/files/rapidyaml-0.6.0-no-download.patch
@@ -0,0 +1,37 @@
+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.5.0.ebuild b/dev-cpp/rapidyaml/rapidyaml-0.5.0.ebuild
index bfb67241cda1..0bc722c427eb 100644
--- a/dev-cpp/rapidyaml/rapidyaml-0.5.0.ebuild
+++ b/dev-cpp/rapidyaml/rapidyaml-0.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -20,7 +20,7 @@ SRC_URI="
 		https://github.com/biojppm/c4log/archive/${HASH_C4LOG}.tar.gz
 			-> ${PN}-c4log-${HASH_C4LOG}.tar.gz
 		https://github.com/yaml/yaml-test-suite/archive/${HASH_YAMLTS}.tar.gz
-			-> ${PN}-yaml-test-suite-${HASH_YAMLTS}.tar.gz
+			-> yaml-test-suite-${HASH_YAMLTS}.tar.gz
 	)"
 S="${WORKDIR}/${P}-src"
 
diff --git a/dev-cpp/rapidyaml/rapidyaml-0.6.0.ebuild b/dev-cpp/rapidyaml/rapidyaml-0.6.0.ebuild
new file mode 100644
index 000000000000..c552128f0d52
--- /dev/null
+++ b/dev-cpp/rapidyaml/rapidyaml-0.6.0.ebuild
@@ -0,0 +1,84 @@
+# 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
+}