diff options
Diffstat (limited to 'dev-cpp')
111 files changed, 2560 insertions, 1003 deletions
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz Binary files differindex d71ccb3710f6..5baa1e8509f4 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 87e4a01b9ad0..508fa6b29e1e 100644 --- a/dev-cpp/abseil-cpp/Manifest +++ b/dev-cpp/abseil-cpp/Manifest @@ -3,7 +3,10 @@ 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 AUX abseil-cpp-20230125.2-musl-1.2.4.patch 2203 BLAKE2B 74ebf85e5f35de255fbf5a757655fedd8f5821558ecf700fcc06e30950ce4bb802ca2431cf8b15d05ddc3a7bf2818eec49bf38c2e33d033df0c2973983340ed4 SHA512 404a3c25135573292cbe90f3fb459172a936abc2ec4739e57b8a1dac300a3e0b848ba18aaab5f6dfd12315de736175b962174022a7969149221bf595738bebb1 +AUX abseil-cpp-20230802.0-conditional-use-of-lzcnt.patch 2148 BLAKE2B 978304f3ff8f46ac8fcd7c708f464cacf657f5f4f76a5bab5c4db6e14dcde0bbc7b2ae03c8b74a527218eab737cbacb9219b1a87ee2af8dde8795d3c1b43c7af SHA512 c94ba837440e2c49f3703492f0eb51c7f1930d8d700660d6db56985ad05fe61d3c97656ba8e0a818b843f04c939bdeb4134005420ad561068c52f64ee481f091 AUX abseil-cpp-20230802.0-sdata-tests.patch 1541 BLAKE2B ae6cebeefc794e89101bd4d0a3a1c022e651dfdb312401fbbf035f6c2afbde8162c132f692e89a075cb1811ae9e0708652c469107047cba49618c0ef752eb108 SHA512 bda7cec902c1f71173b4e7bf2e35c3fffc5de216dc84680e9a0de56b1bb5b9ea4f50cb603e690275e1fc9e2fcbc8ad998a8dadb655fb96d28a651ac80bc2f764 +AUX abseil-cpp-20240722.0-lto-odr.patch 634 BLAKE2B 33a26f207fb0ba8978188091eb32b926cf955cb4272a3afefbd9d02a9dd92f05d0f6bc571540c1c8c18e46c35b19d5ad4db395bc5b63fab21ae7adb5054f208c SHA512 bb9629d746d400ad785e3c12bbc213505c364ebbf3668af46e6cfbf83cca9b8d221c5ecca1d3646241bd2e3369d4ca956b03e404646d0e7e3de0308c27f59578 +AUX abseil-cpp-include-cstdint.patch 1268 BLAKE2B 693dae2368d0a816950e69fa7323437734dee1bae844f9abd957f136686a711b8d8ef92fb55c9910905e2633ccf82dd107c209f53082d1202127c444c54697ac SHA512 72f8461db4ac35a285a782eea9b70f3c387eee07804842f1880c91fa3dc32c19319462a839b2657cdd9f632868d866e5c6cac7fd5b801ac4434073d824d8729d AUX abseil-cpp-random-tests.patch 660 BLAKE2B 60ef86170310b6ababed9f07fc2e40ca12b278f2202de3d1ae3f028eb081b3de0ba6e245211457e0c2d764142916c2a3c7a46c813ba2bc5536c50edebaf4c3f6 SHA512 d2356539fb38a16cc52cd11106d87613c46a4757827bdea22f4a42f5ea7d557387477ce17a20fa54051488f66b1e628be9e539948cdb1e87970174d3894b1d80 DIST abseil-cpp-20211102.0.tar.gz 1884080 BLAKE2B a148f3b7cc9516fbeacc25116032a956bfa3cce61b4294c226e826e1171d24c043ab199757a11fae3fec0bc307b2222773a6b4f4563b289f7565b0ce4f72318a SHA512 fed68aa434c02ec6faa9d1c81f1ad35b60ec024b44957e2e0ac31e6075e385c06a3e1b616afeb4bb7c2413191fd7827d82e1f9f0796b52ed21fb2c41dd9031cf DIST abseil-cpp-20220623.1.tar.gz 1957483 BLAKE2B 5bcf60b5a55882bcb78c7095a9892f6d1e5819fb116e325a8299fb22780ab009f0e1d92d5d8aca5ae0d4acc6d60e620e3357a24e389059f6e75d94f1cbdc1ced SHA512 ab4fccd9a2bfa0c5ad4b56c8e8f8b7ec7a8eca8b6cc6959802acadd1da785e1feb078c6ac621808cd699c82717a9e637dc426d94b70a8db7f2a807059d41cbc2 @@ -11,6 +14,7 @@ DIST abseil-cpp-20230125.2.tar.gz 2119685 BLAKE2B 130e55c68acdec7af0f807189365a5 DIST abseil-cpp-20230125.3.tar.gz 2119655 BLAKE2B 6c60201e4fc2cb5cd942fafb6023347739544f02fd257d003eeedff9e2e5137ee0c954342134d17a64844b9a5f309392a4c3ff9336907f35ba6c967ab03524ee SHA512 50509acfc4128fd31435631f71ac8cd0350acd9e290f78502723149016e7f07c9d84182ba99e0938b1873fecda09393d3fd7af8dabfb0d89cdcdd8a69a917e70 DIST abseil-cpp-20230802.0.tar.gz 2156669 BLAKE2B 34de2f949db3e7578cae39bdd851785fd5327a80662436e7d77f18e196cc28eb1b463e9f49c8fc66060073c6c88222015af8b41044d56af6811c8914e84fbea3 SHA512 320295fa687ded05b774741eb4c5285291d44cc14402ec5d997057cb4f53fb3ba54cd162c7a7b1003312b677603a1c25e14bfdbd1fc22ccf4b4443e8a6e3ec02 DIST abseil-cpp-20240116.2.tar.gz 2151288 BLAKE2B 2e843e29869bf69e46ec48884cbd2ba955eab2329716c4df7b9be0ded550f976184b945587af08d01a7aa77560ae679191c1a1de51c75311d3a5ee87c15017c8 SHA512 5062e731ee8c9a757e6d75fc1c558652deb4dd1daab4d6143f7ad52a139501c61365f89acbf82480be0f9a4911a58286560068d8b1a8b6774e6afad51739766e +DIST abseil-cpp-20240722.0.tar.gz 2242861 BLAKE2B 6756f9a5f70656a6ef1985ba44af69a7fc3ab23b4be8a36ae39d7eedc318a4a9b0da08b31d26b3c46857913a757c916f0e31254278e080497807bed24e4978ce SHA512 bd2cca8f007f2eee66f51c95a979371622b850ceb2ce3608d00ba826f7c494a1da0fba3c1427728f2c173fe50d59b701da35c2c9fdad2752a5a49746b1c8ef31 DIST gtest-1.13.0.tar.gz 862871 BLAKE2B d2768332c233d62f7a5f5332b63dc587c96c24765b2eeaa4f4caf5d421b175aa850d81cec4f50eeef9e06d4b86cb959555b4c2862a197ce3cb86d61fcb51f5d1 SHA512 70c0cfb1b4147bdecb467ecb22ae5b5529eec0abc085763213a796b7cdbd81d1761d12b342060539b936fa54f345d33f060601544874d6213fdde79111fa813e DIST gtest-1b18723e874b256c1e39378c6774a90701d70f7a.tar.gz 833195 BLAKE2B cfeb4fc1569529f8a08557330ab2c88db7703c4f2e8628d18b403f424342ad82b062edb8cc9c0dc122c453235ab327ea742a5ef12e49726e2fa2f60f5ea762d9 SHA512 cb90a54681e0be20a9a8c7a19f960a97cc567931308f4956ee142b86769c062fcf612b9635f5548009ee6d598ae0c1e83692151ec9f1ff1e409b89e158d8b954 DIST gtest-e68764c147ea0dac1e8811925c531d937396878e.tar.gz 862129 BLAKE2B d6decb9d1ad4e379a76119ec984deaa7649fca033f225698ce421bcee1207b52da3c4fdb2f6d68b968248575704ebe501b7b1d0a02c180901ffa78f9aa47f549 SHA512 aca72b5f64894aeee34cb869bdeda2d25ec04e901fe0e4e8d08d49472de1c9b19a97ba97a2e8570a88be74aea26d1cd526b4e605005a881e1cb6ab03ed3a4ceb @@ -18,6 +22,11 @@ EBUILD abseil-cpp-20211102.0-r2.ebuild 1812 BLAKE2B 3e8b5486a5b9817c089cae614e17 EBUILD abseil-cpp-20220623.1.ebuild 1732 BLAKE2B 8134bcb040be826b4f153afddc4c3aae86fd9d773afbf08b50bba323c0d067fd034c92fde3f9c15f73366e910f3641512e81cefa04bc5a9f2830d06e4b8ac3f5 SHA512 ac7802104eb66d08fdcc5904d1d9644ea1511c1f1d8bda2ba8931af6aa56ce5917d59bbb9e68354b8c4d1c38cba1507cb27420e681e3679c88d3bc9538b0e19e EBUILD abseil-cpp-20230125.2.ebuild 1693 BLAKE2B ad84c9a1b9b5983029aa5978f1fefc14700c1ffdfd4edf4a4cf2ff782d25cc339b2354a293c51d8853a6a2e0107ed3f7ea8e32685663ad760fc0245c7a4ac79c SHA512 6fe0f3a491f71fcd954201653fcf329385c738a7e43cb18adf802dc2f10c27ceb7c87e8e5303d20cce07dc1f905a5e094d6979a615b14b4cdb0cce5880b1a467 EBUILD abseil-cpp-20230125.3-r3.ebuild 1640 BLAKE2B 534ee2c085dfb77471eb34a47491abff5a64aafc6052b3875645ed3e490acd0719855f79bc098bd9107ecc5bce406789804825a88f046d3cb47db83be1a7120d SHA512 55d1a88de4c1474c9b5e03e144a874bf15fb5f9b198a188f267d1290d9f92b7ba47106751d0ba6993b87436c49aa2a744d82edd32ee1235e21f6140c57289245 -EBUILD abseil-cpp-20230802.0-r2.ebuild 1647 BLAKE2B 02b204dc37f8efbe4baf8b43268e191325d37610eb5ece67d6ffcd4d0f249043baa9928024abf17424d0c8c7fd0adc8811e0a493bb26e0a37bafec4a8076cc25 SHA512 1b98fb0c0dde809a22eb459188acc18e99464082592a37a357b132ed9817fd7c8470ae390814174b713630a99c736ca84564fbe0e8650c15d4622c39bf461d8b -EBUILD abseil-cpp-20240116.2-r2.ebuild 1647 BLAKE2B 02b204dc37f8efbe4baf8b43268e191325d37610eb5ece67d6ffcd4d0f249043baa9928024abf17424d0c8c7fd0adc8811e0a493bb26e0a37bafec4a8076cc25 SHA512 1b98fb0c0dde809a22eb459188acc18e99464082592a37a357b132ed9817fd7c8470ae390814174b713630a99c736ca84564fbe0e8650c15d4622c39bf461d8b -MISC metadata.xml 250 BLAKE2B f2e7e5ef7661a51822a5d563f7a835c3606c9bbb9688d599637e0950aa68dbacd67592a8c5306528653dd2b5f7100dc6f5e6ac69c5d7bf9777b12c984b53304c SHA512 99565f4efff02cf80efcaa76ad9247db3c0de6f855f37337579cfcd6e01f72a6e176d5e69ef1a1d338afee6a07c1620273fe56af046a60f195de4d8894a8d7f9 +EBUILD abseil-cpp-20230125.3-r4.ebuild 1711 BLAKE2B 801637ded0d238591b0f6fc581e9640424def79d6a5c6414060254e105ef0fda1ea15815f25b23b0894c67fc0132e9ec1aaf1af10823df38f6b653499221c05d SHA512 81bb4091ffe42841581d2bca66528d23ca831ff4fc1b0fd76c6f8ba16dbadab558be4b9772af802a799ea9d50089e3150009b32fb62b23b5c298111ce30c73d2 +EBUILD abseil-cpp-20230125.3-r5.ebuild 1764 BLAKE2B 8c2ec49ea1596ad8f971414d06d8d957e1eebf26858868e95ec82fab990174817e21530aa0969aef024297819fe24658f7a07ad6cf5c336e120e88d961b878f8 SHA512 b685bcd81ee099888290d7111d4ddd7cd413cb191a59667dc5c2a57b1e2f0358525c8f3c222a24b7fce0a66e17da88020d97e26e5900d91b95ce1abbe597cf2a +EBUILD abseil-cpp-20230802.0-r3.ebuild 1718 BLAKE2B 1a46df3f2b8631c4cc5da5697494999329b85a0469e64f00ff2103425218086c7317594c2d4ae7e49e91fc1e636b782490825c94a01155d0bc4f72bff6e2a72b SHA512 bdbb13ac0faa4ccf7f7a41579311a65853916e7d533a107a84506dcc5463621ba5cc1ebcd1a41e01da5621c98ac4aaae0803175b0a74a02fc8af547afd8d9cbe +EBUILD abseil-cpp-20230802.0-r4.ebuild 1761 BLAKE2B fe7475c6b062a8c1d33d563252ef5918fc30a2d4dda267fb72ebd04bbafb172f2956c2573d4e578b85f7530ba20fc4455ddc06cc55af4f131600f183496c6129 SHA512 7a24e5864c1cbd0bf317d617f4e2db8f0d27780edcc4ddf4de07f8c31ca60f445ac048c620592febf7b6088b61c73b3866660b66bc357f781b9b58f9ca4c6694 +EBUILD abseil-cpp-20240116.2-r3.ebuild 1718 BLAKE2B 1a46df3f2b8631c4cc5da5697494999329b85a0469e64f00ff2103425218086c7317594c2d4ae7e49e91fc1e636b782490825c94a01155d0bc4f72bff6e2a72b SHA512 bdbb13ac0faa4ccf7f7a41579311a65853916e7d533a107a84506dcc5463621ba5cc1ebcd1a41e01da5621c98ac4aaae0803175b0a74a02fc8af547afd8d9cbe +EBUILD abseil-cpp-20240116.2-r4.ebuild 1796 BLAKE2B 26d36f3ddd22040aa41d1319dfd41c6c1b76b2261587382c706785de0447905bcd4fc1d55d316d9cc785860e987046f515d70bfeaeff493e93bf5def88da8f34 SHA512 c4dd053c789be1ad89873e52a0f267c98e00f3de672ee0184e4b4c108d7f527050fff0357bf5340816fde70ca5db289fa235d85d23194207c99b9d6b7ab0cc8a +EBUILD abseil-cpp-20240722.0.ebuild 1726 BLAKE2B b3ab1ae4a89142401d52e047c566b15b9be5209c3a5e8726fe6d2f0ee92638bc2c1a0e0b68f86f668bc3233b0aeae7dafcccd6838a82b09ff5caa270dafd56b6 SHA512 e8980346d20a089ef5c009c1e93c85ff9aabe520ae11e40f415baf1d3ccd8cafd5da307f43b136829cc68a60138c945924b584cc5b4f9ccc6eb483c843ef5d7d +MISC metadata.xml 511 BLAKE2B 368361dc6f2e55afb5af3623635272b5a7ec9444a09e7fd0be2879a7dfa2e168c0a1b994d84878a6cd422423103f317b20b543aa11ca00656199e2d3a3a4bad7 SHA512 fc164cafaca7a59e4891a1f5c7f93f790c4b163c0310cbb915f9450de023296d8ed440a89a51230aa9869c70ed55a2b1c54ca3579761cd880df9bccbbde801fd diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20230125.3-r4.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20230125.3-r4.ebuild new file mode 100644 index 000000000000..f1cf1e20630d --- /dev/null +++ b/dev-cpp/abseil-cpp/abseil-cpp-20230125.3-r4.ebuild @@ -0,0 +1,67 @@ +# Copyright 2020-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) + +inherit cmake-multilib python-any-r1 + +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" + +LICENSE="Apache-2.0" +SLOT="0/${PV%%.*}.0" +KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86" +IUSE="test" + +RDEPEND=">=dev-cpp/gtest-1.13.0[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND}" +BDEPEND=" + ${PYTHON_DEPS} + test? ( + sys-libs/timezone-data + ) +" + +RESTRICT="!test? ( test )" + +PATCHES=( + "${FILESDIR}"/${PN}-20230125.2-musl-1.2.4.patch #906218 + "${FILESDIR}"/${PN}-random-tests.patch #935417 + "${FILESDIR}/${PN}-20230802.0-conditional-use-of-lzcnt.patch" #934337 +) + +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 +} + +multilib_src_configure() { + local mycmakeargs=( + # We use -std=c++14 here so that abseil-cpp's string_view is used + # See the discussion in https://github.com/gentoo/gentoo/pull/32281. + -DCMAKE_CXX_STANDARD=14 + -DABSL_ENABLE_INSTALL=TRUE + -DABSL_USE_EXTERNAL_GOOGLETEST=ON + -DABSL_PROPAGATE_CXX_STD=TRUE + # TEST_HELPERS needed for protobuf (bug #915902) + -DABSL_BUILD_TEST_HELPERS=ON + -DABSL_BUILD_TESTING=$(usex test ON OFF) + $(usex test -DBUILD_TESTING=ON '') # intentional usex, it used both variables for tests. + ) + + cmake_src_configure +} diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20230125.3-r5.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20230125.3-r5.ebuild new file mode 100644 index 000000000000..e16880542a7a --- /dev/null +++ b/dev-cpp/abseil-cpp/abseil-cpp-20230125.3-r5.ebuild @@ -0,0 +1,68 @@ +# Copyright 2020-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) + +inherit cmake-multilib python-any-r1 + +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" + +LICENSE="Apache-2.0" +SLOT="0/${PV%%.*}.0" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +IUSE="test" + +RDEPEND=">=dev-cpp/gtest-1.13.0[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND}" +BDEPEND=" + ${PYTHON_DEPS} + test? ( + sys-libs/timezone-data + ) +" + +RESTRICT="!test? ( test )" + +PATCHES=( + "${FILESDIR}"/${PN}-20230125.2-musl-1.2.4.patch #906218 + "${FILESDIR}"/${PN}-random-tests.patch #935417 + "${FILESDIR}/${PN}-20230802.0-conditional-use-of-lzcnt.patch" #934337 + "${FILESDIR}/${PN}-include-cstdint.patch" #937307 +) + +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 +} + +multilib_src_configure() { + local mycmakeargs=( + # We use -std=c++14 here so that abseil-cpp's string_view is used + # See the discussion in https://github.com/gentoo/gentoo/pull/32281. + -DCMAKE_CXX_STANDARD=14 + -DABSL_ENABLE_INSTALL=TRUE + -DABSL_USE_EXTERNAL_GOOGLETEST=ON + -DABSL_PROPAGATE_CXX_STD=TRUE + # TEST_HELPERS needed for protobuf (bug #915902) + -DABSL_BUILD_TEST_HELPERS=ON + -DABSL_BUILD_TESTING=$(usex test ON OFF) + $(usex test -DBUILD_TESTING=ON '') # intentional usex, it used both variables for tests. + ) + + cmake_src_configure +} diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20230802.0-r2.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20230802.0-r3.ebuild index 9a9c217bda00..dc13dfe5045f 100644 --- a/dev-cpp/abseil-cpp/abseil-cpp-20230802.0-r2.ebuild +++ b/dev-cpp/abseil-cpp/abseil-cpp-20230802.0-r3.ebuild @@ -30,6 +30,7 @@ RESTRICT="!test? ( test )" PATCHES=( "${FILESDIR}/${PN}-20230802.0-sdata-tests.patch" "${FILESDIR}/${PN}-random-tests.patch" #935417 + "${FILESDIR}/${PN}-20230802.0-conditional-use-of-lzcnt.patch" #934337 ) src_prepare() { diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20230802.0-r4.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20230802.0-r4.ebuild new file mode 100644 index 000000000000..81fab0813b28 --- /dev/null +++ b/dev-cpp/abseil-cpp/abseil-cpp-20230802.0-r4.ebuild @@ -0,0 +1,68 @@ +# Copyright 2020-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) + +inherit cmake-multilib python-any-r1 + +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" + +LICENSE="Apache-2.0" +SLOT="0/${PV%%.*}" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x86" +IUSE="test" + +RDEPEND=">=dev-cpp/gtest-1.13.0[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND}" +BDEPEND=" + ${PYTHON_DEPS} + test? ( + sys-libs/timezone-data + ) +" + +RESTRICT="!test? ( test )" + +PATCHES=( + "${FILESDIR}/${PN}-20230802.0-sdata-tests.patch" + "${FILESDIR}/${PN}-random-tests.patch" #935417 + "${FILESDIR}/${PN}-20230802.0-conditional-use-of-lzcnt.patch" #934337 + "${FILESDIR}/${PN}-include-cstdint.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 +} + +multilib_src_configure() { + local mycmakeargs=( + # We use -std=c++14 here so that abseil-cpp's string_view is used + # See the discussion in https://github.com/gentoo/gentoo/pull/32281. + -DCMAKE_CXX_STANDARD=14 + -DABSL_ENABLE_INSTALL=TRUE + -DABSL_USE_EXTERNAL_GOOGLETEST=ON + -DABSL_PROPAGATE_CXX_STD=TRUE + # TEST_HELPERS needed for protobuf (bug #915902) + -DABSL_BUILD_TEST_HELPERS=ON + -DABSL_BUILD_TESTING=$(usex test ON OFF) + $(usex test -DBUILD_TESTING=ON '') # intentional usex, it used both variables for tests. + ) + + cmake_src_configure +} diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20240116.2-r2.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20240116.2-r3.ebuild index 9a9c217bda00..dc13dfe5045f 100644 --- a/dev-cpp/abseil-cpp/abseil-cpp-20240116.2-r2.ebuild +++ b/dev-cpp/abseil-cpp/abseil-cpp-20240116.2-r3.ebuild @@ -30,6 +30,7 @@ RESTRICT="!test? ( test )" PATCHES=( "${FILESDIR}/${PN}-20230802.0-sdata-tests.patch" "${FILESDIR}/${PN}-random-tests.patch" #935417 + "${FILESDIR}/${PN}-20230802.0-conditional-use-of-lzcnt.patch" #934337 ) src_prepare() { diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20240116.2-r4.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20240116.2-r4.ebuild new file mode 100644 index 000000000000..fa962fc3667a --- /dev/null +++ b/dev-cpp/abseil-cpp/abseil-cpp-20240116.2-r4.ebuild @@ -0,0 +1,68 @@ +# Copyright 2020-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) + +inherit cmake-multilib python-any-r1 + +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" + +LICENSE="Apache-2.0" +SLOT="0/${PV%%.*}" +KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos" +IUSE="test" + +RDEPEND=">=dev-cpp/gtest-1.13.0[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND}" +BDEPEND=" + ${PYTHON_DEPS} + test? ( + sys-libs/timezone-data + ) +" + +RESTRICT="!test? ( test )" + +PATCHES=( + "${FILESDIR}/${PN}-20230802.0-sdata-tests.patch" + "${FILESDIR}/${PN}-random-tests.patch" #935417 + "${FILESDIR}/${PN}-20230802.0-conditional-use-of-lzcnt.patch" #934337 + "${FILESDIR}/${PN}-include-cstdint.patch" #937307 +) + +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 +} + +multilib_src_configure() { + local mycmakeargs=( + # We use -std=c++14 here so that abseil-cpp's string_view is used + # See the discussion in https://github.com/gentoo/gentoo/pull/32281. + -DCMAKE_CXX_STANDARD=14 + -DABSL_ENABLE_INSTALL=TRUE + -DABSL_USE_EXTERNAL_GOOGLETEST=ON + -DABSL_PROPAGATE_CXX_STD=TRUE + # TEST_HELPERS needed for protobuf (bug #915902) + -DABSL_BUILD_TEST_HELPERS=ON + -DABSL_BUILD_TESTING=$(usex test ON OFF) + $(usex test -DBUILD_TESTING=ON '') # intentional usex, it used both variables for tests. + ) + + cmake_src_configure +} diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20240722.0.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20240722.0.ebuild new file mode 100644 index 000000000000..ce79f7e1ba8d --- /dev/null +++ b/dev-cpp/abseil-cpp/abseil-cpp-20240722.0.ebuild @@ -0,0 +1,71 @@ +# Copyright 2020-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..13} ) + +inherit cmake-multilib python-any-r1 + +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" + +LICENSE="Apache-2.0" +SLOT="0/${PV:2:4}.$(ver_cut 2).0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos" +IUSE="test" + +RDEPEND=">=dev-cpp/gtest-1.13.0[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND}" +BDEPEND=" + ${PYTHON_DEPS} + test? ( + sys-libs/timezone-data + ) +" + +RESTRICT="!test? ( test )" + +PATCHES=( + "${FILESDIR}/${PN}-20230802.0-sdata-tests.patch" + # "${FILESDIR}/${PN}-random-tests.patch" #935417 + # "${FILESDIR}/${PN}-20230802.0-conditional-use-of-lzcnt.patch" #934337 + "${FILESDIR}/${PN}-include-cstdint.patch" #937307 + "${FILESDIR}/${PN}-20240722.0-lto-odr.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 +} + +multilib_src_configure() { + local mycmakeargs=( + -DABSL_ENABLE_INSTALL=TRUE + -DABSL_USE_EXTERNAL_GOOGLETEST=ON + -DABSL_PROPAGATE_CXX_STD=TRUE + # TEST_HELPERS needed for protobuf (bug #915902) + -DABSL_BUILD_TEST_HELPERS=ON + -DABSL_BUILD_TESTING="$(usex test)" + ) + # intentional use, it uses both variables for tests. + if use test; then + mycmakeargs+=( + -DBUILD_TESTING="yes" + ) + fi + + cmake_src_configure +} diff --git a/dev-cpp/abseil-cpp/files/abseil-cpp-20230802.0-conditional-use-of-lzcnt.patch b/dev-cpp/abseil-cpp/files/abseil-cpp-20230802.0-conditional-use-of-lzcnt.patch new file mode 100644 index 000000000000..1fa00d9ff622 --- /dev/null +++ b/dev-cpp/abseil-cpp/files/abseil-cpp-20230802.0-conditional-use-of-lzcnt.patch @@ -0,0 +1,49 @@ +Bug: https://bugs.gentoo.org/934337
+From: https://github.com/abseil/abseil-cpp/commit/c1e1b47d989978cde8c5a2a219df425b785a0c47.patch
+From c1e1b47d989978cde8c5a2a219df425b785a0c47 Mon Sep 17 00:00:00 2001
+From: Derek Mauro <dmauro@google.com>
+Date: Fri, 3 May 2024 09:14:22 -0700
+Subject: [PATCH] Use __builtin_ctzg and __builtin_clzg in the implementations
+ of CountTrailingZeroesNonzero16 and CountLeadingZeroes16 when they are
+ available.
+
+GCC 14 and Clang 19 adds these new builtins. The g-suffix is for
+"generic". The s-suffix on __builtin_ctzs and __builtin_clzs is for
+"short". GCC never implemented the short versions and #1664 reports
+GCC 14 (pre-release) gives an error here, although this may be a
+pre-release bug.
+
+Fixes #1664
+
+PiperOrigin-RevId: 630408249
+Change-Id: I4aedcc82b85430f50d025f8eb1cab089c6fcd1bc
+---
+ absl/numeric/internal/bits.h | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/absl/numeric/internal/bits.h b/absl/numeric/internal/bits.h
+index bfef06bce1f..0917464d6ad 100644
+--- a/absl/numeric/internal/bits.h
++++ b/absl/numeric/internal/bits.h
+@@ -167,7 +167,9 @@ CountLeadingZeroes32(uint32_t x) {
+
+ ABSL_ATTRIBUTE_ALWAYS_INLINE ABSL_INTERNAL_CONSTEXPR_CLZ inline int
+ CountLeadingZeroes16(uint16_t x) {
+-#if ABSL_HAVE_BUILTIN(__builtin_clzs)
++#if ABSL_HAVE_BUILTIN(__builtin_clzg)
++ return x == 0 ? 16 : __builtin_clzg(x);
++#elif ABSL_HAVE_BUILTIN(__builtin_clzs)
+ static_assert(sizeof(unsigned short) == sizeof(x), // NOLINT(runtime/int)
+ "__builtin_clzs does not take 16-bit arg");
+ return x == 0 ? 16 : __builtin_clzs(x);
+@@ -303,7 +305,9 @@ CountTrailingZeroesNonzero64(uint64_t x) {
+
+ ABSL_ATTRIBUTE_ALWAYS_INLINE ABSL_INTERNAL_CONSTEXPR_CTZ inline int
+ CountTrailingZeroesNonzero16(uint16_t x) {
+-#if ABSL_HAVE_BUILTIN(__builtin_ctzs)
++#if ABSL_HAVE_BUILTIN(__builtin_ctzg)
++ return __builtin_ctzg(x);
++#elif ABSL_HAVE_BUILTIN(__builtin_ctzs)
+ static_assert(sizeof(unsigned short) == sizeof(x), // NOLINT(runtime/int)
+ "__builtin_ctzs does not take 16-bit arg");
+ return __builtin_ctzs(x);
diff --git a/dev-cpp/abseil-cpp/files/abseil-cpp-20240722.0-lto-odr.patch b/dev-cpp/abseil-cpp/files/abseil-cpp-20240722.0-lto-odr.patch new file mode 100644 index 000000000000..93c07b701948 --- /dev/null +++ b/dev-cpp/abseil-cpp/files/abseil-cpp-20240722.0-lto-odr.patch @@ -0,0 +1,30 @@ +From 05ed7fe8985d4903fb33031519eb3bc3d1211fa9 Mon Sep 17 00:00:00 2001 +From: Paul Zander <negril.nx+gentoo@gmail.com> +Date: Fri, 30 Aug 2024 02:14:26 +0200 +Subject: [PATCH] lto odr + +Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com> + +diff --git a/absl/flags/CMakeLists.txt b/absl/flags/CMakeLists.txt +index 7376d11..9914f73 100644 +--- a/absl/flags/CMakeLists.txt ++++ b/absl/flags/CMakeLists.txt +@@ -326,6 +326,7 @@ absl_cc_test( + GTest::gtest_main + ) + ++#[===[ + absl_cc_test( + NAME + flags_flag_test +@@ -349,6 +350,7 @@ absl_cc_test( + absl::time + GTest::gtest_main + ) ++]===] + + absl_cc_test( + NAME +-- +2.46.0 + diff --git a/dev-cpp/abseil-cpp/files/abseil-cpp-include-cstdint.patch b/dev-cpp/abseil-cpp/files/abseil-cpp-include-cstdint.patch new file mode 100644 index 000000000000..7aa5c2f1eed9 --- /dev/null +++ b/dev-cpp/abseil-cpp/files/abseil-cpp-include-cstdint.patch @@ -0,0 +1,33 @@ +https://github.com/abseil/abseil-cpp/commit/809e5de7b92950849289236a5a09e9cb4f32c7b9 + +From: Christopher Fore <csfore@posteo.net> +Date: Mon, 5 Aug 2024 10:48:19 -0400 +Subject: [PATCH] container/internal: Explicitly include <cstdint> +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +GCC 15 will no longer include <cstdint> by default, resulting in build +failures in projects that do not explicitly include it. + +Error: +absl/container/internal/container_memory.h:66:27: error: ‘uintptr_t’ does not name a type + 66 | assert(reinterpret_cast<uintptr_t>(p) % Alignment == 0 && + | ^~~~~~~~~ +absl/container/internal/container_memory.h:31:1: note: ‘uintptr_t’ is defined in header ‘<cstdint>’; this is probably fixable by adding ‘#include <cstdint>’ + 30 | #include "absl/utility/utility.h" + +++ |+#include <cstdint> + 31 | + +See-also: https://gcc.gnu.org/pipermail/gcc-cvs/2024-August/407124.html +Signed-off-by: Christopher Fore <csfore@posteo.net> +--- a/absl/container/internal/container_memory.h ++++ b/absl/container/internal/container_memory.h +@@ -17,6 +17,7 @@ + + #include <cassert> + #include <cstddef> ++#include <cstdint> + #include <cstring> + #include <memory> + #include <new> diff --git a/dev-cpp/abseil-cpp/metadata.xml b/dev-cpp/abseil-cpp/metadata.xml index 8984c4885cb9..16dd7edb45a5 100644 --- a/dev-cpp/abseil-cpp/metadata.xml +++ b/dev-cpp/abseil-cpp/metadata.xml @@ -1,7 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <!-- maintainer-wanted --> + <maintainer type="person" proxied="yes"> + <email>negril.nx+gentoo@gmail.com</email> + <name>Paul Zander</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> <upstream> <remote-id type="github">abseil/abseil-cpp</remote-id> </upstream> diff --git a/dev-cpp/ada/Manifest b/dev-cpp/ada/Manifest new file mode 100644 index 000000000000..97d9bdfe91b7 --- /dev/null +++ b/dev-cpp/ada/Manifest @@ -0,0 +1,3 @@ +DIST ada-2.9.1.tar.gz 384701 BLAKE2B ad4a03100de06179c71c4d368cc349a630f8273550840cb19ba3e0cc4d296bfc59fa827bd3ea261609e4f80ebd2adbe7be1450040b519be5844febdcbc55f0f6 SHA512 74bad3f234dfe7b72e2057583e077e6a0f78f34b9c699751972d079b8027ef2dc34e6ef07c0dedeb923d8979f91c58a8a90473e69152c89e76baaa3659fa575b +EBUILD ada-2.9.1.ebuild 646 BLAKE2B 37006f9da477e13230df3eb753638785395e7947d7ab5d6394fb592f96dcd59c17e2fce5b927dbe9741c7f7d3cea69d69638915807bf9e8b7468993a19bbcf39 SHA512 0f0e79b389088004634c396bd7521ce15097dc2f77c8a6a6c33bdc1b0d22f5cb35d5af33c8700c8c00593770712f725c5fc949fc7bbef2e1d9f4b8e92c35b956 +MISC metadata.xml 502 BLAKE2B b38e8b4c9a196d09f33042485198301ac75d57f2b737608258c55a27b81f4b8b167f8e86641c52e11c8d31e7a1af3e1373ba498f99f1abbf93ad8874b9292065 SHA512 8fab507739a2a9f86d165a6b0a0d19c9172c4bcf6790a0fe4879aad4ebe5247160c143cd89e9a5337c49d7db0a45ad2103a062b35206c61c215f8c24afbdf1b4 diff --git a/dev-cpp/ada/ada-2.9.1.ebuild b/dev-cpp/ada/ada-2.9.1.ebuild new file mode 100644 index 000000000000..c87e72f6e853 --- /dev/null +++ b/dev-cpp/ada/ada-2.9.1.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="WHATWG-compliant and fast URL parser written in modern C++" +HOMEPAGE="https://github.com/ada-url/ada" + +SRC_URI="https://github.com/ada-url/ada/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0 MIT" +SLOT="0/$(ver_cut 1)" +KEYWORDS="~amd64" +RESTRICT="test" + +src_configure() { + local mycmakeargs=( + # Building anything other than the library requires the CPM package manager + # which isn't very well equipped for packaging... + -DADA_TESTING=NO + -DADA_TOOLS=NO + ) + cmake_src_configure +} diff --git a/dev-cpp/ada/metadata.xml b/dev-cpp/ada/metadata.xml new file mode 100644 index 000000000000..c71625e8a5e4 --- /dev/null +++ b/dev-cpp/ada/metadata.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person" proxied="yes"> + <email>esteve.varela@gmail.com</email> + <name>Esteve Varela Colominas</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <upstream> + <remote-id type="github">ada-url/ada</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-cpp/aixlog/Manifest b/dev-cpp/aixlog/Manifest index e754da46c71a..b04741d3c830 100644 --- a/dev-cpp/aixlog/Manifest +++ b/dev-cpp/aixlog/Manifest @@ -1,4 +1,4 @@ DIST aixlog-1.5.0.tar.gz 14080 BLAKE2B 20042e44853da950cae80787e8b9692635f0935ff0b559054faaf6ac41db4de7ddef1ab071b4244f1338b81fa559ee9445aa643050f9e250587cbbc0aae5db3e SHA512 28556feac1fa804b8a4dc047471e0a6d4c4fb7d81487810d55b09dd1be878246b8bf9f2097b76a980284318823c287bd0a93dd7a3124425a1ea9aced757152b6 +EBUILD aixlog-1.5.0-r1.ebuild 455 BLAKE2B 3239da3d8fb6d6c51f09c433b47a99eb871a6bf0541c598aa1ae39839c4250d61657503fbf004632fa7cd479d1ba50ee82cf79b22955b4beb6965495ee377064 SHA512 3b1971cf3bf9a01692982514d3fbafff53770f92404e1194c406d5633143e49e2733ff6822acd8f6e4e26c15d49d7855ce2ca5e6bb98f1bb2d98cd434ec78033 EBUILD aixlog-1.5.0.ebuild 587 BLAKE2B a1f4879e4ddf07933170d631d725c29b3dc9ea651d36e011a2f4b77536b70778a26eb350ca791f1d9f49b8ed92b4bda40f0fed7ce27e68464019346671ca4d53 SHA512 7302b12e29866ec8d17cc584c6eda822678417ff51e8d018453859dd7de1901b34e10d275d2c73f3a367c97c4d945e46e7cb8e5fbdd1a9970f808586c5fece59 -EBUILD aixlog-9999.ebuild 567 BLAKE2B a0d0e1552b3b35d1eaa8193df63a259a512871631a5e7c6968f73099684acf87aac57d09302af6ad33ebe833998633c4ed2bcd9dfb1317c5b8fa6e4f3f53a58f SHA512 a4eef4b0a89f2bfb97ba52585e6f6e262560466a49a872c86e6968f9920c4a3861c89aba7d1a706059ceb506f3bb6ae38aac9d1eca96c988b39083ddaada19d3 MISC metadata.xml 499 BLAKE2B 7dea962d454843ca3cde921a8dd30fadcb75f163f8ccf16a51b0d3de5176e8f6cae4788271f9924d5edd79e3e7b4ebe118e55f7397b8b5a8a8d1ec03d2a44241 SHA512 20dbf828621fdc1a4379192ed16d3f1e37bb8c5fe9974638f0b8e7c330d007133a589f5e8d23560d19de3c7c5eaa52c2d1e98d61be9326a998376a45c8f866b2 diff --git a/dev-cpp/aixlog/aixlog-9999.ebuild b/dev-cpp/aixlog/aixlog-1.5.0-r1.ebuild index b1164d6bbd11..4bac816603bb 100644 --- a/dev-cpp/aixlog/aixlog-9999.ebuild +++ b/dev-cpp/aixlog/aixlog-1.5.0-r1.ebuild @@ -1,25 +1,17 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake DESCRIPTION="Header-only C++ logging library" HOMEPAGE="https://github.com/badaix/aixlog" - -if [[ ${PV} == *9999 ]] ; then - inherit git-r3 - - EGIT_REPO_URI="https://github.com/badaix/aixlog.git" - EGIT_BRANCH="develop" -else - SRC_URI="https://github.com/badaix/aixlog/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi +SRC_URI="https://github.com/badaix/aixlog/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~x86" src_configure() { local mycmakeargs=( -DBUILD_EXAMPLE=OFF ) diff --git a/dev-cpp/asio/Manifest b/dev-cpp/asio/Manifest index f9f71fcc2736..5fcfca8fed44 100644 --- a/dev-cpp/asio/Manifest +++ b/dev-cpp/asio/Manifest @@ -4,5 +4,5 @@ DIST asio-1.28.1.tar.bz2 3383257 BLAKE2B 9d98152a6cf8b0e2a807275092b23f6198d8175 DIST asio-1.30.2.tar.bz2 3196850 BLAKE2B d902fda2338d9717bb8f2f5d43468c5d0b64591814c3ae3134350650f0dd97bf241287347d324b11d0e6993b1b44373df13305d736df09ad3375ce4976f5bb27 SHA512 2d26cdcfcc0c310e82ab502551b51d70fd95ba4628bd306929e78539299974fc14aa6ba27cf256f1df7a56539cb885012ba02a202ae17bf817ee6311308a795a EBUILD asio-1.28.1.ebuild 1292 BLAKE2B f1a68c5338831c80f586f10207896fd9e0ee366d942542e9e65a13ef9b16652b4a4aac83f9c6cf8c28001505a092278a98679c18971266c248998cede51ea2c3 SHA512 889122ea7d5ba268c6b069e77eba129764eb31def43e34c2e423603a635ea53d30f5405d350a2ef500c34c5772e4f3c0190760ae0f7474235ce0b88049446be4 EBUILD asio-1.30.1.ebuild 1095 BLAKE2B 0c28bbb7d5ddc62a5ffed0ed43648d18d0259c6e623e7870f436b45dab3370c9a8fbd169308b480b51013b04e042c02c3fb4196ba84f77fde0fbf70652dfdfad SHA512 f5c1659cfeffec7a682f3dda76f38a907f243f56779f11602944e9dab8ee102f7017be95876f5ad0f4b888ca4b49bd330cf80eb8501813491264aae892cc866b -EBUILD asio-1.30.2.ebuild 1235 BLAKE2B 8edf680dc17f5e311b1c8fdc890eb74eae889d894e555076d31013b9982363035deba9b4729b2bf6330299b9ec416a7988c61f9bdd9b24dc23513b47a5cf96da SHA512 337fe5917084bfd572dc3a37f68b0621c25fecd44969e5a2968ed05918671f00f6d13c874c1a6837b0123e84920f1adf5fc820f39c746d32ca6ea37556273cb0 +EBUILD asio-1.30.2.ebuild 1229 BLAKE2B 40d18f77c8dcfb28a45f734dbf8097f016094e9e8195fa64a2ffacfe235b0485d02cadf3c2ff8ca738d27fb27622c935e8614ec76a01f937ec795e4882cc5659 SHA512 ead0899ed6b29c030692c399d86d5488243ca1f5d654b53e99de62cec1be6ff2c85ea4eb049919f8ed1892e5c4c90c9468b87c815fdad83aa223de945996c04e MISC metadata.xml 487 BLAKE2B 57785b73f498590d36241612367eda9036cc4ce85baa6c59e45a4c4f0b696f24f7bbe012eef33dd2e29a9c82fad82f75639e55f9c7a6e2e001b7ab48b65787cc SHA512 4a4f9713ea7274f730707dda0f2de0e0c19e50166466c0b8c3e5053e44fa5df02866235cfd97ebeaff15271cce662f1ae19383c0023813d429eded937d9b9cfb diff --git a/dev-cpp/asio/asio-1.30.2.ebuild b/dev-cpp/asio/asio-1.30.2.ebuild index 6592a495eec8..07f26a2ebb90 100644 --- a/dev-cpp/asio/asio-1.30.2.ebuild +++ b/dev-cpp/asio/asio-1.30.2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/asio/asio/${P}.tar.bz2" LICENSE="Boost-1.0" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86" IUSE="doc examples test" RESTRICT="!test? ( test )" diff --git a/dev-cpp/benchmark/Manifest b/dev-cpp/benchmark/Manifest index d03b8ab1bd4f..eb64f004b7a9 100644 --- a/dev-cpp/benchmark/Manifest +++ b/dev-cpp/benchmark/Manifest @@ -1,8 +1,6 @@ -AUX benchmark-1.8.3-backport-pr1753.patch 3386 BLAKE2B a89175e07a3aeca05e076e3c4a4506cfaf80b23f0ebc1ec1b28fa5b7ef78faf133f881aea0eab1b7336b47fed798f3e1b55e120adf0a78fc61d27a1867d259e6 SHA512 55d49b89c450a3a89ad82186826f8629d1bc92697e1d54ab804046d67c7e7b6b7b60ca78c741df5a16a0f50281efb70b86f700fbecae5d68019685cf00ea5cf1 -AUX benchmark-1.8.3-backport-pr1756.patch 2836 BLAKE2B ea3b1c34e9502488c0e6e6a343ba3c29083bdf0623e935008ac03f0ac7815fa9020327bab7e8b6be4fccf5d10bae8c305ea0220936fb608b02e0acf4cfa5ab82 SHA512 aed107584a5b81685a29b055221e903dc8aa4c92f67ac6654a1a120a507a0c51b20109eafb8ad5a459e9a609ca6e5e2d50234af1bddbe36e8eb9391ba3017cfd -AUX benchmark-1.8.3-fix-32bit-test.patch 809 BLAKE2B 22adc089c727de1f93a19dbaed2549536b7b97b705e472c3126af6ebccb56665c1b4cf835a2e5e306233bc6415eed59401295645f79f679315a68a2275e60d91 SHA512 a14a9adc33e0ffb57177b946d6eae2e3a4faf34a24715b5acf0b0ff9fca372a27357b225eb5ffea05b8ebf033244752c6e7b15714946ec2f036fee483199e994 -DIST benchmark-1.8.3.tar.gz 250206 BLAKE2B 14b4af17184a88378314d11623b73c27368999fcff6e50986407a08739fdf388cdcbd140471b629cd2a9948f81073796f8a6c38d015be8413b7e4d4759715f97 SHA512 4e12114251c79a426873cfba6e27270b69fc980cef9a68e9cb3170f8e2e203f77dee19ab1e65cad51cd67e60991d3bbfdd52553f22522ce5e6c611b5aa07602c +AUX benchmark-1.9.0-fix-documentation-installation.patch 1476 BLAKE2B 7c5848f7542c14f9cfe3c79e01153efb416b1f8892945b1cc3962908a246e83945b191581f544a8dc6972da00fe9af217eb9a70c29ae02f2a6dcc84e20ff1ecf SHA512 f6a7aef337539f0057b3f4c4ffa3e79e1de7451c7d0cb6bbc9a0374e04da38488e7cba9891857d240d9f0cc4a5cfed9d4c67a613cc5919843c80db3328f35432 DIST benchmark-1.8.4.tar.gz 253916 BLAKE2B 78a290a5013d8371e87b7c918e518e3ec0e8247e25e211d160ab8dea51d8871d8dac54ee91ee0c512af86a60d1f4e9baedadc20d4a7fa28ef790411fda0399c8 SHA512 835d12b88fe52309ce6b2ffbc8b3c178ac594be7d249b5daca0373d1d03ec83ea3c7b94224f67f22d21919376985867eeff0d1c0721501cfd8a9e9b8a9c48882 -EBUILD benchmark-1.8.3-r1.ebuild 1029 BLAKE2B 2e1bb67da33327d494ae1b02f9267b54ed9a27319ef8759b772d6bd0f1edb92ac8bb6d80a394109c1bfd2f777e06d50104db95ce75fe88321bcda21ca376e7c4 SHA512 39a95f93725ad39ed236ff99c86b0e9d61cb54caa7077c61a4c4fa56a1e50cf74a5e3894d4fcc7eace809c5992e36139125b991cfe7b02e14ad18a16e92517ee -EBUILD benchmark-1.8.4.ebuild 883 BLAKE2B 35342f464a4c745a4d88cf3baf5f45856f2364e0cdc09305d54a424b8275476d89df38e64e91c827648a2c63eec2190717c44148fc6931e5e6e40158de5076ec SHA512 08da12ac6dd07aeeabdfa5ca3456df587add67aad35dd9664d79d0687144afd113379b36a861a9dfe2007cf72699872d6874826b1797843a9035b91c9d59b72b -MISC metadata.xml 390 BLAKE2B f76ee36d10b6deea1fd4f90c20947023b5e088a5a5ba56115c137ae487ccdc564b3e5cd39721b7efd0cb7958a652fc9334f30d1341f0c539de6c9c7f5e192337 SHA512 b9b2787e558e7c350f6f3b007a5e799a6cf5746ee59fbe5de0ed439a0665fac516b8788601bcd1b10589cd876e25f135b98a241d159899612c189ca1224cfb20 +DIST benchmark-1.9.0.tar.gz 253961 BLAKE2B fdac0018435622e3ee2c1cde02c8140a15f2579b9059d1592b588033e6935bd8d54c874f4ea912696e8e1d5f7eebae30ba849f77cc3f74f006b4b03c712685ed SHA512 0e91e0e5a2222d7650fd8bd9cafb2f0e7c1689cd1b87b2cc529c738db12bfef31162aa5a4da78f7b0aa7f0101dc08b626802c58d39862458f82f9fea9316ca25 +EBUILD benchmark-1.8.4.ebuild 878 BLAKE2B 6233945fe9650081b11d16dceaa507dd71c715a1a97e195e6928789edf70fcf49bd05ac34a4509b4d0689713764d1a9e28e783d47ebfd99bfe1e72c8d46b7d2e SHA512 613d30096278b361be2b1963507c4c295fab63e61bd9fa84214da5af0c24197fc6b33e4390d26d5588b772465fab0c018f0dd8c3142cf6956abd2d77925cea3a +EBUILD benchmark-1.9.0.ebuild 1796 BLAKE2B 41d9258a09d862c047da2b8a77c7cceb02cf3e2c3c6c0aea5d822578825fa093f3eaa4e9cc3f0c8809cb68b547c9caed08e4db2755e881c8067c92471e25e7cd SHA512 a37865ba4538efbb7b8f0618c79085d1c1878860398e82fbd99409169b3a85dc81bd39aa7756d745aeef5eee8bfb2716982db79e7d3766c32eee90ea8d08515b +MISC metadata.xml 1447 BLAKE2B 84a378fdce6b9590457deb8f273fde40828c3156ca70b38f58e81248468d349f228d8eeb4fc4325614ce4b1e77fd4c8c4c275156b8cc125b7cb3c874da6acbc6 SHA512 3c8e6088b0ecd4f1075cb35972db3ac200636a9be7e63036777f840145195fb3b977829efcdd12649d9fb1913925a2d731c3d29abf581613f8d8e9dbe2006577 diff --git a/dev-cpp/benchmark/benchmark-1.8.3-r1.ebuild b/dev-cpp/benchmark/benchmark-1.8.3-r1.ebuild deleted file mode 100644 index 8e3db7fe1c4a..000000000000 --- a/dev-cpp/benchmark/benchmark-1.8.3-r1.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake flag-o-matic - -DESCRIPTION="A microbenchmark support library" -HOMEPAGE="https://github.com/google/benchmark" -SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86" -IUSE="debug doc test" -RESTRICT="!test? ( test )" - -BDEPEND="doc? ( app-text/doxygen ) - test? ( >=dev-cpp/gtest-1.11.0 )" -PATCHES=( - "${FILESDIR}/${PN}-1.8.3-fix-32bit-test.patch" - "${FILESDIR}/${PN}-1.8.3-backport-pr1753.patch" - "${FILESDIR}/${PN}-1.8.3-backport-pr1756.patch" -) - -src_configure() { - local mycmakeargs=( - -DBENCHMARK_ENABLE_ASSEMBLY_TESTS=OFF - -DBENCHMARK_ENABLE_DOXYGEN=$(usex doc) - -DBENCHMARK_ENABLE_GTEST_TESTS=$(usex test) - -DBENCHMARK_ENABLE_TESTING=$(usex test) - -DBENCHMARK_ENABLE_WERROR=OFF - -DBENCHMARK_USE_BUNDLED_GTEST=OFF - ) - - use debug || append-cppflags -DNDEBUG - - cmake_src_configure -} diff --git a/dev-cpp/benchmark/benchmark-1.8.4.ebuild b/dev-cpp/benchmark/benchmark-1.8.4.ebuild index a48b13d02eb4..3ba3a6651fab 100644 --- a/dev-cpp/benchmark/benchmark-1.8.4.ebuild +++ b/dev-cpp/benchmark/benchmark-1.8.4.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86" IUSE="debug doc test" RESTRICT="!test? ( test )" diff --git a/dev-cpp/benchmark/benchmark-1.9.0.ebuild b/dev-cpp/benchmark/benchmark-1.9.0.ebuild new file mode 100644 index 000000000000..46af0a1dbe0f --- /dev/null +++ b/dev-cpp/benchmark/benchmark-1.9.0.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{11,12} ) + +inherit cmake-multilib python-single-r1 + +DESCRIPTION="A microbenchmark support library" +HOMEPAGE="https://github.com/google/benchmark/" +SRC_URI="https://github.com/google/benchmark/archive/v${PV}.tar.gz -> ${P}.tar.gz" +LICENSE="Apache-2.0" +SLOT="0/$(ver_cut 1)" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86" +IUSE="doc +exceptions libcxx libpfm lto test +tools" +RESTRICT="!test? ( test )" +REQUIRED_USE="tools? ( ${PYTHON_REQUIRED_USE} )" + +DEPEND=" + libcxx? ( sys-libs/libcxx[${MULTILIB_USEDEP}] ) + libpfm? ( dev-libs/libpfm:= ) +" + +BDEPEND=" + >=dev-build/cmake-3.10 + doc? ( app-text/doxygen ) + test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] ) +" + +RDEPEND=" + tools? ( + $(python_gen_cond_dep ' + dev-python/numpy[${PYTHON_USEDEP}] + >=dev-python/scipy-1.10.0[${PYTHON_USEDEP}] + ') + + ${PYTHON_DEPS} + ) +" + +PATCHES=( "${FILESDIR}/${P}-fix-documentation-installation.patch" ) + +pkg_setup() { + use tools && python-single-r1_pkg_setup +} + +multilib_src_configure() { + local mycmakeargs=( + -DBENCHMARK_ENABLE_DOXYGEN="$(usex doc)" + -DBENCHMARK_ENABLE_EXCEPTIONS="$(usex exceptions)" + -DBENCHMARK_ENABLE_GTEST_TESTS="$(usex test)" + -DBENCHMARK_ENABLE_LTO="$(usex lto)" + -DBENCHMARK_ENABLE_LIBPFM="$(usex libpfm)" + -DBENCHMARK_ENABLE_TESTING="$(usex test)" + -DBENCHMARK_ENABLE_WERROR=OFF + -DBENCHMARK_INSTALL_DOCS="$(usex doc)" + -DBENCHMARK_USE_BUNDLED_GTEST=OFF + -DBENCHMARK_USE_LIBCXX="$(usex libcxx)" + ) + + cmake_src_configure +} + +multilib_src_install_all() { + dodoc CONTRIBUTING.md + dodoc CONTRIBUTORS + + if use tools; then + python_domodule tools/gbench + python_doscript tools/compare.py + python_doscript tools/strip_asm.py + fi +} diff --git a/dev-cpp/benchmark/files/benchmark-1.8.3-backport-pr1753.patch b/dev-cpp/benchmark/files/benchmark-1.8.3-backport-pr1753.patch deleted file mode 100644 index 1c2516c38e37..000000000000 --- a/dev-cpp/benchmark/files/benchmark-1.8.3-backport-pr1753.patch +++ /dev/null @@ -1,94 +0,0 @@ -https://bugs.gentoo.org/922877 -https://github.com/google/benchmark/pull/1753 - -From cdd4a6d48077a78d07e3b7f165383f6d5052108c Mon Sep 17 00:00:00 2001 -From: Sam James <sam@gentoo.org> -Date: Fri, 2 Feb 2024 21:38:11 -0500 -Subject: [PATCH 1/3] CycleClock: Add support for Alpha architecture - -As documented, the real cycle counter is unsafe to use here, because it -is a 32-bit integer which wraps every ~4s. Use gettimeofday instead, -which has a limitation of a low-precision real-time-clock (~1ms), but no -wrapping. Passes test suite. - -Signed-off-by: Sam James <sam@gentoo.org> ---- - src/cycleclock.h | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/src/cycleclock.h b/src/cycleclock.h -index 931bba146..eff563e7f 100644 ---- a/src/cycleclock.h -+++ b/src/cycleclock.h -@@ -218,6 +218,15 @@ inline BENCHMARK_ALWAYS_INLINE int64_t Now() { - uint64_t pcycle; - asm volatile("%0 = C15:14" : "=r"(pcycle)); - return static_cast<double>(pcycle); -+#elif defined(__alpha__) -+ // Alpha has a cycle counter, the PCC register, but it is an unsigned 32-bit -+ // integer and thus wraps every ~4s, making using it for tick counts -+ // unreliable beyond this time range. The real-time clock is low-precision, -+ // roughtly ~1ms, but it is the only option that can reasonable count -+ // indefinitely. -+ struct timeval tv; -+ gettimeofday(&tv, nullptr); -+ return static_cast<int64_t>(tv.tv_sec) * 1000000 + tv.tv_usec; - #else - // The soft failover to a generic implementation is automatic only for ARM. - // For other platforms the developer is expected to make an attempt to create - -From b1bec2fa5aed335b5be78720a9812cf27baf9df6 Mon Sep 17 00:00:00 2001 -From: Sam James <sam@gentoo.org> -Date: Fri, 2 Feb 2024 21:46:06 -0500 -Subject: [PATCH 2/3] sysinfo: support parsing /proc/cpuinfo on Alpha - -And also, bail out if unable to parse /proc/cpuinfo. This will -preemptively alert users on platforms that need custom code for parsing -/proc/cpuinfo. - -Signed-off-by: Sam James <sam@gentoo.org> ---- - src/sysinfo.cc | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/sysinfo.cc b/src/sysinfo.cc -index 04d64dc5b..786bb1b41 100644 ---- a/src/sysinfo.cc -+++ b/src/sysinfo.cc -@@ -513,7 +513,11 @@ int GetNumCPUs() { - std::cerr << "failed to open /proc/cpuinfo\n"; - return -1; - } -+#if defined(__alpha__) -+ const std::string Key = "cpus detected"; -+#else - const std::string Key = "processor"; -+#endif - std::string ln; - while (std::getline(f, ln)) { - if (ln.empty()) continue; - -From 17f2f35e1ce650b4f8596a5c5df6a050588136c5 Mon Sep 17 00:00:00 2001 -From: Sam James <sam@gentoo.org> -Date: Fri, 2 Feb 2024 21:49:24 -0500 -Subject: [PATCH 3/3] tabular_test: add a missing DoNotOptimize call - -Signed-off-by: Sam James <sam@gentoo.org> ---- - test/user_counters_tabular_test.cc | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/test/user_counters_tabular_test.cc b/test/user_counters_tabular_test.cc -index 3e8fb1bf0..ffd3c0992 100644 ---- a/test/user_counters_tabular_test.cc -+++ b/test/user_counters_tabular_test.cc -@@ -63,6 +63,9 @@ ADD_CASES(TC_CSVOut, {{"%csv_header," - - void BM_Counters_Tabular(benchmark::State& state) { - for (auto _ : state) { -+ // This test requires a non-zero CPU time to avoid divide-by-zero -+ auto iterations = state.iterations(); -+ benchmark::DoNotOptimize(iterations); - } - namespace bm = benchmark; - state.counters.insert({ diff --git a/dev-cpp/benchmark/files/benchmark-1.8.3-backport-pr1756.patch b/dev-cpp/benchmark/files/benchmark-1.8.3-backport-pr1756.patch deleted file mode 100644 index 6744d3cf212f..000000000000 --- a/dev-cpp/benchmark/files/benchmark-1.8.3-backport-pr1756.patch +++ /dev/null @@ -1,89 +0,0 @@ -https://bugs.gentoo.org/922877 -https://github.com/google/benchmark/pull/1756 - -From 3805709f137766c99922f647af9b97d49d14e772 Mon Sep 17 00:00:00 2001 -From: Sam James <sam@gentoo.org> -Date: Tue, 13 Feb 2024 20:23:20 -0500 -Subject: [PATCH] sysinfo.cc: Always abort on GetNumCPUs failure - -Defines a wrapper function, CheckNumCPUs, which enforces that GetNumCPUs -never returns fewer than one CPU. There is no reasonable way to -continue if we are unable to identify the number of CPUs. - -Signed-off-by: Sam James <sam@gentoo.org> ---- - src/sysinfo.cc | 28 +++++++++++++++++----------- - 1 file changed, 17 insertions(+), 11 deletions(-) - -diff --git a/src/sysinfo.cc b/src/sysinfo.cc -index 786bb1b41..daeb98b02 100644 ---- a/src/sysinfo.cc -+++ b/src/sysinfo.cc -@@ -474,12 +474,11 @@ std::string GetSystemName() { - #endif // Catch-all POSIX block. - } - --int GetNumCPUs() { -+int GetNumCPUsImpl() { - #ifdef BENCHMARK_HAS_SYSCTL - int num_cpu = -1; - if (GetSysctl("hw.ncpu", &num_cpu)) return num_cpu; -- fprintf(stderr, "Err: %s\n", strerror(errno)); -- std::exit(EXIT_FAILURE); -+ PrintErrorAndDie("Err: ", strerror(errno)); - #elif defined(BENCHMARK_OS_WINDOWS) - SYSTEM_INFO sysinfo; - // Use memset as opposed to = {} to avoid GCC missing initializer false -@@ -493,8 +492,8 @@ int GetNumCPUs() { - // Returns -1 in case of a failure. - long num_cpu = sysconf(_SC_NPROCESSORS_ONLN); - if (num_cpu < 0) { -- fprintf(stderr, "sysconf(_SC_NPROCESSORS_ONLN) failed with error: %s\n", -- strerror(errno)); -+ PrintErrorAndDie("sysconf(_SC_NPROCESSORS_ONLN) failed with error: ", -+ strerror(errno)); - } - return (int)num_cpu; - #elif defined(BENCHMARK_OS_QNX) -@@ -510,8 +509,7 @@ int GetNumCPUs() { - int max_id = -1; - std::ifstream f("/proc/cpuinfo"); - if (!f.is_open()) { -- std::cerr << "failed to open /proc/cpuinfo\n"; -- return -1; -+ PrintErrorAndDie("Failed to open /proc/cpuinfo"); - } - #if defined(__alpha__) - const std::string Key = "cpus detected"; -@@ -540,12 +538,10 @@ int GetNumCPUs() { - } - } - if (f.bad()) { -- std::cerr << "Failure reading /proc/cpuinfo\n"; -- return -1; -+ PrintErrorAndDie("Failure reading /proc/cpuinfo"); - } - if (!f.eof()) { -- std::cerr << "Failed to read to end of /proc/cpuinfo\n"; -- return -1; -+ PrintErrorAndDie("Failed to read to end of /proc/cpuinfo"); - } - f.close(); - -@@ -559,6 +555,16 @@ int GetNumCPUs() { - BENCHMARK_UNREACHABLE(); - } - -+int GetNumCPUs() { -+ const int num_cpus = GetNumCPUsImpl(); -+ if (num_cpus < 1) { -+ PrintErrorAndDie( -+ "Unable to extract number of CPUs. If your platform uses " -+ "/proc/cpuinfo, custom support may need to be added."); -+ } -+ return num_cpus; -+} -+ - class ThreadAffinityGuard final { - public: - ThreadAffinityGuard() : reset_affinity(SetAffinity()) { diff --git a/dev-cpp/benchmark/files/benchmark-1.8.3-fix-32bit-test.patch b/dev-cpp/benchmark/files/benchmark-1.8.3-fix-32bit-test.patch deleted file mode 100644 index 62e741687f9c..000000000000 --- a/dev-cpp/benchmark/files/benchmark-1.8.3-fix-32bit-test.patch +++ /dev/null @@ -1,20 +0,0 @@ -https://bugs.gentoo.org/916278 -https://salsa.debian.org/science-team/benchmark/-/blob/master/debian/patches/0007-fix-32bit-test.patch?ref_type=heads - -Description: Fix 32bit-test -Author: Anton Gladky <gladk@debian.org> -Last-Update: 2023-10-17 - ---- benchmark-1.8.3.orig/test/statistics_gtest.cc -+++ benchmark-1.8.3/test/statistics_gtest.cc -@@ -28,8 +28,8 @@ TEST(StatisticsTest, StdDev) { - TEST(StatisticsTest, CV) { - EXPECT_DOUBLE_EQ(benchmark::StatisticsCV({101, 101, 101, 101}), 0.0); - EXPECT_DOUBLE_EQ(benchmark::StatisticsCV({1, 2, 3}), 1. / 2.); -- EXPECT_DOUBLE_EQ(benchmark::StatisticsCV({2.5, 2.4, 3.3, 4.2, 5.1}), -- 0.32888184094918121); -+ EXPECT_NEAR(benchmark::StatisticsCV({2.5, 2.4, 3.3, 4.2, 5.1}), -+ 0.32888184094918121, 1e-7); - } - - } // end namespace diff --git a/dev-cpp/benchmark/files/benchmark-1.9.0-fix-documentation-installation.patch b/dev-cpp/benchmark/files/benchmark-1.9.0-fix-documentation-installation.patch new file mode 100644 index 000000000000..631e01881aa8 --- /dev/null +++ b/dev-cpp/benchmark/files/benchmark-1.9.0-fix-documentation-installation.patch @@ -0,0 +1,47 @@ +From 009874342ddcf6446bec308686c54bd387a212a4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Matt=C3=A9o=20Rossillol=E2=80=91=E2=80=91Laruelle?= + <beatussum@protonmail.com> +Date: Mon, 19 Aug 2024 09:12:57 +0200 +Subject: [PATCH] fix documentation installation +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +HTML pages generated by Doxygen are now installed into +/usr/share/doc/${PF}/html. + +The content of the docs directory is always installed even if HTML pages are +installed. + +Signed-off-by: Mattéo Rossillol‑‑Laruelle <beatussum@protonmail.com> +--- + src/CMakeLists.txt | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 32126c0..40e75e0 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -169,12 +169,12 @@ if (BENCHMARK_ENABLE_DOXYGEN) + if (BENCHMARK_ENABLE_INSTALL AND BENCHMARK_INSTALL_DOCS) + install( + DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/html/" +- DESTINATION ${CMAKE_INSTALL_DOCDIR}) +- endif() +-else() +- if (BENCHMARK_ENABLE_INSTALL AND BENCHMARK_INSTALL_DOCS) +- install( +- DIRECTORY "${PROJECT_SOURCE_DIR}/docs/" +- DESTINATION ${CMAKE_INSTALL_DOCDIR}) ++ DESTINATION "${CMAKE_INSTALL_DOCDIR}/html/") + endif() + endif() ++ ++if (BENCHMARK_ENABLE_INSTALL AND BENCHMARK_INSTALL_DOCS) ++ install( ++ DIRECTORY "${PROJECT_SOURCE_DIR}/docs/" ++ DESTINATION ${CMAKE_INSTALL_DOCDIR}) ++endif() +-- +2.44.2 + diff --git a/dev-cpp/benchmark/metadata.xml b/dev-cpp/benchmark/metadata.xml index 7b3ec03c0ee6..0f523bea9937 100644 --- a/dev-cpp/benchmark/metadata.xml +++ b/dev-cpp/benchmark/metadata.xml @@ -1,10 +1,33 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person"> + <email>beatussum@protonmail.com</email> + <name>Mattéo Rossillol‑‑Laruelle</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <use> + <flag name="exceptions">Enable the use of exceptions in the benchmark library</flag> + <flag name="libcxx">Use <pkg>sys-libs/libcxx</pkg> instead of libstdc++ as the default stdlib</flag> + <flag name="libpfm">Enable <pkg>dev-libs/libpfm</pkg> support</flag> + <flag name="tools">Install some additional Python tools</flag> + </use> + <use lang="fr"> + <flag name="exceptions">Utiliser les exceptions inclues dans la bibliothèque</flag> + <flag name="libcxx">Utiliser <pkg>sys-libs/libcxx</pkg> à la place de libstdc++ comme bibliothèque standard</flag> + <flag name="libpfm">Activer le support de <pkg>dev-libs/libpfm</pkg></flag> + <flag name="tools">Installer des outils Python additionnels</flag> + </use> <upstream> - <bugs-to>https://github.com/google/benchmark/issues</bugs-to> - <doc lang="en">https://github.com/google/benchmark/tree/master/docs/</doc> + <maintainer status="active"> + <name>Google</name> + <email>opensource@google.com</email> + </maintainer> + <bugs-to>https://github.com/google/benchmark/issues/</bugs-to> + <doc>https://github.com/google/benchmark/tree/master/docs/</doc> <remote-id type="github">google/benchmark</remote-id> </upstream> </pkgmetadata> diff --git a/dev-cpp/catch/Manifest b/dev-cpp/catch/Manifest index 93e9269f3307..f114e95eb832 100644 --- a/dev-cpp/catch/Manifest +++ b/dev-cpp/catch/Manifest @@ -14,6 +14,6 @@ EBUILD catch-2.13.8.ebuild 1012 BLAKE2B 6d9ed3c4811c39fd9706896d41d048d2e17155d4 EBUILD catch-3.5.2.ebuild 1001 BLAKE2B f54bed2b5ffbc6f9312736e5006bd49d7dfc579fd214d00e9aede0ff840c606763524ea01b2861f5a43dfdf8e3527b730e26b51a8abdc59be37c452b276da1ef SHA512 860d76cb7b2a1b0f5b6aae04cd07acf40205726ac650d6f5351d151744b5a33fec31194dc1a01c8acd03bcfae620a4a8c409f6db1335e844813af352877acde1 EBUILD catch-3.5.3.ebuild 1009 BLAKE2B 655212eabcd56ab04f7569aac764b0f79b3e542521fbabc096c8256d68ec895ea6c58ab0ad4ae8ece8290fa5a849e472488894d7bbb410c883c086953b5bdae7 SHA512 20a5aa63d1cb679ffb7af373dc056993747199fab7b8cd857af94e030114ed48f04de793119c0944e207c7050d6f5c8d6092b5abfeafca69c4f4dedc276d062b EBUILD catch-3.5.4.ebuild 1009 BLAKE2B 655212eabcd56ab04f7569aac764b0f79b3e542521fbabc096c8256d68ec895ea6c58ab0ad4ae8ece8290fa5a849e472488894d7bbb410c883c086953b5bdae7 SHA512 20a5aa63d1cb679ffb7af373dc056993747199fab7b8cd857af94e030114ed48f04de793119c0944e207c7050d6f5c8d6092b5abfeafca69c4f4dedc276d062b -EBUILD catch-3.6.0.ebuild 1002 BLAKE2B 40fb2c0c1d2908cefac78183f5403864099637a78a611570426f3b1ba2283981e3f0779ddf60e888b5a909a4c479ae176e8117f8a9d82df2af5b28870a0a0b43 SHA512 c2e4d8af797415684d32ff5b410ab1892eb71a611b3a8c2941dfb6c4af937ed19660ac9188696220a84efd76c8a8485579179b953031277a002408a26022893c +EBUILD catch-3.6.0.ebuild 1001 BLAKE2B f54bed2b5ffbc6f9312736e5006bd49d7dfc579fd214d00e9aede0ff840c606763524ea01b2861f5a43dfdf8e3527b730e26b51a8abdc59be37c452b276da1ef SHA512 860d76cb7b2a1b0f5b6aae04cd07acf40205726ac650d6f5351d151744b5a33fec31194dc1a01c8acd03bcfae620a4a8c409f6db1335e844813af352877acde1 EBUILD catch-9999.ebuild 1009 BLAKE2B 9dc56f59783ec8812d6701a2ed347e039c655f8ad874e20e5058d1667ba3c061cebd8824af1345e76fd90973b439aa3469bbaa564382f04545d0f43e9bc3d7af SHA512 dd9d0e08934ddb10273a2f6b5642bcca5471976f034cf026eec09da7d651553c2193d7f0928dbfa385333f21ef9a21a44185f3cc480970a97e83a08ec4f96103 MISC metadata.xml 325 BLAKE2B 170690d843389d8befc37befe36d57a20f791f6520a08a8eafae196c6ada323a9afb00f58b55d0df30aa67f3e96430a46c3ee0355911b2289056e8bed48509ff SHA512 d2e3d74294189b3c639a16084b7a3745af6854f295c529fc2dc76d05ed6d7ac7e84c8a760f47f07f0744cdd257b5bf851a900ae48482efceea4a8d6ac6ace7c4 diff --git a/dev-cpp/catch/catch-3.6.0.ebuild b/dev-cpp/catch/catch-3.6.0.ebuild index 31c6d23ac8c3..8b8c8c695764 100644 --- a/dev-cpp/catch/catch-3.6.0.ebuild +++ b/dev-cpp/catch/catch-3.6.0.ebuild @@ -15,7 +15,7 @@ else SRC_URI="https://github.com/catchorg/Catch2/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz" S="${WORKDIR}/${MY_P}" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86" fi DESCRIPTION="Modern C++ header-only framework for unit-tests" diff --git a/dev-cpp/cpp-httplib/Manifest b/dev-cpp/cpp-httplib/Manifest index 9c20f736fe4e..4f9d61378589 100644 --- a/dev-cpp/cpp-httplib/Manifest +++ b/dev-cpp/cpp-httplib/Manifest @@ -1,5 +1,9 @@ DIST cpp-httplib-0.15.3.tar.gz 1151398 BLAKE2B 8ce7d7e59c0954efb14a11e565f9cdf02c007a3b6d39dbdcb21b412906eed3ceeca3182096f4b4eadb32a5886e839e64774ae9a1110ddb60fb7cdea35b5b7d50 SHA512 f7fc9c9eb71f091b82958e023a7b417b30d2590fd5d1a920d1c98361f34bcaca796dbeda7f9fdb8b2c722a8968977b77463c6cbb252cba9823a79c22471fa439 DIST cpp-httplib-0.16.0.tar.gz 1156790 BLAKE2B 4a75059f16f6e46685c2cf028c6fa4c9cd50c35273795a8dbb6ca9d2997146b04b305893ad50adbb62c39db14ab3f589e902353bb199ee167d2648fe3621aee1 SHA512 63dc5a50f425e7be909d60db138caa1b9d7260c5d4db26603011a329f0d6a645d56f436c79466fbe662f24a94bc0f72926062b3ed49cb658eb91a6bdb2ddf25b +DIST cpp-httplib-0.16.2.tar.gz 1157538 BLAKE2B 0fdb3946e33f3af0a6b9646d5edf53572d67fb7e2334923c3ef9784aad569672c21e12c6d0f4c1f91ceccb8d9b3e8f14d51b21f4c6cf252da98024cee47cfcbe SHA512 d0a3d5477cb76cbbbc6da53b0abff3b45fd6b77c0d1686b355ce2904593c67c25849d2b1348e49b0b57ece5be91404fe976b06d75d34eb5068b1e130fd7ddbee +DIST cpp-httplib-0.16.3.tar.gz 1157548 BLAKE2B 986a33043ddf86623f70f50244051089cb6b824866ee247de13772263c691fde2b10e9eeef2078265f0a91b5744dafd2940892cff03c1a9cfd4b35df0d446522 SHA512 1a0d40f17b526db74dfa51903f0d15876b20c836a438be8f87ac2b18e535c3fad1822fbad9cf97053705a2cedc8171ab648e2e8c823eeb2e180c347283f3de9a EBUILD cpp-httplib-0.15.3-r1.ebuild 2251 BLAKE2B 9e6e6fef227f0b3b2e118ecef130f0a57d2877e0c4854016ee1ba6c2951a3f18b92cc660b7def42d4e6b3cffdf570eac6637ed502b9133297b2ff25a3441a0bd SHA512 191160987ddaed74c328a380b3363c02b62edfe4e3216fcc3de9d211e00e90855f02641d2dc05f4ec8e98bffd41308ed251db4921b7cda8f2fd69541b54b21cf -EBUILD cpp-httplib-0.16.0.ebuild 2275 BLAKE2B 9049dff47ccceee35a74ed6d18d535e83c8cf1ab0b5d8718e2b5520710f78dc9aed6419fd90114cc87d1ba921075d7c5bfe3a5449e56323a9ffac23a591c49bf SHA512 97206490f5007f8281d221693cabc91492ca3c233ae4a22c133e46513cd97b9a0bb9b549a1ecadbf24d86cc5c9aabd22c0d022f84094b1c9fafc856349d2fe3f +EBUILD cpp-httplib-0.16.0.ebuild 2270 BLAKE2B 532473c746347059341752647dfbcfe411aecc6397814f161d11e49dedba81f76d91bb3c17b83cdfcdffca83065dc986ffba336bbb7ba9a3fa8449450b089711 SHA512 800cd7a83b73698167f9d2795b35545c0339bb414720902424be0e861b3b20bd046f4100308de8a93d835e50888fff5f12cbd27cdac1cfe6f7cccb553eca4b06 +EBUILD cpp-httplib-0.16.2.ebuild 2352 BLAKE2B 3d978a8da9edc81eb64ef7d7eb51abaa562b2701f8f51f0d8b9f7e53cc8197f01e9b17ac7be554870c934154a23fddf20b55f24d37f73a53904afc522a80f54e SHA512 2b974b667285768e4fb29317b0b007dd3ccff5dce1ede08ba6a7768864c279d8d1dc39ccbd9ea9eb23b58002782f505000f75865ba9129c49aa79fa7bbd841cc +EBUILD cpp-httplib-0.16.3.ebuild 2352 BLAKE2B 3d978a8da9edc81eb64ef7d7eb51abaa562b2701f8f51f0d8b9f7e53cc8197f01e9b17ac7be554870c934154a23fddf20b55f24d37f73a53904afc522a80f54e SHA512 2b974b667285768e4fb29317b0b007dd3ccff5dce1ede08ba6a7768864c279d8d1dc39ccbd9ea9eb23b58002782f505000f75865ba9129c49aa79fa7bbd841cc MISC metadata.xml 658 BLAKE2B d97bce6286ac52413eb4c57a63290685efbc41c72482cbc9b0aeadca193e9e9a315a9912b0cd692cd7f3d213b8a784d07dc8981d5df1d750b4324f1fba995302 SHA512 1c9f1aba4dbe32f4e8f78ecad2a2c677b7f662eff4b1e9e6e4389bed969ddd7c878324c1635d66a22e53c56dc5b05cd401d4c384a5c4a0314c3932109f4d6b70 diff --git a/dev-cpp/cpp-httplib/cpp-httplib-0.16.0.ebuild b/dev-cpp/cpp-httplib/cpp-httplib-0.16.0.ebuild index 2a99bbc0191f..0325b37eb905 100644 --- a/dev-cpp/cpp-httplib/cpp-httplib-0.16.0.ebuild +++ b/dev-cpp/cpp-httplib/cpp-httplib-0.16.0.ebuild @@ -18,7 +18,7 @@ else SRC_URI="https://github.com/yhirose/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 sparc x86" fi LICENSE="MIT" diff --git a/dev-cpp/cpp-httplib/cpp-httplib-0.16.2.ebuild b/dev-cpp/cpp-httplib/cpp-httplib-0.16.2.ebuild new file mode 100644 index 000000000000..43d66265bb25 --- /dev/null +++ b/dev-cpp/cpp-httplib/cpp-httplib-0.16.2.ebuild @@ -0,0 +1,92 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{11..13} ) + +inherit cmake-multilib python-any-r1 toolchain-funcs + +DESCRIPTION="C++ HTTP/HTTPS server and client library" +HOMEPAGE="https://github.com/yhirose/cpp-httplib/" + +if [[ "${PV}" == *9999* ]] ; then + inherit git-r3 + + EGIT_REPO_URI="https://github.com/yhirose/${PN}.git" +else + SRC_URI="https://github.com/yhirose/${PN}/archive/v${PV}.tar.gz + -> ${P}.tar.gz" + + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +fi + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" # soversion + +IUSE="brotli ssl test zlib" +REQUIRED_USE="test? ( brotli ssl zlib )" +RESTRICT="!test? ( test )" + +RDEPEND=" + brotli? ( + app-arch/brotli:=[${MULTILIB_USEDEP}] + ) + ssl? ( + >=dev-libs/openssl-3.0.13:=[${MULTILIB_USEDEP}] + ) + zlib? ( + sys-libs/zlib[${MULTILIB_USEDEP}] + ) +" +DEPEND=" + ${RDEPEND} +" +BDEPEND=" + ${PYTHON_DEPS} +" + +src_configure() { + local -a mycmakeargs=( + -DHTTPLIB_COMPILE=yes + -DBUILD_SHARED_LIBS=yes + -DHTTPLIB_USE_BROTLI_IF_AVAILABLE=no + -DHTTPLIB_USE_OPENSSL_IF_AVAILABLE=no + -DHTTPLIB_USE_ZLIB_IF_AVAILABLE=no + -DHTTPLIB_REQUIRE_BROTLI=$(usex brotli) + -DHTTPLIB_REQUIRE_OPENSSL=$(usex ssl) + -DHTTPLIB_REQUIRE_ZLIB=$(usex zlib) + -DPython3_EXECUTABLE="${PYTHON}" + ) + cmake-multilib_src_configure +} + +multilib_src_test() { + cp -p -R --reflink=auto "${S}/test" ./test || die + + local -a failing_tests=( + # Disable all online tests. + "*.*_Online" + + # Fails on musl x86: + ServerTest.GetRangeWithMaxLongLength + ServerTest.GetStreamedWithTooManyRanges + + # https://github.com/yhirose/cpp-httplib/issues/1798 + # Filed by mgorny's testing, fails on openssl >=3.2: + SSLClientServerTest.ClientCertPresent + SSLClientServerTest.ClientEncryptedCertPresent + SSLClientServerTest.CustomizeServerSSLCtx + SSLClientServerTest.MemoryClientCertPresent + SSLClientServerTest.MemoryClientEncryptedCertPresent + SSLClientServerTest.TrustDirOptional + ) + + # Little dance to please the GTEST filter (join array using ":"). + failing_tests_str="${failing_tests[@]}" + failing_tests_filter="${failing_tests_str// /:}" + + # PREFIX is . to avoid calling "brew" and relying on stuff in /opt + GTEST_FILTER="-${failing_tests_filter}" emake -C test \ + CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS} -I." PREFIX=. +} diff --git a/dev-cpp/cpp-httplib/cpp-httplib-0.16.3.ebuild b/dev-cpp/cpp-httplib/cpp-httplib-0.16.3.ebuild new file mode 100644 index 000000000000..43d66265bb25 --- /dev/null +++ b/dev-cpp/cpp-httplib/cpp-httplib-0.16.3.ebuild @@ -0,0 +1,92 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{11..13} ) + +inherit cmake-multilib python-any-r1 toolchain-funcs + +DESCRIPTION="C++ HTTP/HTTPS server and client library" +HOMEPAGE="https://github.com/yhirose/cpp-httplib/" + +if [[ "${PV}" == *9999* ]] ; then + inherit git-r3 + + EGIT_REPO_URI="https://github.com/yhirose/${PN}.git" +else + SRC_URI="https://github.com/yhirose/${PN}/archive/v${PV}.tar.gz + -> ${P}.tar.gz" + + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +fi + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" # soversion + +IUSE="brotli ssl test zlib" +REQUIRED_USE="test? ( brotli ssl zlib )" +RESTRICT="!test? ( test )" + +RDEPEND=" + brotli? ( + app-arch/brotli:=[${MULTILIB_USEDEP}] + ) + ssl? ( + >=dev-libs/openssl-3.0.13:=[${MULTILIB_USEDEP}] + ) + zlib? ( + sys-libs/zlib[${MULTILIB_USEDEP}] + ) +" +DEPEND=" + ${RDEPEND} +" +BDEPEND=" + ${PYTHON_DEPS} +" + +src_configure() { + local -a mycmakeargs=( + -DHTTPLIB_COMPILE=yes + -DBUILD_SHARED_LIBS=yes + -DHTTPLIB_USE_BROTLI_IF_AVAILABLE=no + -DHTTPLIB_USE_OPENSSL_IF_AVAILABLE=no + -DHTTPLIB_USE_ZLIB_IF_AVAILABLE=no + -DHTTPLIB_REQUIRE_BROTLI=$(usex brotli) + -DHTTPLIB_REQUIRE_OPENSSL=$(usex ssl) + -DHTTPLIB_REQUIRE_ZLIB=$(usex zlib) + -DPython3_EXECUTABLE="${PYTHON}" + ) + cmake-multilib_src_configure +} + +multilib_src_test() { + cp -p -R --reflink=auto "${S}/test" ./test || die + + local -a failing_tests=( + # Disable all online tests. + "*.*_Online" + + # Fails on musl x86: + ServerTest.GetRangeWithMaxLongLength + ServerTest.GetStreamedWithTooManyRanges + + # https://github.com/yhirose/cpp-httplib/issues/1798 + # Filed by mgorny's testing, fails on openssl >=3.2: + SSLClientServerTest.ClientCertPresent + SSLClientServerTest.ClientEncryptedCertPresent + SSLClientServerTest.CustomizeServerSSLCtx + SSLClientServerTest.MemoryClientCertPresent + SSLClientServerTest.MemoryClientEncryptedCertPresent + SSLClientServerTest.TrustDirOptional + ) + + # Little dance to please the GTEST filter (join array using ":"). + failing_tests_str="${failing_tests[@]}" + failing_tests_filter="${failing_tests_str// /:}" + + # PREFIX is . to avoid calling "brew" and relying on stuff in /opt + GTEST_FILTER="-${failing_tests_filter}" emake -C test \ + CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS} -I." PREFIX=. +} diff --git a/dev-cpp/cppdap/Manifest b/dev-cpp/cppdap/Manifest index bedc0f1d2c09..aed7ddb0e28d 100644 --- a/dev-cpp/cppdap/Manifest +++ b/dev-cpp/cppdap/Manifest @@ -1,4 +1,6 @@ DIST cppdap-0_pre20230605.tar.gz 100715 BLAKE2B a7b6f745b7445242544deb2cd5b93bb13ee0faefe083a5e435d9a608fb453aceef1746738beb35678833f69521e637f2b8ca47fccd3e292a56e8a74c6435df86 SHA512 034f6282e992ec346715f84da1817a699937be174ab0ea09f750a693bed158b87ec6920e0ed1f7340ef5232e9634c5aebccd78527adde34b8abc4ff00c5f617e +DIST cppdap-0_pre20240802.tar.gz 101733 BLAKE2B 18302d37493ab38b579b0a00756e18efbaa1620e705e2bb54b24ccb3388837ea8aed28c880b358b670006f84ccb7df036125d1c2f7bb210ba51fa0caebef0759 SHA512 2432c2b413d956661342555a50ab2ed4cdf86de5e7bbda0822a2e7359ad034a0b0150bb6b98dff0d1a3d64e89cd8de67a7a620dd4c9e220a7ed1f9f80e5a36e6 DIST cppdap-gtest-0a03480824b4fc7883255dbd2fd8940c9f81e22e.tar.gz 874709 BLAKE2B 706e6d168e080494ac63cf607c189f55f5e98100fd744dd184a8217173f66891aedb8779a9c8b0aa289889d1f73e18c50ef65d8c70228e2a795a5e5081f66894 SHA512 55867a2e39647a7846506446d642dcd740711dee8c0dfe25887fd6ad361161617f3d462bdb415dfba20693849949c022e97e2de65dd731cc63b9466edd1c8b87 EBUILD cppdap-0_pre20230605-r1.ebuild 1432 BLAKE2B 73b55cdc52822fc2b6f4a0af4ff7771927c90393d3fdd467e303caa2a5eb4cd71c2f95b41606e62f7e39112917fb888553226b7bee3849480c1787f5777be3dd SHA512 2eb49dcf1a932b9a8ccdd0aa777d57f01aac7a06a811a83354dde8b9ab0b213df80a72c3e68577d12211028342fa10521de7bc9a48282772af5d108298274730 +EBUILD cppdap-0_pre20240802.ebuild 1079 BLAKE2B ad944b06d388a8b0ca7b2134e909b4143ac097f760cd395bfacb07a64a73b340e377c93e0f329512d2293ed2baa2c50d6415dc0a9a6b501c7c1be6b4b0610112 SHA512 1e41befa4de233877d001e4aeb7685a61ec6abb58b6544885e514d37f0e0fa1492a9fb178edd533d366c936f966cc476784a697d98f7a47d43a4329d8c4859b2 MISC metadata.xml 336 BLAKE2B 1af53ad3c19922104b16ccdce9681ed7f3ec0b7629ff10864504f040e13d230668b945e912689dfab11ce3db908de1b57cf6a64ad5355b4ace02a81490cf3bed SHA512 15ccaee98d37b7fa915a9fd209cc9bdece01f3935714347ff8e261d66922a6bffd50df1017c75cedb0050883c7def7ad7d9d2f6ddd55116f7c8e73786d92af89 diff --git a/dev-cpp/cppdap/cppdap-0_pre20240802.ebuild b/dev-cpp/cppdap/cppdap-0_pre20240802.ebuild new file mode 100644 index 000000000000..a590a1f1bc61 --- /dev/null +++ b/dev-cpp/cppdap/cppdap-0_pre20240802.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +# See https://github.com/google/cppdap/issues/113 re no release +CPPDAP_COMMIT="c69444ed76f7468b232ac4f989cb8f2bdc100185" + +DESCRIPTION="C++ library for the Debug Adapter Protocol" +HOMEPAGE="https://github.com/google/cppdap" +SRC_URI="https://github.com/google/cppdap/archive/${CPPDAP_COMMIT}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}"/${PN}-${CPPDAP_COMMIT} + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND="dev-cpp/nlohmann_json" +DEPEND=" + ${RDEPEND} + test? ( dev-cpp/gtest ) +" + +src_configure() { + local mycmakeargs=( + # Per README, could use rapidjson or jsoncpp instead. + -DCPPDAP_USE_EXTERNAL_NLOHMANN_JSON_PACKAGE=ON + -DCPPDAP_USE_EXTERNAL_RAPIDJSON_PACKAGE=OFF + -DCPPDAP_USE_EXTERNAL_JSONCPP_PACKAGE=OFF + + -DCPPDAP_BUILD_TESTS=$(usex test) + -DCPPDAP_USE_EXTERNAL_GTEST_PACKAGE=ON + ) + + cmake_src_configure +} + +src_test() { + cd "${BUILD_DIR}" || die + ./cppdap-unittests || die +} diff --git a/dev-cpp/ctemplate/Manifest b/dev-cpp/ctemplate/Manifest index 3c56ffb05648..590c780166e1 100644 --- a/dev-cpp/ctemplate/Manifest +++ b/dev-cpp/ctemplate/Manifest @@ -1,4 +1,4 @@ AUX 70ctemplate-gentoo.el 282 BLAKE2B 6004cc2b2e543f47c0c808bf494160c4b7e7e4768a954c1b0d99bc065a89145875dfc2b1e386bdf3a5e4dbb375a0bf5badc45b1666320f2a00fa8bd108f16c09 SHA512 36bc5424cb6dce40026f1d08b8764bf43d42159ff20e7d81484f5baf1c1e3c2042c12b1a60fc3cef48e297e816a12dbc41169988a6537ee41a2e2528b3c834a3 DIST ctemplate-2.4.tar.gz 391923 BLAKE2B 96b585ed6ca323fc461857e1f2f381e0ca5c229d8c6039c24efcf34fb9ddf45cc36bef141af337e591e1cdd95ca510ea5ba1e539554322c578c25187b1906195 SHA512 4955489e7327bce18802d50fd9dfc8ac12af685e556d1c9d0eb2b7a2f4a9b6086e30be8388d694ec8912623738973d0c76e9ca97196c63c139ee5b468d4858b7 -EBUILD ctemplate-2.4.ebuild 1521 BLAKE2B 30641f29e497249c68c92612b14ce681ae765c0de7db3022124bd9ea5b629a91f1319916026254c0146ac677ba5a9c069492f50f51a316838ae8e9b1408e40a8 SHA512 46262f7a5a85774f10ce16b9ad1afd1c2df500177a3dafbd6fb69e554f259fcb6f01dba849259bc2e24d82328d4f947592a74832ed3b179454835791d123c01b +EBUILD ctemplate-2.4.ebuild 1651 BLAKE2B 6a44571e567c38aa553c0a02873a9bc0406486cad98f562bc1ec2f0cfc5b8a06bad0c193a4d31a8b2b6249afdc86ffab1a2be9bdced439eeba42e5c6a975bf22 SHA512 34351348512026c0ef0cbfaaffd0f7e21b454289fcaf9e68765221cc4d2bb31e917b31fd2c21d5f5aa8ba261d07054d77076317cbf4f6018fb59a169c700c485 MISC metadata.xml 314 BLAKE2B f6d4b334aa6c7bdc8e813da5170b39f55d111fc1112595fc5000f7b05866a518141d514e6496ad4bfef4c818646bfdccec88fe73a6caf1912c8cf65fb064b1ff SHA512 e9f7539c69d3a229e776513eddddc9a8b7151e4dea8d2782335f169d5a988c8f1e7e28fc3698832bc1fae58d47e5274d608e3ce5772a69bac1a2f4000c39e656 diff --git a/dev-cpp/ctemplate/ctemplate-2.4.ebuild b/dev-cpp/ctemplate/ctemplate-2.4.ebuild index b1a2a9d2775c..8224d19db62c 100644 --- a/dev-cpp/ctemplate/ctemplate-2.4.ebuild +++ b/dev-cpp/ctemplate/ctemplate-2.4.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..13} ) -inherit autotools elisp-common python-any-r1 +inherit autotools elisp-common flag-o-matic python-any-r1 DESCRIPTION="A simple but powerful template language for C++" HOMEPAGE="https://github.com/olafvdspek/ctemplate" @@ -33,6 +33,11 @@ src_prepare() { } src_configure() { + # -Werror=odr + # https://bugs.gentoo.org/924637 + # https://github.com/OlafvdSpek/ctemplate/issues/157 + filter-lto + econf $(use_enable static-libs static) } diff --git a/dev-cpp/eigen/Manifest b/dev-cpp/eigen/Manifest index 99e3e0d4e34e..530d9bf67e93 100644 --- a/dev-cpp/eigen/Manifest +++ b/dev-cpp/eigen/Manifest @@ -4,11 +4,13 @@ AUX eigen-3.4.0-buildstring.patch 716 BLAKE2B f9453cab7a7e4609b5801b7f8470bac2ed AUX eigen-3.4.0-cxxstandard.patch 4274 BLAKE2B cd837966150b4cdd6a4080aba0b58785401adf03e3273b83cd03b4b999795b8d87419e31ed27e018feefda659627a3d62b538f7379de13c85fabfbcbdf9fa9f4 SHA512 473ea735425534403f6f66d1e3601e1fcaf6e1f2558f6b1b9695a69e05a4769d0951d4174d99f8853f3a0176d7c7722cbfb9942459da07bbe1636fd4cc847f95 AUX eigen-3.4.0-doc-nocompress.patch 873 BLAKE2B 0458b8e4c03fb8ef3f4ecd74d9f285ca8aa3787a0fd466922f45cb96386c8c5cd35116db4ab2caddc841e47cbf2678594ebf727153804878761dc455f08c2c81 SHA512 a4763cb037a16c12dc3d6a6ac075c7ff130ea9d2913f76472e61d821e45cfcce446ad11e43426227e7b60268a14cd952ee81104ca594c3710bde56d655f910b0 AUX eigen-3.4.0-noansi.patch 729 BLAKE2B 60088bddb6d79992e1f559f4977e6f51082cb6e382b6f481ef54b65d4db9c8042422ad3b26479f67151bf4455d448a59bebeada2cb651a32e7eafe86165ee1bf SHA512 a07851b377da8d927f27dd624a071a17176e76667bc2a38ef54820b7515fb7b0dffdb11200b7e85e10008b7bb69adafa3f4cae7fa237a1cb4c97f2b9ea2a9247 +AUX eigen-3.4.0-ppc-no-vsx.patch 6739 BLAKE2B 9b61a58c671353de4a8675af62d4168c8ec90164c58d159342c81cbd9d5823b08da7235ae5cbd9d316dcf4f3e200e61c3f61cb747b33d53e78b2f595b51c154b SHA512 f1788bc2893b2bc6929d564f0e7fa420e5c8b2829092c247bf9f38289d8f745e6c1f6a7a43bcb2ca8a6a5a0a1067acd20751506fc09e5b996f9aca9b700b5ab3 AUX eigen-9999-please_protect_your_min_with_parentheses.patch 1979 BLAKE2B 50da0559d66338af6d27b8fd8ec5b1273e27bda992e40db62044c1d6a8cc4a066f0d9c9ca2061af4384decaaa7ebe4a4964c8c7dfb4e1b2abca10a1c9e9e2715 SHA512 a0ecb745768e2118af687c6b316520c782f23e43fc33f603b06c5bd9bea141161d9547eacdd16f0038ba49c0307670a7549d3ba570b54b8d44d3a96a94895ff0 DIST eigen-3.4.0.tar.bz2 2143091 BLAKE2B a32aac13cbab68cfaaa252d8a406e6a36ecfd1239361412b1f9baa08284a94467479c08ffae10cb847e9916472b46b1c1af4efbf81f957c8200a4379acd42c42 SHA512 cc488eb111e0e248744d2bc4475b345b5fb82361dff226a5b73a33bd0388de8c219cff8cffcf8f476b672fc0e223f339e8c6a1cfb6293840a4a6abf232438a89 DIST eigen-3.4.0.tar.gz 2705005 BLAKE2B ae5f774a6ed36f52cf9fc3206e50796abacbba69fd0f67cd5759b4e04d847aa656861d5e06e6cd0d798a17f2b06abdb70b16f795a626bdd29edcc872c33821f8 SHA512 ba75ecb760e32acf4ceaf27115468e65d4f77c44f8d519b5a13e7940af2c03a304ad433368cb6d55431f307c5c39e2666ab41d34442db3cf441638e51f5c3b6a DIST eigen-lapack_addons-3.4.1.tgz 6215074 BLAKE2B 564c3398de1f4ea249b58957a482cda0b5eb99e5021e1f18abf3b4d2893fed48912bfa8386681fcae03dd933eea91644f7429d47a53684d64462209a6ae76f30 SHA512 5a827d0befb521cb430f0d63f5000e7955359bc637cdb7292d942712e98c0702570a5b650a72fc609bf5b43633661c0e51de7761ae892df6ff0aab667f436edf EBUILD eigen-3.4.0-r1.ebuild 2588 BLAKE2B b24a464408f8f03282db44144e07080a0bac0b71a38d0847af12f8e506d218f437ebfba0b8ba5ccb654c4d317ecb8006ed02f0b63673038a5f91ed35968762ca SHA512 be51f2e62f6f954365dadefb1e33d7dd5bb094ff33d954b75ab1bbd2a1d0d8e54a673bb44040608668bbe5d936dd16e169cd5b16e9a3fdbe61fdc11a21ccc870 EBUILD eigen-3.4.0-r2.ebuild 12325 BLAKE2B d1ca7a402652d4e02573bed1e752b41308b8e96e86259cbf6238a514602d848bd50b1da806b3eca71d42cfecc153ebaf8dc498adb1c171e3a4dd64312350ca17 SHA512 30d8749e5ce808e8c70fdd6ce5d82a2c0d16eb1be303dbf4da0ed93743b7874549d1ec7700205d2b3c7712eb8d0cfa91d093155ac2f602400fd5202c0c552de8 +EBUILD eigen-3.4.0-r3.ebuild 12384 BLAKE2B 20fac08e54380979ab413ac4d9a6939298c38130a06131d0dddf9ae72bd7b63a47a9effb3296eaf047ad885874bb53ff9853af5720be12dc0a7efc9a5a8c14cd SHA512 a7891132bffb927458c0505d551437c6e6d5cd2b6866a2fbc0c7b190eb28ae5b33936088fdf119a613eb1d1e07d48ec5b97fcb312a0b6c3bf436855c47a63c30 EBUILD eigen-9999.ebuild 11683 BLAKE2B 405987f4e22b99670a07c7a593f1f33317e6b3d8e44f111757145f63ead1a36247e4c4feb6a4078590c277e0d46ce04a305771221ac64ac75e7daaa14c25f95d SHA512 60d8ead0d69e9cebb415e2682f89dda1be3bce484c18505ba7bec1ea38653663b58d3d729b3ac5e34d3d11d0c958a6050bc4d19faf51fbeab2e13b9914952532 MISC metadata.xml 2122 BLAKE2B ce2287db5f80ce761bc100cc0f6fe3dd549dda68853f0fc40d362e9dce72d5a5398b3d2b9562aa8feafc5b869adaab78a87b65499404df072c35d353ec2f5cd8 SHA512 446fe2316a72f8c058445f4c14bfe4683476f1a041d9af55ab3d1f76b4e2b6e83d0f7aad4a7febcd7c4c5bdfdf1efc30483aaa276ace6ac941488ee3d137c5c7 diff --git a/dev-cpp/eigen/eigen-3.4.0-r3.ebuild b/dev-cpp/eigen/eigen-3.4.0-r3.ebuild new file mode 100644 index 000000000000..91904f16f7ab --- /dev/null +++ b/dev-cpp/eigen/eigen-3.4.0-r3.ebuild @@ -0,0 +1,458 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +FORTRAN_NEEDED="test" +inherit cmake cuda fortran-2 llvm toolchain-funcs + +DESCRIPTION="C++ template library for linear algebra" +HOMEPAGE="https://eigen.tuxfamily.org/index.php?title=Main_Page" + +if [[ ${PV} = *9999* ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://gitlab.com/lib${PN}/${PN}.git" + if [[ ${PV} = 3.4.9999* ]] ; then + EGIT_COMMIT="3.4" + fi +else + SRC_URI=" + https://gitlab.com/lib${PN}/${PN}/-/archive/${PV}/${P}.tar.bz2 + test? ( lapack? ( https://downloads.tuxfamily.org/${PN}/lapack_addons_3.4.1.tgz -> ${PN}-lapack_addons-3.4.1.tgz ) ) + " + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" +fi + +LICENSE="MPL-2.0" +SLOT="3" + +# The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications +ARM_CPU_FEATURES=( + neon:NEON +) +PPC_CPU_FEATURES=( + altivec:ALTIVEC + vsx:VSX +) +X86_CPU_FEATURES=( + avx:AVX + avx2:AVX2 + avx512f:AVX512 + avx512dq:AVX512DQ + f16c:FP16C + fma3:FMA + popcnt:POPCNT + sse:SSE + sse2:SSE2 + sse3:SSE3 + ssse3:SSSE3 + sse4_1:SSE4_1 + sse4_2:SSE4_2 +) +# MIPS_CPU_FEATURES=( +# msa:MSA +# ) +# S390_CPU_FEATURES=( +# z13:Z13 +# z14:Z14 +# ) + +CPU_FEATURES_MAP=( + "${ARM_CPU_FEATURES[@]/#/cpu_flags_arm_}" + "${PPC_CPU_FEATURES[@]/#/cpu_flags_ppc_}" + "${X86_CPU_FEATURES[@]/#/cpu_flags_x86_}" + # "${MIPS_CPU_FEATURES[@]/#/cpu_flags_mips_}" + # "${S390_CPU_FEATURES[@]/#/cpu_flags_s390_}" +) + +IUSE_TEST_BACKENDS=( + "adolc" + "boost" + "cholmod" + "fftw" + "klu" + "opengl" + "openmp" + "pastix" + "sparsehash" + "spqr" + "superlu" + "umfpack" +) + +IUSE="${CPU_FEATURES_MAP[*]%:*} clang cuda hip debug doc lapack mathjax test ${IUSE_TEST_BACKENDS[*]}" #zvector + +# Tests failing again because of compiler issues +RESTRICT="!test? ( test )" + +BDEPEND=" + doc? ( + app-text/doxygen[dot] + dev-texlive/texlive-bibtexextra + dev-texlive/texlive-fontsextra + dev-texlive/texlive-fontutils + dev-texlive/texlive-latex + dev-texlive/texlive-latexextra + mathjax? ( dev-libs/mathjax ) + ) + test? ( virtual/pkgconfig ) +" + +# METIS +# MPREAL +# dev-libs/mpfr:0 +# dev-libs/gmp:0 + +TEST_BACKENDS=" + boost? ( dev-libs/boost ) + adolc? ( sci-libs/adolc[sparse] ) + cholmod? ( sci-libs/cholmod:= ) + fftw? ( sci-libs/fftw ) + spqr? ( sci-libs/spqr ) + klu? ( sci-libs/klu ) + opengl? ( + media-libs/freeglut + media-libs/glew + media-libs/libglvnd + ) + pastix? ( sci-libs/pastix[-mpi] ) + sparsehash? ( + amd64? ( dev-cpp/sparsehash ) + arm64? ( dev-cpp/sparsehash ) + ppc64? ( dev-cpp/sparsehash ) + x86? ( dev-cpp/sparsehash ) + ) + superlu? ( sci-libs/superlu ) + umfpack? ( sci-libs/umfpack ) +" +DEPEND=" + test? ( + cuda? ( + !clang? ( + dev-util/nvidia-cuda-toolkit + ) + clang? ( + sys-devel/clang[llvm_targets_NVPTX] + openmp? ( sys-libs/libomp[llvm_targets_NVPTX,offload] ) + ) + ) + hip? ( dev-util/hip ) + lapack? ( virtual/lapacke ) + ${TEST_BACKENDS} + ) +" + +REQUIRED_USE=" + test? ( !lapack ) + || ( ${IUSE_TEST_BACKENDS[*]} ) +" + +PATCHES=( + "${FILESDIR}/${PN}-3.3.9-max-macro.patch" + "${FILESDIR}/${PN}-3.4.0-doc-nocompress.patch" # bug 830064 + "${FILESDIR}/${PN}-3.4.0-buildstring.patch" + "${FILESDIR}/${PN}-3.4.0-noansi.patch" + "${FILESDIR}/${PN}-3.4.0-cxxstandard.patch" + "${FILESDIR}/${PN}-3.4.0-ppc-no-vsx.patch" # bug 936107 +) + +# TODO should be in cuda.eclass +cuda_set_CUDAHOSTCXX() { + local compiler + tc-is-gcc && compiler="gcc" + tc-is-clang && compiler="clang" + [[ -z "$compiler" ]] && die "no compiler specified" + + local package="sys-devel/${compiler}" + local version="${package}" + local CUDAHOSTCXX_test + while + CUDAHOSTCXX="${CUDAHOSTCXX_test}" + version=$(best_version "${version}") + if [[ -z "${version}" ]]; then + if [[ -z "${CUDAHOSTCXX}" ]]; then + die "could not find supported version of ${package}" + fi + break + fi + CUDAHOSTCXX_test="$( + dirname "$( + realpath "$( + which "${compiler}-$(echo "${version}" | grep -oP "(?<=${package}-)[0-9]*")" + )" + )" + )" + version="<${version}" + do ! echo "int main(){}" | nvcc "-ccbin ${CUDAHOSTCXX_test}" - -x cu &>/dev/null; done + + export CUDAHOSTCXX +} + +pkg_setup() { + use test && use cuda && use clang && llvm_pkg_setup +} + +src_unpack() { + if [[ ${PV} = *9999* ]] ; then + git-r3_src_unpack + else + unpack "${P}.tar.bz2" + + if use test && use lapack; then + cd "${S}/lapack" || die + unpack "${PN}-lapack_addons-3.4.1.tgz" + fi + fi +} + +src_prepare() { + cmake_src_prepare + + sed \ + -e "/add_subdirectory(bench\/spbench/s/^/#DONOTCOMPILE /g" \ + -e "/add_subdirectory(demos/s/^/#DONOTCOMPILE /g" \ + -i CMakeLists.txt || die + + if ! use test; then + sed \ + -e "/add_subdirectory(test/s/^/#DONOTCOMPILE /g" \ + -e "/add_subdirectory(scripts/s/^/#DONOTCOMPILE /g" \ + -e "/add_subdirectory(failtest/s/^/#DONOTCOMPILE /g" \ + -e "/add_subdirectory(blas/s/^/#DONOTCOMPILE /g" \ + -e "/add_subdirectory(lapack/s/^/#DONOTCOMPILE /g" \ + -i CMakeLists.txt || die + fi +} + +src_configure() { + local mycmakeargs=( + -DBUILD_SHARED_LIBS="yes" + -DBUILD_TESTING="$(usex test)" + + -DEIGEN_BUILD_DOC="$(usex doc)" # Enable creation of Eigen documentation + -DEIGEN_BUILD_PKGCONFIG="yes" # Build pkg-config .pc file for Eigen + ) + if use doc || use test; then + mycmakeargs+=( + # needs Qt4 + -DEIGEN_TEST_NOQT="yes" # Disable Qt support in unit tests + ) + fi + + if use doc; then + mycmakeargs+=( + -DEIGEN_DOC_USE_MATHJAX="$(usex mathjax)" # Use MathJax for rendering math in HTML docs + -DEIGEN_INTERNAL_DOCUMENTATION=no # Build internal documentation + ) + fi + + if use test; then + mycmakeargs+=( + # the OpenGL testsuite is extremely brittle, bug #712808 + -DOpenGL_GL_PREFERENCE="GLVND" + -DEIGEN_TEST_OPENGL="$(usex opengl)" # Enable OpenGL support in unit tests + -DEIGEN_TEST_OPENMP="$(usex openmp)" # Enable/Disable OpenMP in tests/examples + + -DCMAKE_DISABLE_FIND_PACKAGE_MPREAL=ON + + -DEIGEN_TEST_CXX11=yes + + # -DEIGEN_TEST_CUSTOM_CXX_FLAGS= # Additional compiler flags when compiling unit tests. + # -DEIGEN_TEST_CUSTOM_LINKER_FLAGS= # Additional linker flags when linking unit tests. + # -DEIGEN_TEST_BUILD_FLAGS= # Options passed to the build command of unit tests + + # -DEIGEN_BUILD_BTL=yes # Build benchmark suite + + -DEIGEN_TEST_BUILD_DOCUMENTATION="$(usex doc)" # Test building the doxygen documentation + + # -DEIGEN_COVERAGE_TESTING=no # Enable/disable gcov + # -DEIGEN_CTEST_ERROR_EXCEPTION= # Regular expression for build error messages to be filtered out + # -DEIGEN_DEBUG_ASSERTS=no # Enable advanced debugging of assertions + # -DEIGEN_NO_ASSERTION_CHECKING=no # Disable checking of assertions using exceptions + # -DEIGEN_TEST_NO_EXCEPTIONS=no # Disables C++ exceptions + # -DEIGEN_TEST_NO_EXPLICIT_ALIGNMENT=no # Disable explicit alignment (hence vectorization) in tests/examples + # -DEIGEN_TEST_NO_EXPLICIT_VECTORIZATION=no # Disable explicit vectorization in tests/examples + + # -DEIGEN_DASHBOARD_BUILD_TARGET=buildtests # Target to be built in dashboard mode, default is buildtests + + # -DEIGEN_DEFAULT_TO_ROW_MAJOR=no # Use row-major as default matrix storage order + + # -DEIGEN_TEST_MATRIX_DIR=yes # Enable testing of realword sparse matrices contained in the specified path + # -DEIGEN_TEST_MAX_SIZE=320 # Maximal matrix/vector size, default is 320 + # -DEIGEN_SPLIT_LARGE_TESTS=no # Split large tests into smaller executables + ) + + use !adolc && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Adolc="TRUE" ) + use !boost && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Boost="TRUE" ) + use !cholmod && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_CHOLMOD="TRUE" ) + use !fftw && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_FFTW="TRUE" ) + use !sparsehash && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_GoogleHash="TRUE" ) + use !klu && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KLU="TRUE" ) + use !opengl && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_OpenGL="TRUE" ) + use !openmp && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_OpenMP="TRUE" ) + use !pastix && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_PASTIX="TRUE" ) + use !spqr && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_SPQR="TRUE" ) + use !superlu && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_SuperLU="TRUE" ) + use !umfpack && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_UMFPACK="TRUE" ) + + if use lapack; then + mycmakeargs+=( + -DEIGEN_ENABLE_LAPACK_TESTS=yes + -DEIGEN_TEST_EXTERNAL_BLAS=yes # Use external BLAS library for testsuite + -DCMAKE_DISABLE_FIND_PACKAGE_SuperLU=ON + ) + fi + + if use arm; then + mycmakeargs+=( + -DEIGEN_TEST_NEON="$(usex cpu_flags_arm_neon)" + ) + fi + + if use arm64; then + mycmakeargs+=( + -DEIGEN_TEST_NEON64="$(usex cpu_flags_arm_neon)" + ) + fi + + if use ppc || use ppc64; then + mycmakeargs+=( + -DEIGEN_TEST_ALTIVEC="$(usex cpu_flags_ppc_altivec)" + -DEIGEN_TEST_VSX="$(usex cpu_flags_ppc_vsx)" + ) + fi + + if use amd64 || use x86; then + mycmakeargs+=( + # -DEIGEN_TEST_32BIT=no # Force generating 32bit code. + # -DEIGEN_TEST_X87=no # Force using X87 instructions. Implies no vectorization. + -DEIGEN_TEST_SSE2="$(usex cpu_flags_x86_sse2)" + -DEIGEN_TEST_SSE3="$(usex cpu_flags_x86_sse3)" + -DEIGEN_TEST_SSSE3="$(usex cpu_flags_x86_ssse3)" + -DEIGEN_TEST_FMA="$(usex cpu_flags_x86_fma3)" + -DEIGEN_TEST_SSE4_1="$(usex cpu_flags_x86_sse4_1)" + -DEIGEN_TEST_SSE4_2="$(usex cpu_flags_x86_sse4_2)" + -DEIGEN_TEST_AVX="$(usex cpu_flags_x86_avx)" + -DEIGEN_TEST_F16C="$(usex cpu_flags_x86_f16c)" + -DEIGEN_TEST_AVX2="$(usex cpu_flags_x86_avx2)" + -DEIGEN_TEST_AVX512="$(usex cpu_flags_x86_avx512f)" + -DEIGEN_TEST_AVX512DQ="$(usex cpu_flags_x86_avx512dq)" + ) + fi + + if use mips; then + mycmakeargs+=( + # -DEIGEN_TEST_MSA=no # Enable/Disable MSA in tests/examples + ) + fi + + if use s390; then + mycmakeargs+=( + # -DEIGEN_TEST_Z13=no # Enable/Disable S390X(zEC13) ZVECTOR in tests/examples + # -DEIGEN_TEST_Z14=no # Enable/Disable S390X(zEC14) ZVECTOR in tests/examples + ) + fi + + mycmakeargs+=( + -DEIGEN_TEST_CUDA="$(usex cuda)" # Enable CUDA support in unit tests + -DEIGEN_TEST_CUDA_CLANG="$(usex cuda "$(usex clang)")" # Use clang instead of nvcc to compile the CUDA tests + + -DEIGEN_TEST_HIP="$(usex hip)" # Add HIP support. + + # -DEIGEN_TEST_SYCL=no # Add Sycl support. + # -DEIGEN_SYCL_TRISYCL=no # Use the triSYCL Sycl implementation (ComputeCPP by default). + ) + + if use cuda; then + cuda_add_sandbox -w + if use clang; then + local llvm_prefix + llvm_prefix="$(get_llvm_prefix -b)" + export CC="${llvm_prefix}/bin/clang" + export CXX="${llvm_prefix}/bin/clang++" + export LIBRARY_PATH="${ESYSROOT}/usr/$(get_libdir)" + else + cuda_set_CUDAHOSTCXX + mycmakeargs+=( + -DCUDA_HOST_COMPILER="${CUDAHOSTCXX}" + ) + fi + if [[ "${CUDA_VERBOSE}" == true ]]; then + mycmakeargs+=( + -DCUDA_VERBOSE_BUILD=yes + ) + NVCCFLAGS+=" -v" + fi + + export CUDAFLAGS="${NVCCFLAGS}" + + [[ -z "${CUDAARCHS}" ]] && einfo "trying to determine host CUDAARCHS" + : "${CUDAARCHS:=$(__nvcc_device_query)}" + export CUDAARCHS + + mycmakeargs+=( + -DEIGEN_CUDA_COMPUTE_ARCH="${CUDAARCHS}" + ) + fi + fi + + cmake_src_configure +} + +src_compile() { + local targets=() + if use doc; then + targets+=( doc ) + HTML_DOCS=( "${BUILD_DIR}"/doc/html/. ) + fi + if use test; then + targets+=( buildtests ) + if ! use lapack; then + targets+=( blas ) + fi + # tests generate random data, which + # obviously fails for some seeds + export EIGEN_SEED=712808 + fi + + if use doc || use test; then + cmake_src_compile "${targets[@]}" + fi +} + +src_test() { + CMAKE_SKIP_TESTS=( + product_small_32 # 143 (Subprocess aborted) + product_small_33 # 144 (Subprocess aborted) + + eigensolver_selfadjoint_13 # 452 (Subprocess aborted) + + cholmod_support_21 # 726 (Subprocess aborted) + cholmod_support_22 # 727 (Subprocess aborted) + + NonLinearOptimization # 930 (Subprocess aborted) + openglsupport # 990 (Failed) + levenberg_marquardt # 1020 (Subprocess aborted) + ) + + if use cuda ; then + cuda_add_sandbox -w + + CMAKE_SKIP_TESTS+=( + cxx11_tensor_cast_float16_gpu + cxx11_tensor_gpu_5 + ) + fi + + if use lapack ; then + CMAKE_SKIP_TESTS+=( + "^LAPACK-.*$" + ) + fi + + local myctestargs=( + -j1 # otherwise breaks due to cmake reruns + ) + + cmake_src_test +} diff --git a/dev-cpp/eigen/files/eigen-3.4.0-ppc-no-vsx.patch b/dev-cpp/eigen/files/eigen-3.4.0-ppc-no-vsx.patch new file mode 100644 index 000000000000..7cfeaaf129ff --- /dev/null +++ b/dev-cpp/eigen/files/eigen-3.4.0-ppc-no-vsx.patch @@ -0,0 +1,195 @@ +https://gitlab.com/libeigen/eigen/-/merge_requests/1028 +https://bugs.gentoo.org/936107 +--- a/Eigen/Core ++++ b/Eigen/Core +@@ -346,7 +346,7 @@ + #include "src/Core/CoreIterators.h" + #include "src/Core/ConditionEstimator.h" + +-#if defined(EIGEN_VECTORIZE_ALTIVEC) || defined(EIGEN_VECTORIZE_VSX) ++#if defined(EIGEN_VECTORIZE_VSX) + #include "src/Core/arch/AltiVec/MatrixProduct.h" + #elif defined EIGEN_VECTORIZE_NEON + #include "src/Core/arch/NEON/GeneralBlockPanelKernel.h" +--- a/Eigen/src/Core/arch/AltiVec/Complex.h ++++ b/Eigen/src/Core/arch/AltiVec/Complex.h +@@ -100,6 +100,7 @@ + HasAbs2 = 0, + HasMin = 0, + HasMax = 0, ++ HasSqrt = 1, + #ifdef __VSX__ + HasBlend = 1, + #endif +@@ -320,6 +321,7 @@ + HasAbs2 = 0, + HasMin = 0, + HasMax = 0, ++ HasSqrt = 1, + HasSetLinear = 0 + }; + }; +--- a/Eigen/src/Core/arch/AltiVec/MathFunctions.h ++++ b/Eigen/src/Core/arch/AltiVec/MathFunctions.h +@@ -40,16 +40,14 @@ + return pcos_float(_x); + } + ++#ifdef __VSX__ + #ifndef EIGEN_COMP_CLANG + template<> EIGEN_DEFINE_FUNCTION_ALLOWING_MULTIPLE_DEFINITIONS EIGEN_UNUSED + Packet4f prsqrt<Packet4f>(const Packet4f& x) + { + return vec_rsqrt(x); + } +-#endif + +-#ifdef __VSX__ +-#ifndef EIGEN_COMP_CLANG + template<> EIGEN_DEFINE_FUNCTION_ALLOWING_MULTIPLE_DEFINITIONS EIGEN_UNUSED + Packet2d prsqrt<Packet2d>(const Packet2d& x) + { +@@ -74,6 +72,26 @@ + { + return pexp_double(_x); + } ++ ++template<> EIGEN_STRONG_INLINE Packet8bf psqrt<Packet8bf> (const Packet8bf& a){ ++ BF16_TO_F32_UNARY_OP_WRAPPER(psqrt<Packet4f>, a); ++} ++ ++#ifndef EIGEN_COMP_CLANG ++template<> EIGEN_STRONG_INLINE Packet8bf prsqrt<Packet8bf> (const Packet8bf& a){ ++ BF16_TO_F32_UNARY_OP_WRAPPER(prsqrt<Packet4f>, a); ++} ++#endif ++#else ++template<> EIGEN_DEFINE_FUNCTION_ALLOWING_MULTIPLE_DEFINITIONS ++Packet4f psqrt<Packet4f>(const Packet4f& x) ++{ ++ Packet4f a; ++ for (Index i = 0; i < packet_traits<float>::size; i++) { ++ a[i] = numext::sqrt(x[i]); ++ } ++ return a; ++} + #endif + + // Hyperbolic Tangent function. +--- a/Eigen/src/Core/arch/AltiVec/PacketMath.h ++++ b/Eigen/src/Core/arch/AltiVec/PacketMath.h +@@ -175,16 +175,19 @@ + #else + HasRsqrt = 0, + #endif ++ HasTanh = EIGEN_FAST_MATH, ++ HasErf = EIGEN_FAST_MATH, ++ HasRint = 1, + #else + HasSqrt = 0, + HasRsqrt = 0, +- HasTanh = EIGEN_FAST_MATH, +- HasErf = EIGEN_FAST_MATH, ++ HasTanh = 0, ++ HasErf = 0, ++ HasRint = 0, + #endif + HasRound = 1, + HasFloor = 1, + HasCeil = 1, +- HasRint = 1, + HasNegate = 1, + HasBlend = 1 + }; +@@ -217,16 +220,17 @@ + #else + HasRsqrt = 0, + #endif ++ HasRint = 1, + #else + HasSqrt = 0, + HasRsqrt = 0, +- HasTanh = EIGEN_FAST_MATH, +- HasErf = EIGEN_FAST_MATH, ++ HasRint = 0, + #endif ++ HasTanh = 0, ++ HasErf = 0, + HasRound = 1, + HasFloor = 1, + HasCeil = 1, +- HasRint = 1, + HasNegate = 1, + HasBlend = 1 + }; +@@ -872,19 +876,29 @@ + return vec_nor(c,c); + } + ++#ifdef __VSX__ + template<> EIGEN_STRONG_INLINE Packet4i pcmp_le(const Packet4i& a, const Packet4i& b) { return reinterpret_cast<Packet4i>(vec_cmple(a,b)); } ++#endif + template<> EIGEN_STRONG_INLINE Packet4i pcmp_lt(const Packet4i& a, const Packet4i& b) { return reinterpret_cast<Packet4i>(vec_cmplt(a,b)); } + template<> EIGEN_STRONG_INLINE Packet4i pcmp_eq(const Packet4i& a, const Packet4i& b) { return reinterpret_cast<Packet4i>(vec_cmpeq(a,b)); } ++#ifdef __VSX__ + template<> EIGEN_STRONG_INLINE Packet8s pcmp_le(const Packet8s& a, const Packet8s& b) { return reinterpret_cast<Packet8s>(vec_cmple(a,b)); } ++#endif + template<> EIGEN_STRONG_INLINE Packet8s pcmp_lt(const Packet8s& a, const Packet8s& b) { return reinterpret_cast<Packet8s>(vec_cmplt(a,b)); } + template<> EIGEN_STRONG_INLINE Packet8s pcmp_eq(const Packet8s& a, const Packet8s& b) { return reinterpret_cast<Packet8s>(vec_cmpeq(a,b)); } ++#ifdef __VSX__ + template<> EIGEN_STRONG_INLINE Packet8us pcmp_le(const Packet8us& a, const Packet8us& b) { return reinterpret_cast<Packet8us>(vec_cmple(a,b)); } ++#endif + template<> EIGEN_STRONG_INLINE Packet8us pcmp_lt(const Packet8us& a, const Packet8us& b) { return reinterpret_cast<Packet8us>(vec_cmplt(a,b)); } + template<> EIGEN_STRONG_INLINE Packet8us pcmp_eq(const Packet8us& a, const Packet8us& b) { return reinterpret_cast<Packet8us>(vec_cmpeq(a,b)); } ++#ifdef __VSX__ + template<> EIGEN_STRONG_INLINE Packet16c pcmp_le(const Packet16c& a, const Packet16c& b) { return reinterpret_cast<Packet16c>(vec_cmple(a,b)); } ++#endif + template<> EIGEN_STRONG_INLINE Packet16c pcmp_lt(const Packet16c& a, const Packet16c& b) { return reinterpret_cast<Packet16c>(vec_cmplt(a,b)); } + template<> EIGEN_STRONG_INLINE Packet16c pcmp_eq(const Packet16c& a, const Packet16c& b) { return reinterpret_cast<Packet16c>(vec_cmpeq(a,b)); } ++#ifdef __VSX__ + template<> EIGEN_STRONG_INLINE Packet16uc pcmp_le(const Packet16uc& a, const Packet16uc& b) { return reinterpret_cast<Packet16uc>(vec_cmple(a,b)); } ++#endif + template<> EIGEN_STRONG_INLINE Packet16uc pcmp_lt(const Packet16uc& a, const Packet16uc& b) { return reinterpret_cast<Packet16uc>(vec_cmplt(a,b)); } + template<> EIGEN_STRONG_INLINE Packet16uc pcmp_eq(const Packet16uc& a, const Packet16uc& b) { return reinterpret_cast<Packet16uc>(vec_cmpeq(a,b)); } + +@@ -937,6 +951,7 @@ + } + template<> EIGEN_STRONG_INLINE Packet4f pceil<Packet4f>(const Packet4f& a) { return vec_ceil(a); } + template<> EIGEN_STRONG_INLINE Packet4f pfloor<Packet4f>(const Packet4f& a) { return vec_floor(a); } ++#ifdef __VSX__ + template<> EIGEN_STRONG_INLINE Packet4f print<Packet4f>(const Packet4f& a) + { + Packet4f res; +@@ -947,6 +962,7 @@ + + return res; + } ++#endif + + template<typename Packet> EIGEN_STRONG_INLINE Packet ploadu_common(const __UNPACK_TYPE__(Packet)* from) + { +@@ -1341,12 +1357,6 @@ + BF16_TO_F32_BINARY_OP_WRAPPER(psub<Packet4f>, a, b); + } + +-template<> EIGEN_STRONG_INLINE Packet8bf psqrt<Packet8bf> (const Packet8bf& a){ +- BF16_TO_F32_UNARY_OP_WRAPPER(vec_sqrt, a); +-} +-template<> EIGEN_STRONG_INLINE Packet8bf prsqrt<Packet8bf> (const Packet8bf& a){ +- BF16_TO_F32_UNARY_OP_WRAPPER(prsqrt<Packet4f>, a); +-} + template<> EIGEN_STRONG_INLINE Packet8bf pexp<Packet8bf> (const Packet8bf& a){ + BF16_TO_F32_UNARY_OP_WRAPPER(pexp_float, a); + } +@@ -1390,9 +1400,11 @@ + template<> EIGEN_STRONG_INLINE Packet8bf pround<Packet8bf> (const Packet8bf& a){ + BF16_TO_F32_UNARY_OP_WRAPPER(pround<Packet4f>, a); + } ++#ifdef __VSX__ + template<> EIGEN_STRONG_INLINE Packet8bf print<Packet8bf> (const Packet8bf& a){ + BF16_TO_F32_UNARY_OP_WRAPPER(print<Packet4f>, a); + } ++#endif + template<> EIGEN_STRONG_INLINE Packet8bf pmadd(const Packet8bf& a, const Packet8bf& b, const Packet8bf& c) { + Packet4f a_even = Bf16ToF32Even(a); + Packet4f a_odd = Bf16ToF32Odd(a); diff --git a/dev-cpp/glog/Manifest b/dev-cpp/glog/Manifest index fb6942c0a512..c9f7f21dc0b5 100644 --- a/dev-cpp/glog/Manifest +++ b/dev-cpp/glog/Manifest @@ -4,4 +4,4 @@ DIST glog-0.5.0.tar.gz 183346 BLAKE2B 9109a9a4bd3c74ba5d4c1d9ed44ffe0e16d5d3b9b1 DIST glog-0.6.0.tar.gz 193267 BLAKE2B b42112cdfd54280ce7a9592c3af6b6e10dcb854fe9dbe0db7445c60801d1c12a240c4b3709b45e41aedeb8876d2e08fc3368296e088be6a66126858888cc274e SHA512 fd2c42583d0dd72c790a8cf888f328a64447c5fb9d99b2e2a3833d70c102cb0eb9ae874632c2732424cc86216c8a076a3e24b23a793eaddb5da8a1dc52ba9226 EBUILD glog-0.5.0.ebuild 1506 BLAKE2B 869ed3d3b2be384250d53bcac744354dea33296667822d40227d317d9bd99135dc3edfb0b9632e66663569561af83ac665c17427ed3755e74ef2d865f4679078 SHA512 f9fa6fe43960ff1b61a3d2c50a28c6890bfa9427ba20cfa5760f2c0ecf9fefd6efd76bc52b5fe1de41a1bf58efae3239a3f0fa6759e3a5025e56124da1f40684 EBUILD glog-0.6.0.ebuild 1222 BLAKE2B 6a88a5648b71743b8b7124adfd94dc468ed6ebe44066455d3862b28306ca3dcf5ec182308f56375a7f54eb085fcdb211d89d23135cf45fd3d84e6661c51de0a9 SHA512 5cfbeb151f8ede3006423564c5091770c5583004c2c8c918c65f150f5c971a4d168d3eb6ce0e6634124090895ec3ff4f52fb843dccaabe21bb332c31738985d9 -MISC metadata.xml 738 BLAKE2B 6c95cd538d9c896f256172d0f8c9281016a177fb6e8f507bbe07b6ca3d4cea4ef18eaa10a991f80c8937b58c388181dec81bf9b25a8ab0b6568e3c4c2731dc82 SHA512 f93c8a05ecfc96f29602d3a976431e6148df576c458769916db6c181ae0753826d64482ef7b9029c6c68bfbae0861cc42f39aff774890960f394775dca7e62c3 +MISC metadata.xml 590 BLAKE2B af2c7346ac5b7fd48346a2ff37ceaabe6a165004ec0dc6763a96bfdc31436c2d874d0c8f603c841b2bfe74d911b53000b9958c24bcb2c355b7de485185d83043 SHA512 e7d7e16afaba5d5961ff6fe9ea673ec1c26f5a2d502edb428bfc1bbd7b226ee25cf7abb296c8827404c65ad692d09966be37c95d0d7e4c56e5191df5b3367e8f diff --git a/dev-cpp/glog/metadata.xml b/dev-cpp/glog/metadata.xml index b109eca5bd20..f488a88cb0cf 100644 --- a/dev-cpp/glog/metadata.xml +++ b/dev-cpp/glog/metadata.xml @@ -1,10 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>arfrever.fta@gmail.com</email> - <name>Arfrever Frehtes Taifersar Arahesis</name> - </maintainer> <maintainer type="project"> <email>cjk@gentoo.org</email> <name>Cjk</name> diff --git a/dev-cpp/gtest/Manifest b/dev-cpp/gtest/Manifest index e7e9b2ffc8bf..caba32b09a81 100644 --- a/dev-cpp/gtest/Manifest +++ b/dev-cpp/gtest/Manifest @@ -1,7 +1,7 @@ DIST gtest-1.13.0.tar.gz 862871 BLAKE2B d2768332c233d62f7a5f5332b63dc587c96c24765b2eeaa4f4caf5d421b175aa850d81cec4f50eeef9e06d4b86cb959555b4c2862a197ce3cb86d61fcb51f5d1 SHA512 70c0cfb1b4147bdecb467ecb22ae5b5529eec0abc085763213a796b7cdbd81d1761d12b342060539b936fa54f345d33f060601544874d6213fdde79111fa813e DIST gtest-1.14.0.tar.gz 867764 BLAKE2B c457f55ac572b9fb1553eee3df7eeeaf1e7dd2c3d747dd5e90dd279038fa5c71bb7b7d9ba1cf7e6143898b2a1d24d100584bd2a48ded41a426870c4825eec1b2 SHA512 765c326ccc1b87a01027385e69238266e356361cd4ee3e18e3c9d137a5d11fa5d657c164d02dd1be8fe693c8e10f2b580588dbfa57d27f070e2750f50d3e662c EBUILD gtest-1.13.0.ebuild 1870 BLAKE2B f2ea03a8fa7c5d8c39b4a8af7e1a2ee7871fb0636fa457b1a0b850e0307d0f030228d0c7b60fc5b9545cd412b5b6d2886ccc690977682fbd307ff4bf82967a85 SHA512 4fd2ad52f159021aa883364dc0ec5c65376d6efff0279c9aaf516df5f258678df2c2bc84d5b19d638aa7831138e9af3dbb64ea7f7e80ae09923d02a9445ac4ba -EBUILD gtest-1.14.0-r1.ebuild 1991 BLAKE2B 1bf94cf1ef46c97e6b40bb35d2a461f276966f05184e38d73d24b3756dbdee8f3f55a57a93afb91446bb165f9633c23b092b3162e2ab643d167f9c102018df66 SHA512 06d6eb4b8215ee8746d8752e582a9d43b09b8d617ee35e0a544deb63dc662b3a64849fbf509f93ca09d2f40ffdff18b25e7297c2ce2f3c1329dadad4a5c74c9d +EBUILD gtest-1.14.0-r1.ebuild 2001 BLAKE2B dd8e1a1da489984695880791e4e4eb0da4369395908b7de3a2ce4df508f4e2c1e01bdd267e43fcea5d6f4c3237b2e997ec7a29556179be9df9aed034231d76ce SHA512 4dae89b191ae44b1f7326c7712cf5b0ed9b372e212c9f8860f4339f4904d1abc955246bcb31dcac5c578981e23cc36e9468dc884a63f53741288e8bc2b6ffe56 EBUILD gtest-1.14.0.ebuild 1755 BLAKE2B 50437b841c5a62f9f1d39e499bd2190bc0aa2e024fb81e4b834d3c44182e0d349bf8afe07b59a9ebf8ec375c27b234b09572849c34b51f9f7b47400ab7f2c440 SHA512 6888c92fa06a074cc83a8a99b661d2d5db561bd4860e205b10c58d3327eefd7baf5fad8b314f212001df595aa0c225164081420ebd37f6d7423471d9be4a8460 EBUILD gtest-9999.ebuild 1996 BLAKE2B c42acf93040334dd0300980e64d6ad662b0e33b4147d6e2dc2ec10ca9d618d4b2e21840963c114258579439dc736bf6db2b2d11cd56defb2ea7e27210efbcda3 SHA512 be1189ec0f6e3319d3d7b32208c51e6d4d6b8312750ea2ee0d8438ad61a1a1320302ef60645a6c68526c53bd1cf1cc84bd98869b3e61fa8803876714b18793b8 MISC metadata.xml 553 BLAKE2B a6d63b3f65e8cc9bf95fb0197c48f6adcca359f118797b0bb6c624d09dd586efe066c990e6cb709d42f8cbf32f67feeccf74b9662d13ddfd57f6b13f199585d3 SHA512 e1edf26c4cf978203c3c6e3fda887923dbf76101860dc8e6a81a7218f88fae0f28d4b78ce6cf34b5d3a61c550e1042d5fb3d3530f88b5277a5b46c8943dc0677 diff --git a/dev-cpp/gtest/gtest-1.14.0-r1.ebuild b/dev-cpp/gtest/gtest-1.14.0-r1.ebuild index afb21ca17db8..931f57f2e5cf 100644 --- a/dev-cpp/gtest/gtest-1.14.0-r1.ebuild +++ b/dev-cpp/gtest/gtest-1.14.0-r1.ebuild @@ -21,7 +21,7 @@ else -> ${P}.tar.gz" S="${WORKDIR}"/googletest-${GOOGLETEST_COMMIT} fi - KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi DESCRIPTION="Google C++ Testing Framework" diff --git a/dev-cpp/gtkmm/Manifest b/dev-cpp/gtkmm/Manifest index c11fcd484a88..09729387c60c 100644 --- a/dev-cpp/gtkmm/Manifest +++ b/dev-cpp/gtkmm/Manifest @@ -1,7 +1,9 @@ DIST gtkmm-2.24.5.tar.xz 12022024 BLAKE2B 6b2bca9fe6ad81cd956e1f3cc3140bc503b78386cf3931c8eeac08c8b2a08c73450bdbb703d1febaee67cdf834093ff5e89790f866357190822613a68a596ad3 SHA512 c50e52830977c37181439f4b82a30ac8bead0cf9022d2bec8225f8dc33e08414f863bf67056e1938fae8f888c09a5a6d757acc011fa9331a78caa6bb626dd51e DIST gtkmm-3.24.9.tar.xz 15122612 BLAKE2B bbc80e5140a5c003817a1d6a0e63ebdab971fe9c92cf07d2edcbb8a3ee5e2371ab7b932a5c9af56da096d3e37d6e76101ad25d9cea5074d29d31f97e69960c3d SHA512 6e6e53d7d434f51758ffddce00dbae61074c54a5d3a5bb852fea558147af4ca6c40f9fcf4e7f9fafcbbc22ea33cdd99ea06208b72542c7e75f4dca19a80c6724 DIST gtkmm-4.12.0.tar.xz 16359928 BLAKE2B 84b5f5ee5ef85c9f6d32d3047ab794f4ded3fb33665e18b4b6cacfc4836f5549e9cd32103963de367d0957fa58eb55b02ed06a3d3c6b6777c296d1c1fe3cabbc SHA512 0bde82ac1331c86810bb513362c81a30b0abaf906af4cf4b0607b85362125d8a15307fb5c51c6497fa9292acce437af027c4e336231dd18d72251f43e3d23688 +DIST gtkmm-4.14.0.tar.xz 16713784 BLAKE2B 27366963f25b704d71a2afabc4e04ad3ab0986f9094a62c6897cabb7ad8c318db94da79197e375da231bd972c1173c3af7a27ba28173f5f692c2e8682c31cd0f SHA512 94cf1f764e539b8b1fdff101f6e134c5e2bc9379f1dae3b6daef66ab94e90f5e70a41d8eb94842fd54c0f8706c565e975fa2adf6e4c6913cecaeb3c8cf00a1cd EBUILD gtkmm-2.24.5-r2.ebuild 1539 BLAKE2B bf277f4718556c99499769537d1487bb061fe21c42a75a35045f2d584400746bf5b1975258915898aed7aa0071350a5fd4d7f26dcbec02892e2beaea6bb87a1e SHA512 e53ae5dc8f57b2f4d32b47498cf763a2471f2fc812113ab326d88fa354949472edc21a4257469664da5faf4f6cc50123b0ac7eab81ffafbe6d0b01f2f3883d0b EBUILD gtkmm-3.24.9.ebuild 1436 BLAKE2B 5e316688daa0a77f662747af5ad28d717fb95ca5e44c6b3f5a9c5d948aa864b17969efe53e62f84993ff156935667c29fc7001d96beac1d73343c47985c960d2 SHA512 eac072b1dbb61f9a06c26572c4b36edc86fbaba01933c044c3c0e0c882c1acc871166e6cdab28ae0b9fffeaa5672b42df7d760d82b27fe2f45ea56b3c40b626e EBUILD gtkmm-4.12.0.ebuild 1042 BLAKE2B 17e7055c1bfaa53ef813179131b4f25f25870c45903aeff0a21eac734cdaafb66620feb3881ac29d5664b35da79eed3ff3daf22ce25da7567470e8149110d900 SHA512 50b8529558811ead387f23e9dff66eecbd574964e0d2f9e2a5f4e9db8b2f306f6795077653ad9847f59776ac86bbd0934d6b5af333d5afb4f157e448bceb1831 +EBUILD gtkmm-4.14.0.ebuild 1049 BLAKE2B 3a3afc211da8c83d4b423da6f959686bb2f4fcd1a37bd031c8cbd5f7f03e9bb044548f986fe86fe7d54494960f0228866148aa32609dbd4d306233595f00a41b SHA512 d30bfe381853b8bb6aa57c73867f1f4a8a72a027ff628fd8151dbb7aa84deae3a444dc0e8f761e7c5887b2ea6d60bff19f6c625cccf2a24addb549fc6366cf24 MISC metadata.xml 346 BLAKE2B 590b61bebe118f44f4ac99d2590e6285138507599c79325441d534c727fa610f587d2c4eab35ef34f5a60f8c7f08346924c5ebcfcd74bafe704f81f3144710fd SHA512 2c4cca6bfad460aa0d0730f2e1355384be69fe30598145e4a2c22c46bbea4c3d9dbc46f863da35be01a54ad091a4b0d70e3f09b7e89013c1beb367eda0fb490d diff --git a/dev-cpp/gtkmm/gtkmm-4.14.0.ebuild b/dev-cpp/gtkmm/gtkmm-4.14.0.ebuild new file mode 100644 index 000000000000..e9a4ece0d90e --- /dev/null +++ b/dev-cpp/gtkmm/gtkmm-4.14.0.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..13} ) +inherit gnome.org meson python-any-r1 virtualx + +DESCRIPTION="C++ interface for GTK+" +HOMEPAGE="https://www.gtkmm.org" + +LICENSE="LGPL-2.1+" +SLOT="4.0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="gtk-doc test" + +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-cpp/glibmm-2.68.0:2.68[gtk-doc?] + >=gui-libs/gtk-4.14.0:4 + >=dev-cpp/cairomm-1.15.4:1.16[gtk-doc?] + >=dev-cpp/pangomm-2.50.0:2.48[gtk-doc?] + >=x11-libs/gdk-pixbuf-2.35.5:2 + >=media-libs/libepoxy-1.2 +" +DEPEND=" + ${RDEPEND} + gtk-doc? ( dev-libs/libsigc++:3 ) +" +BDEPEND=" + virtual/pkgconfig + gtk-doc? ( + app-text/doxygen[dot] + dev-lang/perl + dev-libs/libxslt + ) + ${PYTHON_DEPS} +" + +src_configure() { + local emesonargs=( + -Dbuild-demos=false + $(meson_use gtk-doc build-documentation) + $(meson_use test build-tests) + ) + meson_src_configure +} + +src_test() { + virtx meson_src_test +} diff --git a/dev-cpp/json11/Manifest b/dev-cpp/json11/Manifest index 219248479065..3583ebce9ee3 100644 --- a/dev-cpp/json11/Manifest +++ b/dev-cpp/json11/Manifest @@ -1,5 +1,6 @@ AUX json11-1.0.0-fix-multiarch-install.patch 786 BLAKE2B 5362fce55049ed95f0de5467a53c54bd3e0b82c91fcbefe1d6b8d35629a1d968527157720a19c478690d787a1baac634d4b927424d6e4c27abdc89427fe46b7f SHA512 0ef4a3ff19d2ffbf7772b83782ada2fcd2e3baacdd32d6a74931b035166041b7471800fbb01801dbe9b5b1cc003128dbb406a736da1f016c4cb1980ec11a9902 +AUX json11-1.0.0-include-cstdint.patch 258 BLAKE2B 2b7cb5abcbaaaf7c44f1b483716cd68e7a68a5d92f0107847aeb514b93c2b34da1311bd9465ba2077ef568cb7d1a7c150fc89e9adb981a9b59fd7821cefb159d SHA512 c7df20caa578d12a707b74fde88f856dbbf5e75176d7b9aca13f7fe9b501f4ca844fee5a4f2250b3c9de4afd1cd9ed1c26717a06ea4b1d239415cc154152305f AUX json11-1.0.0-json11.pc-do-not-state-the-defaults.patch 728 BLAKE2B d96a4a9b0cf5aece5c07181eff4a246c792afb431d1c35715e1c587811108cfef04dc19bbf7fdcb84ac0e5a289ef6697e2e468ef2dc8f190d38ffead8e6d2768 SHA512 98079b0266d30364e47622e58d8d203ef16296aa40c01e318cd7fd902b8d8adcca5c2cae0d09d203137cc219e9288fa7a1187fc8f8fedd4a1ecc68ebd73688e3 DIST json11-1.0.0.tar.gz 13104 BLAKE2B 9f4fef741b40f1d163dd96555a521b6220c47402624baa5446fb94592989a830a0c511162a6af64b76962c8b07b83a324845dc61c1ca91bbb99e2b0511fb962a SHA512 c49aa9ebc75199528a13cd255d9362acb797d73a17fd69fb22673e945b8719a3d70fdf2d886fed342ca13ed1b4ea578534520d87c46c4a418929f9124aee3ec3 -EBUILD json11-1.0.0-r1.ebuild 483 BLAKE2B 9ecd56a77aaf7cc7e116c877838fe84ddd8ac4d1b571a4802f97b74f29d74c78108a7540d0b16977f043f37bb2588d66ff3cb0b38320e6b7c7fe0a998499d114 SHA512 fb72bff069e37ae1ebb37f86cb88aaba7e7016c7d0eb162cabbd23fd8b0c297421790c14677fd5f9f35894a100dd75cfd43a4c2cfd6a04136bf1e769fe9fd0c7 +EBUILD json11-1.0.0-r1.ebuild 532 BLAKE2B 8a6c7744cc1e9d6a554cc23b22b5363316b15eec99885aadc8add27a22780070610ec2ea5c2bcc5f2cd5a0c0b6019d297e8012570e6d223d59c8c4d7b187f91d SHA512 79783561dcd536c93af34d5af60d0cb5063ffd94eaed239d0540b13c39f438df32b2120625db65d866468adc1bf1b1f558d3b39d5ecf9295be2d49b959ed1ddc MISC metadata.xml 326 BLAKE2B de17355ea68ddbed46fa6e2a41ef90ce0d810757f6974f40773dbb547723ef0664d145dc0718d4c01aaf6f569f32bb298e70f5faccadbd00f283304d4c3308aa SHA512 7e02afef76ec6bac01baead08ae25fd11355197abe23162eb41a055c6de8b1643d5a958b93ab39f87377ad166bfb7441a9aa24f21b382511a13a4ab8624056e6 diff --git a/dev-cpp/json11/files/json11-1.0.0-include-cstdint.patch b/dev-cpp/json11/files/json11-1.0.0-include-cstdint.patch new file mode 100644 index 000000000000..29648cf15825 --- /dev/null +++ b/dev-cpp/json11/files/json11-1.0.0-include-cstdint.patch @@ -0,0 +1,12 @@ +diff --git a/json11.cpp b/json11.cpp +index 9647846..8266a14 100644 +--- a/json11.cpp ++++ b/json11.cpp +@@ -22,6 +22,7 @@ + #include "json11.hpp" + #include <cassert> + #include <cmath> ++#include <cstdint> + #include <cstdlib> + #include <cstdio> + #include <limits> diff --git a/dev-cpp/json11/json11-1.0.0-r1.ebuild b/dev-cpp/json11/json11-1.0.0-r1.ebuild index ab8457f641aa..66b400e6f1bd 100644 --- a/dev-cpp/json11/json11-1.0.0-r1.ebuild +++ b/dev-cpp/json11/json11-1.0.0-r1.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 @@ -16,4 +16,5 @@ KEYWORDS="amd64 x86" PATCHES=( "${FILESDIR}"/${P}-fix-multiarch-install.patch "${FILESDIR}"/${PN}-1.0.0-json11.pc-do-not-state-the-defaults.patch + "${FILESDIR}"/${PN}-1.0.0-include-cstdint.patch ) diff --git a/dev-cpp/libcmis/Manifest b/dev-cpp/libcmis/Manifest index d59c05a45365..44f857ca8f13 100644 --- a/dev-cpp/libcmis/Manifest +++ b/dev-cpp/libcmis/Manifest @@ -1,5 +1,6 @@ +AUX libcmis-0.6.2-boost-1.86.patch 1841 BLAKE2B a452e78528c6b46c5518044b8d3a5c2cb082a0fcd3fa21d897f8e5b626497472f960458a8b1ef4731da46351b3f58e3f78160154dd2d1c05490574838e55f4ef SHA512 310d7eb9093f40cbbd2280dd805305a535ce5ed3d9baebb6a71ae17961be768042c659c529c99a2b7132248d1450f45861b85ec5ad03c9bf1d123ac2fcc3e4e6 AUX libcmis-0.6.2-libxml2-2.12.patch 762 BLAKE2B 1c63319f018b94e4c5609b7ae53faead48afd611613d2dca5b15ac67ef83546e4e7b70a9bb9eb6576697f85019d9358ae96cdd0a8bebbc09458aa2376e1f38a0 SHA512 06e9b18d1459858692c5cc07fb6243ba0ff6af475db6f8c8fd5c7f96ca086222ecfc36043a4bb0e27e3fbce671a12d0f852dd69d6473675ea637db21bc99a66f DIST libcmis-0.6.2.tar.gz 296218 BLAKE2B faad99e09b2721cd56b0d47d2a9589e06222ee7881006e936d0943d5e8afc588fcda721ef282ad7d55c785407a9885c90cbce1d172ca012c4a13cc51da0c15b6 SHA512 a75a69623f34149c39c382c357396b8dd719d589a78424fc3b5d9de84ffbf3f889bcaaed9a01f91b491a507c189347d3d9252db238fddbb522ff8ba9ce7b5ade -EBUILD libcmis-0.6.2.ebuild 1201 BLAKE2B 8f0352f030d38c03c485e2a53ef4b472c4192db3cc48abd0fdb928127ca5f28b7b4a2110b5dd2f162b2d09fb2b2b72a08df477900decfd3d30a4b59d3f281764 SHA512 aa505b451f07f73b088c9b286b7f432a99700288962fdca8b9f24dc13e92c834fe5fef7f85d74895727cc777f3d66d021b6ad329c3886c5a34fb910f36112e1b +EBUILD libcmis-0.6.2.ebuild 1282 BLAKE2B 31c8f79601a070144d9e4043beae5d7a059f8edba78d1453876dfdfd62398d727cb1af35007f7275ccacc510ad922cd587c1e428d90820a050028d0eded3bb3d SHA512 c64595419c5e79e1df8575dbc385bbc2233ba886ca9d8b16c75bb1587f7793d7b37b3f3e3bbfe7813809b13edb22f27653751a03ff318336beb855fa36ac283e EBUILD libcmis-9999.ebuild 1100 BLAKE2B 1eb20b6836ef2caed2f8bc6e0af59fed9257c4c0e930befc2f5e19dda96dfe408d3878a51d50390d98f27580ee2fc44e33290a309d192b6f992d8461ce40a637 SHA512 e7a7638e8035e76cec570ddb37bc77e2531e0dc53918205b72120b18dbeaa6bdf82f395ddf49eca0c25c8e2930a1bcc996cccaf6be3bb57202e6af68be6b222e MISC metadata.xml 426 BLAKE2B 182f7dffcb4df586fdf436512fdff32b98308711021e4a307c3c61262c5e68495da7d4ce833695bec7ea3f098e20fa067817895e7b4420ec19b920b249318527 SHA512 10ed11b843ba2c39fcd0519997fec47647bb45eabd0b5f6df0994748c0fb876216e7f451851dbe84a112468a7d6b38c5608c7ac7ada2ee08549ab1801ce81cc8 diff --git a/dev-cpp/libcmis/files/libcmis-0.6.2-boost-1.86.patch b/dev-cpp/libcmis/files/libcmis-0.6.2-boost-1.86.patch new file mode 100644 index 000000000000..5d2a9ba404e3 --- /dev/null +++ b/dev-cpp/libcmis/files/libcmis-0.6.2-boost-1.86.patch @@ -0,0 +1,47 @@ +https://github.com/tdf/libcmis/issues/67 +https://github.com/tdf/libcmis/pull/68 + +From dfcb642a491f7ec2ae52e3e83d31bb6cdf3670c2 Mon Sep 17 00:00:00 2001 +From: David Seifert <soap@gentoo.org> +Date: Sat, 31 Aug 2024 12:39:39 +0200 +Subject: [PATCH] Fix boost 1.86 breakage + +The fix does not break building against <1.86 since we're now accessing the +object representation of the return value. + +Fixes #67 +--- + src/libcmis/xml-utils.cxx | 14 ++++++++++---- + 1 file changed, 10 insertions(+), 4 deletions(-) + +diff --git a/src/libcmis/xml-utils.cxx b/src/libcmis/xml-utils.cxx +index e487d17..cdf088f 100644 +--- a/src/libcmis/xml-utils.cxx ++++ b/src/libcmis/xml-utils.cxx +@@ -531,16 +531,22 @@ namespace libcmis + boost::uuids::detail::sha1 sha1; + sha1.process_bytes( str.c_str(), str.size() ); + +- unsigned int digest[5]; ++ // on boost < 1.86.0, digest_type is typedef'd as unsigned int[5] ++ // on boost >= 1.86.0, digest_type is typedef'd as unsigned char[20] ++ boost::uuids::detail::sha1::digest_type digest; + sha1.get_digest( digest ); + ++ // by using a pointer to unsigned char, we can read the ++ // object representation of either typedef. ++ const unsigned char* ptr = reinterpret_cast<const unsigned char*>( digest ); ++ + stringstream out; +- // Setup writing mode. Every number must produce eight ++ // Setup writing mode. Every number must produce two + // hexadecimal digits, including possible leading 0s, or we get + // less than 40 digits as result. + out << hex << setfill('0') << right; +- for ( int i = 0; i < 5; ++i ) +- out << setw(8) << digest[i]; ++ for ( int i = 0; i < sizeof( digest ); ++ptr, ++i ) ++ out << setw(2) << static_cast<int>( *ptr ); + return out.str(); + } + diff --git a/dev-cpp/libcmis/libcmis-0.6.2.ebuild b/dev-cpp/libcmis/libcmis-0.6.2.ebuild index c20057c85432..5130a7ba2744 100644 --- a/dev-cpp/libcmis/libcmis-0.6.2.ebuild +++ b/dev-cpp/libcmis/libcmis-0.6.2.ebuild @@ -41,8 +41,12 @@ BDEPEND=" ) " -# https://github.com/tdf/libcmis/pull/52 -PATCHES=( "${FILESDIR}/${P}-libxml2-2.12.patch" ) # bug 917523 +PATCHES=( + # https://github.com/tdf/libcmis/pull/52 + "${FILESDIR}"/${P}-libxml2-2.12.patch # bug 917523 + # https://github.com/tdf/libcmis/pull/68 + "${FILESDIR}"/${P}-boost-1.86.patch +) src_prepare() { default diff --git a/dev-cpp/magic_enum/Manifest b/dev-cpp/magic_enum/Manifest index 70bd308c4d7d..7e9a72032473 100644 --- a/dev-cpp/magic_enum/Manifest +++ b/dev-cpp/magic_enum/Manifest @@ -1,6 +1,7 @@ AUX magic_enum-0.9.5-werror.patch 875 BLAKE2B b2add770c207262fdf631fad89347ae8299300c3c2aabd88f9b9f1b36b4a166f171d338d27cbcd69d14788ffc38cb0baa4d345b21dd7e41e937377d45e1edd6f SHA512 72da8efd9468f623f04feb443768231d45b481df092a4087a319027e50cb75ddbe59deeebcad8568c15f1edf467ba5e41ecfb3f04a6fdd512586f86a4889b71f -DIST magic_enum-0.8.2.tar.gz 171915 BLAKE2B e8915aa7cafa9407d5d4ab3b6837fafde6b1cb75877c8b56f82568e6291ca317720950947b2dfc7e12ca459279ba4e809a8c5782fc04adc2d7636eddcb80122d SHA512 849c426484156faf91dde3f32f6c755c7698879b16dd83e13fb86b299b53ec9bbe4d55267581386302c8acb93d80ec044cc248371fdc8608cdd8f4ab12099f0a +AUX magic_enum-0.9.6-werror.patch 822 BLAKE2B 9f642d414db9369fb9562e6ebd5b35427f9042b6fc87f79998889aca9a16d2df49fe38916f8428240bd9d9a246fd74e15649b59e8e4a62bbdbf2586ac620200c SHA512 9907638ac8200b5e5b7d0e8852d64d870b553053c145c7440cb63edaf1038c9946d0480fcab1dee87a106e16d179d48dd90a62a54ec1c651668cc0df0b2dedde DIST magic_enum-0.9.5.tar.gz 198269 BLAKE2B c3c6bbf6c5d366813dac7df5fbfc48f414cf4235d842ef3a5a2fd8f2c2857e55243b7fbf7000d598e778fc8d2d54c7d6e34f8a97fa2eaf510572bf53f17500a6 SHA512 f1b412d15e0ef624b4588adba00a18ed12eeb1f0dabc021d53a7c047b8976ecb07701b76040f47c77c75e00151619dbce1f9a75f471db04340156a39044768f3 -EBUILD magic_enum-0.8.2.ebuild 686 BLAKE2B d0bb6977096b53596464f585437d53a4a03518264cc100b58e49f033e69189a3a9617e5b8f84a6d78f1d9c37af23156cdbd0b4b2d53753043b75987b61f208d9 SHA512 e09532008abdb985e2bf19a57724d80e417d3384df26a283d35f1d05459d4b906e78e59ea66480827ea4529edfc7f06355441e77ca5d61aaf404d0dac2dcf063 +DIST magic_enum-0.9.6.tar.gz 199883 BLAKE2B 32909c5ea0cff32b14fb4fd5507f1f99cd45f572d56fd14f76aea3ca3c1fa16d08573568a7c7f9a3efbc9396450b2e897aa64de414b34a4c19b6c49f63aed506 SHA512 6154c816446e115f3b164df79ab8d8088eb76b632ee3fdc82ea17cc7ae8d04652c83e5cc587c2c4b334889904b101ba08a04c5837103af260768e93df17cc263 EBUILD magic_enum-0.9.5.ebuild 733 BLAKE2B 61d90178a7204a5a73ac31c96e757c7c01dc4a4a02e6454fa5a506e2a115da70b96c80a5d5ce0b2f8e94d57de24ae342440469507397174c8e7b5e515aa7c4e8 SHA512 ef82538caabd71017c0e34b49fd84f2e3ef938783e3f6d131bd10e295fcece01afb2ee0d6252a1ed32ab79a2ad10706b6ea39755a2b288ddbc0f395ce959a06d +EBUILD magic_enum-0.9.6.ebuild 732 BLAKE2B 86388f177402cacf4504900b80a77be48396fbb725e4786a2ea3758ae278cae467b9e3068e6e8583bde9c926aa4da9b7585dc16dc47dd3b8d4afe5f0fcca3d2f SHA512 bad4873ec408f2d04ad13ed28204029eb8ac22ee47b4fc173849f49a7eab9172193f47ce7cd8937fff495ec06c5508e63131a9904e00d3479b236c12ae3c05d5 MISC metadata.xml 337 BLAKE2B eabb1d9eee57714c609421664a9c4c20ad428bb04293b73b229ad35fd9f49bf0ecd6b8b3b1ff7499ca8a9ac47a34e413ae641fc0d0fb519e0f0362ce06b101fa SHA512 0b40ac7094d30a55aaee08f37268eae8b793768aa2f0d5eba53ef0dc1f3f763f3066cd0a2cfb46bb3002fcebde6e631ccb4cf3a8da2db2742ccd2cf536e67012 diff --git a/dev-cpp/magic_enum/files/magic_enum-0.9.6-werror.patch b/dev-cpp/magic_enum/files/magic_enum-0.9.6-werror.patch new file mode 100644 index 000000000000..581df69ff82b --- /dev/null +++ b/dev-cpp/magic_enum/files/magic_enum-0.9.6-werror.patch @@ -0,0 +1,22 @@ +--- a/test/CMakeLists.txt ++++ b/test/CMakeLists.txt +@@ -12,7 +12,7 @@ + check_cxx_compiler_flag(/std:c++latest HAS_CPPLATEST_FLAG) + elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang") + set(CMAKE_VERBOSE_MAKEFILE ON) +- set(OPTIONS -Wall -Wextra -Wshadow -pedantic-errors -Werror) ++ set(OPTIONS -Wall -Wextra) + + check_cxx_compiler_flag(-std=c++20 HAS_CPP20_FLAG) + check_cxx_compiler_flag(-std=c++23 HAS_CPP23_FLAG) +--- a/example/CMakeLists.txt ++++ b/example/CMakeLists.txt +@@ -2,7 +2,7 @@ + + set(CMAKE_CXX_STANDARD 17) + if((CMAKE_CXX_COMPILER_ID MATCHES "GNU") OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang")) +- set(OPTIONS -Wall -Wextra -Wshadow -pedantic-errors -Werror) ++ set(OPTIONS -Wall -Wextra) + elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC") + set(OPTIONS /W4 /WX) + if(HAS_PERMISSIVE_FLAG) diff --git a/dev-cpp/magic_enum/magic_enum-0.8.2.ebuild b/dev-cpp/magic_enum/magic_enum-0.9.6.ebuild index 4b3b1362dd0a..5a4a0dda0b76 100644 --- a/dev-cpp/magic_enum/magic_enum-0.8.2.ebuild +++ b/dev-cpp/magic_enum/magic_enum-0.9.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 2023 Gentoo Authors +# Copyright 2023-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,10 +13,13 @@ SRC_URI="https://github.com/Neargye/magic_enum/archive/refs/tags/v${PV}.tar.gz - LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" IUSE="test" -# Tests fail to compile -RESTRICT="!test? ( test ) test" +RESTRICT="!test? ( test )" + +PATCHES=( + "${FILESDIR}"/${P}-werror.patch +) src_configure() { local mycmakeargs=( diff --git a/dev-cpp/msgpack-cxx/Manifest b/dev-cpp/msgpack-cxx/Manifest index d004e768d44f..94213dbebff2 100644 --- a/dev-cpp/msgpack-cxx/Manifest +++ b/dev-cpp/msgpack-cxx/Manifest @@ -2,7 +2,9 @@ AUX msgpack-cxx-6.0.0-gcc13.patch 1516 BLAKE2B b6da40e88b4e90cba6cdff1c68d8cb6ca DIST msgpack-cxx-5.0.0.tar.gz 476103 BLAKE2B e631a47e8d39b6ad9c2dd5e782fbbd5044c177e18c619fb52d1293e2c5f2ea7e766e7b26ce6cac36a2ff98217143e12456e0541992afb4f78597ffd3852f2acf SHA512 5ee0237eb1bf05bd4becad32ab145a8f0654f8f0e2e3452331ed3df088cda03ee4cdf1557ba867447e3e18baed924c105c76934f7009dac98b6dc69282c39d0c DIST msgpack-cxx-6.0.0.tar.gz 476132 BLAKE2B 89b6505511bd8f6994a2e61661c7a33bd1aa68804c081ec2fcaf074f845caf4338ac362916af9fb0bab7285b0d0508c74b229316fa75ef8083546ac84c4ca95d SHA512 90f89216676af5a656d570fbff5a716d1177fa1941b0a928b2da20e0b6cd6d0ca880b7369e085dbbca944499c05694a73df919042d8cd78498ed4b34b77a0e9d DIST msgpack-cxx-6.1.0.tar.gz 478452 BLAKE2B 14c6e28ab02957e6313a01002d05c23e2599f433656c8ea8033eb338c6e8b97d10e00a91e1e67bc3b944c3f9b46ad1ea11fc6905d50554699caeed7bd9cbc8f7 SHA512 935453432b53d2cbecc3e34d4fb17ecd3bbc6eae9087fa3c4445c90750f144ab39ad6461cc9552eec7ed2b222315c5f6e8b30d409eb34a98bebe02e03582fd41 +DIST msgpack-cxx-6.1.1.tar.gz 476459 BLAKE2B 6ec940af9b9e02d892c5f118791015baa6b12baa60c77aaf2ff867e8836f21b4f16c436ce448cdfeb7dc8f8a9356a75f3ac829eba9059ca5d78f42a4393700ff SHA512 6a3df977e7a9c8b50feb7c88cff7a78814d1d41d2f7a657dd37d6cfcfe24f44746f40a6dd46bd5dba7ea59d94b9e40c2baa62c08d9b02168ac93c58cbff3becc EBUILD msgpack-cxx-5.0.0.ebuild 1220 BLAKE2B b47929048aa23107e658adf336aba13ea7e7600265c21444571d16cf077dc00cd55abf2242a82bb1b7af1bb954db491bf69099b6cd6c4bc0fcec303292970377 SHA512 7f1ad94c478a5ae8a1877709b92ac0e70e77e075ee9e9f5eb3703695de04fb0ed599dd49e89730c419c308732fc8b55fc24d4846c247bd913a1be39ef1eb8c24 EBUILD msgpack-cxx-6.0.0.ebuild 1277 BLAKE2B dbf52d685dc88f2dc2a9b0994160e8515299a6c3606328b3373571b458a7d3a939fea0c66e7da0378be49bdce228966f7cfdffc244ef4868728ba19a2698df40 SHA512 b9d2ce05fb8f81619f9e63ba8fe317d7a78bdbc07a44bf8f2e7543e704177a007cfa91c5cbc864011f8387b91db2ce2e9e0b5c8962d5d56951a9c6b779683672 EBUILD msgpack-cxx-6.1.0.ebuild 1220 BLAKE2B b47929048aa23107e658adf336aba13ea7e7600265c21444571d16cf077dc00cd55abf2242a82bb1b7af1bb954db491bf69099b6cd6c4bc0fcec303292970377 SHA512 7f1ad94c478a5ae8a1877709b92ac0e70e77e075ee9e9f5eb3703695de04fb0ed599dd49e89730c419c308732fc8b55fc24d4846c247bd913a1be39ef1eb8c24 +EBUILD msgpack-cxx-6.1.1.ebuild 1223 BLAKE2B ecf06a7b34fb0c6758a932c39ac1f18e15d157fbc408dfe18c03f8e1e6c9bff02ee719e3d4ce7e68b676904d04edb8c127eefebff5b2a33ad32a9acb19d9c4f1 SHA512 229c5cc8f2055ec4fee5dfd9948764010c40d73e4ac8a4442df16e4b5fa98ef23d663f807be3102ae336d76322e599545c8b6116cc8e41ee310bc178a1374bdf MISC metadata.xml 410 BLAKE2B 2d8ac30a8aa745f32a388a0d66860d2af8de8bdc0e558b713738def49ec87e96b5ee201c4b2cd01f43f213ffd9f107cfcf9679725637f43ec7eed707ada87c69 SHA512 2009980f9bd56a3932a9f0ce56745439c0d29241bc11f3b8c0b2e26fc5a3f74ef9c7784165ed25e6280de4d1ee27e57ff225a5986522e51f50cc03e793625b4a diff --git a/dev-cpp/msgpack-cxx/msgpack-cxx-6.1.1.ebuild b/dev-cpp/msgpack-cxx/msgpack-cxx-6.1.1.ebuild new file mode 100644 index 000000000000..62978b6f9fb4 --- /dev/null +++ b/dev-cpp/msgpack-cxx/msgpack-cxx-6.1.1.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="MessagePack for C++" +HOMEPAGE="https://msgpack.org/ https://github.com/msgpack/msgpack-c/" +SRC_URI="https://github.com/msgpack/msgpack-c/releases/download/cpp-${PV}/${P}.tar.gz" + +LICENSE="Boost-1.0" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos" +IUSE="+boost doc examples test" + +REQUIRED_USE="test? ( boost )" + +RESTRICT="!test? ( test )" + +RDEPEND="boost? ( dev-libs/boost[context] ) + !<dev-libs/msgpack-5.0.0" +DEPEND="${RDEPEND}" +BDEPEND="doc? ( app-text/doxygen[dot] ) + test? ( sys-libs/zlib )" + +src_configure() { + local mycmakeargs=( + -DMSGPACK_BUILD_EXAMPLES=OFF + -DMSGPACK_CXX17=ON + -DMSGPACK_BUILD_TESTS="$(usex test)" + -DMSGPACK_USE_BOOST="$(usex boost)" + -DMSGPACK_USE_X3_PARSE="$(usex boost)" + ) + + cmake_src_configure +} + +src_compile() { + cmake_src_compile + + if use doc; then + cmake_build doxygen + fi +} + +src_install() { + if use doc; then + local HTML_DOCS=( "${BUILD_DIR}"/doc_cpp/html/. ) + fi + + if use examples; then + docinto examples + dodoc -r example/. + docompress -x /usr/share/doc/${PF}/examples + fi + + cmake_src_install +} diff --git a/dev-cpp/popl/Manifest b/dev-cpp/popl/Manifest index 3abf04a76a65..56524e349d13 100644 --- a/dev-cpp/popl/Manifest +++ b/dev-cpp/popl/Manifest @@ -1,4 +1,4 @@ DIST popl-1.2.0.tar.gz 12302 BLAKE2B cfe775ef5cd823ce7b6cb651f7f8de6c67d24e5e3b657d13e7b2087f3b9673c11a870adbe2195665f4e2c3c7799c2427020d4e86126090ef845aa6a906c7a825 SHA512 a5d372346dd282f634b1ca92f468588f7069b34a5911a6ea46e5ef33e8e6c360ca13f67bf221555d76c7620c4222694077a74589a1c32bdbc094e64366299609 +EBUILD popl-1.2.0-r1.ebuild 467 BLAKE2B 27490abda7123f122ee3061f27d8cfd889bb712549ec04c06d817dce7b6a37c0a775342c81f1c7ab9b4b8b4bdc23a8791b4b67ea583154f96d4aeb2835638030 SHA512 8384288bd4cb743a84909ba712390b1d282357c087a038509dbbe0c5b5573c10ee2e82596ec1d21680ed1569d98ad80a7ec55324091712b6f6009e2caa27fce8 EBUILD popl-1.2.0.ebuild 598 BLAKE2B 3f12b34684fbaf4847f07aedb6a85b774bfbdaa6f019c7fcb5ae4e645778e671d29bd88af17400b995e789c425bfd4a85a53b7c8c59cd0e8278e77ea07d9f3b4 SHA512 8133b8a9683fb46dce090f08e475192441da83ae723b8bcc07f6c04e6735aa644b346d2199798ade91062ccaf4beaa5584d4297271786db4bd28bb677fdefe8d -EBUILD popl-9999.ebuild 578 BLAKE2B 96cc325d37debbda1f48bf2437457aa2fb1d799b06bf2b2be989fdd695e530f3180de746f9838539d30a3500b650129d1e916990f15c9dde6234ec7657bea7e5 SHA512 4328adba89286af181433e60cf1fea305174e180d34b247e3ba99ea540f6901e190befca09fa271bcf4a06776447f60778bd563fcaed77a85bd062ed1b1a745c MISC metadata.xml 495 BLAKE2B eed70a06f91e5f2f284f708828dc7bf9313c37916a7fd45c86365a5d0ab5d86f45ccd2ffed49a546564cc0611affe73418387fe35ec62d8c2a8cfdd02b1bd6c8 SHA512 dad065db7693040ff15613a3b33978ba8ce3fc5119e1bc0e7f9bde36a263bbbd6302af634a47c358331811a9d318aef119901825195ffcbc86d9b7d5293e7252 diff --git a/dev-cpp/popl/popl-9999.ebuild b/dev-cpp/popl/popl-1.2.0-r1.ebuild index f58b83ff2381..81ab0225c4c6 100644 --- a/dev-cpp/popl/popl-9999.ebuild +++ b/dev-cpp/popl/popl-1.2.0-r1.ebuild @@ -1,26 +1,17 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake DESCRIPTION="Header-only C++ program options parser library" HOMEPAGE="https://github.com/badaix/popl" - -if [[ ${PV} == *9999 ]] ; then - inherit git-r3 - - EGIT_REPO_URI="https://github.com/badaix/popl.git" - EGIT_BRANCH="develop" -else - - SRC_URI="https://github.com/badaix/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi +SRC_URI="https://github.com/badaix/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~x86" src_configure() { local mycmakeargs=( -DBUILD_EXAMPLE=OFF ) diff --git a/dev-cpp/range-v3/Manifest b/dev-cpp/range-v3/Manifest index eaa907a4ca00..1c2e1561dbd2 100644 --- a/dev-cpp/range-v3/Manifest +++ b/dev-cpp/range-v3/Manifest @@ -1,5 +1,5 @@ AUX 0.12.0-fix-any-1.patch 1252 BLAKE2B 307bbfa93cbecc4b58ff04172958e5d32c7e4f83b19140e6b3819517cb23a9089654954390e081a3ed82dc299f3bb1e3d0b257ed46b5f24cdb926bcaa28506e5 SHA512 617dfae7cf816cb554136a895f277541a2fa0030e78df60bcdbe6e3a2728f7d702b7c82ac15089f4c3a0fe83e92199b95c665a696471ceac70c8966d66381f25 AUX 0.12.0-fix-any-2.patch 5500 BLAKE2B b1d5df033bdda42d7db172e07a6577d398603ddc262d409529463866f0e5ebd87ff5082941313b61a346c8bae1ac6870103e307c123d525c49eefc97a00af26c SHA512 51dfa7f70020b174666034636de4e326c80bc292c6e579731df95ba07ec60a9523b4f231bd31a0f8217f23e4fd64be785dda3af8e018ebe7b17ba087fe6446f2 DIST range-v3-0.12.0.tar.gz 582834 BLAKE2B 252066fae70aae76450226f2c17248662de4778dcebcd7dbaa2bf757c1bfe3e7441f65e41e3110c1ae83ae93a41c54d6c006dbf5482ffbe09a3aa4f51d02df9c SHA512 b8b632b8e0f2a3234ef61813212c237f648cd741e816ca57bd86f82f6459f7d755e2b70361d2aa43847874fb546a31a792ab1c3ba90292818ae7313438dc62d0 -EBUILD range-v3-0.12.0.ebuild 1222 BLAKE2B 51aadc96e32717ac9c1c6b7dcc61048e89e46f90b52d875809d21bd1f8093a0038b35691b6514c8160a780aecae9ba19febc59712152b79893d459b44baa7890 SHA512 4a4b0cdf1d202e40cc083067f8a6dc2df73ac61d8019a9f511d2c9986e661ebb80547cff2c49ad6643cfc58e0bfea320185cd0691f3878abef459473db669e77 +EBUILD range-v3-0.12.0.ebuild 1220 BLAKE2B 93eb77f5b99870691c48edeb75ff47154d4592a44b5ec437a83e2011f943564a119fbb4fe8b47d6bb6b249cb167a9202fac665aa0899253666487053a2c880ad SHA512 795e8bfed5f53ae4abf9f28198a0255c3e9dda65bf89ba3e76464b86c71f99b391183952153e090d5c34d177d9ddbe5b4e398be1933384d73c5428eac6c4bed8 MISC metadata.xml 810 BLAKE2B bdebf063bfd0652ef3a38f5c96f08fbcfe3933937aa00883d39cc216a79ebfd65fa3c538d15ab0b5b4855ef7696b98e14c292b6587f2d870ca9d4eb6d7d7e96c SHA512 b24ff8d2452b70c34a941c693e6b2bc256fbcc23a49acabdb7126d593b44de30116d9543edf57bf49ca5c6ba854b851b802167347a08736b16a1b200c28aa5fc diff --git a/dev-cpp/range-v3/range-v3-0.12.0.ebuild b/dev-cpp/range-v3/range-v3-0.12.0.ebuild index 1109148151c2..b2ffd55a091c 100644 --- a/dev-cpp/range-v3/range-v3-0.12.0.ebuild +++ b/dev-cpp/range-v3/range-v3-0.12.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/ericniebler/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g LICENSE="Boost-1.0" SLOT="0" -KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-cpp/rapidfuzz-cpp/Manifest b/dev-cpp/rapidfuzz-cpp/Manifest index b8cffa2f455f..19ee5c139784 100644 --- a/dev-cpp/rapidfuzz-cpp/Manifest +++ b/dev-cpp/rapidfuzz-cpp/Manifest @@ -1,5 +1,3 @@ -DIST rapidfuzz-cpp-3.0.4.gh.tar.gz 301889 BLAKE2B eb4b27a0a6b4e5268036bb0fd79e57136685daf307d808de27515279bed63e1b934f504e9f7c22a20fbb028d322df824fce33398685708a2db3d11de93bd77d3 SHA512 c9cc50f7d68756d81a5d2c5efdd76e859fe5a199bf5e45179effcd85e32f0bb98b593b93c2aa57950a04c3d827af98efb13096b9669329881d658ababc059fd5 DIST rapidfuzz-cpp-3.0.5.gh.tar.gz 309782 BLAKE2B fd7547e5c40696c217c8ea2aa98fb83b98606cde7439a5d51c80b4de30002896d9e95365d3c6ac56c32d8a8432c94ce2050b856a7e850a3f37035c5d0ece795f SHA512 4e0a7e28a54612fb11eb331449aa4fdfde1fbd2bf59b295f9eb68903cd647a639fa04d71aa7a8c88ddb7be6646cd3d0f1f5400eb53644b0ae96590037e74f771 -EBUILD rapidfuzz-cpp-3.0.4.ebuild 637 BLAKE2B 7eb8542f2b107e874541d757bf52d492c4ede70ac87f8db938dd30de5b72c02c8fc58dcdc9aa4fa306dea4b7a32608bd922212c087962151287ffa760f24a729 SHA512 8942fbf48246ea0a131f7b27a27e0c43d80b99791c4e7b20b18133957b8f833462d4d9730c0036525aa1c09031a56d60e97554642bbe1a22b1e9337a863ecc37 -EBUILD rapidfuzz-cpp-3.0.5.ebuild 644 BLAKE2B 6d373e1353dc7d5f9839761489020bec065efb158734e295e0d84d99a179159801130214624be97f32182315499a4d8ee67cf0e6f5f25097f84b8b6fc4bf315a SHA512 9b0e235af1501f431cc05c1a3364b3d7f230cd6f58d728b3041ed242213b6774c8e74ee630c2133c80a1677cace60789bcfad0bc3ab029df7855e66b23c45c2f +EBUILD rapidfuzz-cpp-3.0.5.ebuild 637 BLAKE2B 7eb8542f2b107e874541d757bf52d492c4ede70ac87f8db938dd30de5b72c02c8fc58dcdc9aa4fa306dea4b7a32608bd922212c087962151287ffa760f24a729 SHA512 8942fbf48246ea0a131f7b27a27e0c43d80b99791c4e7b20b18133957b8f833462d4d9730c0036525aa1c09031a56d60e97554642bbe1a22b1e9337a863ecc37 MISC metadata.xml 336 BLAKE2B e425e950b6a0524afb6b996f846fdda73310168d6415a67570ac01a75a2c9335b4f5785bda271a2cf88bf5d7e3708582d958d1fa658d12f36fc5455df9763573 SHA512 868c16a2c2b178fa38e65568aeacf5b96a8d4ebf4521094a0da106194de0acefd017d5f7c827d89a9711c6b80d5603a01d9e15ba9b167c55954f3d653ccc6ed5 diff --git a/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-3.0.4.ebuild b/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-3.0.4.ebuild deleted file mode 100644 index e9c6bbefe8e2..000000000000 --- a/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-3.0.4.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 2022-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -DESCRIPTION="Rapid fuzzy string matching in C++" -HOMEPAGE="https://github.com/rapidfuzz/rapidfuzz-cpp/" -SRC_URI=" - https://github.com/rapidfuzz/rapidfuzz-cpp/archive/v${PV}.tar.gz - -> ${P}.gh.tar.gz -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="test" -RESTRICT="!test? ( test )" - -BDEPEND=" - test? ( - >=dev-cpp/catch-3 - ) -" - -src_configure() { - local mycmakeargs=( - -DRAPIDFUZZ_BUILD_TESTING=$(usex test) - ) - cmake_src_configure -} diff --git a/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-3.0.5.ebuild b/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-3.0.5.ebuild index d6330403376e..e9c6bbefe8e2 100644 --- a/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-3.0.5.ebuild +++ b/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-3.0.5.ebuild @@ -14,7 +14,7 @@ SRC_URI=" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-cpp/rapidyaml/Manifest b/dev-cpp/rapidyaml/Manifest index 1f95466beb61..1de17b9ae016 100644 --- a/dev-cpp/rapidyaml/Manifest +++ b/dev-cpp/rapidyaml/Manifest @@ -1,8 +1,12 @@ AUX rapidyaml-0.3.0-tests-no-install.patch 315 BLAKE2B 653c4f80092950636f8ef2ce0f1a4dcb8b3af1af83928ac0f75be35fc6b69805f457370783ef64d577f1a1b1b5992eb252b82092f20d61e2add683b9841007cc SHA512 fcdf198dd628023919579661a09de04f8cc863520cb915069dc850124e2a4baf7304eaa1ac41edaa39cf6085afeb9b3feae4b41b3c7e9d7d4696f109a334c389 AUX rapidyaml-0.6.0-no-download.patch 1574 BLAKE2B ab5ccb742f4015f9936b760227d43dbe2a9b99a5419117cac5098997b6be51f46b3f473fdfa69a5640a045c7bdb8a5b232639b1df1eb57eb4cbbd8d218adb5e4 SHA512 a3884965fb2a7cf7221645fcd4940a0a523aa46658d516c5fbd3554fa2f9cebe038ce805f41dd464e59b048afb9908092bc5e8a45fb0875ad3421d0544e0d4f3 DIST c4fs-0ee9c03d0ef3a7f12db6cb03570aa7606f12ba1b.tar.gz 25156 BLAKE2B 864a6a75c5ebe15d73fb6ffa5a83cd6448f37a0f465bf3992fc5bc1000f06d6e945c99b9a4f8f3625499c47ea719a49dd340d11e37c11ed759d1adcb1ea585be SHA512 58149c055b1f87abb12a01b042600a2927bfe7afeb878ca4523b658b0736aff6f752cd579c748cf9d4c85b4229ea50a1e70d633f85f9041fe157765286fa5233 +DIST c4fs-59cfbae26b821f4d4c50ff0775219cb739fa7f46.tar.gz 25149 BLAKE2B 8c8fbc59112e5a2e5d2a9aa8a0dc6665466ca309b78bbd5fe0203489bd8823097c79ff09f0dd1d33595f5b052fc95bde911580b8b083ee63f349a7fd0d0dde86 SHA512 3a76522f230c26bbe3b893421b1785259a79a4e7e01f83a2530f35af5d2a10195e4b85cfad6e8a6942715120f3c3b7f3eec3e95ac043ac5b47029dcd0ee8c3cf DIST c4log-457a2997e8ea26ea2a659b8152621f7fead1eb48.tar.gz 12056 BLAKE2B f0dc357c8beb28b2fa73e77f85918c3285be08a6e6c750317b7babddfc2372532d56b29a01adbc2284b7e850aeb2a45f1b24599acca0d0feccf5d60c00432627 SHA512 f728b34c000bbd58ad02d003697de1185feffc1a349600153a7d851f8dac28b88433e97c81dcb14769a74faa9e3d86b297536e8764d6e00b886f11bb2343518f +DIST c4log-f4cf64caedd622a739aaa3ecb67a5aac105c2919.tar.gz 12076 BLAKE2B a5d09011d65aabad37f6821430a48e2ab0808863c34c750c7685f3de4b112251a6c7679b5d8962e83f3fe0847cbc9d80b791ec58907a4ee613dda950c947b553 SHA512 097c4566ad4f2906299e544ee067b01369433b654590cf4cf87cb56017caa5757ba037fef5ed1fd00c143a59e8d66013b07a28ad014903d761919a5ddda7c9d1 DIST rapidyaml-0.6.0-src.tgz 7384217 BLAKE2B b81f797dcdac10368231256765bff08fa9d911550b620c286a657b41e74e589701a41d4f6e33317a7149fd1a2aabbad6bac6c66c1e494db053251e20bc5e505c SHA512 6637aa970919d76339ca7d3d131032ca97720650e275f7e285c0fa46671daf8638695c4db6ccb06f93671171110c445781a7f2c8e37f6d9a4951d6e649f60cde +DIST rapidyaml-0.7.2-src.tgz 10139792 BLAKE2B f50005a313414073281258ed66d973adb9cf22995bf8742727b5f1910f05065bb14baac7273e437c450f72e984b713680a83951706f0cc0564113c406a07748c SHA512 076420688d9e230627ec48013928ede74a65980c1bf5335a187270f90958eb15af11e7958379e4915dbd35723f2eadfb425531a460fb0a0467559f9d1ba34b6e DIST yaml-test-suite-6e6c296ae9c9d2d5c4134b4b64d01b29ac19ff6f.tar.gz 99765 BLAKE2B d55a605623c988a4c58daa6dd155980129ffefe86570d55b1ce2514dfa77c352e0467b12e95d6e2bd38cc0454f0b30c3109c088841ddbe423b8bbb7d9e41bc9b SHA512 4ab0e52369d085e696196ef1aab8ecb4f0218e48e8ce33c4ecc863942639141601cb1c83b41027eceddc20a6a4cebfc51abcb83779007e890b87d79c76394946 EBUILD rapidyaml-0.6.0.ebuild 2252 BLAKE2B c09be1414db7519fb861316be9ad31d0aed26d708e2dffac15c904268320bd88d1c0f8fe7324f37d62a176dd77604ebc271f9d540166f59fd15b6c41d156443d SHA512 bd7117d6e2fb0fd42c325f83e0c944b6e7b3aa5d947b28e27fc4ead94fcd382210c3259ce8e6a0ac23a11c16508a696b2c2248e7ea581bef391d7f2a15cf40f5 +EBUILD rapidyaml-0.7.2.ebuild 2942 BLAKE2B 7c36fc1d3f2a7f103121f0cc7cf77714c7989113bb6107bb419fd644f50582baccec6edd4da63b0eb953084799939fdabc44bc0d22aca7b2119dbf77e341f357 SHA512 f2ed0493e7c4310da43646c2709943e3337b999dc1f8b401cad9a21a0974bfe75fcb15c264689350b9212165fc3eb29a31ae0b71f9edca7ac0a182fe8115dc73 MISC metadata.xml 375 BLAKE2B ae9fc516e43fb6561964a17a58c9c2eefffeaa918a62c325c0b72847c60dad692c107f5ea27a2b6abbf93f73bc27f8a24a00f57dfcbf72bb0f6bd9a5344b6ea2 SHA512 263bb4123527bc4e48c2d9ccc4d797e943be1a5924dd8504c09f028728297c46d3e17e0716ea50a6a35fbfd3561043711ac554776a6c538543ae51ba11ab72a1 diff --git a/dev-cpp/rapidyaml/rapidyaml-0.7.2.ebuild b/dev-cpp/rapidyaml/rapidyaml-0.7.2.ebuild new file mode 100644 index 000000000000..107332c03e0e --- /dev/null +++ b/dev-cpp/rapidyaml/rapidyaml-0.7.2.ebuild @@ -0,0 +1,97 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake flag-o-matic + +# see no-download.patch, match with release date if "master" +HASH_C4FS=59cfbae26b821f4d4c50ff0775219cb739fa7f46 +HASH_C4LOG=f4cf64caedd622a739aaa3ecb67a5aac105c2919 +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}" +# Bumped fwiw, but believe the future of this package is to be last-rited -- +# its build system is a maintenance headache and the only remaining revdep +# (jsonnet) is not only incompatible with this version but upstream has +# switched to single-header version and will not be able to easily use +# system's anymore: https://github.com/google/jsonnet/commit/4003c4df8ee +# +# Leaving unkeyworded rather than do extra work until likely last-rites. +# If kept, will be dropped to m-n given I no longer need this. Feel free +# to take over and drop this comment if needed. +#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() { + # not looked into, but tests fail with lto and USE=debug fails to build + filter-lto + + local mycmakeargs=( + -DGIT=false + -DRYML_BUILD_TESTS=$(usex test) + -DRYML_DBG=$(usex debug) + -DRYML_TEST_FUZZ=no + + # 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 +} diff --git a/dev-cpp/robin-hood-hashing/Manifest b/dev-cpp/robin-hood-hashing/Manifest index cb9a16c43216..acb412a6d019 100644 --- a/dev-cpp/robin-hood-hashing/Manifest +++ b/dev-cpp/robin-hood-hashing/Manifest @@ -1,3 +1,5 @@ +AUX robin-hood-hashing-include-cstdint.patch 357 BLAKE2B debcd55902985d2f63e3a61c8774e14bf37849ef0b9f13513104c52351f499f77062d65f86211fb908569c43a38203977e4e250ecea96d7a29abb5d5cba4d416 SHA512 3599a407a8a27ce13b7e29b108599aef2af2cabb76ccbeb3e15f52b18b1a726c4bb71b95c8e67c6f1f38bfd090d780b113d82d8f38d84109cc56bf126fd9aa31 DIST robin-hood-hashing-3.11.5.tar.gz 177134 BLAKE2B b114c1d68ff2eae4cdb526e67def750a11056c2b5c400eab0870fda7c81dde5cf3bb168ea13ed3d34f2e57edffea5c58cb79ffb5328ecf839c723c71f54676d3 SHA512 5f73e089b1e8ec41a9bedded22bc64a789d3a3d04873a2ad9f8cc2970797a473b0f4d3436c2324b3ced85a0d983998a75b1dfaf2b7f3b77235b29806ff2fd489 EBUILD robin-hood-hashing-3.11.5-r1.ebuild 586 BLAKE2B d4daa6220cb51afe1bd31ceaf0eb0dc4c622016bbf642dd7099f2de583098d0477643e33e0d80d7c4cb8adfad490449a4a047aba305d843af754187c1b819927 SHA512 9caff99a89320cfd3ee7edb230829811c75e4573bbdeaf21ae892e29c935556924c3cb09c6cf7410b4483cb03f113ab333ea231549b059223e5deb49aca0e592 +EBUILD robin-hood-hashing-3.11.5-r2.ebuild 643 BLAKE2B 38a7d2638896628b5aadaa8de75d38906b13597acdea7184c16e9617735301c09c3e7309cdbd8d3d84273c2997cf47e5b6c39e4e71c67ad3453f5cba2a5feb97 SHA512 f4dce3e028c1357e6d5fda8e4cf717b65476543ca7ce18e8d2ed5b3a62066f9c1009c625b08ce4de73e07a6d31547e84e1132fb3917fc2de01cf1d4ccbb11d79 MISC metadata.xml 432 BLAKE2B 13444b194ca3577792724af24a8cab24ccb905027261334a26115b099ee36f3cd5b5ecd4d1dc71f03ef33962ab3c068d627c7c85baa8e212007339c27c2a97f1 SHA512 0a915db4e5e7b6ef284e8c798fba99b351c725fc8e18158f4176d0a8211af2215058ad59124780c11cdd3bd9d7a2a2a084131aa92a9921e50aaca76c7c86a154 diff --git a/dev-cpp/robin-hood-hashing/files/robin-hood-hashing-include-cstdint.patch b/dev-cpp/robin-hood-hashing/files/robin-hood-hashing-include-cstdint.patch new file mode 100644 index 000000000000..e5f10b7a0126 --- /dev/null +++ b/dev-cpp/robin-hood-hashing/files/robin-hood-hashing-include-cstdint.patch @@ -0,0 +1,12 @@ +diff --git a/src/include/robin_hood.h b/src/include/robin_hood.h +index b4e0fbc..b83eaef 100644 +--- a/src/include/robin_hood.h ++++ b/src/include/robin_hood.h +@@ -39,6 +39,7 @@ + #define ROBIN_HOOD_VERSION_PATCH 5 // for backwards-compatible bug fixes + + #include <algorithm> ++#include <cstdint> + #include <cstdlib> + #include <cstring> + #include <functional> diff --git a/dev-cpp/robin-hood-hashing/robin-hood-hashing-3.11.5-r2.ebuild b/dev-cpp/robin-hood-hashing/robin-hood-hashing-3.11.5-r2.ebuild new file mode 100644 index 000000000000..cc77a55b6b9f --- /dev/null +++ b/dev-cpp/robin-hood-hashing/robin-hood-hashing-3.11.5-r2.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv x86" +SRC_URI="https://github.com/martinus/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +DESCRIPTION="Fast & memory efficient hashtable based on robin hood hashing for C++11/14/17/20" +HOMEPAGE="https://github.com/martinus/robin-hood-hashing" + +LICENSE="MIT" +SLOT="0" + +PATCHES=( "${FILESDIR}/${PN}-include-cstdint.patch" ) + +src_configure() { + local mycmakeargs=( + -DRH_STANDALONE_PROJECT=OFF + -DCMAKE_INSTALL_LIBDIR="${EPREFIX}/usr/share/" + ) + cmake_src_configure +} diff --git a/dev-cpp/robin-map/Manifest b/dev-cpp/robin-map/Manifest index 58a0d671a2c6..4b15da010cfd 100644 --- a/dev-cpp/robin-map/Manifest +++ b/dev-cpp/robin-map/Manifest @@ -1,4 +1,6 @@ DIST robin-map-0.6.3.tar.gz 64506 BLAKE2B 46a2b5b47346016695db0c49f73cfbf8530b7db0a31527030eb00f3b6f0695325ab6fe16de1e60d6b1d0793818bdd1e31e50117f2e2e4c50154f65b38ac66d84 SHA512 485557f300d33bda62bb8accdf246819ee8ffe956bc022e7ddca54ff6ad1a9fdb8db8d80690add3ef238e834d1eb8e2905920cb0a0674e7df010f6946d01297b +DIST robin-map-1.3.0.tar.gz 70562 BLAKE2B be6ee47ea06edd2485c16e02eecf8db28c7d18c2eb933450df54e0bab8c7ded79954a295a65a8990b641896186efef391a9f9f0f5b236ba96154bfa6cac45e14 SHA512 862cb98d771d1acb692e27d1cc8a4f2cda0883b66af7b38b63ea702ed2d4fc4d49e5700ca4d5f5148fee132f36e111c4839d4f8c52c96a9c60f3937d941b2320 EBUILD robin-map-0.6.3.ebuild 509 BLAKE2B 5dadc9271c94156fc401511e0e52d791d6e52ac463ebf8b7b6e3141e2ea09dd8379b36bcca378b899e353b48a8a6234fbe67176cc1f6ddc162dc37b73f0dbc30 SHA512 9a4a9ec944384b25dec8ad9c086b80939a18ca79bb7b7a8cfa2bfa6d9718f5b5460124ce86bcab59c753203f52cd57d9c95ce149f095a3b77f4cb9e438fe402a -EBUILD robin-map-9999.ebuild 504 BLAKE2B fafe5db735e95537d9885600e4a2c760ed5070c769079411ea422c892bef4b06033f50456b855e662760a2d71eabdc8ee3b1f9f1e9dc5f0785893b34b1187877 SHA512 42dc895fc411aaeca3854220783c544dcb691c54590af7d5c7562fc44cde6e19a86d10c3ceb942ea2a34eef36115e513fd318867592ae0c9d8302d0ec912216a +EBUILD robin-map-1.3.0.ebuild 790 BLAKE2B 82ff36c09525d7b0683161c02803a8a523652dc6a7a1d120a628828d094b02c9c69271fa114efba2063787285950328472ca182e18809ea87e2d337c10c7e3f5 SHA512 de2a6c084e908e38f300076740133191fe0cf1db1b358777607beb732c943264ff2a3c399430c69373eb70ac97ad54176ae9bd954604d407ebb1b636dc014e46 +EBUILD robin-map-9999.ebuild 792 BLAKE2B 9ee7616fe76d34570d1bdaf02d23b7e3b9ec292e5b72268582236b66500baf859ac8e6d4f70a859dfbbdb28be53eabd94e6904372a70b462b15c17dd8dd00ec8 SHA512 e68b25b99abb5f98e4eddc791e1f6d21f5e66e733e25bf72968f36b472ab6446a526a79c4f702c2d7b1ee08184f6faaed7213432a2a8683d300147fed507eefb MISC metadata.xml 345 BLAKE2B 5cc37d0c8e9121615d9a64f9c0a2d401f10a37e82a17627c2b0284b7ec557d689b6f37475cc7f948a06e56cb94c96faa8d50082298ffc06dd2109b0519d3473f SHA512 e7aa93500c38f156256e9f3e2b62a1c98c0016fc70b930f69287737438931ef8cf09a92e5f828d5ae2fd140c94af50e3aa0345b2f0d9499764f0f6f37438ebcf diff --git a/dev-cpp/robin-map/robin-map-1.3.0.ebuild b/dev-cpp/robin-map/robin-map-1.3.0.ebuild new file mode 100644 index 000000000000..df97543a2226 --- /dev/null +++ b/dev-cpp/robin-map/robin-map-1.3.0.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="C++ fast hash map and hash set using robin hood hashing" +HOMEPAGE="https://github.com/Tessil/robin-map" + +if [[ ${PV} == 9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/Tessil/robin-map" +else + SRC_URI="https://github.com/Tessil/robin-map/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86" +fi + +LICENSE="MIT" +SLOT="0" +IUSE="test" +RESTRICT="!test? ( test )" + +BDEPEND=" + test? ( dev-libs/boost ) +" + +src_test() { + cd tests || die + sed -i \ + -e '/Boost_USE_STATIC_LIBS/d' \ + -e 's/-Werror//' \ + CMakeLists.txt || die + cmake -S "${S}/tests" -B . -GNinja || die + eninja + ./tsl_robin_map_tests || die +} diff --git a/dev-cpp/robin-map/robin-map-9999.ebuild b/dev-cpp/robin-map/robin-map-9999.ebuild index 99255a6ea187..5ebd0b902e42 100644 --- a/dev-cpp/robin-map/robin-map-9999.ebuild +++ b/dev-cpp/robin-map/robin-map-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake @@ -13,8 +13,25 @@ if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://github.com/Tessil/robin-map" else SRC_URI="https://github.com/Tessil/robin-map/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" fi LICENSE="MIT" SLOT="0" +IUSE="test" +RESTRICT="!test? ( test )" + +BDEPEND=" + test? ( dev-libs/boost ) +" + +src_test() { + cd tests || die + sed -i \ + -e '/Boost_USE_STATIC_LIBS/d' \ + -e 's/-Werror//' \ + CMakeLists.txt || die + cmake -S "${S}/tests" -B . -GNinja || die + eninja + ./tsl_robin_map_tests || die +} diff --git a/dev-cpp/sol2/Manifest b/dev-cpp/sol2/Manifest index 59216791adbe..b02b3d8f07bb 100644 --- a/dev-cpp/sol2/Manifest +++ b/dev-cpp/sol2/Manifest @@ -3,6 +3,8 @@ AUX sol2-3.3.0-catch-depend.patch 376 BLAKE2B 7db0a0697e42a6045319636157f31ecf47 AUX sol2-3.3.0-cmake-dir.patch 1065 BLAKE2B 906ea8df35dfb8908bf114ac9fc6fbcfae9de6e3168a3d8eff437248ed071cb58a4d6c6a28430a5d4a9e4cf01080a13a62c30f37120339eabf0da2d58aabc9a2 SHA512 10a850a5376838217686ce748d6d99b85d1859c0d8a8bb7fc0d24f5158c3456d8774ad739eb881d58e7396199df8873877e4bc9a1143b3a4b9c568906b86c293 AUX sol2-3.3.0-dont-install-tests.patch 289 BLAKE2B fc82c80a6b5fcc651b43308d1604414249ee462c406554b9b61aece253983c76cce1ee691d404e6486bbd566e521953ce076206053e2bf4bee9ee7f2944434d2 SHA512 bd43744581315bab42b603a3b1e163a86f36936bc444eb1c67504a710323978b53d00bb5b9fb8865e4d5831c80f713a52cc4bd4e02c2dd054840dd47153461c6 AUX sol2-3.3.0-werror.patch 854 BLAKE2B 4ba8febe3e225a904501a61d0bf7bb5a8539b1c8dca65e67ce5b335116851549ab31321126eecc3b8b9c9439491fd8c097430b15fce17c42a8ddc73f50a4fd0d SHA512 00b267ab451cfa9210db5a3ce5de67b33c58438a46be8178cce4dcf1ffd31ca2e5bde0015ccb72e2e641b7a0a59996d88154acc765b6eb3891bb092bec0bf46b +AUX sol2-3.3.1-fix-emplace.patch 660 BLAKE2B b36439910c10c2bb3c86d5911c3aaf20906e411d7fddc40ad2c201c685cf8feea4c49e4e5835396c4d6d1447ea672b55e2f55e7291e74d0eb7f4add9bab7e91f SHA512 3563d2d272bb5d281c4d9875b5ec0cc94548adc0b3ca58f648a20e26e0d180fbb0b35e21d3b6a0ca51808b4744aff4796ef599c6cd17bcc44697e20ff951fb61 DIST sol2-3.3.1.tar.gz 8453954 BLAKE2B f9fced4f001a5f681598e45bf74cdf064f655c950be5b91789d2bf66c0180b5048610d3d4416c024a07db11d41fceaee786800c5ca1412811cbc1a449a894a9e SHA512 4404b124a4f331d77459c01a92cd73895301e7d3ef829a0285980f0138b9cc66782de3713d54f017d5aad7d8a11d23eeffbc5f3b39ccb4d4306a955711d385dd +EBUILD sol2-3.3.1-r1.ebuild 1404 BLAKE2B f4b7ca3ba02f29728b5ecf0ddcaec5722d07a185ce780812456b3ba0a9a69ed92062622ddf9245ff2b8f834a9f5a2597f89fd6d24bcdc342ecd3ee9b5d77c39f SHA512 69792db4cce41f83202a82dfe1b938ae6fcc5d82a2c42a6dcab9488396c03b3f7aa46f0b641541ed0eeefcda069922b146575165d411f53e2a1366058d6ddb6f EBUILD sol2-3.3.1.ebuild 1360 BLAKE2B a0a619ce293f9c658142ba6cac3a28da9359ca658391be51ac7049a8e65e81a2a805654426601bc9503c389efa2e00a11163e66a382d8bb9017baf6ecdef332d SHA512 de9b08a6c6c557f2acc702b3aea402a9c094f441e79ffa8f13a1f05cfbb844c3420b901e17a98d23480047956d65d7435fd7548fa765736138a61510bbb7ee3c MISC metadata.xml 594 BLAKE2B 911a1123a653118d9c19c3ff1a42a979a696d034500eda29a18c72e6f89bcc2f7c4d28977c76a40f61b79649c3f4aa63439cda96311e2cdd2bc9495ad1a85db1 SHA512 5c8252373ee8bdefe9b2863df048616beec0d00dcf1cd7845302721f78158db48729d9ab412dbcf4bed49130518acd2071ca3e5880488a882117ec5728e26b9a diff --git a/dev-cpp/sol2/files/sol2-3.3.1-fix-emplace.patch b/dev-cpp/sol2/files/sol2-3.3.1-fix-emplace.patch new file mode 100644 index 000000000000..5d926a700979 --- /dev/null +++ b/dev-cpp/sol2/files/sol2-3.3.1-fix-emplace.patch @@ -0,0 +1,18 @@ +https://github.com/ThePhD/sol2/commit/d805d027e0a0a7222e936926139f06e23828ce9f + +From: =?UTF-8?q?=E2=80=9CPaulo?= <paulo@ubook.com> +Date: Sat, 25 May 2024 01:52:59 -0300 +Subject: [PATCH] fix emplace + +--- a/include/sol/optional_implementation.hpp ++++ b/include/sol/optional_implementation.hpp +@@ -2191,7 +2191,8 @@ namespace sol { + static_assert(std::is_constructible<T, Args&&...>::value, "T must be constructible with Args"); + + *this = nullopt; +- this->construct(std::forward<Args>(args)...); ++ new (static_cast<void*>(this)) optional(std::in_place, std::forward<Args>(args)...); ++ return **this; + } + + /// Swaps this optional with the other. diff --git a/dev-cpp/sol2/sol2-3.3.1-r1.ebuild b/dev-cpp/sol2/sol2-3.3.1-r1.ebuild new file mode 100644 index 000000000000..04c86b3588ee --- /dev/null +++ b/dev-cpp/sol2/sol2-3.3.1-r1.ebuild @@ -0,0 +1,68 @@ +# Copyright 2021-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1,3,4} luajit ) +inherit cmake lua + +DESCRIPTION="Header-only C++ <-> Lua API wrapper" +HOMEPAGE="https://github.com/ThePhD/sol2" +SRC_URI="https://github.com/ThePhD/sol2/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +IUSE="test" +REQUIRED_USE="${LUA_REQUIRED_USE}" +RESTRICT="!test? ( test )" + +DEPEND=" + ${LUA_DEPS} + test? ( + >=dev-cpp/catch-3 + ) +" +BDEPEND=" + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/sol2-3.3.0-werror.patch + "${FILESDIR}"/sol2-3.2.2-luajit-pkgconf.patch + "${FILESDIR}"/sol2-3.3.0-catch-depend.patch + "${FILESDIR}"/sol2-3.3.0-cmake-dir.patch + "${FILESDIR}"/sol2-3.3.0-dont-install-tests.patch + "${FILESDIR}"/sol2-3.3.1-fix-emplace.patch +) + +src_configure() { + sol2_configure_wrapper() { + local mycmakeargs=( + -DSOL2_BUILD_LUA=no + -DSOL2_TESTS=$(usex test) + -DSOL2_LUA_VERSION="${ELUA}" + ) + cmake_src_configure + } + lua_foreach_impl sol2_configure_wrapper +} + +src_compile() { + lua_foreach_impl cmake_src_compile +} + +src_test() { + sol2_test_wrapper() { + if [[ ${ELUA} == luajit ]]; then + einfo "Skipping test due to https://github.com/ThePhD/sol2/issues/1221" + else + cmake_src_test + fi + } + lua_foreach_impl sol2_test_wrapper +} + +src_install() { + lua_foreach_impl cmake_src_install +} diff --git a/dev-cpp/sparsehash/Manifest b/dev-cpp/sparsehash/Manifest index fca7b1d4140d..fa1714e0ba10 100644 --- a/dev-cpp/sparsehash/Manifest +++ b/dev-cpp/sparsehash/Manifest @@ -1,4 +1,5 @@ AUX sparsehash-2.0.3-fix-buildsystem.patch 2649 BLAKE2B d7a5e7d4343279af069e0b8eb00ad2b8fc33e26840ee0a9ca63c73ea37aa99548d3c741d70647078424f27906946f261b07d764be9adaf47c1d13bc4bf6d302f SHA512 6732a3197550f75ce7a83d61882938d841694f41e9daec51ef36206306fdabdd33dd46eaec106a8877826098b8227368c1ed0962d36aa220abd0336713667bd4 DIST sparsehash-2.0.4.tar.gz 323154 BLAKE2B 8e0da89a6ae684271293f048092d6c79d14818f7ab9d4fa449414b3354f9e7769d9b0cc724227c47a1be7c7357cdac5cf6f3873047a08c8f085cc457858a8826 SHA512 40c007bc5814dd5f2bdacd5ec884bc5424f7126f182d4c7b34371f88b674456fc193b947fdd283dbd0c7eb044d8f06baf8caec6c93e73b1b587282b9026ea877 +EBUILD sparsehash-2.0.4-r1.ebuild 536 BLAKE2B 8d7c23b122acc007906281bcbf5aaee3facc0582c4f9618fa528d7a2b16c8e221084b0bb0aaafdb4c5b64761240c7ae124625dc7a4654f309b82ea6167f1c937 SHA512 f9f3505a61d5b24a92e142ddb35e84509c9642c302b5c4198ca9d7e75160261e61bdd500f5d1537e60709d473f3e9105aeb255c0df4ffdcd1d5c8931c4649cf7 EBUILD sparsehash-2.0.4.ebuild 535 BLAKE2B 4193e724f2289877d7f2026abf31446c60176d87d19ad95aefcc220acf16fa9dfe8757bd649a7a5edf60ca051a6b55559de1395e199ed576eba59910f2b30949 SHA512 3113d72f49fdb3711effee15cb490b0dc23439b5d4eea08a54e9a3dc9964fe2d62bca56cc35633c14a0796e28c715029e9cff635f8fab63e86769b7d1aeb2404 MISC metadata.xml 334 BLAKE2B 13c59a7f06e31a02327cd4a394645f9b0e05f9703d093ab401fe6a0bf0ad8810283b3fec4cb0a87d9b87925bce0703cbeb5bf57717e7975e3fed4ce15965e850 SHA512 80339a3d0f36902822493ce7fcf0734840eeb8a107838e5d95b2ab59aa5e55f3c50bcfc266f4a989c768ae758b0fa5a22d18e0bbf070d7f1150e076ae0d4d544 diff --git a/dev-cpp/sparsehash/sparsehash-2.0.4-r1.ebuild b/dev-cpp/sparsehash/sparsehash-2.0.4-r1.ebuild new file mode 100644 index 000000000000..4fa97720bb96 --- /dev/null +++ b/dev-cpp/sparsehash/sparsehash-2.0.4-r1.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="An extremely memory-efficient hash_map implementation" +HOMEPAGE="https://github.com/sparsehash/sparsehash" +SRC_URI="https://github.com/sparsehash/sparsehash/archive/${P}.tar.gz" +S="${WORKDIR}/${PN}-${P}" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" + +PATCHES=( "${FILESDIR}"/${PN}-2.0.3-fix-buildsystem.patch ) + +src_prepare() { + default + eautoreconf +} diff --git a/dev-cpp/tbb/Manifest b/dev-cpp/tbb/Manifest index f41f489c2adf..f1240193e74a 100644 --- a/dev-cpp/tbb/Manifest +++ b/dev-cpp/tbb/Manifest @@ -1,29 +1,16 @@ AUX tbb-2020.1-makefile-debug.patch 2640 BLAKE2B 98e1d88f279452898be78fb53235427a5c45a0056429e07acd5bc273a48c7214dc8df29c72cba344688f650fce25bba06f6f9e4dfbf1091260544e95159cf33d SHA512 9a29ff67321b75efe10621bfe924e89a5c51d4e7327e20aa69018aaea590189ed297b9ab94bd3b48172d0b093e3d2aaebfc7088b480364f6f6c7802a27d3c1e4 AUX tbb-2020.3-gcc13.patch 1384 BLAKE2B 8d4288d8c4597247930949d053bcbc4f6b91f3693a6b2e54b67b2ca6f0c2d4797428654eca0afa3b09d0cd2eff005d553d637cefa962017b80a7af8e0efde49f SHA512 101781458837345c0efc1c3cd7c8d1d517628df190a73a9b8d9de55cb150807cd8c548bdd33ee11a837b07bb6f3b705f4bc4ef5a57a944fe9baa6c34958b1164 -AUX tbb-2021.4.0-lto.patch 9710 BLAKE2B 801b7886af6ec02f118add4607c22b26cfafb14997162d5d4e72ec3b48d6ab5ea03995c6a02957331b65172b2d18d932b59bf655352dcbbc178aa508613681f1 SHA512 d65c84a3246dcf5a7c799fd87566834842adfd104bca2c0b0cbd9e2dcae0b900a189154ca9d9c95351c32ff9014cee15f0eb924228e486b58fdcfc624b12d46b -AUX tbb-2021.4.0-missing-TBB_machine_fetchadd4.patch 645 BLAKE2B 8a769caed4817413f8e8d11ae3264a75769826989e3815cf24fa856d601ded1ffbd7edd772aa268ca0f8afa15f9fab8bf1deb019635f2355377367814c62d5ce SHA512 d84bed45b82cd63c8afb1f22e2688a7e298014997fa3d1107d7a91b1d4a0f7a54a42cfa38841a051c6a0ca6721182584472f34362c97edba02e3131c77230545 -AUX tbb-2021.5.0-flags-stripping.patch 1078 BLAKE2B 32b5463980ae8841ce551caffb91d5bb20a70af4d93d6c0d9e45bd235f3948599c42fa779eb4c53a6994275d827c0074dab8cb2e66313989a1ffe067e48b12c3 SHA512 22460e212ea506bfd13765eb9557d21cb19d4fd9f42e195ed36f12aabd6e9b4c24a218a5bcb55894f45ce0f118de89287751913d386931bd9cda3a389bc04345 -AUX tbb-2021.5.0-musl-deepbind.patch 982 BLAKE2B a605db66a697ce4cf826448ea843529464b224882708c26623acdaa573a07ca157d562c0e03e12dc8480871f3327daca144a0bc238a5a15421b17966c429c9fd SHA512 6a6deca9d6ac037704e75abaf1544627c369057636214fa0a9c573fc190900226fab3760d8b5afe3ac7ac456bdaa105f0912173d054fe2eaa6dcdbadcb9822d1 -AUX tbb-2021.5.0-musl-mallinfo.patch 931 BLAKE2B 7e77b6bed7d0a8422e45499317fd02ea080e94575e96c0610e1503633a296855095b675be1b679d4b97c8e50e72736d71582c30a91d7630c02b0c98996d2abb2 SHA512 21555821262a29b904ff3c0c8a023459c5c2ae0df11d17e0e2ec36d680016a0a2c4808ad257e1a3fabd78046e5ac795f5906aed129c35e40c257251957722723 -AUX tbb-2021.5.0-musl-setcontext.patch 1409 BLAKE2B b7dbb2379cdf8c27fe704850e9ef9d9630719c3031d7f5591e973648c5e299f90b25684aab7af95a56038dde3e490e6711f5a443e016404129d92de549f9c55e SHA512 558c917326408818cd0c1d8169fd958533dab9470e2a04621ff396de61c8a371a68c9f4a2d9f1e91ed79bd57605be3208e4e473e80cb3f38db526a673ff3468d -AUX tbb-2021.5.0-x86-mwaitpkg.patch 1975 BLAKE2B d072f7dfa7f1fbe5986c409147419d782abd1c21e602a8555a696833c7c919f2e6996f8a2fd1e61fb6d3ccdf00f0ce5ee9b78ad53770a06f632cb6029bb74029 SHA512 de952018c2b82634f02f38754d0cb92d31229b9546a135ac54d43b53ad2d0a74ba3bd02946e856c29455438e539a0cf5bc3fb4eae35aa0774baa1faf723e8b61 +AUX tbb-2021.13.0-test-atomics.patch 1391 BLAKE2B 96d18091c1df00c2ae4dbbc341a727559a3137e940a2c90efb8bd218f63b0376451b58ed1c0f5ef8a3711c48c82d7fff83eb07443a92736a6e50d942d8071f5c SHA512 0d155b182ef85437dfa16021b5cee12fa6534318a4890c08cb107826f0ebb327385dd540a094399ce53e91211fed16983a359eeabb01d04dc7d2445cf49c638e AUX tbb-2021.7.0-pthread-eagain.patch 4515 BLAKE2B d5a2d3d5dc0a4607227f03200901985fa823a6be2817c34e58e166e639f1f294a2ab65407140a8b4423e30d217fa3c04a4493dd3e4849d77877473002006870c SHA512 bfbac70acc603796f93c7712017700fa1de99cd1aa984f8015863f66ca6caaa03e5c4705dfc42c1af7592bc5b05b7ba9b48df7e5686d27f4ce67c53b954775cf AUX tbb-2021.8.0-gcc-13.patch 735 BLAKE2B d67ab028669cae808058d68c74ec4ef7477641afc025e9c5e3ce59912571330c2e3cc85b7fd25db2a7a084a1f05a82794ccd48c3f5f72a1c0893535de250f038 SHA512 ad9547149a68ab0ab78c28413d85b2496fcaf9d94b0ec48b4d723374092230ab4ed1b6d32cd05a63d8046036ed8f2c68cd91f38585e4dab6839e81383580a8d6 DIST tbb-2020.3.tar.gz 2639788 BLAKE2B 3e92bccdc8179fc049379ccbb8ad7f615623177abc61d813b1a601020c345137bfd7d4c4600cf5b0d587e5ebef677635c3c8124d06b05fdd3325128ed8c9f84a SHA512 04c4b5501418792827190691d03d20d4dc1fd3cbbcf459a4d40c5c2281d964e658f31f133ad3907b78e17ed04f4ff16728ed89487ed0ce2cb239f23feb34bd87 -DIST tbb-2021.10.0.tar.gz 2598088 BLAKE2B ba8352474b97c3d98b534cbfd8f61af165352967529f19226dbae17f17d20a8b5dfd7a3b29bab85431620cea1ee1c5990ec7311cc9b1b865d6aa1800540dd6d0 SHA512 d71cf317e7f78948c1ea20977cfcfba1eff72cb20c457c87e624cb3aaa3215a1c24eeeec11ed6ed99cf118c577d956234202458bb5e0215c9c317099d9c3b732 -DIST tbb-2021.11.0.tar.gz 2613493 BLAKE2B 2b56042c8126709b6f36c1118685b28ddf2ff39b6563aae168d6bb8106d234757ff125a39da37f907a7da62f2f2ad64e4db01ca028d20c1e74def4ba2e92c1a6 SHA512 4779141b7602f2fa3a509fdd346824ba270a3a568df3649ce8cb51264d233df5cec5e5cb67b91319dd11d3d5e054697b4ed345e07216107985ddb6e1e7ef94e5 DIST tbb-2021.12.0.tar.gz 2617255 BLAKE2B 3e1db8b1972a7225c5355def66ae40006e6e0f0f97e2efff45dd361f724e348a2f0476bc14b59f89f5361cac6fa36a4973602467bc7fbb2b8b139a4ff4dd58de SHA512 64022bcb61cf7b2030a1bcc11168445ef9f0d69b70290233a7febb71cc7a12cc2282dddc045f84e30893efe276342f02fd78d176706268eeaefe9aac7446d4e9 -DIST tbb-2021.5.0.tar.gz 2463218 BLAKE2B 2d50d312b86318ba4923afe68753b3781f9646cbdb33861f3458301a3a19b7ca3aab6959dca085294dfc743d7f552635f80fb524ec5d780a46f58ffe02e3280d SHA512 0e7b71022e397a6d7abb0cea106847935ae79a1e12a6976f8d038668c6eca8775ed971202c5bd518f7e517092b67af805cc5feb04b5c3a40e9fbf972cc703a46 +DIST tbb-2021.13.0.tar.gz 2613916 BLAKE2B 0edd2d8a966dba673e50827629491924140a302430f4380e7cd9914f3592eaf6515204c7267649237970a5482cc030f0c29cbddd1476f16caf46989f70041058 SHA512 1f536b98c4eb331c3ba21e4b36362c932d7852b974ea7237b5f7bffb0e996d76f688c7ac534cb56f5866cfdffd5d3f015521b4c2ca21e584503070782ca82a2f DIST tbb-2021.7.0.tar.gz 2571727 BLAKE2B 2977ef1a33d9bc7baa40e0e57c02e62798a09c6c66cdbe369f2702d87fd9877c3d97f8d83f71384028995ea0956f5c5630d4aaf4edbe68538e7c514d3b87085c SHA512 d314e3d88b85c96607a9eda15e3d808bf361eb562a534c59101929236e90c187883e7718e5435b5e7f01f4ee652c9765af95f5f173368b83997e4666b7403a49 -DIST tbb-2021.8.0.tar.gz 2575336 BLAKE2B 2c3a7f0e59d70b17550f805461a15a520c7f1b3a37a41bd51c51f9f5863b50812d2b939351e11e0f4ceb3da8a47e413abe171bcb6bfb71c0fe2f81ed373f65f2 SHA512 72f68730dfd89409796f9548d3c302111787712089688a7c77092ed1b3a7bf4e7444fe4b58015d2c78b7b71259852526789b2483bf1e71bea8146c4b4676e7b4 DIST tbb-2021.9.0.tar.gz 2579150 BLAKE2B f6f701df1605913770222689063ff422416f86f132fb3fbc80f383b7c52762d3804e75200ca4826906b16c66f674918bcfd78b16a1dafb499ca53a9d2b6652ec SHA512 2ece7f678ad7c8968c0ad5cda9f987e4b318c6d9735169e1039beb0ff8dfca18815835875211acc6c7068913d9b0bdd4c9ded22962b0bb48f4a0ce0f7b78f31c EBUILD tbb-2020.3.ebuild 3437 BLAKE2B 16b92e3a47f6ff29b92163d589f90fed7cffa31f1e2d1f4e81c1e06cdf184401662be048beafa20caf924e777424b8186dc35393a4b8edbf2f5cde75d96040ef SHA512 11ef97cd4d8ce9f7f6b5cc235c13106e03d218d88ba52ea2776ef3f2e186adbf5b2f081a856b086e6d3184b4469d130f23636acec4a662a803e8e6a6dbdd4c44 -EBUILD tbb-2021.10.0.ebuild 1373 BLAKE2B 55884f50fce48432b098ac6ac8b4f1111db584dcb0fd8b97a47c432a031d401a64aa0e47a9e530f51d79fc366a1445d0b489f74b3f7b4a8a45fcaadf3a74c4d7 SHA512 0371109aeeb690b5325abd9a8fb62b6246da916807ba11b3bcd916659f35ccfd95f7f596aaaf7e6f7d588e87a915a06d5a164f0033e547e6fcfccf5b47aedce1 -EBUILD tbb-2021.11.0.ebuild 1373 BLAKE2B 8ffdd8f4c0fa0be004647dfc8bc6c14c154b3e3c1963a4c8e3a05fab58162957321457dd679fbce184ef738ad448ef4cd8c28ff3fb19aaa5d99445459db46258 SHA512 95a06feac192edac1b5cda90413b9b1aa045869acaf46c32dd69572ebf564c3ec23f54793b46a4b8fb924a1e9df645eab569db7e97b6e9a459872dc736926e14 -EBUILD tbb-2021.12.0.ebuild 1373 BLAKE2B 8ffdd8f4c0fa0be004647dfc8bc6c14c154b3e3c1963a4c8e3a05fab58162957321457dd679fbce184ef738ad448ef4cd8c28ff3fb19aaa5d99445459db46258 SHA512 95a06feac192edac1b5cda90413b9b1aa045869acaf46c32dd69572ebf564c3ec23f54793b46a4b8fb924a1e9df645eab569db7e97b6e9a459872dc736926e14 -EBUILD tbb-2021.5.0-r1.ebuild 1618 BLAKE2B f382a29be9b11a662e9f90b501c589da661a90ff0078a2f77a53f56f310748a74905f6ac5ef2ef9eda4b1ab44c02820ff2fbff1868cc6c30ee9e70e42672cbc5 SHA512 198135a64c94e5665cf172dd4c0dc07b9155bf070451c6aaa56ffeaf37c5bd1512bae15591c122f8ef73855c3189b816561ba27bb90831dd33b0e6c583174fdd +EBUILD tbb-2021.12.0.ebuild 1423 BLAKE2B 1752a9546d5c9291fc5c3081ebb237be2172cc071143e587dc5a2278143279d756308a9f3f445069da8c6a41d6cab1f124625963fffc0a0e27b0f11df9bf695c SHA512 48ee55cdc0a33d8b7ffa56fe88791d13469fb0a21a75d81410f616dc59013f38bcf34c08d15691ae7973093d9d1f3761568da96b7079ba50f2400589651fa086 +EBUILD tbb-2021.13.0.ebuild 1423 BLAKE2B 1752a9546d5c9291fc5c3081ebb237be2172cc071143e587dc5a2278143279d756308a9f3f445069da8c6a41d6cab1f124625963fffc0a0e27b0f11df9bf695c SHA512 48ee55cdc0a33d8b7ffa56fe88791d13469fb0a21a75d81410f616dc59013f38bcf34c08d15691ae7973093d9d1f3761568da96b7079ba50f2400589651fa086 EBUILD tbb-2021.7.0-r1.ebuild 1092 BLAKE2B 449710ffde68b12225ac8bccd749f54abda65e6764339cdc56b855e2fceb084362971302d1f9bbc6c8742cbdccb430d02b9fe0babfa46a3d5f3c246c679efe8d SHA512 a4af6752b60e17c22215f2455643e3ebc3440dadc058196f0482fdde08bbf95184ad1fdf9fb3f6409287d6406c3b4803fd30c0a1b349fffdc9bf10a4db14ed52 -EBUILD tbb-2021.7.0.ebuild 1112 BLAKE2B fd19a921be35faeb73ab5bf64a124e02055da4b52b9fbdc4f23eb1131042260d562016fff0a91e3ef9dc53a864ca5d6ebd33b2b2cc5b677bd600eebf740dd70d SHA512 e9d46e652ca21812fcbfb9e2d37967167c72bb45c5d246c10977fb2b80c129ce24525647abf34a491f797a673e349b600badb6783a327301bede83c0b5173cb0 -EBUILD tbb-2021.8.0.ebuild 1424 BLAKE2B 1600ce57224eaf970b53fbca75fceca6746571765df9c7a652f4e1b463b3f05d2c8dc010020c4d397e9af0398638ed2b07e5fefa72436a21b8ec07623f567ce6 SHA512 71c1c13df0b806bfda979ff617eebe81c62355b8a1f8d9094f3c48f333a7a616bbad80b658788cefe19c46ed205476b597b76e6186eba173533e79234dd68a77 -EBUILD tbb-2021.9.0.ebuild 1368 BLAKE2B 893d9b7b964e0bd1d2715170765c0045ac4d019a69f8a9318c07888545dc9d86276bc77d33470a4c295883d4fbb78fa518e03f56fb67d2578761d57fe75d3af2 SHA512 dc9419acda9ba55cf4f7369d337dfe2aaa3dcff3e640d23175dc2bd38679c1e376f2771e94f8c93210c1c1fc9e123fd3f9e8a0b028799f3fdaa1a42e1be49cdd +EBUILD tbb-2021.9.0.ebuild 1431 BLAKE2B 5ba9cc84b2dd2f587d2858b98b04433c538fc8798d052247aeb7e882774fccc31356390448f0d352f0d7cae5a4a47d5ba965fa48cc8a610f4b2117a32bd47c44 SHA512 86305a5ef1a9eaa83bf027d2952f9c3ce2ffe1b6b9a1ae6383bc671f00349e119b563829a4a36a0d2aa7cb3c496ece8e4dbfd4d2d815a5fb5ea2bf7fd249a835 MISC metadata.xml 696 BLAKE2B b8003afd9cf4ef7a07aab27f5a5263604fd32ca98ade51ed5a3872a53ea45c2151a49b0a9bd997219a58ef4e37ff4c969df716ee7e9987bf43c9fbc132dca245 SHA512 b95aad151a300ae292c519d7d792e2b4bdf471ef786c77904e279a203a4ebb24514177a1a8663abdf2ea6899c63e007dbc7a69cf1c0b53f6e3d3b486d66243d7 diff --git a/dev-cpp/tbb/files/tbb-2021.13.0-test-atomics.patch b/dev-cpp/tbb/files/tbb-2021.13.0-test-atomics.patch new file mode 100644 index 000000000000..7cc8216153d0 --- /dev/null +++ b/dev-cpp/tbb/files/tbb-2021.13.0-test-atomics.patch @@ -0,0 +1,38 @@ +From c828ae47b8f4bea7736d2f9d05460e2b529c9d7d Mon Sep 17 00:00:00 2001 +From: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de> +Date: Fri, 9 Dec 2022 12:36:11 +0100 +Subject: [PATCH] Add cmake check for libatomic requirement when building with + gcc (#980) + +Signed-off-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de> +--- + cmake/compilers/GNU.cmake | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +diff --git a/cmake/compilers/GNU.cmake b/cmake/compilers/GNU.cmake +index cd76acfe1e..59f4e6934f 100644 +--- a/cmake/compilers/GNU.cmake ++++ b/cmake/compilers/GNU.cmake +@@ -44,6 +44,22 @@ if (NOT MINGW) + set(TBB_COMMON_LINK_LIBS dl) + endif() + ++# Check whether code with full atomics can be built without libatomic ++# see: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81358 ++include(CheckCXXSourceCompiles) ++check_cxx_source_compiles("#include <atomic> ++int main() { ++ std::atomic<uint8_t> w1; ++ std::atomic<uint16_t> w2; ++ std::atomic<uint32_t> w4; ++ std::atomic<uint64_t> w8; ++ return ++w1 + ++w2 + ++w4 + ++w8; ++}" TBB_BUILDS_WITHOUT_LIBATOMIC) ++ ++if(NOT TBB_BUILDS_WITHOUT_LIBATOMIC) ++ set(TBB_COMMON_LINK_LIBS ${TBB_COMMON_LINK_LIBS} atomic) ++endif() ++ + # Ignore -Werror set through add_compile_options() or added to CMAKE_CXX_FLAGS if TBB_STRICT is disabled. + if (NOT TBB_STRICT AND COMMAND tbb_remove_compile_flag) + tbb_remove_compile_flag(-Werror) diff --git a/dev-cpp/tbb/files/tbb-2021.4.0-lto.patch b/dev-cpp/tbb/files/tbb-2021.4.0-lto.patch deleted file mode 100644 index 1c9705576004..000000000000 --- a/dev-cpp/tbb/files/tbb-2021.4.0-lto.patch +++ /dev/null @@ -1,249 +0,0 @@ -https://github.com/oneapi-src/oneTBB/pull/608 - -From 6feeba8035ea2bdf652d473a35730b19427752db Mon Sep 17 00:00:00 2001 -From: Ivan Kochin <kochin.ivan@intel.com> -Date: Wed, 27 Oct 2021 17:23:32 +0300 -Subject: [PATCH] Use native CMake way to detect the IPO support (#608) - -* Use native CMake way to detect the IPO support - -Signed-off-by: Kochin Ivan <kochin.ivan@intel.com> ---- - CMakeLists.txt | 17 +++++++++++++++++ - cmake/README.md | 1 + - cmake/compilers/Clang.cmake | 8 ++------ - cmake/compilers/GNU.cmake | 8 +++----- - cmake/compilers/MSVC.cmake | 1 + - cmake/utils.cmake | 13 +++++++++++++ - src/tbb/CMakeLists.txt | 5 ++--- - src/tbbbind/CMakeLists.txt | 6 +++--- - src/tbbmalloc/CMakeLists.txt | 5 ++--- - 9 files changed, 44 insertions(+), 20 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 13b1dbc2c..4dbdadb97 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -103,6 +103,7 @@ option(TBBMALLOC_BUILD "Enable tbbmalloc build" ON) - option(TBB_CPF "Enable preview features of the library" OFF) - option(TBB_FIND_PACKAGE "Enable search for external oneTBB using find_package instead of build from sources" OFF) - option(TBB_DISABLE_HWLOC_AUTOMATIC_SEARCH "Disable HWLOC automatic search by pkg-config tool" OFF) -+option(TBB_ENABLE_IPO "Enable Interprocedural Optimization (IPO) during the compilation" ON) - - if (NOT DEFINED BUILD_SHARED_LIBS) - set(BUILD_SHARED_LIBS ON) -@@ -181,6 +182,22 @@ foreach(FILE_WITH_EXTRA_TARGETS ${FILES_WITH_EXTRA_TARGETS}) - include(${FILE_WITH_EXTRA_TARGETS}) - endforeach() - -+# - Enabling LTO on Android causes the NDK bug. -+# NDK throws the warning: "argument unused during compilation: '-Wa,--noexecstack'" -+# - For some reason GCC does not instrument code with Thread Sanitizer when lto is enabled and C linker is used. -+if (TBB_ENABLE_IPO AND BUILD_SHARED_LIBS AND NOT ANDROID_PLATFORM AND NOT TBB_SANITIZE MATCHES "thread") -+ if (NOT CMAKE_VERSION VERSION_LESS 3.9) -+ cmake_policy(SET CMP0069 NEW) -+ include(CheckIPOSupported) -+ check_ipo_supported(RESULT TBB_IPO_PROPERTY) -+ else() -+ set(TBB_IPO_FLAGS TRUE) -+ endif() -+ if (TBB_IPO_PROPERTY OR TBB_IPO_FLAGS) -+ message(STATUS "IPO enabled") -+ endif() -+endif() -+ - set(TBB_COMPILER_SETTINGS_FILE ${CMAKE_CURRENT_SOURCE_DIR}/cmake/compilers/${CMAKE_CXX_COMPILER_ID}.cmake) - if (EXISTS ${TBB_COMPILER_SETTINGS_FILE}) - include(${TBB_COMPILER_SETTINGS_FILE}) -diff --git a/cmake/README.md b/cmake/README.md -index ec56e423c..ed1631de3 100644 ---- a/cmake/README.md -+++ b/cmake/README.md -@@ -16,6 +16,7 @@ TBB_CPF:BOOL - Enable preview features of the library (OFF by default) - TBB_INSTALL_VARS:BOOL - Enable auto-generated vars installation(packages generated by `cpack` and `make install` will also include the vars script)(OFF by default) - TBB_VALGRIND_MEMCHECK:BOOL - Enable scan for memory leaks using Valgrind (OFF by default) - TBB_DISABLE_HWLOC_AUTOMATIC_SEARCH - Disable HWLOC automatic search by pkg-config tool (OFF by default) -+TBB_ENABLE_IPO - Enable Interprocedural Optimization (IPO) during the compilation (ON by default) - ``` - - ## Configure, build and test -diff --git a/cmake/compilers/Clang.cmake b/cmake/compilers/Clang.cmake -index 183341fcc..69aa51932 100644 ---- a/cmake/compilers/Clang.cmake -+++ b/cmake/compilers/Clang.cmake -@@ -58,12 +58,8 @@ if (MINGW) - list(APPEND TBB_COMMON_COMPILE_FLAGS -U__STRICT_ANSI__) - endif() - --# Enabling LTO on Android causes the NDK bug. --# NDK throws the warning: "argument unused during compilation: '-Wa,--noexecstack'" --if (NOT ANDROID_PLATFORM AND BUILD_SHARED_LIBS) -- set(TBB_IPO_COMPILE_FLAGS $<$<NOT:$<CONFIG:Debug>>:-flto>) -- set(TBB_IPO_LINK_FLAGS $<$<NOT:$<CONFIG:Debug>>:-flto>) --endif() -+set(TBB_IPO_COMPILE_FLAGS $<$<NOT:$<CONFIG:Debug>>:-flto>) -+set(TBB_IPO_LINK_FLAGS $<$<NOT:$<CONFIG:Debug>>:-flto>) - - # TBB malloc settings - set(TBBMALLOC_LIB_COMPILE_FLAGS -fno-rtti -fno-exceptions) -diff --git a/cmake/compilers/GNU.cmake b/cmake/compilers/GNU.cmake -index fa14c869e..a9cfa8927 100644 ---- a/cmake/compilers/GNU.cmake -+++ b/cmake/compilers/GNU.cmake -@@ -63,11 +63,9 @@ if (MINGW) - list(APPEND TBB_COMMON_COMPILE_FLAGS -U__STRICT_ANSI__) - endif() - --# For some reason GCC does not instrument code with Thread Sanitizer when lto is enabled and C linker is used. --if (NOT TBB_SANITIZE MATCHES "thread") -- set(TBB_IPO_COMPILE_FLAGS $<$<NOT:$<CONFIG:Debug>>:-flto>) -- set(TBB_IPO_LINK_FLAGS $<$<NOT:$<CONFIG:Debug>>:-flto>) --endif() -+set(TBB_IPO_COMPILE_FLAGS $<$<NOT:$<CONFIG:Debug>>:-flto>) -+set(TBB_IPO_LINK_FLAGS $<$<NOT:$<CONFIG:Debug>>:-flto>) -+ - - # TBB malloc settings - set(TBBMALLOC_LIB_COMPILE_FLAGS -fno-rtti -fno-exceptions) -diff --git a/cmake/compilers/MSVC.cmake b/cmake/compilers/MSVC.cmake -index 3447418cc..5767235a0 100644 ---- a/cmake/compilers/MSVC.cmake -+++ b/cmake/compilers/MSVC.cmake -@@ -77,6 +77,7 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "(Clang|IntelLLVM)") - endif() - set(TBB_OPENMP_NO_LINK_FLAG TRUE) - set(TBB_IPO_COMPILE_FLAGS $<$<NOT:$<CONFIG:Debug>>:-flto>) -+ set(TBB_IPO_LINK_FLAGS $<$<NOT:$<CONFIG:Debug>>:-flto>) - else() - set(TBB_IPO_COMPILE_FLAGS $<$<NOT:$<CONFIG:Debug>>:/GL>) - set(TBB_IPO_LINK_FLAGS $<$<NOT:$<CONFIG:Debug>>:-LTCG> $<$<NOT:$<CONFIG:Debug>>:-INCREMENTAL:NO>) -diff --git a/cmake/utils.cmake b/cmake/utils.cmake -index 06d3a9aee..f74abfcf9 100644 ---- a/cmake/utils.cmake -+++ b/cmake/utils.cmake -@@ -44,3 +44,16 @@ macro(tbb_install_target target) - COMPONENT devel) - endif() - endmacro() -+ -+macro(tbb_handle_ipo target) -+ if (TBB_IPO_PROPERTY) -+ set_target_properties(${target} PROPERTIES INTERPROCEDURAL_OPTIMIZATION TRUE) -+ elseif (TBB_IPO_FLAGS) -+ target_compile_options(${target} PRIVATE ${TBB_IPO_COMPILE_FLAGS}) -+ if (COMMAND target_link_options) -+ target_link_options(${target} PRIVATE ${TBB_IPO_LINK_FLAGS}) -+ else() -+ target_link_libraries(${target} PRIVATE ${TBB_IPO_LINK_FLAGS}) -+ endif() -+ endif() -+endmacro() -diff --git a/src/tbb/CMakeLists.txt b/src/tbb/CMakeLists.txt -index 80fdcdcde..021392d89 100644 ---- a/src/tbb/CMakeLists.txt -+++ b/src/tbb/CMakeLists.txt -@@ -79,7 +79,6 @@ target_compile_options(tbb - ${TBB_WARNING_SUPPRESS} - ${TBB_LIB_COMPILE_FLAGS} - ${TBB_COMMON_COMPILE_FLAGS} -- ${TBB_IPO_COMPILE_FLAGS} - ) - - # Avoid use of target_link_libraries here as it changes /DEF option to \DEF on Windows. -@@ -89,6 +88,8 @@ set_target_properties(tbb PROPERTIES - SOVERSION ${TBB_BINARY_VERSION} - ) - -+tbb_handle_ipo(tbb) -+ - if (TBB_DEF_FILE_PREFIX) # If there's no prefix, assume we're using export directives - set_target_properties(tbb PROPERTIES - LINK_FLAGS ${TBB_LINK_DEF_FILE_FLAG}${CMAKE_CURRENT_SOURCE_DIR}/def/${TBB_DEF_FILE_PREFIX}-tbb.def -@@ -103,14 +104,12 @@ if (COMMAND target_link_options) - PRIVATE - ${TBB_LIB_LINK_FLAGS} - ${TBB_COMMON_LINK_FLAGS} -- ${TBB_IPO_LINK_FLAGS} - ) - else() - target_link_libraries(tbb - PRIVATE - ${TBB_LIB_LINK_FLAGS} - ${TBB_COMMON_LINK_FLAGS} -- ${TBB_IPO_LINK_FLAGS} - ) - endif() - -diff --git a/src/tbbbind/CMakeLists.txt b/src/tbbbind/CMakeLists.txt -index 99b7ccaac..3233ec718 100644 ---- a/src/tbbbind/CMakeLists.txt -+++ b/src/tbbbind/CMakeLists.txt -@@ -46,7 +46,6 @@ function(tbbbind_build TBBBIND_NAME REQUIRED_HWLOC_TARGET) - ${TBB_WARNING_LEVEL} - ${TBB_LIB_COMPILE_FLAGS} - ${TBB_COMMON_COMPILE_FLAGS} -- ${TBB_IPO_COMPILE_FLAGS} - ) - - # Avoid use of target_link_libraries here as it changes /DEF option to \DEF on Windows. -@@ -55,6 +54,9 @@ function(tbbbind_build TBBBIND_NAME REQUIRED_HWLOC_TARGET) - VERSION ${TBBBIND_BINARY_VERSION}.${TBB_BINARY_MINOR_VERSION} - SOVERSION ${TBBBIND_BINARY_VERSION} - ) -+ -+ tbb_handle_ipo(${TBBBIND_NAME}) -+ - if (TBB_DEF_FILE_PREFIX) # If there's no prefix, assume we're using export directives - set_target_properties(${TBBBIND_NAME} PROPERTIES - LINK_FLAGS ${TBB_LINK_DEF_FILE_FLAG}${CMAKE_CURRENT_SOURCE_DIR}/def/${TBB_DEF_FILE_PREFIX}-tbbbind.def -@@ -69,14 +71,12 @@ function(tbbbind_build TBBBIND_NAME REQUIRED_HWLOC_TARGET) - PRIVATE - ${TBB_LIB_LINK_FLAGS} - ${TBB_COMMON_LINK_FLAGS} -- ${TBB_IPO_LINK_FLAGS} - ) - else() - target_link_libraries(${TBBBIND_NAME} - PRIVATE - ${TBB_LIB_LINK_FLAGS} - ${TBB_COMMON_LINK_FLAGS} -- ${TBB_IPO_LINK_FLAGS} - ) - endif() - -diff --git a/src/tbbmalloc/CMakeLists.txt b/src/tbbmalloc/CMakeLists.txt -index f77bc8f10..5a851851f 100644 ---- a/src/tbbmalloc/CMakeLists.txt -+++ b/src/tbbmalloc/CMakeLists.txt -@@ -59,7 +59,6 @@ target_compile_options(tbbmalloc - ${TBB_LIB_COMPILE_FLAGS} - ${TBBMALLOC_LIB_COMPILE_FLAGS} - ${TBB_COMMON_COMPILE_FLAGS} -- ${TBB_IPO_COMPILE_FLAGS} - ) - - enable_language(C) -@@ -72,6 +71,8 @@ set_target_properties(tbbmalloc PROPERTIES - LINKER_LANGUAGE C - ) - -+tbb_handle_ipo(tbbmalloc) -+ - if (TBB_DEF_FILE_PREFIX) # If there's no prefix, assume we're using export directives - set_target_properties(tbbmalloc PROPERTIES - LINK_FLAGS ${TBB_LINK_DEF_FILE_FLAG}${CMAKE_CURRENT_SOURCE_DIR}/def/${TBB_DEF_FILE_PREFIX}-tbbmalloc.def -@@ -88,14 +89,12 @@ if (COMMAND target_link_options) - PRIVATE - ${TBB_LIB_LINK_FLAGS} - ${TBB_COMMON_LINK_FLAGS} -- ${TBB_IPO_LINK_FLAGS} - ) - else() - target_link_libraries(tbbmalloc - PRIVATE - ${TBB_LIB_LINK_FLAGS} - ${TBB_COMMON_LINK_FLAGS} -- ${TBB_IPO_LINK_FLAGS} - ) - endif() - diff --git a/dev-cpp/tbb/files/tbb-2021.4.0-missing-TBB_machine_fetchadd4.patch b/dev-cpp/tbb/files/tbb-2021.4.0-missing-TBB_machine_fetchadd4.patch deleted file mode 100644 index 091cad5821e7..000000000000 --- a/dev-cpp/tbb/files/tbb-2021.4.0-missing-TBB_machine_fetchadd4.patch +++ /dev/null @@ -1,23 +0,0 @@ -https://github.com/oneapi-src/oneTBB/issues/186 -https://github.com/oneapi-src/oneTBB/pull/550 -https://bugs.gentoo.org/827883 - -From: Felix Yan <felixonmars@archlinux.org> -Date: Thu, 7 Oct 2021 14:16:16 +0800 -Subject: [PATCH] Define ITT_ARCH_IA64 when undefiend (#550) - -Upstream-Status: Merged in commit later than 2021.5.0 - ---- a/src/tbb/tools_api/ittnotify_config.h -+++ b/src/tbb/tools_api/ittnotify_config.h -@@ -147,6 +147,10 @@ - # define ITT_ARCH_IA32E 2 - #endif /* ITT_ARCH_IA32E */ - -+#ifndef ITT_ARCH_IA64 -+# define ITT_ARCH_IA64 3 -+#endif /* ITT_ARCH_IA64 */ -+ - #ifndef ITT_ARCH_ARM - # define ITT_ARCH_ARM 4 - #endif /* ITT_ARCH_ARM */ diff --git a/dev-cpp/tbb/files/tbb-2021.5.0-flags-stripping.patch b/dev-cpp/tbb/files/tbb-2021.5.0-flags-stripping.patch deleted file mode 100644 index 4252ea446423..000000000000 --- a/dev-cpp/tbb/files/tbb-2021.5.0-flags-stripping.patch +++ /dev/null @@ -1,27 +0,0 @@ -https://github.com/oneapi-src/oneTBB/pull/716 - -From 9595b9699ae6863d1e0cf770a89728eafcaf8845 Mon Sep 17 00:00:00 2001 -From: Christoph Erhardt <github@sicherha.de> -Date: Wed, 5 Jan 2022 15:13:32 +0100 -Subject: [PATCH] Fix overeager stripping of compile flag - -The existing regex strips all occurrences of the given string from -`${CMAKE_CXX_FLAGS}`, regardless of whether it is just a substring of a -flag. For instance, `-Werror=format-security` gets truncated to -`=format-security`. - -The new regex makes sure that only whole words get replaced. - -Signed-off-by: Christoph Erhardt <github@sicherha.de> ---- a/cmake/utils.cmake -+++ b/cmake/utils.cmake -@@ -18,7 +18,7 @@ macro(tbb_remove_compile_flag flag) - set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY COMPILE_OPTIONS ${_tbb_compile_options}) - unset(_tbb_compile_options) - if (CMAKE_CXX_FLAGS) -- string(REGEX REPLACE ${flag} "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) -+ string(REGEX REPLACE "(^|[ \t\r\n]+)${flag}($|[ \t\r\n]+)" " " CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) - endif() - endmacro() - - diff --git a/dev-cpp/tbb/files/tbb-2021.5.0-musl-deepbind.patch b/dev-cpp/tbb/files/tbb-2021.5.0-musl-deepbind.patch deleted file mode 100644 index 014a3863f452..000000000000 --- a/dev-cpp/tbb/files/tbb-2021.5.0-musl-deepbind.patch +++ /dev/null @@ -1,25 +0,0 @@ -https://github.com/oneapi-src/oneTBB/commit/883c2e5245c39624b3b5d6d56d5b203cf09eac38 -https://bugs.gentoo.org/830698 - -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 15 Dec 2021 08:08:07 -0800 -Subject: [PATCH] Musl/linux can not use RTLD_DEEPBIND (#684) - -Exclude non-glibc linux systems along with android -Fixes -src/tbb/dynamic_link.cpp:417:29: error: use - of undeclared identifier 'RTLD_DEEPBIND' | flags = flags | RTLD_DEEPBIND; -| ^ - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- a/src/tbb/dynamic_link.cpp -+++ b/src/tbb/dynamic_link.cpp -@@ -413,7 +413,7 @@ namespace r1 { - int flags = RTLD_NOW; - if (local_binding) { - flags = flags | RTLD_LOCAL; --#if __linux__ && !__ANDROID__ && !__TBB_USE_SANITIZERS -+#if (__linux__ && __GLIBC__) && !__TBB_USE_SANITIZERS - flags = flags | RTLD_DEEPBIND; - #endif - } else { diff --git a/dev-cpp/tbb/files/tbb-2021.5.0-musl-mallinfo.patch b/dev-cpp/tbb/files/tbb-2021.5.0-musl-mallinfo.patch deleted file mode 100644 index e46c16f42f59..000000000000 --- a/dev-cpp/tbb/files/tbb-2021.5.0-musl-mallinfo.patch +++ /dev/null @@ -1,32 +0,0 @@ -https://cgit.openembedded.org/meta-openembedded/tree/meta-oe/recipes-support/tbb/tbb/0001-mallinfo-is-glibc-specific-API-mark-it-so.patch -https://github.com/oneapi-src/oneTBB/pull/203 -https://bugs.gentoo.org/828704 - -From: Naveen Saini <naveen.kumar.saini@intel.com> -Date: Wed, 7 Apr 2021 11:14:13 +0800 -Subject: [PATCH] mallinfo() is glibc specific API mark it so - -Helps compiling with musl - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> ---- a/src/tbbmalloc_proxy/proxy.cpp -+++ b/src/tbbmalloc_proxy/proxy.cpp -@@ -260,6 +260,7 @@ int mallopt(int /*param*/, int /*value*/ - return 1; - } - -+#ifdef __GLIBC__ - struct mallinfo mallinfo() __THROW - { - struct mallinfo m; -@@ -267,6 +268,7 @@ struct mallinfo mallinfo() __THROW - - return m; - } -+#endif - - #if __ANDROID__ - // Android doesn't have malloc_usable_size, provide it to be compatible diff --git a/dev-cpp/tbb/files/tbb-2021.5.0-musl-setcontext.patch b/dev-cpp/tbb/files/tbb-2021.5.0-musl-setcontext.patch deleted file mode 100644 index 111bbf123d9a..000000000000 --- a/dev-cpp/tbb/files/tbb-2021.5.0-musl-setcontext.patch +++ /dev/null @@ -1,30 +0,0 @@ -https://bugs.gentoo.org/832700 -https://github.com/oneapi-src/oneTBB/commit/6a15b64093c51ddc00bdf4a6b49d4bbec1574a12 - -From: Rui Ueyama <rui314@gmail.com> -Date: Fri, 4 Feb 2022 19:32:11 +0900 -Subject: [PATCH] Make tbb compile with musl libc (#748) - -TBB resumable tasks are implemented using getcontext() and setcontext() -on Unix-like systems. These functions are deprecated in the recent -versions of POSIX and may not exist. musl libc does not provide these -functions. - -There's unfortunately no way to detect musl (musl intentionally do not -define macros like `__MUSL__`), so __TBB_RESUMABLE_TASKS is defined if -`__GLIBC__`. glibc-compatible libc's such as uClibc defines `__GLIBC__`, -so it should work as a catch-all condition. - -Signed-off-by: Rui Ueyama <ruiu@cs.stanford.edu> ---- a/include/oneapi/tbb/detail/_config.h -+++ b/include/oneapi/tbb/detail/_config.h -@@ -268,7 +268,7 @@ - #define __TBB_CPP20_COMPARISONS_PRESENT __TBB_CPP20_PRESENT - #endif - --#define __TBB_RESUMABLE_TASKS (!__TBB_WIN8UI_SUPPORT && !__ANDROID__ && !__QNXNTO__) -+#define __TBB_RESUMABLE_TASKS (!__TBB_WIN8UI_SUPPORT && !__ANDROID__ && !__QNXNTO__ && (!__linux__ || __GLIBC__)) - - /* This macro marks incomplete code or comments describing ideas which are considered for the future. - * See also for plain comment with TODO and FIXME marks for small improvement opportunities. - diff --git a/dev-cpp/tbb/files/tbb-2021.5.0-x86-mwaitpkg.patch b/dev-cpp/tbb/files/tbb-2021.5.0-x86-mwaitpkg.patch deleted file mode 100644 index 83f119a9acd3..000000000000 --- a/dev-cpp/tbb/files/tbb-2021.5.0-x86-mwaitpkg.patch +++ /dev/null @@ -1,43 +0,0 @@ -https://github.com/oneapi-src/oneTBB/pull/609 -https://github.com/oneapi-src/oneTBB/issues/370 -https://bugs.gentoo.org/842762 - -From 542a27fa1cfafaf76772e793549d9f4d288d03a9 Mon Sep 17 00:00:00 2001 -From: Ilya Isaev <ilya.isaev@intel.com> -Date: Fri, 8 Oct 2021 10:18:16 +0300 -Subject: [PATCH] Detect 32 bit x86 systems while adding -mwaitpkg option - -Signed-off-by: Ilya Isaev <ilya.isaev@intel.com> ---- a/cmake/compilers/Clang.cmake -+++ b/cmake/compilers/Clang.cmake -@@ -44,7 +44,7 @@ if (NOT TBB_STRICT AND COMMAND tbb_remove_compile_flag) - endif() - - # Enable Intel(R) Transactional Synchronization Extensions (-mrtm) and WAITPKG instructions support (-mwaitpkg) on relevant processors --if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86|AMD64)") -+if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86|AMD64|i.86)") - set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -mrtm $<$<NOT:$<VERSION_LESS:${CMAKE_CXX_COMPILER_VERSION},12.0>>:-mwaitpkg>) - endif() - ---- a/cmake/compilers/GNU.cmake -+++ b/cmake/compilers/GNU.cmake -@@ -36,7 +36,7 @@ if (NOT CMAKE_GENERATOR MATCHES "Ninja" AND NOT CMAKE_CXX_DEPENDS_USE_COMPILER) - endif() - - # Enable Intel(R) Transactional Synchronization Extensions (-mrtm) and WAITPKG instructions support (-mwaitpkg) on relevant processors --if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86|AMD64)") -+if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86|AMD64|i.86)") - set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -mrtm $<$<AND:$<NOT:$<CXX_COMPILER_ID:Intel>>,$<NOT:$<VERSION_LESS:${CMAKE_CXX_COMPILER_VERSION},11.0>>>:-mwaitpkg>) - endif() - ---- a/cmake/compilers/MSVC.cmake -+++ b/cmake/compilers/MSVC.cmake -@@ -72,7 +72,7 @@ if (TBB_WINDOWS_DRIVER) - endif() - - if (CMAKE_CXX_COMPILER_ID MATCHES "(Clang|IntelLLVM)") -- if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86|AMD64)") -+ if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86|AMD64|i.86)") - set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -mrtm -mwaitpkg) - endif() - set(TBB_OPENMP_NO_LINK_FLAG TRUE) diff --git a/dev-cpp/tbb/tbb-2021.10.0.ebuild b/dev-cpp/tbb/tbb-2021.10.0.ebuild deleted file mode 100644 index 3d0e05e45514..000000000000 --- a/dev-cpp/tbb/tbb-2021.10.0.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake-multilib flag-o-matic - -DESCRIPTION="High level abstract threading library" -HOMEPAGE="https://github.com/oneapi-src/oneTBB" -SRC_URI="https://github.com/oneapi-src/oneTBB/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/oneTBB-${PV}" - -LICENSE="Apache-2.0" -# https://github.com/oneapi-src/oneTBB/blob/master/CMakeLists.txt#L53 -# libtbb<SONAME>-libtbbmalloc<SONAME>-libtbbbind<SONAME> -SLOT="0/12.5-2.5-3.5" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND="!kernel_Darwin? ( sys-apps/hwloc:= )" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PN}-2021.8.0-gcc-13.patch -) - -src_prepare() { - # Workaround for bug #912210 - append-ldflags $(test-flags-CCLD -Wl,--undefined-version) - - # Has an #error to force compilation as C but links with C++ library, dies - # with GLIBCXX_ASSERTIONS as a result. - sed -i -e '/tbb_add_c_test(SUBDIR tbbmalloc NAME test_malloc_pure_c DEPENDENCIES TBB::tbbmalloc)/d' test/CMakeLists.txt || die - - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DTBB_TEST=$(usex test) - -DTBB_ENABLE_IPO=OFF - -DTBB_STRICT=OFF - ) - - cmake-multilib_src_configure -} diff --git a/dev-cpp/tbb/tbb-2021.12.0.ebuild b/dev-cpp/tbb/tbb-2021.12.0.ebuild index 3ac69c080835..ac958e5973a4 100644 --- a/dev-cpp/tbb/tbb-2021.12.0.ebuild +++ b/dev-cpp/tbb/tbb-2021.12.0.ebuild @@ -24,6 +24,7 @@ BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}"/${PN}-2021.8.0-gcc-13.patch + "${FILESDIR}"/${PN}-2021.13.0-test-atomics.patch ) src_prepare() { diff --git a/dev-cpp/tbb/tbb-2021.11.0.ebuild b/dev-cpp/tbb/tbb-2021.13.0.ebuild index 3ac69c080835..ac958e5973a4 100644 --- a/dev-cpp/tbb/tbb-2021.11.0.ebuild +++ b/dev-cpp/tbb/tbb-2021.13.0.ebuild @@ -24,6 +24,7 @@ BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}"/${PN}-2021.8.0-gcc-13.patch + "${FILESDIR}"/${PN}-2021.13.0-test-atomics.patch ) src_prepare() { diff --git a/dev-cpp/tbb/tbb-2021.5.0-r1.ebuild b/dev-cpp/tbb/tbb-2021.5.0-r1.ebuild deleted file mode 100644 index adb066b4c2d9..000000000000 --- a/dev-cpp/tbb/tbb-2021.5.0-r1.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake-multilib flag-o-matic - -DESCRIPTION="High level abstract threading library" -HOMEPAGE="https://github.com/oneapi-src/oneTBB" -SRC_URI="https://github.com/oneapi-src/oneTBB/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/oneTBB-${PV}" - -LICENSE="Apache-2.0" -# https://github.com/oneapi-src/oneTBB/blob/master/CMakeLists.txt#L53 -# libtbb<SONAME>-libtbbmalloc<SONAME>-libtbbbind<SONAME> -SLOT="0/12.5-2.5-3.5" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND="!kernel_Darwin? ( sys-apps/hwloc:= )" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - # should be in.. 2022? - "${FILESDIR}"/${PN}-2021.4.0-lto.patch - "${FILESDIR}"/${PN}-2021.5.0-musl-deepbind.patch - # bug 827883 - "${FILESDIR}"/${PN}-2021.4.0-missing-TBB_machine_fetchadd4.patch - # need to verify this is in master - "${FILESDIR}"/${PN}-2021.5.0-musl-mallinfo.patch - # musl again, should be in.. 2022? - "${FILESDIR}"/${PN}-2021.5.0-musl-setcontext.patch - # should be in.. 2022? - "${FILESDIR}"/${PN}-2021.5.0-x86-mwaitpkg.patch - - "${FILESDIR}"/${PN}-2021.5.0-flags-stripping.patch -) - -src_configure() { - # Workaround for bug #912210 - append-ldflags $(test-flags-CCLD -Wl,--undefined-version) - - # Workaround for bug #912210 - append-ldflags $(test-flags-CCLD -Wl,--undefined-version) - - local mycmakeargs=( - -DTBB_TEST=$(usex test) - -DTBB_ENABLE_IPO=OFF - -DTBB_STRICT=OFF - ) - - cmake-multilib_src_configure -} diff --git a/dev-cpp/tbb/tbb-2021.7.0.ebuild b/dev-cpp/tbb/tbb-2021.7.0.ebuild deleted file mode 100644 index 972e90e1702f..000000000000 --- a/dev-cpp/tbb/tbb-2021.7.0.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake-multilib flag-o-matic - -DESCRIPTION="High level abstract threading library" -HOMEPAGE="https://github.com/oneapi-src/oneTBB" -SRC_URI="https://github.com/oneapi-src/oneTBB/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/oneTBB-${PV}" - -LICENSE="Apache-2.0" -# https://github.com/oneapi-src/oneTBB/blob/master/CMakeLists.txt#L53 -# libtbb<SONAME>-libtbbmalloc<SONAME>-libtbbbind<SONAME> -SLOT="0/12.5-2.5-3.5" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND="!kernel_Darwin? ( sys-apps/hwloc:= )" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -src_configure() { - # Workaround for bug #912210 - append-ldflags $(test-flags-CCLD -Wl,--undefined-version) - - # bug #872287 - filter-flags -D_GLIBCXX_ASSERTIONS - append-cppflags -U_GLIBCXX_ASSERTIONS - - local mycmakeargs=( - -DTBB_TEST=$(usex test) - -DTBB_ENABLE_IPO=OFF - -DTBB_STRICT=OFF - ) - - cmake-multilib_src_configure -} diff --git a/dev-cpp/tbb/tbb-2021.8.0.ebuild b/dev-cpp/tbb/tbb-2021.8.0.ebuild deleted file mode 100644 index 9b77bc83b8e5..000000000000 --- a/dev-cpp/tbb/tbb-2021.8.0.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake-multilib flag-o-matic - -DESCRIPTION="High level abstract threading library" -HOMEPAGE="https://github.com/oneapi-src/oneTBB" -SRC_URI="https://github.com/oneapi-src/oneTBB/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/oneTBB-${PV}" - -LICENSE="Apache-2.0" -# https://github.com/oneapi-src/oneTBB/blob/master/CMakeLists.txt#L53 -# libtbb<SONAME>-libtbbmalloc<SONAME>-libtbbbind<SONAME> -SLOT="0/12.5-2.5-3.5" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND="!kernel_Darwin? ( sys-apps/hwloc:= )" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PN}-2021.7.0-pthread-eagain.patch - "${FILESDIR}"/${PN}-2021.8.0-gcc-13.patch -) - -src_prepare() { - # Has an #error to force compilation as C but links with C++ library, dies - # with GLIBCXX_ASSERTIONS as a result. - sed -i -e '/tbb_add_c_test(SUBDIR tbbmalloc NAME test_malloc_pure_c DEPENDENCIES TBB::tbbmalloc)/d' test/CMakeLists.txt || die - - cmake_src_prepare -} - -src_configure() { - # Workaround for bug #912210 - append-ldflags $(test-flags-CCLD -Wl,--undefined-version) - - local mycmakeargs=( - -DTBB_TEST=$(usex test) - -DTBB_ENABLE_IPO=OFF - -DTBB_STRICT=OFF - ) - - cmake-multilib_src_configure -} diff --git a/dev-cpp/tbb/tbb-2021.9.0.ebuild b/dev-cpp/tbb/tbb-2021.9.0.ebuild index 2a0013ba8bb3..8b1ca16deaa8 100644 --- a/dev-cpp/tbb/tbb-2021.9.0.ebuild +++ b/dev-cpp/tbb/tbb-2021.9.0.ebuild @@ -14,7 +14,7 @@ LICENSE="Apache-2.0" # https://github.com/oneapi-src/oneTBB/blob/master/CMakeLists.txt#L53 # libtbb<SONAME>-libtbbmalloc<SONAME>-libtbbbind<SONAME> SLOT="0/12.5-2.5-3.5" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" IUSE="test" RESTRICT="!test? ( test )" @@ -24,6 +24,7 @@ BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}"/${PN}-2021.8.0-gcc-13.patch + "${FILESDIR}"/${PN}-2021.13.0-test-atomics.patch ) src_prepare() { diff --git a/dev-cpp/toml11/Manifest b/dev-cpp/toml11/Manifest new file mode 100644 index 000000000000..9ff259749d77 --- /dev/null +++ b/dev-cpp/toml11/Manifest @@ -0,0 +1,3 @@ +DIST toml11-4.2.0.tar.gz 345359 BLAKE2B 771de7b1af5b3a8f93c114ff4a4ea84b2884c9a0a9a3c304aa3489e4a4aed90d31bca41287a183ee58519455839d7fb4a3075c48d689232991dca67a850f785a SHA512 acb29d37150e5752526cf0a38ae7f207fcfd142d3c78d280e706ad404b2d32f5bae6d44d6ce13cc0bdfd3b0fa4a0a94cf732d70b1fd2a01c3c517fee8a4ef05b +EBUILD toml11-4.2.0.ebuild 530 BLAKE2B 5790c78ef41feb0f6da40e8c54ca9a81d3c5db149d0925c2df93b41cf515b214f1763fbd20a18ae985115717d2cf019851eac82eb8b47ca9efa52faccd43cf9f SHA512 cd0eb90f7fb52c1261b2a0a23ea12dfedf63574c23a13cf43de3f6ff6bf3f75edd18e1a93a678fc83888a911b97ad65b2051076d6399a16a89531dc7892a0a4e +MISC metadata.xml 402 BLAKE2B 3036a6fb020f076c47ad30c901b5f8a5e36af312190df2e8ae84cd374731b9711fb48b3d8f7f3463edd7b50ae99b6e4dc78d4e60dfa3b3ccc56cf4c806082063 SHA512 e438104524445b0a27547730396437403a2885403c5611fad81e438282517195b44f81040540162c7ee0ace9758f99c19feb0772ab2d8ad0cd6f853aaf64e6de diff --git a/dev-cpp/toml11/metadata.xml b/dev-cpp/toml11/metadata.xml new file mode 100644 index 000000000000..b6d01e802127 --- /dev/null +++ b/dev-cpp/toml11/metadata.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> + +<pkgmetadata> + <maintainer type="person"> + <email>xgqt@gentoo.org</email> + <name>Maciej Barć</name> + </maintainer> + <upstream> + <remote-id type="github">ToruNiina/toml11</remote-id> + <bugs-to>https://github.com/ToruNiina/toml11/issues/</bugs-to> + </upstream> +</pkgmetadata> diff --git a/dev-cpp/toml11/toml11-4.2.0.ebuild b/dev-cpp/toml11/toml11-4.2.0.ebuild new file mode 100644 index 000000000000..da9ac1e07435 --- /dev/null +++ b/dev-cpp/toml11/toml11-4.2.0.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="TOML for Modern C++" +HOMEPAGE="https://toruniina.github.io/toml11/ + https://github.com/ToruNiina/toml11/" + +if [[ "${PV}" == *9999* ]] ; then + inherit git-r3 + + EGIT_REPO_URI="https://github.com/ToruNiina/${PN}.git" +else + SRC_URI="https://github.com/ToruNiina/${PN}/archive/v${PV}.tar.gz + -> ${P}.tar.gz" + + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="MIT" +SLOT="0" + +DOCS=( README.md README_ja.md ) diff --git a/dev-cpp/tomlplusplus/Manifest b/dev-cpp/tomlplusplus/Manifest index aafb0cbb1f17..8976ff0c4e28 100644 --- a/dev-cpp/tomlplusplus/Manifest +++ b/dev-cpp/tomlplusplus/Manifest @@ -1,3 +1,3 @@ DIST tomlplusplus-3.4.0.gh.tar.gz 1294731 BLAKE2B 9495ccd78707ced11744eab7c1c0bf0c0c28e283d186195bb48d1059bae7eb1a874bc964b0fc45210fd73ffd7485ecf3e1159da227d0e1c8ff249e79c08eecf0 SHA512 c227fc8147c9459b29ad24002aaf6ab2c42fac22ea04c1c52b283a0172581ccd4527b33c1931e0ef0d1db6b6a53f9e9882c6d4231c7f3494cf070d0220741aa5 -EBUILD tomlplusplus-3.4.0.ebuild 817 BLAKE2B 26456b69f130f519ae0807911a871708e530a27983819bfd4ef2d056d69705a6738ef7103a856d3686d3700f27d700ee27699aa70143dded449722ec783dd924 SHA512 5b3e9740ac298f7625235381b408d6ae44c510373bb51e9c9cd6484660cd9aa5d348a8ac0f717345bd9703943df99bbe34ce33840b2b8afeadb9ca819b29c3fa +EBUILD tomlplusplus-3.4.0.ebuild 849 BLAKE2B 3225200dbee1846bd5c5495d3e9ac327917805276ffba10119fb9ec708e78d9655570beb9b6242e446988cddb9d66ddb732adc6b597a76eb114c0ffff4b69377 SHA512 f650d5a49c4362377230f688b279fef764ad34f9fb7638dce4b60bca6c4426766535a49aeae4d0de5767bf4c681c29b0d6a9d64cc2539c77f80052dbd05640e0 MISC metadata.xml 472 BLAKE2B 0b7b57b4dab3fe1f942c50c85a29550ded25998479db8e0b3a4502eca56e572047ede8085242c276fc5cce8e59a8991aa8866f695a761987aee8eb02b4d64783 SHA512 e5ded89974456e4731779fd95a11a380b32dda742e0355296f40b87062cfc960faac563bb4a7cb9f97dac2ad0744193d96383c9b3ea8688776444f9021d93055 diff --git a/dev-cpp/tomlplusplus/tomlplusplus-3.4.0.ebuild b/dev-cpp/tomlplusplus/tomlplusplus-3.4.0.ebuild index 9c8941ea61d9..4ac6f2dfc7a2 100644 --- a/dev-cpp/tomlplusplus/tomlplusplus-3.4.0.ebuild +++ b/dev-cpp/tomlplusplus/tomlplusplus-3.4.0.ebuild @@ -14,11 +14,13 @@ SRC_URI="https://github.com/marzer/tomlplusplus/archive/refs/tags/v${PV}.tar.gz LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 ~arm64 ~riscv" +KEYWORDS="amd64 ~arm64 ~riscv ~x86" IUSE="test" RESTRICT="!test? ( test )" +BDEPEND="dev-build/cmake" + src_configure() { local emesonargs=( -Dbuild_lib=true diff --git a/dev-cpp/tree/Manifest b/dev-cpp/tree/Manifest index ba11c9366c96..001354dac412 100644 --- a/dev-cpp/tree/Manifest +++ b/dev-cpp/tree/Manifest @@ -1,5 +1,5 @@ DIST tree-3.17.tar.gz 1178425 BLAKE2B f59239b861c0495c48036d0fffa49370d4cd78a94bfc35348bbbe0232a3c1221293a23366a6289429adabcb00b21292288ce085fa54f74dc204537c95c5b7c37 SHA512 af11f693c13dd37dddf016751c0f975c21d7a5ad405879e18fbe5387400ee1fcfb42942ee8888efffcb0c985d7875f2698591139aeb18b4809e83e225a743112 DIST tree-3.18.tar.gz 1179107 BLAKE2B d05f90c58e203800a7482d0d7b36625dc32e9d3321a65f80fda380d2d7c214be1f47bc01d9f20fe2e287eeafdebe4180940ba7dbc7f78c12072193cbb95c2df1 SHA512 df9047fcd92ac5137af47dd03582fa1ba87651f112a91a1d61eecf3916af1a2130e1841e954af9b6eeb167da33c9e50c2662ecdcc5317e67173ba50f77afeae0 EBUILD tree-3.17.ebuild 743 BLAKE2B ee1f494c9b7a0b29c220135e3304e638e45e820718967582814de04e66626ec8dbb6c132fb4e739c4b7cdc49f89f9398da9516fa3900ec8bedeb5a3cc3491c08 SHA512 4d45fa7d72cf2aba431d8fb4560dbae9608b0f6152433c2844af683b767495bbcec666b11bb967b48ce178ed2f28bf11cba2d4699fe31f8dd30b1ae4f67d1a9b -EBUILD tree-3.18.ebuild 746 BLAKE2B e57385f0c0d8640ee66d4464fa92f58507828902e452e93397e8d422ae0890592be318079b15e5cc147e1f1c6f4910ddd0f2da64fd92378efab4a3a60f8b5a58 SHA512 6e9d12f29c7dd7d0c3f5a437cb847ff12d457c3adc13d992523c2b716781196c26f2de92e2474c65188492c724f213299a07b7b34aecf7a7a194cc926b87f72b +EBUILD tree-3.18.ebuild 743 BLAKE2B c869c27ed0ae602088c68c096717bb4907623b77ebdf107302d3fb00595591ed9716f13c3dd1dc5e846c22981b42f6288c1a624898c06bc5c7789495c2a34a42 SHA512 d78afd9900a16749392cb0404f524246dcda47355876daab57c8f619bfab0c79526b00aea731e5f360be0ff9273367582497a0ccb6077fc117ca84eae4c6acf3 MISC metadata.xml 701 BLAKE2B e0367f9eee54369769f24c6024fe76d5b934d67dfcd5b377ea69516885194060e74f5c70d32ae78d2c71ded893126ee69e19bd5a3778cbea4de560e3c7751df5 SHA512 636c94cc96c157e89b74f26dd72bed483e0525bc8d992cb2dbda443790dfea8d0335e2f870e02ea56509c2152a63a70799a74c706a1ee33117e5dc50268b6ae8 diff --git a/dev-cpp/tree/tree-3.18.ebuild b/dev-cpp/tree/tree-3.18.ebuild index 33b480f4a325..917ad3c60aed 100644 --- a/dev-cpp/tree/tree-3.18.ebuild +++ b/dev-cpp/tree/tree-3.18.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}.hh-${PV}" LICENSE="|| ( GPL-2 GPL-3 )" SLOT="0" -KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos" src_configure() { tc-export CXX diff --git a/dev-cpp/valijson/Manifest b/dev-cpp/valijson/Manifest index 9e7658787831..275c6ab7d5f1 100644 --- a/dev-cpp/valijson/Manifest +++ b/dev-cpp/valijson/Manifest @@ -1,6 +1,6 @@ AUX 1.0-fix-macro-typos.patch 2966 BLAKE2B 5f8307c6a71cd4066a6f68af78e3f35294490688c65fdee7dd3a7d0394de0210a13a784255bba761e408870d9d76691bd6f298e9ecb7c0e7f3b816f71a805742 SHA512 6da572cb86237758708d171452eb8ba88e7f2cda1baecfaf8dd2f674b04de0cdd2d57c9041f517ff472714ff2ad66e66aa4e432931f09bfb00349c1c48b8e6da DIST valijson-1.0.2.tar.gz 723131 BLAKE2B ada64202d1c82f4e24c8fb3935a070ee40a24e8b75712fd4392f19c93c363d293db788cd1481ed3a857721fcd6f87e2d91c3b9779863fb6e2421ba4ee4f1d1f7 SHA512 c1141e533d6a791a01883c5b7ab9501eebc39057a850d784670a4bcf99bff3fee4c3120107128dcaa9db0505adf2ae794700620c02163b3e636f0b635031df80 DIST valijson-1.0.tar.gz 721078 BLAKE2B 74f4a061266a6ee8fba9d93b4e1df20dc828d85169f865bdb60ba9f5217ee422324a09788b02b4ddd18a92d906c64863a5bd7c1250f8bdb62fd9f00f3d73c7e7 SHA512 a206954b11e92cbebbebf094e6f0925a270ebd6bec49cbdb7adda5a4cec93587a5a61ebbce105846c3950cf5df74bfdd5f5bb1ffbf73315f45c7a6cda2b77db9 -EBUILD valijson-1.0.2.ebuild 523 BLAKE2B 283be5a77334c4fc4220834d545080eb5bcb008f187456c666676871d2e6d0f14fcba1cf1d9ce96048fbef6ba22ceebe547c5b229c52898dc7108f9246b17370 SHA512 334ce0ecd45bf78fbe3761c942905b382328ef9c1ec70b2ee4e7a102e5d88705fa1f7a8166e1c4945b41ec8757c3f2e848a8eb7e3ff6d3f18ed2c863e0f037e8 +EBUILD valijson-1.0.2.ebuild 521 BLAKE2B 9dfa466b0a68b75923ac58bfe2af461f155de502d16ef8fc2b8756c21c922ab3c278f6ec9f8f8a9d8a9e7fed3fa7459945fa85fa4680da1f89a45cec6d5360bd SHA512 5e5904aff20d69b6f812cfc70fa5ba7ad7d99c9c8d42effc5eeb8ebe972a19e37d81efaf693be7483d5d69f8cf49159dd7ed05dfe16516b731e0d926b7d0d204 EBUILD valijson-1.0.ebuild 577 BLAKE2B 7773d8d58ee2a589e36bac21710cf611c64dddf0d7a5ad8baae774de35e70662f4ddee675d3649f4fa6d7139901ba9065b6799e20bcf61b241451b04d292c51c SHA512 7bf65b7b19b584dc9637a5c4d048a3c9e96e3980c1f7829e3d726fa70de0e8eb75969d4196bb54d04013f35905589a28d80d361008189aa1fcd9312852238a6b MISC metadata.xml 498 BLAKE2B 415d770e91c8304ace73ee5ff1ee079d7e1c09c6eeac26123e4ba4615194829a0c8bedfe27e2e803cddb101b30c3bd94b6003523fa0ec849972303b0f37f59e2 SHA512 dfaf020b039378127a159f2f8b66f1488b671817c34b77b01e19f24c117306c88801e26990fc434b4f9c23d1620631cf048ff9c281017135e46c7b7acbbfb8a0 diff --git a/dev-cpp/valijson/valijson-1.0.2.ebuild b/dev-cpp/valijson/valijson-1.0.2.ebuild index b0c20539683e..9ee0f307cdba 100644 --- a/dev-cpp/valijson/valijson-1.0.2.ebuild +++ b/dev-cpp/valijson/valijson-1.0.2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/tristanpenman/valijson/archive/v${PV}.tar.gz -> ${P} LICENSE="BSD-2 Boost-1.0" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="amd64 ~arm64 x86" RESTRICT="test" src_install() { diff --git a/dev-cpp/xsimd/Manifest b/dev-cpp/xsimd/Manifest index 21d48dbecda6..02ede58ed931 100644 --- a/dev-cpp/xsimd/Manifest +++ b/dev-cpp/xsimd/Manifest @@ -1,8 +1,12 @@ AUX xsimd-11.1.0-c++17.patch 1429 BLAKE2B 23be29fdd74ed37632bd1fba0ffdedf08af48f14985494f5befac4afb34622bb44e294e954d9d4e57a07ee6e9d988a48a93dd1b66a6f6206b79bd7c0cb600cc8 SHA512 41a474a6d768aec39e6760d4ff60017a5e3d5c4349bf244d3de1464bd9b06022d6cadcd4f91cc17a6630f38f1b0fe0e3aa4fa5a6810b8c57d649f5a8da28c217 AUX xsimd-11.1.0-no-march.patch 3720 BLAKE2B 21adb3c35d8161db849c90363781642fa9c1051686e6dba00e55396adc905d1276540c663d34ab7bd124daa3fe6e367c5c41c17d7e0f31d55b82b1488fbdee0f SHA512 567f535a2a0dcdb02f05b53beba48e9704ef40d63df9531014257e0773a8df09854245ec5d22e6b7cffdf7541e8f48e55e2ea8faa513ca93f952aa177757bb3a AUX xsimd-12.1.1-no-march.patch 3739 BLAKE2B 44fb2ddfb55b8109e3b92a1479647ecbaf0f16fe949bc70c2f12fcfbd1cb0d87bfdf43d0fc2ac835bde8dbe843527d6426692a2fd0b504b6cfdcee824ae5d262 SHA512 82d5d1834af23f94ef0421c328e8f0b84c4c3b05acbd3c05bc9ea9c56c4078e827b8dcecf5f726deb35de9b3693c63effd5b7085c07a3b964f25a577d53c6da2 +AUX xsimd-13.0.0-detection-simd-with-mitigations.patch 5810 BLAKE2B a9a2bf8211e60c4e370c6c845cb06a1b17c7666778e907ba3215c9309a82e70efba2462cfb77298f15dd2366b0354c5830c99a3d08cfd619981b5e9c5179726b SHA512 b01b33722aa0a45f74d4df9810ea442ec37932aeb188c5c40e63f15533667b82b0ad5a0c2c737e18ad327e70c44bf13669f46dcc57fcde305dd94f0d24421e9f +AUX xsimd-13.0.0-sve-rvv.patch 3244 BLAKE2B 50681c648f98caf5efa5c916618be090435f1e35ecc1877e4c933e31d2e869c25cc36b6c8d885ec0749753b07b903125b17dbfd55e95e5f5e1a3e01363942463 SHA512 36f4dfee1103155b1dc9159293690df937fd554d0ce401834193e59283f65beb366f9a48f5fc25bb367a11c0c2b7a57b7e225d1a9cd74de9f1a143e919c0b052 DIST xsimd-11.1.0.tar.gz 219350 BLAKE2B 2bbbc4f7dbe489a407fe798b146c008aba44664efc943c2e1507d5c6e7da2a03ed91abf0d872e5abf9bd94be3e76bef276ec5b47d4e356b42a7b4c680bd6f3d9 SHA512 3a6141dfa4d95a977f4222880dfd06197613d153a78a84653022423279eec037ea9def08ae225aba7231c0b2c434ab7c907c965f8367fb0db9b96113980b51f3 DIST xsimd-12.1.1.tar.gz 253141 BLAKE2B 29efbb045d8ade8737d702a73f3d0a912111dd4fbc84485c0e54c8b06d73edbb4b85f4b51e24da9bed0dea010b0cce9d99b57e20e8b94d3daf90d46031548eb9 SHA512 8e45a8e9b28358d5f20f713ea19a8c366edc62790c27984149f283dfe808d78a549c8ec465e8b3677d7e30b2cb80093908de364bbb9dc80683f5fdfb843131e1 +DIST xsimd-13.0.0.tar.gz 259967 BLAKE2B 63267c75a7e8ed2e8689a912e79a1d012ff3cf3813969f97a640801e372ec9e66a6e3d3034b6918a30dc3374e8211fd1107f1309156354b6bca6ba17c6f132b4 SHA512 cdc42ddad3353297cf25ea2b6b3f09967f5f388efc26241f2997979fdbbac072819ff771145bc5bfa86cb326cca84b4119e8e6e3f658407961cf203a40603a7f EBUILD xsimd-11.1.0-r1.ebuild 1034 BLAKE2B fdc6a900c039da14a5091ee7ed4a9ea9e2611610a9bd812fc6be91544e08e2f91d101b0800e70c8df224bab2d08677723e9aece300edbca585d9e31ee9425c4a SHA512 0e00b0d9143cd2c2736be80f35616fbb17789bc9696efb9ee340d13243b2c1c299314549faeeb6e02b3029e96709d8e7c108fe2b58cd5658aa60a8e9ff44c1e1 EBUILD xsimd-12.1.1.ebuild 1045 BLAKE2B 263ebcc57be8996455820190be8d339f4f22ceb17d4da6e8f1438502307b429b091cf721d2ea9e55e7a2a6c66e65d1d824a271af3f5aeec0d66aa519c2e345c7 SHA512 998d903d3841879ce50c7e812b74d04bea52f49eb02222d886d4322f4cd7dd386c6eecf95f39b26668c93d91ac899c2c336ba6a677d3bd354e07c5aff52d8ed3 +EBUILD xsimd-13.0.0.ebuild 1156 BLAKE2B 4d9e98b81e4dddaa290d2b4a7ede0af27929838c32d8056532d01e0670601203447a588c8008dd0181c8fb7892827178dbe70a80241558ba7ee3c61b5e452cbf SHA512 1a0ba1839d8b37dca5194fa0f768db02539154f0f9ebf83bdeb6912bc4d7d63dd7bcdc6a3110dd7b0f304855709a8883c6b0126de0a64b5aff3be277c8475200 MISC metadata.xml 385 BLAKE2B e22c7622c338c277eee7dd048463a2d3244fffcd255b1a9dd9652a1295c3c1f0043e67fab28b084b3f10b03b5fd5e36b4f713c040ddc168ac6be9287af14e031 SHA512 5826eb1e62fa79c1e355668ad83a9e4e113b3cf154535537181597062f952ad436c56c8d9dd9f3599815307e33f4e1366b2a9b109d27c53bc112fe0a4c62d885 diff --git a/dev-cpp/xsimd/files/xsimd-13.0.0-detection-simd-with-mitigations.patch b/dev-cpp/xsimd/files/xsimd-13.0.0-detection-simd-with-mitigations.patch new file mode 100644 index 000000000000..6aab22cd8416 --- /dev/null +++ b/dev-cpp/xsimd/files/xsimd-13.0.0-detection-simd-with-mitigations.patch @@ -0,0 +1,148 @@ +https://mail.kde.org/pipermail/distributions/2024-July/001511.html +https://github.com/xtensor-stack/xsimd/commit/96edf0340492fa9c080f5182b38358ca85baef5e + +From 96edf0340492fa9c080f5182b38358ca85baef5e Mon Sep 17 00:00:00 2001 +From: Dmitry Kazakov <dimula73@gmail.com> +Date: Tue, 28 May 2024 22:21:08 +0200 +Subject: [PATCH] Fix detection of SSE/AVX/AVX512 when they are explicitly + disabled by OS + +Some CPU vulnerability mitigations may disable AVX functionality +on the hardware level via the XCR0 register. We should check that +manually to verify that OS actually allows us to use this feature. + +See https://bugs.kde.org/show_bug.cgi?id=484622 + +Fix #1025 +--- + include/xsimd/config/xsimd_cpuid.hpp | 91 ++++++++++++++++++++++------ + 1 file changed, 72 insertions(+), 19 deletions(-) + +diff --git a/include/xsimd/config/xsimd_cpuid.hpp b/include/xsimd/config/xsimd_cpuid.hpp +index f22089bac..6dda3be09 100644 +--- a/include/xsimd/config/xsimd_cpuid.hpp ++++ b/include/xsimd/config/xsimd_cpuid.hpp +@@ -114,6 +114,35 @@ namespace xsimd + #endif + + #elif defined(__x86_64__) || defined(__i386__) || defined(_M_AMD64) || defined(_M_IX86) ++ ++ auto get_xcr0_low = []() noexcept ++ { ++ uint32_t xcr0; ++ ++#if defined(_MSC_VER) && _MSC_VER >= 1400 ++ ++ xcr0 = (uint32_t)_xgetbv(0); ++ ++#elif defined(__GNUC__) ++ ++ __asm__( ++ "xorl %%ecx, %%ecx\n" ++ "xgetbv\n" ++ : "=a"(xcr0) ++ : ++#if defined(__i386__) ++ : "ecx", "edx" ++#else ++ : "rcx", "rdx" ++#endif ++ ); ++ ++#else /* _MSC_VER < 1400 */ ++#error "_MSC_VER < 1400 is not supported" ++#endif /* _MSC_VER && _MSC_VER >= 1400 */ ++ return xcr0; ++ }; ++ + auto get_cpuid = [](int reg[4], int level, int count = 0) noexcept + { + +@@ -148,19 +177,43 @@ namespace xsimd + + get_cpuid(regs1, 0x1); + +- sse2 = regs1[3] >> 26 & 1; +- sse3 = regs1[2] >> 0 & 1; +- ssse3 = regs1[2] >> 9 & 1; +- sse4_1 = regs1[2] >> 19 & 1; +- sse4_2 = regs1[2] >> 20 & 1; +- fma3_sse42 = regs1[2] >> 12 & 1; ++ // OS can explicitly disable the usage of SSE/AVX extensions ++ // by setting an appropriate flag in CR0 register ++ // ++ // https://docs.kernel.org/admin-guide/hw-vuln/gather_data_sampling.html ++ ++ unsigned sse_state_os_enabled = 1; ++ unsigned avx_state_os_enabled = 1; ++ unsigned avx512_state_os_enabled = 1; ++ ++ // OSXSAVE: A value of 1 indicates that the OS has set CR4.OSXSAVE[bit ++ // 18] to enable XSETBV/XGETBV instructions to access XCR0 and ++ // to support processor extended state management using ++ // XSAVE/XRSTOR. ++ bool osxsave = regs1[2] >> 27 & 1; ++ if (osxsave) ++ { ++ ++ uint32_t xcr0 = get_xcr0_low(); ++ ++ sse_state_os_enabled = xcr0 >> 1 & 1; ++ avx_state_os_enabled = xcr0 >> 2 & sse_state_os_enabled; ++ avx512_state_os_enabled = xcr0 >> 6 & avx_state_os_enabled; ++ } ++ ++ sse2 = regs1[3] >> 26 & sse_state_os_enabled; ++ sse3 = regs1[2] >> 0 & sse_state_os_enabled; ++ ssse3 = regs1[2] >> 9 & sse_state_os_enabled; ++ sse4_1 = regs1[2] >> 19 & sse_state_os_enabled; ++ sse4_2 = regs1[2] >> 20 & sse_state_os_enabled; ++ fma3_sse42 = regs1[2] >> 12 & sse_state_os_enabled; + +- avx = regs1[2] >> 28 & 1; ++ avx = regs1[2] >> 28 & avx_state_os_enabled; + fma3_avx = avx && fma3_sse42; + + int regs8[4]; + get_cpuid(regs8, 0x80000001); +- fma4 = regs8[2] >> 16 & 1; ++ fma4 = regs8[2] >> 16 & avx_state_os_enabled; + + // sse4a = regs[2] >> 6 & 1; + +@@ -168,23 +221,23 @@ namespace xsimd + + int regs7[4]; + get_cpuid(regs7, 0x7); +- avx2 = regs7[1] >> 5 & 1; ++ avx2 = regs7[1] >> 5 & avx_state_os_enabled; + + int regs7a[4]; + get_cpuid(regs7a, 0x7, 0x1); +- avxvnni = regs7a[0] >> 4 & 1; ++ avxvnni = regs7a[0] >> 4 & avx_state_os_enabled; + + fma3_avx2 = avx2 && fma3_sse42; + +- avx512f = regs7[1] >> 16 & 1; +- avx512cd = regs7[1] >> 28 & 1; +- avx512dq = regs7[1] >> 17 & 1; +- avx512bw = regs7[1] >> 30 & 1; +- avx512er = regs7[1] >> 27 & 1; +- avx512pf = regs7[1] >> 26 & 1; +- avx512ifma = regs7[1] >> 21 & 1; +- avx512vbmi = regs7[2] >> 1 & 1; +- avx512vnni_bw = regs7[2] >> 11 & 1; ++ avx512f = regs7[1] >> 16 & avx512_state_os_enabled; ++ avx512cd = regs7[1] >> 28 & avx512_state_os_enabled; ++ avx512dq = regs7[1] >> 17 & avx512_state_os_enabled; ++ avx512bw = regs7[1] >> 30 & avx512_state_os_enabled; ++ avx512er = regs7[1] >> 27 & avx512_state_os_enabled; ++ avx512pf = regs7[1] >> 26 & avx512_state_os_enabled; ++ avx512ifma = regs7[1] >> 21 & avx512_state_os_enabled; ++ avx512vbmi = regs7[2] >> 1 & avx512_state_os_enabled; ++ avx512vnni_bw = regs7[2] >> 11 & avx512_state_os_enabled; + avx512vnni_vbmi = avx512vbmi && avx512vnni_bw; + #endif + } + diff --git a/dev-cpp/xsimd/files/xsimd-13.0.0-sve-rvv.patch b/dev-cpp/xsimd/files/xsimd-13.0.0-sve-rvv.patch new file mode 100644 index 000000000000..38ea56d1baa2 --- /dev/null +++ b/dev-cpp/xsimd/files/xsimd-13.0.0-sve-rvv.patch @@ -0,0 +1,88 @@ +https://mail.kde.org/pipermail/distributions/2024-July/001511.html +https://github.com/xtensor-stack/xsimd/commit/80a59235e3ffa51659aaa06f002bfd088b77023c + +From 80a59235e3ffa51659aaa06f002bfd088b77023c Mon Sep 17 00:00:00 2001 +From: Dmitry Kazakov <dimula73@gmail.com> +Date: Fri, 14 Jun 2024 10:19:55 +0200 +Subject: [PATCH] Fix xsimd::available_architectures().has() for sve and rvv + archs + +Ideally the patch CPU detection code should also check if the length +of SVE and RVV is actually supported by the current CPU implementation +(i.e. ZCR_Elx.LEN register for SVE and something else for RVV), but +I don't have such CPUs/emulators handy, so I cannot add such checks. + +Given that xsimd::available_architectures().has() is a new feature +of XSIMD13 and the length check has never been present in XSIMD, this +bug is not a regression at least. + +The patch also adds a unittest that reproduces the error the patch fixes +--- + include/xsimd/config/xsimd_cpuid.hpp | 12 ++++++++++-- + test/test_arch.cpp | 15 +++++++++++++++ + 2 files changed, 25 insertions(+), 2 deletions(-) + +diff --git a/include/xsimd/config/xsimd_cpuid.hpp b/include/xsimd/config/xsimd_cpuid.hpp +index 6dda3be09..8021fceb8 100644 +--- a/include/xsimd/config/xsimd_cpuid.hpp ++++ b/include/xsimd/config/xsimd_cpuid.hpp +@@ -42,6 +42,10 @@ namespace xsimd + #define ARCH_FIELD_EX(arch, field_name) \ + unsigned field_name; \ + XSIMD_INLINE bool has(::xsimd::arch) const { return this->field_name; } ++ ++#define ARCH_FIELD_EX_REUSE(arch, field_name) \ ++ XSIMD_INLINE bool has(::xsimd::arch) const { return this->field_name; } ++ + #define ARCH_FIELD(name) ARCH_FIELD_EX(name, name) + + ARCH_FIELD(sse2) +@@ -72,8 +76,12 @@ namespace xsimd + ARCH_FIELD(neon) + ARCH_FIELD(neon64) + ARCH_FIELD_EX(i8mm<::xsimd::neon64>, i8mm_neon64) +- ARCH_FIELD(sve) +- ARCH_FIELD(rvv) ++ ARCH_FIELD_EX(detail::sve<512>, sve) ++ ARCH_FIELD_EX_REUSE(detail::sve<256>, sve) ++ ARCH_FIELD_EX_REUSE(detail::sve<128>, sve) ++ ARCH_FIELD_EX(detail::rvv<512>, rvv) ++ ARCH_FIELD_EX_REUSE(detail::rvv<256>, rvv) ++ ARCH_FIELD_EX_REUSE(detail::rvv<128>, rvv) + ARCH_FIELD(wasm) + + #undef ARCH_FIELD +diff --git a/test/test_arch.cpp b/test/test_arch.cpp +index b42073358..f1f50d546 100644 +--- a/test/test_arch.cpp ++++ b/test/test_arch.cpp +@@ -38,6 +38,16 @@ struct check_supported + } + }; + ++struct check_cpu_has_intruction_set ++{ ++ template <class Arch> ++ void operator()(Arch arch) const ++ { ++ static_assert(std::is_same<decltype(xsimd::available_architectures().has(arch)), bool>::value, ++ "cannot test instruction set availability on CPU"); ++ } ++}; ++ + struct check_available + { + template <class Arch> +@@ -71,6 +81,11 @@ TEST_CASE("[multi arch support]") + xsimd::supported_architectures::for_each(check_supported {}); + } + ++ SUBCASE("xsimd::available_architectures::has") ++ { ++ xsimd::all_architectures::for_each(check_cpu_has_intruction_set {}); ++ } ++ + SUBCASE("xsimd::default_arch::name") + { + constexpr char const* name = xsimd::default_arch::name(); + diff --git a/dev-cpp/xsimd/xsimd-13.0.0.ebuild b/dev-cpp/xsimd/xsimd-13.0.0.ebuild new file mode 100644 index 000000000000..f6fa6899c716 --- /dev/null +++ b/dev-cpp/xsimd/xsimd-13.0.0.ebuild @@ -0,0 +1,60 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="C++ wrappers for SIMD intrinsics" +HOMEPAGE="https://github.com/xtensor-stack/xsimd" +SRC_URI="https://github.com/xtensor-stack/${PN}/archive/refs/tags/${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86" +IUSE="doc test" +RESTRICT="!test? ( test )" + +BDEPEND=" + doc? ( + app-text/doxygen + dev-python/breathe + dev-python/sphinx + dev-python/sphinx-rtd-theme + ) + test? ( dev-cpp/doctest )" + +PATCHES=( + "${FILESDIR}"/${PN}-11.1.0-c++17.patch + "${FILESDIR}"/${PN}-12.1.1-no-march.patch + "${FILESDIR}"/${PN}-13.0.0-sve-rvv.patch + "${FILESDIR}"/${PN}-13.0.0-detection-simd-with-mitigations.patch +) + +src_prepare() { + sed -i \ + -e '/fPIC/d' \ + test/CMakeLists.txt \ + || die + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DBUILD_TESTS=$(usex test) + ) + cmake_src_configure +} + +src_compile() { + cmake_src_compile + use doc && emake -C docs html +} + +src_install() { + cmake_src_install + if use doc; then + dodoc -r docs/build/html + fi +} diff --git a/dev-cpp/yaml-cpp/Manifest b/dev-cpp/yaml-cpp/Manifest index d87a307a3d62..ac5c6276e45e 100644 --- a/dev-cpp/yaml-cpp/Manifest +++ b/dev-cpp/yaml-cpp/Manifest @@ -3,8 +3,9 @@ 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.8.0-gcc13.patch 2242 BLAKE2B 8b5b99e86a578310dd020237a82150dd0ae47dc009cff2f423ec6248c77635384c6e4ff0620a446858ec12223ea3148a006a76fd9c5a02c28cf29c0969b19dfd SHA512 429ca92104b6203695970e7bc79ed452c0dd6a02b98beb2e640a89184d10f1daedf10a5f7697942036317225c52a054c0916bfe1c54635b34b83721f72a31f6d AUX yaml-cpp-0.8.0-gtest.patch 954 BLAKE2B 916365624688a62d2fa1f5dcbe62e65c872439efd8172a9898457797ce857003c31d8de082fe87ee9a47027f4021bc87ded88e7d4e40ed87e2da2a2333cc6d62 SHA512 781451e4477c22f059bb22b59b253bc2c2d4c0668bb00b44867d79a6d0e87f95abcfa11d35bcbf0e7aacc94b9185dfbef814018d7a58df00d93cd13ca0df8edc +AUX yaml-cpp-0.8.0-include-cstdint.patch 1090 BLAKE2B 0415488b047454dfbbf962b6e1f135c277e7c4b1cce30b76045c611d3cee9dcf6f701c8ff290ff3943442dd1d3c7ec8d5547328a91dbced7d93530d4dcb9703f SHA512 1e376b6ba5b4f5673271bb0790768ca8512efe44d821940c7bc58539d08f118bc30ebaa64a137bf7ba77987f6c5596706dcf99a9b4a58199aa0e4f7aa2969b52 DIST yaml-cpp-0.7.0.tar.gz 1033237 BLAKE2B 69a11a8503ad607aa0d54912a5e53d305a643fe2d36dd86fa96832e3d4930b39a85318dc130e438210a9ca60357f3aa9aa6cd0f2b6bc45728b648c545a437368 SHA512 2de0f0ec8f003cd3c498d571cda7a796bf220517bad2dc02cba70c522dddde398f33cf1ad20da251adaacb2a07b77844111f297e99d45a7c46ebc01706bbafb5 DIST yaml-cpp-0.8.0.gh.tar.gz 1017151 BLAKE2B 5fd3eaec06bc04215afd2aa14ae8cd35f829f700f104931a51dbd8bb22e4e87f5cd5f2f975d3a2f464226d7165d3d106aa17bc7eab8a812c2545d2212011cf11 SHA512 aae9d618f906117d620d63173e95572c738db518f4ff1901a06de2117d8deeb8045f554102ca0ba4735ac0c4d060153a938ef78da3e0da3406d27b8298e5f38e EBUILD yaml-cpp-0.7.0-r2.ebuild 857 BLAKE2B 63735ee4c253e6b04cf7c2c9b0725cf4aad80564eca30ca2e80360e8fa4d1263d95af7260cfa49c182d1109b13dd1ef5e754d1e6967f6414d9745ecf683b71b9 SHA512 7308409215a0e874fe4d2a2a6b8a8ccbfba8b4617a3852d50d40ca70cd2394fde8c1b8e1224136018aa043aecf3dbb6bc515e1ac90517c448c904a6315944249 -EBUILD yaml-cpp-0.8.0.ebuild 834 BLAKE2B 79015081abc63012a566c0a9b312d1cf0730f446b1ccd91c46af38f39fbfab8fc966d6ebe7f105acd572afa4cf79dc6f34cdcf7f67e7568a228395115bc16ec6 SHA512 a3b1e11b3ce2dd532a8951fa00b6991d069fbbe02df23b71d9c4dc8b82b20616901fdcc92a52d50ffb99536a59c957e924a197e391948212df9ee137c95c5ef1 +EBUILD yaml-cpp-0.8.0.ebuild 886 BLAKE2B 3201a330fa6b5de80fbc96216b38ff4f52a38ba64ca652d0c002a750c8f343d6b518d19b8f621a56c5d8a95378ebb78306050a7da5072030110d7c52feb66755 SHA512 f9f2ae48d5fc6f5a2338a1582999e7db9c9cb1a2cb22880db1b5f845e1ca36e29a17353732f0fa64057d773e211a53215097d905be947998209066033d422e74 MISC metadata.xml 484 BLAKE2B e973aef681bed7de47725bab49d2acfe809ad73c97eea709bec9d5bb9d720f89bc222ff77f09b90780b2a14d6a094f9ddd24a4f15d6ad88b94060d240c5836d8 SHA512 612604d3b0c2edd157c4a55ae22d92e174cdcbc17532de7f2888b9579b4b028da2214e6d756864dfffdeca129f32e5db2241308d326c6ff21044f48bf2d87d73 diff --git a/dev-cpp/yaml-cpp/files/yaml-cpp-0.8.0-include-cstdint.patch b/dev-cpp/yaml-cpp/files/yaml-cpp-0.8.0-include-cstdint.patch new file mode 100644 index 000000000000..d017b43fa440 --- /dev/null +++ b/dev-cpp/yaml-cpp/files/yaml-cpp-0.8.0-include-cstdint.patch @@ -0,0 +1,33 @@ +https://github.com/jbeder/yaml-cpp/pull/1310 + +From: Christopher Fore <csfore@posteo.net> +Date: Wed, 14 Aug 2024 21:02:32 -0400 +Subject: [PATCH] emitterutils: Explicitly include <cstdint> + +GCC 15 will no longer include it by default, resulting in build +failures in projects that do not explicitly include it. + +Error: +src/emitterutils.cpp:221:11: error: 'uint16_t' was not declared in this scope + 221 | std::pair<uint16_t, uint16_t> EncodeUTF16SurrogatePair(int codePoint) { + | ^~~~~~~~ +src/emitterutils.cpp:13:1: note: 'uint16_t' is defined in header '<cstdint>'; +this is probably fixable by adding '#include <cstdint>' + 12 | #include "yaml-cpp/null.h" + +++ |+#include <cstdint> + 13 | #include "yaml-cpp/ostream_wrapper.h" + +Tests pass. + +Closes: #1307 +See-also: https://gcc.gnu.org/pipermail/gcc-cvs/2024-August/407124.html +See-also: https://bugs.gentoo.org/937412 +Signed-off-by: Christopher Fore <csfore@posteo.net> +--- a/src/emitterutils.cpp ++++ b/src/emitterutils.cpp +@@ -1,4 +1,5 @@ + #include <algorithm> ++#include <cstdint> + #include <iomanip> + #include <sstream> + diff --git a/dev-cpp/yaml-cpp/yaml-cpp-0.8.0.ebuild b/dev-cpp/yaml-cpp/yaml-cpp-0.8.0.ebuild index dc3a8a58c33c..5691f9d3a803 100644 --- a/dev-cpp/yaml-cpp/yaml-cpp-0.8.0.ebuild +++ b/dev-cpp/yaml-cpp/yaml-cpp-0.8.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -22,6 +22,7 @@ DEPEND=" PATCHES=( "${FILESDIR}/yaml-cpp-0.8.0-gtest.patch" "${FILESDIR}/yaml-cpp-0.8.0-gcc13.patch" + "${FILESDIR}/yaml-cpp-0.8.0-include-cstdint.patch" ) src_configure() { |