diff options
Diffstat (limited to 'dev-cpp')
-rw-r--r-- | dev-cpp/Manifest.gz | bin | 12579 -> 12580 bytes | |||
-rw-r--r-- | dev-cpp/abseil-cpp/Manifest | 9 | ||||
-rw-r--r-- | dev-cpp/abseil-cpp/abseil-cpp-20210324.2.ebuild | 77 | ||||
-rw-r--r-- | dev-cpp/abseil-cpp/abseil-cpp-20211102.0-r1.ebuild | 72 | ||||
-rw-r--r-- | dev-cpp/abseil-cpp/abseil-cpp-20211102.0-r2.ebuild | 2 | ||||
-rw-r--r-- | dev-cpp/abseil-cpp/abseil-cpp-20220623.1.ebuild | 2 | ||||
-rw-r--r-- | dev-cpp/abseil-cpp/metadata.xml | 3 | ||||
-rw-r--r-- | dev-cpp/taskflow/Manifest | 3 | ||||
-rw-r--r-- | dev-cpp/taskflow/files/taskflow-3.4.0-fix_doctest.patch | 377 | ||||
-rw-r--r-- | dev-cpp/taskflow/taskflow-3.4.0.ebuild | 47 | ||||
-rw-r--r-- | dev-cpp/yaml-cpp/Manifest | 1 | ||||
-rw-r--r-- | dev-cpp/yaml-cpp/yaml-cpp-0.7.0-r1.ebuild | 40 |
12 files changed, 435 insertions, 198 deletions
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz Binary files differindex 4358d5da0703..6b2977d010b9 100644 --- a/dev-cpp/Manifest.gz +++ b/dev-cpp/Manifest.gz diff --git a/dev-cpp/abseil-cpp/Manifest b/dev-cpp/abseil-cpp/Manifest index 7f044eeb075a..464d3d996c4a 100644 --- a/dev-cpp/abseil-cpp/Manifest +++ b/dev-cpp/abseil-cpp/Manifest @@ -5,16 +5,13 @@ AUX abseil-cpp-20211102.0-r2-cuda11.6-compile-fix.patch 741 BLAKE2B 22bc89e5b0ed AUX abseil-cpp-20211102.0-r2-gcc-13.patch 951 BLAKE2B ad2a13d2260d7cfdfe95b07f1582bbf5ce627d8d8bf1e32b70834611065359b95d17b198c2b0aef70ff353dc289903c70ee9be95d40ef38f75c1872f08987eb1 SHA512 73aae8c3c90d87da47a8a37b68721fa06f44abcf02e829fecdcc076999f420a513005e946662bfeb073cf19a06916b1b400b3f35811ddfbe9b0fde75b4d87a53 AUX abseil-cpp-20211102.0-r2-loong.patch 739 BLAKE2B a3082b6da75719f57287dfac5b67e70ced0ebdbf3e2682c273d7022b024a92fedc8d33c781bafe167675a6a1cd592dbaf915c4031e6dca6aca2513451717cdc8 SHA512 d77e896e145e71b96be32779adb12cbaeabb3a69e5e57a0f47fdf428baf3b6ea22484e9a02979bf15f839417b13e74d0629a6d7207ad0bfa4f44eb9e1eb82867 DIST abseil-cpp-20200923.3.tar.gz 1783980 BLAKE2B 66d46fd6aafe0bf0d3fccd8a4e0a72fb0545a405d9c92d36ffcb1cf791b6d0eb85fd55218f740ba34c05c7bc952ad1aeaa367963b1f540f03a4f510fd02cd6d5 SHA512 7d9e2bc001a397b983afe1e5ca4d779bd27d0d30fad7f44e564a675e228f2fc29c203ef89dd1b0ff4a1832c6d99ae7627c9103a0daa6cccb426472528109ef85 -DIST abseil-cpp-20210324.2.tar.gz 1774172 BLAKE2B f33ebe830bcece41d76c4de8f514e32a2515be8a78b6cc7a8877ba72284be62649e345dea224976e78e8dcf7fd957e249c92f7c89e92ae44e984fe294df711fc SHA512 7b935f0f2787a81438f30072f2191138ce3c099e4b22addfbe8ebe579d906604bc6ab03f054d3d6917a08ef5cb7a4371c1a501a7dfbc15c50301261dbf5f6e27 DIST abseil-cpp-20211102.0.tar.gz 1884080 BLAKE2B a148f3b7cc9516fbeacc25116032a956bfa3cce61b4294c226e826e1171d24c043ab199757a11fae3fec0bc307b2222773a6b4f4563b289f7565b0ce4f72318a SHA512 fed68aa434c02ec6faa9d1c81f1ad35b60ec024b44957e2e0ac31e6075e385c06a3e1b616afeb4bb7c2413191fd7827d82e1f9f0796b52ed21fb2c41dd9031cf DIST abseil-cpp-20220623.1.tar.gz 1957483 BLAKE2B 5bcf60b5a55882bcb78c7095a9892f6d1e5819fb116e325a8299fb22780ab009f0e1d92d5d8aca5ae0d4acc6d60e620e3357a24e389059f6e75d94f1cbdc1ced SHA512 ab4fccd9a2bfa0c5ad4b56c8e8f8b7ec7a8eca8b6cc6959802acadd1da785e1feb078c6ac621808cd699c82717a9e637dc426d94b70a8db7f2a807059d41cbc2 DIST gtest-1.10.0_p20200702.tar.gz 866900 BLAKE2B c162d47868583ba270675abe5df935b8f4b9a9c00dbdc80dd88afa7f2b98266640b32b2ea5e8f9f6d6227196b5d2f79dbfda4e9585106224e814cc1503cf777d SHA512 715d887b59b47d4691c7c90ef0cf0ffc3d1e758e500263c76b50fd506e90a9d1c390af745933cfe3f55e1edac5d72dccedef3cb9a50b71a5b796424471a3017b DIST gtest-1b18723e874b256c1e39378c6774a90701d70f7a.tar.gz 833195 BLAKE2B cfeb4fc1569529f8a08557330ab2c88db7703c4f2e8628d18b403f424342ad82b062edb8cc9c0dc122c453235ab327ea742a5ef12e49726e2fa2f60f5ea762d9 SHA512 cb90a54681e0be20a9a8c7a19f960a97cc567931308f4956ee142b86769c062fcf612b9635f5548009ee6d598ae0c1e83692151ec9f1ff1e409b89e158d8b954 DIST gtest-e68764c147ea0dac1e8811925c531d937396878e.tar.gz 862129 BLAKE2B d6decb9d1ad4e379a76119ec984deaa7649fca033f225698ce421bcee1207b52da3c4fdb2f6d68b968248575704ebe501b7b1d0a02c180901ffa78f9aa47f549 SHA512 aca72b5f64894aeee34cb869bdeda2d25ec04e901fe0e4e8d08d49472de1c9b19a97ba97a2e8570a88be74aea26d1cd526b4e605005a881e1cb6ab03ed3a4ceb EBUILD abseil-cpp-20200923.3.ebuild 2026 BLAKE2B 9dffa70b9c9fcaa4c20fa06d6c775d52d35919690619ebc24d4b35da1502f587cdece1bc2f6532c2246210216082d0e6c21b9620acb3161abde70d3ccb8b6689 SHA512 6e3a4125ed1320e938f373607c25fe8823323d13ae031256e615cf5d0a547fb39c4fc6269091d21efa3905adad9002869fed7b74e61324ff9d8a8530a807f807 -EBUILD abseil-cpp-20210324.2.ebuild 1891 BLAKE2B da7b42a49acb82ceb39e7e5906b4da251bc9e6a8ddc8cb0159a75da8780b2cdc3c904417880126092f85cf730a73a92356d170d8e643cc1693c4eb95af692df5 SHA512 4105a51bc824f32e8f122df992cc370d3ef5541f06e77b13eafe2cf5dd0a9387a0aa81c7b86cec90df0321d70c8f4bd6f766d13a0f12379a29410d16c4ad8f75 -EBUILD abseil-cpp-20211102.0-r1.ebuild 1683 BLAKE2B 29136b71c898153014d4ea5ac3b2ab9639e4718a7b3a24aff8e32152fd07967702b42cf682075629276e8bed365c4e1f78b494fdf0184c235abb2815e8d3c574 SHA512 7ea77c6f409f9809642ce6ed7b09948e72f01154cd00d516e1a6ac474f451d37c157639d0e3b90a80eac9db997f6f320de270dc2fa1f4031dd62a78af17a3788 -EBUILD abseil-cpp-20211102.0-r2.ebuild 1847 BLAKE2B 6198a25f9819d644c9a25b113184ac7e63eb91bded975b8de99de8bfd2f0204385ab910524d209fc9122ddd745bdd4f8d3d9eef7ea54b0d2d6396ac0c24cd460 SHA512 6d63fd221f5166912e523b28fd1a6fcce737d9486b97568410497cef70feaa4fcd03043e5cca0a37c91651c5cb824d04b8328100ef83f0eb50e40a49606dd19b +EBUILD abseil-cpp-20211102.0-r2.ebuild 1843 BLAKE2B 3e9120c96bb73c11369433c4dba24132e5109821a76438e275c05e198c9edf955847899f4ff14195e8470be38b0eb9381da8c01d44f4699f07994540e3182895 SHA512 8c15ad4115e4b05280b995b856d7cab91a51c523b440d96424fceaa29bfe1eb48c58b6764e93f08bbf8c47aac6aaf89508041483936188eaddceb26f48fafa64 EBUILD abseil-cpp-20211102.0.ebuild 1603 BLAKE2B 021dfbff67d17af4822a729fa6c7837f6e14b1db6a4e1af32cbb5b87a08a0a1708a70a5bbec3e1fe860d576355cebbbfbf38f4435442cdee8dd66de683b889aa SHA512 54c6a36d26fef86c5ef3037034ae16e5b76f7ae0110b31780963a661fe494f38514b29c897c5943819bfc82d91da666c4d22f801a15802555eb9af2c77cd0900 -EBUILD abseil-cpp-20220623.1.ebuild 1697 BLAKE2B b76c231b427c05eb5bf69b9af0bf0421969a7b5f0988dcba9e5aa1cd5622e50df7aa3907cc177c50412156e479c606aba7389c5d1ef50481124615b6726e71c4 SHA512 bb05d9e749abe889df77049d6a134fc8835b8682c30e7b6ac16c79831dd0f2e83be93567c5cedd6ce66731b8246729b2d4677cf23902ce594e935cba94f7423f -MISC metadata.xml 357 BLAKE2B 3137dd5248b0a7df5b0bf1af9c410cc5a8af300142d18d9d4110a74452f4b1a5f263dd1748a7b88eef0b1548b7203dc12c2678c6d07673f6766fdbc8a1297813 SHA512 3134c17c0f83d8ad16f081c506fd1f3e3ff06f1a2b615d56c4f05456c971acf8568768c2ed443f3a35725dd19f8d42076957fe2d25d049de277dea55903ea2ed +EBUILD abseil-cpp-20220623.1.ebuild 1693 BLAKE2B b0a3e2616b67469d27ece025cbbe0ed8bfdd37a323e61e15873e7e7f1dd0fe485ca4a57964b8374a45eca55452b6dc4ec767bc93b054d70717e3ac4fa614b0a6 SHA512 412f3290e2577c66d20856ce8f1ba1a297d547e40e70fa26681fac36608936c0aa2d01208967072dd7a9acc119c1065134d6fbe20d31e60cb7708cc9e08f7716 +MISC metadata.xml 439 BLAKE2B c4a87701635b1b903c2461acca126d15edb4f15cbb8dd9f353bcc71730c85478fd815e1f9c1f6ff8082360777a6e11042a01e417167c192b41f72b67e193d41f SHA512 16489f072408026da8f5da445185233f54a7c29761fa835a8388099acb8a6e3685e7db108fc4a3daa3430bcf6cb61d2e5d03c2e0e25d0f42f6da23e5dbcd134e diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20210324.2.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20210324.2.ebuild deleted file mode 100644 index af0821bbd992..000000000000 --- a/dev-cpp/abseil-cpp/abseil-cpp-20210324.2.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 2020-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} ) - -inherit cmake flag-o-matic python-any-r1 toolchain-funcs - -# yes, it needs SOURCE, not just installed one -GTEST_COMMIT="aee0f9d9b5b87796ee8a0ab26b7587ec30e8858e" -GTEST_FILE="gtest-1.10.0_p20200702.tar.gz" - -DESCRIPTION="Abseil Common Libraries (C++), LTS Branch" -HOMEPAGE="https://abseil.io" -SRC_URI="https://github.com/abseil/abseil-cpp/archive/${PV}.tar.gz -> ${P}.tar.gz - test? ( https://github.com/google/googletest/archive/${GTEST_COMMIT}.tar.gz -> ${GTEST_FILE} )" - -LICENSE=" - Apache-2.0 - test? ( BSD ) -" -SLOT="0/${PV%%.*}" -KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86" -IUSE="test" - -DEPEND="" -RDEPEND="${DEPEND}" - -BDEPEND=" - ${PYTHON_DEPS} - test? ( sys-libs/timezone-data ) -" - -RESTRICT="!test? ( test )" - -PATCHES=( - "${FILESDIR}/${PN}-20200923-arm_no_crypto.patch" -) - -src_prepare() { - cmake_src_prepare - - # un-hardcode abseil compiler flags - sed -i \ - -e '/"-maes",/d' \ - -e '/"-msse4.1",/d' \ - -e '/"-mfpu=neon"/d' \ - -e '/"-march=armv8-a+crypto"/d' \ - absl/copts/copts.py || die - - # now generate cmake files - python_fix_shebang absl/copts/generate_copts.py - absl/copts/generate_copts.py || die - - if use test; then - sed -i 's/-Werror//g' \ - "${WORKDIR}/googletest-${GTEST_COMMIT}"/googletest/cmake/internal_utils.cmake || die - fi -} - -src_configure() { - if use arm || use arm64; then - # bug #778926 - if [[ $($(tc-getCXX) ${CXXFLAGS} -E -P - <<<$'#if defined(__ARM_FEATURE_CRYPTO)\nHAVE_ARM_FEATURE_CRYPTO\n#endif') != *HAVE_ARM_FEATURE_CRYPTO* ]]; then - append-cxxflags -DABSL_ARCH_ARM_NO_CRYPTO - fi - fi - - local mycmakeargs=( - -DABSL_ENABLE_INSTALL=TRUE - -DABSL_LOCAL_GOOGLETEST_DIR="${WORKDIR}/googletest-${GTEST_COMMIT}" - -DCMAKE_CXX_STANDARD=17 - $(usex test -DBUILD_TESTING=ON '') #intentional usex - ) - cmake_src_configure -} diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20211102.0-r1.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20211102.0-r1.ebuild deleted file mode 100644 index 73bcffd05bbc..000000000000 --- a/dev-cpp/abseil-cpp/abseil-cpp-20211102.0-r1.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 2020-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..11} ) - -inherit cmake python-any-r1 - -# yes, it needs SOURCE, not just installed one -# and no, 1.11.0 is not enough -GTEST_COMMIT="1b18723e874b256c1e39378c6774a90701d70f7a" -GTEST_FILE="gtest-${GTEST_COMMIT}.tar.gz" - -DESCRIPTION="Abseil Common Libraries (C++), LTS Branch" -HOMEPAGE="https://abseil.io" -SRC_URI="https://github.com/abseil/abseil-cpp/archive/${PV}.tar.gz -> ${P}.tar.gz - test? ( https://github.com/google/googletest/archive/${GTEST_COMMIT}.tar.gz -> ${GTEST_FILE} )" - -LICENSE=" - Apache-2.0 - test? ( BSD ) -" -SLOT="0/${PV%%.*}" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" -IUSE="test" - -DEPEND="" -RDEPEND="${DEPEND}" - -BDEPEND=" - ${PYTHON_DEPS} - test? ( sys-libs/timezone-data ) -" - -RESTRICT="!test? ( test )" - -PATCHES=( - "${FILESDIR}/${PN}-20211102.0-fix-cuda-nvcc-build.patch" -) - -src_prepare() { - cmake_src_prepare - - # un-hardcode abseil compiler flags - sed -i \ - -e '/"-maes",/d' \ - -e '/"-msse4.1",/d' \ - -e '/"-mfpu=neon"/d' \ - -e '/"-march=armv8-a+crypto"/d' \ - absl/copts/copts.py || die - - # now generate cmake files - python_fix_shebang absl/copts/generate_copts.py - absl/copts/generate_copts.py || die - - if use test; then - sed -i 's/-Werror//g' \ - "${WORKDIR}/googletest-${GTEST_COMMIT}"/googletest/cmake/internal_utils.cmake || die - fi -} - -src_configure() { - local mycmakeargs=( - -DABSL_ENABLE_INSTALL=TRUE - -DABSL_LOCAL_GOOGLETEST_DIR="${WORKDIR}/googletest-${GTEST_COMMIT}" - -DCMAKE_CXX_STANDARD=17 - -DABSL_PROPAGATE_CXX_STD=TRUE - $(usex test -DBUILD_TESTING=ON '') #intentional usex - ) - cmake_src_configure -} diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20211102.0-r2.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20211102.0-r2.ebuild index a56f32be78e9..7c3766b6ac30 100644 --- a/dev-cpp/abseil-cpp/abseil-cpp-20211102.0-r2.ebuild +++ b/dev-cpp/abseil-cpp/abseil-cpp-20211102.0-r2.ebuild @@ -22,7 +22,7 @@ LICENSE=" test? ( BSD ) " SLOT="0/${PV%%.*}" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86" IUSE="test" DEPEND="" diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20220623.1.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20220623.1.ebuild index 8fc2418166b6..eff814b4fca6 100644 --- a/dev-cpp/abseil-cpp/abseil-cpp-20220623.1.ebuild +++ b/dev-cpp/abseil-cpp/abseil-cpp-20220623.1.ebuild @@ -22,7 +22,7 @@ LICENSE=" test? ( BSD ) " SLOT="0/${PV%%.*}" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86" IUSE="test" DEPEND="" diff --git a/dev-cpp/abseil-cpp/metadata.xml b/dev-cpp/abseil-cpp/metadata.xml index f6827887342a..50aacfb6cbca 100644 --- a/dev-cpp/abseil-cpp/metadata.xml +++ b/dev-cpp/abseil-cpp/metadata.xml @@ -8,4 +8,7 @@ <use> <flag name="cxx17">Build with -DCMAKE_CXX_STANDARD=17 (required by some revdeps)</flag> </use> + <upstream> + <remote-id type="github">abseil/abseil-cpp</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-cpp/taskflow/Manifest b/dev-cpp/taskflow/Manifest index 9050d4a79b3e..099a44e3198f 100644 --- a/dev-cpp/taskflow/Manifest +++ b/dev-cpp/taskflow/Manifest @@ -1,6 +1,9 @@ AUX taskflow-3.3.0-fix_doctest.patch 11940 BLAKE2B 05b8b67289ea904548635183db8798a17c1fe2dfd8fdc7866703cfbc19a986c07c486fedcfbd57ce6061f374f1024ce54c4017d008f205cf8f68256a97efcfda SHA512 508c124ce728d02a98f76461a7d0612b6f5a68c29e4bbcc8039d9a8e43e537fc4521e13f76e77bdcc22620ff14897015dd48bac47b58e2e2f09c67a5473ae028 +AUX taskflow-3.4.0-fix_doctest.patch 12005 BLAKE2B 02df64614f0692beb127ff498b6a28f2d02279e76e8379c55d70c39ded8c207c0ec43aaaacafd2c334c552444ac31b35e4b9b6a9f72afed9c1d82dbd9ae7d5db SHA512 df4cad42467361c2988030ccb66076d621bf60c074634d03686bb4e28f2dbe7e38599a0ba6993e59d35df59e4eb63469b04a447c038824d5c77680d6e2e1bb44 AUX taskflow-9999-fix_doctest.patch 12005 BLAKE2B 02df64614f0692beb127ff498b6a28f2d02279e76e8379c55d70c39ded8c207c0ec43aaaacafd2c334c552444ac31b35e4b9b6a9f72afed9c1d82dbd9ae7d5db SHA512 df4cad42467361c2988030ccb66076d621bf60c074634d03686bb4e28f2dbe7e38599a0ba6993e59d35df59e4eb63469b04a447c038824d5c77680d6e2e1bb44 DIST taskflow-3.3.0.tar.gz 64446007 BLAKE2B 07878a03bd90af64914f1dc80850bcf5d4140f20ecfa998237039b6f37cc668e8c2b5dffafb75f4518209b3ac01f9935f5e30a020871334f131e6fe7654748bf SHA512 08ab20bf38927d49c8332fc103cb7b4b6358efa06466cb8471f2004eb27b79b9eadc9971ec4acd110c8f369686b6f99bf3e21192285c3f28b9cb855bfd9ab0b5 +DIST taskflow-3.4.0.tar.gz 64152239 BLAKE2B cec78155bc8db3ac7fb6e61ece8c1bb4697c6655122cdcd987405ce21b1f4f30570debda8a7cccf43d089bac791cb18654e829380e244addae2875ad4fdb47c5 SHA512 e0e3589feec65677c4de6583a70c14f90826f2177636010955c597a3232f7842431c697eae711318f4a64fae52ac3e33e2d0739ef36bb7c57698110b6fa4740d EBUILD taskflow-3.3.0.ebuild 1000 BLAKE2B f4b9ccf9b2debe643d32247f610eed6c31d20c506351b81dfb6096c8550da4e9da79ec5cfff921a5d33eaf47616e053611447b154643c7300e247c6ecc1b7541 SHA512 c47d83679e4d2d495636fe49b67b38eac01b65d3b4f2a90ab1c2059c5151487f2c7f41140eaedbb4d41b1b7c018b3646826662ed1d8015a99a213ca61dcfacbc +EBUILD taskflow-3.4.0.ebuild 1000 BLAKE2B 569ac9e32cdb984e614b9842d57b7686a32a399e2b983f6a2abd91a7facf1b5acb496defb13b1f4c0fcfd8ff10d08c54a60c8d806eefa4472869191f99d023cd SHA512 c2d60881a3d28d7f53cc7fa690aa7e7cf02a3f5c0895ed13bc2a06d356ea59f8fdaa97bb2e903ae6887534c9ed23baaca3177894bb3ae541ba18b4f3a3ce981d EBUILD taskflow-9999.ebuild 955 BLAKE2B f05ffb61825b989838487a762e6440c88eedc296174da5c7c4288efaa8b42d345a26d14de263662e8c51ebc485b0cc350ad30d5e537d6646183faced957cf953 SHA512 1dabc3aae2c06983a9f1fabb48a9a5f7486d12440099b9588d602989c60cf5b7de792c219589aed4989e5c305abcb36e57a9b58ad63fd78a4967270401a3180a MISC metadata.xml 651 BLAKE2B e10047de786b002d6c270c5e7bd4b618a435188c4d15d907e771b7d638832e41e1e7b6d4a367878c8b46a2ea774afdbdf6e5f054e90dadfd87dac3042c471fea SHA512 44ef280af91998e08aa97e8dfb9b3a5d26b67f1416d58c7e8975f12516549a76b9b9763158207add9b581bb08559d95721fedc35984916011e5af4eda155a87d diff --git a/dev-cpp/taskflow/files/taskflow-3.4.0-fix_doctest.patch b/dev-cpp/taskflow/files/taskflow-3.4.0-fix_doctest.patch new file mode 100644 index 000000000000..323d17e7f535 --- /dev/null +++ b/dev-cpp/taskflow/files/taskflow-3.4.0-fix_doctest.patch @@ -0,0 +1,377 @@ +diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt +index 3397d798..1256e8e6 100644 +--- a/unittests/CMakeLists.txt ++++ b/unittests/CMakeLists.txt +@@ -1,6 +1,7 @@ + enable_testing() + +-include(${TF_3RD_PARTY_DIR}/doctest/doctest.cmake) ++find_package(doctest REQUIRED) ++include(doctest) + + list(APPEND TF_UNITTESTS + utility +@@ -23,8 +24,7 @@ list(APPEND TF_UNITTESTS + + foreach(unittest IN LISTS TF_UNITTESTS) + add_executable(${unittest} ${unittest}.cpp) +- target_link_libraries(${unittest} ${PROJECT_NAME} tf::default_settings) +- target_include_directories(${unittest} PRIVATE ${TF_3RD_PARTY_DIR}/doctest) ++ target_link_libraries(${unittest} ${PROJECT_NAME} tf::default_settings doctest::doctest) + doctest_discover_tests(${unittest}) + endforeach() + +diff --git a/unittests/algorithms.cpp b/unittests/algorithms.cpp +index a250713a..09ae9ba5 100644 +--- a/unittests/algorithms.cpp ++++ b/unittests/algorithms.cpp +@@ -1,6 +1,6 @@ + #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN + +-#include <doctest.h> ++#include <doctest/doctest.h> + #include <taskflow/taskflow.hpp> + #include <taskflow/algorithm/reduce.hpp> + #include <taskflow/algorithm/sort.hpp> +diff --git a/unittests/asyncs.cpp b/unittests/asyncs.cpp +index 28eeaa8c..466687a2 100644 +--- a/unittests/asyncs.cpp ++++ b/unittests/asyncs.cpp +@@ -1,6 +1,6 @@ + #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN + +-#include <doctest.h> ++#include <doctest/doctest.h> + #include <taskflow/taskflow.hpp> + + // -------------------------------------------------------- +diff --git a/unittests/basics.cpp b/unittests/basics.cpp +index f5b9e3dd..e93c3fd3 100644 +--- a/unittests/basics.cpp ++++ b/unittests/basics.cpp +@@ -1,6 +1,6 @@ + #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN + +-#include <doctest.h> ++#include <doctest/doctest.h> + #include <taskflow/taskflow.hpp> + #include <taskflow/algorithm/reduce.hpp> + +diff --git a/unittests/cancellation.cpp b/unittests/cancellation.cpp +index 3ce1cb8c..6543ee52 100644 +--- a/unittests/cancellation.cpp ++++ b/unittests/cancellation.cpp +@@ -1,6 +1,6 @@ + #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN + +-#include <doctest.h> ++#include <doctest/doctest.h> + #include <taskflow/taskflow.hpp> + + // EmptyFuture +diff --git a/unittests/compositions.cpp b/unittests/compositions.cpp +index 4fd621b5..e3c91e4c 100644 +--- a/unittests/compositions.cpp ++++ b/unittests/compositions.cpp +@@ -1,6 +1,6 @@ + #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN + +-#include <doctest.h> ++#include <doctest/doctest.h> + #include <taskflow/taskflow.hpp> + + // -------------------------------------------------------- +diff --git a/unittests/control_flow.cpp b/unittests/control_flow.cpp +index 024ace84..11206384 100644 +--- a/unittests/control_flow.cpp ++++ b/unittests/control_flow.cpp +@@ -1,6 +1,6 @@ + #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN + +-#include <doctest.h> ++#include <doctest/doctest.h> + #include <taskflow/taskflow.hpp> + + // -------------------------------------------------------- +diff --git a/unittests/cuda/CMakeLists.txt b/unittests/cuda/CMakeLists.txt +index d0ccc8e9..ccb46721 100644 +--- a/unittests/cuda/CMakeLists.txt ++++ b/unittests/cuda/CMakeLists.txt +@@ -13,15 +13,14 @@ list(APPEND TF_CUDA_UNITTESTS + + foreach(cudatest IN LISTS TF_CUDA_UNITTESTS) + add_executable(${cudatest} ${cudatest}.cu) +- target_link_libraries(${cudatest} ${PROJECT_NAME} tf::default_settings) +- target_include_directories(${cudatest} PRIVATE ${TF_3RD_PARTY_DIR}/doctest) +- ++ target_link_libraries(${cudatest} ${PROJECT_NAME} tf::default_settings doctest::doctest) ++ + # avoid cmake 3.18+ warning + # we let nvcc to decide the flag if the architecture is not given + if(NOT CUDA_ARCHITECTURES) + set_property(TARGET ${cudatest} PROPERTY CUDA_ARCHITECTURES OFF) + endif() +- ++ + doctest_discover_tests(${cudatest}) + endforeach() + +diff --git a/unittests/cuda/cuda_algorithms.cu b/unittests/cuda/cuda_algorithms.cu +index cccc04b4..47645273 100644 +--- a/unittests/cuda/cuda_algorithms.cu ++++ b/unittests/cuda/cuda_algorithms.cu +@@ -1,6 +1,6 @@ + #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN + +-#include <doctest.h> ++#include <doctest/doctest.h> + #include <taskflow/taskflow.hpp> + #include <taskflow/cuda/cudaflow.hpp> + #include <taskflow/cuda/algorithm/for_each.hpp> +diff --git a/unittests/cuda/cuda_basics.cu b/unittests/cuda/cuda_basics.cu +index 8e0fdffd..f97c7822 100644 +--- a/unittests/cuda/cuda_basics.cu ++++ b/unittests/cuda/cuda_basics.cu +@@ -1,6 +1,6 @@ + #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN + +-#include <doctest.h> ++#include <doctest/doctest.h> + #include <taskflow/taskflow.hpp> + #include <taskflow/cuda/cudaflow.hpp> + +diff --git a/unittests/cuda/cuda_capturer_optimizer.cu b/unittests/cuda/cuda_capturer_optimizer.cu +index 86fcfb72..7cbcf0a5 100644 +--- a/unittests/cuda/cuda_capturer_optimizer.cu ++++ b/unittests/cuda/cuda_capturer_optimizer.cu +@@ -1,6 +1,6 @@ + #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN + +-#include <doctest.h> ++#include <doctest/doctest.h> + #include <taskflow/taskflow.hpp> + #include <taskflow/cuda/cudaflow.hpp> + #include <taskflow/cuda/algorithm/for_each.hpp> +diff --git a/unittests/cuda/cuda_device.cu b/unittests/cuda/cuda_device.cu +index 49df36aa..fb68b29a 100644 +--- a/unittests/cuda/cuda_device.cu ++++ b/unittests/cuda/cuda_device.cu +@@ -1,6 +1,6 @@ + #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN + +-#include <doctest.h> ++#include <doctest/doctest.h> + #include <taskflow/taskflow.hpp> + #include <taskflow/cuda/cudaflow.hpp> + +diff --git a/unittests/cuda/cuda_kmeans.cu b/unittests/cuda/cuda_kmeans.cu +index 91495b59..c14d250f 100644 +--- a/unittests/cuda/cuda_kmeans.cu ++++ b/unittests/cuda/cuda_kmeans.cu +@@ -1,6 +1,6 @@ + #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN + +-#include <doctest.h> ++#include <doctest/doctest.h> + #include <taskflow/taskflow.hpp> + #include <taskflow/cuda/cudaflow.hpp> + #include <taskflow/cuda/algorithm/for_each.hpp> +diff --git a/unittests/cuda/cuda_matrix.cu b/unittests/cuda/cuda_matrix.cu +index 8e9f2421..ec5386f4 100644 +--- a/unittests/cuda/cuda_matrix.cu ++++ b/unittests/cuda/cuda_matrix.cu +@@ -1,6 +1,6 @@ + #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN + +-#include <doctest.h> ++#include <doctest/doctest.h> + #include <taskflow/taskflow.hpp> + #include <taskflow/cuda/cudaflow.hpp> + +diff --git a/unittests/cuda/cuda_rebinds.cu b/unittests/cuda/cuda_rebinds.cu +index eb9218fa..92798dfd 100644 +--- a/unittests/cuda/cuda_rebinds.cu ++++ b/unittests/cuda/cuda_rebinds.cu +@@ -1,6 +1,6 @@ + #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN + +-#include <doctest.h> ++#include <doctest/doctest.h> + + #include <taskflow/taskflow.hpp> + #include <taskflow/cuda/cudaflow.hpp> +diff --git a/unittests/cuda/cuda_updates.cu b/unittests/cuda/cuda_updates.cu +index bdda539a..d8b52dcf 100644 +--- a/unittests/cuda/cuda_updates.cu ++++ b/unittests/cuda/cuda_updates.cu +@@ -1,6 +1,6 @@ + #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN + +-#include <doctest.h> ++#include <doctest/doctest.h> + + #include <taskflow/taskflow.hpp> + #include <taskflow/cuda/cudaflow.hpp> +diff --git a/unittests/movable.cpp b/unittests/movable.cpp +index 96ce9da3..d5e64b47 100644 +--- a/unittests/movable.cpp ++++ b/unittests/movable.cpp +@@ -1,5 +1,5 @@ + #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN +-#include <doctest.h> ++#include <doctest/doctest.h> + #include <taskflow/taskflow.hpp> + + // increments a counter only on destruction +diff --git a/unittests/pipelines.cpp b/unittests/pipelines.cpp +index 94d8f394..701365c0 100644 +--- a/unittests/pipelines.cpp ++++ b/unittests/pipelines.cpp +@@ -1,6 +1,6 @@ + #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN + +-#include <doctest.h> ++#include <doctest/doctest.h> + + #include <taskflow/taskflow.hpp> + #include <taskflow/algorithm/pipeline.hpp> +diff --git a/unittests/semaphores.cpp b/unittests/semaphores.cpp +index 616191b5..64b8a587 100644 +--- a/unittests/semaphores.cpp ++++ b/unittests/semaphores.cpp +@@ -1,6 +1,6 @@ + #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN + +-#include <doctest.h> ++#include <doctest/doctest.h> + #include <taskflow/taskflow.hpp> + + // -------------------------------------------------------- +diff --git a/unittests/serializer.cpp b/unittests/serializer.cpp +index 92c3ec70..c6a715e6 100644 +--- a/unittests/serializer.cpp ++++ b/unittests/serializer.cpp +@@ -1,6 +1,6 @@ + #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN + +-#include <doctest.h> ++#include <doctest/doctest.h> + #include <taskflow/utility/serializer.hpp> + #include <random> + +diff --git a/unittests/sorting.cpp b/unittests/sorting.cpp +index 8146324a..ff732fb0 100644 +--- a/unittests/sorting.cpp ++++ b/unittests/sorting.cpp +@@ -1,6 +1,6 @@ + #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN + +-#include <doctest.h> ++#include <doctest/doctest.h> + #include <taskflow/taskflow.hpp> + #include <taskflow/algorithm/sort.hpp> + +diff --git a/unittests/subflows.cpp b/unittests/subflows.cpp +index 9db430de..e669a2c8 100644 +--- a/unittests/subflows.cpp ++++ b/unittests/subflows.cpp +@@ -1,6 +1,6 @@ + #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN + +-#include <doctest.h> ++#include <doctest/doctest.h> + #include <taskflow/taskflow.hpp> + #include <taskflow/algorithm/reduce.hpp> + +diff --git a/unittests/sycl/CMakeLists.txt b/unittests/sycl/CMakeLists.txt +index c6481996..3b014d0e 100644 +--- a/unittests/sycl/CMakeLists.txt ++++ b/unittests/sycl/CMakeLists.txt +@@ -1,4 +1,4 @@ +-list(APPEND TF_SYCL_TESTS ++list(APPEND TF_SYCL_TESTS + sycl_basics + #sycl_algorithms + #sycl_rebinds +@@ -12,9 +12,8 @@ foreach(sycl_test IN LISTS TF_SYCL_TESTS) + target_compile_options(${sycl_test} PRIVATE ${TF_SYCL_OPTIONS}) + target_link_options(${sycl_test} PRIVATE ${TF_SYCL_OPTIONS}) + target_link_libraries(${sycl_test} +- ${PROJECT_NAME} Threads::Threads tf::default_settings ++ ${PROJECT_NAME} Threads::Threads tf::default_settings doctest::doctest + ) +- target_include_directories(${sycl_test} PRIVATE ${TF_3RD_PARTY_DIR}/doctest) +- ++ + doctest_discover_tests(${sycl_test}) + endforeach() +diff --git a/unittests/sycl/sycl_algorithms.cpp b/unittests/sycl/sycl_algorithms.cpp +index e029b2ef..7b44ca78 100644 +--- a/unittests/sycl/sycl_algorithms.cpp ++++ b/unittests/sycl/sycl_algorithms.cpp +@@ -1,5 +1,5 @@ + #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN +-#include <doctest.h> ++#include <doctest/doctest.h> + #include <taskflow/syclflow.hpp> + + constexpr float eps = 0.0001f; +diff --git a/unittests/sycl/sycl_basics.cpp b/unittests/sycl/sycl_basics.cpp +index 0ff76969..eac52906 100644 +--- a/unittests/sycl/sycl_basics.cpp ++++ b/unittests/sycl/sycl_basics.cpp +@@ -1,5 +1,5 @@ + #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN +-#include <doctest.h> ++#include <doctest/doctest.h> + #include <taskflow/sycl/syclflow.hpp> + + // task creation +diff --git a/unittests/sycl/sycl_rebinds.cpp b/unittests/sycl/sycl_rebinds.cpp +index 71b2f9de..1b5949fd 100644 +--- a/unittests/sycl/sycl_rebinds.cpp ++++ b/unittests/sycl/sycl_rebinds.cpp +@@ -1,5 +1,5 @@ + #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN +-#include <doctest.h> ++#include <doctest/doctest.h> + #include <taskflow/syclflow.hpp> + + // ---------------------------------------------------------------------------- +diff --git a/unittests/traversals.cpp b/unittests/traversals.cpp +index 71aef04b..683915b4 100644 +--- a/unittests/traversals.cpp ++++ b/unittests/traversals.cpp +@@ -1,6 +1,6 @@ + #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN + +-#include <doctest.h> ++#include <doctest/doctest.h> + + #include <taskflow/taskflow.hpp> + +diff --git a/unittests/tsq.cpp b/unittests/tsq.cpp +index 51a137a7..8e9cac56 100644 +--- a/unittests/tsq.cpp ++++ b/unittests/tsq.cpp +@@ -49,7 +49,7 @@ + + #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN + +-#include <doctest.h> ++#include <doctest/doctest.h> + #include <taskflow/taskflow.hpp> + + // ============================================================================ +diff --git a/unittests/utility.cpp b/unittests/utility.cpp +index 63c49708..01ee81a3 100644 +--- a/unittests/utility.cpp ++++ b/unittests/utility.cpp +@@ -1,6 +1,6 @@ + #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN + +-#include <doctest.h> ++#include <doctest/doctest.h> + + #include <taskflow/utility/traits.hpp> + #include <taskflow/utility/object_pool.hpp> diff --git a/dev-cpp/taskflow/taskflow-3.4.0.ebuild b/dev-cpp/taskflow/taskflow-3.4.0.ebuild new file mode 100644 index 000000000000..c23ae2ccf7b7 --- /dev/null +++ b/dev-cpp/taskflow/taskflow-3.4.0.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Modern C++ Parallel Task Programming" +HOMEPAGE="https://taskflow.github.io" +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://github.com/taskflow/${PN}.git" + inherit git-r3 + S="${WORKDIR}/taskflow-${PV}" +else + SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc ~x86" + S="${WORKDIR}/taskflow-${PV}" +fi + +LICENSE="MIT" +SLOT="0" +IUSE="examples test" +RESTRICT="!test? ( test )" + +DEPEND="test? ( dev-cpp/doctest )" + +HTML_DOCS=( docs/. ) + +PATCHES=( + "${FILESDIR}"/taskflow-3.4.0-fix_doctest.patch +) + +src_prepare() { + rm -r "${S}/3rd-party" || die "rm failed" + cmake_src_prepare +} + +src_configure() { + # TODO: enable CUDA via USE flag + local mycmakeargs=( + -DTF_BUILD_CUDA=OFF + -DTF_BUILD_EXAMPLES=$(usex examples) + -DTF_BUILD_TESTS=$(usex test) + ) + + cmake_src_configure +} diff --git a/dev-cpp/yaml-cpp/Manifest b/dev-cpp/yaml-cpp/Manifest index 8009f46a84dd..e7ac75e4acd9 100644 --- a/dev-cpp/yaml-cpp/Manifest +++ b/dev-cpp/yaml-cpp/Manifest @@ -3,6 +3,5 @@ AUX yaml-cpp-0.7.0-gtest.patch 1081 BLAKE2B 7fe415662ce9eb205f6f1c42df9885ae5817 AUX yaml-cpp-0.7.0-install-paths.patch 1062 BLAKE2B c76f9f34e7f20954a2f2f0582f5d124ec22af2c91dccc19b4c7891b19d14bc2aff7d61f93b20a606c58397c70f9db2f35f10c6645869253a5bedd50d9e65eaa1 SHA512 9d14416fdb8111027324ffeae3856590348f9497444ecae7a2091d3211e17fe61fdd66932b98c119cf54551c551aa8f6a698a2c5a97cb559cf6e3a54f25e07cb AUX yaml-cpp-0.7.0-pkg-config.patch 786 BLAKE2B e15882c2980e3c5697985c097ff8775d8750a4cf6712d4afb370875763646d2355cbeb14e17c21c1ee3cc98335f5edd42b8f7ac71a2e4de6dfb5364188e38669 SHA512 33d7ddedd8414559b5a20a03ebcc5b58ea3e706e1c757a93576fff619e4fab3d9fadda0f2db38ff5dc675620a28d97cef623205d2c568371ad93c597ab735284 DIST yaml-cpp-0.7.0.tar.gz 1033237 BLAKE2B 69a11a8503ad607aa0d54912a5e53d305a643fe2d36dd86fa96832e3d4930b39a85318dc130e438210a9ca60357f3aa9aa6cd0f2b6bc45728b648c545a437368 SHA512 2de0f0ec8f003cd3c498d571cda7a796bf220517bad2dc02cba70c522dddde398f33cf1ad20da251adaacb2a07b77844111f297e99d45a7c46ebc01706bbafb5 -EBUILD yaml-cpp-0.7.0-r1.ebuild 875 BLAKE2B 9fce3fa4514b87547ec49bdc6ca6a7bb18d8122b63212a8823d9e8cc212a79dee6a93a440936d9e6e6786aa54936a19753722371ba9d1586faba5aadf185e667 SHA512 78dfdedd17147f93c89910eb1864b9f2ba93070750bd6ed0e072d775617c7379cd2141f990f1d2783309b989592c4d403b94897b389aaf91bb60f1fb25d7e9bc EBUILD yaml-cpp-0.7.0-r2.ebuild 857 BLAKE2B 63735ee4c253e6b04cf7c2c9b0725cf4aad80564eca30ca2e80360e8fa4d1263d95af7260cfa49c182d1109b13dd1ef5e754d1e6967f6414d9745ecf683b71b9 SHA512 7308409215a0e874fe4d2a2a6b8a8ccbfba8b4617a3852d50d40ca70cd2394fde8c1b8e1224136018aa043aecf3dbb6bc515e1ac90517c448c904a6315944249 MISC metadata.xml 484 BLAKE2B e973aef681bed7de47725bab49d2acfe809ad73c97eea709bec9d5bb9d720f89bc222ff77f09b90780b2a14d6a094f9ddd24a4f15d6ad88b94060d240c5836d8 SHA512 612604d3b0c2edd157c4a55ae22d92e174cdcbc17532de7f2888b9579b4b028da2214e6d756864dfffdeca129f32e5db2241308d326c6ff21044f48bf2d87d73 diff --git a/dev-cpp/yaml-cpp/yaml-cpp-0.7.0-r1.ebuild b/dev-cpp/yaml-cpp/yaml-cpp-0.7.0-r1.ebuild deleted file mode 100644 index 1f26291823b9..000000000000 --- a/dev-cpp/yaml-cpp/yaml-cpp-0.7.0-r1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake-multilib - -DESCRIPTION="YAML parser and emitter in C++" -HOMEPAGE="https://github.com/jbeder/yaml-cpp" -SRC_URI="https://github.com/jbeder/yaml-cpp/archive/${P}.tar.gz" -S="${WORKDIR}/yaml-cpp-${P}" - -LICENSE="MIT" -SLOT="0/0.7" -KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" -IUSE="test" -RESTRICT="!test? ( test )" - -DEPEND="test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] )" - -PATCHES=( - "${FILESDIR}/${P}-gtest.patch" - "${FILESDIR}/${P}-pkg-config.patch" -) - -src_prepare() { - rm -r test/gtest-* || die - - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DYAML_BUILD_SHARED_LIBS=ON - -DYAML_CPP_BUILD_TOOLS=OFF # Don't have install rule - -DYAML_CPP_BUILD_TESTS=$(usex test) - ) - - cmake-multilib_src_configure -} |