diff options
Diffstat (limited to 'dev-libs')
846 files changed, 14000 insertions, 12725 deletions
diff --git a/dev-libs/FBGEMM/FBGEMM-2023.11.02.ebuild b/dev-libs/FBGEMM/FBGEMM-2023.11.02.ebuild deleted file mode 100644 index ce3c44e805d1..000000000000 --- a/dev-libs/FBGEMM/FBGEMM-2023.11.02.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 2022-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..12} ) -inherit python-any-r1 flag-o-matic cmake - -CommitId=cdae5d97e3aa9fda4222f31c04dbd80249c918d1 - -DESCRIPTION="Facebook GEneral Matrix Multiplication" -HOMEPAGE="https://github.com/pytorch/FBGEMM" -SRC_URI="https://github.com/pytorch/${PN}/archive/${CommitId}.tar.gz - -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64" -IUSE="doc test" - -DEPEND=" - >=dev-libs/asmjit-2022.07.02 - dev-libs/cpuinfo -" -RDEPEND="${DEPEND}" -BDEPEND=" - test? ( dev-cpp/gtest ) - doc? ( - $(python_gen_any_dep ' - dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}] - dev-python/breathe[${PYTHON_USEDEP}] - ') - ) - ${PYTHON_DEPS} -" -RESTRICT="!test? ( test )" - -S="${WORKDIR}"/${PN}-${CommitId} - -python_check_deps() { - if use doc; then - python_has_version \ - "dev-python/sphinx[${PYTHON_USEDEP}]" \ - "dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]" \ - "dev-python/breathe[${PYTHON_USEDEP}]" - fi -} - -PATCHES=( - "${FILESDIR}"/${P}-gentoo.patch -) - -src_prepare() { - # Bug #855668 - filter-lto - - rm test/RowWiseSparseAdagradFusedTest.cc || die - rm test/SparseAdagradTest.cc || die - sed -i \ - -e "/-Werror/d" \ - CMakeLists.txt \ - || die - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DFBGEMM_LIBRARY_TYPE=shared - -DFBGEMM_BUILD_BENCHMARKS=OFF - -DFBGEMM_BUILD_DOCS=$(usex doc ON OFF) - -DFBGEMM_BUILD_TESTS=$(usex test ON OFF) - ) - cmake_src_configure -} - -src_test() { - OMP_STACKSIZE=512k cmake_src_test -} diff --git a/dev-libs/FBGEMM/FBGEMM-2023.12.01.ebuild b/dev-libs/FBGEMM/FBGEMM-2023.12.01.ebuild deleted file mode 100644 index 0d2e34d143c4..000000000000 --- a/dev-libs/FBGEMM/FBGEMM-2023.12.01.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 2022-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -inherit python-any-r1 flag-o-matic cmake - -CommitId=88fc6e741bc03e09fcdc3cd365fa3aafddb7ec24 - -DESCRIPTION="Facebook GEneral Matrix Multiplication" -HOMEPAGE="https://github.com/pytorch/FBGEMM" -SRC_URI="https://github.com/pytorch/${PN}/archive/${CommitId}.tar.gz - -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64" -IUSE="doc test" - -DEPEND=" - >=dev-libs/asmjit-2022.07.02 - dev-libs/cpuinfo -" -RDEPEND="${DEPEND}" -BDEPEND=" - test? ( dev-cpp/gtest ) - doc? ( - $(python_gen_any_dep ' - dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}] - dev-python/breathe[${PYTHON_USEDEP}] - ') - ) - ${PYTHON_DEPS} -" -RESTRICT="!test? ( test )" - -S="${WORKDIR}"/${PN}-${CommitId} - -python_check_deps() { - if use doc; then - python_has_version \ - "dev-python/sphinx[${PYTHON_USEDEP}]" \ - "dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]" \ - "dev-python/breathe[${PYTHON_USEDEP}]" - fi -} - -PATCHES=( - "${FILESDIR}"/${PN}-2023.11.02-gentoo.patch -) - -src_prepare() { - # Bug #855668 - filter-lto - - rm test/RowWiseSparseAdagradFusedTest.cc || die - rm test/SparseAdagradTest.cc || die - sed -i \ - -e "/-Werror/d" \ - CMakeLists.txt \ - || die - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DFBGEMM_LIBRARY_TYPE=shared - -DFBGEMM_BUILD_BENCHMARKS=OFF - -DFBGEMM_BUILD_DOCS=$(usex doc ON OFF) - -DFBGEMM_BUILD_TESTS=$(usex test ON OFF) - ) - cmake_src_configure -} - -src_test() { - OMP_STACKSIZE=512k cmake_src_test -} diff --git a/dev-libs/FBGEMM/Manifest b/dev-libs/FBGEMM/Manifest index 5b052896fa9b..cdd095351647 100644 --- a/dev-libs/FBGEMM/Manifest +++ b/dev-libs/FBGEMM/Manifest @@ -1,3 +1 @@ -DIST FBGEMM-2023.11.02.tar.gz 895265 BLAKE2B 0f884147a86881159485680f1cb0c7b7e65bba5a98e62c38534041264f920e08a268e348e3d82ba3d246226a10f592d86dc37bce0cfa42c72dad478041a6c807 SHA512 030f27a120586240c5f80026bd033cf6fedbe1ae12a667308d33d6321f2334021d474a3625795d1f34734336b688b19c09134e10d5cc8dec86e84485de298584 -DIST FBGEMM-2023.12.01.tar.gz 1004090 BLAKE2B dc19ebee06bccb888e5d03606168c7439ce8c96303a697056edd22d3a3a6ff4f4f3ddf5371d50aa774890ca1ad66d665f5e54976dc1b8da841759a3f4d64c4d7 SHA512 ab37964326d2cbbcbf0f2c722675d1f059407fc3185275d37f2e04f3e516fe0733ac1fb35351fc7e7c308e9c0da40811d3657a10a3696cb7648494df79408aab DIST FBGEMM-2023.12.04.tar.gz 1004231 BLAKE2B 930ae36f4761901e1b22d7ce4a341f051158a23646bd1f5309f6eb98c1ca483e8aa4e5a6cfc44ced702f73f84e3398c1439799457a98d0d8a009702e335d5c03 SHA512 3c786572b4a69af2a32b360711014469ded69be580d0079ba79ab81cbaa964aab51e5a189e24f0ec7dc93402d761167898918a0ea0f86d556cad4b99f5858d8c diff --git a/dev-libs/FP16/FP16-2021.03.20-r4.ebuild b/dev-libs/FP16/FP16-2021.03.20-r4.ebuild index af3be0a34c68..377693665d64 100644 --- a/dev-libs/FP16/FP16-2021.03.20-r4.ebuild +++ b/dev-libs/FP16/FP16-2021.03.20-r4.ebuild @@ -1,8 +1,8 @@ -# Copyright 2022-2023 Gentoo Authors +# Copyright 2022-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..12} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit python-r1 cmake CommitId=0a92994d729ff76a58f692d3028ca1b64b145d91 @@ -12,6 +12,8 @@ HOMEPAGE="https://github.com/Maratyszcza/FP16/" SRC_URI="https://github.com/Maratyszcza/${PN}/archive/${CommitId}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}"/${PN}-${CommitId} + LICENSE="MIT" SLOT="0" KEYWORDS="~amd64" @@ -22,13 +24,11 @@ DEPEND="dev-libs/psimd" RDEPEND=" ${DEPEND} ${PYTHON_DEPS} - dev-python/PeachPy[${PYTHON_USEDEP}] + dev-python/peachpy[${PYTHON_USEDEP}] " BDEPEND="test? ( dev-cpp/gtest )" RESTRICT="!test? ( test )" -S="${WORKDIR}"/${PN}-${CommitId} - PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) diff --git a/dev-libs/FP16/FP16-2024.05.27.ebuild b/dev-libs/FP16/FP16-2024.05.27.ebuild new file mode 100644 index 000000000000..083edbf6e0d1 --- /dev/null +++ b/dev-libs/FP16/FP16-2024.05.27.ebuild @@ -0,0 +1,58 @@ +# Copyright 2022-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{10..12} ) +inherit python-r1 cmake + +CommitId=95163a75c51bc8dc29f72d0d7419ec50132984ff + +DESCRIPTION="conversion to/from half-precision floating point formats" +HOMEPAGE="https://github.com/Maratyszcza/FP16/" +SRC_URI="https://github.com/Maratyszcza/${PN}/archive/${CommitId}.tar.gz + -> ${P}.tar.gz" + +S="${WORKDIR}"/${PN}-${CommitId} + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" +IUSE="test" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +DEPEND="dev-libs/psimd" +RDEPEND=" + ${DEPEND} + ${PYTHON_DEPS} + dev-python/peachpy[${PYTHON_USEDEP}] +" +BDEPEND="test? ( dev-cpp/gtest )" +RESTRICT="!test? ( test )" + +PATCHES=( + "${FILESDIR}"/${PN}-2021.03.20-gentoo.patch +) + +src_prepare() { + cmake_src_prepare + mkdir -p module/fp16 || die + cp include/fp16/*py module/fp16 || die +} + +src_configure() { + local mycmakeargs=( + -DFP16_BUILD_BENCHMARKS=OFF + -DFP16_BUILD_TESTS=$(usex test ON OFF) + ) + cmake_src_configure +} + +python_install() { + python_domodule module/fp16 +} + +src_install() { + cmake_src_install + rm "${ED}"/usr/include/fp16/*.py || die + python_foreach_impl python_install +} diff --git a/dev-libs/FP16/FP16-2024.06.20.ebuild b/dev-libs/FP16/FP16-2024.06.20.ebuild new file mode 100644 index 000000000000..4658ceaebbff --- /dev/null +++ b/dev-libs/FP16/FP16-2024.06.20.ebuild @@ -0,0 +1,37 @@ +# Copyright 2022-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit cmake + +CommitId=98b0a46bce017382a6351a19577ec43a715b6835 + +DESCRIPTION="conversion to/from half-precision floating point formats" +HOMEPAGE="https://github.com/Maratyszcza/FP16/" +SRC_URI="https://github.com/Maratyszcza/${PN}/archive/${CommitId}.tar.gz + -> ${P}.tar.gz" + +S="${WORKDIR}"/${PN}-${CommitId} + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" +IUSE="test" + +BDEPEND="test? ( dev-cpp/gtest )" +RESTRICT="!test? ( test )" + +PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) + +src_prepare() { + sed -i -e "s|CXX_STANDARD 11|CXX_STANDARD 14|" CMakeLists.txt || die + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DFP16_BUILD_BENCHMARKS=OFF + -DFP16_BUILD_TESTS=$(usex test ON OFF) + ) + cmake_src_configure +} diff --git a/dev-libs/FP16/Manifest b/dev-libs/FP16/Manifest index 46545c95256a..3fd0b65e93a5 100644 --- a/dev-libs/FP16/Manifest +++ b/dev-libs/FP16/Manifest @@ -1 +1,3 @@ DIST FP16-2021.03.20.tar.gz 71228 BLAKE2B e598225032324ffe38db9002e8397e67a713b6323ac57408e7e39e146826b2bb1dab60cd75181a25b1b07958463e3913bbf0e53b23803e53d472fda66b8ba6d5 SHA512 3f094f242425ea37de274eb8539dc5f8ab0c13fd5325d14180ef12e9c04e6002a110d086c4c667f7c8054af337deab096d59482eb95cc8a632c3c412b48e89d1 +DIST FP16-2024.05.27.tar.gz 71220 BLAKE2B 5b101aad7a8339fff400bba1db896c82498832075f3eb00cc6eaf27608ee0988f918956b5a768262b74552a52436200d4acd17f04f4a05060a32512afb26a9ac SHA512 b88fd0a91e6b6873ce5d0e2cd2afd2b8dceb8b17c366240abb8a5e2fe152faea3ba577ef420038c595cab0b61581a70b84c019c825a8dd262b1bee4686843b66 +DIST FP16-2024.06.20.tar.gz 64704 BLAKE2B cd086ca7419aa004c0c4c840227e61612348efb98bdddbf68ef92959267f5f4b0aef55751c5b8a6f50a1f0e7f386e4df5fac273c3849961168e0a5c03faf81e2 SHA512 d3ae46b5b0c944f1d8dcfbb90689266f4abaff3e0b5ef338d5d79193367f06d1bfbb9ad85a5a7685a894daeee6dc73fc5d73631718be1379cc6918655a0289aa diff --git a/dev-libs/FP16/files/FP16-2024.06.20-gentoo.patch b/dev-libs/FP16/files/FP16-2024.06.20-gentoo.patch new file mode 100644 index 000000000000..c5ab4e046827 --- /dev/null +++ b/dev-libs/FP16/files/FP16-2024.06.20-gentoo.patch @@ -0,0 +1,21 @@ +--- a/CMakeLists.txt 2022-05-10 09:11:41.286417033 +0200 ++++ b/CMakeLists.txt 2022-05-10 09:12:48.647398387 +0200 +@@ -19,7 +19,7 @@ + ENDIF() + + # ---[ Download deps +-IF(FP16_BUILD_TESTS AND NOT DEFINED GOOGLETEST_SOURCE_DIR) ++IF(FALSE) + MESSAGE(STATUS "Downloading Google Test to ${CMAKE_BINARY_DIR}/googletest-source (define GOOGLETEST_SOURCE_DIR to avoid it)") + CONFIGURE_FILE(cmake/DownloadGoogleTest.cmake "${CMAKE_BINARY_DIR}/googletest-download/CMakeLists.txt") + EXECUTE_PROCESS(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" . +@@ -60,9 +60,6 @@ + # ---[ Build google test + IF(NOT TARGET gtest) + SET(gtest_force_shared_crt ON CACHE BOOL "" FORCE) +- ADD_SUBDIRECTORY( +- "${GOOGLETEST_SOURCE_DIR}" +- "${CMAKE_BINARY_DIR}/googletest") + ENDIF() + + # ---[ Build FP16 unit tests diff --git a/dev-libs/FXdiv/FXdiv-2020.12.09-r1.ebuild b/dev-libs/FXdiv/FXdiv-2020.12.09-r1.ebuild index 2237546d365e..9edefb851e51 100644 --- a/dev-libs/FXdiv/FXdiv-2020.12.09-r1.ebuild +++ b/dev-libs/FXdiv/FXdiv-2020.12.09-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 @@ -10,6 +10,8 @@ HOMEPAGE="https://github.com/Maratyszcza/FXdiv/" SRC_URI="https://github.com/Maratyszcza/${PN}/archive/${CommitId}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}"/${PN}-${CommitId} + LICENSE="MIT" SLOT="0" KEYWORDS="~amd64" @@ -18,8 +20,6 @@ IUSE="test" BDEPEND="test? ( dev-cpp/gtest )" RESTRICT="!test? ( test )" -S="${WORKDIR}"/${PN}-${CommitId} - PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) diff --git a/dev-libs/apache-arrow/Manifest b/dev-libs/apache-arrow/Manifest index 07693b6a2c7c..cece0e7dd1cb 100644 --- a/dev-libs/apache-arrow/Manifest +++ b/dev-libs/apache-arrow/Manifest @@ -1,8 +1,6 @@ -DIST apache-arrow-16.1.0.tar.gz 21707079 BLAKE2B 5541c364351e59e8164f2461546bce3ddc834d70b3a03b815b681187674bdd89ccfb7eb113bf9010c821845b0c1fa51f5321bfea5b20927e6364f6452ec980d2 SHA512 28975f59e1fdde2dba4afaf4a5ba934b63db3a7f27656e2aa0af0f0d2a046c9dbfa9a6082de94629c36d03809b296566a37ea65ec5a2fc17fedac7d21e272d31 -DIST apache-arrow-17.0.0.tar.gz 21822331 BLAKE2B 64f9321cbf13fafae5938f26840d3ef642d6f5b40386315030bc70fe8703786ee394c8483d2bde7961cf2b5c15470ffebd7c66029e116b05cfbf5524e9fe51f1 SHA512 4e2a617b8deeb9f94ee085653a721904a75696f0827bcba82b535cc7f4f723066a09914c7fa83c593e51a8a4031e8bf99e563cac1ebb1d89604cb406975d4864 DIST apache-arrow-18.0.0.tar.gz 19113236 BLAKE2B c358f8e61155432540a4002c6dfba7a3763d934a43eddae0a9a6f98bb26879df51e3cdcc64db6dd684ffde2ef8ef6dcff8906355b5769f71afae907aa1e920c5 SHA512 4df30ab5561da695eaa864422626b9898555d86ca56835c3b8a8ca93a1dbaf081582bb36e2440d1daf7e1dd48c76941f1152a4f25ce0dbcc1c2abe244a00c05e -DIST apache-arrow-arrow-data-25d16511e8d42c2744a1d94d90169e3a36e92631.tar.gz 3571960 BLAKE2B c1c076bb3ff6427a45d1a157c60fb13c37786f97d213768c0bbe1ae073b5fb8d23cd402bdcfee303061df56bf3421ea8376f7c4ba9fec04c5cb35a85a32280f2 SHA512 abbc18da8f03b123a2d97eee709e929bbb5d567bf23219bbc63508c0e82ef99d7c0d71ca2d952566b63e968cffd96c5e1c62be9cb658323c949f229ff03234a8 -DIST apache-arrow-arrow-data-735ae7128d571398dd798d7ff004adebeb342883.tar.gz 3572136 BLAKE2B 35fdc78211adbfd326004e264a6480e8ec3e1debde9f4ffefea63dfe450d8e6e2b30f8ea5574ab001bb2d658a12dae0176da4524ed139bf7575e3ec1648f6795 SHA512 e5bb17efcb0f80aa52e21722d663a3085df6bc8dedfe446efa942d6c479dd7eb486ab2899c02380467f1008b305ec7a831847b6d68e0be0107ebe498db1f4eb5 -DIST apache-arrow-parquet-data-74278bc4a1122d74945969e6dec405abd1533ec3.tar.gz 1037654 BLAKE2B c9bb725a16f6706a3859bb36a60b700af62cb5f96546483ef1de0b65900b02b4f9013841d7b3dc70fd0f2fd8969b4d5c72d0fb68972568f61b4a6863a0df6f60 SHA512 18f8e2480079a0fd29eec2b8e5f753af1ee80255f6fc80af4acbf5c56e6dec08e2f9f54d8c5734c929ef901c63e4009c5d830325333fa6cc947d40ff5dcddfa3 +DIST apache-arrow-18.1.0.tar.gz 19132388 BLAKE2B 4a8c60d8a5dcf2b8ac4e2ae3a7f555dd0604d5ccc4b72ba317f18e16e75725b24553050fe88a02f382b0581310f20d0b795133b243f2851fa0e8d3801a839358 SHA512 7249c03a6097bc64fb0092143e4d4aaef3227565147e6254f026ddd504177c8dd565a184a0df39743dc989070dc3785e5b66f738c8e310ed9c982b61c2ec4914 +DIST apache-arrow-19.0.0.tar.gz 17830405 BLAKE2B cf611106b0ee5f92a4cbf341e9f5b6771f377710bb11c6eab555706a52b5c72fcf4590ba55c36100a97c6219ec421813f51ef6337530d84eb8394735ef2787b5 SHA512 6820de33a5d5b0922ea64dd8ff55d186ef02596ad0415578067aaf3e5cf7d3eead473bc3a5f92d6d3f19b97d153fe1c901359008d922d1ffb0fc2a65dc860c79 DIST arrow-testing-4d209492d514c2d3cb2d392681b9aa00e6d8da1c.tar.gz 3572558 BLAKE2B fe5b6a46babbde8e2becefea09fecf090201a49faa7d4ee2f44b0bb4da42c344b37564999d32fdbd54a81a56c33fbde9b2d9d2fa664bf127cb5661e845fb6229 SHA512 6758ad936e1eeb2c5dd2b4b40fe90822a48a4ce67ee4d36657c168e1db5d9a17c092f4cf571b13d56b568a773515385441874d1ea36a1f6e5b15a99f67176fa3 +DIST parquet-testing-c7cf1374cf284c0c73024cd1437becea75558bf8.tar.gz 1076246 BLAKE2B 070323055ce6cbcff6987b03e6f483cb4647021b29fd2e62b6f05751637dc46df27601f7519e2aa1c6c4edb4b016d0dfc16f69d31e4a262c7231fbc96f21d711 SHA512 81799640604bec3c5f91499a4af7a3c1a4b669f8f4933d3cf622b556fcd376635eb869197d41371b3745a662118961488b6a8eed17fc664c0a1e0f879a1a42e4 DIST parquet-testing-cb7a9674142c137367bf75a01b79c6e214a73199.tar.gz 1068025 BLAKE2B 0fdd12d04108b27b17564c60ca36e751453f5d74cfbbe3a076e8befa1696aa0f093e2d1a5eacb99e69a98deda502930ba79b8329403af1e8b9d696e6617c6075 SHA512 dd221d9d59442cebb7158d7cf769d6e5323416bfcde2852eee37a26ff089bc04ea10b9ae7158a37d8694c10469d77c7d251d0dd2549596a7b3899d9c39b45997 diff --git a/dev-libs/apache-arrow/apache-arrow-18.0.0.ebuild b/dev-libs/apache-arrow/apache-arrow-18.0.0.ebuild index 6a952147632e..ba16c6ab26cc 100644 --- a/dev-libs/apache-arrow/apache-arrow-18.0.0.ebuild +++ b/dev-libs/apache-arrow/apache-arrow-18.0.0.ebuild @@ -28,7 +28,7 @@ S="${WORKDIR}/${P}/cpp" LICENSE="Apache-2.0" SLOT="0/$(ver_cut 1)" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~riscv ~s390 ~x86" +KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~riscv ~s390 x86" IUSE=" +brotli bzip2 compute dataset +json lz4 +parquet re2 +snappy ssl test zlib zstd diff --git a/dev-libs/apache-arrow/apache-arrow-17.0.0.ebuild b/dev-libs/apache-arrow/apache-arrow-18.1.0-r2.ebuild index a605bad2c853..bde0003e1c21 100644 --- a/dev-libs/apache-arrow/apache-arrow-17.0.0.ebuild +++ b/dev-libs/apache-arrow/apache-arrow-18.1.0-r2.ebuild @@ -6,9 +6,9 @@ EAPI=8 inherit cmake # arrow.git: testing -ARROW_DATA_GIT_HASH=735ae7128d571398dd798d7ff004adebeb342883 +ARROW_DATA_GIT_HASH=4d209492d514c2d3cb2d392681b9aa00e6d8da1c # arrow.git: cpp/submodules/parquet-testing -PARQUET_DATA_GIT_HASH=74278bc4a1122d74945969e6dec405abd1533ec3 +PARQUET_DATA_GIT_HASH=cb7a9674142c137367bf75a01b79c6e214a73199 DESCRIPTION="A cross-language development platform for in-memory data." HOMEPAGE=" @@ -19,16 +19,16 @@ SRC_URI=" mirror://apache/arrow/arrow-${PV}/${P}.tar.gz test? ( https://github.com/apache/parquet-testing/archive/${PARQUET_DATA_GIT_HASH}.tar.gz - -> ${PN}-parquet-data-${PARQUET_DATA_GIT_HASH}.tar.gz + -> parquet-testing-${PARQUET_DATA_GIT_HASH}.tar.gz https://github.com/apache/arrow-testing/archive/${ARROW_DATA_GIT_HASH}.tar.gz - -> ${PN}-arrow-data-${ARROW_DATA_GIT_HASH}.tar.gz + -> arrow-testing-${ARROW_DATA_GIT_HASH}.tar.gz ) " S="${WORKDIR}/${P}/cpp" LICENSE="Apache-2.0" SLOT="0/$(ver_cut 1)" -KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~riscv ~s390 ~x86" +KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~riscv ~s390 x86" IUSE=" +brotli bzip2 compute dataset +json lz4 +parquet re2 +snappy ssl test zlib zstd @@ -49,6 +49,7 @@ RDEPEND=" dataset? ( dev-libs/libutf8proc:= ) + elibc_musl? ( sys-libs/timezone-data ) lz4? ( app-arch/lz4:= ) parquet? ( dev-libs/libutf8proc:= @@ -71,10 +72,6 @@ DEPEND=" ) " -PATCHES=( - "${FILESDIR}/${PN}-11.0.0-shared-lz4.patch" -) - src_prepare() { # use Gentoo CXXFLAGS, specify docdir at src_configure. sed -i \ @@ -88,35 +85,35 @@ src_prepare() { src_configure() { local mycmakeargs=( -DARROW_BUILD_STATIC=OFF - -DARROW_BUILD_TESTS=$(usex test) - -DARROW_COMPUTE=$(usex compute) + -DARROW_BUILD_TESTS=$(usex test ON OFF) + -DARROW_COMPUTE=$(usex compute ON OFF) -DARROW_CSV=ON - -DARROW_DATASET=$(usex dataset) + -DARROW_DATASET=$(usex dataset ON OFF) -DARROW_DEPENDENCY_SOURCE=SYSTEM -DARROW_DOC_DIR=share/doc/${PF} -DARROW_FILESYSTEM=ON -DARROW_HDFS=ON -DARROW_JEMALLOC=OFF - -DARROW_JSON=$(usex json) - -DARROW_PARQUET=$(usex parquet) - -DPARQUET_REQUIRE_ENCRYPTION=$(usex ssl) + -DARROW_JSON=$(usex json ON OFF) + -DARROW_PARQUET=$(usex parquet ON OFF) + -DPARQUET_REQUIRE_ENCRYPTION=$(usex ssl ON OFF) -DARROW_USE_CCACHE=OFF -DARROW_USE_SCCACHE=OFF - -DARROW_WITH_BROTLI=$(usex brotli) - -DARROW_WITH_BZ2=$(usex bzip2) - -DARROW_WITH_LZ4=$(usex lz4) - -DARROW_WITH_RE2=$(usex re2) - -DARROW_WITH_SNAPPY=$(usex snappy) - -DARROW_WITH_ZLIB=$(usex zlib) - -DARROW_WITH_ZSTD=$(usex zstd) + -DARROW_WITH_BROTLI=$(usex brotli ON OFF) + -DARROW_WITH_BZ2=$(usex bzip2 ON OFF) + -DARROW_WITH_LZ4=$(usex lz4 ON OFF) + -DARROW_WITH_RE2=$(usex re2 ON OFF) + -DARROW_WITH_SNAPPY=$(usex snappy ON OFF) + -DARROW_WITH_ZLIB=$(usex zlib ON OFF) + -DARROW_WITH_ZSTD=$(usex zstd ON OFF) -DCMAKE_CXX_STANDARD=17 ) cmake_src_configure } src_test() { - export PARQUET_TEST_DATA="${WORKDIR}/parquet-testing-${PARQUET_DATA_GIT_HASH}/data" - export ARROW_TEST_DATA="${WORKDIR}/arrow-testing-${ARROW_DATA_GIT_HASH}/data" + local -x PARQUET_TEST_DATA="${WORKDIR}/parquet-testing-${PARQUET_DATA_GIT_HASH}/data" + local -x ARROW_TEST_DATA="${WORKDIR}/arrow-testing-${ARROW_DATA_GIT_HASH}/data" cmake_src_test } diff --git a/dev-libs/apache-arrow/apache-arrow-16.1.0.ebuild b/dev-libs/apache-arrow/apache-arrow-19.0.0.ebuild index 8b1d7dc7296d..9ac405157cf5 100644 --- a/dev-libs/apache-arrow/apache-arrow-16.1.0.ebuild +++ b/dev-libs/apache-arrow/apache-arrow-19.0.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 2023-2024 Gentoo Authors +# Copyright 2023-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -6,9 +6,9 @@ EAPI=8 inherit cmake # arrow.git: testing -ARROW_DATA_GIT_HASH=25d16511e8d42c2744a1d94d90169e3a36e92631 +ARROW_DATA_GIT_HASH=4d209492d514c2d3cb2d392681b9aa00e6d8da1c # arrow.git: cpp/submodules/parquet-testing -PARQUET_DATA_GIT_HASH=74278bc4a1122d74945969e6dec405abd1533ec3 +PARQUET_DATA_GIT_HASH=c7cf1374cf284c0c73024cd1437becea75558bf8 DESCRIPTION="A cross-language development platform for in-memory data." HOMEPAGE=" @@ -19,20 +19,27 @@ SRC_URI=" mirror://apache/arrow/arrow-${PV}/${P}.tar.gz test? ( https://github.com/apache/parquet-testing/archive/${PARQUET_DATA_GIT_HASH}.tar.gz - -> ${PN}-parquet-data-${PARQUET_DATA_GIT_HASH}.tar.gz + -> parquet-testing-${PARQUET_DATA_GIT_HASH}.tar.gz https://github.com/apache/arrow-testing/archive/${ARROW_DATA_GIT_HASH}.tar.gz - -> ${PN}-arrow-data-${ARROW_DATA_GIT_HASH}.tar.gz + -> arrow-testing-${ARROW_DATA_GIT_HASH}.tar.gz ) " S="${WORKDIR}/${P}/cpp" LICENSE="Apache-2.0" SLOT="0/$(ver_cut 1)" -KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~riscv ~s390 ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~riscv ~s390 ~x86" IUSE=" +brotli bzip2 compute dataset +json lz4 +parquet re2 +snappy ssl test zlib zstd " +REQUIRED_USE=" + test? ( + json + parquet? ( zstd ) + ) + ssl? ( json ) +" RESTRICT="!test? ( test )" RDEPEND=" @@ -42,6 +49,7 @@ RDEPEND=" dataset? ( dev-libs/libutf8proc:= ) + elibc_musl? ( sys-libs/timezone-data ) lz4? ( app-arch/lz4:= ) parquet? ( dev-libs/libutf8proc:= @@ -53,7 +61,8 @@ RDEPEND=" zlib? ( sys-libs/zlib:= ) zstd? ( app-arch/zstd:= ) " -DEPEND="${RDEPEND} +DEPEND=" + ${RDEPEND} dev-cpp/xsimd >=dev-libs/boost-1.81.0 json? ( dev-libs/rapidjson ) @@ -63,18 +72,6 @@ DEPEND="${RDEPEND} ) " -REQUIRED_USE=" - test? ( - json - parquet? ( zstd ) - ) - ssl? ( json ) -" - -PATCHES=( - "${FILESDIR}/${PN}-11.0.0-shared-lz4.patch" -) - src_prepare() { # use Gentoo CXXFLAGS, specify docdir at src_configure. sed -i \ @@ -88,35 +85,36 @@ src_prepare() { src_configure() { local mycmakeargs=( -DARROW_BUILD_STATIC=OFF - -DARROW_BUILD_TESTS=$(usex test) - -DARROW_COMPUTE=$(usex compute) + -DARROW_BUILD_TESTS=$(usex test ON OFF) + -DARROW_COMPUTE=$(usex compute ON OFF) -DARROW_CSV=ON - -DARROW_DATASET=$(usex dataset) + -DARROW_DATASET=$(usex dataset ON OFF) -DARROW_DEPENDENCY_SOURCE=SYSTEM -DARROW_DOC_DIR=share/doc/${PF} -DARROW_FILESYSTEM=ON -DARROW_HDFS=ON -DARROW_JEMALLOC=OFF - -DARROW_JSON=$(usex json) - -DARROW_PARQUET=$(usex parquet) - -DPARQUET_REQUIRE_ENCRYPTION=$(usex ssl) + -DARROW_JSON=$(usex json ON OFF) + -DARROW_MIMALLOC=OFF + -DARROW_PARQUET=$(usex parquet ON OFF) + -DPARQUET_REQUIRE_ENCRYPTION=$(usex ssl ON OFF) -DARROW_USE_CCACHE=OFF -DARROW_USE_SCCACHE=OFF - -DARROW_WITH_BROTLI=$(usex brotli) - -DARROW_WITH_BZ2=$(usex bzip2) - -DARROW_WITH_LZ4=$(usex lz4) - -DARROW_WITH_RE2=$(usex re2) - -DARROW_WITH_SNAPPY=$(usex snappy) - -DARROW_WITH_ZLIB=$(usex zlib) - -DARROW_WITH_ZSTD=$(usex zstd) + -DARROW_WITH_BROTLI=$(usex brotli ON OFF) + -DARROW_WITH_BZ2=$(usex bzip2 ON OFF) + -DARROW_WITH_LZ4=$(usex lz4 ON OFF) + -DARROW_WITH_RE2=$(usex re2 ON OFF) + -DARROW_WITH_SNAPPY=$(usex snappy ON OFF) + -DARROW_WITH_ZLIB=$(usex zlib ON OFF) + -DARROW_WITH_ZSTD=$(usex zstd ON OFF) -DCMAKE_CXX_STANDARD=17 ) cmake_src_configure } src_test() { - export PARQUET_TEST_DATA="${WORKDIR}/parquet-testing-${PARQUET_DATA_GIT_HASH}/data" - export ARROW_TEST_DATA="${WORKDIR}/arrow-testing-${ARROW_DATA_GIT_HASH}/data" + local -x PARQUET_TEST_DATA="${WORKDIR}/parquet-testing-${PARQUET_DATA_GIT_HASH}/data" + local -x ARROW_TEST_DATA="${WORKDIR}/arrow-testing-${ARROW_DATA_GIT_HASH}/data" cmake_src_test } diff --git a/dev-libs/apache-arrow/files/apache-arrow-11.0.0-shared-lz4.patch b/dev-libs/apache-arrow/files/apache-arrow-11.0.0-shared-lz4.patch deleted file mode 100644 index fdb26196d0bb..000000000000 --- a/dev-libs/apache-arrow/files/apache-arrow-11.0.0-shared-lz4.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: cpp/cmake_modules/Findlz4Alt.cmake -=================================================================== ---- cpp.orig/cmake_modules/Findlz4Alt.cmake -+++ cpp/cmake_modules/Findlz4Alt.cmake -@@ -32,8 +32,8 @@ if(lz4_FOUND) - # Conan uses lz4::lz4 not LZ4::lz4 - if(NOT TARGET LZ4::lz4 AND TARGET lz4::lz4) - add_library(LZ4::lz4 ALIAS lz4::lz4) -+ return() - endif() -- return() - endif() - - if(MSVC_TOOLCHAIN AND NOT DEFINED LZ4_MSVC_LIB_PREFIX) diff --git a/dev-libs/appstream-glib/Manifest b/dev-libs/appstream-glib/Manifest index ab2a38f0357b..f8fe51289368 100644 --- a/dev-libs/appstream-glib/Manifest +++ b/dev-libs/appstream-glib/Manifest @@ -1 +1,2 @@ DIST appstream-glib-0.8.2.tar.xz 2320880 BLAKE2B 6c3c90298ae8bf362caea8c46643afaaab0bb0071271f5244eeca9356ed96a6a956c1b2ffa4a8500201e4bc494a54a15b3db4937b81c6f5f8b80f83299ac58ee SHA512 c9c21049ab43f5da8595aa07a3c2e097163a05b5e0fc030e4e3326136cd18127f04ad9edf08c12aea823b89048b43808cc60759cc26fcf2541cd9c1acbb29e28 +DIST appstream-glib-0.8.3.tar.xz 2322068 BLAKE2B 672ad96e6da162fe7afa9112edd38923d0e58df4837381622698297be778ea7d5eb3b056e23dd7fe469acfd94942a425edbbb7cb48fea09457cf3dd2615aea10 SHA512 df4247b710cf234eef037f5f7be6be4872638d0686becd65e10e6a4214b0dd1b48ffbbd69179f3fb9777373926840d5b776e20a41ce11d4926114345944db127 diff --git a/dev-libs/appstream-glib/appstream-glib-0.8.3.ebuild b/dev-libs/appstream-glib/appstream-glib-0.8.3.ebuild new file mode 100644 index 000000000000..b4a216c5ead7 --- /dev/null +++ b/dev-libs/appstream-glib/appstream-glib-0.8.3.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit xdg meson + +DESCRIPTION="Provides GObjects and helper methods to read and write AppStream metadata" +HOMEPAGE="https://people.freedesktop.org/~hughsient/appstream-glib/ https://github.com/hughsie/appstream-glib" +SRC_URI="https://people.freedesktop.org/~hughsient/${PN}/releases/${P}.tar.xz" + +LICENSE="LGPL-2.1+" +SLOT="0/8" # soname version +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="gtk-doc fonts +introspection" + +RDEPEND=" + >=dev-libs/glib-2.58.0:2 + sys-apps/util-linux + app-arch/libarchive:= + >=net-misc/curl-7.56.0 + >=dev-libs/json-glib-1.1.2 + >=x11-libs/gdk-pixbuf-2.31.5:2[introspection?] + + fonts? ( + x11-libs/gtk+:3 + >=media-libs/freetype-2.4:2 + ) + >=media-libs/fontconfig-2.11:1.0 + dev-libs/libyaml + x11-libs/pango + introspection? ( >=dev-libs/gobject-introspection-1.54:= ) +" +DEPEND="${RDEPEND}" +# libxml2 required for glib-compile-resources +BDEPEND=" + dev-util/gperf + + dev-libs/libxml2:2 + app-text/docbook-xml-dtd:4.2 + dev-libs/libxslt + gtk-doc? ( + >=dev-util/gtk-doc-1.9 + app-text/docbook-xml-dtd:4.3 + ) + >=sys-devel/gettext-0.19.8 +" + +src_configure() { + local emesonargs=( + -Ddep11=true + -Dbuilder=true + -Drpm=false + -Dalpm=false + $(meson_use fonts) + -Dman=true + $(meson_use gtk-doc) + $(meson_use introspection) + ) + meson_src_configure +} diff --git a/dev-libs/appstream/Manifest b/dev-libs/appstream/Manifest index 35b4d3636a13..b46df5fa688d 100644 --- a/dev-libs/appstream/Manifest +++ b/dev-libs/appstream/Manifest @@ -1 +1,2 @@ DIST AppStream-1.0.3.tar.xz 2644220 BLAKE2B cd7aa28b49c23229ee48b9a69e57a08244f81115e23525695e463930d2296daf80b5c7bb098c89726c220caec8c3e072fd85d77ac808e96c5cf2ff0488ba4ba1 SHA512 9b70d965966d55dbcc6a62d85525fdd5990a28abb1d94b2df91ab1549c24ce9c40d95e2d761c2f24e0c61fe5b74ab6a1f829dda387a8282aa9dff9198dc9610d +DIST AppStream-1.0.4.tar.xz 2719900 BLAKE2B e8b3ca6092d4cddf73e5f902ac9d5e071d9eb31d8b206fd814e2078f5bcfcba1683e97beccaea9e7024da0285d77c63fb426e3b3d17f15c3add332e964e313d3 SHA512 ea0f9e226401b6c5a004676d14d01c195da295269169807bc956dbfd1d4f4b2b4ba61fe905fbefbe3c562a502c31fc869aba9e87c490dcac1d861f50038d14f1 diff --git a/dev-libs/appstream/appstream-1.0.4.ebuild b/dev-libs/appstream/appstream-1.0.4.ebuild new file mode 100644 index 000000000000..98d966051a45 --- /dev/null +++ b/dev-libs/appstream/appstream-1.0.4.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson xdg-utils + +if [[ ${PV} == *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/ximion/${PN}" +else + MY_PN="AppStream" + SRC_URI="https://www.freedesktop.org/software/appstream/releases/${MY_PN}-${PV}.tar.xz" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" + S="${WORKDIR}/${MY_PN}-${PV}" +fi + +DESCRIPTION="Cross-distro effort for providing metadata for software in the Linux ecosystem" +HOMEPAGE="https://www.freedesktop.org/wiki/Distributions/AppStream/" + +LICENSE="LGPL-2.1+ GPL-2+" +# check as_api_level +SLOT="0/5" +IUSE="apt compose doc +introspection qt6 systemd test" +RESTRICT="test" # bug 691962 + +RDEPEND=" + app-arch/zstd:= + >=dev-libs/glib-2.62:2 + dev-libs/libxml2:2 + >=dev-libs/libxmlb-0.3.14:= + dev-libs/libyaml + dev-libs/snowball-stemmer:= + >=net-misc/curl-7.62 + compose? ( dev-libs/glib:2 + dev-libs/libyaml + gnome-base/librsvg:2 + media-libs/fontconfig:1.0 + media-libs/freetype:2 + x11-libs/cairo + x11-libs/gdk-pixbuf:2 ) + introspection? ( >=dev-libs/gobject-introspection-1.56:= ) + qt6? ( dev-qt/qtbase:6 ) + systemd? ( sys-apps/systemd:= ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-libs/appstream-glib + dev-libs/libxslt + dev-util/itstool + >=sys-devel/gettext-0.19.8 + doc? ( app-text/docbook-xml-dtd:4.5 ) + test? ( dev-qt/qttools:6[linguist] ) +" + +PATCHES=( "${FILESDIR}"/${PN}-1.0.0-disable-Werror-flags.patch ) # bug 733774 + +src_prepare() { + default + sed -e "/^as_doc_target_dir/s/appstream/${PF}/" -i docs/meson.build || die + if ! use test; then + sed -e "/^subdir.*tests/s/^/#DONT /" -i {,qt/}meson.build || die # bug 675944 + fi +} + +src_configure() { + xdg_environment_reset + + local emesonargs=( + -Dapidocs=false + -Ddocs=false + -Dcompose=false + -Dmaintainer=false + -Dstatic-analysis=false + -Dstemming=true + -Dvapi=false + -Dapt-support=$(usex apt true false) + -Dcompose=$(usex compose true false) + -Dinstall-docs=$(usex doc true false) + -Dgir=$(usex introspection true false) + -Dqt=$(usex qt6 true false) + -Dsystemd=$(usex systemd true false) + ) + + meson_src_configure +} diff --git a/dev-libs/appstream/metadata.xml b/dev-libs/appstream/metadata.xml index fc47b80bd700..c03626cd5701 100644 --- a/dev-libs/appstream/metadata.xml +++ b/dev-libs/appstream/metadata.xml @@ -7,6 +7,7 @@ </maintainer> <use> <flag name="apt">Enables Debians APT support</flag> + <flag name="compose">Enable appstream compose</flag> </use> <upstream> <remote-id type="github">ximion/appstream</remote-id> diff --git a/dev-libs/apr-util/apr-util-1.6.3.ebuild b/dev-libs/apr-util/apr-util-1.6.3.ebuild index be766ad6fa3a..bb852f0e5588 100644 --- a/dev-libs/apr-util/apr-util-1.6.3.ebuild +++ b/dev-libs/apr-util/apr-util-1.6.3.ebuild @@ -54,6 +54,10 @@ PATCHES=( "${FILESDIR}"/${PN}-1.6.3-configure-int.patch ) +QA_CONFIG_IMPL_DECL_SKIP=( + memset_s # bug #898566 +) + src_prepare() { default diff --git a/dev-libs/asmjit/Manifest b/dev-libs/asmjit/Manifest index 02e1b92d572b..df923fb6f0b3 100644 --- a/dev-libs/asmjit/Manifest +++ b/dev-libs/asmjit/Manifest @@ -1,2 +1 @@ -DIST asmjit-2021.11.13.tar.gz 717251 BLAKE2B 2bcad7234b0cab2d60c9fcd09149c93397595ca4859cb415378dabf52f8660de3aa5de40ee192fca814ee62bfc690ae8260c2f54faf10eb52c3ed3d63d1f4258 SHA512 2774168ff0847b3c29aee87325f12e431693c70661f8c10e0dc0d6530a3683d51ca472ef993e88c9d4e179494b045b2e75c22d6eda19b0c75e19843b69162da1 -DIST asmjit-2022.07.02.tar.gz 974040 BLAKE2B 28f2d23bcded48f1526b8820a5c9c919e014bdd6e8095762ba37414d2a47dc5665d89c4ca43fee9b216d5dfc71ef19835ce04f6dccc500451f204033b42be20c SHA512 c1196edb656833caa6d4d6817e34e4d2320ecda06bc6b531a0ff73f9e3786a98dad3f2348884de4e272d0e6853bb7b1eaab3feaa5d4430f28c3c9339ded1a58c +DIST asmjit-2024.10.25.tar.gz 1184167 BLAKE2B 2b07a470f1b7a3886aa67bd3d8efeb35f7218622df0f21da398b724226fa7253c37c3548f9a3f29ce0d2306794af02642969e9623829750e7ed6a0e6abfd88de SHA512 aef778b28bfb7187c93f5a7c8edacbb4d57b79d32b09ce30eab52e1708f641b123d19d5501c14625a155b4add8499782f4207145addbdf670266bc121d11138b diff --git a/dev-libs/asmjit/asmjit-2021.11.13.ebuild b/dev-libs/asmjit/asmjit-2021.11.13.ebuild deleted file mode 100644 index f16e753bac6e..000000000000 --- a/dev-libs/asmjit/asmjit-2021.11.13.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 2022-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -inherit cmake - -CommitId=4ec760a3d1f69e32ba460ecd2513f29b8428700b -DESCRIPTION="Machine code generation for C++" -HOMEPAGE="https://asmjit.com/" -SRC_URI="https://github.com/asmjit/${PN}/archive/${CommitId}.tar.gz - -> ${P}.tar.gz" - -LICENSE="ZLIB" -SLOT="0" -KEYWORDS="~amd64" -IUSE="test" - -BDEPEND="test? ( dev-cpp/gtest )" -RESTRICT="!test? ( test )" - -S="${WORKDIR}"/${PN}-${CommitId} - -PATCHES=( - "${FILESDIR}"/${P}-gentoo.patch -) - -src_configure() { - local mycmakeargs=( - -DASMJIT_TEST=$(usex test TRUE FALSE) - ) - cmake_src_configure -} diff --git a/dev-libs/asmjit/asmjit-2022.07.02.ebuild b/dev-libs/asmjit/asmjit-2022.07.02.ebuild deleted file mode 100644 index 23065a9bf113..000000000000 --- a/dev-libs/asmjit/asmjit-2022.07.02.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 2022-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -inherit cmake - -CommitId=c59847629d3a19da4d10f0be4ac33b43fc4a100f -DESCRIPTION="Machine code generation for C++" -HOMEPAGE="https://asmjit.com/" -SRC_URI="https://github.com/asmjit/${PN}/archive/${CommitId}.tar.gz - -> ${P}.tar.gz" - -LICENSE="ZLIB" -SLOT="0" -KEYWORDS="~amd64" -IUSE="test" - -BDEPEND="test? ( dev-cpp/gtest )" -RESTRICT="!test? ( test )" - -S="${WORKDIR}"/${PN}-${CommitId} - -src_configure() { - local mycmakeargs=( - -DASMJIT_TEST=$(usex test) - ) - cmake_src_configure -} diff --git a/dev-libs/asmjit/asmjit-2024.10.25.ebuild b/dev-libs/asmjit/asmjit-2024.10.25.ebuild new file mode 100644 index 000000000000..69fb1376fe46 --- /dev/null +++ b/dev-libs/asmjit/asmjit-2024.10.25.ebuild @@ -0,0 +1,33 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit cmake + +DESCRIPTION="Machine code generation for C++" +HOMEPAGE="https://asmjit.com/" +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/asmjit/asmjit" +else + CommitId=f1096428b87e9d16305de16e91f2a7f52aef5a88 + SRC_URI="https://github.com/asmjit/${PN}/archive/${CommitId}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64" + S="${WORKDIR}"/${PN}-${CommitId} +fi + +LICENSE="ZLIB" +SLOT="0" +IUSE="test" + +BDEPEND="test? ( dev-cpp/gtest )" +RESTRICT="!test? ( test )" + +DOCS=( README.md CONTRIBUTING.md ) + +src_configure() { + local mycmakeargs=( + -DASMJIT_TEST=$(usex test) + ) + cmake_src_configure +} diff --git a/dev-libs/asmjit/asmjit-9999.ebuild b/dev-libs/asmjit/asmjit-9999.ebuild new file mode 100644 index 000000000000..69fb1376fe46 --- /dev/null +++ b/dev-libs/asmjit/asmjit-9999.ebuild @@ -0,0 +1,33 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit cmake + +DESCRIPTION="Machine code generation for C++" +HOMEPAGE="https://asmjit.com/" +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/asmjit/asmjit" +else + CommitId=f1096428b87e9d16305de16e91f2a7f52aef5a88 + SRC_URI="https://github.com/asmjit/${PN}/archive/${CommitId}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64" + S="${WORKDIR}"/${PN}-${CommitId} +fi + +LICENSE="ZLIB" +SLOT="0" +IUSE="test" + +BDEPEND="test? ( dev-cpp/gtest )" +RESTRICT="!test? ( test )" + +DOCS=( README.md CONTRIBUTING.md ) + +src_configure() { + local mycmakeargs=( + -DASMJIT_TEST=$(usex test) + ) + cmake_src_configure +} diff --git a/dev-libs/asmjit/files/asmjit-2021.11.13-gentoo.patch b/dev-libs/asmjit/files/asmjit-2021.11.13-gentoo.patch deleted file mode 100644 index 035ffbbbdcea..000000000000 --- a/dev-libs/asmjit/files/asmjit-2021.11.13-gentoo.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff --git a/src/asmjit/core/support.h b/src/asmjit/core/support.h -index f98ffaa..2329cb2 100644 ---- a/src/asmjit/core/support.h -+++ b/src/asmjit/core/support.h -@@ -33,33 +33,40 @@ - ASMJIT_BEGIN_NAMESPACE - - //! \addtogroup asmjit_utilities - //! \{ - - //! Contains support classes and functions that may be used by AsmJit source - //! and header files. Anything defined here is considered internal and should - //! not be used outside of AsmJit and related projects like AsmTK. - namespace Support { - - // ============================================================================ - // [asmjit::Support - Architecture Features & Constraints] - // ============================================================================ - - //! \cond INTERNAL -+#if defined(__GNUC__) && !defined(__clang__) && __GNUC__ >= 11 -+// There is a bug in GCC11+ that makes it unusable to use annotated unaligned loads/stores. -+static constexpr bool kUnalignedAccess16 = false; -+static constexpr bool kUnalignedAccess32 = false; -+static constexpr bool kUnalignedAccess64 = false; -+#else - static constexpr bool kUnalignedAccess16 = ASMJIT_ARCH_X86 != 0; - static constexpr bool kUnalignedAccess32 = ASMJIT_ARCH_X86 != 0; - static constexpr bool kUnalignedAccess64 = ASMJIT_ARCH_X86 != 0; -+#endif - //! \endcond - - // ============================================================================ - // [asmjit::Support - Internal] - // ============================================================================ - - //! \cond INTERNAL - namespace Internal { - template<typename T, size_t Alignment> - struct AlignedInt {}; - - template<> struct AlignedInt<uint16_t, 1> { typedef uint16_t ASMJIT_ALIGN_TYPE(T, 1); }; - template<> struct AlignedInt<uint16_t, 2> { typedef uint16_t T; }; - template<> struct AlignedInt<uint32_t, 1> { typedef uint32_t ASMJIT_ALIGN_TYPE(T, 1); }; - template<> struct AlignedInt<uint32_t, 2> { typedef uint32_t ASMJIT_ALIGN_TYPE(T, 2); }; diff --git a/dev-libs/atcore/Manifest b/dev-libs/atcore/Manifest deleted file mode 100644 index 680d872e7290..000000000000 --- a/dev-libs/atcore/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST atcore-1.0.0.tar.xz 169116 BLAKE2B 8aaafe18edfbb0dcbe08b99c9cfba2d2390a9e9aaf5ed8ebbc61b6320c37ac4e893a7c64e5c56a131e32ec112fa0d9e253749e634661834de3d03e2cced97dea SHA512 8be63850d939aa9b89651252e91cd3295d52d2d0603f88b846783cca25fc0e29dd3569bfef97aeaf6c115a3bc3328fb127e126b20aaf67faf1c319ac8be7b88b diff --git a/dev-libs/atcore/atcore-1.0.0.ebuild b/dev-libs/atcore/atcore-1.0.0.ebuild deleted file mode 100644 index effc4ea9ba27..000000000000 --- a/dev-libs/atcore/atcore-1.0.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 - -ECM_TEST="forceoptional" -QTMIN=5.12.3 -inherit ecm kde.org - -DESCRIPTION="API to manage the serial connection between the computer and 3D Printers" -SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" -HOMEPAGE="https://atelier.kde.org/" - -LICENSE="|| ( LGPL-2.1+ LGPL-3 ) gui? ( GPL-3+ )" -SLOT="0" -KEYWORDS="~amd64" -IUSE="doc gui test" - -DEPEND=" - >=dev-qt/qtserialport-${QTMIN}:5 - gui? ( - >=dev-qt/qtcharts-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - ) -" -RDEPEND="${DEPEND}" -BDEPEND=" - >=dev-qt/linguist-tools-${QTMIN}:5 - doc? ( app-text/doxygen[dot] ) -" - -src_prepare() { - ecm_src_prepare - - sed -e "s/${PN}/${PF}/" -i doc/CMakeLists.txt || die - - use gui || ecm_punt_qt_module Charts - use test || cmake_comment_add_subdirectory unittests -} - -src_configure() { - local mycmakeargs=( - -DBUILD_DOCS=$(usex doc) - -DBUILD_TEST_GUI=$(usex gui) - ) - - ecm_src_configure -} diff --git a/dev-libs/atcore/metadata.xml b/dev-libs/atcore/metadata.xml deleted file mode 100644 index fbb79823ed64..000000000000 --- a/dev-libs/atcore/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>kde@gentoo.org</email> - <name>Gentoo KDE Project</name> - </maintainer> - <upstream> - <bugs-to>https://bugs.kde.org/</bugs-to> - </upstream> - <use> - <flag name="gui">Build test GUI</flag> - </use> -</pkgmetadata> diff --git a/dev-libs/atf/Manifest b/dev-libs/atf/Manifest index 6d124f1bc3d2..8d80871d32de 100644 --- a/dev-libs/atf/Manifest +++ b/dev-libs/atf/Manifest @@ -1 +1,2 @@ DIST atf-0.21.tar.gz 567791 BLAKE2B e9449bb61008a91c10050462e84ff65c6fd88124db56ff3f6c149ff47fe8647fe8fe786cd7b1106cbfd62723a57ab613432323f266a93a4c86d8a6ab39bfcc0a SHA512 9b4b67d7d0d1f65cc9571d38c67dfc620b08ff7c0abf57d87bcae54055b4af21f95f3363f2cf8ee9b13b89a5351bc58669b784a0fd8c1beb0664c14933c10ce1 +DIST atf-0.22.tar.gz 196918 BLAKE2B 9dcd71d71daeb6a9364382d93972254c303599b61be2ae5126136ee5e00a6af1c8d9e7d5b25964f6a21edff7ce1e2bbad43e9ed5819d7dcfa0b83b55fa664750 SHA512 2bf2e8cb379aae6b435bfe9deb6d235c1641ec4ae9604fcfe9bb90324fd298b0ee7b7be2df3dd80cb140fe777936b239a14bab766b72a5a9862c1a463cea9455 diff --git a/dev-libs/atf/atf-0.21-r2.ebuild b/dev-libs/atf/atf-0.21-r3.ebuild index bc30e3d33c4e..a91b0d57209a 100644 --- a/dev-libs/atf/atf-0.21-r2.ebuild +++ b/dev-libs/atf/atf-0.21-r3.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 2017-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit flag-o-matic +inherit autotools flag-o-matic DESCRIPTION="Libraries to write tests in C, C++ and shell" HOMEPAGE="https://github.com/freebsd/atf" @@ -17,11 +17,20 @@ BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}"/${P}-getopt-solaris.patch ) +src_prepare() { + default + # Refresh autotools, bug 879659 + eautoreconf +} + src_configure() { # Uses std::auto_ptr (deprecated in c++11, removed in c++17) append-cxxflags "-std=c++14" - default + local myconf=( + ATF_SHELL="${EPREFIX}/bin/sh" + ) + econf "${myconf[@]}" } src_install() { diff --git a/dev-libs/atf/atf-0.22-r1.ebuild b/dev-libs/atf/atf-0.22-r1.ebuild new file mode 100644 index 000000000000..79e2b1a661d3 --- /dev/null +++ b/dev-libs/atf/atf-0.22-r1.ebuild @@ -0,0 +1,39 @@ +# Copyright 2017-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Libraries to write tests in C, C++ and shell" +HOMEPAGE="https://github.com/freebsd/atf" +SRC_URI="https://github.com/freebsd/atf/archive/refs/tags/${P}.tar.gz" +S="${WORKDIR}/atf-${P}" + +LICENSE="BSD BSD-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x64-solaris" + +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/atf-0.22-atf_check-temp.patch +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + local myconf=( + ATF_SHELL="${EPREFIX}/bin/sh" + ) + econf "${myconf[@]}" +} + +src_install() { + default + rm -r "${ED}"/usr/tests || die + find "${ED}" -name '*.la' -delete || die +} diff --git a/dev-libs/atf/files/atf-0.21-getopt-solaris.patch b/dev-libs/atf/files/atf-0.21-getopt-solaris.patch index d70af36ce40e..08e4fe0faadb 100644 --- a/dev-libs/atf/files/atf-0.21-getopt-solaris.patch +++ b/dev-libs/atf/files/atf-0.21-getopt-solaris.patch @@ -1,3 +1,5 @@ +https://github.com/freebsd/atf/pull/100 + On Solaris, getopt(3) is in stdio.h. --- a/atf-c/tp_test.c diff --git a/dev-libs/atf/files/atf-0.22-atf_check-temp.patch b/dev-libs/atf/files/atf-0.22-atf_check-temp.patch new file mode 100644 index 000000000000..325a4d86858a --- /dev/null +++ b/dev-libs/atf/files/atf-0.22-atf_check-temp.patch @@ -0,0 +1,43 @@ +https://github.com/freebsd/atf/issues/76 +https://github.com/freebsd/atf/commit/b42c98612cb99fa3f52766a46203263dc1de7187 + +From b42c98612cb99fa3f52766a46203263dc1de7187 Mon Sep 17 00:00:00 2001 +From: Enji Cooper <ngie@FreeBSD.org> +Date: Sat, 7 Dec 2024 17:29:17 -0800 +Subject: [PATCH] atf_check: fix std::length_error thrown from temp_file + +The previous logic used 2 separate calls to `atf::fs::path::str()` when +constructing a `std::vector<char>` to pass to `mkstemp(..)`. This in +turn caused grief with how data copying is done in atf-c(3), etc, as the +prior code computed the length of the path of an internal buffer in +`atf_dynstr` structs. + +Moreover, the code was manually appending a nul char, which was +unnecessary when making the valid assumption that `std::string` is a +nul-terminated string. + +The new code convert the path to an `std::string` once, includes the +existing nul char in the buffer, then passes it to mkstemp(3) instead. +The code works properly now. + +Closes: #76 +Signed-off-by: Enji Cooper <ngie@FreeBSD.org> +--- + atf-sh/atf-check.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/atf-sh/atf-check.cpp b/atf-sh/atf-check.cpp +index 508a9c51..f6ebc7a6 100644 +--- a/atf-sh/atf-check.cpp ++++ b/atf-sh/atf-check.cpp +@@ -118,8 +118,8 @@ class temp_file : public std::ostream { + const atf::fs::path file = atf::fs::path( + atf::env::get("TMPDIR", "/tmp")) / pattern; + +- std::vector<char> buf(file.str().begin(), file.str().end()); +- buf.push_back('\0'); ++ std::string file_s = file.str(); ++ std::vector<char> buf(file_s.begin(), file_s.end() + 1); + + m_fd = ::mkstemp(buf.data()); + if (m_fd == -1) diff --git a/dev-libs/ayatana-ido/ayatana-ido-0.10.2.ebuild b/dev-libs/ayatana-ido/ayatana-ido-0.10.2.ebuild index abfe742415e1..09007046db50 100644 --- a/dev-libs/ayatana-ido/ayatana-ido-0.10.2.ebuild +++ b/dev-libs/ayatana-ido/ayatana-ido-0.10.2.ebuild @@ -15,7 +15,7 @@ SLOT="0" IUSE="test" RESTRICT="!test? ( test )" -KEYWORDS="~alpha amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86" RDEPEND=" >=dev-libs/glib-2.58:2 diff --git a/dev-libs/ayatana-ido/ayatana-ido-0.10.4.ebuild b/dev-libs/ayatana-ido/ayatana-ido-0.10.4.ebuild index 8cd82fa8600a..677e089c0bec 100644 --- a/dev-libs/ayatana-ido/ayatana-ido-0.10.4.ebuild +++ b/dev-libs/ayatana-ido/ayatana-ido-0.10.4.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/AyatanaIndicators/${PN}/archive/${PV}.tar.gz -> ${P} LICENSE="LGPL-2.1 LGPL-3 GPL-3" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-libs/blake3/blake3-1.5.1.ebuild b/dev-libs/blake3/blake3-1.5.1.ebuild index 2421017f0078..2469f0290524 100644 --- a/dev-libs/blake3/blake3-1.5.1.ebuild +++ b/dev-libs/blake3/blake3-1.5.1.ebuild @@ -12,4 +12,4 @@ S="${WORKDIR}/BLAKE3-${PV}/c" LICENSE="|| ( CC0-1.0 Apache-2.0 )" SLOT="0/0" -KEYWORDS="amd64 arm arm64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="amd64 arm arm64 hppa ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86" diff --git a/dev-libs/blake3/blake3-1.5.3.ebuild b/dev-libs/blake3/blake3-1.5.3.ebuild index cd045ca324ca..871bb5d5b36d 100644 --- a/dev-libs/blake3/blake3-1.5.3.ebuild +++ b/dev-libs/blake3/blake3-1.5.3.ebuild @@ -13,7 +13,7 @@ S="${WORKDIR}/BLAKE3-${PV}/c" LICENSE="|| ( CC0-1.0 Apache-2.0 )" SLOT="0/0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos" IUSE="test" RESTRICT="!test? ( test )" PATCHES=( "${FILESDIR}/${PN}-1.5.3-backport-pr405.patch" ) diff --git a/dev-libs/boehm-gc/Manifest b/dev-libs/boehm-gc/Manifest index 86d6c424038a..9d25386b4dd6 100644 --- a/dev-libs/boehm-gc/Manifest +++ b/dev-libs/boehm-gc/Manifest @@ -1,3 +1 @@ -DIST gc-8.2.4.tar.gz 1210929 BLAKE2B 48f058b3f6f9f708d4335a7a0b077aab4ea5df32be73038bb8c20c12483d7ec8798b16db85afed5aa270f0f818de08abf9407036f662c757f361a929f99d951f SHA512 27d014378000f25fb2f5598904be85604822d5ed4553f8b3d1c279122300d3958b4432ec08f951cfd842d92121ea8a030dda34bf2475ec53d4fded551fdd3a98 -DIST gc-8.2.6.tar.gz 1216440 BLAKE2B fb1a51ed90ecd2e81a5d398593717ece3079d3d6f265521dd48ee7e1038700272bfccb6788f4e9915fb3fafd6f1be3775a3b69f38912eae0f6578822d168398a SHA512 48afcc1d8570d6b5d62addf8b7b947a3836717e71c073f6dff8982744c06f5973a02e890d17e8dd93f7f997d029b49c652929e6efa0e32aefbcdf7ab0910eda5 DIST gc-8.2.8.tar.gz 1219553 BLAKE2B 7e0da4d9596b53bacb41a9939c0dfc9c8cf9b57c032dd445a74678b9467bc9253749497ad3f9ae43060aafed42877191b27c5e8faad1a59f75e80a68fa6d37bd SHA512 e0994bac8d1068f79a8379fa5797efbd420b22eb923d6537613e7542fc6805f74f57be0c4ff7555539461f8ace849fa1534e2077752bfb61c0e14f367b5b55af diff --git a/dev-libs/boehm-gc/boehm-gc-8.2.4.ebuild b/dev-libs/boehm-gc/boehm-gc-8.2.4.ebuild deleted file mode 100644 index d37ea89c0d9b..000000000000 --- a/dev-libs/boehm-gc/boehm-gc-8.2.4.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit multilib-minimal libtool - -MY_P="gc-${PV}" - -DESCRIPTION="The Boehm-Demers-Weiser conservative garbage collector" -HOMEPAGE="https://www.hboehm.info/gc/ https://github.com/ivmai/bdwgc/" -SRC_URI="https://github.com/ivmai/bdwgc/releases/download/v${PV}/${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}" - -LICENSE="boehm-gc" -# SONAME: libgc.so.1 libgccpp.so.1 -# We've been using subslot 0 for these instead of "1.1". -SLOT="0" -# Upstream marked this version as "Pre-release" -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="cxx +large static-libs +threads" - -RDEPEND=">=dev-libs/libatomic_ops-7.4[${MULTILIB_USEDEP}]" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -src_prepare() { - default - - # bug #594754 - elibtoolize -} - -multilib_src_configure() { - local config=( - --disable-docs - --with-libatomic-ops - $(use_enable cxx cplusplus) - $(use_enable static-libs static) - $(use threads || echo --disable-threads) - $(use_enable large large-config) - ) - - ECONF_SOURCE="${S}" econf "${config[@]}" -} - -multilib_src_install_all() { - local HTML_DOCS=( doc/*.md ) - einstalldocs - dodoc doc/README{.environment,.linux,.macros} - - # Package provides .pc files - find "${ED}" -name '*.la' -delete || die - - newman doc/gc.man GC_malloc.1 -} diff --git a/dev-libs/boehm-gc/boehm-gc-8.2.6.ebuild b/dev-libs/boehm-gc/boehm-gc-8.2.6.ebuild deleted file mode 100644 index c915752a7a69..000000000000 --- a/dev-libs/boehm-gc/boehm-gc-8.2.6.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit multilib-minimal libtool - -MY_P="gc-${PV}" - -DESCRIPTION="The Boehm-Demers-Weiser conservative garbage collector" -HOMEPAGE="https://www.hboehm.info/gc/ https://github.com/ivmai/bdwgc/" -SRC_URI="https://github.com/ivmai/bdwgc/releases/download/v${PV}/${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}" - -LICENSE="boehm-gc" -# SONAME: libgc.so.1 libgccpp.so.1 -# We've been using subslot 0 for these instead of "1.1". -SLOT="0" -# Don't keyword versions if upstream mark them as pre-release. -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="cxx +large static-libs +threads" - -RDEPEND=">=dev-libs/libatomic_ops-7.4[${MULTILIB_USEDEP}]" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -src_prepare() { - default - - # bug #594754 - elibtoolize -} - -multilib_src_configure() { - local config=( - --disable-docs - --with-libatomic-ops - $(use_enable cxx cplusplus) - $(use_enable static-libs static) - $(use threads || echo --disable-threads) - $(use_enable large large-config) - ) - - ECONF_SOURCE="${S}" econf "${config[@]}" -} - -multilib_src_install_all() { - local HTML_DOCS=( doc/*.md ) - einstalldocs - dodoc doc/README{.environment,.linux,.macros} - - # Package provides .pc files - find "${ED}" -name '*.la' -delete || die - - newman doc/gc.man GC_malloc.1 -} diff --git a/dev-libs/boehm-gc/boehm-gc-8.2.8.ebuild b/dev-libs/boehm-gc/boehm-gc-8.2.8.ebuild index e1b04d54de7a..c915752a7a69 100644 --- a/dev-libs/boehm-gc/boehm-gc-8.2.8.ebuild +++ b/dev-libs/boehm-gc/boehm-gc-8.2.8.ebuild @@ -17,7 +17,7 @@ LICENSE="boehm-gc" # We've been using subslot 0 for these instead of "1.1". SLOT="0" # Don't keyword versions if upstream mark them as pre-release. -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="cxx +large static-libs +threads" RDEPEND=">=dev-libs/libatomic_ops-7.4[${MULTILIB_USEDEP}]" diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest index 47f740ee7fe7..3ba699717f9c 100644 --- a/dev-libs/boost/Manifest +++ b/dev-libs/boost/Manifest @@ -1,3 +1,3 @@ -DIST boost_1_84_0.tar.bz2 123110547 BLAKE2B a872ee00402be0383726020f4d13a7df6c2765c52eac2e09aab1604432931d26dd597503f5dcbbf788d7e7528d13c6d1dbfff1e85d22bf92c7828ef74cf2405d SHA512 5dfeb35198bb096e46cf9e131ef0334cb95bc0bf09f343f291b860b112598b3c36111bd8c232439c401a2b2fb832fa0c399a8d5b96afc60bd359dff070154497 DIST boost_1_85_0.tar.bz2 124015250 BLAKE2B dd72a9299cd78d2c260e1c94e28ba04daaa352f5bd023d99e43caa3540b1e0f8c09fc04b91f68db0ef8532e4a91fdef0b66a80bf0f9f838303bccaf0729bf581 SHA512 b4489813a4192b57626589457932338cfc47c4ec05c19b3a58b2d8df9e95f022ff2f5f452811ff82d1cec4fb0a490e991c8825bad0fb5a81318d07a8788d8ca0 DIST boost_1_86_0.tar.bz2 126220652 BLAKE2B de3d262e3dc174813e8e9abc8fb083ae101949dbd3b818b1114457497607085dc998f6f0fdd095a87c38c90700761c825ce239b082144389507c0fec77d527dd SHA512 9f8144e07a44cc5b5be6c6da17b2e6f29f0637dda345764c89eac0bcb9ce2878469a7e6fcd2c96d25034937025768450b33fc14fb40470fa4806bfcf03330e75 +DIST boost_1_87_0.tar.bz2 131473200 BLAKE2B 8bbd163ab2fcdd29e2dbe74fdab49b2c80b4ea58df40e39148d151911f2c81188e7fe44faf61905eddfc5615b5003932e0ea85a6527844f55ee121595173adfa SHA512 a2d5007953f67b816169efe0cf11675cd63fc6bae63f87ee1372515e57913ef6cf6ae8c3f2c400fef8ce63a035a02a0cad0da5acc29e977a85d458625b2a719c diff --git a/dev-libs/boost/boost-1.86.0-r1.ebuild b/dev-libs/boost/boost-1.86.0-r1.ebuild index 426a0b9095fa..0832d12b6146 100644 --- a/dev-libs/boost/boost-1.86.0-r1.ebuild +++ b/dev-libs/boost/boost-1.86.0-r1.ebuild @@ -45,7 +45,7 @@ RDEPEND=" zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] ) zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND}" -BDEPEND=">=dev-build/b2-5.0.0" +BDEPEND=">=dev-build/b2-5.1.0" PATCHES=( "${FILESDIR}"/${PN}-1.81.0-disable_icu_rpath.patch diff --git a/dev-libs/boost/boost-1.84.0-r3.ebuild b/dev-libs/boost/boost-1.87.0.ebuild index f7163f591335..9c46452336c4 100644 --- a/dev-libs/boost/boost-1.84.0-r3.ebuild +++ b/dev-libs/boost/boost-1.87.0.ebuild @@ -9,7 +9,7 @@ EAPI=8 # (e.g. https://www.boost.org/users/history/version_1_83_0.html) # Note that the latter may sometimes feature patches not on the former too. -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit flag-o-matic multiprocessing python-r1 toolchain-funcs multilib-minimal @@ -21,8 +21,8 @@ SRC_URI="https://boostorg.jfrog.io/artifactory/main/release/${PV}/source/boost_$ S="${WORKDIR}/${PN}_${MY_PV}" LICENSE="Boost-1.0" -SLOT="0/${PV}" # ${PV} instead of the major version due to bug 486122 -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +SLOT="0/${PV}" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="bzip2 +context debug doc icu lzma +nls mpi numpy python +stacktrace tools zlib zstd" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" # the tests will never fail because these are not intended as sanity @@ -40,22 +40,16 @@ RDEPEND=" mpi? ( virtual/mpi[${MULTILIB_USEDEP},cxx,threads] ) python? ( ${PYTHON_DEPS} - numpy? ( dev-python/numpy[${PYTHON_USEDEP}] ) + numpy? ( dev-python/numpy:=[${PYTHON_USEDEP}] ) ) zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] ) zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND}" -BDEPEND=">=dev-build/b2-5.0.0" +BDEPEND=">=dev-build/b2-5.1.0" PATCHES=( "${FILESDIR}"/${PN}-1.81.0-disable_icu_rpath.patch "${FILESDIR}"/${PN}-1.79.0-build-auto_index-tool.patch - - # upstreamed - "${FILESDIR}"/${PN}-1.83.0-math-gcc14.patch - "${FILESDIR}"/${PN}-1.79.0-context-x32.patch - "${FILESDIR}"/${PN}-1.84.0-signals2-patch1.patch - "${FILESDIR}"/${PN}-1.84.0-signals2-patch2.patch ) create_user-config.jam() { @@ -175,6 +169,7 @@ src_configure() { -sNO_LZMA=$(usex lzma 0 1) -sNO_ZLIB=$(usex zlib 0 1) -sNO_ZSTD=$(usex zstd 0 1) + boost.stacktrace.from_exception=off ) if [[ ${CHOST} == *-darwin* ]]; then diff --git a/dev-libs/boost/files/boost-1.79.0-context-x32.patch b/dev-libs/boost/files/boost-1.79.0-context-x32.patch deleted file mode 100644 index 625599152328..000000000000 --- a/dev-libs/boost/files/boost-1.79.0-context-x32.patch +++ /dev/null @@ -1,45 +0,0 @@ -https://github.com/boostorg/context/pull/247 - -From 922e033fa1464e506c82a0d6980103268f7197cf Mon Sep 17 00:00:00 2001 -From: David Seifert <soap@gentoo.org> -Date: Tue, 23 Jan 2024 13:23:29 +0100 -Subject: [PATCH] Fix x32 build on x86-64 - ---- a/libs/context/src/asm/jump_i386_sysv_elf_gas.S -+++ b/libs/context/src/asm/jump_i386_sysv_elf_gas.S -@@ -24,6 +24,10 @@ - * * - ****************************************************************************************/ - -+#ifdef __x86_64__ -+#include "jump_x86_64_sysv_elf_gas.S" -+#else -+ - .file "jump_i386_sysv_elf_gas.S" - .text - .globl jump_fcontext -@@ -91,3 +95,5 @@ jump_fcontext: - - /* Mark that we don't need executable stack. */ - .section .note.GNU-stack,"",%progbits -+ -+#endif ---- a/libs/context/src/asm/make_i386_sysv_elf_gas.S -+++ b/libs/context/src/asm/make_i386_sysv_elf_gas.S -@@ -24,6 +24,10 @@ - * * - ****************************************************************************************/ - -+#ifdef __x86_64__ -+#include "make_x86_64_sysv_elf_gas.S" -+#else -+ - .file "make_i386_sysv_elf_gas.S" - .text - .globl make_fcontext -@@ -111,3 +115,5 @@ finish: - - /* Mark that we don't need executable stack. */ - .section .note.GNU-stack,"",%progbits -+ -+#endif diff --git a/dev-libs/boost/files/boost-1.83.0-math-gcc14.patch b/dev-libs/boost/files/boost-1.83.0-math-gcc14.patch deleted file mode 100644 index 935f1486bfee..000000000000 --- a/dev-libs/boost/files/boost-1.83.0-math-gcc14.patch +++ /dev/null @@ -1,19 +0,0 @@ -https://github.com/boostorg/math/pull/1057 - -From b3a21bcbcbd95c23da594ff53c3a48e38f0ff9f3 Mon Sep 17 00:00:00 2001 -From: Matt Borland <matt@mattborland.com> -Date: Wed, 13 Dec 2023 08:43:43 +0100 -Subject: [PATCH] Fix cstdfloat numeric limits detection macro for libstdc++14 - ---- a/boost/math/cstdfloat/cstdfloat_limits.hpp -+++ b/boost/math/cstdfloat/cstdfloat_limits.hpp -@@ -24,7 +24,7 @@ - #pragma GCC system_header - #endif - -- #if defined(BOOST_CSTDFLOAT_HAS_INTERNAL_FLOAT128_T) && defined(BOOST_MATH_USE_FLOAT128) && !defined(BOOST_CSTDFLOAT_NO_LIBQUADMATH_SUPPORT) && (!defined(__GNUC__) || (defined(__GNUC__) && __GNUC__ < 14)) -+ #if defined(BOOST_CSTDFLOAT_HAS_INTERNAL_FLOAT128_T) && defined(BOOST_MATH_USE_FLOAT128) && !defined(BOOST_CSTDFLOAT_NO_LIBQUADMATH_SUPPORT) && (!defined(_GLIBCXX_RELEASE) || (defined(_GLIBCXX_RELEASE) && _GLIBCXX_RELEASE < 14)) - - #include <limits> - #include <boost/math/tools/nothrow.hpp> - diff --git a/dev-libs/boost/files/boost-1.84.0-signals2-patch1.patch b/dev-libs/boost/files/boost-1.84.0-signals2-patch1.patch deleted file mode 100644 index 9c07bd8f06cf..000000000000 --- a/dev-libs/boost/files/boost-1.84.0-signals2-patch1.patch +++ /dev/null @@ -1,124 +0,0 @@ -https://github.com/boostorg/signals2/issues/70 - -From 2ba258f7b465e7bde14663ca3a966019b4ec3694 Mon Sep 17 00:00:00 2001 -From: Frank Mori Hess <fmh6jj@gmail.com> -Date: Sat, 30 Dec 2023 14:34:58 -0500 -Subject: [PATCH] Fix disconnect by slot when the slot is another signal. - ---- a/boost/signals2/detail/signal_template.hpp -+++ b/boost/signals2/detail/signal_template.hpp -@@ -103,9 +103,9 @@ namespace boost - BOOST_SIGNALS2_FORWARDED_ARGS(BOOST_SIGNALS2_NUM_ARGS)); - } - template<typename T> -- bool operator==(const T &other) const -+ bool contains(const T &other) const - { -- return _fun == other; -+ return _fun.contains(other); - } - private: - BOOST_SIGNALS2_BOUND_EXTENDED_SLOT_FUNCTION_N(BOOST_SIGNALS2_NUM_ARGS)() -@@ -115,6 +115,8 @@ namespace boost - boost::shared_ptr<connection> _connection; - }; - -+ template<BOOST_SIGNALS2_SIGNAL_TEMPLATE_DECL(BOOST_SIGNALS2_NUM_ARGS)> -+ class BOOST_SIGNALS2_WEAK_SIGNAL_CLASS_NAME(BOOST_SIGNALS2_NUM_ARGS); - template<BOOST_SIGNALS2_SIGNAL_TEMPLATE_DECL(BOOST_SIGNALS2_NUM_ARGS)> - class BOOST_SIGNALS2_SIGNAL_IMPL_CLASS_NAME(BOOST_SIGNALS2_NUM_ARGS); - -@@ -150,6 +152,8 @@ namespace boost - typedef GroupCompare group_compare_type; - typedef typename detail::slot_call_iterator_t<slot_invoker, - typename connection_list_type::iterator, connection_body<group_key_type, slot_type, Mutex> > slot_call_iterator; -+ typedef detail::BOOST_SIGNALS2_WEAK_SIGNAL_CLASS_NAME(BOOST_SIGNALS2_NUM_ARGS) -+ <BOOST_SIGNALS2_SIGNAL_TEMPLATE_INSTANTIATION> weak_signal_type; - - BOOST_SIGNALS2_SIGNAL_IMPL_CLASS_NAME(BOOST_SIGNALS2_NUM_ARGS)(const combiner_type &combiner_arg, - const group_compare_type &group_compare): -@@ -531,13 +535,20 @@ namespace boost - { - (*it)->nolock_disconnect(lock); - }else -- { -- // check for wrapped extended slot -+ { // check for wrapped extended slot - bound_extended_slot_function_type *fp; - fp = (*it)->slot().slot_function().template target<bound_extended_slot_function_type>(); -- if(fp && function_equal(*fp, slot)) -+ if(fp && fp->contains(slot)) - { - (*it)->nolock_disconnect(lock); -+ }else -+ { // check for wrapped signal -+ weak_signal_type *fp; -+ fp = (*it)->slot().slot_function().template target<weak_signal_type>(); -+ if(fp && fp->contains(slot)) -+ { -+ (*it)->nolock_disconnect(lock); -+ } - } - } - } -@@ -588,8 +599,6 @@ namespace boost - const boost::shared_ptr<mutex_type> _mutex; - }; - -- template<BOOST_SIGNALS2_SIGNAL_TEMPLATE_DECL(BOOST_SIGNALS2_NUM_ARGS)> -- class BOOST_SIGNALS2_WEAK_SIGNAL_CLASS_NAME(BOOST_SIGNALS2_NUM_ARGS); - } - - template<BOOST_SIGNALS2_SIGNAL_TEMPLATE_DEFAULTED_DECL(BOOST_SIGNALS2_NUM_ARGS)> -@@ -603,8 +612,7 @@ namespace boost - typedef detail::BOOST_SIGNALS2_SIGNAL_IMPL_CLASS_NAME(BOOST_SIGNALS2_NUM_ARGS) - <BOOST_SIGNALS2_SIGNAL_TEMPLATE_INSTANTIATION> impl_class; - public: -- typedef detail::BOOST_SIGNALS2_WEAK_SIGNAL_CLASS_NAME(BOOST_SIGNALS2_NUM_ARGS) -- <BOOST_SIGNALS2_SIGNAL_TEMPLATE_INSTANTIATION> weak_signal_type; -+ typedef typename impl_class::weak_signal_type weak_signal_type; - friend class detail::BOOST_SIGNALS2_WEAK_SIGNAL_CLASS_NAME(BOOST_SIGNALS2_NUM_ARGS) - <BOOST_SIGNALS2_SIGNAL_TEMPLATE_INSTANTIATION>; - -@@ -746,12 +754,24 @@ namespace boost - using std::swap; - swap(_pimpl, other._pimpl); - } -+ bool operator==(const BOOST_SIGNALS2_SIGNAL_CLASS_NAME(BOOST_SIGNALS2_NUM_ARGS) & other) const -+ { -+ return _pimpl.get() == other._pimpl.get(); -+ } - protected: - virtual shared_ptr<void> lock_pimpl() const - { - return _pimpl; - } - private: -+ // explicit private copy constructor to avoid compiler trying to do implicit conversions to signal -+ explicit BOOST_SIGNALS2_SIGNAL_CLASS_NAME(BOOST_SIGNALS2_NUM_ARGS)( -+ const BOOST_SIGNALS2_SIGNAL_CLASS_NAME(BOOST_SIGNALS2_NUM_ARGS) & other) BOOST_NOEXCEPT -+ { -+ // noncopyable -+ BOOST_ASSERT(false); -+ } -+ - shared_ptr<impl_class> - _pimpl; - }; -@@ -802,6 +822,16 @@ namespace boost - shared_pimpl(_weak_pimpl.lock()); - return (*shared_pimpl)(BOOST_SIGNALS2_SIGNATURE_ARG_NAMES(BOOST_SIGNALS2_NUM_ARGS)); - } -+ bool contains(const BOOST_SIGNALS2_SIGNAL_CLASS_NAME(BOOST_SIGNALS2_NUM_ARGS) -+ <BOOST_SIGNALS2_SIGNAL_TEMPLATE_INSTANTIATION> &signal) const -+ { -+ return _weak_pimpl.lock().get() == signal._pimpl.get(); -+ } -+ template <typename T> -+ bool contains(const T&) const -+ { -+ return false; -+ } - private: - boost::weak_ptr<detail::BOOST_SIGNALS2_SIGNAL_IMPL_CLASS_NAME(BOOST_SIGNALS2_NUM_ARGS) - <BOOST_SIGNALS2_SIGNAL_TEMPLATE_INSTANTIATION> > _weak_pimpl; diff --git a/dev-libs/boost/files/boost-1.84.0-signals2-patch2.patch b/dev-libs/boost/files/boost-1.84.0-signals2-patch2.patch deleted file mode 100644 index f277ae9973a1..000000000000 --- a/dev-libs/boost/files/boost-1.84.0-signals2-patch2.patch +++ /dev/null @@ -1,19 +0,0 @@ -https://github.com/boostorg/signals2/issues/70 - -From 4d994bbed820882059c7842ba5e230a26d68f2f0 Mon Sep 17 00:00:00 2001 -From: Frank Mori Hess <fmh6jj@gmail.com> -Date: Sat, 30 Dec 2023 14:51:49 -0500 -Subject: [PATCH] Fix disconnect by slot when slot is wrapped in a - boost::reference_wrapper - ---- a/boost/signals2/detail/signal_template.hpp -+++ b/boost/signals2/detail/signal_template.hpp -@@ -223,7 +223,7 @@ namespace boost - void disconnect(const T &slot) - { - typedef mpl::bool_<(is_convertible<T, group_type>::value)> is_group; -- do_disconnect(slot, is_group()); -+ do_disconnect(unwrap_ref(slot), is_group()); - } - // emit signal - result_type operator ()(BOOST_SIGNALS2_SIGNATURE_FULL_ARGS(BOOST_SIGNALS2_NUM_ARGS)) diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest index 15dd4e0b8776..1939ab8d5a25 100644 --- a/dev-libs/botan/Manifest +++ b/dev-libs/botan/Manifest @@ -1,10 +1,10 @@ DIST Botan-2.19.3.tar.xz 6105896 BLAKE2B 6d7778d9e9a101c76f35c65b0fb0201641cd91967ba934510f3836ee4b924d54cabdc760dd460997679250aa66e1d2a99369cd03f8fb9e7b2fe672d4b355215f SHA512 80012397e2aa7cc88a9536340ac9b770d1195fddda53b9d4cfde82318dd05f9d4f925bbdff773aba99883a701f4d30581e9d5c97e915fa80c3ca2acfa5a92110 DIST Botan-2.19.3.tar.xz.asc 488 BLAKE2B cd86bf77306aad2956cced6ac4fb96081279af88743e87d8fe5437e72e9fa8db8aaf40d0b5cb9c5b3a85204cb7d63c3baa3054126ab4c9a2db527e6835a069d7 SHA512 9142f932c958138b4bac32f503a550e6c73b61612690a280dcb98efe8c367aa6bd3cd88b4ed4decec376bb87596a780a21bdcb01d4a3573a1c44fbeb0aa49d23 -DIST Botan-2.19.4.tar.xz 6099528 BLAKE2B c35dfec5aad13c76fe09b33f97a72d15f84bfd6c434cae89be13c3fd3e6f7deaa9ea21474890bb6a1f4fa7d23369c32b9fc747862233eac33c8c88dbc912d31f SHA512 2fab4347367703dce8302b7710698ed228c6cc6dd609c39829ba17ad580407ed40d822862d467aa7aea4bfd633c1f1d1c0d437e86376f453845cc609596335d8 -DIST Botan-2.19.4.tar.xz.asc 488 BLAKE2B b8b7db32d61859778c0866e782ed94ef89ba48a0f0f2289d9452fe7f540ae37ad495cb7eede68199d9bed8e23f695e1860c0d379cd4c35c92de8c45db167b68a SHA512 e00c4e2944655919507300650d81fbee03dd22d1a84cb8135848ea9ee061ca4d4dfada618643193143c0123e56f22e4a6d3a26c73923d872754d80dc2a4779c5 +DIST Botan-2.19.5.tar.xz 6140148 BLAKE2B ab3a133a84c1beb2efd32fcb1746c13ec58cf24cf28cea43c93e9dd4b45c65a47225ff92139e34e1470cf150f839794e3bbd316df5e72a060f11d03141002b79 SHA512 323930fbabd833a6affd71f90835e4ca31a9632e346dee9c5f396aca898697d0f2993b860f739d02cdf49fa7fbb3a2d306c4790e5d5f39620b2dea284983669c +DIST Botan-2.19.5.tar.xz.asc 488 BLAKE2B 7d52f66f7495ccc249a58ec30206234a9ea4420bcc6e6412593a975bec1173afe55bbcd2c0cbe3859a3fdf547464d3d2949bc03dcb9dbd25c4d5c97589f48202 SHA512 3ba185cf077c109d183fff14270fa60c7be01fd87077e233e6473365111ba83d41448db6d5b5849fe1194c47e84cc2da91a0f75c30ea43538772f13138e472fa DIST Botan-3.1.1.tar.xz 8800368 BLAKE2B c31365e6bd4106f96a033e5f092c528c0185577f41d9a698d2630ece0f660f87f03e0775ebeb5c4d812819bbc6eb556b5ff15c16f243288ae73c8bf1fbb991ce SHA512 ed6bdadb910b0775245648140212953ed364aa26107f851e39ac5cb664d7f476c519a22cdad41f0e520796c4ebe453c56ca68a2178e39f815d445e9979333795 DIST Botan-3.1.1.tar.xz.asc 488 BLAKE2B 9ac94473d90a26932e507cdb3f46d8381565deecff38a5a2f7fe043b33405071adf0baee4235dd94bb6d35fa3ffedca6192fb5f5d76030874a90a399d88f9744 SHA512 f52e8602a57f590150f6f49829e788910006e5113ab6e85c6efe73009b8db752b5f28b869c6265ef6dd3c2727c64c0182d125f02f92485485768416c618acdb9 DIST Botan-3.2.0.tar.xz 8998204 BLAKE2B f21e7574af93ab3331607f4a4ecf1b2cbbc0db4b510ea8ad19a5286d46d3a8e37e13746d2d4751eb16a70fdc8371b4435b030ef0a17f1ab6dcd76bd81bb3a4fa SHA512 526cf71144584fef6e73f14f6aa1e2a7b03a92a3e51436287764bb61e742a94e02926bcc2aab038f08ef2169cb511152c8ecd71d51e06deb4875dc676875c2d9 DIST Botan-3.2.0.tar.xz.asc 488 BLAKE2B f7bc716dd18eedf35928933e22c75de3d2731330dfdaf8a5048e8ad86e1f3896ea55294a64b7f82593af16dd2e4097a9ba68f25baa024e175b7334478bcf84a6 SHA512 3ee42ac73e1bd6cea0a2e9f468b88d67c02a4a69786c41ddf9fc7f94b6847be00e0f3f0f38f934ab599b8d6dd29006414294df8b371f5cf2422292f3dd176756 -DIST Botan-3.3.0.tar.xz 7164024 BLAKE2B 051a24c28e6858fdff2af15d01a871ebe5bab11d773be821c0a56a55c725c91cf3119280195ac736f4df83305c1d4910430e6b26deded0d4c634e5c2fc23b389 SHA512 90930add225a2b4376046b3ed0177c71e7d19e983fb2b99c40751de5e6c3959b520eaa1e836782eb02ebc8aff8e9a4fd928f585de5e6b1798a8ad4aa0464f19b -DIST Botan-3.3.0.tar.xz.asc 488 BLAKE2B 043538ff2572a449d4d9ad4bba6d7cab78865e924f712d1b4d4aad9f378cc417f07c19a25adefa22b6e1c06259a50880414c11ce8d3ad1e7f815cf458dbbe6b8 SHA512 c951079c22665966b96cf18c20df7b709353b42dab4aeb33d021b4a8abbc0f06d8fe909f1a5db3e736b4f93b17374d8f832f7aa9f25757a5d5ab1604320581b2 +DIST Botan-3.6.1.tar.xz 7581864 BLAKE2B 744eed158e021d26b9414b3a098e017e6e2c2160fc7fb6a0f24f6cbbb4b08501157108dedd7a71fc3645e27c86608a9ba5d18a11087adfd1c9b174ca3ce85b30 SHA512 06327c55bee5e0d2e142f81b997dd8a1ef98f61ef920b57f6eb4e80ebf6b3de1c62373b889d4a32e62509495792e0b46d5dcc82a6446266974b4d4ead8d9f287 +DIST Botan-3.6.1.tar.xz.asc 488 BLAKE2B 3538c941f707a182f86226dfdbb8222570671e0bce3ca61137a5d978c2b1f5e658ffc1168d7e73a1861210adfac8aa661124c9cbc4950973f7b1e2c3360aab90 SHA512 871c6d91368d8a080e704afb53b1339c6d06aa57aaa45f260bccf1cb1ed31c635587ba930f954ab55668a7ca13b89b2f2acba3c0f1723e3f7190c6ebe9dc2e0b diff --git a/dev-libs/botan/botan-2.19.4.ebuild b/dev-libs/botan/botan-2.19.5.ebuild index b35aa44c46b2..ee758c0c3626 100644 --- a/dev-libs/botan/botan-2.19.4.ebuild +++ b/dev-libs/botan/botan-2.19.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -17,8 +17,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="BSD-2" # New major versions are parallel-installable SLOT="$(ver_cut 1)/$(ver_cut 1-2)" # soname version -# Unkeyworded because of https://github.com/randombit/botan/issues/3916 -#KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~ppc-macos" +KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~ppc-macos" IUSE="doc boost bzip2 lzma python static-libs sqlite test tools zlib" CPU_USE=( cpu_flags_arm_{aes,neon} @@ -54,6 +53,12 @@ BDEPEND=" # Please see upstream's guidance: # https://botan.randombit.net/handbook/packaging.html#minimize-distribution-patches +PATCHES=( + "${FILESDIR}"/${P}-no-distutils.patch + "${FILESDIR}"/${P}-boost-1.87.patch + "${FILESDIR}"/${P}-cloudflare.patch +) + python_check_deps() { use doc || return 0 python_has_version "dev-python/sphinx[${PYTHON_USEDEP}]" @@ -189,7 +194,7 @@ src_test() { src_install() { default - if [[ -d "${ED}"/usr/share/doc/${P} ]] ; then + if [[ -d "${ED}"/usr/share/doc/${P} && ${P} != ${PF} ]] ; then # --docdir in configure controls the parent directory unfortunately mv "${ED}"/usr/share/doc/${P} "${ED}"/usr/share/doc/${PF} || die fi diff --git a/dev-libs/botan/botan-3.1.1.ebuild b/dev-libs/botan/botan-3.1.1.ebuild index 2c1e9f8eef3a..0c48886d9385 100644 --- a/dev-libs/botan/botan-3.1.1.ebuild +++ b/dev-libs/botan/botan-3.1.1.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 @@ -49,7 +49,7 @@ BDEPEND=" $(python_gen_any_dep ' doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) ') - || ( >=sys-devel/gcc-11:* >=sys-devel/clang-14:* ) + || ( >=sys-devel/gcc-11:* >=llvm-core/clang-14:* ) verify-sig? ( sec-keys/openpgp-keys-botan ) " @@ -72,7 +72,7 @@ pkg_pretend() { die "GCC version is too old to compile Botan!" elif tc-is-clang && ver_test $(clang-version) -lt 14 ; then eerror "Botan needs >=gcc-11 or >=clang-14 to compile." - eerror "Please upgrade Clang: emerge -v1 sys-devel/clang" + eerror "Please upgrade Clang: emerge -v1 llvm-core/clang" die "Clang version is too old to compile Botan!" fi } diff --git a/dev-libs/botan/botan-3.2.0-r1.ebuild b/dev-libs/botan/botan-3.2.0-r1.ebuild index e742955ead68..612b0486a98a 100644 --- a/dev-libs/botan/botan-3.2.0-r1.ebuild +++ b/dev-libs/botan/botan-3.2.0-r1.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 @@ -50,7 +50,7 @@ BDEPEND=" $(python_gen_any_dep ' doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) ') - || ( >=sys-devel/gcc-11:* >=sys-devel/clang-14:* ) + || ( >=sys-devel/gcc-11:* >=llvm-core/clang-14:* ) verify-sig? ( sec-keys/openpgp-keys-botan ) " @@ -76,7 +76,7 @@ pkg_pretend() { die "GCC version is too old to compile Botan!" elif tc-is-clang && ver_test $(clang-version) -lt 14 ; then eerror "Botan needs >=gcc-11 or >=clang-14 to compile." - eerror "Please upgrade Clang: emerge -v1 sys-devel/clang" + eerror "Please upgrade Clang: emerge -v1 llvm-core/clang" die "Clang version is too old to compile Botan!" fi } diff --git a/dev-libs/botan/botan-3.2.0-r2.ebuild b/dev-libs/botan/botan-3.2.0-r2.ebuild index 4153b96779f2..a9b992551551 100644 --- a/dev-libs/botan/botan-3.2.0-r2.ebuild +++ b/dev-libs/botan/botan-3.2.0-r2.ebuild @@ -50,7 +50,7 @@ BDEPEND=" $(python_gen_any_dep ' doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) ') - || ( >=sys-devel/gcc-11:* >=sys-devel/clang-14:* ) + || ( >=sys-devel/gcc-11:* >=llvm-core/clang-14:* ) verify-sig? ( sec-keys/openpgp-keys-botan ) " @@ -76,7 +76,7 @@ pkg_pretend() { die "GCC version is too old to compile Botan!" elif tc-is-clang && ver_test $(clang-version) -lt 14 ; then eerror "Botan needs >=gcc-11 or >=clang-14 to compile." - eerror "Please upgrade Clang: emerge -v1 sys-devel/clang" + eerror "Please upgrade Clang: emerge -v1 llvm-core/clang" die "Clang version is too old to compile Botan!" fi } diff --git a/dev-libs/botan/botan-3.3.0.ebuild b/dev-libs/botan/botan-3.6.1.ebuild index b85a0977016b..052faed7a59a 100644 --- a/dev-libs/botan/botan-3.3.0.ebuild +++ b/dev-libs/botan/botan-3.6.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -17,8 +17,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="BSD-2" # New major versions are parallel-installable SLOT="$(ver_cut 1)/$(ver_cut 1-2)" # soname version -# Unkeyworded because of https://github.com/randombit/botan/issues/3917 -#KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos" +KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~ppc-macos" IUSE="doc boost bzip2 lzma python static-libs sqlite test tools zlib" CPU_USE=( cpu_flags_arm_{aes,neon,sha1,sha2} @@ -48,7 +47,7 @@ BDEPEND=" $(python_gen_any_dep ' doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) ') - || ( >=sys-devel/gcc-11:* >=sys-devel/clang-14:* ) + || ( >=sys-devel/gcc-11:* >=llvm-core/clang-14:* ) verify-sig? ( sec-keys/openpgp-keys-botan ) " @@ -56,6 +55,12 @@ BDEPEND=" # Please see upstream's guidance: # https://botan.randombit.net/handbook/packaging.html#minimize-distribution-patches +PATCHES=( + "${FILESDIR}"/${P}-boost-1.87.patch + "${FILESDIR}"/${P}-tests-glibcxx_assertions.patch + "${FILESDIR}"/${PN}-3.6.1-no-avx2.patch +) + python_check_deps() { use doc || return 0 python_has_version "dev-python/sphinx[${PYTHON_USEDEP}]" @@ -71,7 +76,7 @@ pkg_pretend() { die "GCC version is too old to compile Botan!" elif tc-is-clang && ver_test $(clang-version) -lt 14 ; then eerror "Botan needs >=gcc-11 or >=clang-14 to compile." - eerror "Please upgrade Clang: emerge -v1 sys-devel/clang" + eerror "Please upgrade Clang: emerge -v1 llvm-core/clang" die "Clang version is too old to compile Botan!" fi } diff --git a/dev-libs/botan/files/botan-2.19.5-boost-1.87.patch b/dev-libs/botan/files/botan-2.19.5-boost-1.87.patch new file mode 100644 index 000000000000..a52fbaea130d --- /dev/null +++ b/dev-libs/botan/files/botan-2.19.5-boost-1.87.patch @@ -0,0 +1,361 @@ +https://bugs.gentoo.org/946389 +https://github.com/randombit/botan/commit/37fec38ff97604f964122cd2d33f5d503f319b10 + +From 37fec38ff97604f964122cd2d33f5d503f319b10 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ren=C3=A9=20Meusel?= <rene.meusel@rohde-schwarz.com> +Date: Thu, 19 Dec 2024 10:28:40 +0100 +Subject: [PATCH] Backport: Remove usage of deprecated asio API + +These were all finally dropped with boost 1.87, so this fixes +build with boost 1.87. + +Co-Authored-By: Jack Lloyd <jack@randombit.net> +Co-Authored-By: q66 <q66@chimera-linux.org> +--- + src/cli/tls_http_server.cpp | 16 +++++----- + src/cli/tls_proxy.cpp | 46 ++++++++++++++++------------- + src/lib/utils/socket/socket.cpp | 18 +++++------ + src/lib/utils/socket/socket_udp.cpp | 18 +++++------ + 4 files changed, 50 insertions(+), 48 deletions(-) + +diff --git a/src/cli/tls_http_server.cpp b/src/cli/tls_http_server.cpp +index fc0b5bbb77e..67ab126b145 100644 +--- a/src/cli/tls_http_server.cpp ++++ b/src/cli/tls_http_server.cpp +@@ -176,7 +176,7 @@ class TLS_Asio_HTTP_Session final : public std::enable_shared_from_this<TLS_Asio + typedef std::shared_ptr<TLS_Asio_HTTP_Session> pointer; + + static pointer create( +- boost::asio::io_service& io, ++ boost::asio::io_context& io, + Botan::TLS::Session_Manager& session_manager, + Botan::Credentials_Manager& credentials, + Botan::TLS::Policy& policy) +@@ -201,7 +201,7 @@ class TLS_Asio_HTTP_Session final : public std::enable_shared_from_this<TLS_Asio + } + + private: +- TLS_Asio_HTTP_Session(boost::asio::io_service& io, ++ TLS_Asio_HTTP_Session(boost::asio::io_context& io, + Botan::TLS::Session_Manager& session_manager, + Botan::Credentials_Manager& credentials, + Botan::TLS::Policy& policy) +@@ -230,7 +230,8 @@ class TLS_Asio_HTTP_Session final : public std::enable_shared_from_this<TLS_Asio + + m_client_socket.async_read_some( + boost::asio::buffer(&m_c2s[0], m_c2s.size()), +- m_strand.wrap( ++ boost::asio::bind_executor( ++ m_strand, + boost::bind( + &TLS_Asio_HTTP_Session::client_read, shared_from_this(), + boost::asio::placeholders::error, +@@ -332,7 +333,8 @@ class TLS_Asio_HTTP_Session final : public std::enable_shared_from_this<TLS_Asio + boost::asio::async_write( + m_client_socket, + boost::asio::buffer(&m_s2c[0], m_s2c.size()), +- m_strand.wrap( ++ boost::asio::bind_executor( ++ m_strand, + boost::bind( + &TLS_Asio_HTTP_Session::handle_client_write_completion, + shared_from_this(), +@@ -406,7 +408,7 @@ class TLS_Asio_HTTP_Session final : public std::enable_shared_from_this<TLS_Asio + } + } + +- boost::asio::io_service::strand m_strand; ++ boost::asio::io_context::strand m_strand; + + tcp::socket m_client_socket; + +@@ -427,7 +429,7 @@ class TLS_Asio_HTTP_Server final + typedef TLS_Asio_HTTP_Session session; + + TLS_Asio_HTTP_Server( +- boost::asio::io_service& io, unsigned short port, ++ boost::asio::io_context& io, unsigned short port, + Botan::Credentials_Manager& creds, + Botan::TLS::Policy& policy, + Botan::TLS::Session_Manager& session_mgr, +@@ -551,7 +553,7 @@ class TLS_HTTP_Server final : public Command + session_mgr.reset(new Botan::TLS::Session_Manager_In_Memory(rng())); + } + +- boost::asio::io_service io; ++ boost::asio::io_context io; + + TLS_Asio_HTTP_Server server(io, listen_port, creds, *policy, *session_mgr, max_clients); + +diff --git a/src/cli/tls_proxy.cpp b/src/cli/tls_proxy.cpp +index bd96530c202..853be08161c 100644 +--- a/src/cli/tls_proxy.cpp ++++ b/src/cli/tls_proxy.cpp +@@ -98,11 +98,11 @@ class tls_proxy_session final : public std::enable_shared_from_this<tls_proxy_se + typedef std::shared_ptr<tls_proxy_session> pointer; + + static pointer create( +- boost::asio::io_service& io, ++ boost::asio::io_context& io, + Botan::TLS::Session_Manager& session_manager, + Botan::Credentials_Manager& credentials, + Botan::TLS::Policy& policy, +- tcp::resolver::iterator endpoints) ++ tcp::resolver::results_type endpoints) + { + return pointer( + new tls_proxy_session( +@@ -141,11 +141,11 @@ class tls_proxy_session final : public std::enable_shared_from_this<tls_proxy_se + + private: + tls_proxy_session( +- boost::asio::io_service& io, ++ boost::asio::io_context& io, + Botan::TLS::Session_Manager& session_manager, + Botan::Credentials_Manager& credentials, + Botan::TLS::Policy& policy, +- tcp::resolver::iterator endpoints) ++ tcp::resolver::results_type endpoints) + : m_strand(io) + , m_server_endpoints(endpoints) + , m_client_socket(io) +@@ -184,7 +184,8 @@ class tls_proxy_session final : public std::enable_shared_from_this<tls_proxy_se + + m_client_socket.async_read_some( + boost::asio::buffer(&m_c2p[0], m_c2p.size()), +- m_strand.wrap( ++ boost::asio::bind_executor( ++ m_strand, + boost::bind( + &tls_proxy_session::client_read, shared_from_this(), + boost::asio::placeholders::error, +@@ -245,7 +246,8 @@ class tls_proxy_session final : public std::enable_shared_from_this<tls_proxy_se + boost::asio::async_write( + m_client_socket, + boost::asio::buffer(&m_p2c[0], m_p2c.size()), +- m_strand.wrap( ++ boost::asio::bind_executor( ++ m_strand, + boost::bind( + &tls_proxy_session::handle_client_write_completion, + shared_from_this(), +@@ -270,11 +272,11 @@ class tls_proxy_session final : public std::enable_shared_from_this<tls_proxy_se + boost::asio::async_write( + m_server_socket, + boost::asio::buffer(&m_p2s[0], m_p2s.size()), +- m_strand.wrap( +- boost::bind( +- &tls_proxy_session::handle_server_write_completion, +- shared_from_this(), +- boost::asio::placeholders::error))); ++ boost::asio::bind_executor(m_strand, ++ boost::bind( ++ &tls_proxy_session::handle_server_write_completion, ++ shared_from_this(), ++ boost::asio::placeholders::error))); + } + } + +@@ -308,7 +310,8 @@ class tls_proxy_session final : public std::enable_shared_from_this<tls_proxy_se + + m_server_socket.async_read_some( + boost::asio::buffer(&m_s2p[0], m_s2p.size()), +- m_strand.wrap( ++ boost::asio::bind_executor( ++ m_strand, + boost::bind(&tls_proxy_session::server_read, shared_from_this(), + boost::asio::placeholders::error, + boost::asio::placeholders::bytes_transferred))); +@@ -318,7 +321,8 @@ class tls_proxy_session final : public std::enable_shared_from_this<tls_proxy_se + { + m_hostname = session.server_info().hostname(); + +- auto onConnect = [this](boost::system::error_code ec, tcp::resolver::iterator /*endpoint*/) ++ auto onConnect = [this](boost::system::error_code ec, ++ const boost::asio::ip::tcp::resolver::results_type::iterator& /*endpoint*/) + { + if(ec) + { +@@ -328,7 +332,7 @@ class tls_proxy_session final : public std::enable_shared_from_this<tls_proxy_se + server_read(boost::system::error_code(), 0); // start read loop + proxy_write_to_server(nullptr, 0); + }; +- async_connect(m_server_socket, m_server_endpoints, onConnect); ++ async_connect(m_server_socket, m_server_endpoints.begin(), m_server_endpoints.end(), onConnect); + return true; + } + +@@ -341,9 +345,9 @@ class tls_proxy_session final : public std::enable_shared_from_this<tls_proxy_se + } + } + +- boost::asio::io_service::strand m_strand; ++ boost::asio::io_context::strand m_strand; + +- tcp::resolver::iterator m_server_endpoints; ++ tcp::resolver::results_type m_server_endpoints; + + tcp::socket m_client_socket; + tcp::socket m_server_socket; +@@ -369,8 +373,8 @@ class tls_proxy_server final + typedef tls_proxy_session session; + + tls_proxy_server( +- boost::asio::io_service& io, unsigned short port, +- tcp::resolver::iterator endpoints, ++ boost::asio::io_context& io, unsigned short port, ++ tcp::resolver::results_type endpoints, + Botan::Credentials_Manager& creds, + Botan::TLS::Policy& policy, + Botan::TLS::Session_Manager& session_mgr, +@@ -428,7 +432,7 @@ class tls_proxy_server final + } + + tcp::acceptor m_acceptor; +- tcp::resolver::iterator m_server_endpoints; ++ tcp::resolver::results_type m_server_endpoints; + + Botan::Credentials_Manager& m_creds; + Botan::TLS::Policy& m_policy; +@@ -479,10 +483,10 @@ class TLS_Proxy final : public Command + + auto policy = load_tls_policy(get_arg("policy")); + +- boost::asio::io_service io; ++ boost::asio::io_context io; + + tcp::resolver resolver(io); +- auto server_endpoint_iterator = resolver.resolve({ target, target_port }); ++ auto server_endpoint_iterator = resolver.resolve(target, target_port); + + std::unique_ptr<Botan::TLS::Session_Manager> session_mgr; + +diff --git a/src/lib/utils/socket/socket.cpp b/src/lib/utils/socket/socket.cpp +index bc632259a64..0ce4e85830f 100644 +--- a/src/lib/utils/socket/socket.cpp ++++ b/src/lib/utils/socket/socket.cpp +@@ -48,19 +48,17 @@ class Asio_Socket final : public OS::Socket + std::chrono::milliseconds timeout) : + m_timeout(timeout), m_timer(m_io), m_tcp(m_io) + { +- m_timer.expires_from_now(m_timeout); ++ m_timer.expires_after(m_timeout); + check_timeout(); + + boost::asio::ip::tcp::resolver resolver(m_io); +- boost::asio::ip::tcp::resolver::query query(hostname, service); +- boost::asio::ip::tcp::resolver::iterator dns_iter = resolver.resolve(query); ++ boost::asio::ip::tcp::resolver::results_type endpoints = resolver.resolve(hostname, service); + + boost::system::error_code ec = boost::asio::error::would_block; + + auto connect_cb = [&ec](const boost::system::error_code& e, +- boost::asio::ip::tcp::resolver::iterator) { ec = e; }; +- +- boost::asio::async_connect(m_tcp, dns_iter, connect_cb); ++ const boost::asio::ip::tcp::resolver::results_type::iterator&) { ec = e; }; ++ boost::asio::async_connect(m_tcp, endpoints.begin(), endpoints.end(), connect_cb); + + while(ec == boost::asio::error::would_block) + { +@@ -75,7 +73,7 @@ class Asio_Socket final : public OS::Socket + + void write(const uint8_t buf[], size_t len) override + { +- m_timer.expires_from_now(m_timeout); ++ m_timer.expires_after(m_timeout); + + boost::system::error_code ec = boost::asio::error::would_block; + +@@ -92,7 +90,7 @@ class Asio_Socket final : public OS::Socket + + size_t read(uint8_t buf[], size_t len) override + { +- m_timer.expires_from_now(m_timeout); ++ m_timer.expires_after(m_timeout); + + boost::system::error_code ec = boost::asio::error::would_block; + size_t got = 0; +@@ -115,7 +113,7 @@ class Asio_Socket final : public OS::Socket + private: + void check_timeout() + { +- if(m_tcp.is_open() && m_timer.expires_at() < std::chrono::system_clock::now()) ++ if(m_tcp.is_open() && m_timer.expiry() < std::chrono::system_clock::now()) + { + boost::system::error_code err; + m_tcp.close(err); +@@ -125,7 +123,7 @@ class Asio_Socket final : public OS::Socket + } + + const std::chrono::milliseconds m_timeout; +- boost::asio::io_service m_io; ++ boost::asio::io_context m_io; + boost::asio::system_timer m_timer; + boost::asio::ip::tcp::socket m_tcp; + }; +diff --git a/src/lib/utils/socket/socket_udp.cpp b/src/lib/utils/socket/socket_udp.cpp +index fbbdd9abbcc..82a25b49cda 100644 +--- a/src/lib/utils/socket/socket_udp.cpp ++++ b/src/lib/utils/socket/socket_udp.cpp +@@ -48,19 +48,17 @@ class Asio_SocketUDP final : public OS::SocketUDP + std::chrono::microseconds timeout) : + m_timeout(timeout), m_timer(m_io), m_udp(m_io) + { +- m_timer.expires_from_now(m_timeout); ++ m_timer.expires_after(m_timeout); + check_timeout(); + + boost::asio::ip::udp::resolver resolver(m_io); +- boost::asio::ip::udp::resolver::query query(hostname, service); +- boost::asio::ip::udp::resolver::iterator dns_iter = resolver.resolve(query); ++ boost::asio::ip::udp::resolver::results_type endpoints = resolver.resolve(hostname, service); + + boost::system::error_code ec = boost::asio::error::would_block; + + auto connect_cb = [&ec](const boost::system::error_code& e, +- boost::asio::ip::udp::resolver::iterator) { ec = e; }; +- +- boost::asio::async_connect(m_udp, dns_iter, connect_cb); ++ const boost::asio::ip::udp::resolver::results_type::iterator&) { ec = e; }; ++ boost::asio::async_connect(m_udp, endpoints.begin(), endpoints.end(), connect_cb); + + while(ec == boost::asio::error::would_block) + { +@@ -75,7 +73,7 @@ class Asio_SocketUDP final : public OS::SocketUDP + + void write(const uint8_t buf[], size_t len) override + { +- m_timer.expires_from_now(m_timeout); ++ m_timer.expires_after(m_timeout); + + boost::system::error_code ec = boost::asio::error::would_block; + +@@ -95,7 +93,7 @@ class Asio_SocketUDP final : public OS::SocketUDP + + size_t read(uint8_t buf[], size_t len) override + { +- m_timer.expires_from_now(m_timeout); ++ m_timer.expires_after(m_timeout); + + boost::system::error_code ec = boost::asio::error::would_block; + size_t got = 0; +@@ -121,7 +119,7 @@ class Asio_SocketUDP final : public OS::SocketUDP + private: + void check_timeout() + { +- if(m_udp.is_open() && m_timer.expires_at() < std::chrono::system_clock::now()) ++ if(m_udp.is_open() && m_timer.expiry() < std::chrono::system_clock::now()) + { + boost::system::error_code err; + m_udp.close(err); +@@ -131,7 +129,7 @@ class Asio_SocketUDP final : public OS::SocketUDP + } + + const std::chrono::microseconds m_timeout; +- boost::asio::io_service m_io; ++ boost::asio::io_context m_io; + boost::asio::system_timer m_timer; + boost::asio::ip::udp::socket m_udp; + }; + diff --git a/dev-libs/botan/files/botan-2.19.5-cloudflare.patch b/dev-libs/botan/files/botan-2.19.5-cloudflare.patch new file mode 100644 index 000000000000..0824fd9a1089 --- /dev/null +++ b/dev-libs/botan/files/botan-2.19.5-cloudflare.patch @@ -0,0 +1,52 @@ +https://github.com/randombit/botan/commit/698c383b050591ae1a239c9e6d4ebe05532d2eee + +From 698c383b050591ae1a239c9e6d4ebe05532d2eee Mon Sep 17 00:00:00 2001 +From: Luke Valenta <lvalenta@cloudflare.com> +Date: Thu, 11 Apr 2024 14:24:36 -0400 +Subject: [PATCH] Backport: Update roughtime.cloudflare.com public key and port + +See also #4002. + +Fixes #3937. Note that the old Cloudflare public key is still present in +test vectors in the codebase. +--- + src/cli/roughtime.cpp | 2 +- + src/tests/test_roughtime.cpp | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/cli/roughtime.cpp b/src/cli/roughtime.cpp +index ff38fe1c43c..6c1561efacd 100644 +--- a/src/cli/roughtime.cpp ++++ b/src/cli/roughtime.cpp +@@ -72,7 +72,7 @@ class Roughtime final : public Command + <name> <key type> <base 64 encoded public key> <protocol> <host:port> + + Example servers: +- Cloudflare-Roughtime ed25519 gD63hSj3ScS+wuOeGrubXlq35N1c5Lby/S+T7MNTjxo= udp roughtime.cloudflare.com:2002 ++ Cloudflare-Roughtime ed25519 0GD7c3yP8xEc4Zl2zeuN2SlLvDVVocjsPSL8/Rl/7zg= udp roughtime.cloudflare.com:2003 + Google-Sandbox-Roughtime ed25519 etPaaIxcBMY1oUeGpwvPMCJMwlRVNxv51KK/tktoJTQ= udp roughtime.sandbox.google.com:2002 + + --chain-file=<filename> +diff --git a/src/tests/test_roughtime.cpp b/src/tests/test_roughtime.cpp +index 48ac545876b..4b29837e9b6 100644 +--- a/src/tests/test_roughtime.cpp ++++ b/src/tests/test_roughtime.cpp +@@ -191,7 +191,7 @@ class Roughtime final : public Test + + const auto servers = Botan::Roughtime::servers_from_str( + "Chainpoint-Roughtime ed25519 bbT+RPS7zKX6w71ssPibzmwWqU9ffRV5oj2OresSmhE= udp roughtime.chainpoint.org:2002\n" +- "Cloudflare-Roughtime ed25519 gD63hSj3ScS+wuOeGrubXlq35N1c5Lby/S+T7MNTjxo= udp roughtime.cloudflare.com:2002\n" ++ "Cloudflare-Roughtime ed25519 0GD7c3yP8xEc4Zl2zeuN2SlLvDVVocjsPSL8/Rl/7zg= udp roughtime.cloudflare.com:2003\n" + "Google-Sandbox-Roughtime ed25519 etPaaIxcBMY1oUeGpwvPMCJMwlRVNxv51KK/tktoJTQ= udp roughtime.sandbox.google.com:2002\n" + "int08h-Roughtime ed25519 AW5uAoTSTDfG5NfY1bTh08GUnOqlRb+HVhbJ3ODJvsE= udp roughtime.int08h.com:2002\n" + "ticktock ed25519 cj8GsiNlRkqiDElAeNMSBBMwrAl15hYPgX50+GWX/lA= udp ticktock.mixmin.net:5333\n" +@@ -224,7 +224,7 @@ class Roughtime final : public Test + Botan::Roughtime::Nonce nonce(Test::rng()); + try + { +- const auto response_raw = Botan::Roughtime::online_request("roughtime.cloudflare.com:2002", nonce, ++ const auto response_raw = Botan::Roughtime::online_request("roughtime.cloudflare.com:2003", nonce, + std::chrono::seconds(5)); + const auto now = std::chrono::system_clock::now(); + const auto response = Botan::Roughtime::Response::from_bits(response_raw, nonce); + diff --git a/dev-libs/botan/files/botan-2.19.5-no-distutils.patch b/dev-libs/botan/files/botan-2.19.5-no-distutils.patch new file mode 100644 index 000000000000..bc6631fb7cc6 --- /dev/null +++ b/dev-libs/botan/files/botan-2.19.5-no-distutils.patch @@ -0,0 +1,86 @@ +https://github.com/randombit/botan/commit/0fed26215b52a3d30122deb528f6b4deb824eae7 + +From 0fed26215b52a3d30122deb528f6b4deb824eae7 Mon Sep 17 00:00:00 2001 +From: Jack Lloyd <jack@randombit.net> +Date: Fri, 6 Sep 2024 11:56:01 -0400 +Subject: [PATCH] Remove code relying on Python distutils + +This was just used to check if Sphinx supports concurrency, but +Sphinx is also barely faster with 1 core vs 32, so it hardly matters. + +Debian bug 1080557 +--- + src/scripts/build_docs.py | 45 --------------------------------------- + 1 file changed, 45 deletions(-) + +diff --git a/src/scripts/build_docs.py b/src/scripts/build_docs.py +index 6eb9b656c98..5bd04acb13b 100755 +--- a/src/scripts/build_docs.py ++++ b/src/scripts/build_docs.py +@@ -18,18 +18,6 @@ + import os + import stat + +-def get_concurrency(): +- """ +- Get default concurrency level of build +- """ +- def_concurrency = 2 +- +- try: +- import multiprocessing +- return max(def_concurrency, multiprocessing.cpu_count()) +- except ImportError: +- return def_concurrency +- + def have_prog(prog): + """ + Check if some named program exists in the path +@@ -124,37 +112,6 @@ def log_level(): + + return options + +-def sphinx_supports_concurrency(): +- import re +- from distutils.version import StrictVersion +- +- proc = subprocess.Popen(['sphinx-build', '--version'], +- stdout=subprocess.PIPE, +- stderr=subprocess.STDOUT) +- output, _ = proc.communicate() +- if isinstance(output, bytes): +- output = output.decode('ascii') +- output = output.strip() +- +- # Sphinx v1.1.3 +- # sphinx-build 1.7.4 +- match = re.match(r'^(?:[a-zA-Z_-]+) v?(([0-9]+)\.([0-9]+))', output) +- +- if match is None: +- # If regex doesn't match, disable by default +- logging.warning("Did not recognize sphinx version from '%s'", output) +- return False +- +- version = StrictVersion(match.group(1)) +- +- if version < StrictVersion('1.4'): +- # not supported +- return False +- if version == StrictVersion('3.0'): +- # Bug in Sphinx 3.0 https://github.com/sphinx-doc/sphinx/issues/7438 +- return False +- return True +- + def read_config(config): + try: + f = open(config) +@@ -203,8 +160,6 @@ def main(args=None): + + if with_sphinx: + sphinx_build = ['sphinx-build', '-q', '-c', cfg['sphinx_config_dir']] +- if sphinx_supports_concurrency(): +- sphinx_build += ['-j', str(get_concurrency())] + + cmds.append(sphinx_build + ['-b', 'html', handbook_src, handbook_output]) + + diff --git a/dev-libs/botan/files/botan-3.6.1-boost-1.87.patch b/dev-libs/botan/files/botan-3.6.1-boost-1.87.patch new file mode 100644 index 000000000000..eb42cad0567d --- /dev/null +++ b/dev-libs/botan/files/botan-3.6.1-boost-1.87.patch @@ -0,0 +1,322 @@ +https://bugs.gentoo.org/946389 +https://github.com/randombit/botan/pull/4484 + +From 2a406beab449a2cb310fa543451a7087ca7b4b1a Mon Sep 17 00:00:00 2001 +From: q66 <q66@chimera-linux.org> +Date: Sun, 15 Dec 2024 02:42:02 +0100 +Subject: [PATCH 1/2] Remove usage of deprecated asio API + +These were all finally dropped with boost 1.87, so this fixes +build with boost 1.87. +--- a/src/cli/tls_proxy.cpp ++++ b/src/cli/tls_proxy.cpp +@@ -106,11 +106,11 @@ class tls_proxy_session final : public std::enable_shared_from_this<tls_proxy_se + + typedef std::shared_ptr<tls_proxy_session> pointer; + +- static pointer create(boost::asio::io_service& io, ++ static pointer create(boost::asio::io_context& io, + const std::shared_ptr<Botan::TLS::Session_Manager>& session_manager, + const std::shared_ptr<Botan::Credentials_Manager>& credentials, + const std::shared_ptr<Botan::TLS::Policy>& policy, +- const tcp::resolver::iterator& endpoints) { ++ const tcp::resolver::results_type& endpoints) { + auto session = std::make_shared<tls_proxy_session>(io, endpoints); + + // Defer the setup of the TLS server to make use of +@@ -144,7 +144,7 @@ class tls_proxy_session final : public std::enable_shared_from_this<tls_proxy_se + } + } + +- tls_proxy_session(boost::asio::io_service& io, tcp::resolver::iterator endpoints) : ++ tls_proxy_session(boost::asio::io_context& io, tcp::resolver::results_type endpoints) : + m_strand(io), + m_server_endpoints(std::move(endpoints)), + m_client_socket(io), +@@ -287,7 +287,7 @@ class tls_proxy_session final : public std::enable_shared_from_this<tls_proxy_se + + void tls_session_activated() override { + auto onConnect = [self = weak_from_this()](boost::system::error_code ec, +- const tcp::resolver::iterator& /*endpoint*/) { ++ tcp::resolver::results_type::iterator /*endpoint*/) { + if(ec) { + log_error("Server connection", ec); + return; +@@ -301,7 +301,7 @@ class tls_proxy_session final : public std::enable_shared_from_this<tls_proxy_se + return; + } + }; +- async_connect(m_server_socket, m_server_endpoints, onConnect); ++ async_connect(m_server_socket, m_server_endpoints.begin(), m_server_endpoints.end(), onConnect); + } + + void tls_session_established(const Botan::TLS::Session_Summary& session) override { +@@ -315,9 +315,9 @@ class tls_proxy_session final : public std::enable_shared_from_this<tls_proxy_se + } + } + +- boost::asio::io_service::strand m_strand; ++ boost::asio::io_context::strand m_strand; + +- tcp::resolver::iterator m_server_endpoints; ++ tcp::resolver::results_type m_server_endpoints; + + tcp::socket m_client_socket; + tcp::socket m_server_socket; +@@ -341,9 +341,9 @@ class tls_proxy_server final { + public: + typedef tls_proxy_session session; + +- tls_proxy_server(boost::asio::io_service& io, ++ tls_proxy_server(boost::asio::io_context& io, + unsigned short port, +- tcp::resolver::iterator endpoints, ++ tcp::resolver::results_type endpoints, + std::shared_ptr<Botan::Credentials_Manager> creds, + std::shared_ptr<Botan::TLS::Policy> policy, + std::shared_ptr<Botan::TLS::Session_Manager> session_mgr, +@@ -383,7 +383,7 @@ class tls_proxy_server final { + } + + tcp::acceptor m_acceptor; +- tcp::resolver::iterator m_server_endpoints; ++ tcp::resolver::results_type m_server_endpoints; + + std::shared_ptr<Botan::Credentials_Manager> m_creds; + std::shared_ptr<Botan::TLS::Policy> m_policy; +@@ -429,10 +429,10 @@ class TLS_Proxy final : public Command { + + auto policy = load_tls_policy(get_arg("policy")); + +- boost::asio::io_service io; ++ boost::asio::io_context io; + + tcp::resolver resolver(io); +- auto server_endpoint_iterator = resolver.resolve({target, target_port}); ++ auto server_endpoint_iterator = resolver.resolve(target, target_port); + + std::shared_ptr<Botan::TLS::Session_Manager> session_mgr; + +--- a/src/lib/utils/socket/socket.cpp ++++ b/src/lib/utils/socket/socket.cpp +@@ -46,20 +46,19 @@ class Asio_Socket final : public OS::Socket { + public: + Asio_Socket(std::string_view hostname, std::string_view service, std::chrono::milliseconds timeout) : + m_timeout(timeout), m_timer(m_io), m_tcp(m_io) { +- m_timer.expires_from_now(m_timeout); ++ m_timer.expires_after(m_timeout); + check_timeout(); + + boost::asio::ip::tcp::resolver resolver(m_io); +- boost::asio::ip::tcp::resolver::query query(std::string{hostname}, std::string{service}); +- boost::asio::ip::tcp::resolver::iterator dns_iter = resolver.resolve(query); ++ boost::asio::ip::tcp::resolver::results_type dns_iter = resolver.resolve(std::string{hostname}, std::string{service}); + + boost::system::error_code ec = boost::asio::error::would_block; + +- auto connect_cb = [&ec](const boost::system::error_code& e, const boost::asio::ip::tcp::resolver::iterator&) { ++ auto connect_cb = [&ec](const boost::system::error_code& e, boost::asio::ip::tcp::resolver::results_type::iterator) { + ec = e; + }; + +- boost::asio::async_connect(m_tcp, dns_iter, connect_cb); ++ boost::asio::async_connect(m_tcp, dns_iter.begin(), dns_iter.end(), connect_cb); + + while(ec == boost::asio::error::would_block) { + m_io.run_one(); +@@ -74,7 +73,7 @@ class Asio_Socket final : public OS::Socket { + } + + void write(const uint8_t buf[], size_t len) override { +- m_timer.expires_from_now(m_timeout); ++ m_timer.expires_after(m_timeout); + + boost::system::error_code ec = boost::asio::error::would_block; + +@@ -90,7 +89,7 @@ class Asio_Socket final : public OS::Socket { + } + + size_t read(uint8_t buf[], size_t len) override { +- m_timer.expires_from_now(m_timeout); ++ m_timer.expires_after(m_timeout); + + boost::system::error_code ec = boost::asio::error::would_block; + size_t got = 0; +@@ -116,7 +115,7 @@ class Asio_Socket final : public OS::Socket { + + private: + void check_timeout() { +- if(m_tcp.is_open() && m_timer.expires_at() < std::chrono::system_clock::now()) { ++ if(m_tcp.is_open() && m_timer.expiry() < std::chrono::system_clock::now()) { + boost::system::error_code err; + + // NOLINTNEXTLINE(bugprone-unused-return-value,cert-err33-c) +@@ -127,7 +126,7 @@ class Asio_Socket final : public OS::Socket { + } + + const std::chrono::milliseconds m_timeout; +- boost::asio::io_service m_io; ++ boost::asio::io_context m_io; + boost::asio::system_timer m_timer; + boost::asio::ip::tcp::socket m_tcp; + }; +--- a/src/lib/utils/socket/socket_udp.cpp ++++ b/src/lib/utils/socket/socket_udp.cpp +@@ -46,20 +46,19 @@ class Asio_SocketUDP final : public OS::SocketUDP { + public: + Asio_SocketUDP(std::string_view hostname, std::string_view service, std::chrono::microseconds timeout) : + m_timeout(timeout), m_timer(m_io), m_udp(m_io) { +- m_timer.expires_from_now(m_timeout); ++ m_timer.expires_after(m_timeout); + check_timeout(); + + boost::asio::ip::udp::resolver resolver(m_io); +- boost::asio::ip::udp::resolver::query query(std::string{hostname}, std::string{service}); +- boost::asio::ip::udp::resolver::iterator dns_iter = resolver.resolve(query); ++ boost::asio::ip::udp::resolver::results_type dns_iter = resolver.resolve(std::string{hostname}, std::string{service}); + + boost::system::error_code ec = boost::asio::error::would_block; + +- auto connect_cb = [&ec](const boost::system::error_code& e, const boost::asio::ip::udp::resolver::iterator&) { ++ auto connect_cb = [&ec](const boost::system::error_code& e, boost::asio::ip::udp::resolver::results_type::iterator) { + ec = e; + }; + +- boost::asio::async_connect(m_udp, dns_iter, connect_cb); ++ boost::asio::async_connect(m_udp, dns_iter.begin(), dns_iter.end(), connect_cb); + + while(ec == boost::asio::error::would_block) { + m_io.run_one(); +@@ -74,7 +73,7 @@ class Asio_SocketUDP final : public OS::SocketUDP { + } + + void write(const uint8_t buf[], size_t len) override { +- m_timer.expires_from_now(m_timeout); ++ m_timer.expires_after(m_timeout); + + boost::system::error_code ec = boost::asio::error::would_block; + +@@ -90,7 +89,7 @@ class Asio_SocketUDP final : public OS::SocketUDP { + } + + size_t read(uint8_t buf[], size_t len) override { +- m_timer.expires_from_now(m_timeout); ++ m_timer.expires_after(m_timeout); + + boost::system::error_code ec = boost::asio::error::would_block; + size_t got = 0; +@@ -116,7 +115,7 @@ class Asio_SocketUDP final : public OS::SocketUDP { + + private: + void check_timeout() { +- if(m_udp.is_open() && m_timer.expires_at() < std::chrono::system_clock::now()) { ++ if(m_udp.is_open() && m_timer.expiry() < std::chrono::system_clock::now()) { + boost::system::error_code err; + + // NOLINTNEXTLINE(bugprone-unused-return-value,cert-err33-c) +@@ -127,7 +126,7 @@ class Asio_SocketUDP final : public OS::SocketUDP { + } + + const std::chrono::microseconds m_timeout; +- boost::asio::io_service m_io; ++ boost::asio::io_context m_io; + boost::asio::system_timer m_timer; + boost::asio::ip::udp::socket m_udp; + }; + +From 3820f357017eacef1fcb5119582bc9789b88f6c2 Mon Sep 17 00:00:00 2001 +From: Jack Lloyd <jack@randombit.net> +Date: Wed, 18 Dec 2024 17:10:34 -0500 +Subject: [PATCH 2/2] Address review comments + +--- a/src/cli/tls_proxy.cpp ++++ b/src/cli/tls_proxy.cpp +@@ -287,7 +287,7 @@ class tls_proxy_session final : public std::enable_shared_from_this<tls_proxy_se + + void tls_session_activated() override { + auto onConnect = [self = weak_from_this()](boost::system::error_code ec, +- tcp::resolver::results_type::iterator /*endpoint*/) { ++ const tcp::resolver::results_type::iterator& /*endpoint*/) { + if(ec) { + log_error("Server connection", ec); + return; +--- a/src/examples/tls_stream_client.cpp ++++ b/src/examples/tls_stream_client.cpp +@@ -35,7 +35,7 @@ class Credentials_Manager : public Botan::Credentials_Manager { + class client { + public: + client(boost::asio::io_context& io_context, +- boost::asio::ip::tcp::resolver::iterator endpoint_iterator, ++ const boost::asio::ip::tcp::resolver::results_type& endpoints, + std::string_view host, + const http::request<http::string_body>& req) : + m_request(req), +@@ -46,7 +46,8 @@ class client { + host)), + m_stream(io_context, m_ctx) { + boost::asio::async_connect(m_stream.lowest_layer(), +- std::move(endpoint_iterator), ++ endpoints.begin(), ++ endpoints.end(), + boost::bind(&client::handle_connect, this, ap::error)); + } + +@@ -111,8 +112,7 @@ int main(int argc, char* argv[]) { + boost::asio::io_context io_context; + + boost::asio::ip::tcp::resolver resolver(io_context); +- boost::asio::ip::tcp::resolver::query query(host, port); +- boost::asio::ip::tcp::resolver::iterator iterator = resolver.resolve(query); ++ boost::asio::ip::tcp::resolver::results_type endpoints = resolver.resolve(host, port); + + http::request<http::string_body> req; + req.version(11); +@@ -121,7 +121,7 @@ int main(int argc, char* argv[]) { + req.set(http::field::host, host); + req.set(http::field::user_agent, Botan::version_string()); + +- client c(io_context, iterator, host, req); ++ client c(io_context, endpoints, host, req); + + io_context.run(); + } catch(std::exception& e) { +--- a/src/lib/utils/socket/socket.cpp ++++ b/src/lib/utils/socket/socket.cpp +@@ -50,13 +50,12 @@ class Asio_Socket final : public OS::Socket { + check_timeout(); + + boost::asio::ip::tcp::resolver resolver(m_io); +- boost::asio::ip::tcp::resolver::results_type dns_iter = resolver.resolve(std::string{hostname}, std::string{service}); ++ boost::asio::ip::tcp::resolver::results_type dns_iter = ++ resolver.resolve(std::string{hostname}, std::string{service}); + + boost::system::error_code ec = boost::asio::error::would_block; + +- auto connect_cb = [&ec](const boost::system::error_code& e, boost::asio::ip::tcp::resolver::results_type::iterator) { +- ec = e; +- }; ++ auto connect_cb = [&ec](const boost::system::error_code& e, const auto&) { ec = e; }; + + boost::asio::async_connect(m_tcp, dns_iter.begin(), dns_iter.end(), connect_cb); + +--- a/src/lib/utils/socket/socket_udp.cpp ++++ b/src/lib/utils/socket/socket_udp.cpp +@@ -50,13 +50,13 @@ class Asio_SocketUDP final : public OS::SocketUDP { + check_timeout(); + + boost::asio::ip::udp::resolver resolver(m_io); +- boost::asio::ip::udp::resolver::results_type dns_iter = resolver.resolve(std::string{hostname}, std::string{service}); ++ boost::asio::ip::udp::resolver::results_type dns_iter = ++ resolver.resolve(std::string{hostname}, std::string{service}); + + boost::system::error_code ec = boost::asio::error::would_block; + +- auto connect_cb = [&ec](const boost::system::error_code& e, boost::asio::ip::udp::resolver::results_type::iterator) { +- ec = e; +- }; ++ auto connect_cb = [&ec](const boost::system::error_code& e, ++ const boost::asio::ip::udp::resolver::results_type::iterator&) { ec = e; }; + + boost::asio::async_connect(m_udp, dns_iter.begin(), dns_iter.end(), connect_cb); + + diff --git a/dev-libs/botan/files/botan-3.6.1-no-avx2.patch b/dev-libs/botan/files/botan-3.6.1-no-avx2.patch new file mode 100644 index 000000000000..b72e23c5d6d9 --- /dev/null +++ b/dev-libs/botan/files/botan-3.6.1-no-avx2.patch @@ -0,0 +1,29 @@ +https://bugs.gentoo.org/946821 +https://github.com/randombit/botan/issues/4493 +https://github.com/randombit/botan/pull/4494 + +From 07d0556e03c4a2f96c0e26073523b944b86cdfc5 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ren=C3=A9=20Meusel?= <rene.meusel@rohde-schwarz.com> +Date: Mon, 23 Dec 2024 09:29:07 +0100 +Subject: [PATCH] FIX: SM4 GFNI needs AVX2 + +closes #4493 +--- + src/lib/block/sm4/sm4_gfni/info.txt | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/lib/block/sm4/sm4_gfni/info.txt b/src/lib/block/sm4/sm4_gfni/info.txt +index 4c5867f9b72..1ec736e7cd4 100644 +--- a/src/lib/block/sm4/sm4_gfni/info.txt ++++ b/src/lib/block/sm4/sm4_gfni/info.txt +@@ -7,6 +7,10 @@ name -> "SM4 GFNI" + brief -> "SM4 using Intel GFNI" + </module_info> + ++<requires> ++simd_avx2 ++</requires> ++ + <isa> + gfni + </isa> diff --git a/dev-libs/botan/files/botan-3.6.1-tests-glibcxx_assertions.patch b/dev-libs/botan/files/botan-3.6.1-tests-glibcxx_assertions.patch new file mode 100644 index 000000000000..204adbc15825 --- /dev/null +++ b/dev-libs/botan/files/botan-3.6.1-tests-glibcxx_assertions.patch @@ -0,0 +1,40 @@ +https://github.com/randombit/botan/issues/4491 +https://github.com/randombit/botan/commit/3e0cb45cc94764e3ff221ceb141421a83eb27aef + +From 3e0cb45cc94764e3ff221ceb141421a83eb27aef Mon Sep 17 00:00:00 2001 +From: Jack Lloyd <jack@randombit.net> +Date: Mon, 28 Oct 2024 18:13:52 -0400 +Subject: [PATCH] Workaround apparent libstdc++ bug in Ubuntu 24.04 + +The iterator checks failed when we attempted to use first to extract +ideal_granularity bytes out of dummy_buffer, but on testing it failed +exactly when ideal_granularity was 256 bytes, the same size as +dummy_buffer itself. + +Increase the size and add an assert that the buffer is large enough. +--- + src/tests/test_ffi.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/tests/test_ffi.cpp b/src/tests/test_ffi.cpp +index 647e6ad10b..592435b142 100644 +--- a/src/tests/test_ffi.cpp ++++ b/src/tests/test_ffi.cpp +@@ -1381,7 +1381,7 @@ class FFI_AEAD_Test final : public FFI_Test { + std::vector<uint8_t> ciphertext(ideal_granularity * pt_multiplier + taglen); + TEST_FFI_OK(botan_rng_get, (rng, plaintext.data(), plaintext.size())); + +- std::vector<uint8_t> dummy_buffer(256); ++ std::vector<uint8_t> dummy_buffer(1024); + TEST_FFI_OK(botan_rng_get, (rng, dummy_buffer.data(), dummy_buffer.size())); + std::vector<uint8_t> dummy_buffer_reference = dummy_buffer; + +@@ -1405,6 +1405,7 @@ class FFI_AEAD_Test final : public FFI_Test { + // input if there is no space in the output buffer. Even when + // the cipher is a mode that won't produce any output until the + // entire message is processed. Hence, give it some dummy buffer. ++ BOTAN_ASSERT_NOMSG(dummy_buffer.size() > ideal_granularity); + auto ct_chunk = (requires_entire_message) ? std::span(dummy_buffer).first(ideal_granularity) + : ct_stuffer.first(ideal_granularity); + + diff --git a/dev-libs/c-blosc2/Manifest b/dev-libs/c-blosc2/Manifest index 3da20037bc96..e08104970cfe 100644 --- a/dev-libs/c-blosc2/Manifest +++ b/dev-libs/c-blosc2/Manifest @@ -1 +1 @@ -DIST c-blosc2-2.15.1.gh.tar.gz 3203267 BLAKE2B 0009afc8e9357a9d9787a60ee549bb21d68e952ca076f529add0f67500f2055a43463b3d612b600197579fd640b937024070508cb92b911d77e8ff4d8c7f16e5 SHA512 56e7395297ce8e336b2e881bf4dae169268ef19328bae8c037aa297696f723196f65eb3f66c03728d1c6492b768e17ad586f8aae29c9033b571f736d391e9ab9 +DIST c-blosc2-2.15.2.gh.tar.gz 3174873 BLAKE2B f656b81689ff30c54fd977e3652c8ee4a74320f2b4d9e2b25aa909254ed6f94021cebc63c6ddc1878a0125f97b56fc6583152c3cfae445adc976149e2449d69f SHA512 6208c2cfdd19eedada0b3a264229b1f17dee09280a66ce7d22dfcee80fe320a6cd68b5cc64994852316b7987f319284a5de70d043feb84f3d756b3ef30b723f7 diff --git a/dev-libs/c-blosc2/c-blosc2-2.15.1.ebuild b/dev-libs/c-blosc2/c-blosc2-2.15.2.ebuild index d8b4572f42ed..d8b4572f42ed 100644 --- a/dev-libs/c-blosc2/c-blosc2-2.15.1.ebuild +++ b/dev-libs/c-blosc2/c-blosc2-2.15.2.ebuild diff --git a/dev-libs/capnproto/Manifest b/dev-libs/capnproto/Manifest index 84e5ab808603..f37f2c7fc98f 100644 --- a/dev-libs/capnproto/Manifest +++ b/dev-libs/capnproto/Manifest @@ -1,3 +1,4 @@ DIST capnproto-0.10.2.tar.gz 2279393 BLAKE2B d78442bc122bc976fb636dfde694e10414bf3468ead903fac7ba59cbd81a49ce94969954fdc90f92f7f58f0af80f2da1f70de9b461d99fc6ae9a9e7aa9cd0500 SHA512 079ab715ea19ac207f72bb4874ab6362c11dfb9128342ec937e3f4d27e4100530cf9e6a0275eaca1e45a1bb706b65179a526ea8cfceba93bb36cd6c4f1c0cf5b DIST capnproto-0.10.4.tar.gz 2280389 BLAKE2B 3a893b766302a96df71763613fa1624f6b7229b8926099d1d9c217f4a1817db16aa24d3bec7950e480da6b027bd9b6b0b5a4083e982e7bda8fc6594794fd379a SHA512 6179a202399f4391014827799c954e0b3ad811ab82ebd0addc01d8c7695b9c1a9c0a0c26b018cd392e3731e12b30cca58545459d1b3a140e86e34b75d7eacbc7 DIST capnproto-0.9.1.tar.gz 2238849 BLAKE2B f8de56c7f79b0ddad35f3e8fec7740510ca2328e4ddc633a71420901d3fc44df44d807c3965213dfc2535bbe03832c5164242d33cd0bff901d6f288fb62bab21 SHA512 bdc5960f26214139744d768ca4558b085e2d359c375a8849ca532a4c458a2daf0ee1a1f4d00745de5abf353aa1e4084a2d85e5523006f23f591f21fac2d847fd +DIST capnproto-1.0.2.tar.gz 2412146 BLAKE2B c4f519ced618cd7473194fce9fae96cce22abf2ee4a30f4fd8550e82875727cb8f9c420bd8faba71190bf05870b82e4ff2e74729c7bc2e2e255163e9e764f8d3 SHA512 56551ecad52cf06e5dd52401e6d848eae41126c6ba2bb31a9ec1c82e1b47e0e6171d69db923c118c614aec0d396ddf35724081cccef3a605c39d0b5379a2c03e diff --git a/dev-libs/capnproto/capnproto-1.0.2.ebuild b/dev-libs/capnproto/capnproto-1.0.2.ebuild new file mode 100644 index 000000000000..5682e6778538 --- /dev/null +++ b/dev-libs/capnproto/capnproto-1.0.2.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake flag-o-matic + +DESCRIPTION="RPC/Serialization system with capabilities support" +HOMEPAGE="https://capnproto.org" +SRC_URI="https://github.com/sandstorm-io/capnproto/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}"/${P}/c++ + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86" +IUSE="+ssl test zlib" +RESTRICT="!test? ( test )" + +RDEPEND=" + ssl? ( dev-libs/openssl:= ) + zlib? ( sys-libs/zlib:= ) +" +DEPEND=" + ${RDEPEND} + test? ( dev-cpp/gtest ) +" + +src_configure() { + append-atomic-flags + if [[ ${LIBS} == *atomic* ]] ; then + # append-libs won't work here, cmake doesn't respect it + # ... and ldflags gets missed once + append-flags -latomic + fi + + local mycmakeargs=( + -DBUILD_TESTING=$(usex test) + -DWITH_OPENSSL=$(usex ssl) + -DWITH_ZLIB=$(usex zlib) + ) + + cmake_src_configure +} + +src_test() { + cmake_build check +} diff --git a/dev-libs/capstone/Manifest b/dev-libs/capstone/Manifest index f3e37db537f8..28560cbb1f8b 100644 --- a/dev-libs/capstone/Manifest +++ b/dev-libs/capstone/Manifest @@ -1,3 +1,2 @@ -DIST capstone-5.0.1.tar.gz 7654195 BLAKE2B 83f6681d4c9c748df00daf59f7b33637ab72eee661261c22acae40a6db2def70bb6b5339d731244fdbae6f1e1b0b5b22bb6f60c1390a1bebceb97b3f810aedb0 SHA512 350aba77ce2d96b5c25764913591ba80e4497177ae0a8b2c820c6755ee8310848fbfc54e7ccac27fafc2dbc6778118ad92c53d1b5cb601d4fa146dec7d7e11e5 DIST capstone-5.0.3.tar.gz 7650875 BLAKE2B 3750964a95cbaba685dfb5cf511f12d18f2c157fb622a15c4615734987b8a49ffacf021457f36302606ccf9055e45a7fc56af000b8f09df467922896b431537c SHA512 2fd3194dd37065e6091d208c7670b12c0ca6872931eef794bd6b2dd624601c843e8ee6c5714eae0372e394e91a9bc1e4de7dfea6b1087542dd461226569101de -DIST capstone-6.0.0_alpha1.tar.gz 9929667 BLAKE2B 2a32026b943759e2c9d5dfa52c176112f6fcbfda0d1b64349bc2f4a587e41d929cd1a23e17ac94d8eb92e277878b1e1da671fd10dea2e7b43fc2361518f60504 SHA512 f95da568693b8bfe350c366ecd90b406754c3cfb9ac2ece772b67edf01aded5cb88d1b1190c6ec39c99506e50d89d93e33af8cb2892c03f6555d4eb39fc2d531 +DIST capstone-6.0.0_alpha2.tar.gz 10158754 BLAKE2B cbd2a337f53ce3d69501b3f3859f8c2f97f613c96d1f32fe74856ee9eb716ecca0ad6cbbd23c4c9cf7cfa111c9f2f4e24bd222de0773f42dc15b014c179502d5 SHA512 6f5dc2baaa3d26ba1c1f487a91167395110614004f72d66aa3b0656098d46fffd7f79a9fef0fb861c0cf12dd88e53d3989bbcf74851fdd480af69bf81d6017e1 diff --git a/dev-libs/capstone/capstone-5.0.1.ebuild b/dev-libs/capstone/capstone-5.0.1.ebuild deleted file mode 100644 index 0f09dd8b9584..000000000000 --- a/dev-libs/capstone/capstone-5.0.1.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..13} ) -DISTUTILS_EXT=1 -DISTUTILS_OPTIONAL=1 -DISTUTILS_USE_PEP517=setuptools - -inherit cmake distutils-r1 toolchain-funcs - -DESCRIPTION="disassembly/disassembler framework + bindings" -HOMEPAGE="https://www.capstone-engine.org/" - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/capstone-engine/capstone.git" - EGIT_REPO_BRANCH="next" -else - MY_PV="${PV/_rc/-rc}" - SRC_URI="https://github.com/capstone-engine/capstone/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${PN}-${MY_PV}" - KEYWORDS="~alpha amd64 ~arm ~arm64 ~loong ~ppc ppc64 ~riscv x86" -fi - -LICENSE="BSD" -SLOT="0/5" # libcapstone.so.5 - -IUSE="python static-libs test" -RDEPEND="python? ( ${PYTHON_DEPS} )" -DEPEND="${RDEPEND} - python? ( dev-python/setuptools[${PYTHON_USEDEP}] ) -" -BDEPEND="${DISTUTILS_DEPS}" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RESTRICT="!test? ( test )" - -if [[ ${PV} == *_rc* ]]; then - # Upstream doesn't flag release candidates (bug 858350) - QA_PKGCONFIG_VERSION="" -fi - -wrap_python() { - local phase=$1 - shift - - if use python; then - pushd bindings/python >/dev/null || die - distutils-r1_${phase} "$@" - popd >/dev/null || die - fi -} - -src_prepare() { - tc-export RANLIB - cmake_src_prepare - - wrap_python ${FUNCNAME} -} - -src_configure() { - local mycmakeargs=( - -DCAPSTONE_BUILD_TESTS="$(usex test)" - ) - cmake_src_configure - - wrap_python ${FUNCNAME} -} - -src_compile() { - cmake_src_compile - - wrap_python ${FUNCNAME} -} - -src_test() { - cmake_src_test - - wrap_python ${FUNCNAME} -} - -src_install() { - cmake_src_install - - wrap_python ${FUNCNAME} - - if ! use static-libs ; then - find "${ED}" -name '*.a' -delete || die - fi -} - -python_test() { - emake check -} diff --git a/dev-libs/capstone/capstone-5.0.3.ebuild b/dev-libs/capstone/capstone-5.0.3.ebuild index f971451e9567..848e72e3face 100644 --- a/dev-libs/capstone/capstone-5.0.3.ebuild +++ b/dev-libs/capstone/capstone-5.0.3.ebuild @@ -21,7 +21,7 @@ else MY_PV="${PV/_rc/-rc}" SRC_URI="https://github.com/capstone-engine/capstone/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${PN}-${MY_PV}" - KEYWORDS="~alpha amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv x86" + KEYWORDS="~alpha amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86" fi LICENSE="BSD" diff --git a/dev-libs/capstone/capstone-6.0.0_alpha1.ebuild b/dev-libs/capstone/capstone-6.0.0_alpha2.ebuild index 8d6006b4688e..83121174ce92 100644 --- a/dev-libs/capstone/capstone-6.0.0_alpha1.ebuild +++ b/dev-libs/capstone/capstone-6.0.0_alpha2.ebuild @@ -32,7 +32,7 @@ fi LICENSE="BSD" SLOT="0/6" # libcapstone.so.6 -IUSE="python static-libs test" +IUSE="python static-libs" RDEPEND="python? ( ${PYTHON_DEPS} )" DEPEND="${RDEPEND} python? ( dev-python/setuptools[${PYTHON_USEDEP}] ) @@ -40,8 +40,6 @@ DEPEND="${RDEPEND} BDEPEND="${DISTUTILS_DEPS}" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" -RESTRICT="!test? ( test )" - PATCHES=( # Currently "-Werror" is only added in the `next`-development branch, but # not merged into 5.* releases. Eventually this patch may be needed in the @@ -74,8 +72,8 @@ src_prepare() { src_configure() { local mycmakeargs=( - -DBUILD_SHARED_LIBS=true - -DCAPSTONE_BUILD_STATIC_RUNTIME=false + -DCAPSTONE_BUILD_SHARED_LIBS=true + -DCAPSTONE_BUILD_STATIC_LIBS=false ) cmake_src_configure diff --git a/dev-libs/capstone/capstone-9999.ebuild b/dev-libs/capstone/capstone-9999.ebuild index 8d6006b4688e..83121174ce92 100644 --- a/dev-libs/capstone/capstone-9999.ebuild +++ b/dev-libs/capstone/capstone-9999.ebuild @@ -32,7 +32,7 @@ fi LICENSE="BSD" SLOT="0/6" # libcapstone.so.6 -IUSE="python static-libs test" +IUSE="python static-libs" RDEPEND="python? ( ${PYTHON_DEPS} )" DEPEND="${RDEPEND} python? ( dev-python/setuptools[${PYTHON_USEDEP}] ) @@ -40,8 +40,6 @@ DEPEND="${RDEPEND} BDEPEND="${DISTUTILS_DEPS}" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" -RESTRICT="!test? ( test )" - PATCHES=( # Currently "-Werror" is only added in the `next`-development branch, but # not merged into 5.* releases. Eventually this patch may be needed in the @@ -74,8 +72,8 @@ src_prepare() { src_configure() { local mycmakeargs=( - -DBUILD_SHARED_LIBS=true - -DCAPSTONE_BUILD_STATIC_RUNTIME=false + -DCAPSTONE_BUILD_SHARED_LIBS=true + -DCAPSTONE_BUILD_STATIC_LIBS=false ) cmake_src_configure diff --git a/dev-libs/castxml/Manifest b/dev-libs/castxml/Manifest index 0575492df556..087b47c3269d 100644 --- a/dev-libs/castxml/Manifest +++ b/dev-libs/castxml/Manifest @@ -1 +1 @@ -DIST CastXML-0.6.8.tar.gz 122609 BLAKE2B 3266535a2f08e4aa3c344f2d26cb0b98ba5d3736036ba95face5a603bbc9547a53647892e1f11cf748d954c556bec2099a734a9b9e566254186e9765c0410413 SHA512 7645286ef7fe89ebd1d582a289f9446a96f9aa6db89539314cc2a77bd005ca203d0346f5b4f7d14b83baefc41e0a2a8e55585b429985777cff6c3c0ffc1ef6ce +DIST CastXML-0.6.10.tar.gz 123149 BLAKE2B c69caf043bdf733cbc519109ba0e2c675f169fbcbf3fe4d4c13c509fcd01838eab9e71b69369f152c7c3d41d48e73f8c1288091cd8addcefdb04de254f79ce0a SHA512 40d16714600f20f94d2b2da6d0021665f5115faf25d3d92d76b320fd8167f093991ad6e36ce0cbf9979d5ab265f246018f609f4b96a46b115bed411d398937cc diff --git a/dev-libs/castxml/castxml-0.6.8.ebuild b/dev-libs/castxml/castxml-0.6.10.ebuild index b3642228052d..c14f26f131bb 100644 --- a/dev-libs/castxml/castxml-0.6.8.ebuild +++ b/dev-libs/castxml/castxml-0.6.10.ebuild @@ -24,7 +24,7 @@ RESTRICT="!test? ( test )" DEPEND=" $(llvm_gen_dep ' - sys-devel/clang:${LLVM_SLOT}= + llvm-core/clang:${LLVM_SLOT}= ') " RDEPEND=" diff --git a/dev-libs/cdk/Manifest b/dev-libs/cdk/Manifest index 3ad50fa1d50a..a298a2d03d0e 100644 --- a/dev-libs/cdk/Manifest +++ b/dev-libs/cdk/Manifest @@ -2,3 +2,7 @@ DIST cdk-5.0-20230201.tgz 533972 BLAKE2B 8667583ea1401ab04dc43dbd93f8580ee898c35 DIST cdk-5.0-20230201.tgz.asc 729 BLAKE2B 9076836bb6fd8f89ad4c474b7fc2beb3fa9fd16a3c2d530ce34052af65231e2d77f3879d02ca031be6a7bdac6bba29f40bac3320fc513fc3ba5e617316184ed4 SHA512 85e80c49049da9cd335013e564fd15929a127b3fec24bdb50d153196b47f4092c353a7bd6a40211566a7f4d09701cc75d66f9b3b32fed50c6b728e17dc7a166a DIST cdk-5.0-20240331.tgz 538287 BLAKE2B 0d4e3b8d04056aa658e94a29a836cdc4f82c2281783c11eb74715724befe983954b14ae9aae4dd4e17e772d711becb798107e910234aba02fe626e004ef6f216 SHA512 dfd5a038ec839e7cfe8850d41bace4cf34b44cf7a52c60912838051a959ecd6b2077a29b1dc152425ce518f5c578236bfa4d6736eaa096727e08bd16785d4d34 DIST cdk-5.0-20240331.tgz.asc 729 BLAKE2B 108697e54bbc335cb8aa8e3c4d29fdaffb2a3d8a05f9608f8f5e87ab0cd7ffae74ad9b70ef1dec10cda859e515a19de35b25dbed72dfd185aebab7f92a61153f SHA512 923ecf8ede1b799d6c91220d10f3f4721ac049ee9d0e1716751a4c607fd9e19c67745a202e1cef910821e2c68955733e22e7ef2e6624a9f03fd6fd8e165272b8 +DIST cdk-5.0-20240619.tgz 547275 BLAKE2B c43689561f2338382c9defe9cd5b1d2b26672396ba973e1a7192311c2725a976f7e2c8d2ed25ec15ef64cc20ca677078cb162f4060bc1c4f99508c1a1df50bcb SHA512 13f15a53142167352f9b4e6ebd7d49cc2b4c209c36b53422f04d640bd652d33928e55af47f8e02a54a668e89f5df94245008b2a3466fdeae683224582f9a8919 +DIST cdk-5.0-20240619.tgz.asc 729 BLAKE2B 35113c83dbd649ec67a4b3c97d769f98650f5489536894f0111c5f492cd9a9bac387514cf231806f5e35ccd329c38b9a817fe5915ecdcf7c3959a2eddb1bc926 SHA512 fffebaed05ff032b83196bb9e186636bbe5d661a02a1736bc7a70bda8a5efb474fa91da1610852cb327f49701d0c1dc33214e911e3514d15bd512fd4d3ac6f2f +DIST cdk-5.0-20250116.tgz 549798 BLAKE2B 5509f5ce311f9cc0d3e833d18f9d434f0cd88b8106d9ffcce03b9203d63796089e1d67ac566ffc26a61f3e335a6327f48a0662959d5f497ee94f72e7970fed9a SHA512 d86a26fcce3f2b23c86138b0e620bafcae4ac63d1932f58c074a5e96b8eb856be1a858e190c6563d2986b92f9e770e5d0bd7c3d872f31880ceba41f9eb1754a2 +DIST cdk-5.0-20250116.tgz.asc 729 BLAKE2B 1d624eeb1071d3ed1b6174941fa5059ae35f7208b8e213bb9cb6d3cf1210d8c62fc7fa7217c13324591e21325a199c6abf09a5afa37ff3d6b38bb280d4b146f8 SHA512 643e3bf1aa71873341a4455626fd284d80be261abfc694dbc93c07c62ce9e8dde38b690c196b780e697c39d44b53dde038543b95615ead1a05364c334f2b152d diff --git a/dev-libs/cdk/cdk-5.0.20240331.ebuild b/dev-libs/cdk/cdk-5.0.20240331.ebuild index c60865d5feb5..7a2837499e80 100644 --- a/dev-libs/cdk/cdk-5.0.20240331.ebuild +++ b/dev-libs/cdk/cdk-5.0.20240331.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}"/${MY_P} LICENSE="MIT" SLOT="0/6" # subslot = soname version -KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="examples unicode" DEPEND="sys-libs/ncurses:=[unicode(+)?]" diff --git a/dev-libs/cdk/cdk-5.0.20240619-r1.ebuild b/dev-libs/cdk/cdk-5.0.20240619-r1.ebuild new file mode 100644 index 000000000000..b2fe41e7d07a --- /dev/null +++ b/dev-libs/cdk/cdk-5.0.20240619-r1.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_P="${PN}-$(ver_rs 2 -)" + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/thomasdickey.asc +inherit verify-sig + +DESCRIPTION="A library of curses widgets" +HOMEPAGE="https://dickey.his.com/cdk/cdk.html https://github.com/ThomasDickey/cdk-snapshots" +SRC_URI="https://invisible-island.net/archives/${PN}/${MY_P}.tgz" +SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/${PN}/${MY_P}.tgz.asc )" +S="${WORKDIR}"/${MY_P} + +LICENSE="MIT" +SLOT="0/6" # subslot = soname version +KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="examples unicode" + +DEPEND="sys-libs/ncurses:=[unicode(+)?]" +RDEPEND="${DEPEND}" +BDEPEND=" + virtual/pkgconfig + verify-sig? ( sec-keys/openpgp-keys-thomasdickey ) +" + +PATCHES=( + "${FILESDIR}/${PN}-5.0.20240619-xlib.patch" +) + +src_configure() { + if [[ ${CHOST} == *-*-darwin* ]] ; then + export ac_cv_prog_LIBTOOL=glibtool + fi + + # --with-libtool dropped for now because of broken Makefile + # bug #790773 + # + # Fedora and openSUSE at least both build with --enable-const. Without + # this, consumers end up broken like gphoto2 in bug #919279. + econf \ + --disable-rpath-hack \ + --enable-const \ + --with-shared \ + --with-pkg-config \ + --enable-pc-files \ + --with-pkg-config-libdir="${EPREFIX}/usr/$(get_libdir)/pkgconfig" \ + --with-ncurses$(usex unicode "w" "") +} + +src_install() { + # parallel make installs duplicate libs + emake -j1 \ + DESTDIR="${D}" \ + DOCUMENT_DIR="${ED}/usr/share/doc/${PF}" \ + install + + if use examples ; then + local x + for x in include c++ demos examples cli cli/utils cli/samples ; do + docinto ${x} + find ${x} -maxdepth 1 -mindepth 1 -type f -print0 | xargs -0 dodoc || die + done + fi + + find "${ED}" \( -name '*.a' -or -name '*.la' \) -delete || die +} diff --git a/dev-libs/cdk/cdk-5.0.20250116.ebuild b/dev-libs/cdk/cdk-5.0.20250116.ebuild new file mode 100644 index 000000000000..57e04aacc320 --- /dev/null +++ b/dev-libs/cdk/cdk-5.0.20250116.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_P="${PN}-$(ver_rs 2 -)" + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/thomasdickey.asc +inherit verify-sig + +DESCRIPTION="A library of curses widgets" +HOMEPAGE="https://dickey.his.com/cdk/cdk.html https://github.com/ThomasDickey/cdk-snapshots" +SRC_URI="https://invisible-island.net/archives/${PN}/${MY_P}.tgz" +SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/${PN}/${MY_P}.tgz.asc )" +S="${WORKDIR}"/${MY_P} + +LICENSE="MIT" +SLOT="0/6" # subslot = soname version +KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="examples unicode" + +DEPEND="sys-libs/ncurses:=[unicode(+)?]" +RDEPEND="${DEPEND}" +BDEPEND=" + virtual/pkgconfig + verify-sig? ( sec-keys/openpgp-keys-thomasdickey ) +" + +src_configure() { + if [[ ${CHOST} == *-*-darwin* ]] ; then + export ac_cv_prog_LIBTOOL=glibtool + fi + + # --with-libtool dropped for now because of broken Makefile + # bug #790773 + # + # Fedora and openSUSE at least both build with --enable-const. Without + # this, consumers end up broken like gphoto2 in bug #919279. + econf \ + --disable-rpath-hack \ + --enable-const \ + --with-shared \ + --with-pkg-config \ + --enable-pc-files \ + --with-pkg-config-libdir="${EPREFIX}/usr/$(get_libdir)/pkgconfig" \ + --with-ncurses$(usex unicode "w" "") +} + +src_install() { + # parallel make installs duplicate libs + emake -j1 \ + DESTDIR="${D}" \ + DOCUMENT_DIR="${ED}/usr/share/doc/${PF}" \ + install + + if use examples ; then + local x + for x in include c++ demos examples cli cli/utils cli/samples ; do + docinto ${x} + find ${x} -maxdepth 1 -mindepth 1 -type f -print0 | xargs -0 dodoc || die + done + fi + + find "${ED}" \( -name '*.a' -or -name '*.la' \) -delete || die +} diff --git a/dev-libs/cdk/files/cdk-5.0.20240619-xlib.patch b/dev-libs/cdk/files/cdk-5.0.20240619-xlib.patch new file mode 100644 index 000000000000..e346fd8e24f4 --- /dev/null +++ b/dev-libs/cdk/files/cdk-5.0.20240619-xlib.patch @@ -0,0 +1,28 @@ +https://bugs.gentoo.org/831226 + +lib name is depend on USE flag 'unicode', but for unknown reason, +upstream remove XLIB in release 5.0.20240619 (always -lcdk instead +of -lcdkw if unicode is enabled), which cause link failed if +USE="unicode". + +diff --git a/cdk-config.in b/cdk-config.in +index 19b2972..aa0b2c8 100644 +--- a/cdk-config.in ++++ b/cdk-config.in +@@ -41,6 +41,7 @@ same_prefix=yes + same_exec_prefix=yes + + THIS="@PACKAGE@" ++XLIB="@LIB_ROOTNAME@" + + [ $# = 0 ] && exec @SHELL@ "$0" --error + +@@ -66,7 +67,7 @@ while [ $# -gt 0 ]; do + + eval LDFLAGS='"@LDFLAGS@"' + eval LIBS='"@LIBS@"' +- LIBS="-l${THIS} $LIBS" ++ LIBS="-l${XLIB} $LIBS" + + # If the directory given by --libdir is not in the LDFLAGS+LIBS set, + # prepend it to LDFLAGS to help link this application's library. diff --git a/dev-libs/cdk/metadata.xml b/dev-libs/cdk/metadata.xml index f683d1054e8f..69097ea69330 100644 --- a/dev-libs/cdk/metadata.xml +++ b/dev-libs/cdk/metadata.xml @@ -1,7 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person" proxied="yes"> + <email>zhixu.liu@gmail.com</email> + <name>Z. Liu</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> <upstream> <changelog>https://dickey.his.com/cdk/CHANGES.html</changelog> <remote-id type="github">ThomasDickey/cdk-snapshots</remote-id> diff --git a/dev-libs/cgilib/cgilib-0.7-r2.ebuild b/dev-libs/cgilib/cgilib-0.7-r2.ebuild index 8c0584ac9a4b..ebcf11bf0124 100644 --- a/dev-libs/cgilib/cgilib-0.7-r2.ebuild +++ b/dev-libs/cgilib/cgilib-0.7-r2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://www.infodrom.org/projects/cgilib/download/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 ~s390 sparc x86" IUSE="static-libs" DOCS=( AUTHORS ChangeLog README cookies.txt ) diff --git a/dev-libs/check/check-0.15.2-r1.ebuild b/dev-libs/check/check-0.15.2-r1.ebuild index 728babb12861..4003f08cbde1 100644 --- a/dev-libs/check/check-0.15.2-r1.ebuild +++ b/dev-libs/check/check-0.15.2-r1.ebuild @@ -19,7 +19,7 @@ RESTRICT="ppc? ( test ) ppc64? ( test ) !test? ( test )" -RDEPEND="subunit? ( dev-python/subunit[${MULTILIB_USEDEP}] )" +RDEPEND="subunit? ( dev-python/python-subunit[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND} sys-apps/texinfo" BDEPEND="doc? ( app-text/doxygen )" diff --git a/dev-libs/concurrencykit/concurrencykit-0.7.2.ebuild b/dev-libs/concurrencykit/concurrencykit-0.7.2-r1.ebuild index e4db47d51ef1..e02b068bbbfc 100644 --- a/dev-libs/concurrencykit/concurrencykit-0.7.2.ebuild +++ b/dev-libs/concurrencykit/concurrencykit-0.7.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -21,10 +21,9 @@ KEYWORDS="amd64 ~arm ~arm64 ~riscv x86" # See bug #616762 for more information. RDEPEND="!sys-cluster/charm" -src_configure() { - # https://github.com/concurrencykit/ck/issues/200 - append-cflags -fno-strict-aliasing +PATCHES=( "${FILESDIR}/${PN}-0.7.2-strict-aliasing.patch" ) +src_configure() { tc-export AR CC LD local myeconfargs=( diff --git a/dev-libs/concurrencykit/files/concurrencykit-0.7.2-strict-aliasing.patch b/dev-libs/concurrencykit/files/concurrencykit-0.7.2-strict-aliasing.patch new file mode 100644 index 000000000000..457da38deef7 --- /dev/null +++ b/dev-libs/concurrencykit/files/concurrencykit-0.7.2-strict-aliasing.patch @@ -0,0 +1,24 @@ +From 4f1e5cc70889058e809984a30917ef1d88bdd63d Mon Sep 17 00:00:00 2001 +From: Samy Al Bahra <sbahra@fileshield.io> +Date: Fri, 10 Jan 2025 19:48:41 -0500 +Subject: [PATCH] regressions/ck_pr: fix type aliasing warning. + +Fixes #200 +--- + regressions/ck_pr/validate/ck_pr_store.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/regressions/ck_pr/validate/ck_pr_store.c b/regressions/ck_pr/validate/ck_pr_store.c +index e012b222..428655bc 100644 +--- a/regressions/ck_pr/validate/ck_pr_store.c ++++ b/regressions/ck_pr/validate/ck_pr_store.c +@@ -67,7 +67,8 @@ + { \ + uint##m##_t f = 0; \ + uint##w##_t j = (uint##w##_t)-1; \ +- ck_pr_store_##w((uint##w##_t *)(void *)&f, j); \ ++ void *f_p = &f; \ ++ ck_pr_store_##w((uint##w##_t *)f_p, j); \ + if (f != j) { \ + printf("FAIL [%#" PRIx##m " != %#" PRIx##w "]\n", f, j);\ + exit(EXIT_FAILURE); \ diff --git a/dev-libs/cpuinfo/Manifest b/dev-libs/cpuinfo/Manifest index 11981c5f1443..80cd9e1172ec 100644 --- a/dev-libs/cpuinfo/Manifest +++ b/dev-libs/cpuinfo/Manifest @@ -1,4 +1 @@ -DIST cpuinfo-2022.03.26.tar.gz 3503965 BLAKE2B 03607ea04de156907d230dc9f009d72bf6d36ae7391c190c68dbc3f9a4c395e8ec72f935f6ae032d6b1341432278df3aee6f9fe7f7cad1b82784ecec5084d373 SHA512 dbbe4f3e1d5ae74ffc8ba2cba0ab745a23f4993788f4947825ef5125dd1cbed3e13e0c98e020e6fcfa9879f54f06d7cba4de73ec29f77649b6a27b4ab82c8f1c -DIST cpuinfo-2022.08.19.tar.gz 3512624 BLAKE2B 909ebde6c522d514641dcbe16586bc972327b8564cb12fa6db25b8978a0a840e627154430f97dd37f024ea4f36a45db8ca5033e6e076390383dd9b35307bed5f SHA512 b3342ce0a1f842084ff53efdfd15c44586ac7cd36249211e2925d84aa1f33ee8d6f76cd62ea20e91d8b908c3c8afda5a47516008b69749504024b9813a623ee2 -DIST cpuinfo-2023.01.13.tar.gz 3513605 BLAKE2B eee9765f30b1dca6f39fb0b1f387f5e1cfaf544e5c9b256391aea913c5b67a012ef45f5afecfcda4a34ab64ca8da2f20e37db58cb4d463f8e312a04965cd40df SHA512 96bd11d3453e98cf1130f0862614e813861e20111655f8c472f29f17048a07d712b4f84b511760fdee995cf3d695112371af0c21cbd144ee3fb6fb6153dd2829 -DIST cpuinfo-2023.11.04.tar.gz 3516672 BLAKE2B 4f99781081ae7c0736bac35d8f589918be1466763d57d0b0661c7cdf8a24fccee61d87acae314714bad09da2a15d96d9725b7c2b7a6a9945bb320f96c31b3eb7 SHA512 02dd70f0b95c2cb6d8af4e33072f63f5d72d2314796033ae68bb6b37cb7db18d43dd2cdfedafc896dec0614dbeec9ab507f765f3d958fbda8c0ab3e3a191a87c +DIST cpuinfo-2024.10.22.1.tar.gz 3544638 BLAKE2B ba5f0fdc9e2910e51a14b656947ed36196c6cbc2e653b3699d6d1a998567ed3367044a8efe94b8d342352ecea481da492f2b6747e5e680abfd91804d2c8e27d2 SHA512 e98b8ca15b311dde460502ed5fed94688b3fcff08d0d5b860fc7213e598bd3d8e38b825206b911646aae47c0102fd9f69ab32c3f47bae4def451259503d9ca1b diff --git a/dev-libs/cpuinfo/cpuinfo-2022.03.26-r1.ebuild b/dev-libs/cpuinfo/cpuinfo-2022.03.26-r1.ebuild deleted file mode 100644 index fc964a2ae125..000000000000 --- a/dev-libs/cpuinfo/cpuinfo-2022.03.26-r1.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 2022-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -inherit cmake - -CommitId=b40bae27785787b6dd70788986fd96434cf90ae2 - -DESCRIPTION="CPU INFOrmation library" -HOMEPAGE="https://github.com/pytorch/cpuinfo/" -SRC_URI="https://github.com/pytorch/${PN}/archive/${CommitId}.tar.gz - -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" -IUSE="test" - -BDEPEND="test? ( dev-cpp/gtest )" -RESTRICT="!test? ( test )" - -S="${WORKDIR}"/${PN}-${CommitId} - -PATCHES=( - "${FILESDIR}"/${P}-gentoo.patch -) - -src_prepare() { - cmake_src_prepare - - # >=dev-cpp/gtest-1.13.0 depends on building with at least C++14 standard - sed -i -e 's/CXX_STANDARD 11/CXX_STANDARD 14/' \ - CMakeLists.txt || die "sed failed" -} - -src_configure() { - local mycmakeargs=( - -DCPUINFO_BUILD_BENCHMARKS=OFF - -DCPUINFO_BUILD_UNIT_TESTS=$(usex test ON OFF) - ) - cmake_src_configure -} diff --git a/dev-libs/cpuinfo/cpuinfo-2022.08.19.ebuild b/dev-libs/cpuinfo/cpuinfo-2022.08.19.ebuild deleted file mode 100644 index 07d77a29af2f..000000000000 --- a/dev-libs/cpuinfo/cpuinfo-2022.08.19.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 2022-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -inherit cmake - -CommitId=8ec7bd91ad0470e61cf38f618cc1f270dede599c - -DESCRIPTION="CPU INFOrmation library" -HOMEPAGE="https://github.com/pytorch/cpuinfo/" -SRC_URI="https://github.com/pytorch/${PN}/archive/${CommitId}.tar.gz - -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" -IUSE="test" - -BDEPEND="test? ( dev-cpp/gtest )" -RESTRICT="!test? ( test )" - -S="${WORKDIR}"/${PN}-${CommitId} - -PATCHES=( - "${FILESDIR}"/${PN}-2022.03.26-gentoo.patch -) - -src_prepare() { - cmake_src_prepare - - # >=dev-cpp/gtest-1.13.0 depends on building with at least C++14 standard - sed -i -e 's/CXX_STANDARD 11/CXX_STANDARD 14/' \ - CMakeLists.txt || die "sed failed" -} - -src_configure() { - local mycmakeargs=( - -DCPUINFO_BUILD_BENCHMARKS=OFF - -DCPUINFO_BUILD_UNIT_TESTS=$(usex test ON OFF) - ) - cmake_src_configure -} diff --git a/dev-libs/cpuinfo/cpuinfo-2023.01.13.ebuild b/dev-libs/cpuinfo/cpuinfo-2023.01.13.ebuild deleted file mode 100644 index 3b0ec9465234..000000000000 --- a/dev-libs/cpuinfo/cpuinfo-2023.01.13.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 2022-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -inherit cmake - -CommitId=6481e8bef08f606ddd627e4d3be89f64d62e1b8a - -DESCRIPTION="CPU INFOrmation library" -HOMEPAGE="https://github.com/pytorch/cpuinfo/" -SRC_URI="https://github.com/pytorch/${PN}/archive/${CommitId}.tar.gz - -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" -IUSE="test" - -BDEPEND="test? ( dev-cpp/gtest )" -RESTRICT="!test? ( test )" - -S="${WORKDIR}"/${PN}-${CommitId} - -PATCHES=( - "${FILESDIR}"/${PN}-2022.03.26-gentoo.patch - "${FILESDIR}"/${P}-test.patch -) - -src_prepare() { - cmake_src_prepare - - # >=dev-cpp/gtest-1.13.0 depends on building with at least C++14 standard - sed -i -e 's/CXX_STANDARD 11/CXX_STANDARD 14/' \ - CMakeLists.txt || die "sed failed" -} - -src_configure() { - local mycmakeargs=( - -DCPUINFO_BUILD_BENCHMARKS=OFF - -DCPUINFO_BUILD_UNIT_TESTS=$(usex test ON OFF) - ) - cmake_src_configure -} diff --git a/dev-libs/cpuinfo/cpuinfo-2023.11.04.ebuild b/dev-libs/cpuinfo/cpuinfo-2024.10.22.1.ebuild index 59286c83bde5..43cb3b1940fd 100644 --- a/dev-libs/cpuinfo/cpuinfo-2023.11.04.ebuild +++ b/dev-libs/cpuinfo/cpuinfo-2024.10.22.1.ebuild @@ -4,7 +4,7 @@ EAPI=8 inherit cmake -CommitId=d6860c477c99f1fce9e28eb206891af3c0e1a1d7 +CommitId=094fc30b9256f54dad5ad23bcbfb5de74781422f DESCRIPTION="CPU INFOrmation library" HOMEPAGE="https://github.com/pytorch/cpuinfo/" @@ -22,7 +22,7 @@ BDEPEND="test? ( dev-cpp/gtest )" RESTRICT="!test? ( test )" PATCHES=( - "${FILESDIR}"/${P}-gentoo.patch + "${FILESDIR}"/${PN}-2023.11.04-gentoo.patch "${FILESDIR}"/${PN}-2023.01.13-test.patch ) diff --git a/dev-libs/cpuinfo/files/cpuinfo-2022.03.26-gentoo.patch b/dev-libs/cpuinfo/files/cpuinfo-2022.03.26-gentoo.patch deleted file mode 100644 index b7163d9e06e0..000000000000 --- a/dev-libs/cpuinfo/files/cpuinfo-2022.03.26-gentoo.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- a/CMakeLists.txt 2022-05-09 22:00:05.453640876 +0200 -+++ b/CMakeLists.txt 2022-05-09 22:01:11.621691380 +0200 -@@ -94,12 +94,6 @@ - - IF(CPUINFO_BUILD_MOCK_TESTS OR CPUINFO_BUILD_UNIT_TESTS) - IF(CPUINFO_SUPPORTED_PLATFORM AND NOT DEFINED GOOGLETEST_SOURCE_DIR) -- MESSAGE(STATUS "Downloading Google Test to ${CONFU_DEPENDENCIES_SOURCE_DIR}/googletest (define GOOGLETEST_SOURCE_DIR to avoid it)") -- CONFIGURE_FILE(cmake/DownloadGoogleTest.cmake "${CONFU_DEPENDENCIES_BINARY_DIR}/googletest-download/CMakeLists.txt") -- EXECUTE_PROCESS(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" . -- WORKING_DIRECTORY "${CONFU_DEPENDENCIES_BINARY_DIR}/googletest-download") -- EXECUTE_PROCESS(COMMAND "${CMAKE_COMMAND}" --build . -- WORKING_DIRECTORY "${CONFU_DEPENDENCIES_BINARY_DIR}/googletest-download") - SET(GOOGLETEST_SOURCE_DIR "${CONFU_DEPENDENCIES_SOURCE_DIR}/googletest" CACHE STRING "Google Test source directory") - ENDIF() - ENDIF() -@@ -309,9 +303,6 @@ - IF(MSVC AND NOT CPUINFO_RUNTIME_TYPE STREQUAL "static") - SET(gtest_force_shared_crt ON CACHE BOOL "" FORCE) - ENDIF() -- ADD_SUBDIRECTORY( -- "${GOOGLETEST_SOURCE_DIR}" -- "${CONFU_DEPENDENCIES_BINARY_DIR}/googletest") - ENDIF() - ENDIF() - ENDIF() diff --git a/dev-libs/criterion/criterion-2.4.1-r1.ebuild b/dev-libs/criterion/criterion-2.4.1-r1.ebuild index 2bf0c4da2c69..95418b86a7b8 100644 --- a/dev-libs/criterion/criterion-2.4.1-r1.ebuild +++ b/dev-libs/criterion/criterion-2.4.1-r1.ebuild @@ -21,7 +21,7 @@ SRC_URI="https://github.com/Snaipe/Criterion/archive/refs/tags/v${PV}.tar.gz -> S="${WORKDIR}/Criterion-${PV}" LICENSE="BSD-2 MIT ZLIB" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 x86" IUSE="test" RESTRICT="!test? ( test )" @@ -36,6 +36,10 @@ DEPEND="${RDEPEND} BDEPEND="dev-build/cmake virtual/pkgconfig" +PATCHES=( + "${FILESDIR}"/${PN}-2.4.1-includes.patch +) + python_check_deps() { has_version "dev-util/cram[${PYTHON_USEDEP}]" } diff --git a/dev-libs/criterion/files/criterion-2.4.1-includes.patch b/dev-libs/criterion/files/criterion-2.4.1-includes.patch new file mode 100644 index 000000000000..9fbce640ce5e --- /dev/null +++ b/dev-libs/criterion/files/criterion-2.4.1-includes.patch @@ -0,0 +1,14 @@ +--- a/include/criterion/alloc.h ++++ b/include/criterion/alloc.h +@@ -31,9 +31,11 @@ + #ifdef __cplusplus + # include <memory> + # include <cstddef> ++# include <cstdint> + using std::size_t; + #else + # include <stddef.h> ++# include <stdint.h> + #endif + #include "internal/common.h" + diff --git a/dev-libs/crossguid/Manifest b/dev-libs/crossguid/Manifest index cbf759e557c4..8c7c4899206d 100644 --- a/dev-libs/crossguid/Manifest +++ b/dev-libs/crossguid/Manifest @@ -1,2 +1 @@ DIST crossguid-0.2.2_p20190529.tar.gz 141660 BLAKE2B 0f78a8ab5a420297f666b3b8156d499a9141ec25c049d4d2bb2ba594dc585abe211a149b83c605cce4f5530207231a065d5f3a87a0c969781de8c6381afa2527 SHA512 f0a80d8e99b10473bcfdfde3d1c5fd7b766959819f0d1c0595ac84ce46db9007a5fbfde9a55aca60530c46cb7f8ef4c7e472c6191559ded92f868589c141ccaf -DIST crossguid-0_pre20150817.tar.gz 46569 BLAKE2B 3384b6c507c4713f5ea0d6012138f3543445a42c7353e934e267b91275f7cf75720a446f5fe24f334b1022946f856a65f5c158d0036c999c761e626c1e30062a SHA512 823ca301f1d3b78a778649cd9169194d98dd33c65cadd5bfb9f86429e82049c99c17e09f093b92675981d2aac2aac25b60cbb157fad57a3e1bada826edd8ba0a diff --git a/dev-libs/crossguid/crossguid-0_pre20150817.ebuild b/dev-libs/crossguid/crossguid-0_pre20150817.ebuild deleted file mode 100644 index 9c61857673ce..000000000000 --- a/dev-libs/crossguid/crossguid-0_pre20150817.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/graeme-hill/crossguid.git" - inherit git-r3 -else - EGIT_COMMIT="8f399e8bd4252be9952f3dfa8199924cc8487ca4" - SRC_URI="https://github.com/graeme-hill/crossguid/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${PN}-${EGIT_COMMIT}" -fi - -DESCRIPTION="Lightweight cross platform C++ GUID/UUID library" -HOMEPAGE="https://github.com/graeme-hill/crossguid" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~riscv x86" - -# We use libuuid from util-linux. -DEPEND="sys-apps/util-linux" -RDEPEND="${DEPEND}" - -RESTRICT="test" #575544 - -e() { echo "$@"; "$@"; } - -src_compile() { - e $(tc-getCXX) \ - ${CXXFLAGS} ${CPPFLAGS} ${LDFLAGS} \ - -std=c++11 \ - -c guid.cpp -o guid.o \ - -DGUID_LIBUUID \ - || die - - e $(tc-getAR) rs libcrossguid.a guid.o || die -} - -src_install() { - insinto /usr/include - doins guid.h - dolib.a libcrossguid.a -} diff --git a/dev-libs/crypto++/crypto++-8.9.0.ebuild b/dev-libs/crypto++/crypto++-8.9.0.ebuild index ff53d102d69b..17b26d94ceab 100644 --- a/dev-libs/crypto++/crypto++-8.9.0.ebuild +++ b/dev-libs/crypto++/crypto++-8.9.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -30,7 +30,7 @@ LICENSE="Boost-1.0" # verify with abidiff! SLOT="0/${PV}" KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos" -IUSE="+asm static-libs" +IUSE="+asm openmp static-libs" BDEPEND=" app-arch/unzip @@ -41,6 +41,14 @@ config_uncomment() { sed -i -e "s://\s*\(#define\s*$1\):\1:" config.h || die } +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + src_prepare() { default @@ -56,6 +64,9 @@ src_configure() { export PREFIX="${EPREFIX}/usr" tc-export AR RANLIB + # https://github.com/cryfs/cryfs/issues/369#issuecomment-1030678487 + use openmp && append-flags -fopenmp + # Long history of correctness bugs: # https://github.com/weidai11/cryptopp/issues/1134 # https://github.com/weidai11/cryptopp/issues/1141 diff --git a/dev-libs/cudnn-frontend/Manifest b/dev-libs/cudnn-frontend/Manifest index 5abdb5da3981..4e0ba403b229 100644 --- a/dev-libs/cudnn-frontend/Manifest +++ b/dev-libs/cudnn-frontend/Manifest @@ -1,6 +1 @@ -DIST cudnn-frontend-0.6.2.tar.gz 18658544 BLAKE2B b60e94a58cd414fee1da2b7da8ea83122dedfb59d5db8b987f7d3d42b00d2634c85dabf45fc81e607a6a4f8c2485690294a724ab744ad4025003ab3fd9a69028 SHA512 d0de74ca90771a38d609fc4784372f35c418dfade4b54f1035ee333567560c7c1dd559490e9a6efdf1043cb91ca27d159f31297238ec9d3578532d77ca505e17 -DIST cudnn-frontend-0.7.3.tar.gz 18685637 BLAKE2B 77ce32fb84cca43a431c6ad0d7be96f56975369e5f7c2f22e011c895200b92966f0cb48d6f7b01a66d8b89837ed4b955d8bd93a3bcf07ad0b29a247b3d73f6a4 SHA512 bd2fe79404f60975ca40792d373d6a388aad900ac98e42fd4258f4405a0b189641e400b1bd634b38b3376ee1b91a82cf76b152038992cdf83f629e76b3f69f93 -DIST cudnn-frontend-0.9.2.tar.gz 18582081 BLAKE2B d8611231f73f3716bca8c2d851439355121ca2460dd46cf8149632fa53094b7b2a2e9d6840dfcd2c1da113f8b6f06c15559c90c6c5333b36d5c29bd9997733e1 SHA512 0cc326e8395183ab3bc2d90a2155a80318daa9c1d6b30522efc42716bd7000ba036d802a8080a1a6a1f3c017a514f2bed936df57a7cab92c8fcd0136f4312912 -DIST cudnn-frontend-1.0.3.tar.gz 423596 BLAKE2B a7bf970dac5e9977a1c80609cdd169ec5764f366880030329372ec0ac49668ddf67ee33a4a19df6b9f799832fa857f62f94e27ea055f3549ac209ab9f564c28a SHA512 2ad346c52e03589e9edcc0ef8ee0fe48fdc6f73aa8136f9f3729796d5ce60718b486fc8a1036fbdcee2cc899c633a11f1fce9204417a0fb14333a4b51a749db0 -DIST cudnn-frontend-1.1.2.tar.gz 436616 BLAKE2B 9749219fd176fa8eba50e3ab6c63940dce95a095a850bfd9747f47cc91e077792c184d8d0629be31865eab6d6cda627c948de744d5f6d6d9522c1a91931d26f5 SHA512 88407f75ec82c2e04fe72148090f0f56a56a088dccd6beab850df6f761ad8ed7527391c80e667dd2073b8313d0416dbd28eca92dd18a538a3fdbc420c13f552c -DIST cudnn-frontend-1.4.0.tar.gz 607171 BLAKE2B 2c90239d7aad6a346c40c4a41b2bdfacc4717df020b9e845135068eec8f2043a6096b2d398d8ee46e05e5936ab5c4fe2529a5432083cdf00456ed11842591b43 SHA512 36026e4d2da2d7287dcdd4a4e0c9516ecc6b954a0dc11f115678e85280a223f557b420f1760ed6efa85acf3b0c3bcba82befb3d8c761a4989e73ddcdbbef8e79 +DIST cudnn-frontend-1.6.1.tar.gz 597869 BLAKE2B e2704fbc1e0a8ac2d2a4321fab23c2b01109a8aef81ad5ff3ceb9dbf7bfbc42749443ff257ad3af6c0d348f67d47c4f210402cb5faa22feb1d5d12a4242637f1 SHA512 078b4968b9eaa601cbf1e61547780bfe3155bc165b3c540a851ab19ac58df9b1fab3780fd37416aea7a072c12c9e2bca5ee03cb7a147c211aa6e431d7965e888 diff --git a/dev-libs/cudnn-frontend/cudnn-frontend-0.6.2.ebuild b/dev-libs/cudnn-frontend/cudnn-frontend-0.6.2.ebuild deleted file mode 100644 index 30ef2c4c7f0f..000000000000 --- a/dev-libs/cudnn-frontend/cudnn-frontend-0.6.2.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="A c++ wrapper for the cudnn backend API" -HOMEPAGE="https://github.com/NVIDIA/cudnn-frontend" -SRC_URI="https://github.com/NVIDIA/cudnn-frontend/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0/8" -KEYWORDS="~amd64" - -RDEPEND="=dev-libs/cudnn-8*" -DEPEND="${RDEPEND}" - -src_install() { - insinto /opt/cuda/targets/x86_64-linux - doins -r include -} diff --git a/dev-libs/cudnn-frontend/cudnn-frontend-0.7.3.ebuild b/dev-libs/cudnn-frontend/cudnn-frontend-0.7.3.ebuild deleted file mode 100644 index 0ad71cab6763..000000000000 --- a/dev-libs/cudnn-frontend/cudnn-frontend-0.7.3.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="A c++ wrapper for the cudnn backend API" -HOMEPAGE="https://github.com/NVIDIA/cudnn-frontend" -SRC_URI="https://github.com/NVIDIA/cudnn-frontend/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0/8" -KEYWORDS="~amd64" - -RDEPEND="=dev-libs/cudnn-8*" -DEPEND="${RDEPEND}" - -src_install() { - insinto /opt/cuda/targets/x86_64-linux - doins -r include -} diff --git a/dev-libs/cudnn-frontend/cudnn-frontend-0.9.2.ebuild b/dev-libs/cudnn-frontend/cudnn-frontend-0.9.2.ebuild deleted file mode 100644 index 0ad71cab6763..000000000000 --- a/dev-libs/cudnn-frontend/cudnn-frontend-0.9.2.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="A c++ wrapper for the cudnn backend API" -HOMEPAGE="https://github.com/NVIDIA/cudnn-frontend" -SRC_URI="https://github.com/NVIDIA/cudnn-frontend/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0/8" -KEYWORDS="~amd64" - -RDEPEND="=dev-libs/cudnn-8*" -DEPEND="${RDEPEND}" - -src_install() { - insinto /opt/cuda/targets/x86_64-linux - doins -r include -} diff --git a/dev-libs/cudnn-frontend/cudnn-frontend-1.1.2.ebuild b/dev-libs/cudnn-frontend/cudnn-frontend-1.1.2.ebuild deleted file mode 100644 index 10648668e6c9..000000000000 --- a/dev-libs/cudnn-frontend/cudnn-frontend-1.1.2.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="A c++ wrapper for the cudnn backend API" -HOMEPAGE="https://github.com/NVIDIA/cudnn-frontend" -SRC_URI="https://github.com/NVIDIA/cudnn-frontend/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0/8" -KEYWORDS="~amd64" - -RDEPEND="=dev-libs/cudnn-8*" -DEPEND="${RDEPEND}" - -src_install() { - insinto /opt/cuda/targets/x86_64-linux - doins -r include -} diff --git a/dev-libs/cudnn-frontend/cudnn-frontend-1.4.0.ebuild b/dev-libs/cudnn-frontend/cudnn-frontend-1.4.0.ebuild deleted file mode 100644 index 10648668e6c9..000000000000 --- a/dev-libs/cudnn-frontend/cudnn-frontend-1.4.0.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="A c++ wrapper for the cudnn backend API" -HOMEPAGE="https://github.com/NVIDIA/cudnn-frontend" -SRC_URI="https://github.com/NVIDIA/cudnn-frontend/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0/8" -KEYWORDS="~amd64" - -RDEPEND="=dev-libs/cudnn-8*" -DEPEND="${RDEPEND}" - -src_install() { - insinto /opt/cuda/targets/x86_64-linux - doins -r include -} diff --git a/dev-libs/cudnn-frontend/cudnn-frontend-1.0.3.ebuild b/dev-libs/cudnn-frontend/cudnn-frontend-1.6.1.ebuild index 10648668e6c9..10648668e6c9 100644 --- a/dev-libs/cudnn-frontend/cudnn-frontend-1.0.3.ebuild +++ b/dev-libs/cudnn-frontend/cudnn-frontend-1.6.1.ebuild diff --git a/dev-libs/cutlass/Manifest b/dev-libs/cutlass/Manifest index a597ef5b7303..25d7b6920af0 100644 --- a/dev-libs/cutlass/Manifest +++ b/dev-libs/cutlass/Manifest @@ -1,2 +1,2 @@ -DIST cutlass-3.3.0.tar.gz 20850597 BLAKE2B 07dc1f503395cfed1efb51871baa4ca7890fc4c871cb146933590c51599b4114fd38099bfcd84d8b0b76b876cc6e9f3bb8f42a3f9a7c9321185f7d880609a5da SHA512 c950ab718e67ffc972911b81890eae767a27d32dfc13f72b91e21e7c6b98eadfb3a5eebb9683091e61aed61709481451cfcd95d660e723686bf79a155e9f0b17 DIST cutlass-3.4.1.tar.gz 23351905 BLAKE2B 6524d70a4f65fc28c7150aa44bfbb5cc64c1b5e885e645d0e58d96dd1c03565c564e8f55f6f0275f2c607d7877e9380e90e424da3eaf44cc6e8997271c5d519d SHA512 c2ff60af28de951cf4420b163ba2dfc46d30c98fe9e6e765cd1e0be89bf9292e057542ec7061c043c42225b74d970f95f675d366db64105a5c103bb165183ab5 +DIST cutlass-3.5.1.tar.gz 29257911 BLAKE2B 680a67beabf821873655ea8145a84a0a6084b5d9dbd03bdc1b49a7964bcd4e7e5e3b213fea46d09583715e8862795455cbc47e5dac4e5bba546b7aeaf31881ce SHA512 f9bc493a80e959b21d3adbe85987d375c052f6095be9e13b871f890a6ead093bfb68712eae206fd8fc3f0a2ac06d96760ffec7939869b0e12c4c37788184cc21 diff --git a/dev-libs/cutlass/cutlass-3.3.0.ebuild b/dev-libs/cutlass/cutlass-3.5.1.ebuild index 7ba922d88c71..7ba922d88c71 100644 --- a/dev-libs/cutlass/cutlass-3.3.0.ebuild +++ b/dev-libs/cutlass/cutlass-3.5.1.ebuild diff --git a/dev-libs/cxxopts/Manifest b/dev-libs/cxxopts/Manifest index 7c4f5f353d16..b2a7ac501f93 100644 --- a/dev-libs/cxxopts/Manifest +++ b/dev-libs/cxxopts/Manifest @@ -1,2 +1,3 @@ DIST cxxopts-3.0.0.tar.gz 97020 BLAKE2B 129b055dd03ce9e4a146d36587063f7155b47456d81e395ae6eeab8012e8d6cfcb410c305353f2ac2ec66a2f3e8d6169e1a0d27c53dcb35388b967d3c9cc86f1 SHA512 239479a3b35ddef6fc380ac9371e1cf7e3aea066f03e1ea538151fa2fff4296838daa976d55e988d8f87f40c0ae027767bcb214754177499413af1081315565c DIST cxxopts-3.2.0.tar.gz 160534 BLAKE2B b6fead8930e83b4af089631e584bec0777da2e7b58aeb5e44b03a1655795dd3aff3923a245699e936bef7e0e871da2c86dd5639d44a839f1ac305a694e811feb SHA512 7265de66b92591255488d01bc26ca874423c75223e2e157a99f14fdd3e92e8d2669b72732acac3ce835190f1a09c13a994c480f0513f229eba8aa008e3d98955 +DIST cxxopts-3.2.1.tar.gz 160606 BLAKE2B 891657d5c00213ae79a1f7600627829f114cf17c3f5c332b1a1c2dcdf2ba7c4a46826f5e0bdff2c09803396fdf133c12d35f6d76b01e473c83bc0fc130821ad4 SHA512 7841fb3e6c3c2a057917c962e29fc0090e6ed06f5515aaa5e2a868fef59071a9a99b74d81c32cf613ecf10a68a4d96d6ad07805f48c7c3951ded096a2317dc3d diff --git a/dev-libs/cxxopts/cxxopts-3.2.1-r1.ebuild b/dev-libs/cxxopts/cxxopts-3.2.1-r1.ebuild new file mode 100644 index 000000000000..738734154e08 --- /dev/null +++ b/dev-libs/cxxopts/cxxopts-3.2.1-r1.ebuild @@ -0,0 +1,49 @@ +# Copyright 2020-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Lightweight C++ command line option parser" +HOMEPAGE="https://github.com/jarro2783/cxxopts" +SRC_URI="https://github.com/jarro2783/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +IUSE="icu test" + +RESTRICT=" + !test? ( test ) +" + +DOCS=( + README.md + CHANGELOG.md +) + +PATCHES=( + "${FILESDIR}"/${P}-gcc15.patch +) + +src_prepare() { + sed -r -e 's:-Werror[[:space:]]*::' -i cmake/cxxopts.cmake || die + cmake_src_prepare +} + +src_configure() { + # bug #938824, bug #940222 + sed -i -e '/set.*CMAKE_CXX_STANDARD/s:11:17:' \ + test/{add-subdirectory,find-package}-test/CMakeLists.txt || die + + local mycmakeargs=( + # bug #938824, bug #940222 + -DCXXOPTS_CXX_STANDARD=17 + -DCXXOPTS_BUILD_EXAMPLES:BOOL=OFF + -DCXXOPTS_BUILD_TESTS:BOOL=$(usex test) + -DCXXOPTS_ENABLE_INSTALL:BOOL=ON + -DCXXOPTS_USE_UNICODE_HELP:BOOL=$(usex icu) + ) + cmake_src_configure +} diff --git a/dev-libs/cxxopts/cxxopts-3.2.1.ebuild b/dev-libs/cxxopts/cxxopts-3.2.1.ebuild new file mode 100644 index 000000000000..bc1006c6538a --- /dev/null +++ b/dev-libs/cxxopts/cxxopts-3.2.1.ebuild @@ -0,0 +1,39 @@ +# Copyright 2020-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Lightweight C++ command line option parser" +HOMEPAGE="https://github.com/jarro2783/cxxopts" +SRC_URI="https://github.com/jarro2783/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +IUSE="icu test" + +RESTRICT=" + !test? ( test ) +" + +DOCS=( + README.md + CHANGELOG.md +) + +src_prepare() { + sed -r -e 's:-Werror[[:space:]]*::' -i cmake/cxxopts.cmake || die + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DCXXOPTS_BUILD_EXAMPLES:BOOL=OFF + -DCXXOPTS_BUILD_TESTS:BOOL=$(usex test) + -DCXXOPTS_ENABLE_INSTALL:BOOL=ON + -DCXXOPTS_USE_UNICODE_HELP:BOOL=$(usex icu) + ) + cmake_src_configure +} diff --git a/dev-libs/cxxopts/files/cxxopts-3.2.1-gcc15.patch b/dev-libs/cxxopts/files/cxxopts-3.2.1-gcc15.patch new file mode 100644 index 000000000000..288de016ea21 --- /dev/null +++ b/dev-libs/cxxopts/files/cxxopts-3.2.1-gcc15.patch @@ -0,0 +1,18 @@ +https://github.com/jarro2783/cxxopts/commit/63d1b65a694cfceafc20863afa75df49dfbe6b2a + +From 63d1b65a694cfceafc20863afa75df49dfbe6b2a Mon Sep 17 00:00:00 2001 +From: pastalian <28638872+pastalian@users.noreply.github.com> +Date: Wed, 28 Aug 2024 20:31:42 +0900 +Subject: [PATCH] Add missing header for gcc-15 (#438) + +--- a/include/cxxopts.hpp ++++ b/include/cxxopts.hpp +@@ -27,6 +27,7 @@ THE SOFTWARE. + #ifndef CXXOPTS_HPP_INCLUDED + #define CXXOPTS_HPP_INCLUDED + ++#include <cstdint> + #include <cstdlib> + #include <cstring> + #include <exception> + diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r5.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r5.ebuild index 53a7bb02f62a..34c5a387d055 100644 --- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r5.ebuild +++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r5.ebuild @@ -15,7 +15,7 @@ SRC_URI+=" https://dev.gentoo.org/~grobian/distfiles/${MY_PATCH_VER}.tar.xz" LICENSE="BSD-with-attribution" SLOT="2" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="authdaemond berkdb gdbm kerberos ldapdb openldap mysql pam postgres sample selinux sqlite srp ssl static-libs urandom" REQUIRED_USE="ldapdb? ( openldap )" @@ -117,7 +117,7 @@ multilib_src_configure() { $(use_enable ldapdb) $(multilib_native_use_enable sample) $(use_enable kerberos gssapi) - $(multilib_native_use_with mysql mysql "${EPREFIX}"/usr) + $(multilib_native_use_with mysql mysql "${EPREFIX}/usr/$(get_libdir)") $(multilib_native_use_with postgres pgsql "${EPREFIX}/usr/$(get_libdir)/postgresql") $(use_with sqlite sqlite3 "${EPREFIX}/usr/$(get_libdir)") $(use_enable srp) diff --git a/dev-libs/date/Manifest b/dev-libs/date/Manifest index 1fa5abe76055..6c8ee9c59fee 100644 --- a/dev-libs/date/Manifest +++ b/dev-libs/date/Manifest @@ -1,2 +1,3 @@ DIST date-3.0.0.tar.gz 822623 BLAKE2B 438a7a5c153c7c2d695fefc95bbd474ef507af2cd8182d1e7d54d482b0128c3f9c57582ed5b40ef46d8f6f5539228d20322c684b1e1b418e5ade3b4871bf4ec1 SHA512 03ba0faef68e053aba888591b9350af1a043ef543825c80b1ca3f0dc0448697f56286e561f1a2a59e684680d7fc1e51fd24955c4cc222fe28db64f56037dc1aa DIST date-3.0.1_p20240913.gh.tar.gz 828871 BLAKE2B bd036c0f12e54bc2d4de538fa32edbee9420c6579a267cd069575698692c2080e77ac0f803ab12607c5fce591603861e0f9de63ed7db2d1cd17e78f486978d96 SHA512 92d570658777d1cff09e78f15ae47a3d832bbc571f7cd6df309948b004641ec8b705f4fe4bace0cd19f8d7922cac52d7a7e0ee71cd2b5ff6a03550deee806267 +DIST date-3.0.3.gh.tar.gz 829597 BLAKE2B edbc4f7e4ca6debd6ec494b816affb6934a28a7fda1bb89e39f5dfc3a30c3c2e019cd803f1570bd26d32b07200c33cb231a0eacad22e2fc290f9eb565b0206dc SHA512 e11d7f230ecc431d94c4b58fe7394dd57a9ec0baa9de52496578479b51bbf885566d6666882916d84d388060fa36065b3fa8dd3a8bc14f720b38d1c943f06700 diff --git a/dev-libs/date/date-3.0.1_p20240913.ebuild b/dev-libs/date/date-3.0.1_p20240913.ebuild index 716577c52456..6bc908715f31 100644 --- a/dev-libs/date/date-3.0.1_p20240913.ebuild +++ b/dev-libs/date/date-3.0.1_p20240913.ebuild @@ -19,7 +19,7 @@ KEYWORDS="~amd64 ~arm64" IUSE="only-c-locale test" RESTRICT="!test? ( test )" -BDEPEND="test? ( sys-devel/clang )" # tests call clang++ +BDEPEND="test? ( llvm-core/clang )" # tests call clang++ PATCHES=( "$FILESDIR"/${PN}-3.0.1_p20240913_remove-failing-tests.patch diff --git a/dev-libs/date/date-3.0.3.ebuild b/dev-libs/date/date-3.0.3.ebuild new file mode 100644 index 000000000000..70364c33a9f8 --- /dev/null +++ b/dev-libs/date/date-3.0.3.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake toolchain-funcs + +DESCRIPTION="A date and time library based on the C++11/14/17 <chrono> header" +HOMEPAGE="https://github.com/HowardHinnant/date" +SRC_URI="https://github.com/HowardHinnant/date/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~arm64" +IUSE="only-c-locale test" +RESTRICT="!test? ( test )" + +PATCHES=( "${FILESDIR}"/${PN}-3.0.3_remove-failing-tests.patch ) + +src_configure() { + local mycmakeargs=( + -DBUILD_TZ_LIB=ON + -DUSE_SYSTEM_TZ_DB=ON + -DENABLE_DATE_TESTING=$(usex test) + -DCOMPILE_WITH_C_LOCALE=$(usex only-c-locale) + ) + cmake_src_configure +} + +src_test() { + cd test/ || die + CC="$(tc-getCC)" CXX="$(tc-getCXX)" ./testit || die +} diff --git a/dev-libs/date/files/date-3.0.3_remove-failing-tests.patch b/dev-libs/date/files/date-3.0.3_remove-failing-tests.patch new file mode 100644 index 000000000000..158b28258526 --- /dev/null +++ b/dev-libs/date/files/date-3.0.3_remove-failing-tests.patch @@ -0,0 +1,34 @@ +From: Filip Kobierski <fkobi@pm.me> + +Upstream states that " There are known failures on all platforms"[1]. +This patch removes the tests that fail for Gentoo. +They both test if the library can parse PM dates in a 12 hour format. + +Here are the failiure messages: +test_Ip(): Assertion `tp == sys_days{2016_y/12/11} + hours{13}' failed. +test_p(): Assertion `tp == sys_days{2016_y/12/11} + hours{23}' failed. + +[1]: https://github.com/HowardHinnant/date?tab=readme-ov-file#build--test +--- + test/date_test/parse.pass.cpp | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/test/date_test/parse.pass.cpp b/test/date_test/parse.pass.cpp +index 13ca909..cdeea71 100644 +--- a/test/date_test/parse.pass.cpp ++++ b/test/date_test/parse.pass.cpp +@@ -906,11 +906,9 @@ main() + test_D(); + test_F(); + test_H(); +- test_Ip(); + test_j(); + test_m(); + test_M(); +- test_p(); + test_r(); + test_R(); + test_S(); +-- +2.45.2 + diff --git a/dev-libs/date/metadata.xml b/dev-libs/date/metadata.xml index 9cd6469e422f..80e83adfadca 100644 --- a/dev-libs/date/metadata.xml +++ b/dev-libs/date/metadata.xml @@ -5,6 +5,10 @@ <email>gentoo@jonas-toth.eu</email> <name>Jonas Toth</name> </maintainer> + <maintainer type="person" proxied="yes"> + <email>fkobi@pm.me</email> + <name>Filip Kobierski</name> + </maintainer> <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> diff --git a/dev-libs/dbus-glib/Manifest b/dev-libs/dbus-glib/Manifest index c30e3135cb62..1c633be509ac 100644 --- a/dev-libs/dbus-glib/Manifest +++ b/dev-libs/dbus-glib/Manifest @@ -1,2 +1 @@ -DIST dbus-glib-0.110.tar.gz 836497 BLAKE2B d936402bbaa5c354b2730cbace273974ec0133db052503fea2780d70b128e50e4fdf54f6ebfeed024eb5602fa3725a40627e27320a4727647299f74b2eb75c85 SHA512 c40ccf7118d4951f0e09082216ccd26f21ee906bdf96d912611d3cd29badd7ef446bea74e19f26c28ebceb9e19bb659d11c643c3e712dac499df12907be88a54 DIST dbus-glib-0.112.tar.gz 715340 BLAKE2B 24e1c222f0116b32c109682816f6c35771647f4c63cab93a6621bd68b71ea4dca62fbf9e6bb360386b8658146dbf34b0d7dc471db7525585412d120340c4c969 SHA512 7c9f393f065dfb3d698f35e6554caf15fe539f5dd52d2b2bb6ed1770e130f5dab8e45379232520301455bae9bb77e25a109faf175153fcd4b9dd11d7de4a546e diff --git a/dev-libs/dbus-glib/dbus-glib-0.110.ebuild b/dev-libs/dbus-glib/dbus-glib-0.110.ebuild deleted file mode 100644 index 3c833833f1fc..000000000000 --- a/dev-libs/dbus-glib/dbus-glib-0.110.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools bash-completion-r1 multilib-minimal toolchain-funcs - -DESCRIPTION="D-Bus bindings for glib" -HOMEPAGE="https://dbus.freedesktop.org/" -SRC_URI="https://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz" - -LICENSE="|| ( GPL-2 AFL-2.1 )" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="debug static-libs test" -RESTRICT="!test? ( test )" - -DEPEND=" - >=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}] - >=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}] - >=sys-apps/dbus-1.8[${MULTILIB_USEDEP}] -" -RDEPEND="${DEPEND}" -BDEPEND=" - >=dev-libs/expat-2.1.0-r3 - >=dev-libs/glib-2.40:2 - >=sys-apps/dbus-1.8 - >=dev-util/glib-utils-2.40 - >=dev-build/gtk-doc-am-1.14 - virtual/pkgconfig -" # CBUILD dependencies are needed to make a native tool while cross-compiling. - -DOCS=( AUTHORS ChangeLog HACKING NEWS README ) - -PATCHES=( "${FILESDIR}"/${P}-config-glib-genmarshal.conf ) - -set_TBD() { - # out of sources build dir for make check - export TBD="${BUILD_DIR}-tests" -} - -src_prepare() { - default - eautoreconf -} - -multilib_src_configure() { - local myconf=( - --localstatedir="${EPREFIX}"/var - --enable-bash-completion - --disable-gtk-doc - $(use_enable debug asserts) - $(use_enable static-libs static) - ) - - # Configure a CBUILD directory to make a native build tool. - if tc-is-cross-compiler; then - mkdir "${BUILD_DIR}-build" || die - cd "${BUILD_DIR}-build" || die - ECONF_SOURCE="${S}" econf_build - myconf+=( --with-dbus-binding-tool="$PWD/dbus/dbus-binding-tool" ) - cd - || die - fi - - ECONF_SOURCE="${S}" econf "${myconf[@]}" - - ln -s "${S}"/doc/reference/html doc/reference/html || die #460042 - - if use test; then - set_TBD - mkdir "${TBD}" || die - cd "${TBD}" || die - einfo "Running configure in ${TBD}" - ECONF_SOURCE="${S}" econf \ - "${myconf[@]}" \ - $(use_enable test checks) \ - $(use_enable test tests) \ - $(use_enable test asserts) - fi -} - -multilib_src_compile() { - tc-is-cross-compiler && emake -C "${BUILD_DIR}-build" - - emake - - if use test; then - set_TBD - cd "${TBD}" || die - einfo "Running make in ${TBD}" - emake - fi -} - -multilib_src_test() { - set_TBD - cd "${TBD}" || die - emake check -} - -multilib_src_install_all() { - einstalldocs - - newbashcomp "${ED}"/etc/bash_completion.d/dbus-bash-completion.sh dbus-send - rm -rf "${ED}"/etc/bash_completion.d || die - - find "${ED}" -type f -name '*.la' -delete || die -} diff --git a/dev-libs/dbus-glib/dbus-glib-0.112.ebuild b/dev-libs/dbus-glib/dbus-glib-0.112.ebuild index 6bb0cf21144e..7faec8fb4b0f 100644 --- a/dev-libs/dbus-glib/dbus-glib-0.112.ebuild +++ b/dev-libs/dbus-glib/dbus-glib-0.112.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit autotools bash-completion-r1 multilib-minimal toolchain-funcs +inherit autotools bash-completion-r1 flag-o-matic multilib-minimal toolchain-funcs DESCRIPTION="D-Bus bindings for glib" HOMEPAGE="https://dbus.freedesktop.org/" @@ -43,6 +43,9 @@ src_prepare() { } multilib_src_configure() { + # bug #943768 + append-cflags -std=gnu17 + local myconf=( --localstatedir="${EPREFIX}"/var --enable-bash-completion diff --git a/dev-libs/dbus-glib/files/dbus-glib-0.110-config-glib-genmarshal.conf b/dev-libs/dbus-glib/files/dbus-glib-0.110-config-glib-genmarshal.conf deleted file mode 100644 index 463638710ad0..000000000000 --- a/dev-libs/dbus-glib/files/dbus-glib-0.110-config-glib-genmarshal.conf +++ /dev/null @@ -1,76 +0,0 @@ -From 39f0ae6152acfb3d8ca086090a02e0aa8742f050 Mon Sep 17 00:00:00 2001 -From: "Yann E. MORIN" <yann.morin.1998@free.fr> -Date: Sun, 2 Dec 2018 16:26:07 +0100 -Subject: [PATCH] buildsys: use variable for glib-genmarshal - -When doing cross-compilation, the path returned by pkg-config for -glib-genmarshal can be incorrect (because it is the runtime path, -not the build-time path). - -Change configure.ac to use pkg-config to get the variable. - -This allows overridig the path at configure time, by using the configure -option GLIB_GENMARSHAL=/path/toglib-genmarshal - -Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> -[smcv: Fix typo in commit message] -Reviewed-by: Simon McVittie <smcv@collabora.com> ---- - configure.ac | 4 ++-- - dbus/Makefile.am | 4 ++-- - dbus/examples/statemachine/Makefile.am | 4 ++-- - 3 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/configure.ac b/configure.ac -index e00bc38..8be3147 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -267,8 +267,8 @@ AC_DEFINE([GLIB_VERSION_MIN_REQUIRED], [GLIB_VERSION_2_32], - [Warn on use of APIs deprecated before GLib 2.32]) - PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.40, gobject-2.0 >= 2.40, gio-2.0 >= 2.40]) - --GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` --AC_SUBST(GLIB_GENMARSHAL) -+PKG_CHECK_VAR([GLIB_GENMARSHAL], [glib-2.0], [glib_genmarshal],, -+ [AC_MSG_ERROR([cannot find glib-genmarshal])]) - - dnl GLib flags - AC_SUBST(GLIB_CFLAGS) -diff --git a/dbus/Makefile.am b/dbus/Makefile.am -index 37c6334..2e8cb27 100644 ---- a/dbus/Makefile.am -+++ b/dbus/Makefile.am -@@ -87,10 +87,10 @@ dbus_binding_tool_LDADD= $(builddir)/libdbus-gtool.la $(builddir)/libdbus-glib-1 - ## we just rebuilt these manually and check them into cvs; easier than - ## convincing automake/make to do this properly - regenerate-built-sources: -- @GLIB_GENMARSHAL@ --prefix=_dbus_g_marshal dbus-gmarshal.list --header > dbus-gmarshal.h && \ -+ $(GLIB_GENMARSHAL) --prefix=_dbus_g_marshal dbus-gmarshal.list --header > dbus-gmarshal.h && \ - echo '#include <config.h>' > dbus-gmarshal.c && \ - echo '#include "dbus-gmarshal.h"' >> dbus-gmarshal.c && \ -- @GLIB_GENMARSHAL@ --prefix=_dbus_g_marshal dbus-gmarshal.list --body >> dbus-gmarshal.c -+ $(GLIB_GENMARSHAL) --prefix=_dbus_g_marshal dbus-gmarshal.list --body >> dbus-gmarshal.c - - - completiondir = $(sysconfdir)/bash_completion.d -diff --git a/dbus/examples/statemachine/Makefile.am b/dbus/examples/statemachine/Makefile.am -index 187b044..c8fe029 100644 ---- a/dbus/examples/statemachine/Makefile.am -+++ b/dbus/examples/statemachine/Makefile.am -@@ -35,11 +35,11 @@ statemachine-glue.h: statemachine.xml - - sm-marshal.c: Makefile sm-marshal.list - echo "#include <config.h>" > $@.tmp -- @GLIB_GENMARSHAL@ --prefix=sm_marshal $(srcdir)/sm-marshal.list --header --body >> $@.tmp -+ $(GLIB_GENMARSHAL) --prefix=sm_marshal $(srcdir)/sm-marshal.list --header --body >> $@.tmp - mv $@.tmp $@ - - sm-marshal.h: Makefile sm-marshal.list -- @GLIB_GENMARSHAL@ --prefix=sm_marshal $(srcdir)/sm-marshal.list --header > $@.tmp && mv $@.tmp $@ -+ $(GLIB_GENMARSHAL) --prefix=sm_marshal $(srcdir)/sm-marshal.list --header > $@.tmp && mv $@.tmp $@ - - BUILT_SOURCES += sm-marshal.c sm-marshal.h - --- -GitLab - diff --git a/dev-libs/dmalloc/Manifest b/dev-libs/dmalloc/Manifest index 9f669702ee43..d7b96d4c9ca3 100644 --- a/dev-libs/dmalloc/Manifest +++ b/dev-libs/dmalloc/Manifest @@ -1,2 +1 @@ -DIST dmalloc-5.5.2.tgz 666608 BLAKE2B 9371b35b9a39706215ff2fc4e31510dafa30a86dccb2290563a2c8a0e7211372dca419dd7d549011548853f1e168fe15c55361d763d27230c547c93113de823e SHA512 96bb94aeb2bc3220f652b5294bdf8592b984cb2a53e5f02b2b8d52450c3396d18651f334644cdfff9c85a8c0d0cedc7f6a18b9d70497b2c6b5f85dbd1e827b93 DIST dmalloc-5.6.5.tgz 322310 BLAKE2B 43ba8cdef73423f2e3d6fa5dea34f1653d890c95dcd4ea13e9317d85d1991d0e68e80192860c7bdaf4ee33b36c892b9df31340ddde808b7d60ee00f21d532976 SHA512 17090378b763dd3eaf5ff196298f08982ad593d4c3a0104a67866b88793b612307f3ce9ef0aa7dfef2df6c8eb050e2be06513b29ca912e916c0bfd882a0f4bf1 diff --git a/dev-libs/dmalloc/dmalloc-5.5.2-r7.ebuild b/dev-libs/dmalloc/dmalloc-5.5.2-r7.ebuild deleted file mode 100644 index a9ffdad2cd2b..000000000000 --- a/dev-libs/dmalloc/dmalloc-5.5.2-r7.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools toolchain-funcs - -DESCRIPTION="A Debug Malloc Library" -HOMEPAGE="https://dmalloc.com" -SRC_URI="https://dmalloc.com/releases/${P}.tgz" - -LICENSE="CC-BY-SA-3.0" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="threads" - -BDEPEND="sys-apps/texinfo" - -DOCS=( NEWS README docs/NOTES docs/TODO ) - -PATCHES=( - # - Build objects twice, once -fPIC for shared. - # - Use DESTDIR. - # - Fix SONAME and NEEDED. - "${FILESDIR}"/${P}-Makefile.in.patch - # - Broken test, always returns false. - "${FILESDIR}"/${P}-cxx.patch - "${FILESDIR}"/${P}-ar.patch - # strdup() strndup() macros - "${FILESDIR}"/${P}-string-macros.patch -) - -src_prepare() { - default - - # - Add threads support. - use threads && eapply "${FILESDIR}"/${P}-threads.patch - - # Respect CFLAGS/LDFLAGS. #337429 - sed -i \ - -e '/libdmalloc/ s:$(CC):& $(CFLAGS) $(LDFLAGS):g' \ - -e 's|ar cr|$(AR) cr|g' \ - Makefile.in || die - - # Run autoconf for -cxx.patch. - eautoconf -} - -src_configure() { - tc-export AR - - econf \ - --enable-cxx \ - --enable-shlib \ - $(use_enable threads) -} - -src_compile() { - default - - cd docs - makeinfo dmalloc.texi || die -} - -src_test() { - emake heavy -} - -src_install() { - default - - newdoc ChangeLog.1 ChangeLog - dodoc docs/dmalloc.pdf - dodoc RELEASE.html docs/dmalloc.html - doinfo docs/dmalloc.info - - # add missing symlinks, lazy - dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so - dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so.${PV%%.*} - - for lib in cxx th thcxx; do - dosym lib${PN}${lib}.so.${PV} /usr/$(get_libdir)/lib${PN}${lib}.so - dosym lib${PN}${lib}.so.${PV} \ - /usr/$(get_libdir)/lib${PN}${lib}.so.${PV%%.*} - done - - rm "${ED}"/usr/$(get_libdir)/lib${PN}*.a || die -} diff --git a/dev-libs/dmalloc/dmalloc-5.6.5-r1.ebuild b/dev-libs/dmalloc/dmalloc-5.6.5-r1.ebuild deleted file mode 100644 index ee3f5afb3a2d..000000000000 --- a/dev-libs/dmalloc/dmalloc-5.6.5-r1.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools - -DESCRIPTION="A Debug Malloc Library" -HOMEPAGE="https://dmalloc.com" -SRC_URI="https://dmalloc.com/releases/${P}.tgz" - -LICENSE="CC-BY-SA-3.0" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -IUSE="threads" - -BDEPEND="sys-apps/texinfo" - -PATCHES=( - "${FILESDIR}"/${PN}-5.6.5-add-destdir-support.patch - "${FILESDIR}"/${PN}-5.6.5-allow-overriding-ar-and-ld.patch - "${FILESDIR}"/${PN}-5.6.5-set-soname-version.patch - "${FILESDIR}"/${PN}-5.6.5-configure-c99.patch - "${FILESDIR}"/${PN}-5.6.5-fix-cxx-check.patch -) - -src_prepare() { - default - - eautoreconf -} - -src_configure() { - econf \ - --enable-cxx \ - --enable-shlib \ - $(use_enable threads) -} - -src_test() { - # mv: cannot stat 'aout': No such file or directory - emake -j1 heavy -} - -src_install() { - default - - soname_link() { - dosym ${1}.so.${PV} /usr/$(get_libdir)/${1}.so.${PV%%.*} - dosym ${1}.so.${PV%%.*} /usr/$(get_libdir)/${1}.so - } - - soname_link libdmalloc - soname_link libdmallocxx - - if use threads; then - soname_link libdmallocth - soname_link libdmallocthcxx - fi - - rm "${ED}"/usr/$(get_libdir)/lib${PN}*.a || die -} diff --git a/dev-libs/dmalloc/dmalloc-5.6.5-r2.ebuild b/dev-libs/dmalloc/dmalloc-5.6.5-r2.ebuild index 0fd5179d091e..f7d63447979a 100644 --- a/dev-libs/dmalloc/dmalloc-5.6.5-r2.ebuild +++ b/dev-libs/dmalloc/dmalloc-5.6.5-r2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://dmalloc.com/releases/${P}.tgz" LICENSE="CC-BY-SA-3.0" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86" IUSE="threads" BDEPEND="sys-apps/texinfo" @@ -24,6 +24,10 @@ PATCHES=( "${FILESDIR}"/${PN}-5.6.5-fix-cxx-check.patch ) +QA_CONFIG_IMPL_DECL_SKIP=( + GetEnvironmentVariableA +) + src_prepare() { default diff --git a/dev-libs/dmalloc/files/dmalloc-5.5.2-Makefile.in.patch b/dev-libs/dmalloc/files/dmalloc-5.5.2-Makefile.in.patch deleted file mode 100644 index 92b232eb58e9..000000000000 --- a/dev-libs/dmalloc/files/dmalloc-5.5.2-Makefile.in.patch +++ /dev/null @@ -1,343 +0,0 @@ ---- a/Makefile.in -+++ b/Makefile.in -@@ -41,7 +41,7 @@ - - # thread version of the library - LIB_TH = lib$(MODULE)th.a --LIB_TH_SL = lib$(MODULE)th.@shlibext@ -+LIB_TH_SL = lib$(MODULE)th.@shlibext@.5.5.2 - @TH_ON@BUILD_ALL_1 = threads - @TH_ON@INSTALL_LIB_1 = installth - @SL_ON@BUILD_THREADS_1 = $(LIB_TH_SL) -@@ -50,8 +50,8 @@ - @TH_ON@@SL_ON@INSTALL_LIB_2 = installthsl - - # C++ version of the library --LIB_CXX = lib$(MODULE)xx.a --LIB_CXX_SL = lib$(MODULE)xx.@shlibext@ -+LIB_CXX = lib$(MODULE)cxx.a -+LIB_CXX_SL = lib$(MODULE)cxx.@shlibext@.5.5.2 - @CXX_ON@BUILD_ALL_3 = $(LIB_CXX) - @CXX_ON@INSTALL_LIB_3 = installcxx - @SL_ON@BUILD_CXX_3 = $(LIB_CXX_SL) -@@ -61,7 +61,7 @@ - - # threads + C++ - LIB_TH_CXX = lib$(MODULE)thcxx.a --LIB_TH_CXX_SL = lib$(MODULE)thcxx.@shlibext@ -+LIB_TH_CXX_SL = lib$(MODULE)thcxx.@shlibext@.5.5.2 - @TH_ON@@CXX_ON@BUILD_ALL_5 = $(LIB_TH_CXX) - @TH_ON@@CXX_ON@INSTALL_LIB_5 = installthcxx - @TH_ON@BUILD_CXX_5 = $(LIB_TH_CXX) -@@ -76,7 +76,7 @@ - @CXX_ON@@SL_ON@INSTALL_THREADS_6 = installthcxxsl - - # shared versions of the libraries --LIB_SL = lib$(MODULE).@shlibext@ -+LIB_SL = lib$(MODULE).@shlibext@.5.5.2 - @SL_ON@BUILD_ALL_7 = $(LIB_SL) - @SL_ON@INSTALL_LIB_7 = installsl - @SL_ON@BUILD_TH_CXX_7 = $(LIB_TH_CXX_SL) -@@ -145,9 +145,13 @@ - - HFLS = dmalloc.h - OBJS = arg_check.o compat.o dmalloc_rand.o dmalloc_tab.o env.o heap.o -+OBJS_SL = arg_check_sl.o compat_sl.o dmalloc_rand_sl.o dmalloc_tab_sl.o env_sl.o heap_sl.o - NORMAL_OBJS = chunk.o error.o malloc.o -+NORMAL_OBJS_SL = chunk_sl.o error_sl.o malloc_sl.o - THREAD_OBJS = chunk_th.o error_th.o malloc_th.o -+THREAD_OBJS_SL = chunk_th_sl.o error_th_sl.o malloc_th_sl.o - CXX_OBJS = dmallocc.o -+CXX_OBJS_SL = dmallocc_sl.o - - CFLAGS = $(CCFLAGS) - TEST = $(MODULE)_t -@@ -160,9 +164,9 @@ - - clean : - rm -f $(A_OUT) core *.o *.t -- rm -f $(LIBRARY) $(LIB_TH) $(LIB_CXX) $(LIB_TH_CXX) $(TEST) $(TEST_FC) -- rm -f $(LIB_TH_SL) $(LIB_CXX_SL) $(LIB_TH_CXX_SL) $(LIB_SL) -+ rm -f $(TEST) $(TEST_FC) - rm -f $(UTIL) dmalloc.h -+ rm -f lib$(MODULE)*.* - - realclean : clean - -@@ -174,65 +178,65 @@ - # rm -f configure - - installdirs : -- $(srcdir)/mkinstalldirs $(includedir) $(libdir) $(bindir) -+ $(srcdir)/mkinstalldirs $(DESTDIR)$(includedir) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) - - installincs : $(HFLS) -- $(srcdir)/mkinstalldirs $(includedir) -- $(INSTALL_DATA) $(HFLS) $(includedir) -+ $(srcdir)/mkinstalldirs $(DESTDIR)$(includedir) -+ $(INSTALL_DATA) $(HFLS) $(DESTDIR)$(includedir) - - installthsl : $(LIB_TH_SL) -- $(srcdir)/mkinstalldirs $(libdir) -- $(INSTALL_PROGRAM) $(LIB_TH_SL) $(libdir) -+ $(srcdir)/mkinstalldirs $(DESTDIR)$(shlibdir) -+ $(INSTALL) $(LIB_TH_SL) $(DESTDIR)$(shlibdir) - - installth : $(INSTALL_THREADS) -- $(srcdir)/mkinstalldirs $(libdir) -- $(INSTALL_PROGRAM) $(LIB_TH) $(libdir) -+ $(srcdir)/mkinstalldirs $(DESTDIR)$(libdir) -+ $(INSTALL) $(LIB_TH) $(DESTDIR)$(libdir) - @CXX_OFF@ @echo "Enter 'make installthcxx' to install the threaded C++ library" - @SL_OFF@ @echo "Enter 'make installthsl' to install the threaded shared-library" - - installthcxxsl : $(LIB_TH_CXX_SL) -- $(srcdir)/mkinstalldirs $(shlibdir) -- $(INSTALL_PROGRAM) $(LIB_TH_CXX_SL) $(shlibdir) -+ $(srcdir)/mkinstalldirs $(DESTDIR)$(shlibdir) -+ $(INSTALL) $(LIB_TH_CXX_SL) $(DESTDIR)$(libdir) - - installthcxx : $(INSTALL_TH_CXX) -- $(srcdir)/mkinstalldirs $(libdir) -- $(INSTALL_PROGRAM) $(LIB_TH_CXX) $(libdir) -+ $(srcdir)/mkinstalldirs $(DESTDIR)$(libdir) -+ $(INSTALL) $(LIB_TH_CXX) $(DESTDIR)$(libdir) - @SL_OFF@ @echo "Enter 'make installthcxxsl' to install the threaded C++ shared-library" - - installcxxsl : $(LIB_CXX_SL) -- $(srcdir)/mkinstalldirs $(libdir) -- $(INSTALL_PROGRAM) $(LIB_CXX_SL) $(libdir) -+ $(srcdir)/mkinstalldirs $(DESTDIR)$(shlibdir) -+ $(INSTALL) $(LIB_CXX_SL) $(DESTDIR)$(shlibdir) - - installcxx : $(INSTALL_CXX) -- $(srcdir)/mkinstalldirs $(libdir) -- $(INSTALL_PROGRAM) $(LIB_CXX) $(libdir) -+ $(srcdir)/mkinstalldirs $(DESTDIR)$(libdir) -+ $(INSTALL) $(LIB_CXX) $(DESTDIR)$(libdir) - @TH_OFF@ @echo "Enter 'make installthcxx' to install the threaded C++ library" - @SL_OFF@ @echo "Enter 'make installcxxsl' to install the C++ shared-library" - - installsl : $(LIB_SL) -- $(srcdir)/mkinstalldirs $(shlibdir) -- $(INSTALL_PROGRAM) $(LIB_SL) $(shlibdir) -+ $(srcdir)/mkinstalldirs $(DESTDIR)$(shlibdir) -+ $(INSTALL) $(LIB_SL) $(DESTDIR)$(shlibdir) - @CXX_OFF@ @echo "Enter 'make installcxxsl' to install the C++ shared-library" - @TH_OFF@ @echo "Enter 'make installthsl' to install thread shared-library" - - installlib : $(INSTALL_LIB) -- $(srcdir)/mkinstalldirs $(libdir) -- $(INSTALL_PROGRAM) $(LIBRARY) $(libdir) -- @RANLIB@ $(libdir)/$(LIBRARY) -+ $(srcdir)/mkinstalldirs $(DESTDIR)$(libdir) -+ $(INSTALL) $(LIBRARY) $(DESTDIR)$(libdir) -+ @RANLIB@ $(DESTDIR)$(libdir)/$(LIBRARY) - @SL_OFF@ @echo "Enter 'make installsl' to install $(LIB_SL) in $(shlibdir)" - @CXX_OFF@ @echo "Enter 'make installcxx' to install the C++ library" - @TH_OFF@ @echo "Enter 'make installth' to install thread library" - - installdocs : $(srcdir)/docs/$(HTMLFILE) $(srcdir)/docs/$(TEXIFILE) \ - $(srcdir)/docs/$(PDFFILE) -- $(srcdir)/mkinstalldirs $(docdir) -- $(INSTALL_DATA) $(srcdir)/docs/$(HTMLFILE) $(docdir) -- $(INSTALL_DATA) $(srcdir)/docs/$(TEXIFILE) $(docdir) -- $(INSTALL_DATA) $(srcdir)/docs/$(PDFFILE) $(docdir) -+ $(srcdir)/mkinstalldirs $(DESTDIR)$(docdir) -+ $(INSTALL_DATA) $(srcdir)/docs/$(HTMLFILE) $(DESTDIR)$(docdir) -+ $(INSTALL_DATA) $(srcdir)/docs/$(TEXIFILE) $(DESTDIR)$(docdir) -+ $(INSTALL_DATA) $(srcdir)/docs/$(PDFFILE) $(DESTDIR)$(docdir) - - install : installincs installlib $(UTIL) -- $(srcdir)/mkinstalldirs $(bindir) -- $(INSTALL_PROGRAM) $(UTIL) $(bindir) -+ $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) -+ $(INSTALL_PROGRAM) $(UTIL) $(DESTDIR)$(bindir) - @echo "Enter 'make installdocs' to install $(DOCFILES) in $(docdir)" - - dmalloc.h.2 : $(srcdir)/configure -@@ -255,10 +259,8 @@ - # NOTE: you may have to edit the configure.ac script to get this to - # work on your operating system. Please send feedback to the author - # via: http://256.com/gray/email.html --$(LIB_SL) : $(LIBRARY) -- rm -f $@ $@.t -- @shlinkargs@ $(LIBRARY) $(OBJS) $(NORMAL_OBJS) -- mv $@.t $@ -+$(LIB_SL) : $(OBJS_SL) $(NORMAL_OBJS_SL) -+ $(CC) -shared -Wl,-soname,libdmalloc.so.5 -o $@ $(OBJS_SL) $(NORMAL_OBJS_SL) - - $(LIBRARY) : $(OBJS) $(NORMAL_OBJS) - ar cr $@ $? -@@ -268,32 +270,26 @@ - ar cr $@ $? - @RANLIB@ $@ - --$(LIB_TH_SL) : $(LIB_TH) -- rm -f $@ $@.t -- @shlinkargs@ $(LIB_TH) $(OBJS) $(THREAD_OBJS) -- mv $@.t $@ -+$(LIB_TH_SL) : $(OBJS_SL) $(THREAD_OBJS_SL) -+ $(CC) -shared -Wl,-soname,libdmallocth.so.5 -o $@ $(OBJS_SL) $(THREAD_OBJS_SL) - - $(LIB_CXX) : $(OBJS) $(NORMAL_OBJS) $(CXX_OBJS) - ar cr $@ $? - @RANLIB@ $@ - --$(LIB_CXX_SL) : $(LIB_CXX) -- rm -f $@ $@.t -- @shlinkargs@ $(LIB_CXX) $(OBJS) $(NORMAL_OBJS) $(CXX_OBJS) -- mv $@.t $@ -+$(LIB_CXX_SL) : $(OBJS_SL) $(NORMAL_OBJS_SL) $(CXX_OBJS_SL) -+ $(CC) -shared -Wl,-soname,libdmalloccxx.so.5 -o $@ $(OBJS_SL) $(NORMAL_OBJS_SL) $(CXX_OBJS_SL) - - $(LIB_TH_CXX) : $(OBJS) $(THREAD_OBJS) $(CXX_OBJS) - ar cr $@ $? - @RANLIB@ $@ - --$(LIB_TH_CXX_SL) : $(LIB_TH_CXX) -- rm -f $@ $@.t -- @shlinkargs@ $(LIB_TH_CXX) $(OBJS) $(THREAD_OBJS) $(CXX_OBJS) -- mv $@.t $@ -+$(LIB_TH_CXX_SL) : $(OBJS_SL) $(THREAD_OBJS_SL) $(CXX_OBJS_SL) -+ $(CC) -shared -Wl,-soname,libdmallocthcxx.so.5 -o $@ $(OBJS_SL) $(THREAD_OBJS_SL) $(CXX_OBJS_SL) - --threadssl : $(LIB_TH_SL) -+threadssl : $(LIB_TH_SL)$(ver) - --threadscxxsl : $(LIB_TH_CXX_SL) -+threadscxxsl : $(LIB_TH_CXX_SL)$(ver) - - threadscxx : $(BUILD_TH_CXX) - @SL_OFF@ @echo "Enter 'make threadscxxsl' to build the threaded C++ shared-library" -@@ -302,7 +298,7 @@ - @CXX_OFF@ @echo "Enter 'make threadscxx' to build the threaded C++ library" - @SL_OFF@ @echo "Enter 'make threadssl' to build the threaded shared library" - --cxxsl : $(LIB_CXX_SL) -+cxxsl : $(LIB_CXX_SL)$(ver) - - cxx : $(BUILD_CXX) - @SL_OFF@ @echo "Enter 'make cxxsl' to build the cxx shared library" -@@ -371,6 +367,11 @@ - $(CXX) $(CFLAGS) $(CPPFLAGS) $(DEFS) $(INCS) -c $(srcdir)/dmallocc.cc \ - -o ./$@ - -+dmallocc_sl.o : $(srcdir)/dmallocc.cc -+ rm -f $@ -+ $(CXX) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $(srcdir)/dmallocc.cc \ -+ -o ./$@ -+ - # - # auto configure settings - uncomment if you are doing configure - # development on the library -@@ -395,38 +396,109 @@ - - arg_check.o: arg_check.c conf.h settings.h dmalloc.h chunk.h debug_tok.h \ - dmalloc_loc.h error.h arg_check.h -+arg_check_sl.o: arg_check.c conf.h settings.h dmalloc.h chunk.h debug_tok.h \ -+ dmalloc_loc.h error.h arg_check.h -+ rm -f $@ -+ $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@ - chunk.o: chunk.c conf.h settings.h dmalloc.h chunk.h chunk_loc.h \ - dmalloc_loc.h compat.h debug_tok.h dmalloc_rand.h dmalloc_tab.h error.h \ - error_val.h heap.h -+chunk_sl.o: chunk.c conf.h settings.h dmalloc.h chunk.h chunk_loc.h \ -+ dmalloc_loc.h compat.h debug_tok.h dmalloc_rand.h dmalloc_tab.h error.h \ -+ error_val.h heap.h -+ rm -f $@ -+ $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@ - compat.o: compat.c conf.h settings.h dmalloc.h compat.h dmalloc_loc.h -+compat_sl.o: compat.c conf.h settings.h dmalloc.h compat.h dmalloc_loc.h -+ rm -f $@ -+ $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@ - dmalloc.o: dmalloc.c conf.h settings.h dmalloc_argv.h dmalloc.h compat.h \ - debug_tok.h dmalloc_loc.h env.h error_val.h version.h -+dmalloc_sl.o: dmalloc.c conf.h settings.h dmalloc_argv.h dmalloc.h compat.h \ -+ debug_tok.h dmalloc_loc.h env.h error_val.h version.h -+ rm -f $@ -+ $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@ - dmalloc_argv.o: dmalloc_argv.c conf.h settings.h dmalloc_argv.h \ - dmalloc_argv_loc.h compat.h -+dmalloc_argv_sl.o: dmalloc_argv.c conf.h settings.h dmalloc_argv.h \ -+ dmalloc_argv_loc.h compat.h -+ rm -f $@ -+ $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@ - dmalloc_fc_t.o: dmalloc_fc_t.c conf.h settings.h dmalloc.h dmalloc_argv.h \ - dmalloc_rand.h debug_tok.h dmalloc_loc.h error_val.h -+dmalloc_fc_t_sl.o: dmalloc_fc_t.c conf.h settings.h dmalloc.h dmalloc_argv.h \ -+ dmalloc_rand.h debug_tok.h dmalloc_loc.h error_val.h -+ rm -f $@ -+ $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@ - dmalloc_rand.o: dmalloc_rand.c dmalloc_rand.h -+dmalloc_rand_sl.o: dmalloc_rand.c dmalloc_rand.h -+ rm -f $@ -+ $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@ - dmalloc_t.o: dmalloc_t.c conf.h settings.h compat.h dmalloc.h \ - dmalloc_argv.h dmalloc_rand.h arg_check.h debug_tok.h dmalloc_loc.h \ - error_val.h heap.h -+dmalloc_t_sl.o: dmalloc_t.c conf.h settings.h compat.h dmalloc.h \ -+ dmalloc_argv.h dmalloc_rand.h arg_check.h debug_tok.h dmalloc_loc.h \ -+ error_val.h heap.h -+ rm -f $@ -+ $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@ - dmalloc_tab.o: dmalloc_tab.c conf.h settings.h chunk.h compat.h dmalloc.h \ - dmalloc_loc.h error.h error_val.h dmalloc_tab.h dmalloc_tab_loc.h -+dmalloc_tab_sl.o: dmalloc_tab.c conf.h settings.h chunk.h compat.h dmalloc.h \ -+ dmalloc_loc.h error.h error_val.h dmalloc_tab.h dmalloc_tab_loc.h -+ rm -f $@ -+ $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@ - env.o: env.c conf.h settings.h dmalloc.h compat.h dmalloc_loc.h \ - debug_tok.h env.h error.h -+env_sl.o: env.c conf.h settings.h dmalloc.h compat.h dmalloc_loc.h \ -+ debug_tok.h env.h error.h -+ rm -f $@ -+ $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@ - error.o: error.c conf.h settings.h dmalloc.h chunk.h compat.h debug_tok.h \ - dmalloc_loc.h env.h error.h error_val.h version.h -+error_sl.o: error.c conf.h settings.h dmalloc.h chunk.h compat.h debug_tok.h \ -+ dmalloc_loc.h env.h error.h error_val.h version.h -+ rm -f $@ -+ $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@ - heap.o: heap.c conf.h settings.h dmalloc.h chunk.h compat.h debug_tok.h \ - dmalloc_loc.h error.h error_val.h heap.h -+heap_sl.o: heap.c conf.h settings.h dmalloc.h chunk.h compat.h debug_tok.h \ -+ dmalloc_loc.h error.h error_val.h heap.h -+ rm -f $@ -+ $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@ - malloc.o: malloc.c conf.h settings.h dmalloc.h chunk.h compat.h \ - debug_tok.h dmalloc_loc.h env.h error.h error_val.h heap.h \ - malloc_funcs.h return.h -+malloc_sl.o: malloc.c conf.h settings.h dmalloc.h chunk.h compat.h \ -+ debug_tok.h dmalloc_loc.h env.h error.h error_val.h heap.h \ -+ malloc_funcs.h return.h -+ rm -f $@ -+ $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@ - protect.o: protect.c conf.h settings.h dmalloc.h dmalloc_loc.h error.h \ - heap.h protect.h -+protect_sl.o: protect.c conf.h settings.h dmalloc.h dmalloc_loc.h error.h \ -+ heap.h protect.h -+ rm -f $@ -+ $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@ - chunk_th.o: chunk.c conf.h settings.h dmalloc.h chunk.h chunk_loc.h \ - dmalloc_loc.h compat.h debug_tok.h dmalloc_rand.h dmalloc_tab.h error.h \ - error_val.h heap.h -+chunk_th_sl.o: chunk.c conf.h settings.h dmalloc.h chunk.h chunk_loc.h \ -+ dmalloc_loc.h compat.h debug_tok.h dmalloc_rand.h dmalloc_tab.h error.h \ -+ error_val.h heap.h -+ rm -f $@ -+ $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@ - error_th.o: error.c conf.h settings.h dmalloc.h chunk.h compat.h debug_tok.h \ - dmalloc_loc.h env.h error.h error_val.h version.h -+error_th_sl.o: error.c conf.h settings.h dmalloc.h chunk.h compat.h debug_tok.h \ -+ dmalloc_loc.h env.h error.h error_val.h version.h -+ rm -f $@ -+ $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@ - malloc_th.o: malloc.c conf.h settings.h dmalloc.h chunk.h compat.h \ - debug_tok.h dmalloc_loc.h env.h error.h error_val.h heap.h \ - malloc_funcs.h return.h -+malloc_th_sl.o: malloc.c conf.h settings.h dmalloc.h chunk.h compat.h \ -+ debug_tok.h dmalloc_loc.h env.h error.h error_val.h heap.h \ -+ malloc_funcs.h return.h -+ rm -f $@ -+ $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@ diff --git a/dev-libs/dmalloc/files/dmalloc-5.5.2-ar.patch b/dev-libs/dmalloc/files/dmalloc-5.5.2-ar.patch deleted file mode 100644 index 56be2fa3ef4e..000000000000 --- a/dev-libs/dmalloc/files/dmalloc-5.5.2-ar.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -131,7 +132,7 @@ - AC_MSG_CHECKING([shared library link args]) - AC_COMPILE_IFELSE([ int foo(int val) { return val + 1; } ],[ - # so now we try to create an archive from the compiled .o file -- (ar cr conftest.a conftest.o) 2>&5 -+ ($AR cr conftest.a conftest.o) 2>&5 - # see which shared-library ld commands work - # - # Darwin/Mac OS X - Terry Teague diff --git a/dev-libs/dmalloc/files/dmalloc-5.5.2-cxx.patch b/dev-libs/dmalloc/files/dmalloc-5.5.2-cxx.patch deleted file mode 100644 index 0fa01e105c53..000000000000 --- a/dev-libs/dmalloc/files/dmalloc-5.5.2-cxx.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -55,11 +55,12 @@ - AC_PROG_CC - AC_PROG_CXX - -+# fixme. always returns false. - # see if we actually have a CXX program --if test "$ac_cv_prog_CXX" = "" -o ! -x "$ac_cv_prog_CXX"; then -- AC_MSG_WARN(could not find C++ compiler $ac_cv_prog_CXX) -- enable_cxx=no --fi -+#if test "$ac_cv_prog_CXX" = "" -o ! -x "$ac_cv_prog_CXX"; then -+# AC_MSG_WARN(could not find C++ compiler $ac_cv_prog_CXX) -+# enable_cxx=no -+#fi - - # hopefully we have a stdc c-compiler - if test "$ac_cv_prog_cc_stdc" = "no" ; then diff --git a/dev-libs/dmalloc/files/dmalloc-5.5.2-string-macros.patch b/dev-libs/dmalloc/files/dmalloc-5.5.2-string-macros.patch deleted file mode 100644 index e3d4eb78fe52..000000000000 --- a/dev-libs/dmalloc/files/dmalloc-5.5.2-string-macros.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/dmalloc.h.3 -+++ b/dmalloc.h.3 -@@ -405,6 +405,7 @@ - * - * string -> String we are duplicating. - */ -+#undef strdup - extern - char *strdup(const char *string); - #endif /* ifndef DMALLOC_STRDUP_MACRO */ -@@ -429,6 +430,7 @@ - * - * len -> Length of the string to duplicate. - */ -+#undef strndup - extern - char *strndup(const char *string, const DMALLOC_SIZE len); - diff --git a/dev-libs/dmalloc/files/dmalloc-5.5.2-threads.patch b/dev-libs/dmalloc/files/dmalloc-5.5.2-threads.patch deleted file mode 100644 index c3cbd90aa9f5..000000000000 --- a/dev-libs/dmalloc/files/dmalloc-5.5.2-threads.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/settings.dist -+++ b/settings.dist -@@ -409,7 +409,7 @@ - */ - - #ifndef LOCK_THREADS --#define LOCK_THREADS 0 -+#define LOCK_THREADS 1 - #endif - - #if LOCK_THREADS diff --git a/dev-libs/dynolog/dynolog-0.3.1_p20230126-r2.ebuild b/dev-libs/dynolog/dynolog-0.3.1_p20230126-r3.ebuild index ca74802f6de0..ca74802f6de0 100644 --- a/dev-libs/dynolog/dynolog-0.3.1_p20230126-r2.ebuild +++ b/dev-libs/dynolog/dynolog-0.3.1_p20230126-r3.ebuild diff --git a/dev-libs/editline/editline-1.17.1_p20240527.ebuild b/dev-libs/editline/editline-1.17.1_p20240527.ebuild index 5bb5cf61df41..e2247f06ad2e 100644 --- a/dev-libs/editline/editline-1.17.1_p20240527.ebuild +++ b/dev-libs/editline/editline-1.17.1_p20240527.ebuild @@ -20,7 +20,7 @@ else -> ${P}.tar.gz" S="${WORKDIR}/${PN}-${COMMIT}" - KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64 ~arm64 ~x86" fi LICENSE="Apache-2.0" diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest index 710720bed01d..f5298e7e716f 100644 --- a/dev-libs/efl/Manifest +++ b/dev-libs/efl/Manifest @@ -1 +1,2 @@ DIST efl-1.27.0.tar.xz 168543208 BLAKE2B 082f7089f1a017db8e62f36fb2a51e18c7d00b74b8e865a60d066e49921c69720101deb3184a125633a6c646e241b8765cccc038c906c00d4ca16ecb705faf6f SHA512 5dda2f630463a2504d9246be17449579bbc470904e137b02b3b5c44db033dec2688f6c477885de1485944d875ee62619b6e7c5d4d3657225951f6feaf83b4fa4 +DIST efl-1.28.0.tar.xz 168556580 BLAKE2B d40cc99a5512c81931ba6d8459ff3941406a377cf17131300a2681a180e40467526ea71039c5d4bcaf8c4fe192d3b656a168333a75a0d5d3f7bbc7c681ec3c61 SHA512 f88b005f981f09496baac0a1232c26433ad80acc5957a0a972a9b1335dda111d8defbfd7ed0ed6a7ead1528d58fef4f7ed53c60b87f33c625fb22f38683a890d diff --git a/dev-libs/efl/efl-1.27.0-r1.ebuild b/dev-libs/efl/efl-1.27.0-r1.ebuild index f64a6f6f2aac..06352ba5d97a 100644 --- a/dev-libs/efl/efl-1.27.0-r1.ebuild +++ b/dev-libs/efl/efl-1.27.0-r1.ebuild @@ -132,6 +132,8 @@ BDEPEND="${PYTHON_DEPS} nls? ( sys-devel/gettext ) wayland? ( dev-util/wayland-scanner )" +PATCHES=( "${FILESDIR}/${PN}-1.27-eina_string_view.patch" ) + pkg_setup() { # Deprecated, provided for backward-compatibility. Everything is moved to libefreet.so. QA_FLAGS_IGNORED="/usr/$(get_libdir)/libefreet_trash.so.${PV} diff --git a/dev-libs/efl/efl-1.28.0.ebuild b/dev-libs/efl/efl-1.28.0.ebuild new file mode 100644 index 000000000000..04c679ce28e5 --- /dev/null +++ b/dev-libs/efl/efl-1.28.0.ebuild @@ -0,0 +1,302 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_REQ_USE="deprecated(+)" +LUA_COMPAT=( lua5-{1,2} luajit ) + +PYTHON_COMPAT=( python3_{10..13} ) + +inherit lua-single meson python-any-r1 xdg + +DESCRIPTION="Enlightenment Foundation Libraries all-in-one package" +HOMEPAGE="https://www.enlightenment.org" +SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${P}.tar.xz" + +LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+X avif bmp connman cpu_flags_arm_neon dds debug doc drm +eet efl-one elogind examples fbcon" +IUSE+=" +fontconfig fribidi gif glib +gstreamer harfbuzz heif hyphen ibus ico jpeg2k jpegxl json" +IUSE+=" nls mono opengl +pdf physics pmaps postscript psd pulseaudio raw scim sdl +sound +svg" +IUSE+=" +system-lz4 systemd tga tgv tiff tslib unwind v4l vnc wayland webp xcf xim xpm xpresent" +IUSE+=" zeroconf" + +REQUIRED_USE="${LUA_REQUIRED_USE} + ?? ( elogind systemd ) + ?? ( fbcon tslib ) + drm? ( wayland ) + examples? ( eet svg ) + gstreamer? ( sound ) + ibus? ( glib ) + opengl? ( X ) + pulseaudio? ( sound ) + xim? ( X ) + xpresent? ( X )" + +# Requires everything to be enabled unconditionally. +RESTRICT="test" + +RDEPEND="${LUA_DEPS} + dev-libs/libinput:= + dev-libs/libunibreak:= + dev-libs/openssl:0= + net-misc/curl + media-libs/giflib:= + media-libs/libjpeg-turbo:= + media-libs/libpng:= + sys-apps/dbus + sys-apps/util-linux + sys-libs/zlib + X? ( + !opengl? ( media-libs/libglvnd ) + media-libs/freetype + x11-libs/libX11 + x11-libs/libXScrnSaver + x11-libs/libXcomposite + x11-libs/libXcursor + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXi + x11-libs/libXinerama + x11-libs/libXrandr + x11-libs/libXrender + x11-libs/libXtst + x11-libs/libxkbcommon + wayland? ( x11-libs/libxkbcommon[X] ) + ) + avif? ( media-libs/libavif:= ) + connman? ( net-misc/connman ) + drm? ( + dev-libs/libinput:= + dev-libs/wayland + media-libs/mesa[gbm(+)] + x11-libs/libdrm + x11-libs/libxkbcommon + ) + elogind? ( + sys-auth/elogind + virtual/libudev:= + ) + fontconfig? ( + media-libs/fontconfig + media-libs/freetype + ) + fribidi? ( dev-libs/fribidi ) + glib? ( dev-libs/glib:2 ) + gstreamer? ( + media-libs/gstreamer:1.0 + media-libs/gst-plugins-base:1.0 + ) + harfbuzz? ( media-libs/harfbuzz:= ) + heif? ( media-libs/libheif:= ) + hyphen? ( dev-libs/hyphen ) + ibus? ( app-i18n/ibus ) + jpeg2k? ( media-libs/openjpeg:= ) + jpegxl? ( media-libs/libjxl:= ) + json? ( >=media-libs/rlottie-0.0.1_pre20200424:= ) + mono? ( dev-lang/mono ) + opengl? ( virtual/opengl ) + pdf? ( app-text/poppler:=[cxx] ) + physics? ( sci-physics/bullet:= ) + postscript? ( app-text/libspectre ) + pulseaudio? ( media-libs/libpulse ) + raw? ( media-libs/libraw:= ) + scim? ( app-i18n/scim ) + sdl? ( media-libs/libsdl2 ) + sound? ( media-libs/libsndfile ) + svg? ( gnome-base/librsvg:2 ) + system-lz4? ( app-arch/lz4:= ) + systemd? ( sys-apps/systemd:= ) + tiff? ( media-libs/tiff:= ) + tslib? ( x11-libs/tslib:= ) + unwind? ( sys-libs/libunwind:= ) + v4l? ( media-libs/libv4l ) + vnc? ( net-libs/libvncserver ) + wayland? ( + dev-libs/wayland + media-libs/libglvnd + media-libs/mesa[wayland] + x11-libs/libxkbcommon + ) + webp? ( media-libs/libwebp:= ) + xpm? ( x11-libs/libXpm ) + xpresent? ( x11-libs/libXpresent ) + zeroconf? ( net-dns/avahi )" +DEPEND="${RDEPEND} + X? ( x11-base/xorg-proto ) + wayland? ( dev-libs/wayland-protocols )" +BDEPEND="${PYTHON_DEPS} + virtual/pkgconfig + doc? ( app-text/doxygen ) + examples? ( sys-devel/gettext ) + mono? ( dev-build/cmake ) + nls? ( sys-devel/gettext ) + wayland? ( dev-util/wayland-scanner )" + +pkg_setup() { + # Deprecated, provided for backward-compatibility. Everything is moved to libefreet.so. + QA_FLAGS_IGNORED="/usr/$(get_libdir)/libefreet_trash.so.${PV} + /usr/$(get_libdir)/libefreet_mime.so.${PV}" + + python-any-r1_pkg_setup +} + +src_prepare() { + default + + # Remove automagic unwind configure option, #743154 + if ! use unwind; then + sed -i "/config_h.set('HAVE_UNWIND/,/eina_ext_deps += unwind/d" src/lib/eina/meson.build || + die "Failed to remove libunwind dep" + fi + + # Fix python shebangs for python-exec[-native-symlinks], #764086 + local shebangs=($(grep -rl "#!/usr/bin/env python3" || die)) + python_fix_shebang -q ${shebangs[*]} +} + +src_configure() { + local emesonargs=( + -Dbuffer=false + -Dbuild-tests=false + -Dcocoa=false + -Ddrm-deprecated=false + -Dembedded-libunibreak=false + -Dg-mainloop=false + -Dmono-beta=false + -Ddotnet=false + -Dpixman=false + -Dwl-deprecated=false + + -Dedje-sound-and-video=true + -Deeze=true + -Dinput=true + -Dinstall-eo-files=true + -Dlibmount=true + -Dnative-arch-optimization=true + -Dxinput2=true + -Dxinput22=true + + -Dcrypto=openssl + -Ddotnet-stylecop-severity=Warning + + $(meson_use X x11) + $(meson_use debug debug-threads) + $(meson_use doc docs) + $(meson_use drm) + $(meson_use examples build-examples) + $(meson_use fbcon fb) + $(meson_use fontconfig) + $(meson_use fribidi) + $(meson_use glib) + $(meson_use gstreamer) + $(meson_use harfbuzz) + $(meson_use hyphen) + $(meson_use lua_single_target_luajit elua) + $(meson_use nls) + $(meson_use physics) + $(meson_use pulseaudio) + $(meson_use sdl) + $(meson_use sound audio) + $(meson_use tslib) + $(meson_use v4l v4l2) + $(meson_use vnc vnc-server) + $(meson_use wayland wl) + $(meson_use xpresent) + $(meson_use zeroconf avahi) + + $(meson_use !system-lz4 embedded-lz4) + ) + + if use elogind || use systemd; then + emesonargs+=( -D systemd=true ) + else + emesonargs+=( -D systemd=false ) + fi + + if use wayland; then + emesonargs+=( -D opengl=es-egl ) + elif ! use wayland && use opengl; then + emesonargs+=( -D opengl=full ) + elif ! use wayland && use X && ! use opengl; then + emesonargs+=( -D opengl=es-egl ) + else + emesonargs+=( -D opengl=none ) + fi + + if use connman; then + emesonargs+=( -D network-backend=connman ) + else + emesonargs+=( -D network-backend=none ) + fi + + local disabledEvasLoaders="" + ! use avif && disabledEvasLoaders="avif," + ! use bmp && disabledEvasLoaders+="bmp,wbmp," + ! use dds && disabledEvasLoaders+="dds," + ! use eet && disabledEvasLoaders+="eet," + ! use gstreamer && disabledEvasLoaders+="gst," + ! use heif && disabledEvasLoaders+="heif," + ! use ico && disabledEvasLoaders+="ico," + ! use jpeg2k && disabledEvasLoaders+="jp2k," + ! use jpegxl && disabledEvasLoaders+="jxl," + ! use json && disabledEvasLoaders+="json," + ! use pdf && disabledEvasLoaders+="pdf," + ! use pmaps && disabledEvasLoaders+="pmaps," + ! use postscript && disabledEvasLoaders+="ps," + ! use psd && disabledEvasLoaders+="psd," + ! use raw && disabledEvasLoaders+="raw," + ! use svg && disabledEvasLoaders+="rsvg,svg," + ! use tga && disabledEvasLoaders+="tga," + ! use tgv && disabledEvasLoaders+="tgv," + ! use tiff && disabledEvasLoaders+="tiff," + ! use webp && disabledEvasLoaders+="webp," + ! use xcf && disabledEvasLoaders+="xcf," + ! use xpm && disabledEvasLoaders+="xpm," + [[ ! -z "$disabledEvasLoaders" ]] && disabledEvasLoaders=${disabledEvasLoaders::-1} + emesonargs+=( -D evas-loaders-disabler="${disabledEvasLoaders}" ) + + local disabledImfLoaders="" + ! use ibus && disabledImfLoaders+="ibus," + ! use scim && disabledImfLoaders+="scim," + ! use xim && disabledImfLoaders+="xim," + [[ ! -z "$disabledImfLoaders" ]] && disabledImfLoaders=${disabledImfLoaders::-1} + emesonargs+=( -D ecore-imf-loaders-disabler="${disabledImfLoaders}" ) + + local bindingsList="cxx," + use lua_single_target_luajit && bindingsList+="lua," + use mono && bindingsList+="mono," + [[ ! -z "$bindingsList" ]] && bindingsList=${bindingsList::-1} + emesonargs+=( -D bindings="${bindingsList}" ) + + local luaChoice="" + if use lua_single_target_luajit; then + luaChoice+="luajit" + else + luaChoice+="lua" + fi + emesonargs+=( -D lua-interpreter="${luaChoice}" ) + + # Not all arm CPU's have neon instruction set, #722552 + if use arm && ! use cpu_flags_arm_neon; then + emesonargs+=( -D native-arch-optimization=false ) + fi + + meson_src_configure +} + +src_compile() { + meson_src_compile +} + +src_install() { + meson_src_install + + if use examples; then + docompress -x /usr/share/doc/${PF}/examples/ + dodoc -r "${BUILD_DIR}"/src/examples/ + fi +} diff --git a/dev-libs/efl/files/efl-1.27-eina_string_view.patch b/dev-libs/efl/files/efl-1.27-eina_string_view.patch new file mode 100644 index 000000000000..8e3bb9c1f460 --- /dev/null +++ b/dev-libs/efl/files/efl-1.27-eina_string_view.patch @@ -0,0 +1,32 @@ +https://git.enlightenment.org/enlightenment/efl/issues/71 + +commit 6c3630ffda0884b86e6ffc9d00d7315ab67858e5 +Author: Ted Rodgers <ted.d.rodgers@gmail.com> +Date: Wed Aug 21 10:56:13 2024 -0400 + + eina_string_view.hh change lenght to length + + fixes #71 + +diff --git a/src/bindings/cxx/eina_cxx/eina_string_view.hh b/src/bindings/cxx/eina_cxx/eina_string_view.hh +index 77798db70f..f0bbcb705d 100644 +--- a/src/bindings/cxx/eina_cxx/eina_string_view.hh ++++ b/src/bindings/cxx/eina_cxx/eina_string_view.hh +@@ -181,7 +181,7 @@ public: + size_type rfind(basic_string_view<CharT, Traits> const& s) const + { + const_reverse_iterator iter = std::search(crbegin(), crend(), s.crbegin(), s.crend(), Traits::eq); +- return iter == crend() ? npos : reverse_distance(crbegin(), iter) - s.lenght(); ++ return iter == crend() ? npos : reverse_distance(crbegin(), iter) - s.length(); + } + + size_type rfind(basic_string_view<CharT, Traits> const& s, size_type pos) const +@@ -189,7 +189,7 @@ public: + if (pos >= _len) + return npos; + const_reverse_iterator iter = std::search(crbegin()+pos, crend(), s.crbegin(), s.crend(), Traits::eq); +- return iter == crend() ? npos : reverse_distance(crbegin(), iter) - s.lenght(); ++ return iter == crend() ? npos : reverse_distance(crbegin(), iter) - s.length(); + } + + size_type rfind(CharT c) const diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest index 01f87dc02d56..d33d4d2c61d4 100644 --- a/dev-libs/elfutils/Manifest +++ b/dev-libs/elfutils/Manifest @@ -1,5 +1,3 @@ -DIST elfutils-0.190.tar.bz2 9162766 BLAKE2B 9934aff08f1898377708b28595fb52130ef9f80408132ac7d306845b10672ba45cf1ac69783da07b3eea9fd647741d44da45b8b2626c45a768cb2844c6186513 SHA512 9c4f5328097e028286c42f29e39dc3d80914b656cdfbbe05b639e91bc787ae8ae64dd4d69a6e317ce30c01648ded10281b86a51e718295f4c589df1225a48102 -DIST elfutils-0.190.tar.bz2.sig 310 BLAKE2B d6a2d490aa6815ed9a7c3624050716ebf7c50465af9907d471d47aa3b57590faf9b9ee03de127c6b3bdffa6948414aab6aa8c784ce29570f76bb03ee2021c062 SHA512 7cd88c19402a959679204a5b01ddd48720e224b84268d0d7452f0f1433150b97dd02288fac204fbd5e2fd6f227473bfe62205b350d5fe2e17addf45fb452eed6 DIST elfutils-0.191.tar.bz2 9310088 BLAKE2B 2a7ad251369eca7ba609ab8644181fd479ad8596ee58dc068398ca22be25a978e96b81a10a92a5555d7574fd1b9227c8d54fb41dceb4025aedfc6ae32870bbca SHA512 e22d85f25317a79b36d370347e50284c9120c86f9830f08791b7b6a7b4ad89b9bf4c7c71129133b8d193a0edffb2a2c17987b7e48428b9670aff5ce918777e04 DIST elfutils-0.191.tar.bz2.sig 310 BLAKE2B 5afee19515a115d4ca6d1e0c4a49eca84bb4b911687492934e939a80ac75b7fcea9b6bf5fc0f2248a4c64ef09bd5af9dfc60c72410cba33b78444c38443ad279 SHA512 ab030739d95d13abb84cf4dc6c5407e51d0bd0bca108e27654a1830371694181a1b6f115fdbb4ae0772390f54f1c4811e5ae26b38fdcfd3275177a3716adfd22 DIST elfutils-0.192.tar.bz2 11913897 BLAKE2B cf9036a1fca416e0d47c76471093609230545aee63e31e30991dc3c88417d7c621c930bb74809374da3bf142501cee91a2b861a5a89efcb5e1ac184df5defce1 SHA512 543188f5f2cfe5bc7955a878416c5f252edff9926754e5de0c6c57b132f21d9285c9b29e41281e93baad11d4ae7efbbf93580c114579c182103565fe99bd3909 diff --git a/dev-libs/elfutils/elfutils-0.190.ebuild b/dev-libs/elfutils/elfutils-0.190.ebuild deleted file mode 100644 index 902cc0aea9f1..000000000000 --- a/dev-libs/elfutils/elfutils-0.190.ebuild +++ /dev/null @@ -1,120 +0,0 @@ -# Copyright 2003-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/elfutils.gpg -inherit flag-o-matic multilib-minimal verify-sig - -DESCRIPTION="Libraries/utilities to handle ELF objects (drop in replacement for libelf)" -HOMEPAGE="https://sourceware.org/elfutils/" -SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2" -SRC_URI+=" verify-sig? ( https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2.sig )" - -LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" -IUSE="bzip2 debuginfod lzma nls static-libs test +utils zstd" -RESTRICT="!test? ( test )" - -RDEPEND=" - !dev-libs/libelf - >=sys-libs/zlib-1.2.8-r1[static-libs?,${MULTILIB_USEDEP}] - bzip2? ( >=app-arch/bzip2-1.0.6-r4[static-libs?,${MULTILIB_USEDEP}] ) - debuginfod? ( - app-arch/libarchive:= - dev-db/sqlite:3= - net-libs/libmicrohttpd:= - - net-misc/curl[static-libs?,${MULTILIB_USEDEP}] - ) - lzma? ( >=app-arch/xz-utils-5.0.5-r1[static-libs?,${MULTILIB_USEDEP}] ) - zstd? ( app-arch/zstd:=[static-libs?,${MULTILIB_USEDEP}] ) - elibc_musl? ( - dev-libs/libbsd - sys-libs/argp-standalone - sys-libs/fts-standalone - sys-libs/obstack-standalone - ) -" -DEPEND=" - ${RDEPEND} -" -BDEPEND=" - app-alternatives/lex - sys-devel/m4 - virtual/pkgconfig - nls? ( sys-devel/gettext ) - verify-sig? ( sec-keys/openpgp-keys-elfutils ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-0.189-musl-aarch64-regs.patch - "${FILESDIR}"/${PN}-0.189-musl-macros.patch -) - -src_prepare() { - default - - if ! use static-libs; then - sed -i -e '/^lib_LIBRARIES/s:=.*:=:' -e '/^%.os/s:%.o$::' lib{asm,dw,elf}/Makefile.in || die - fi - - # https://sourceware.org/PR23914 - sed -i 's:-Werror::' */Makefile.in || die -} - -src_configure() { - # bug #407135 - use test && append-flags -g - - # bug 660738 - filter-flags -fno-asynchronous-unwind-tables - - multilib-minimal_src_configure -} - -multilib_src_configure() { - local myeconfargs=( - $(use_enable nls) - $(multilib_native_use_enable debuginfod) - $(use_enable debuginfod libdebuginfod) - - # explicitly disable thread safety, it's not recommended by upstream - # doesn't build either on musl. - --disable-thread-safety - - # Valgrind option is just for running tests under it; dodgy under sandbox - # and indeed even w/ glibc with newer instructions. - --disable-valgrind - --program-prefix="eu-" - --with-zlib - $(use_with bzip2 bzlib) - $(use_with lzma) - $(use_with zstd) - ) - - # Needed because sets alignment macro - is-flagq -fsanitize=address && myeconfargs+=( --enable-sanitize-address ) - is-flagq -fsanitize=undefined && myeconfargs+=( --enable-sanitize-undefined ) - - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_test() { - env LD_LIBRARY_PATH="${BUILD_DIR}/libelf:${BUILD_DIR}/libebl:${BUILD_DIR}/libdw:${BUILD_DIR}/libasm" \ - LC_ALL="C" \ - emake check VERBOSE=1 -} - -multilib_src_install_all() { - einstalldocs - - dodoc NOTES - - # These build quick, and are needed for most tests, so don't - # disable their building when the USE flag is disabled. - if ! use utils; then - rm -rf "${ED}"/usr/bin || die - fi -} diff --git a/dev-libs/elfutils/elfutils-0.191-r1.ebuild b/dev-libs/elfutils/elfutils-0.191-r1.ebuild deleted file mode 100644 index bcfa4c11cfc6..000000000000 --- a/dev-libs/elfutils/elfutils-0.191-r1.ebuild +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright 2003-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/elfutils.gpg -inherit autotools flag-o-matic multilib-minimal - -DESCRIPTION="Libraries/utilities to handle ELF objects (drop in replacement for libelf)" -HOMEPAGE="https://sourceware.org/elfutils/" -if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI="https://sourceware.org/git/elfutils.git" - inherit git-r3 - - BDEPEND=" - sys-devel/bison - sys-devel/flex - " -else - inherit verify-sig - SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2" - SRC_URI+=" verify-sig? ( https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2.sig )" - - KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" - - BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-elfutils-20240301 )" -fi - -LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )" -SLOT="0" -IUSE="bzip2 debuginfod lzma nls test +utils valgrind zstd" -RESTRICT="!test? ( test )" - -RDEPEND=" - !dev-libs/libelf - >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] - bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] ) - debuginfod? ( - app-arch/libarchive:= - dev-db/sqlite:3= - net-libs/libmicrohttpd:= - - net-misc/curl[${MULTILIB_USEDEP}] - ) - lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] ) - zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] ) - elibc_musl? ( - dev-libs/libbsd - sys-libs/argp-standalone - sys-libs/fts-standalone - sys-libs/obstack-standalone - ) -" -DEPEND=" - ${RDEPEND} - valgrind? ( dev-debug/valgrind ) -" -BDEPEND+=" - sys-devel/m4 - virtual/pkgconfig - nls? ( sys-devel/gettext ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-0.189-musl-aarch64-regs.patch - "${FILESDIR}"/${PN}-0.191-musl-macros.patch - "${FILESDIR}"/${PN}-0.191-avoid-overriding-libcxx-system-header.patch -) - -src_prepare() { - default - - eautoreconf - - # https://sourceware.org/PR23914 - sed -i 's:-Werror::' */Makefile.in || die -} - -src_configure() { - # bug #407135 - use test && append-flags -g - - # bug 660738 - filter-flags -fno-asynchronous-unwind-tables - - multilib-minimal_src_configure -} - -multilib_src_configure() { - unset LEX YACC - - local myeconfargs=( - $(use_enable nls) - $(multilib_native_use_enable debuginfod) - $(use_enable debuginfod libdebuginfod) - $(use_enable valgrind valgrind-annotations) - - # explicitly disable thread safety, it's not recommended by upstream - # doesn't build either on musl. - --disable-thread-safety - - # Valgrind option is just for running tests under it; dodgy under sandbox - # and indeed even w/ glibc with newer instructions. - --disable-valgrind - --program-prefix="eu-" - --with-zlib - $(use_with bzip2 bzlib) - $(use_with lzma) - $(use_with zstd) - ) - - [[ ${PV} == 9999 ]] && myeconfargs+=( --enable-maintainer-mode ) - - # Needed because sets alignment macro - is-flagq -fsanitize=address && myeconfargs+=( --enable-sanitize-address ) - is-flagq -fsanitize=undefined && myeconfargs+=( --enable-sanitize-undefined ) - - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_test() { - env LD_LIBRARY_PATH="${BUILD_DIR}/libelf:${BUILD_DIR}/libebl:${BUILD_DIR}/libdw:${BUILD_DIR}/libasm" \ - LC_ALL="C" \ - emake check VERBOSE=1 -} - -multilib_src_install_all() { - einstalldocs - - dodoc NOTES - - # These build quick, and are needed for most tests, so we don't - # disable building them when the USE flag is disabled. - if ! use utils; then - rm -rf "${ED}"/usr/bin || die - fi -} diff --git a/dev-libs/elfutils/elfutils-0.191.ebuild b/dev-libs/elfutils/elfutils-0.191.ebuild deleted file mode 100644 index 92eb88bd503c..000000000000 --- a/dev-libs/elfutils/elfutils-0.191.ebuild +++ /dev/null @@ -1,120 +0,0 @@ -# Copyright 2003-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/elfutils.gpg -inherit flag-o-matic multilib-minimal verify-sig - -DESCRIPTION="Libraries/utilities to handle ELF objects (drop in replacement for libelf)" -HOMEPAGE="https://sourceware.org/elfutils/" -SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2" -SRC_URI+=" verify-sig? ( https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2.sig )" - -LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="bzip2 debuginfod lzma nls static-libs test +utils zstd" -RESTRICT="!test? ( test )" - -RDEPEND=" - !dev-libs/libelf - >=sys-libs/zlib-1.2.8-r1[static-libs?,${MULTILIB_USEDEP}] - bzip2? ( >=app-arch/bzip2-1.0.6-r4[static-libs?,${MULTILIB_USEDEP}] ) - debuginfod? ( - app-arch/libarchive:= - dev-db/sqlite:3= - net-libs/libmicrohttpd:= - - net-misc/curl[static-libs?,${MULTILIB_USEDEP}] - ) - lzma? ( >=app-arch/xz-utils-5.0.5-r1[static-libs?,${MULTILIB_USEDEP}] ) - zstd? ( app-arch/zstd:=[static-libs?,${MULTILIB_USEDEP}] ) - elibc_musl? ( - dev-libs/libbsd - sys-libs/argp-standalone - sys-libs/fts-standalone - sys-libs/obstack-standalone - ) -" -DEPEND=" - ${RDEPEND} -" -BDEPEND=" - app-alternatives/lex - sys-devel/m4 - virtual/pkgconfig - nls? ( sys-devel/gettext ) - verify-sig? ( >=sec-keys/openpgp-keys-elfutils-20240301 ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-0.189-musl-aarch64-regs.patch - "${FILESDIR}"/${PN}-0.191-musl-macros.patch -) - -src_prepare() { - default - - if ! use static-libs; then - sed -i -e '/^lib_LIBRARIES/s:=.*:=:' -e '/^%.os/s:%.o$::' lib{asm,dw,elf}/Makefile.in || die - fi - - # https://sourceware.org/PR23914 - sed -i 's:-Werror::' */Makefile.in || die -} - -src_configure() { - # bug #407135 - use test && append-flags -g - - # bug 660738 - filter-flags -fno-asynchronous-unwind-tables - - multilib-minimal_src_configure -} - -multilib_src_configure() { - local myeconfargs=( - $(use_enable nls) - $(multilib_native_use_enable debuginfod) - $(use_enable debuginfod libdebuginfod) - - # explicitly disable thread safety, it's not recommended by upstream - # doesn't build either on musl. - --disable-thread-safety - - # Valgrind option is just for running tests under it; dodgy under sandbox - # and indeed even w/ glibc with newer instructions. - --disable-valgrind - --program-prefix="eu-" - --with-zlib - $(use_with bzip2 bzlib) - $(use_with lzma) - $(use_with zstd) - ) - - # Needed because sets alignment macro - is-flagq -fsanitize=address && myeconfargs+=( --enable-sanitize-address ) - is-flagq -fsanitize=undefined && myeconfargs+=( --enable-sanitize-undefined ) - - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_test() { - env LD_LIBRARY_PATH="${BUILD_DIR}/libelf:${BUILD_DIR}/libebl:${BUILD_DIR}/libdw:${BUILD_DIR}/libasm" \ - LC_ALL="C" \ - emake check VERBOSE=1 -} - -multilib_src_install_all() { - einstalldocs - - dodoc NOTES - - # These build quick, and are needed for most tests, so don't - # disable their building when the USE flag is disabled. - if ! use utils; then - rm -rf "${ED}"/usr/bin || die - fi -} diff --git a/dev-libs/elfutils/files/elfutils-0.189-musl-macros.patch b/dev-libs/elfutils/files/elfutils-0.189-musl-macros.patch deleted file mode 100644 index 97c6c1dcd62e..000000000000 --- a/dev-libs/elfutils/files/elfutils-0.189-musl-macros.patch +++ /dev/null @@ -1,86 +0,0 @@ -May not be required (or at least some hunks) with next release (0.186?) - -https://git.alpinelinux.org/aports/plain/main/elfutils/musl-macros.patch ---- a/lib/libeu.h -+++ b/lib/libeu.h -@@ -31,6 +31,27 @@ - - #include <stddef.h> - #include <stdint.h> -+#include <unistd.h> -+#include <alloca.h> -+#include <string.h> -+ -+#ifndef TEMP_FAILURE_RETRY -+#define TEMP_FAILURE_RETRY(expression) \ -+ (__extension__ \ -+ ({ long int __result; \ -+ do __result = (long int) (expression); \ -+ while (__result == -1L && errno == EINTR); \ -+ __result; })) -+#endif -+ -+#ifndef strndupa -+#define strndupa(s, n) \ -+ (__extension__ ({const char *__in = (s); \ -+ size_t __len = strnlen (__in, (n)) + 1; \ -+ char *__out = (char *) alloca (__len); \ -+ __out[__len-1] = '\0'; \ -+ (char *) memcpy (__out, __in, __len-1);})) -+#endif - - extern void *xmalloc (size_t) __attribute__ ((__malloc__)); - extern void *xcalloc (size_t, size_t) __attribute__ ((__malloc__)); ---- a/src/arlib.h -+++ b/src/arlib.h -@@ -29,6 +29,16 @@ - #include <stdint.h> - #include <sys/types.h> - -+#if !defined(ACCESSPERMS) -+# define ACCESSPERMS (S_IRWXU|S_IRWXG|S_IRWXO) /* 0777 */ -+#endif -+#if !defined(ALLPERMS) -+# define ALLPERMS (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO) /* 07777 */ -+#endif -+#if !defined(DEFFILEMODE) -+# define DEFFILEMODE (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)/* 0666*/ -+#endif -+ - - /* State of -D/-U flags. */ - extern bool arlib_deterministic_output; ---- a/src/elfcompress.c -+++ b/src/elfcompress.c -@@ -37,6 +37,14 @@ - #include "libeu.h" - #include "printversion.h" - -+#if !defined(FNM_EXTMATCH) -+# define FNM_EXTMATCH 0 -+#endif -+ -+#if !defined(ALLPERMS) -+# define ALLPERMS (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO) /* 07777 */ -+#endif -+ - /* Name and version of program. */ - ARGP_PROGRAM_VERSION_HOOK_DEF = print_version; - ---- a/src/strip.c -+++ b/src/strip.c -@@ -45,6 +45,14 @@ - #include <system.h> - #include <printversion.h> - -+#if !defined(FNM_EXTMATCH) -+# define FNM_EXTMATCH 0 -+#endif -+ -+#if !defined(ACCESSPERMS) -+#define ACCESSPERMS (S_IRWXU|S_IRWXG|S_IRWXO) -+#endif -+ - typedef uint8_t GElf_Byte; - - /* Name and version of program. */ diff --git a/dev-libs/ell/Manifest b/dev-libs/ell/Manifest index 9de4d046fae9..ca2c02babb06 100644 --- a/dev-libs/ell/Manifest +++ b/dev-libs/ell/Manifest @@ -1 +1 @@ -DIST ell-0.69.tar.xz 574172 BLAKE2B 3d28392b6cb378a8512667172598ec3cf9b5eeb5f68c65b43a939636a23a03d8f168b500171c4e1224e97bc072e88e9d57e5f02a9d5cbf489d684537070cfeef SHA512 9631b364ba48f984b104cf1091a4dbf10f675b04f58b555f55249d3fec6610c3ccf6e1b0197e807e843b179a39f22c33b8e2a58c4dbcff91bb8c6ce628618f65 +DIST ell-0.71.tar.xz 574408 BLAKE2B ccd0f15504621c183b9f3e8d109f1f66c23d88b2e0773efc2347fabd147e2f45cca53fc49b4e972a9cf57d3623361bee2eb6864a19523624cb1ca0b4203556f2 SHA512 2e75dda61185d545edfc60157ff94cff6562e6fd4580d2613e189651f4cfc0a1fa6e1408275a790c37705073e67607778a4fdf0200faee7d9b0e25b2bcbf659d diff --git a/dev-libs/ell/ell-0.69.ebuild b/dev-libs/ell/ell-0.71.ebuild index 9df526a060e0..300277eeda9f 100644 --- a/dev-libs/ell/ell-0.69.ebuild +++ b/dev-libs/ell/ell-0.71.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 diff --git a/dev-libs/ell/files/0.70/0001-settings-fix-std-c23-build-failure.patch b/dev-libs/ell/files/0.70/0001-settings-fix-std-c23-build-failure.patch new file mode 100644 index 000000000000..7adbb003267a --- /dev/null +++ b/dev-libs/ell/files/0.70/0001-settings-fix-std-c23-build-failure.patch @@ -0,0 +1,43 @@ +https://bugs.gentoo.org/943704 +https://lore.kernel.org/all/20241117001814.2149181-2-slyich@gmail.com/T/#m1770e7c457dbb58d6950ee981c68cdd39a996724 + +From fdfed58104edd309431f738eaf3a7b5361ff9c86 Mon Sep 17 00:00:00 2001 +Message-ID: <fdfed58104edd309431f738eaf3a7b5361ff9c86.1731907744.git.sam@gentoo.org> +From: Sergei Trofimovich <slyich@gmail.com> +Date: Sun, 17 Nov 2024 00:18:11 +0000 +Subject: [PATCH 1/4] settings: fix -std=c23 build failure + +gcc-15 switched to -std=c23 by default: + + https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=55e3bd376b2214e200fa76d12b67ff259b06c212 + +As a result `ell` fails the build as: + + ell/settings.c: In function 'l_settings_get_embedded_value': + ell/settings.c:1521:24: error: incompatible types when returning type '_Bool' but 'const char *' was expected + 1521 | return false; + | ^~~~~ + +The change uses poiter instead of a bool to return the zero value. +--- + ell/settings.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ell/settings.c b/ell/settings.c +index a5f17d1..b46d00b 100644 +--- a/ell/settings.c ++++ b/ell/settings.c +@@ -1518,7 +1518,7 @@ LIB_EXPORT const char *l_settings_get_embedded_value( + struct embedded_group_data *group; + + if (unlikely(!settings)) +- return false; ++ return NULL; + + group = l_queue_find(settings->embedded_groups, + embedded_group_match, group_name); + +base-commit: 373b828093fd48e5f33558bfba9fceaed311486c +-- +2.47.0 + diff --git a/dev-libs/ell/files/0.70/0002-cert-fix-std-c23-build-failure.patch b/dev-libs/ell/files/0.70/0002-cert-fix-std-c23-build-failure.patch new file mode 100644 index 000000000000..85b95a845834 --- /dev/null +++ b/dev-libs/ell/files/0.70/0002-cert-fix-std-c23-build-failure.patch @@ -0,0 +1,67 @@ +https://bugs.gentoo.org/943704 +https://lore.kernel.org/all/20241117001814.2149181-2-slyich@gmail.com/T/#m1770e7c457dbb58d6950ee981c68cdd39a996724 + +From f06bcc6e1b08563ef9a8c8837ad39aaa4357ee43 Mon Sep 17 00:00:00 2001 +Message-ID: <f06bcc6e1b08563ef9a8c8837ad39aaa4357ee43.1731907744.git.sam@gentoo.org> +In-Reply-To: <fdfed58104edd309431f738eaf3a7b5361ff9c86.1731907744.git.sam@gentoo.org> +References: <fdfed58104edd309431f738eaf3a7b5361ff9c86.1731907744.git.sam@gentoo.org> +From: Sergei Trofimovich <slyich@gmail.com> +Date: Sun, 17 Nov 2024 00:18:12 +0000 +Subject: [PATCH 2/4] cert: fix -std=c23 build failure + +gcc-15 switched to -std=c23 by default: + + https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=55e3bd376b2214e200fa76d12b67ff +259b06c212 + +As a result `ell` fails the build as: + + 390 | return false; + | ^~~~~ + +ell/cert.c:390:32: error: incompatible types when returning type '_Bool' but 'const uint8_t *' {aka 'const unsigned char *'} was expected +--- + ell/cert.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/ell/cert.c b/ell/cert.c +index 38bb01a..19a6556 100644 +--- a/ell/cert.c ++++ b/ell/cert.c +@@ -387,13 +387,13 @@ const uint8_t *cert_get_extension(struct l_cert *cert, + + seq = asn1_der_find_elem(ext, end - ext, 0, &tag, &len); + if (unlikely(!seq || tag != ASN1_ID_SEQUENCE)) +- return false; ++ return NULL; + + ext = seq + len; + + oid = asn1_der_find_elem(seq, len, 0, &tag, &oid_len); + if (unlikely(!oid || tag != ASN1_ID_OID)) +- return false; ++ return NULL; + + if (!asn1_oid_eq(ext_id, oid_len, oid)) + continue; +@@ -403,7 +403,7 @@ const uint8_t *cert_get_extension(struct l_cert *cert, + + if (data && tag == ASN1_ID_BOOLEAN) { + if (data_len != 1) +- return false; ++ return NULL; + + critical = *data != 0; /* Tolerate BER booleans */ + +@@ -411,7 +411,7 @@ const uint8_t *cert_get_extension(struct l_cert *cert, + } + + if (unlikely(!data || tag != ASN1_ID_OCTET_STRING)) +- return false; ++ return NULL; + + if (out_critical) + *out_critical = critical; +-- +2.47.0 + diff --git a/dev-libs/ell/files/0.70/0003-dbus-fix-std-c23-build-failure.patch b/dev-libs/ell/files/0.70/0003-dbus-fix-std-c23-build-failure.patch new file mode 100644 index 000000000000..d320a7ba7ab0 --- /dev/null +++ b/dev-libs/ell/files/0.70/0003-dbus-fix-std-c23-build-failure.patch @@ -0,0 +1,45 @@ +https://bugs.gentoo.org/943704 +https://lore.kernel.org/all/20241117001814.2149181-2-slyich@gmail.com/T/#m1770e7c457dbb58d6950ee981c68cdd39a996724 + +From 4aebc7cd5b40df939532bcf4c15e0407e2748750 Mon Sep 17 00:00:00 2001 +Message-ID: <4aebc7cd5b40df939532bcf4c15e0407e2748750.1731907744.git.sam@gentoo.org> +In-Reply-To: <fdfed58104edd309431f738eaf3a7b5361ff9c86.1731907744.git.sam@gentoo.org> +References: <fdfed58104edd309431f738eaf3a7b5361ff9c86.1731907744.git.sam@gentoo.org> +From: Sergei Trofimovich <slyich@gmail.com> +Date: Sun, 17 Nov 2024 00:18:13 +0000 +Subject: [PATCH 3/4] dbus: fix -std=c23 build failure + +gcc-15 switched to -std=c23 by default: + + https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=55e3bd376b2214e200fa76d12b67ff259b06c212 + +As a result `ell` fails the build as: + + 1700 | return false; + | ^~~~~ + +ell/dbus.c:1700:24: error: incompatible types when returning type '_Bool' but 'void *' was expected +--- + ell/dbus.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/ell/dbus.c b/ell/dbus.c +index bd6e1b8..1ab4ded 100644 +--- a/ell/dbus.c ++++ b/ell/dbus.c +@@ -1697,10 +1697,10 @@ LIB_EXPORT void *l_dbus_object_get_data(struct l_dbus *dbus, const char *object, + const char *interface) + { + if (unlikely(!dbus)) +- return false; ++ return NULL; + + if (unlikely(!dbus->tree)) +- return false; ++ return NULL; + + return _dbus_object_tree_get_interface_data(dbus->tree, object, + interface); +-- +2.47.0 + diff --git a/dev-libs/ell/files/0.70/0004-test-rtnl-fix-std-c23-build-failure.patch b/dev-libs/ell/files/0.70/0004-test-rtnl-fix-std-c23-build-failure.patch new file mode 100644 index 000000000000..a170e2475b0c --- /dev/null +++ b/dev-libs/ell/files/0.70/0004-test-rtnl-fix-std-c23-build-failure.patch @@ -0,0 +1,58 @@ +https://bugs.gentoo.org/943704 +https://lore.kernel.org/all/20241117001814.2149181-2-slyich@gmail.com/T/#m1770e7c457dbb58d6950ee981c68cdd39a996724 + +From f5048a5412a0f046c58e1566569dfcc31cd5b5d6 Mon Sep 17 00:00:00 2001 +Message-ID: <f5048a5412a0f046c58e1566569dfcc31cd5b5d6.1731907744.git.sam@gentoo.org> +In-Reply-To: <fdfed58104edd309431f738eaf3a7b5361ff9c86.1731907744.git.sam@gentoo.org> +References: <fdfed58104edd309431f738eaf3a7b5361ff9c86.1731907744.git.sam@gentoo.org> +From: Sergei Trofimovich <slyich@gmail.com> +Date: Sun, 17 Nov 2024 00:18:14 +0000 +Subject: [PATCH 4/4] test-rtnl: fix -std=c23 build failure + +gcc-15 switched to -std=c23 by default: + + https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=55e3bd376b2214e200fa76d12b67ff259b06c212 + +As a result `ell` fails the build as: + + passing argument 1 of 'l_idle_oneshot' from incompatible pointer type [-Wincompatible-pointer-types] + 501 | l_idle_oneshot(test_next, NULL, NULL); + | ^~~~~~~~~ + | | + | void (*)(void) + +unit/test-rtnl.c: In function 'test_run': +unit/test-rtnl.c:501:24: error: +--- + unit/test-rtnl.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/unit/test-rtnl.c b/unit/test-rtnl.c +index 59d8492..6fbac9e 100644 +--- a/unit/test-rtnl.c ++++ b/unit/test-rtnl.c +@@ -358,6 +358,12 @@ static void test_next() + test->start(rtnl, test->data); + } + ++static void test_next_cb(void * unused) ++{ ++ (void)unused; ++ test_next(); ++} ++ + #define test_assert(cond) \ + do { \ + if (!(cond)) { \ +@@ -498,7 +504,7 @@ static void test_run(void) + { + success = false; + +- l_idle_oneshot(test_next, NULL, NULL); ++ l_idle_oneshot(test_next_cb, NULL, NULL); + l_main_run_with_signal(signal_handler, NULL); + } + +-- +2.47.0 + diff --git a/dev-libs/expat/Manifest b/dev-libs/expat/Manifest index 5d7d530e8311..89616753658b 100644 --- a/dev-libs/expat/Manifest +++ b/dev-libs/expat/Manifest @@ -1,5 +1,2 @@ -DIST expat-2.5.0.tar.xz 460560 BLAKE2B 670298d076ff3b512a0212170d40cb04c601a11d6b152f215a5302ad3238c69c2386393d7a6c70bc284be35ce97bf27d87115c3391f4bc17406e509d739d3e31 SHA512 2da73b991b7c0c54440485c787e5edeb3567230204e31b3cac1c3a6713ec6f9f1554d3afffc0f8336168dfd5df02db4a69bcf21b4d959723d14162d13ab87516 -DIST expat-2.6.0.tar.xz 483448 BLAKE2B 2f0117317bde4e03d8662bcac1ff6c2bbb1af694846b21a82ac12d11ccd43032b481af72fa35298c3cb19b7426dba6a67e703904ca7b05663ffd854a42348bd0 SHA512 d6f1c4a1a2ec8ffc04c04d6767cc8dd7dea3d132d10b8a2c45c5bfb405893c75db032b87a56cc88300b61c961dd7f9782b93aa74dddc7e66f25acb0c6c82b1fd -DIST expat-2.6.1.tar.xz 484000 BLAKE2B 21a177ae8d70ca1bf41cae75c299a3021a9fc1b9d5eb01eb2945b16d7b24dcbeabad855379bdd8a14de804e1a1648105ce03b505f68c2beb4096a81020e35848 SHA512 fcd7e04e9411799c48b7d08ea07808a0809d034453a0649d9a79ed09000f1a11e5082a034089fc0c0acd2789e85bdf1deb2a94d8e3e33791bbfed66ce7207bcc -DIST expat-2.6.2.tar.xz 485236 BLAKE2B aae019270e1ab233fe8480b7eaa77f648f23ef3383dc772dc946cb13163067431716dc5446862eb502315fd089f2f52f3d476589b74a97e462575cd54df44db4 SHA512 47b60967d6346d330dded87ea1a2957aa7d34dd825043386a89aa131054714f618ede57bfe97cf6caa40582a4bc67e198d2a915e7d8dbe8ee4f581857c2e3c2e DIST expat-2.6.3.tar.xz 485600 BLAKE2B b8e0a0e779f0f136eaca91115cbbcf5a5cca457cab1cca6f8d6141151d19f8ef2dccb41b0e9134459c1e7d99cb2e0b4ce3922d2bd9221002ec43fe9d53a0084a SHA512 e02c4ad88f9d539258aa1c1db71ded7770a8f12c77b5535e5b34f040ae5b1361ef23132f16d96bdb7c096a83acd637a7c907916bdfcc6d5cfb9e35d04020ca0b +DIST expat-2.6.4.tar.xz 486732 BLAKE2B 70d716722358db8d0acb2c74dbbc9d2362d04a0b856eab6b6d723614b656cf6aad9f6646339e0a32b4151db2e9541439bcb81ec87791e5e6ec0bd36a3ca067cc SHA512 620da34d98524478b445038bf1dd439790fe11169496516425fca922226797835c27549fc5fb825792b516563b24eb922d9ad8f27d20a0229e7ee8cd640dfb25 diff --git a/dev-libs/expat/expat-2.6.0.ebuild b/dev-libs/expat/expat-2.6.0.ebuild deleted file mode 100644 index 6831ba968e9d..000000000000 --- a/dev-libs/expat/expat-2.6.0.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -AUTOTOOLS_AUTO_DEPEND=no -AT_NOEAUTOHEADER=yes # because expat_config.h.in would need post-processing -inherit autotools multilib-minimal - -DESCRIPTION="Stream-oriented XML parser library" -HOMEPAGE="https://libexpat.github.io/" -SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/expat-${PV}.tar.xz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="examples static-libs test unicode" -RESTRICT="!test? ( test )" -BDEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )" - -DOCS=( README.md ) - -src_prepare() { - default - - # fix interpreter to be a recent/good shell - sed -i -e "1s:/bin/sh:${BASH}:" conftools/get-version.sh || die - if use unicode; then - cp -R "${S}" "${S}"w || die - pushd "${S}"w >/dev/null - find -name Makefile.am \ - -exec sed \ - -e 's,libexpat\.la,libexpatw.la,' \ - -e 's,libexpat_la,libexpatw_la,' \ - -i {} + || die - eautoreconf - popd >/dev/null - fi -} - -multilib_src_configure() { - local myconf="$(use_with test tests) $(use_enable static-libs static) --without-docbook" - - mkdir -p "${BUILD_DIR}"w || die - - if use unicode; then - pushd "${BUILD_DIR}"w >/dev/null - CPPFLAGS="${CPPFLAGS} -DXML_UNICODE" ECONF_SOURCE="${S}"w econf ${myconf} - popd >/dev/null - fi - - ECONF_SOURCE="${S}" econf ${myconf} -} - -multilib_src_compile() { - emake - - if use unicode; then - pushd "${BUILD_DIR}"w >/dev/null - emake -C lib - popd >/dev/null - fi -} - -multilib_src_install() { - emake install DESTDIR="${D}" - - if use unicode; then - pushd "${BUILD_DIR}"w >/dev/null - emake -C lib install DESTDIR="${D}" - popd >/dev/null - - pushd "${ED}"/usr/$(get_libdir)/pkgconfig >/dev/null - cp expat.pc expatw.pc - sed -i -e '/^Libs/s:-lexpat:&w:' expatw.pc || die - popd >/dev/null - fi -} - -multilib_src_install_all() { - einstalldocs - - doman doc/xmlwf.1 - - # Note: Use of HTML_DOCS would add unwanted "doc" subfolder - docinto html - dodoc doc/*.{css,html} - - if use examples; then - docinto examples - dodoc examples/*.c - docompress -x usr/share/doc/${PF}/examples - fi - - find "${D}" -name '*.la' -type f -delete || die -} diff --git a/dev-libs/expat/expat-2.6.1.ebuild b/dev-libs/expat/expat-2.6.1.ebuild deleted file mode 100644 index c156f565c7a4..000000000000 --- a/dev-libs/expat/expat-2.6.1.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -AUTOTOOLS_AUTO_DEPEND=no -AT_NOEAUTOHEADER=yes # because expat_config.h.in would need post-processing -inherit autotools multilib-minimal - -DESCRIPTION="Stream-oriented XML parser library" -HOMEPAGE="https://libexpat.github.io/" -SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/expat-${PV}.tar.xz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="examples static-libs test unicode" -RESTRICT="!test? ( test )" -BDEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )" - -DOCS=( README.md ) - -QA_CONFIG_IMPL_DECL_SKIP=( - # https://bugs.gentoo.org/906384 - arc4random - arc4random_buf -) - -src_prepare() { - default - - # fix interpreter to be a recent/good shell - sed -i -e "1s:/bin/sh:${BASH}:" conftools/get-version.sh || die - if use unicode; then - cp -R "${S}" "${S}"w || die - pushd "${S}"w >/dev/null - find -name Makefile.am \ - -exec sed \ - -e 's,libexpat\.la,libexpatw.la,' \ - -e 's,libexpat_la,libexpatw_la,' \ - -i {} + || die - eautoreconf - popd >/dev/null - fi -} - -multilib_src_configure() { - local myconf="$(use_with test tests) $(use_enable static-libs static) --without-docbook" - - mkdir -p "${BUILD_DIR}"w || die - - if use unicode; then - pushd "${BUILD_DIR}"w >/dev/null - CPPFLAGS="${CPPFLAGS} -DXML_UNICODE" ECONF_SOURCE="${S}"w econf ${myconf} - popd >/dev/null - fi - - ECONF_SOURCE="${S}" econf ${myconf} -} - -multilib_src_compile() { - emake - - if use unicode; then - pushd "${BUILD_DIR}"w >/dev/null - emake -C lib - popd >/dev/null - fi -} - -multilib_src_install() { - emake install DESTDIR="${D}" - - if use unicode; then - pushd "${BUILD_DIR}"w >/dev/null - emake -C lib install DESTDIR="${D}" - popd >/dev/null - - pushd "${ED}"/usr/$(get_libdir)/pkgconfig >/dev/null - cp expat.pc expatw.pc - sed -i -e '/^Libs/s:-lexpat:&w:' expatw.pc || die - popd >/dev/null - fi -} - -multilib_src_install_all() { - einstalldocs - - doman doc/xmlwf.1 - - # Note: Use of HTML_DOCS would add unwanted "doc" subfolder - docinto html - dodoc doc/*.{css,html} - - if use examples; then - docinto examples - dodoc examples/*.c - docompress -x usr/share/doc/${PF}/examples - fi - - find "${D}" -name '*.la' -type f -delete || die -} diff --git a/dev-libs/expat/expat-2.6.2.ebuild b/dev-libs/expat/expat-2.6.2.ebuild deleted file mode 100644 index c156f565c7a4..000000000000 --- a/dev-libs/expat/expat-2.6.2.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -AUTOTOOLS_AUTO_DEPEND=no -AT_NOEAUTOHEADER=yes # because expat_config.h.in would need post-processing -inherit autotools multilib-minimal - -DESCRIPTION="Stream-oriented XML parser library" -HOMEPAGE="https://libexpat.github.io/" -SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/expat-${PV}.tar.xz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="examples static-libs test unicode" -RESTRICT="!test? ( test )" -BDEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )" - -DOCS=( README.md ) - -QA_CONFIG_IMPL_DECL_SKIP=( - # https://bugs.gentoo.org/906384 - arc4random - arc4random_buf -) - -src_prepare() { - default - - # fix interpreter to be a recent/good shell - sed -i -e "1s:/bin/sh:${BASH}:" conftools/get-version.sh || die - if use unicode; then - cp -R "${S}" "${S}"w || die - pushd "${S}"w >/dev/null - find -name Makefile.am \ - -exec sed \ - -e 's,libexpat\.la,libexpatw.la,' \ - -e 's,libexpat_la,libexpatw_la,' \ - -i {} + || die - eautoreconf - popd >/dev/null - fi -} - -multilib_src_configure() { - local myconf="$(use_with test tests) $(use_enable static-libs static) --without-docbook" - - mkdir -p "${BUILD_DIR}"w || die - - if use unicode; then - pushd "${BUILD_DIR}"w >/dev/null - CPPFLAGS="${CPPFLAGS} -DXML_UNICODE" ECONF_SOURCE="${S}"w econf ${myconf} - popd >/dev/null - fi - - ECONF_SOURCE="${S}" econf ${myconf} -} - -multilib_src_compile() { - emake - - if use unicode; then - pushd "${BUILD_DIR}"w >/dev/null - emake -C lib - popd >/dev/null - fi -} - -multilib_src_install() { - emake install DESTDIR="${D}" - - if use unicode; then - pushd "${BUILD_DIR}"w >/dev/null - emake -C lib install DESTDIR="${D}" - popd >/dev/null - - pushd "${ED}"/usr/$(get_libdir)/pkgconfig >/dev/null - cp expat.pc expatw.pc - sed -i -e '/^Libs/s:-lexpat:&w:' expatw.pc || die - popd >/dev/null - fi -} - -multilib_src_install_all() { - einstalldocs - - doman doc/xmlwf.1 - - # Note: Use of HTML_DOCS would add unwanted "doc" subfolder - docinto html - dodoc doc/*.{css,html} - - if use examples; then - docinto examples - dodoc examples/*.c - docompress -x usr/share/doc/${PF}/examples - fi - - find "${D}" -name '*.la' -type f -delete || die -} diff --git a/dev-libs/expat/expat-2.5.0.ebuild b/dev-libs/expat/expat-2.6.4.ebuild index 147a248aae0d..1ed4e7d7dbe1 100644 --- a/dev-libs/expat/expat-2.5.0.ebuild +++ b/dev-libs/expat/expat-2.6.4.ebuild @@ -1,9 +1,8 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 AUTOTOOLS_AUTO_DEPEND=no -AT_NOEAUTOHEADER=yes # because expat_config.h.in would need post-processing inherit autotools multilib-minimal DESCRIPTION="Stream-oriented XML parser library" @@ -19,6 +18,12 @@ BDEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )" DOCS=( README.md ) +QA_CONFIG_IMPL_DECL_SKIP=( + # https://bugs.gentoo.org/906384 + arc4random + arc4random_buf +) + src_prepare() { default diff --git a/dev-libs/ffcall/Manifest b/dev-libs/ffcall/Manifest index 956d5f041533..1d17452042f3 100644 --- a/dev-libs/ffcall/Manifest +++ b/dev-libs/ffcall/Manifest @@ -1 +1,2 @@ DIST libffcall-2.4.tar.gz 1253767 BLAKE2B 669bf556f082b533eb7d71ebc6fadeac464b1a6054ac8078c9315678929bcfb8ad4b7376b345bcfbb5d2caf9d45179012d4bb5a08ad675f475f58570ae96b7ae SHA512 c9451662764a888e3be21499c29673bfb0e1df4915814da3506db5d395a2b00ea2f0c08d1c9dffebf030179f9347794876ec6ec9e6710b4fc70fd760960335e6 +DIST libffcall-2.5.tar.gz 1451999 BLAKE2B 552a0a33bbed91380ced4bdb0f87f38be0a531e729b9530d80dd777ce93b4fe3515a984c2da0221e0110756fbbc099d666b1fed6f5cfacfccbedda7f97e58054 SHA512 5e5b1c34b9e66bde00e1deea464099ef09e439070e8180c04f2520442933e369e76632346ae59a5720356128787e88255bd75764736ac9b5334a592eb6cf5878 diff --git a/dev-libs/ffcall/ffcall-2.4-r1.ebuild b/dev-libs/ffcall/ffcall-2.4-r1.ebuild index 88002acc4cdb..9dd7818a3c81 100644 --- a/dev-libs/ffcall/ffcall-2.4-r1.ebuild +++ b/dev-libs/ffcall/ffcall-2.4-r1.ebuild @@ -17,7 +17,7 @@ S="${WORKDIR}"/${MY_PV} # under GNU LGPL." -ffcall author LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" PATCHES=( # bug 842915, drop on next version bump diff --git a/dev-libs/ffcall/ffcall-2.5.ebuild b/dev-libs/ffcall/ffcall-2.5.ebuild new file mode 100644 index 000000000000..7f9d8f6bfae9 --- /dev/null +++ b/dev-libs/ffcall/ffcall-2.5.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic libtool + +MY_PV="libffcall-${PV}" + +DESCRIPTION="Build foreign function call interfaces in embedded interpreter" +HOMEPAGE="https://www.gnu.org/software/libffcall/" +SRC_URI="mirror://gnu/libffcall/${MY_PV}.tar.gz" +S="${WORKDIR}"/${MY_PV} + +# "Ffcall is under GNU GPL. As a special exception, if used in GNUstep +# or in derivate works of GNUstep, the included parts of ffcall are +# under GNU LGPL." -ffcall author +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" + +src_prepare() { + # The build system is a strange mix of autogenerated + # files and manual tweaks on top. Uses $CFLAGS / $LDFLAGS randomly. + # We are adding them consistently here and a bit over the top: + # bugs: #334581 + local mfi + for mfi in {,*/,*/*/,}Makefile.in ; do + einfo "Patching '${mfi}'" + # usually uses only assembler here, but -march= + # and -Wa, are a must to pass here. + sed -e 's/$(CC) /&$(CFLAGS) /g' \ + -i "${mfi}" || die + done + + default + elibtoolize +} + +src_configure() { + append-flags -fPIC + + # Doc goes in datadir + econf \ + --datadir="${EPREFIX}"/usr/share/doc/${PF} \ + --enable-shared +} + +src_compile() { + emake -j1 +} + +src_install() { + dodoc NEWS README + dodir /usr/share/man + + default + + find "${ED}" -name '*.la' -delete || die +} diff --git a/dev-libs/flatbuffers/Manifest b/dev-libs/flatbuffers/Manifest index 080fa756df8b..a946a5128816 100644 --- a/dev-libs/flatbuffers/Manifest +++ b/dev-libs/flatbuffers/Manifest @@ -1 +1,3 @@ -DIST flatbuffers-24.3.25.gh.tar.gz 2297829 BLAKE2B f3a5a94119a1b1b63fba9126e1cdff7ab712996bfc0d65626a679405f62dfa722bc5de244ef775fba336224b60feff3aa27acf54bed027c4013590b4afbefe7c SHA512 e2a614f4fc526ce07bfe1e1bc79efd3c87acbdb93aee7b42994d4855abd2593f36b5ca1edb53c7dcd470d5fbe14a3e394bd75dcebb4458cc0aeb33d622a3c662 +DIST flatbuffers-24.12.23.gh.tar.gz 2326944 BLAKE2B d32d8f861cfb2eff23cdedda01d4e0bd2f203c4d4bf1d0ade1a06ce9caf9fcf3b43c58f2e5bf9014892c184f819ab8005b322d6e96b9f3c9b9c5624eef12642f SHA512 f97762ba41b9cfef648e93932fd789324c6bb6ebc5b7aeca8185c9ef602294b67d73aea7ae371035579a1419cbfbeba7c3e88b31b5a5848db98f5e8a03b982b1 +DIST flatbuffers-25.1.21.gh.tar.gz 2432983 BLAKE2B 5c869588cd0de48c31d37564050f6b254a5cb310ff5a46c5afd5fc05829b3ca686ff404749de8f3d33921bc1551a34d5da01bb2fdff0c4aa5c5ec97e43924487 SHA512 809366e176f4459ee3010b7c3e2c7e6f800fdf0c5cc2d39846885e793fd933602176aeecbfbdc92aec7dadbcd54fc8ba0d57741c034251078136262bdac10ce8 +DIST flatbuffers-25.1.24.gh.tar.gz 2430616 BLAKE2B 36e74e8ed537e363edc74cdf7b58a9ae39f0f2d587ee2ac14f4bf14b22bb77b8f63b1c682d44c20be895cbf399f41fb194796c3598d0550c7bfe0f4b9ff90c43 SHA512 48694fa20e41ffefd2ee264f570e96516853da0bce66c3e29b40e66baa62fdc4e38642de395307e4503743e7e2034654211d3866406be2d44dc582b61dfc25f7 diff --git a/dev-libs/flatbuffers/flatbuffers-24.3.25.ebuild b/dev-libs/flatbuffers/flatbuffers-24.12.23.ebuild index ead2e8a0a127..07228e942d39 100644 --- a/dev-libs/flatbuffers/flatbuffers-24.3.25.ebuild +++ b/dev-libs/flatbuffers/flatbuffers-24.12.23.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 diff --git a/dev-libs/flatbuffers/flatbuffers-25.1.21.ebuild b/dev-libs/flatbuffers/flatbuffers-25.1.21.ebuild new file mode 100644 index 000000000000..cdd8e1c2f807 --- /dev/null +++ b/dev-libs/flatbuffers/flatbuffers-25.1.21.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Memory efficient serialization library" +HOMEPAGE=" + https://flatbuffers.dev/ + https://github.com/google/flatbuffers/ +" +SRC_URI=" + https://github.com/google/flatbuffers/archive/v${PV}.tar.gz + -> ${P}.gh.tar.gz +" + +LICENSE="Apache-2.0" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86" +IUSE="static-libs test" +RESTRICT="!test? ( test )" + +src_configure() { + local mycmakeargs=( + -DFLATBUFFERS_BUILD_FLATLIB=$(usex static-libs) + -DFLATBUFFERS_BUILD_SHAREDLIB=ON + -DFLATBUFFERS_BUILD_TESTS=$(usex test) + -DFLATBUFFERS_BUILD_BENCHMARKS=OFF + ) + + cmake_src_configure +} diff --git a/dev-libs/flatbuffers/flatbuffers-25.1.24.ebuild b/dev-libs/flatbuffers/flatbuffers-25.1.24.ebuild new file mode 100644 index 000000000000..cdd8e1c2f807 --- /dev/null +++ b/dev-libs/flatbuffers/flatbuffers-25.1.24.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Memory efficient serialization library" +HOMEPAGE=" + https://flatbuffers.dev/ + https://github.com/google/flatbuffers/ +" +SRC_URI=" + https://github.com/google/flatbuffers/archive/v${PV}.tar.gz + -> ${P}.gh.tar.gz +" + +LICENSE="Apache-2.0" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86" +IUSE="static-libs test" +RESTRICT="!test? ( test )" + +src_configure() { + local mycmakeargs=( + -DFLATBUFFERS_BUILD_FLATLIB=$(usex static-libs) + -DFLATBUFFERS_BUILD_SHAREDLIB=ON + -DFLATBUFFERS_BUILD_TESTS=$(usex test) + -DFLATBUFFERS_BUILD_BENCHMARKS=OFF + ) + + cmake_src_configure +} diff --git a/dev-libs/freexl/freexl-2.0.0-r1.ebuild b/dev-libs/freexl/freexl-2.0.0-r1.ebuild index 19c2c632a0f1..5b679836e2b5 100644 --- a/dev-libs/freexl/freexl-2.0.0-r1.ebuild +++ b/dev-libs/freexl/freexl-2.0.0-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://www.gaia-gis.it/gaia-sins/${PN}-sources/${P}.tar.gz" LICENSE="|| ( MPL-1.1 GPL-2+ LGPL-2.1+ )" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~riscv x86" DEPEND=" dev-libs/expat diff --git a/dev-libs/fribidi/Manifest b/dev-libs/fribidi/Manifest index 0c2bd2c704d2..51d79117eabb 100644 --- a/dev-libs/fribidi/Manifest +++ b/dev-libs/fribidi/Manifest @@ -1 +1,2 @@ DIST fribidi-1.0.13.tar.xz 1170100 BLAKE2B 8cc31220304ddbdeb0047b30ed9084921920b32ad3f1bdcf29ecbb2fafbd430c391bc99bb7f205546ff8482aea1ef7ed369da71deb3474aa623fc2aeace1b62a SHA512 09357d842ff9e05b918f826e28e4a25ad996e17f73242ee9ce53fae9f37ec6c639f9cae4271577f6e0269f34265afc893858225c4a94610f0a6ee7580fb1fe07 +DIST fribidi-1.0.16.tar.xz 1098260 BLAKE2B 9a0dce6152ba0f0ca4a42a83ca0f6d234fb9fef2a681d274aab6922e3394b70430e677fd549b17b13d928d733c0e72a7e3527cfb461971bbfd155ec1bd5e738c SHA512 e3a56f36155f6813e3609473639fc533de742309f561c463012dc90b412a1ac7694b765d92669b2cbfaee973ca0e92fa5e926e68a1a078921f26ef17d82ab651 diff --git a/dev-libs/fribidi/fribidi-1.0.16.ebuild b/dev-libs/fribidi/fribidi-1.0.16.ebuild new file mode 100644 index 000000000000..2da9139de635 --- /dev/null +++ b/dev-libs/fribidi/fribidi-1.0.16.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson-multilib + +DESCRIPTION="A free implementation of the unicode bidirectional algorithm" +HOMEPAGE="https://fribidi.org/" +SRC_URI="https://github.com/fribidi/fribidi/releases/download/v${PV}/${P}.tar.xz" + +LICENSE="LGPL-2.1+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + +IUSE="doc test" +RESTRICT="!test? ( test )" + +BDEPEND="virtual/pkgconfig" + +multilib_src_configure() { + local emesonargs=( + -Ddeprecated=true + $(meson_native_use_bool doc docs) + -Dbin=true + $(meson_use test tests) + ) + meson_src_configure +} diff --git a/dev-libs/girara/girara-9999.ebuild b/dev-libs/girara/girara-9999.ebuild index 5857ec363588..d5d5f640f369 100644 --- a/dev-libs/girara/girara-9999.ebuild +++ b/dev-libs/girara/girara-9999.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://pwmt.org/projects/girara/" if [[ ${PV} == *9999 ]]; then inherit git-r3 - EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git" + EGIT_REPO_URI="https://github.com/pwmt/${PN}.git" EGIT_BRANCH="develop" else SRC_URI="https://pwmt.org/projects/girara/download/${P}.tar.xz" diff --git a/dev-libs/gjs/gjs-1.80.2.ebuild b/dev-libs/gjs/gjs-1.80.2.ebuild index a8f7db81a5f7..dad161a150e5 100644 --- a/dev-libs/gjs/gjs-1.80.2.ebuild +++ b/dev-libs/gjs/gjs-1.80.2.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gjs" LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 arm arm64 ~loong ~mips ~ppc ppc64 ~riscv x86" IUSE="+cairo examples readline sysprof test" RESTRICT="!test? ( test )" diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest index 3eb58284cb81..b63ac5ea0b90 100644 --- a/dev-libs/glib/Manifest +++ b/dev-libs/glib/Manifest @@ -2,4 +2,7 @@ DIST glib-2.76.4.tar.xz 5274356 BLAKE2B c9ceb514ea81e1e6ab2d0efc82c48c0d8ae6c997 DIST glib-2.78.3.tar.xz 5321388 BLAKE2B 6ef754b15e1ce4377eafdfc317025ac65c3d8010a8816a0cef786cec9da2af9f7d7d1da735c971ab8c848b2dcec050330e5b0fdceb156a36d739848e6160cd19 SHA512 9c1af75fb973d23ce0286d5b7836eea45f9628c148ced5ac10e10abceda05024ae4c57f01439824d3287d986527500b7b959828b630b6e4a3314b5224f4d7246 DIST glib-2.78.4.tar.xz 5331892 BLAKE2B ada7134597d7d863e581a2bb1097ac07a63b27b53309aadab5b1d3686327ee718ad8c5c07af3fce5cc12328e728fc2c4df5fd9e69f431fa00dc634062ef7f926 SHA512 6f3a06e10e7373a2dbf0688512de4126472fb73cbec488b7983b5ffecff09c64d7e1ca462f892e8f215d3d277d103ca802bad7ef0bd0f91edf26fc6ce67187b6 DIST glib-2.78.6.tar.xz 5344808 BLAKE2B d16173794c4aa019459cf8c8c84d4107fb8393828f41ec6c631b9452890f34f9022ed848a543ed134fdb8a575faef6b941cea3e05de512eb1b7a99f7601a2485 SHA512 8d75f8fd77b6309215ca86a0c7648878efe11051f18b279840c137669017ea4066388f8682367e4ea3f154333d833c9dc28ccd4a66a91f0c3854a40a2838f8da -DIST glib-2.80.4.tar.xz 5535760 BLAKE2B 1d2b301703b27a5c2def370e1d44b4f7b08a940969563ce9d8d7c38e5f0a32163b95523e09cedc4a57b2af84a57d63dc545abcb31b61a8066ef62ba396fb4f3c SHA512 efdc7dd1e0609b0f2d988a8cc8fd4a3fda96e8450832f905f7686f9063b727cb996e0e4e638aca62f60b76f9f04be62e089a615413e64cf298c7eef26e074570 +DIST glib-2.80.5.tar.xz 5538308 BLAKE2B 3f17ff85a85d20858b69c2dccc1e5d6ffd92661a8cfda8b8770dd391861999ff3381008f4fe382e90f0a7798fe218debda7f559f6e3ac8f9305e3be98b879969 SHA512 c9cc9f99e217fd950810fcfbfa7300c7850cae4dbfbabc03cdcadb6dcca2e51ea7979ceb68c09d8e9776fd1c04db73b89b81f748c8bd911e1f7ad9f704dff172 +DIST glib-2.82.4.tar.xz 5556896 BLAKE2B 62caecc7570b1639f6ddf1deb9debb6d3d6180b74f497f2fcace5ce65d6e28996555d51e5b4980f500bdc3f811b5b6214521b1170f553f2fa1fd240fd0eec835 SHA512 5df0b3c56fe6cf6c94019e29afb408174a5864cdb97cf58d5a12a0f83990b5c2004a49c8e3b0e195f5808874b5911a4a7b3d6aea8718aada1b40561e623cd08d +DIST gobject-introspection-1.80.1.tar.xz 1040228 BLAKE2B 7a8c1da9bc8aef293deedde1eed97536fa2f42f79a9761ac8ededb0676e46b636545a69e20e63d812844aeb626fa4fb7ce3c7922e51554fdc79560f16443acd9 SHA512 f45c2c1b105086488d974c6134db9910746df8edb187772f2ecd249656a1047c8ac88ba51f5bf7393c3d99c3ace143ecd09be256c2f4d0ceee110c9ad51a839a +DIST gobject-introspection-1.82.0.tar.xz 1052872 BLAKE2B 8336ae26d48a71a203655d9d268076f603055ceabb55dbfa676f2c67b4096b83afc106d485dc45d02b3a8be806f9ef50d54806a82e61f2a252ae59543c61e934 SHA512 e139fadb4174c72b648914f3774d89fc0e5eaee45bba0c13edf05de883664dad8276dbc34006217bb09871ed4bad23adab51ff232a17b9eb131329b2926cafb7 diff --git a/dev-libs/glib/files/glib-2.80.5-gobject-introspection-1.80.patch b/dev-libs/glib/files/glib-2.80.5-gobject-introspection-1.80.patch new file mode 100644 index 000000000000..3e31626a3fff --- /dev/null +++ b/dev-libs/glib/files/glib-2.80.5-gobject-introspection-1.80.patch @@ -0,0 +1,103 @@ +https://bugs.gentoo.org/946578 +https://gitlab.gnome.org/GNOME/gobject-introspection/-/commit/a2139dba59eac283a7f543ed737f038deebddc19 + +From a2139dba59eac283a7f543ed737f038deebddc19 Mon Sep 17 00:00:00 2001 +From: Christoph Reiter <reiter.christoph@gmail.com> +Date: Wed, 28 Aug 2024 21:26:02 +0200 +Subject: [PATCH] giscanner: remove dependency on distutils.msvccompiler + +It was removed with setuptools 74.0.0. Since we still depend on the +MSVCCompiler class use new_compiler() to get it some other way. + +Remove any reference to MSVC9Compiler, which was for Visual Studio 2008 +which we no longer support anyway. + +Fixes #515 +--- + giscanner/ccompiler.py | 7 +++---- + giscanner/msvccompiler.py | 14 +++++++------- + 2 files changed, 10 insertions(+), 11 deletions(-) + +diff --git a/giscanner/ccompiler.py b/giscanner/ccompiler.py +index d0ed70a3c..9a732cd5e 100644 +--- a/giscanner/ccompiler.py ++++ b/giscanner/ccompiler.py +@@ -26,7 +26,6 @@ import tempfile + import sys + import distutils + +-from distutils.msvccompiler import MSVCCompiler + from distutils.unixccompiler import UnixCCompiler + from distutils.cygwinccompiler import Mingw32CCompiler + from distutils.sysconfig import get_config_vars +@@ -167,7 +166,7 @@ class CCompiler(object): + # Now, create the distutils ccompiler instance based on the info we have. + if compiler_name == 'msvc': + # For MSVC, we need to create a instance of a subclass of distutil's +- # MSVC9Compiler class, as it does not provide a preprocess() ++ # MSVCCompiler class, as it does not provide a preprocess() + # implementation + from . import msvccompiler + self.compiler = msvccompiler.get_msvc_compiler() +@@ -460,7 +459,7 @@ class CCompiler(object): + return self.compiler.linker_exe + + def check_is_msvc(self): +- return isinstance(self.compiler, MSVCCompiler) ++ return self.compiler.compiler_type == "msvc" + + # Private APIs + def _set_cpp_options(self, options): +@@ -486,7 +485,7 @@ class CCompiler(object): + # macros for compiling using distutils + # get dropped for MSVC builds, so + # escape the escape character. +- if isinstance(self.compiler, MSVCCompiler): ++ if self.check_is_msvc(): + macro_value = macro_value.replace('\"', '\\\"') + macros.append((macro_name, macro_value)) + elif option.startswith('-U'): +diff --git a/giscanner/msvccompiler.py b/giscanner/msvccompiler.py +index 0a5439820..e333a80f5 100644 +--- a/giscanner/msvccompiler.py ++++ b/giscanner/msvccompiler.py +@@ -19,30 +19,30 @@ + # + + import os +-import distutils ++from typing import Type + + from distutils.errors import DistutilsExecError, CompileError +-from distutils.ccompiler import CCompiler, gen_preprocess_options ++from distutils.ccompiler import CCompiler, gen_preprocess_options, new_compiler + from distutils.dep_util import newer + + # Distutil's MSVCCompiler does not provide a preprocess() + # Implementation, so do our own here. + + ++DistutilsMSVCCompiler: Type = type(new_compiler(compiler="msvc")) ++ ++ + def get_msvc_compiler(): + return MSVCCompiler() + + +-class MSVCCompiler(distutils.msvccompiler.MSVCCompiler): ++class MSVCCompiler(DistutilsMSVCCompiler): + + def __init__(self, verbose=0, dry_run=0, force=0): +- super(distutils.msvccompiler.MSVCCompiler, self).__init__() ++ super(DistutilsMSVCCompiler, self).__init__() + CCompiler.__init__(self, verbose, dry_run, force) + self.__paths = [] + self.__arch = None # deprecated name +- if os.name == 'nt': +- if isinstance(self, distutils.msvc9compiler.MSVCCompiler): +- self.__version = distutils.msvc9compiler.VERSION + self.initialized = False + self.preprocess_options = None + if self.check_is_clang_cl(): +-- +GitLab diff --git a/dev-libs/glib/files/glib-2.80.5-tests-autoptr-ffi.patch b/dev-libs/glib/files/glib-2.80.5-tests-autoptr-ffi.patch new file mode 100644 index 000000000000..0130481897ef --- /dev/null +++ b/dev-libs/glib/files/glib-2.80.5-tests-autoptr-ffi.patch @@ -0,0 +1,29 @@ +https://gitlab.gnome.org/GNOME/glib/-/commit/99382cfb4b5edf56f7c62eccc155f361a640298a.patch +https://bugs.gentoo.org/946789 + +From 99382cfb4b5edf56f7c62eccc155f361a640298a Mon Sep 17 00:00:00 2001 +From: Andoni Morales Alastruey <ylatuya@gmail.com> +Date: Tue, 28 May 2024 17:26:38 +0200 +Subject: [PATCH] girepository: fix autoptr tests build + +In macOS compilation fails with the following error: +``` +In file included from ../girepository/tests/autoptr.c:23: +../girepository/girffi.h:30:10: fatal error: 'ffi.h' file not found +``` +--- + girepository/tests/meson.build | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/girepository/tests/meson.build b/girepository/tests/meson.build +index 6fa947cfdf..f9928267d5 100644 +--- a/girepository/tests/meson.build ++++ b/girepository/tests/meson.build +@@ -72,6 +72,7 @@ if enable_gir + if cc.get_id() != 'msvc' + girepository_tests += { + 'autoptr-girepository' : { ++ 'dependencies': [libffi_dep], + 'source' : 'autoptr.c', + 'depends': gio_gir_testing_dep, + }, diff --git a/dev-libs/glib/glib-2.80.5-r1.ebuild b/dev-libs/glib/glib-2.80.5-r1.ebuild new file mode 100644 index 000000000000..5cd0b2716ca0 --- /dev/null +++ b/dev-libs/glib/glib-2.80.5-r1.ebuild @@ -0,0 +1,457 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_REQ_USE="xml(+)" +PYTHON_COMPAT=( python3_{10..13} ) + +inherit gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg + +DESCRIPTION="The GLib library of C routines" +HOMEPAGE="https://www.gtk.org/" + +INTROSPECTION_PN="gobject-introspection" +INTROSPECTION_PV="1.80.1" +INTROSPECTION_P="${INTROSPECTION_PN}-${INTROSPECTION_PV}" +SRC_URI=" + ${SRC_URI} + introspection? ( mirror://gnome/sources/gobject-introspection/${INTROSPECTION_PV%.*}/gobject-introspection-${INTROSPECTION_PV}.tar.${GNOME_TARBALL_SUFFIX} ) +" +INTROSPECTION_SOURCE_DIR="${WORKDIR}/${INTROSPECTION_P}" +INTROSPECTION_BUILD_DIR="${WORKDIR}/${INTROSPECTION_P}-build" + +LICENSE="LGPL-2.1+" +SLOT="2" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="dbus debug +elf doc +introspection +mime selinux static-libs sysprof systemtap test utils xattr" +RESTRICT="!test? ( test )" + +# * elfutils (via libelf) does not build on Windows. gresources are not embedded +# within ELF binaries on that platform anyway and inspecting ELF binaries from +# other platforms is not that useful so exclude the dependency in this case. +# * Technically static-libs is needed on zlib, util-linux and perhaps more, but +# these are used by GIO, which glib[static-libs] consumers don't really seem +# to need at all, thus not imposing the deps for now and once some consumers +# are actually found to static link libgio-2.0.a, we can revisit and either add +# them or just put the (build) deps in that rare consumer instead of recursive +# RDEPEND here (due to lack of recursive DEPEND). +RDEPEND=" + !<dev-libs/gobject-introspection-1.80.1 + !<dev-util/gdbus-codegen-${PV} + >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] + >=dev-libs/libpcre2-10.32:0=[${MULTILIB_USEDEP},unicode(+),static-libs?] + >=dev-libs/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}] + >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] + >=virtual/libintl-0-r2[${MULTILIB_USEDEP}] + introspection? ( + >=dev-libs/gobject-introspection-common-${INTROSPECTION_PV} + ) + kernel_linux? ( >=sys-apps/util-linux-2.23[${MULTILIB_USEDEP}] ) + selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] ) + xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) ) + elf? ( virtual/libelf:0= ) + sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] ) +" +DEPEND="${RDEPEND}" +# libxml2 used for optional tests that get automatically skipped +BDEPEND=" + app-text/docbook-xsl-stylesheets + dev-libs/libxslt + >=sys-devel/gettext-0.19.8 + doc? ( >=dev-util/gi-docgen-2023.1 ) + dev-python/docutils + systemtap? ( >=dev-debug/systemtap-1.3 ) + $(python_gen_any_dep ' + dev-python/packaging[${PYTHON_USEDEP}] + ') + ${PYTHON_DEPS} + test? ( >=sys-apps/dbus-1.2.14 ) + virtual/pkgconfig + + introspection? ( + $(python_gen_any_dep ' + dev-python/setuptools[${PYTHON_USEDEP}] + ') + virtual/pkgconfig + sys-devel/bison + app-alternatives/lex + ${PYTHON_DEPS} + ) +" +# TODO: >=dev-util/gdbus-codegen-${PV} test dep once we modify gio/tests/meson.build to use external gdbus-codegen + +PDEPEND=" + dbus? ( gnome-base/dconf ) + mime? ( x11-misc/shared-mime-info ) +" +# shared-mime-info needed for gio/xdgmime, bug #409481 +# dconf is needed to be able to save settings, bug #498436 + +MULTILIB_CHOST_TOOLS=( + /usr/bin/gio-querymodules$(get_exeext) +) + +PATCHES=( + "${FILESDIR}"/${PN}-2.64.1-mark-gdbus-server-auth-test-flaky.patch + "${FILESDIR}"/${P}-tests-autoptr-ffi.patch +) + +python_check_deps() { + if use introspection ; then + python_has_version "dev-python/packaging[${PYTHON_USEDEP}]" && + python_has_version "dev-python/setuptools[${PYTHON_USEDEP}]" + else + python_has_version "dev-python/packaging[${PYTHON_USEDEP}]" + fi +} + +pkg_setup() { + if use kernel_linux ; then + CONFIG_CHECK="~INOTIFY_USER" + if use test ; then + CONFIG_CHECK="~IPV6" + WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them." + fi + linux-info_pkg_setup + fi + python-any-r1_pkg_setup +} + +src_prepare() { + if use test; then + # TODO: Review the test exclusions, especially now with meson + # Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163 + if ! has_version dev-util/desktop-file-utils ; then + ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system," + ewarn "think on installing it to get these tests run." + sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die + sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die + fi + + # gdesktopappinfo requires existing terminal (gnome-terminal or any + # other), falling back to xterm if one doesn't exist + #if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then + # ewarn "Some tests will be skipped due to missing terminal program" + # These tests seem to sometimes fail even with a terminal; skip for now and reevulate with meson + # Also try https://gitlab.gnome.org/GNOME/glib/issues/1601 once ready + # for backport (or in a bump) and file new issue if still fails + sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die + # desktop-app-info/launch* might fail similarly + sed -i -e "/desktop-app-info\/launch-as-manager/d" gio/tests/desktop-app-info.c || die + #fi + + # https://bugzilla.gnome.org/show_bug.cgi?id=722604 + sed -i -e "/timer\/stop/d" glib/tests/timer.c || die + sed -i -e "/timer\/basic/d" glib/tests/timer.c || die + + ewarn "Tests for search-utils have been skipped" + sed -i -e "/search-utils/d" glib/tests/meson.build || die + + # Play nice with network-sandbox, but this approach would defeat the purpose of the test + #sed -i -e "s/localhost/127.0.0.1/g" gio/tests/gsocketclient-slow.c || die + else + # Don't build tests, also prevents extra deps, bug #512022 + sed -i -e '/subdir.*tests/d' {.,gio,glib}/meson.build || die + fi + + # Don't build fuzzing binaries - not used + sed -i -e '/subdir.*fuzzing/d' meson.build || die + + # gdbus-codegen is a separate package + sed -i -e '/install_dir/d' gio/gdbus-2.0/codegen/meson.build || die + sed -i -e '/install : true/d' gio/gdbus-2.0/codegen/meson.build || die + + # Same kind of meson-0.50 issue with some installed-tests files; will likely be fixed upstream soon + sed -i -e '/install_dir/d' gio/tests/meson.build || die + + cat > "${T}/glib-test-ld-wrapper" <<-EOF + #!/usr/bin/env sh + exec \${LD:-ld} "\$@" + EOF + chmod a+x "${T}/glib-test-ld-wrapper" || die + sed -i -e "s|'ld'|'${T}/glib-test-ld-wrapper'|g" gio/tests/meson.build || die + + # make default sane for us + if use prefix ; then + sed -i -e "s:/usr/local:${EPREFIX}/usr:" gio/xdgmime/xdgmime.c || die + # bug #308609, without path, bug #314057 + export PERL=perl + fi + + if [[ ${CHOST} == *-solaris* ]] ; then + # fix standards conflicts + sed -i \ + -e 's/\<\(_XOPEN_SOURCE_EXTENDED\)\>/_POSIX_PTHREAD_SEMANTICS/' \ + -e '/\<_XOPEN_SOURCE\>/s/\<2\>/600/' \ + meson.build || die + sed -i -e '/#define\s\+_POSIX_SOURCE/d' \ + glib/giounix.c || die + fi + + # disable native macOS integrations + sed -i -e '/glib_conf.set(.HAVE_\(CARBON\|COCOA\).,/s/true/false/' \ + meson.build || die + sed -i \ + -e '/AvailabilityMacros.h/d' \ + gio/giomodule.c || die + + # Link the glib source to the introspection subproject directory so it can be built there first + if use introspection ; then + ln -s "${S}" "${INTROSPECTION_SOURCE_DIR}/subprojects/glib" + + # bug #946578 + cd "${INTROSPECTION_SOURCE_DIR}" || die + eapply "${FILESDIR}"/glib-2.80.5-gobject-introspection-1.80.patch + cd "${S}" || die + fi + + default + gnome2_environment_reset + # TODO: python_name sedding for correct python shebang? Might be relevant mainly for glib-utils only +} + +multilib_src_configure() { + # TODO: figure a way to pass appropriate values for all cross properties + # that glib uses (search for get_cross_property) + #if tc-is-cross-compiler ; then + # https://bugzilla.gnome.org/show_bug.cgi?id=756473 + # TODO-meson: This should be in meson cross file as 'growing_stack' + # property; and more, look at get_cross_property + #case ${CHOST} in + #hppa*|metag*) export glib_cv_stack_grows=yes ;; + #*) export glib_cv_stack_grows=no ;; + #esac + #fi + + # Build internal copy of gobject-introspection to avoid circular dependency (built for native abi only) + if multilib_native_use introspection && ! has_version ">=dev-libs/${INTROSPECTION_P}" ; then + einfo "Bootstrapping gobject-introspection..." + INTROSPECTION_BIN_DIR="${T}/bootstrap-gi-prefix/usr/bin" + INTROSPECTION_LIB_DIR="${T}/bootstrap-gi-prefix/usr/$(get_libdir)" + + local emesonargs=( + --prefix="${T}/bootstrap-gi-prefix/usr" + -Dpython="${EPYTHON}" + -Dbuild_introspection_data=true + # Build an internal copy of glib for the internal copy of gobject-introspection + --force-fallback-for=glib + # Make the paths in pkgconfig files relative as we used to not + # do a proper install here and it seems less risky to keep it + # this way. + -Dpkgconfig.relocatable=true + + # We want as minimal a build as possible here to speed things up + # and reduce the risk of failures. + -Dglib:selinux=disabled + -Dglib:xattr=false + -Dglib:libmount=disabled + -Dglib:man-pages=disabled + -Dglib:dtrace=false + -Dglib:systemtap=false + -Dglib:sysprof=disabled + -Dglib:documentation=false + -Dglib:tests=false + -Dglib:installed_tests=false + -Dglib:nls=disabled + -Dglib:oss_fuzz=disabled + -Dglib:libelf=disabled + -Dglib:multiarch=false + ) + + ORIG_SOURCE_DIR=${EMESON_SOURCE} + EMESON_SOURCE=${INTROSPECTION_SOURCE_DIR} + + # g-ir-scanner has some relocatable logic but it searches + # for 'lib', not 'lib64', so it can't find itself and eventually + # falls back to the system installation. See bug #946221. + sed -i -e "/^pylibdir =/s:'lib:'$(get_libdir):" "${EMESON_SOURCE}"/tools/g-ir-tool-template.in || die + + ORIG_BUILD_DIR=${BUILD_DIR} + BUILD_DIR=${INTROSPECTION_BUILD_DIR} + + pushd ${INTROSPECTION_SOURCE_DIR} || die + + meson_src_configure + meson_src_compile + # We already provide a prefix in ${T} above. Blank DESTDIR + # as it may be set in the environment by Portage (though not + # guaranteed in src_configure). + meson_src_install --destdir "" + + popd || die + + EMESON_SOURCE=${ORIG_SOURCE_DIR} + BUILD_DIR=${ORIG_BUILD_DIR} + + # Add gobject-introspection binaries and pkgconfig files to path + export PATH="${INTROSPECTION_BIN_DIR}:${PATH}" + + # Override primary pkgconfig search paths to prioritize our internal copy + export PKG_CONFIG_LIBDIR="${INTROSPECTION_LIB_DIR}/pkgconfig:${INTROSPECTION_BUILD_DIR}/meson-private" + + # Set the normal primary pkgconfig search paths as secondary + # (We also need to prepend our just-built one for later use of + # g-ir-scanner to use the new one and to help workaround bugs like + # bug #946221.) + export PKG_CONFIG_PATH="${PKG_CONFIG_LIBDIR}:$(pkg-config --variable pc_path pkg-config)" + + # Add the paths to the built glib libraries to the library path so that gobject-introspection can load them + for gliblib in glib gobject gthread gmodule gio girepository; do + export LD_LIBRARY_PATH="${BUILD_DIR}/${gliblib}:${LD_LIBRARY_PATH}" + done + + # Add the path to introspection libraries so that glib can call gir utilities + export LD_LIBRARY_PATH="${INTROSPECTION_LIB_DIR}:${LD_LIBRARY_PATH}" + + # Add the paths to the gobject-introspection python modules to python path so they can be imported + export PYTHONPATH="${INTROSPECTION_LIB_DIR}/gobject-introspection:${PYTHONPATH}" + fi + + # TODO: Can this be cleaned up now we have -Dglib_debug? (bug #946485) + use debug && EMESON_BUILD_TYPE=debug + + local emesonargs=( + -Ddefault_library=$(usex static-libs both shared) + -Druntime_dir="${EPREFIX}"/run + $(meson_feature debug glib_debug) + $(meson_feature selinux) + $(meson_use xattr) + -Dlibmount=enabled # only used if host_system == 'linux' + -Dman-pages=enabled + $(meson_use systemtap dtrace) + $(meson_use systemtap) + $(meson_feature sysprof) + $(meson_use doc documentation) + $(meson_use test tests) + -Dinstalled_tests=false + -Dnls=enabled + -Doss_fuzz=disabled + $(meson_native_use_feature elf libelf) + -Dmultiarch=false + $(meson_native_use_feature introspection) + ) + + # Workaround for bug #938302 + if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then + local native_file="${T}"/meson.${CHOST}.ini.local + cat >> ${native_file} <<-EOF || die + [binaries] + dtrace='stap-dtrace' + EOF + emesonargs+=( --native-file "${native_file}" ) + fi + + meson_src_configure +} + +multilib_src_test() { + export XDG_CONFIG_DIRS=/etc/xdg + export XDG_DATA_DIRS=/usr/local/share:/usr/share + # TODO: Use ${ABI} here to be unique for multilib? + export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp" + export LC_TIME=C # bug #411967 + export TZ=UTC + unset GSETTINGS_BACKEND # bug #596380 + python_setup + + # https://bugs.gentoo.org/839807 + local -x SANDBOX_PREDICT=${SANDBOX_PREDICT} + addpredict /usr/b + + # Related test is a bit nitpicking + mkdir -p "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" || die + chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" || die + + meson_src_test --timeout-multiplier 20 --no-suite flaky +} + +multilib_src_install() { + meson_src_install + keepdir /usr/$(get_libdir)/gio/modules +} + +multilib_src_install_all() { + # These are installed by dev-util/glib-utils + # TODO: With patching we might be able to get rid of the python-any deps + # and removals, and test depend on glib-utils instead; revisit now with + # meson + rm "${ED}/usr/bin/glib-genmarshal" || die + rm "${ED}/usr/share/man/man1/glib-genmarshal.1" || die + rm "${ED}/usr/bin/glib-mkenums" || die + rm "${ED}/usr/share/man/man1/glib-mkenums.1" || die + rm "${ED}/usr/bin/gtester-report" || die + rm "${ED}/usr/share/man/man1/gtester-report.1" || die + # gdbus-codegen manpage installed by dev-util/gdbus-codegen + rm "${ED}/usr/share/man/man1/gdbus-codegen.1" || die +} + +pkg_preinst() { + xdg_pkg_preinst + + # Make gschemas.compiled belong to glib alone + local cache="/usr/share/glib-2.0/schemas/gschemas.compiled" + + if [[ -e ${EROOT}${cache} ]]; then + cp "${EROOT}"${cache} "${ED}"/${cache} || die + else + touch "${ED}"${cache} || die + fi + + multilib_pkg_preinst() { + # Make giomodule.cache belong to glib alone + local cache="/usr/$(get_libdir)/gio/modules/giomodule.cache" + + if [[ -e ${EROOT}${cache} ]]; then + cp "${EROOT}"${cache} "${ED}"${cache} || die + else + touch "${ED}"${cache} || die + fi + } + + # Don't run the cache ownership when cross-compiling, as it would end up with an empty cache + # file due to inability to create it and GIO might not look at any of the modules there + if ! tc-is-cross-compiler ; then + multilib_foreach_abi multilib_pkg_preinst + fi +} + +pkg_postinst() { + xdg_pkg_postinst + # glib installs no schemas itself, but we force update for fresh install in case + # something has dropped in a schemas file without direct glib dep; and for upgrades + # in case the compiled schema format could have changed + gnome2_schemas_update + + multilib_pkg_postinst() { + gnome2_giomodule_cache_update \ + || die "Update GIO modules cache failed (for ${ABI})" + } + if ! tc-is-cross-compiler ; then + multilib_foreach_abi multilib_pkg_postinst + else + ewarn "Updating of GIO modules cache skipped due to cross-compilation." + ewarn "You might want to run gio-querymodules manually on the target for" + ewarn "your final image for performance reasons and re-run it when packages" + ewarn "installing GIO modules get upgraded or added to the image." + fi + + for v in ${REPLACING_VERSIONS}; do + if ver_test "$v" "-lt" "2.63.6"; then + ewarn "glib no longer installs the gio-launch-desktop binary. You may need" + ewarn "to restart your session for \"Open With\" dialogs to work." + fi + done +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update + + if [[ -z ${REPLACED_BY_VERSION} ]]; then + multilib_pkg_postrm() { + rm -f "${EROOT}"/usr/$(get_libdir)/gio/modules/giomodule.cache || die + } + multilib_foreach_abi multilib_pkg_postrm + rm -f "${EROOT}"/usr/share/glib-2.0/schemas/gschemas.compiled || die + fi +} diff --git a/dev-libs/glib/glib-2.80.4.ebuild b/dev-libs/glib/glib-2.82.4-r1.ebuild index beb79e841944..9cb47e594084 100644 --- a/dev-libs/glib/glib-2.80.4.ebuild +++ b/dev-libs/glib/glib-2.82.4-r1.ebuild @@ -10,9 +10,19 @@ inherit gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 DESCRIPTION="The GLib library of C routines" HOMEPAGE="https://www.gtk.org/" +INTROSPECTION_PN="gobject-introspection" +INTROSPECTION_PV="1.82.0" +INTROSPECTION_P="${INTROSPECTION_PN}-${INTROSPECTION_PV}" +SRC_URI=" + ${SRC_URI} + introspection? ( mirror://gnome/sources/gobject-introspection/${INTROSPECTION_PV%.*}/gobject-introspection-${INTROSPECTION_PV}.tar.${GNOME_TARBALL_SUFFIX} ) +" +INTROSPECTION_SOURCE_DIR="${WORKDIR}/${INTROSPECTION_P}" +INTROSPECTION_BUILD_DIR="${WORKDIR}/${INTROSPECTION_P}-build" + LICENSE="LGPL-2.1+" SLOT="2" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="dbus debug +elf doc +introspection +mime selinux static-libs sysprof systemtap test utils xattr" RESTRICT="!test? ( test )" @@ -33,7 +43,9 @@ RDEPEND=" >=dev-libs/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}] >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] >=virtual/libintl-0-r2[${MULTILIB_USEDEP}] - introspection? ( >=dev-libs/gobject-introspection-1.80.1 ) + introspection? ( + >=dev-libs/gobject-introspection-common-${INTROSPECTION_PV} + ) kernel_linux? ( >=sys-apps/util-linux-2.23[${MULTILIB_USEDEP}] ) selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] ) xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) ) @@ -50,11 +62,18 @@ BDEPEND=" dev-python/docutils systemtap? ( >=dev-debug/systemtap-1.3 ) ${PYTHON_DEPS} - $(python_gen_any_dep ' - dev-python/packaging[${PYTHON_USEDEP}] - ') test? ( >=sys-apps/dbus-1.2.14 ) virtual/pkgconfig + + introspection? ( + $(python_gen_any_dep ' + dev-python/setuptools[${PYTHON_USEDEP}] + ') + virtual/pkgconfig + sys-devel/bison + app-alternatives/lex + ${PYTHON_DEPS} + ) " # TODO: >=dev-util/gdbus-codegen-${PV} test dep once we modify gio/tests/meson.build to use external gdbus-codegen @@ -74,7 +93,9 @@ PATCHES=( ) python_check_deps() { - python_has_version "dev-python/packaging[${PYTHON_USEDEP}]" + if use introspection ; then + python_has_version "dev-python/setuptools[${PYTHON_USEDEP}]" + fi } pkg_setup() { @@ -167,6 +188,11 @@ src_prepare() { -e '/AvailabilityMacros.h/d' \ gio/giomodule.c || die + # Link the glib source to the introspection subproject directory so it can be built there first + if use introspection ; then + ln -s "${S}" "${INTROSPECTION_SOURCE_DIR}/subprojects/glib" + fi + default gnome2_environment_reset # TODO: python_name sedding for correct python shebang? Might be relevant mainly for glib-utils only @@ -185,11 +211,97 @@ multilib_src_configure() { #esac #fi + # Build internal copy of gobject-introspection to avoid circular dependency (built for native abi only) + if multilib_native_use introspection && ! has_version ">=dev-libs/${INTROSPECTION_P}" ; then + einfo "Bootstrapping gobject-introspection..." + INTROSPECTION_BIN_DIR="${T}/bootstrap-gi-prefix/usr/bin" + INTROSPECTION_LIB_DIR="${T}/bootstrap-gi-prefix/usr/$(get_libdir)" + + local emesonargs=( + --prefix="${T}/bootstrap-gi-prefix/usr" + -Dpython="${EPYTHON}" + -Dbuild_introspection_data=true + # Build an internal copy of glib for the internal copy of gobject-introspection + --force-fallback-for=glib + # Make the paths in pkgconfig files relative as we used to not + # do a proper install here and it seems less risky to keep it + # this way. + -Dpkgconfig.relocatable=true + + # We want as minimal a build as possible here to speed things up + # and reduce the risk of failures. + -Dglib:selinux=disabled + -Dglib:xattr=false + -Dglib:libmount=disabled + -Dglib:man-pages=disabled + -Dglib:dtrace=false + -Dglib:systemtap=false + -Dglib:sysprof=disabled + -Dglib:documentation=false + -Dglib:tests=false + -Dglib:installed_tests=false + -Dglib:nls=disabled + -Dglib:oss_fuzz=disabled + -Dglib:libelf=disabled + -Dglib:multiarch=false + ) + + ORIG_SOURCE_DIR=${EMESON_SOURCE} + EMESON_SOURCE=${INTROSPECTION_SOURCE_DIR} + + # g-ir-scanner has some relocatable logic but it searches + # for 'lib', not 'lib64', so it can't find itself and eventually + # falls back to the system installation. See bug #946221. + sed -i -e "/^pylibdir =/s:'lib:'$(get_libdir):" "${EMESON_SOURCE}"/tools/g-ir-tool-template.in || die + + ORIG_BUILD_DIR=${BUILD_DIR} + BUILD_DIR=${INTROSPECTION_BUILD_DIR} + + pushd ${INTROSPECTION_SOURCE_DIR} || die + + meson_src_configure + meson_src_compile + # We already provide a prefix in ${T} above. Blank DESTDIR + # as it may be set in the environment by Portage (though not + # guaranteed in src_configure). + meson_src_install --destdir "" + + popd || die + + EMESON_SOURCE=${ORIG_SOURCE_DIR} + BUILD_DIR=${ORIG_BUILD_DIR} + + # Add gobject-introspection binaries and pkgconfig files to path + export PATH="${INTROSPECTION_BIN_DIR}:${PATH}" + + # Override primary pkgconfig search paths to prioritize our internal copy + export PKG_CONFIG_LIBDIR="${INTROSPECTION_LIB_DIR}/pkgconfig:${INTROSPECTION_BUILD_DIR}/meson-private" + + # Set the normal primary pkgconfig search paths as secondary + # (We also need to prepend our just-built one for later use of + # g-ir-scanner to use the new one and to help workaround bugs like + # bug #946221.) + export PKG_CONFIG_PATH="${PKG_CONFIG_LIBDIR}:$(pkg-config --variable pc_path pkg-config)" + + # Add the paths to the built glib libraries to the library path so that gobject-introspection can load them + for gliblib in glib gobject gthread gmodule gio girepository; do + export LD_LIBRARY_PATH="${BUILD_DIR}/${gliblib}:${LD_LIBRARY_PATH}" + done + + # Add the path to introspection libraries so that glib can call gir utilities + export LD_LIBRARY_PATH="${INTROSPECTION_LIB_DIR}:${LD_LIBRARY_PATH}" + + # Add the paths to the gobject-introspection python modules to python path so they can be imported + export PYTHONPATH="${INTROSPECTION_LIB_DIR}/gobject-introspection:${PYTHONPATH}" + fi + + # TODO: Can this be cleaned up now we have -Dglib_debug? (bug #946485) use debug && EMESON_BUILD_TYPE=debug local emesonargs=( -Ddefault_library=$(usex static-libs both shared) -Druntime_dir="${EPREFIX}"/run + $(meson_feature debug glib_debug) $(meson_feature selinux) $(meson_use xattr) -Dlibmount=enabled # only used if host_system == 'linux' @@ -223,6 +335,7 @@ multilib_src_configure() { multilib_src_test() { export XDG_CONFIG_DIRS=/etc/xdg export XDG_DATA_DIRS=/usr/local/share:/usr/share + # TODO: Use ${ABI} here to be unique for multilib? export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp" export LC_TIME=C # bug #411967 export TZ=UTC @@ -234,7 +347,7 @@ multilib_src_test() { addpredict /usr/b # Related test is a bit nitpicking - mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" || die + mkdir -p "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" || die chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" || die meson_src_test --timeout-multiplier 20 --no-suite flaky diff --git a/dev-libs/gmp/gmp-6.3.0-r1.ebuild b/dev-libs/gmp/gmp-6.3.0-r1.ebuild index 1e060d527db6..fae87d5caac7 100644 --- a/dev-libs/gmp/gmp-6.3.0-r1.ebuild +++ b/dev-libs/gmp/gmp-6.3.0-r1.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 @@ -96,6 +96,8 @@ multilib_src_configure() { # 6.3.0 says it now supports LTO, but needs retesting on a variety # of platforms. Fix was maybe https://gmplib.org/repo/gmp-6.3/rev/9c324044f4b5. filter-lto + # https://gmplib.org/list-archives/gmp-bugs/2024-November/005550.html + append-cflags $(test-flags-CC -std=gnu17) # Because of our 32-bit userland, 1.0 is the only HPPA ABI that works # https://gmplib.org/manual/ABI-and-ISA.html#ABI-and-ISA (bug #344613) @@ -115,7 +117,9 @@ multilib_src_configure() { # https://gmplib.org/manual/Notes-for-Package-Builds local myeconfargs=( - CC_FOR_BUILD="$(tc-getBUILD_CC)" + # -std=gnu99 appended here for bug #919935 to help + # prefix building w/ older compilers. + CC_FOR_BUILD="$(tc-getBUILD_CC) -std=gnu99" --localstatedir="${EPREFIX}"/var/state/gmp --enable-shared diff --git a/dev-libs/gobject-introspection-common/Manifest b/dev-libs/gobject-introspection-common/Manifest index f2b1f664fb16..7e5de5698e6a 100644 --- a/dev-libs/gobject-introspection-common/Manifest +++ b/dev-libs/gobject-introspection-common/Manifest @@ -1,3 +1,4 @@ DIST gobject-introspection-1.76.1.tar.xz 1055416 BLAKE2B 2251c34b543c95f95bdec6853c8234db1b2e6271e729eaa5abf28e39c7718b326e0813a1214c62fb4634fd11218c4c856e6651de09081b01c9fcf8f73b8cf316 SHA512 84331a30f8854d2259609650c21aadd6363ea1417a75828bd395f8f4346da1c6d6550cff5f2c9f5f6fd6fbf2a9d27b5880c2ee1616fa905c5f362384d481a916 DIST gobject-introspection-1.78.1.tar.xz 1060296 BLAKE2B 115cf9ea27cec2d8d3a84081c909b72144fd1568bc316677c26f49652dc93b34fba10701678ad4977dcf97a89f7608545fbd2d73c2503c87635b2102e66ae024 SHA512 a3081882995a762645b04faa71082dbd523bee845519007e48b13235aad8a4cd4c74f0d042a6c17710125f945bd970e4b76e95a559274e294d595e04725a4e97 DIST gobject-introspection-1.80.1.tar.xz 1040228 BLAKE2B 7a8c1da9bc8aef293deedde1eed97536fa2f42f79a9761ac8ededb0676e46b636545a69e20e63d812844aeb626fa4fb7ce3c7922e51554fdc79560f16443acd9 SHA512 f45c2c1b105086488d974c6134db9910746df8edb187772f2ecd249656a1047c8ac88ba51f5bf7393c3d99c3ace143ecd09be256c2f4d0ceee110c9ad51a839a +DIST gobject-introspection-1.82.0.tar.xz 1052872 BLAKE2B 8336ae26d48a71a203655d9d268076f603055ceabb55dbfa676f2c67b4096b83afc106d485dc45d02b3a8be806f9ef50d54806a82e61f2a252ae59543c61e934 SHA512 e139fadb4174c72b648914f3774d89fc0e5eaee45bba0c13edf05de883664dad8276dbc34006217bb09871ed4bad23adab51ff232a17b9eb131329b2926cafb7 diff --git a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.80.1.ebuild b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.80.1.ebuild index e4f7e8c166a3..04c04e48d684 100644 --- a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.80.1.ebuild +++ b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.80.1.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://gi.readthedocs.io/" LICENSE="HPND" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" RDEPEND="!<${CATEGORY}/${GNOME_ORG_MODULE}-${PV}" # Use !<${PV} because mixing gobject-introspection with different version of -common can cause issues like: diff --git a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.82.0.ebuild b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.82.0.ebuild new file mode 100644 index 000000000000..e4f7e8c166a3 --- /dev/null +++ b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.82.0.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +GNOME_ORG_MODULE="gobject-introspection" + +inherit gnome.org + +DESCRIPTION="Build infrastructure for GObject Introspection" +HOMEPAGE="https://gi.readthedocs.io/" + +LICENSE="HPND" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + +RDEPEND="!<${CATEGORY}/${GNOME_ORG_MODULE}-${PV}" +# Use !<${PV} because mixing gobject-introspection with different version of -common can cause issues like: +# https://forums.gentoo.org/viewtopic-p-7421930.html + +src_configure() { :; } + +src_compile() { :; } + +src_install() { + insinto /usr/share/aclocal + doins m4/introspection.m4 + + insinto /usr/share/gobject-introspection-1.0 + doins Makefile.introspection +} diff --git a/dev-libs/gobject-introspection/Manifest b/dev-libs/gobject-introspection/Manifest index f2b1f664fb16..7e5de5698e6a 100644 --- a/dev-libs/gobject-introspection/Manifest +++ b/dev-libs/gobject-introspection/Manifest @@ -1,3 +1,4 @@ DIST gobject-introspection-1.76.1.tar.xz 1055416 BLAKE2B 2251c34b543c95f95bdec6853c8234db1b2e6271e729eaa5abf28e39c7718b326e0813a1214c62fb4634fd11218c4c856e6651de09081b01c9fcf8f73b8cf316 SHA512 84331a30f8854d2259609650c21aadd6363ea1417a75828bd395f8f4346da1c6d6550cff5f2c9f5f6fd6fbf2a9d27b5880c2ee1616fa905c5f362384d481a916 DIST gobject-introspection-1.78.1.tar.xz 1060296 BLAKE2B 115cf9ea27cec2d8d3a84081c909b72144fd1568bc316677c26f49652dc93b34fba10701678ad4977dcf97a89f7608545fbd2d73c2503c87635b2102e66ae024 SHA512 a3081882995a762645b04faa71082dbd523bee845519007e48b13235aad8a4cd4c74f0d042a6c17710125f945bd970e4b76e95a559274e294d595e04725a4e97 DIST gobject-introspection-1.80.1.tar.xz 1040228 BLAKE2B 7a8c1da9bc8aef293deedde1eed97536fa2f42f79a9761ac8ededb0676e46b636545a69e20e63d812844aeb626fa4fb7ce3c7922e51554fdc79560f16443acd9 SHA512 f45c2c1b105086488d974c6134db9910746df8edb187772f2ecd249656a1047c8ac88ba51f5bf7393c3d99c3ace143ecd09be256c2f4d0ceee110c9ad51a839a +DIST gobject-introspection-1.82.0.tar.xz 1052872 BLAKE2B 8336ae26d48a71a203655d9d268076f603055ceabb55dbfa676f2c67b4096b83afc106d485dc45d02b3a8be806f9ef50d54806a82e61f2a252ae59543c61e934 SHA512 e139fadb4174c72b648914f3774d89fc0e5eaee45bba0c13edf05de883664dad8276dbc34006217bb09871ed4bad23adab51ff232a17b9eb131329b2926cafb7 diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.80.1-r2.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.80.1-r3.ebuild index f1c88150e2d5..0daf6e5c22b8 100644 --- a/dev-libs/gobject-introspection/gobject-introspection-1.80.1-r2.ebuild +++ b/dev-libs/gobject-introspection/gobject-introspection-1.80.1-r3.ebuild @@ -13,7 +13,7 @@ HOMEPAGE="https://gi.readthedocs.io/" LICENSE="LGPL-2+ GPL-2+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="doctool gtk-doc test" RESTRICT="!test? ( test )" @@ -22,7 +22,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" # virtual/pkgconfig needed at runtime, bug #505408 RDEPEND=" >=dev-libs/gobject-introspection-common-${PV} - >=dev-libs/glib-2.79.0:2 + >=dev-libs/glib-2.79.0:2[introspection] dev-libs/libffi:= $(python_gen_cond_dep ' dev-python/setuptools[${PYTHON_USEDEP}] diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.82.0-r1.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.82.0-r1.ebuild new file mode 100644 index 000000000000..4e419d3dadfe --- /dev/null +++ b/dev-libs/gobject-introspection/gobject-introspection-1.82.0-r1.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..13} ) +PYTHON_REQ_USE="xml(+)" +inherit gnome.org meson python-single-r1 xdg + +DESCRIPTION="Introspection system for GObject-based libraries" +HOMEPAGE="https://gi.readthedocs.io/" + +LICENSE="LGPL-2+ GPL-2+" +SLOT="0" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" + +IUSE="doctool gtk-doc test" +RESTRICT="!test? ( test )" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +# virtual/pkgconfig needed at runtime, bug #505408 +RDEPEND=" + >=dev-libs/gobject-introspection-common-${PV} + >=dev-libs/glib-2.82.0:2[introspection] + dev-libs/libffi:= + $(python_gen_cond_dep ' + dev-python/setuptools[${PYTHON_USEDEP}] + ') + doctool? ( + $(python_gen_cond_dep ' + dev-python/mako[${PYTHON_USEDEP}] + dev-python/markdown[${PYTHON_USEDEP}] + ') + ) + virtual/pkgconfig + ${PYTHON_DEPS} +" +# Wants real bison, not app-alternatives/yacc +DEPEND="${RDEPEND}" +BDEPEND=" + gtk-doc? ( + >=dev-util/gtk-doc-1.19 + app-text/docbook-xml-dtd:4.3 + app-text/docbook-xml-dtd:4.5 + ) + sys-devel/bison + app-alternatives/lex + test? ( + x11-libs/cairo[glib] + $(python_gen_cond_dep ' + dev-python/mako[${PYTHON_USEDEP}] + dev-python/markdown[${PYTHON_USEDEP}] + ') + ) +" + +pkg_setup() { + python-single-r1_pkg_setup +} + +src_configure() { + local emesonargs=( + $(meson_feature test cairo) + $(meson_feature doctool) + #-Dglib_src_dir + $(meson_use gtk-doc gtk_doc) + #-Dcairo_libname + -Dpython="${EPYTHON}" + -Dbuild_introspection_data=true + #-Dgir_dir_prefix + ) + meson_src_configure +} + +src_install() { + meson_src_install + python_fix_shebang "${ED}"/usr/bin/ + python_optimize "${ED}"/usr/$(get_libdir)/gobject-introspection/giscanner + + # Prevent collision with gobject-introspection-common + rm -v "${ED}"/usr/share/aclocal/introspection.m4 \ + "${ED}"/usr/share/gobject-introspection-1.0/Makefile.introspection || die + rmdir "${ED}"/usr/share/aclocal || die +} diff --git a/dev-libs/gom/gom-0.5.2.ebuild b/dev-libs/gom/gom-0.5.2.ebuild index 7aab22c7647f..2bf94ea0bbff 100644 --- a/dev-libs/gom/gom-0.5.2.ebuild +++ b/dev-libs/gom/gom-0.5.2.ebuild @@ -12,7 +12,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gom" LICENSE="LGPL-2+ FDL-1.1+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86" IUSE="gtk-doc +introspection python test" RESTRICT="!test? ( test )" REQUIRED_USE="python? ( introspection ${PYTHON_REQUIRED_USE} )" diff --git a/dev-libs/gumbo/Manifest b/dev-libs/gumbo/Manifest index 170e614ce6f0..49b0f1601083 100644 --- a/dev-libs/gumbo/Manifest +++ b/dev-libs/gumbo/Manifest @@ -1,3 +1,2 @@ -DIST gumbo-0.10.1.tar.gz 2119285 BLAKE2B 21a8dd479bcc568842ce85782d4de903c1b79d842dd5381c01fd7b7ee802872484bf8b647edde9c2a4939404a4d042e920633f4d337870cd9f4197a90b158ffd SHA512 bb1fb55cd07076ab6a9f38dc14db50397dbdca9a04ace4895dfba8b8cbc09038a96e26070c09c75fa929ada2e815affe233c1e2ecd8afe2aba6201647cf277d1 -DIST gumbo-0.11.0.tar.gz 2119456 BLAKE2B 9da25c08e94af6f33b7e6e66017da9b7780a5f58aef7eac7d03bdf98c415e13252377dadd4f6fe3b8ddcf7d2aea8d4aff6edac181ea8cf8a4fa152f7c711e107 SHA512 7fdfee66db32dfda70bb1f2069b9bf59f2293fd30e1360d7adcced68e894a42e42e2e5de05204ea4ee30cb8d680fd48b66400a68710fe5f00fb3c84004c85928 DIST gumbo-0.12.1.tar.gz 2115338 BLAKE2B 8c2d119ff622bb07a2d4f0a04b4e3d1db1d3609632f540618dcb47a94f3b0ef4bb72fae8f74e2dbe43b4a2311421eee5b4d371475efda068a04ac5e8f8b9b304 SHA512 df74bf00b20152306b71db5659d4bf35ef6098ad6937925301ee48c96772607d2ab8e49a5b262caa27a72d5f267762c85e1434690e6abbf7e67d63c4713346d7 +DIST gumbo-0.12.2.tar.gz 2113915 BLAKE2B b2bdcdba3746c2cc1e7bc09b9ee8409b2f03fad0ad42d95aed8fbcef1696d43d571898a1f5323b2aeab4d8a955a6ce89da30a1643edb0fc9b19027002740aa19 SHA512 258d93c0404b7dc35e1088cded02a394b2cbd0d08f3e7d0a3e32d859c2032efcc831687c7bc749e9bddb60d4f910bab741007bed1117d486a0d3fd194e22f4e7 diff --git a/dev-libs/gumbo/gumbo-0.10.1.ebuild b/dev-libs/gumbo/gumbo-0.10.1.ebuild deleted file mode 100644 index 1de03817647b..000000000000 --- a/dev-libs/gumbo/gumbo-0.10.1.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -DESCRIPTION="The HTML5 parsing algorithm implemented as a pure C99 library" -HOMEPAGE="https://github.com/google/gumbo-parser#readme" -SRC_URI="https://github.com/google/gumbo-parser/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="doc test" -RESTRICT="!test? ( test )" - -DEPEND="test? ( dev-cpp/gtest )" -BDEPEND="doc? ( app-text/doxygen )" - -S="${WORKDIR}/gumbo-parser-${PV}" - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf --disable-static -} - -src_compile() { - default - - if use doc; then - doxygen || die "doxygen failed" - HTML_DOCS=( docs/html/. ) - fi -} - -src_install() { - default - use doc && doman docs/man/man3/* - - find "${ED}" -name '*.la' -delete || die -} diff --git a/dev-libs/gumbo/gumbo-0.11.0.ebuild b/dev-libs/gumbo/gumbo-0.12.2.ebuild index 78776bebc0b7..0bef4a333911 100644 --- a/dev-libs/gumbo/gumbo-0.11.0.ebuild +++ b/dev-libs/gumbo/gumbo-0.12.2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://codeberg.org/grisha/gumbo-parser/archive/${PV}.tar.gz -> ${P}.t S="${WORKDIR}/gumbo-parser" LICENSE="Apache-2.0" -SLOT="0" +SLOT="0/2" # gumbo SONAME KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x64-solaris" IUSE="doc test" RESTRICT="!test? ( test )" diff --git a/dev-libs/gumbo/metadata.xml b/dev-libs/gumbo/metadata.xml index bf5592871976..febcdedd3cd8 100644 --- a/dev-libs/gumbo/metadata.xml +++ b/dev-libs/gumbo/metadata.xml @@ -9,4 +9,7 @@ <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> + <upstream> + <remote-id type="codeberg">grisha/gumbo-parser</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-libs/hidapi/Manifest b/dev-libs/hidapi/Manifest index 3bece08534c5..f6646bc12414 100644 --- a/dev-libs/hidapi/Manifest +++ b/dev-libs/hidapi/Manifest @@ -1,2 +1 @@ -DIST hidapi-0.13.1.tgz 244666 BLAKE2B b3406114f8dd8b192eecac1673592866f930688af8023819d20f73c76226f0829c8d68f4b47051b4836ce4348fc3bbad8f9849f1d565563dcd0f993df43de4ca SHA512 07b224b9b5146caf693e6d67514fed236436ed68f38a3ada98ebf8352dfaa4e175f576902affb4b79da1bb8c9b47a1ee0831a93c7d3d210e93faee24632f7d53 DIST hidapi-0.14.0.tgz 348221 BLAKE2B 6472bfe5863d75a8901983a763191f3b6c18c25934b652b79f33141a6818619f816d35ed2480435254cecc51598d1e07e53c8c8c4f35a10cf28c1e4374bb450d SHA512 66a045144f90b41438898b82f0398e80223323ebfe6e4f197d2713696bb3ae60f36aea5a37a9999b34b12294783fd7e4c28c6e785462559cbe21276009da1eac diff --git a/dev-libs/hidapi/hidapi-0.13.1-r1.ebuild b/dev-libs/hidapi/hidapi-0.13.1-r1.ebuild deleted file mode 100644 index 2e02a10b8d7d..000000000000 --- a/dev-libs/hidapi/hidapi-0.13.1-r1.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="A multi-platform library for USB and Bluetooth HID-Class devices" -HOMEPAGE="https://github.com/libusb/hidapi" -SRC_URI="https://github.com/libusb/hidapi/archive/${P}.tar.gz -> ${P}.tgz" - -LICENSE="|| ( BSD GPL-3 HIDAPI )" -SLOT="0" -KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86" -IUSE="doc" - -DEPEND=" - virtual/libusb:1[${MULTILIB_USEDEP}] - virtual/libudev:0[${MULTILIB_USEDEP}]" -RDEPEND="${DEPEND}" -BDEPEND=" - doc? ( app-text/doxygen )" - -S="${WORKDIR}/${PN}-${P}" - -multilib_src_configure() { - append-lfs-flags - - cmake_src_configure -} - -multilib_src_compile() { - cmake_src_compile - - if use doc && multilib_is_native_abi; then - cd "${S}/doxygen" - doxygen Doxyfile || die - fi -} - -multilib_src_install() { - cmake_src_install - - if use doc && multilib_is_native_abi; then - local HTML_DOCS=( "${S}/doxygen/html/." ) - fi - einstalldocs -} diff --git a/dev-libs/hidapi/hidapi-0.14.0.ebuild b/dev-libs/hidapi/hidapi-0.14.0.ebuild index 3208e04b1603..96d5eeada9ee 100644 --- a/dev-libs/hidapi/hidapi-0.14.0.ebuild +++ b/dev-libs/hidapi/hidapi-0.14.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-${P}" LICENSE="|| ( BSD GPL-3 HIDAPI )" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv sparc x86" IUSE="doc" DEPEND=" diff --git a/dev-libs/hipother/Manifest b/dev-libs/hipother/Manifest index 0c54674e72c0..2dde3bd57777 100644 --- a/dev-libs/hipother/Manifest +++ b/dev-libs/hipother/Manifest @@ -1 +1,2 @@ DIST hipother-6.1.1.tar.gz 33496 BLAKE2B 026967cb298a888df441d543d70478836036b81dc26c8284410076daf18eb28dc42f7d4b6aaf2bfaa8b6c957ada8244afc0e7c40882c0370bc2b6a0ae94ffaf8 SHA512 ca4d5df9e3138e845be051aace8fb02d84b879439e6bc9ca1551853f80f54b554b9cad1a91c6c114160b21d3ca62fa47a88e32efe60c0f475ff8b56f7f18b5d4 +DIST hipother-6.3.0.tar.gz 37660 BLAKE2B 8af74369c769750575d55c7ab152af32f6b8ce06f65247fb1390900427c0a24282b4681dbd65e36241262423a793af48b432fc252d0fad5ac367c25f242e1865 SHA512 3bdd70e6ef34aeb51c7d973f73cf3b761016659892c57719cc85d123e8212e4510c5d799563d20cea9de441e983ed148900c6656784a0cc28d0f67c4ea91c99e diff --git a/dev-libs/hipother/hipother-6.3.0.ebuild b/dev-libs/hipother/hipother-6.3.0.ebuild new file mode 100644 index 000000000000..8160512df6a2 --- /dev/null +++ b/dev-libs/hipother/hipother-6.3.0.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="ROCclr runtime implementation for non-AMD HIP platforms, like NVIDIA" +HOMEPAGE="https://github.com/ROCm/hipother" +SRC_URI="https://github.com/ROCm/hipother/archive/refs/tags/rocm-${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/hipother-rocm-${PV}" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64" + +RDEPEND=" + !<dev-util/hip-6 +" + +src_install() { + insinto /usr/include + doins -r hipnv/include/hip +} diff --git a/dev-libs/hyprgraphics/Manifest b/dev-libs/hyprgraphics/Manifest new file mode 100644 index 000000000000..4da1aecd35c4 --- /dev/null +++ b/dev-libs/hyprgraphics/Manifest @@ -0,0 +1 @@ +DIST hyprgraphics-0.1.1.gh.tar.gz 421561 BLAKE2B 1f99b2db950c700aae7273ef6a883470165e1b45656c958d5c3999080ecc8372a5114cdf3e5baa812778bd0f157683e38d44f8a3f62eb060b0e48b1ce5ac2a22 SHA512 9295ab3bfcdfed42425ca21d0b8c48f4fc6abba377eaf07ac638e077181380ae57fd352a67420540fda7c4709cae77cde563f328271e36fc38c3101e04e8fd69 diff --git a/dev-libs/hyprgraphics/hyprgraphics-0.1.1.ebuild b/dev-libs/hyprgraphics/hyprgraphics-0.1.1.ebuild new file mode 100644 index 000000000000..c5c096e4cd92 --- /dev/null +++ b/dev-libs/hyprgraphics/hyprgraphics-0.1.1.ebuild @@ -0,0 +1,24 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Hyprland graphics / resource utilities" +HOMEPAGE="https://github.com/hyprwm/hyprgraphics" +SRC_URI="https://github.com/hyprwm/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64" + +RDEPEND=" + >=gui-libs/hyprutils-0.1.1:= + media-libs/libjpeg-turbo:= + media-libs/libjxl:= + media-libs/libwebp:= + sys-apps/file + x11-libs/cairo +" +DEPEND="${RDEPEND}" diff --git a/dev-libs/hyprgraphics/metadata.xml b/dev-libs/hyprgraphics/metadata.xml new file mode 100644 index 000000000000..3c6ac7a66b0b --- /dev/null +++ b/dev-libs/hyprgraphics/metadata.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person" proxied="yes"> + <email>julien@jroy.ca</email> + <name>Julien Roy</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <longdescription> +Hyprgraphics is a small C++ library with graphics / resource related utilities used across the hypr* ecosystem. + </longdescription> + <upstream> + <bugs-to>https://github.com/hyprwm/hyprgraphics/issues</bugs-to> + <changelog>https://github.com/hyprwm/hyprgraphics/releases</changelog> + <remote-id type="github">hyprwm/hyprgraphics</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-libs/hyprland-protocols/Manifest b/dev-libs/hyprland-protocols/Manifest index 2967b1a44da7..d3a8c2e59ed7 100644 --- a/dev-libs/hyprland-protocols/Manifest +++ b/dev-libs/hyprland-protocols/Manifest @@ -1,2 +1 @@ -DIST hyprland-protocols-0.3.0.gh.tar.gz 7423 BLAKE2B 1ecc6625152e9bd530490d8321dcbe41396dd7306066f6cd6d97c22a0ebb2c914348b6829e8d5e210f07807a7df282a1cc63fa44a93bd08df22987850bd27a3a SHA512 15bb0c45eed1949d888d228c671139fefd48e32d634823ed8041a4901e15e73409b0fd368d4c1f6197bd6980e723b20303697ad46b1171330cfd27821118ba32 DIST hyprland-protocols-0.4.0.gh.tar.gz 8131 BLAKE2B 3187849ed4e460a06a6c88919972f1a8989f6aa2dff24209da5697dddbfcfb82898babdc275246942a9b6e79f922a58c4139870b5c68fc2d28288400cedfb80e SHA512 cc32cae0840c49a7f128150be99b3584d5e5eb417a321ae7c917a859715e263c199001f73e7642348e2ae670ed4fffeecab9649144920d90999f46e9bfb8f938 diff --git a/dev-libs/hyprland-protocols/hyprland-protocols-0.3.0.ebuild b/dev-libs/hyprland-protocols/hyprland-protocols-0.3.0.ebuild deleted file mode 100644 index 0de43fcf06fb..000000000000 --- a/dev-libs/hyprland-protocols/hyprland-protocols-0.3.0.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 2023-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit meson - -DESCRIPTION="Wayland protocol extensions for Hyprland" -HOMEPAGE="https://github.com/hyprwm/hyprland-protocols" - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://github.com/hyprwm/${PN}.git" - inherit git-r3 -else - SRC_URI="https://github.com/hyprwm/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz" - KEYWORDS="amd64 ~riscv" -fi - -LICENSE="BSD" -SLOT="0" - -BDEPEND=" - dev-util/wayland-scanner - virtual/pkgconfig -" diff --git a/dev-libs/hyprland-protocols/hyprland-protocols-0.4.0.ebuild b/dev-libs/hyprland-protocols/hyprland-protocols-0.4.0.ebuild index f5179590cd2f..0de43fcf06fb 100644 --- a/dev-libs/hyprland-protocols/hyprland-protocols-0.4.0.ebuild +++ b/dev-libs/hyprland-protocols/hyprland-protocols-0.4.0.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then inherit git-r3 else SRC_URI="https://github.com/hyprwm/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz" - KEYWORDS="~amd64 ~riscv" + KEYWORDS="amd64 ~riscv" fi LICENSE="BSD" diff --git a/dev-libs/hyprlang/Manifest b/dev-libs/hyprlang/Manifest index c803c20cf264..4af83969ae13 100644 --- a/dev-libs/hyprlang/Manifest +++ b/dev-libs/hyprlang/Manifest @@ -1,3 +1,3 @@ -DIST hyprlang-0.5.1.gh.tar.gz 56237 BLAKE2B 1d93362d4e121dc0d6e18d27456be71bed088d79646a92a74e41af7ebefd511cef05c12034eb679fd1849c3c95e50e425a52a42da75f274bf39d2956d6bd6d5e SHA512 92bf1e79c41c33e09de25f45e8abfe753736521be06fee298875a68072761bf0254d06d2d312a12b2ae750d8710f50d1666f1b3fbbb95c338398f2b9e80ce454 DIST hyprlang-0.5.2.gh.tar.gz 56383 BLAKE2B 0d7708532e5169b0b0c2d5f88927ead24941af157c668832bdc67f4e87da1737d9f17d6d26b2424519bce4b54e4912c44ef879546d699ba03e270cab73652a89 SHA512 df330da11da317ff6aac2eb4a65c81b6cf4fc85e79f117e3fc3ef6e06d4c857d03134be9fcdc4e33f4974a4b2181e45b6009dba70ed047cda38e32df289b60a7 DIST hyprlang-0.5.3.gh.tar.gz 56761 BLAKE2B 5f8803b697b2d3e8f7bb386b6a07c10c1d66f97c0e4a034d5e9eb4272b250ba0665ee92d74277fd0f85b3857954b91890c199da16c27cd594a5c4975c55c15c0 SHA512 b5ab72d0f6ddb4c190bb2c2a495fab0128de0b5432b3161785b2ef0111aaea18ca42f17bc77248a4a4ab8b86d7cdd9b3acf415d495d4fcac42cf8bab5bc87df6 +DIST hyprlang-0.6.0.gh.tar.gz 57475 BLAKE2B 6d9783b87e2c2cecd965b82733eb40db357b6c18be031e3e15ab7436ecedf1a93fb1fcf27bcc3edd13e14fe697e65b790b7cf06e29ffe15595e6ba9564d552fc SHA512 bd7aee527acc82accaf47fe061844103520787da638df769ec7f2978fb2334c33b01e0b37af03cd66f4a6dc447bbecb2ede8ed61fa59c59044aae4f631e90823 diff --git a/dev-libs/hyprlang/hyprlang-0.5.3.ebuild b/dev-libs/hyprlang/hyprlang-0.5.3.ebuild index 695f9358068e..f2f3ebc0b9ee 100644 --- a/dev-libs/hyprlang/hyprlang-0.5.3.ebuild +++ b/dev-libs/hyprlang/hyprlang-0.5.3.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/hyprwm/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64" RDEPEND=">=gui-libs/hyprutils-0.1.1" DEPEND="${RDEPEND}" diff --git a/dev-libs/hyprlang/hyprlang-0.5.1.ebuild b/dev-libs/hyprlang/hyprlang-0.6.0.ebuild index 9884a4ce9a12..7b3f37ecbece 100644 --- a/dev-libs/hyprlang/hyprlang-0.5.1.ebuild +++ b/dev-libs/hyprlang/hyprlang-0.6.0.ebuild @@ -11,4 +11,7 @@ SRC_URI="https://github.com/hyprwm/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz LICENSE="GPL-3" SLOT="0" -KEYWORDS="amd64 ~riscv" +KEYWORDS="~amd64" + +RDEPEND=">=gui-libs/hyprutils-0.1.1:=" +DEPEND="${RDEPEND}" diff --git a/dev-libs/icinga-php-library/icinga-php-library-0.14.1.ebuild b/dev-libs/icinga-php-library/icinga-php-library-0.14.1.ebuild index 26598e685221..b961f6d4f390 100644 --- a/dev-libs/icinga-php-library/icinga-php-library-0.14.1.ebuild +++ b/dev-libs/icinga-php-library/icinga-php-library-0.14.1.ebuild @@ -10,7 +10,7 @@ SRC_URI="https://github.com/${MY_GITHUB_AUTHOR}/${PN}/archive/refs/tags/v${PV}.t LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="amd64 ~arm64 x86" DEPEND="dev-lang/php:*" RDEPEND="${DEPEND}" diff --git a/dev-libs/icu-layoutex/Manifest b/dev-libs/icu-layoutex/Manifest index 7a7475da110d..4773f3bc3568 100644 --- a/dev-libs/icu-layoutex/Manifest +++ b/dev-libs/icu-layoutex/Manifest @@ -1,4 +1,4 @@ -DIST icu4c-74_2-src.tgz 26529443 BLAKE2B 08790dd3634037177eaec428651afe0da1f71dbad3423bde7ea5a6d49eab5dc011f72b175760fc55f6d8d7d820f7f3dfc369a80a1f7cb2f9f933644beb3d3711 SHA512 e6c7876c0f3d756f3a6969cad9a8909e535eeaac352f3a721338b9cbd56864bf7414469d29ec843462997815d2ca9d0dab06d38c37cdd4d8feb28ad04d8781b0 -DIST icu4c-74_2-src.tgz.asc 659 BLAKE2B 0723204ce19d7bd4b1989e00b5ab084cc5b154c214129632a7f7ce31c151c8a4b9e0033d49872db728a3787809dbad2320f1d848561c84f94797c7e006749b94 SHA512 b249a61aba711b34599c3c0fbc113a52a83e59cb7bbda914ca74f534c1f474e6821d663dc7f078608b24393703654a43c2b793ca3d3f3be761393b6a73862ecc DIST icu4c-75_1-src.tgz 26568378 BLAKE2B 2772b52bf59407188511359ec54bea432bc70ba81610015bb51192f7aff33d5e4b08840cf3bfed3de7f9a91b430b6a6efe9dd75fdc53327d4c9f8fbf54d96d18 SHA512 70ea842f0d5f1f6c6b65696ac71d96848c4873f4d794bebc40fd87af2ad4ef064c61a786bf7bc430ce4713ec6deabb8cc1a8cc0212eab148cee2d498a3683e45 DIST icu4c-75_1-src.tgz.asc 659 BLAKE2B d884a9ddb2afc1a8aa00e66568d2f4f76de2b2d15b5ac4ca5a464e2d1dd22aef2406cbd1391c31c8987f1b95d9325c37359f081d2ad69ca313a9d656d3dd7ec1 SHA512 a69d47d74e28a3dcc2f5b83bb0094b7e52e737c83ad484aec64ce76a6f1ad719b1de651ad4024df6cc1bb74992a8540dec09cec2814c45a3e7aaa365afd96628 +DIST icu4c-76_1-src.tgz 27437767 BLAKE2B 67223391123d2d2c75107fc4b87510b1d8d520301a863032951b894366ec8b414692ee3fa2acd652289b0ae2f60946d71bf9ca21ed87de40825e2fd02634c658 SHA512 b702ab62fb37a1574d5f4a768326d0f8fa30d9db5b015605b5f8215b5d8547f83d84880c586d3dcc7b6c76f8d47ef34e04b0f51baa55908f737024dd79a42a6c +DIST icu4c-76_1-src.tgz.asc 228 BLAKE2B 37a058e22da5ad122e3df6de2cb3979fa734b32e4e81d91201d2095fbf20ef2dbcba4579efab3041193e49c388d09618c965ddf082a8362aa82b694184804fa7 SHA512 c4bd81d4e98d7e37a6ba9540748c4ce1eb740d70bd689a13e2e51da76503b6e0287afd4d1cd3af4540210f37626dec998fcbd7269976cb801f238b789e604489 diff --git a/dev-libs/icu-layoutex/files/icu-layoutex-76.1-remove-bashisms.patch b/dev-libs/icu-layoutex/files/icu-layoutex-76.1-remove-bashisms.patch new file mode 100644 index 000000000000..62bb3221116f --- /dev/null +++ b/dev-libs/icu-layoutex/files/icu-layoutex-76.1-remove-bashisms.patch @@ -0,0 +1,151 @@ +--- a/config/icu-config-bottom ++++ b/config/icu-config-bottom +@@ -218,65 +218,65 @@ + ;; + + --cflags) +- echo $ECHO_N "${CFLAGS} ${ECHO_C}" ++ printf "%s" "${CFLAGS} " + ;; + + --cc) +- echo $ECHO_N "${CC} ${ECHO_C}" ++ printf "%s" "${CC} " + ;; + + --cxx) +- echo $ECHO_N "${CXX} ${ECHO_C}" ++ printf "%s" "${CXX} " + ;; + + --cxxflags) +- echo $ECHO_N "${CXXFLAGS} ${ECHO_C}" ++ printf "%s" "${CXXFLAGS} " + ;; + + --cppflags) + # Don't echo the -I. - it's unneeded. +- echo $ECHO_N "${CPPFLAGS} ${ECHO_C}" | sed -e 's/-I. //' ++ printf "%s" "${CPPFLAGS} " | sed -e 's/-I. //' + ;; + + --cppflags-searchpath) +- echo $ECHO_N "-I${prefix}/include ${ECHO_C}" ++ printf "%s" "-I${prefix}/include " + ;; + + --cppflags-dynamic) +- echo $ECHO_N "${SHAREDLIBCPPFLAGS} ${ECHO_C}" ++ printf "%s" "${SHAREDLIBCPPFLAGS} " + ;; + + --cxxflags-dynamic) +- echo $ECHO_N "${SHAREDLIBCXXFLAGS} ${ECHO_C}" ++ printf "%s" "${SHAREDLIBCXXFLAGS} " + ;; + + --cflags-dynamic) +- echo $ECHO_N "${SHAREDLIBCFLAGS} ${ECHO_C}" ++ printf "%s" "${SHAREDLIBCFLAGS} " + ;; + + --ldflags-system) +- echo $ECHO_N "${LIBS} ${ECHO_C}" ++ printf "%s" "${LIBS} " + ;; + + --ldflags) +- echo $ECHO_N "${LDFLAGS} ${ICULIBS} ${ECHO_C}" ++ printf "%s" "${LDFLAGS} ${ICULIBS} " + # $RPATH_LDFLAGS + ;; + + --ldflags-libsonly) +- echo $ECHO_N "${ICULIBS_I18N} ${ICULIBS_COMMON} ${ICULIBS_DATA} ${ECHO_C}" ++ printf "%s" "${ICULIBS_I18N} ${ICULIBS_COMMON} ${ICULIBS_DATA} " + ;; + + --ldflags-icuio) +- echo $ECHO_N " ${ICULIBS_ICUIO} ${ECHO_C}" ++ printf "%s" " ${ICULIBS_ICUIO} " + ;; + + --ldflags-obsolete) +- echo $ECHO_N "${ICULIBS_OBSOLETE} ${ECHO_C}" ++ printf "%s" "${ICULIBS_OBSOLETE} " + ;; + + --ldflags-toolutil) +- echo $ECHO_N " ${ICULIBS_TOOLUTIL} ${ECHO_C}" ++ printf "%s" " ${ICULIBS_TOOLUTIL} " + ;; + + --ldflags-layout) +@@ -285,7 +285,7 @@ + ;; + + --ldflags-searchpath) +- echo $ECHO_N "-L${libdir} ${ECHO_C}" ++ printf "%s" "-L${libdir} " + ;; + + --detect-prefix) +@@ -321,47 +321,47 @@ + ;; + + --shared-datadir) +- echo $ECHO_N "${datadir} ${ECHO_C}" ++ printf "%s" "${datadir} " + ;; + + --incfile) +- echo $ECHO_N "${pkglibdir}/Makefile.inc ${ECHO_C}" ++ printf "%s" "${pkglibdir}/Makefile.inc " + ;; + + --incpkgdatafile) +- echo $ECHO_N "${pkglibdir}/pkgdata.inc ${ECHO_C}" ++ printf "%s" "${pkglibdir}/pkgdata.inc " + ;; + + --icudata) +- echo $ECHO_N "${ICUDATA_NAME} ${ECHO_C}" ++ printf "%s" "${ICUDATA_NAME} " + ;; + + --icudata-mode) +- echo $ECHO_N "${PKGDATA_MODE} ${ECHO_C}" ++ printf "%s" "${PKGDATA_MODE} " + ;; + + --icudata-install-dir) +- echo $ECHO_N "${ICUPKGDATA_DIR} ${ECHO_C}" ++ printf "%s" "${ICUPKGDATA_DIR} " + ;; + + --icudatadir) +- echo $ECHO_N "${ICUDATA_DIR} ${ECHO_C}" ++ printf "%s" "${ICUDATA_DIR} " + ;; + + --shlib-c) +- echo $ECHO_N "${SHLIB_c} ${ECHO_C}" ++ printf "%s" "${SHLIB_c} " + ;; + + --shlib-cc) +- echo $ECHO_N "${SHLIB_cc} ${ECHO_C}" ++ printf "%s" "${SHLIB_cc} " + ;; + + --version) +- echo $ECHO_N $VERSION ++ printf "%s" "$VERSION" + ;; + + --unicode-version) +- echo $ECHO_N $UNICODE_VERSION ++ printf "%s" "$UNICODE_VERSION" + ;; + + --host) diff --git a/dev-libs/icu-layoutex/files/icu-layoutex-76.1-undo-pkgconfig-change-for-now.patch b/dev-libs/icu-layoutex/files/icu-layoutex-76.1-undo-pkgconfig-change-for-now.patch new file mode 100644 index 000000000000..b99557871bc0 --- /dev/null +++ b/dev-libs/icu-layoutex/files/icu-layoutex-76.1-undo-pkgconfig-change-for-now.patch @@ -0,0 +1,30 @@ +https://github.com/chimera-linux/cports/blob/master/main/icu/patches/pc.patch + +""" +for some reason enable-shared only emits a requires.private here now and things +underlink icu-uc libs when using other icu libs, even though the deps are correct +this is https://github.com/unicode-org/icu/commit/199bc827021ffdb43b6579d68e5eecf54c7f6f56 , +consumers probably have to be explicit about -i18n -uc use now instead of it +being implicit, but just undo .private for now +""" +--- a/Makefile.in ++++ b/Makefile.in +@@ -290,7 +290,7 @@ + ifeq ($(ENABLE_SHARED),) + @echo "Requires: icu-uc" >> $@ + else +- @echo "Requires.private: icu-uc" >> $@ ++ @echo "Requires: icu-uc" >> $@ + endif + @echo "Libs:" '-L$${libdir}' "${ICULIBS_I18N}" >> $@ + @echo $@ updated. +@@ -302,7 +302,7 @@ + ifeq ($(ENABLE_SHARED),) + @echo "Requires: icu-i18n" >> $@ + else +- @echo "Requires.private: icu-i18n" >> $@ ++ @echo "Requires: icu-i18n" >> $@ + endif + @echo "Libs:" '-L$${libdir}' "${ICULIBS_IO}" >> $@ + @echo $@ updated. + diff --git a/dev-libs/icu-layoutex/icu-layoutex-75.1.ebuild b/dev-libs/icu-layoutex/icu-layoutex-75.1.ebuild index 484d41097871..3f281c42e315 100644 --- a/dev-libs/icu-layoutex/icu-layoutex-75.1.ebuild +++ b/dev-libs/icu-layoutex/icu-layoutex-75.1.ebuild @@ -19,7 +19,7 @@ S="${WORKDIR}"/${PN/-layoutex}/source LICENSE="BSD" SLOT="0/${PV%.*}" if [[ ${PV} != *_rc* ]] ; then - KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" + KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ppc64 sparc x86" fi IUSE="debug static-libs test" RESTRICT="!test? ( test )" diff --git a/dev-libs/icu-layoutex/icu-layoutex-74.2.ebuild b/dev-libs/icu-layoutex/icu-layoutex-76.1-r1.ebuild index b754ba1ec4af..3e0aed8d009b 100644 --- a/dev-libs/icu-layoutex/icu-layoutex-74.2.ebuild +++ b/dev-libs/icu-layoutex/icu-layoutex-76.1-r1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 # Please bump with dev-libs/icu VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/icu.asc -inherit autotools flag-o-matic multilib-minimal toolchain-funcs verify-sig +inherit autotools multilib-minimal toolchain-funcs verify-sig MY_PV=${PV/_rc/-rc} MY_PV=${MY_PV//./_} @@ -17,7 +17,7 @@ SRC_URI+=" verify-sig? ( https://github.com/unicode-org/icu/releases/download/re S="${WORKDIR}"/${PN/-layoutex}/source LICENSE="BSD" -SLOT="0/${PV%.*}.1" +SLOT="0/${PV%.*}" if [[ ${PV} != *_rc* ]] ; then KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ppc64 sparc x86" fi @@ -31,19 +31,32 @@ DEPEND=" RDEPEND="${DEPEND}" BDEPEND=" virtual/pkgconfig - verify-sig? ( >=sec-keys/openpgp-keys-icu-20221020 ) + verify-sig? ( >=sec-keys/openpgp-keys-icu-20241110 ) " -PATCHES=( "${FILESDIR}/${PN}-65.1-remove-bashisms.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-76.1-remove-bashisms.patch" + + # Undo change for now which exposes underlinking in consumers; + # revisit when things are a bit quieter and tinderbox its removal. + "${FILESDIR}/${PN}-76.1-undo-pkgconfig-change-for-now.patch" +) src_prepare() { default + # TODO: switch uconfig.h hacks to use uconfig_local + # # Disable renaming as it assumes stable ABI and that consumers # won't use unofficial APIs. We need this despite the configure argument. sed -i \ -e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \ common/unicode/uconfig.h || die + # + # ODR violations, experimental API + sed -i \ + -e "s/# define UCONFIG_NO_MF2 0/#define UCONFIG_NO_MF2 1/" \ + common/unicode/uconfig.h || die # Fix linking of icudata sed -i \ @@ -56,11 +69,6 @@ src_prepare() { src_configure() { MAKEOPTS+=" VERBOSE=1" - # ICU tries to append -std=c++11 without this, so as of 71.1, - # despite GCC 9+ using c++14 (or gnu++14) and GCC 11+ using gnu++17, - # we still need this. - append-cxxflags -std=c++14 - if tc-is-cross-compiler; then mkdir "${WORKDIR}"/host || die pushd "${WORKDIR}"/host >/dev/null || die diff --git a/dev-libs/icu-le-hb/Manifest b/dev-libs/icu-le-hb/Manifest index 3c7d06f31db3..500dd55654ad 100644 --- a/dev-libs/icu-le-hb/Manifest +++ b/dev-libs/icu-le-hb/Manifest @@ -1 +1,2 @@ DIST icu-le-hb-1.2.3.tar.gz 45191 BLAKE2B 14ad8592a27ff8673d9609a689bedf5094c127bb9cb638a1e65c1fcb6e22e8c488f89e55af5578cd4961a34feafffd5df9cdedb20dfc7edcc4d6f63aec1eff0f SHA512 c1450e28c1984a409cacc2b675ab91fa0e80edfbbfb201913cb83e435fd30f3a3ad78ca32f8cf092c5f056f2812b899ceb4471b36ef975faf5be892d305a1efd +DIST icu-le-hb-2.0.0.tar.gz 421450 BLAKE2B 20b72590ff5b968754ab369f57770c449fa68e001c9211987adf708447a6ee956266b1fa64049651b2b132afcb98f9c456d3549e48db5d8d40faa0ec90cd801d SHA512 aa8d822ef3c471a8e4325a8f4bc01011e096b7fcc0c7cbab3849f91bda6b802397c831e8db34525ebaa2b14e2a007a5728af92e75f0605d944973984c2ceec28 diff --git a/dev-libs/icu-le-hb/icu-le-hb-2.0.0.ebuild b/dev-libs/icu-le-hb/icu-le-hb-2.0.0.ebuild new file mode 100644 index 000000000000..2bd9c7b1c86a --- /dev/null +++ b/dev-libs/icu-le-hb/icu-le-hb-2.0.0.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit multilib-minimal + +DESCRIPTION="ICU Layout Engine API on top of HarfBuzz shaping library" +HOMEPAGE="https://github.com/harfbuzz/harfbuzz https://github.com/harfbuzz/icu-le-hb" +SRC_URI="https://github.com/harfbuzz/icu-le-hb/releases/download/${PV}/${P}.tar.gz" + +LICENSE="icu" +SLOT="0" +KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ppc64 sparc x86" + +# dev-libs/icu is not linked into icu-le-hb but the latter still needs +# to be rebuilt on dev-libs/icu upgrades (see bug #621786). +RDEPEND=" + dev-libs/icu:=[${MULTILIB_USEDEP}] + >=media-libs/harfbuzz-2.0.0:=[${MULTILIB_USEDEP}] +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +multilib_src_configure() { + ECONF_SOURCE="${S}" econf +} + +multilib_src_install_all() { + find "${ED}" -type f -name "*.la" -delete || die +} diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest index 7a7475da110d..4773f3bc3568 100644 --- a/dev-libs/icu/Manifest +++ b/dev-libs/icu/Manifest @@ -1,4 +1,4 @@ -DIST icu4c-74_2-src.tgz 26529443 BLAKE2B 08790dd3634037177eaec428651afe0da1f71dbad3423bde7ea5a6d49eab5dc011f72b175760fc55f6d8d7d820f7f3dfc369a80a1f7cb2f9f933644beb3d3711 SHA512 e6c7876c0f3d756f3a6969cad9a8909e535eeaac352f3a721338b9cbd56864bf7414469d29ec843462997815d2ca9d0dab06d38c37cdd4d8feb28ad04d8781b0 -DIST icu4c-74_2-src.tgz.asc 659 BLAKE2B 0723204ce19d7bd4b1989e00b5ab084cc5b154c214129632a7f7ce31c151c8a4b9e0033d49872db728a3787809dbad2320f1d848561c84f94797c7e006749b94 SHA512 b249a61aba711b34599c3c0fbc113a52a83e59cb7bbda914ca74f534c1f474e6821d663dc7f078608b24393703654a43c2b793ca3d3f3be761393b6a73862ecc DIST icu4c-75_1-src.tgz 26568378 BLAKE2B 2772b52bf59407188511359ec54bea432bc70ba81610015bb51192f7aff33d5e4b08840cf3bfed3de7f9a91b430b6a6efe9dd75fdc53327d4c9f8fbf54d96d18 SHA512 70ea842f0d5f1f6c6b65696ac71d96848c4873f4d794bebc40fd87af2ad4ef064c61a786bf7bc430ce4713ec6deabb8cc1a8cc0212eab148cee2d498a3683e45 DIST icu4c-75_1-src.tgz.asc 659 BLAKE2B d884a9ddb2afc1a8aa00e66568d2f4f76de2b2d15b5ac4ca5a464e2d1dd22aef2406cbd1391c31c8987f1b95d9325c37359f081d2ad69ca313a9d656d3dd7ec1 SHA512 a69d47d74e28a3dcc2f5b83bb0094b7e52e737c83ad484aec64ce76a6f1ad719b1de651ad4024df6cc1bb74992a8540dec09cec2814c45a3e7aaa365afd96628 +DIST icu4c-76_1-src.tgz 27437767 BLAKE2B 67223391123d2d2c75107fc4b87510b1d8d520301a863032951b894366ec8b414692ee3fa2acd652289b0ae2f60946d71bf9ca21ed87de40825e2fd02634c658 SHA512 b702ab62fb37a1574d5f4a768326d0f8fa30d9db5b015605b5f8215b5d8547f83d84880c586d3dcc7b6c76f8d47ef34e04b0f51baa55908f737024dd79a42a6c +DIST icu4c-76_1-src.tgz.asc 228 BLAKE2B 37a058e22da5ad122e3df6de2cb3979fa734b32e4e81d91201d2095fbf20ef2dbcba4579efab3041193e49c388d09618c965ddf082a8362aa82b694184804fa7 SHA512 c4bd81d4e98d7e37a6ba9540748c4ce1eb740d70bd689a13e2e51da76503b6e0287afd4d1cd3af4540210f37626dec998fcbd7269976cb801f238b789e604489 diff --git a/dev-libs/icu/files/icu-76.1-remove-bashisms.patch b/dev-libs/icu/files/icu-76.1-remove-bashisms.patch new file mode 100644 index 000000000000..62bb3221116f --- /dev/null +++ b/dev-libs/icu/files/icu-76.1-remove-bashisms.patch @@ -0,0 +1,151 @@ +--- a/config/icu-config-bottom ++++ b/config/icu-config-bottom +@@ -218,65 +218,65 @@ + ;; + + --cflags) +- echo $ECHO_N "${CFLAGS} ${ECHO_C}" ++ printf "%s" "${CFLAGS} " + ;; + + --cc) +- echo $ECHO_N "${CC} ${ECHO_C}" ++ printf "%s" "${CC} " + ;; + + --cxx) +- echo $ECHO_N "${CXX} ${ECHO_C}" ++ printf "%s" "${CXX} " + ;; + + --cxxflags) +- echo $ECHO_N "${CXXFLAGS} ${ECHO_C}" ++ printf "%s" "${CXXFLAGS} " + ;; + + --cppflags) + # Don't echo the -I. - it's unneeded. +- echo $ECHO_N "${CPPFLAGS} ${ECHO_C}" | sed -e 's/-I. //' ++ printf "%s" "${CPPFLAGS} " | sed -e 's/-I. //' + ;; + + --cppflags-searchpath) +- echo $ECHO_N "-I${prefix}/include ${ECHO_C}" ++ printf "%s" "-I${prefix}/include " + ;; + + --cppflags-dynamic) +- echo $ECHO_N "${SHAREDLIBCPPFLAGS} ${ECHO_C}" ++ printf "%s" "${SHAREDLIBCPPFLAGS} " + ;; + + --cxxflags-dynamic) +- echo $ECHO_N "${SHAREDLIBCXXFLAGS} ${ECHO_C}" ++ printf "%s" "${SHAREDLIBCXXFLAGS} " + ;; + + --cflags-dynamic) +- echo $ECHO_N "${SHAREDLIBCFLAGS} ${ECHO_C}" ++ printf "%s" "${SHAREDLIBCFLAGS} " + ;; + + --ldflags-system) +- echo $ECHO_N "${LIBS} ${ECHO_C}" ++ printf "%s" "${LIBS} " + ;; + + --ldflags) +- echo $ECHO_N "${LDFLAGS} ${ICULIBS} ${ECHO_C}" ++ printf "%s" "${LDFLAGS} ${ICULIBS} " + # $RPATH_LDFLAGS + ;; + + --ldflags-libsonly) +- echo $ECHO_N "${ICULIBS_I18N} ${ICULIBS_COMMON} ${ICULIBS_DATA} ${ECHO_C}" ++ printf "%s" "${ICULIBS_I18N} ${ICULIBS_COMMON} ${ICULIBS_DATA} " + ;; + + --ldflags-icuio) +- echo $ECHO_N " ${ICULIBS_ICUIO} ${ECHO_C}" ++ printf "%s" " ${ICULIBS_ICUIO} " + ;; + + --ldflags-obsolete) +- echo $ECHO_N "${ICULIBS_OBSOLETE} ${ECHO_C}" ++ printf "%s" "${ICULIBS_OBSOLETE} " + ;; + + --ldflags-toolutil) +- echo $ECHO_N " ${ICULIBS_TOOLUTIL} ${ECHO_C}" ++ printf "%s" " ${ICULIBS_TOOLUTIL} " + ;; + + --ldflags-layout) +@@ -285,7 +285,7 @@ + ;; + + --ldflags-searchpath) +- echo $ECHO_N "-L${libdir} ${ECHO_C}" ++ printf "%s" "-L${libdir} " + ;; + + --detect-prefix) +@@ -321,47 +321,47 @@ + ;; + + --shared-datadir) +- echo $ECHO_N "${datadir} ${ECHO_C}" ++ printf "%s" "${datadir} " + ;; + + --incfile) +- echo $ECHO_N "${pkglibdir}/Makefile.inc ${ECHO_C}" ++ printf "%s" "${pkglibdir}/Makefile.inc " + ;; + + --incpkgdatafile) +- echo $ECHO_N "${pkglibdir}/pkgdata.inc ${ECHO_C}" ++ printf "%s" "${pkglibdir}/pkgdata.inc " + ;; + + --icudata) +- echo $ECHO_N "${ICUDATA_NAME} ${ECHO_C}" ++ printf "%s" "${ICUDATA_NAME} " + ;; + + --icudata-mode) +- echo $ECHO_N "${PKGDATA_MODE} ${ECHO_C}" ++ printf "%s" "${PKGDATA_MODE} " + ;; + + --icudata-install-dir) +- echo $ECHO_N "${ICUPKGDATA_DIR} ${ECHO_C}" ++ printf "%s" "${ICUPKGDATA_DIR} " + ;; + + --icudatadir) +- echo $ECHO_N "${ICUDATA_DIR} ${ECHO_C}" ++ printf "%s" "${ICUDATA_DIR} " + ;; + + --shlib-c) +- echo $ECHO_N "${SHLIB_c} ${ECHO_C}" ++ printf "%s" "${SHLIB_c} " + ;; + + --shlib-cc) +- echo $ECHO_N "${SHLIB_cc} ${ECHO_C}" ++ printf "%s" "${SHLIB_cc} " + ;; + + --version) +- echo $ECHO_N $VERSION ++ printf "%s" "$VERSION" + ;; + + --unicode-version) +- echo $ECHO_N $UNICODE_VERSION ++ printf "%s" "$UNICODE_VERSION" + ;; + + --host) diff --git a/dev-libs/icu/files/icu-76.1-undo-pkgconfig-change-for-now.patch b/dev-libs/icu/files/icu-76.1-undo-pkgconfig-change-for-now.patch new file mode 100644 index 000000000000..b99557871bc0 --- /dev/null +++ b/dev-libs/icu/files/icu-76.1-undo-pkgconfig-change-for-now.patch @@ -0,0 +1,30 @@ +https://github.com/chimera-linux/cports/blob/master/main/icu/patches/pc.patch + +""" +for some reason enable-shared only emits a requires.private here now and things +underlink icu-uc libs when using other icu libs, even though the deps are correct +this is https://github.com/unicode-org/icu/commit/199bc827021ffdb43b6579d68e5eecf54c7f6f56 , +consumers probably have to be explicit about -i18n -uc use now instead of it +being implicit, but just undo .private for now +""" +--- a/Makefile.in ++++ b/Makefile.in +@@ -290,7 +290,7 @@ + ifeq ($(ENABLE_SHARED),) + @echo "Requires: icu-uc" >> $@ + else +- @echo "Requires.private: icu-uc" >> $@ ++ @echo "Requires: icu-uc" >> $@ + endif + @echo "Libs:" '-L$${libdir}' "${ICULIBS_I18N}" >> $@ + @echo $@ updated. +@@ -302,7 +302,7 @@ + ifeq ($(ENABLE_SHARED),) + @echo "Requires: icu-i18n" >> $@ + else +- @echo "Requires.private: icu-i18n" >> $@ ++ @echo "Requires: icu-i18n" >> $@ + endif + @echo "Libs:" '-L$${libdir}' "${ICULIBS_IO}" >> $@ + @echo $@ updated. + diff --git a/dev-libs/icu/icu-75.1.ebuild b/dev-libs/icu/icu-75.1.ebuild index 9de8164ebc09..f183944d6ac8 100644 --- a/dev-libs/icu/icu-75.1.ebuild +++ b/dev-libs/icu/icu-75.1.ebuild @@ -19,7 +19,7 @@ SRC_URI+=" verify-sig? ( https://github.com/unicode-org/icu/releases/download/re S="${WORKDIR}"/${PN}/source if [[ ${PV} != *_rc* ]] ; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" fi LICENSE="BSD" SLOT="0/${PV%.*}" diff --git a/dev-libs/icu/icu-74.2.ebuild b/dev-libs/icu/icu-76.1-r1.ebuild index b506cc195aba..2ea3b7d3ef20 100644 --- a/dev-libs/icu/icu-74.2.ebuild +++ b/dev-libs/icu/icu-76.1-r1.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 # Please bump with dev-libs/icu-layoutex -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/icu.asc -inherit autotools flag-o-matic multilib-minimal python-any-r1 toolchain-funcs verify-sig +inherit autotools multilib-minimal python-any-r1 toolchain-funcs verify-sig MY_PV=${PV/_rc/-rc} MY_PV=${MY_PV//./_} @@ -19,10 +19,10 @@ SRC_URI+=" verify-sig? ( https://github.com/unicode-org/icu/releases/download/re S="${WORKDIR}"/${PN}/source if [[ ${PV} != *_rc* ]] ; then - KEYWORDS="~alpha amd64 arm arm64 hppa ~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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" fi LICENSE="BSD" -SLOT="0/${PV%.*}.1" +SLOT="0/${PV%.*}" IUSE="debug doc examples static-libs test" RESTRICT="!test? ( test )" @@ -31,7 +31,7 @@ BDEPEND=" dev-build/autoconf-archive virtual/pkgconfig doc? ( app-text/doxygen[dot] ) - verify-sig? ( >=sec-keys/openpgp-keys-icu-20221020 ) + verify-sig? ( >=sec-keys/openpgp-keys-icu-20241110 ) " MULTILIB_CHOST_TOOLS=( @@ -39,19 +39,30 @@ MULTILIB_CHOST_TOOLS=( ) PATCHES=( - "${FILESDIR}/${PN}-65.1-remove-bashisms.patch" + "${FILESDIR}/${PN}-76.1-remove-bashisms.patch" "${FILESDIR}/${PN}-64.2-darwin.patch" "${FILESDIR}/${PN}-68.1-nonunicode.patch" + + # Undo change for now which exposes underlinking in consumers; + # revisit when things are a bit quieter and tinderbox its removal. + "${FILESDIR}/${PN}-76.1-undo-pkgconfig-change-for-now.patch" ) src_prepare() { default + # TODO: switch uconfig.h hacks to use uconfig_local + # # Disable renaming as it assumes stable ABI and that consumers # won't use unofficial APIs. We need this despite the configure argument. sed -i \ -e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \ common/unicode/uconfig.h || die + # + # ODR violations, experimental API + sed -i \ + -e "s/# define UCONFIG_NO_MF2 0/#define UCONFIG_NO_MF2 1/" \ + common/unicode/uconfig.h || die # Fix linking of icudata sed -i \ @@ -69,19 +80,6 @@ src_prepare() { src_configure() { MAKEOPTS+=" VERBOSE=1" - # -Werror=odr - # https://bugs.gentoo.org/866947 - # https://unicode-org.atlassian.net/browse/ICU-22001 - # - # Only present in testsuite, but unfortunately that means we cannot... - # test... LTO support. - filter-lto - - # ICU tries to append -std=c++11 without this, so as of 71.1, - # despite GCC 9+ using c++14 (or gnu++14) and GCC 11+ using gnu++17, - # we still need this. - append-cxxflags -std=c++14 - if tc-is-cross-compiler; then mkdir "${WORKDIR}"/host || die pushd "${WORKDIR}"/host >/dev/null || die diff --git a/dev-libs/igraph/igraph-0.10.12.ebuild b/dev-libs/igraph/igraph-0.10.12.ebuild index 30a8f524a0b5..280105ef5c8d 100644 --- a/dev-libs/igraph/igraph-0.10.12.ebuild +++ b/dev-libs/igraph/igraph-0.10.12.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/igraph/igraph/releases/download/${PV}/${P}.tar.gz" LICENSE="GPL-2+" SLOT="0/0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="debug test threads" RESTRICT="!test? ( test )" diff --git a/dev-libs/imath/Manifest b/dev-libs/imath/Manifest index c9ee72b93ef1..f71289fb030f 100644 --- a/dev-libs/imath/Manifest +++ b/dev-libs/imath/Manifest @@ -1 +1,2 @@ DIST imath-3.1.11.tar.gz 596585 BLAKE2B d5fc8d7607070bc96619e74eb67c60048695023c1baa715e3ab5de84a49bf1f7381cc19e3a047b75f8520e20a9976c58503b2063feb2add7b6dfcc7c73e13ad7 SHA512 0bc86bea3a2aca89d02b501b4fba3c13ca861e914cec558e820fe9e4c43ab14cac34e31ff278b8c35b5fe76f7bea32f2c8105c0d33eb92224eb23d42d7a402e9 +DIST imath-3.1.12.tar.gz 604232 BLAKE2B f11cd2ac2e8ba9df36b2401083088e5603980b45ca36b7b89348a5b87af99cb89de39154e9d37a0d0ef505a06d270f087f96dbc6bca3d4349e03840f34915bb3 SHA512 32628dfcacb610310b81ffe017a66215cf5fb84c2e0a6ac8c94a68c048be3d2b97eb57965dd253770184d5824cce1e5440b8eefb2834666b273b3193ff108343 diff --git a/dev-libs/imath/imath-3.1.11.ebuild b/dev-libs/imath/imath-3.1.12.ebuild index 79345be46be9..3a1960478263 100644 --- a/dev-libs/imath/imath-3.1.11.ebuild +++ b/dev-libs/imath/imath-3.1.12.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit cmake python-single-r1 @@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}" LICENSE="BSD" SLOT="3/29" -KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="doc large-stack python test" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RESTRICT="!test? ( test )" @@ -47,14 +47,19 @@ BDEPEND=" DOCS=( CHANGES.md CONTRIBUTORS.md README.md SECURITY.md ) +PATCHES=( + "${FILESDIR}/${PN}-3.1.11-fix_cmake_module_export.patch" + "${FILESDIR}/${PN}-3.1.11-use-correct-boost_python_version.patch" +) + pkg_setup() { use python && python-single-r1_pkg_setup } src_configure() { local mycmakeargs=( - -DBUILD_WEBSITE=$(usex doc) - -DIMATH_ENABLE_LARGE_STACK=$(usex large-stack) + -DBUILD_WEBSITE="$(usex doc)" + -DIMATH_ENABLE_LARGE_STACK="$(usex large-stack)" # the following options are at their default value -DIMATH_HALF_USE_LOOKUP_TABLE=ON -DIMATH_INSTALL_PKG_CONFIG=ON diff --git a/dev-libs/immer/immer-0.8.1-r1.ebuild b/dev-libs/immer/immer-0.8.1-r1.ebuild index 3d52cf8cbd2a..380df851f358 100644 --- a/dev-libs/immer/immer-0.8.1-r1.ebuild +++ b/dev-libs/immer/immer-0.8.1-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/arximboldi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g LICENSE="Boost-1.0" SLOT="0" -KEYWORDS="amd64 ~arm64 ~riscv ~x86" +KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-libs/iniparser/Manifest b/dev-libs/iniparser/Manifest index 0df565c5a236..06b695bc2638 100644 --- a/dev-libs/iniparser/Manifest +++ b/dev-libs/iniparser/Manifest @@ -1,3 +1,3 @@ DIST iniparser-3.1.tar.gz 39097 BLAKE2B 4ada36f5bb95476c06deffa7938a750bcdeb0bd5bb817b24274c1e1c588d9abbd23c3a58f3cb3b6f961912f3e12e74aadf224da4cd81863b874e4a84d11c1744 SHA512 8fd8324c5629fdc3e3eff00afb5f0832402ccc760c5b92db82aa29b340ec891419ca2c4fee3a4d4d67cf9bc51c76b095bc0c458e087c2b8e72ac36867c47ae86 DIST iniparser-4.1.tar.gz 44732 BLAKE2B a3480dab512b41eb9635c733b76048ab089a311c2970aae5ce89d103ff6ab1923d5824a5fca3bf445ba213ecd9954018fdef2831fd98c1a43c9ae7d4fb1cb388 SHA512 a8125aaaead1f9dfde380fa1e45bae31ca2312be029f2c53b4072cb3b127d16578a95c7c0aee1e3dda5e7b8db7a865ba6dfe8a1d80eb673061b3babef744e968 -DIST iniparser-4.2.2.tar.bz2 32649 BLAKE2B e4ab230ca1cde6a0322e05aa483e3112e324903c65e1f22640e17a7696ac30a4eef66c1bb449ea730b9a0caf55091b425fafb9d1514fbf7bbd21d7ef4503147e SHA512 a9b0d4b80a4d4faeff4ec5ae9f0de8f0d4e1d6244dddfca7c3ef9bb188fcb0c3bb288478632145232fe52073cd0714abc0ad12a1cca4e3936fc40a3fba357601 +DIST iniparser-v4.2.5.tar.bz2 34574 BLAKE2B 47eeffa4f441d491c153717df5b713e56181e090509b4496e9768b7f4654970b9cc6f261f9c821afbd2769b194a5742f82d20fc46471c92577bcde5ad350f989 SHA512 db7ebab3336bf9854efc9a70784762b1917da616d4c1f5e6c2409b238dd967967c196df85f444c1d21732dc47d195ca044a93ae2b0d8d556fe150e7dd1b78d64 diff --git a/dev-libs/iniparser/iniparser-4.1-r1.ebuild b/dev-libs/iniparser/iniparser-4.1-r1.ebuild deleted file mode 100644 index c47f61626075..000000000000 --- a/dev-libs/iniparser/iniparser-4.1-r1.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs flag-o-matic - -DESCRIPTION="A free stand-alone ini file parsing library" -HOMEPAGE="https://github.com/ndevilla/iniparser" -SRC_URI="https://github.com/ndevilla/iniparser/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="4" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="doc examples" - -BDEPEND="doc? ( app-text/doxygen )" - -PATCHES=( - "${FILESDIR}"/${P}-CVE-null-getstring.patch # upstream, bug #907928 -) - -_newlib_so_with_symlinks() { - local source="${1}" base="${2}" current="${3}" revision="${4}" age="${5}" - - newlib.so ${source} ${base}.so.${current}.${revision}.${age} - local i - for i in ".${current}" '' ; do - dosym ${base}.so.${current}.${revision}.${age} /usr/$(get_libdir)/${base}.so${i} - done -} - -src_prepare() { - default - rm -r html || die -} - -src_configure() { - append-lfs-flags -} - -_emake() { - emake CC="$(tc-getCC)" AR="$(tc-getAR)" V=1 \ - SO_TARGET=lib${PN}${SLOT}.so.1 \ - ADDITIONAL_CFLAGS= \ - "$@" -} - -src_compile() { - _emake -} - -src_test() { - _emake -C test -} - -src_install() { - _newlib_so_with_symlinks lib${PN}${SLOT}.so.1 lib${PN}${SLOT} 1 0 0 - - insinto /usr/include/${PN}${SLOT} - doins src/*.h - - if use doc; then - emake -C doc - HTML_DOCS=( html/. ) - fi - - if use examples; then - docinto examples - dodoc -r example/. - docompress -x /usr/share/doc/${PF}/examples - fi - - einstalldocs -} diff --git a/dev-libs/iniparser/iniparser-4.1-r2.ebuild b/dev-libs/iniparser/iniparser-4.1-r2.ebuild new file mode 100644 index 000000000000..d48fac06d4e7 --- /dev/null +++ b/dev-libs/iniparser/iniparser-4.1-r2.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs flag-o-matic + +DESCRIPTION="Free stand-alone ini file parsing library" +HOMEPAGE="https://github.com/ndevilla/iniparser/" +SRC_URI=" + https://github.com/ndevilla/iniparser/archive/refs/tags/v${PV}.tar.gz + -> ${P}.tar.gz +" + +LICENSE="MIT" +SLOT="0/1" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="doc examples" + +BDEPEND="doc? ( app-text/doxygen )" + +PATCHES=( + "${FILESDIR}"/${P}-CVE-null-getstring.patch +) + +src_prepare() { + default + + rm -r html || die +} + +src_compile() { + append-lfs-flags + tc-export AR CC + + emake V=1 ADDITIONAL_CFLAGS= + use doc && emake -C doc +} + +src_test() { + emake V=1 -C test +} + +src_install() { + dolib.so lib${PN}.so.1 + dosym -r /usr/$(get_libdir)/lib${PN}.so{.1,} + + doheader src/*.h + + if use examples; then + docinto examples + dodoc -r example/. + docompress -x /usr/share/doc/${PF}/examples + fi + + use doc && local HTML_DOCS=( html/. ) + einstalldocs +} diff --git a/dev-libs/iniparser/iniparser-4.2.2.ebuild b/dev-libs/iniparser/iniparser-4.2.2.ebuild deleted file mode 100644 index 338c713a9dd4..000000000000 --- a/dev-libs/iniparser/iniparser-4.2.2.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -DESCRIPTION="A free stand-alone ini file parsing library" -HOMEPAGE="https://gitlab.com/iniparser/iniparser" -SRC_URI="https://gitlab.com/iniparser/iniparser/-/archive/v${PV}/iniparser-v${PV}.tar.bz2 -> ${P}.tar.bz2" - -S="${WORKDIR}/${PN}-v${PV}" -LICENSE="MIT" -SLOT="4" -#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="doc examples" - -BDEPEND="doc? ( app-text/doxygen )" - -src_configure() { - local mycmakeargs=( - -DBUILD_DOCS=$(usex doc) - -DBUILD_EXAMPLES=$(usex examples) - ) - - cmake_src_configure -} diff --git a/dev-libs/iniparser/iniparser-4.2.5.ebuild b/dev-libs/iniparser/iniparser-4.2.5.ebuild new file mode 100644 index 000000000000..0da548834a2f --- /dev/null +++ b/dev-libs/iniparser/iniparser-4.2.5.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Free stand-alone ini file parsing library" +HOMEPAGE="https://gitlab.com/iniparser/iniparser/" +SRC_URI="https://gitlab.com/iniparser/iniparser/-/archive/v${PV}/${PN}-v${PV}.tar.bz2" +S=${WORKDIR}/${PN}-v${PV} + +LICENSE="MIT" +SLOT="0/4" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="doc examples" + +BDEPEND="doc? ( app-text/doxygen )" + +src_configure() { + local mycmakeargs=( + -DBUILD_DOCS=$(usex doc) + -DBUILD_STATIC_LIBS=no + ) + + cmake_src_configure +} + +src_install() { + local DOCS=( AUTHORS README.md FAQ* ) + cmake_src_install + + if use examples; then + docinto examples + dodoc -r example/. + fi +} diff --git a/dev-libs/iniparser/metadata.xml b/dev-libs/iniparser/metadata.xml index 1c90e38bac72..7f7e9f7f07a5 100644 --- a/dev-libs/iniparser/metadata.xml +++ b/dev-libs/iniparser/metadata.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>samba@gentoo.org</email> - <name>Samba Team</name> + <maintainer type="person"> + <email>ionen@gentoo.org</email> + <name>Ionen Wolkens</name> </maintainer> <upstream> <remote-id type="gitlab">iniparser/iniparser</remote-id> diff --git a/dev-libs/intel-compute-runtime/Manifest b/dev-libs/intel-compute-runtime/Manifest index b828d023e778..51a71fb57a7a 100644 --- a/dev-libs/intel-compute-runtime/Manifest +++ b/dev-libs/intel-compute-runtime/Manifest @@ -1 +1,3 @@ DIST intel-compute-runtime-24.35.30872.25.tar.gz 7375680 BLAKE2B 8aede769b46ecdb2eb49346bc87c1e58fbefa382e80419a301b00197fbdc977f62b001e7670a912a28c736aafc59e60d45a4c4d3e61331d6001307c184d3a4b8 SHA512 4e09f432f1f3a7f8c3b9a7bbd6981f2b26a837fc6f6b4459d21bb51fcce94a3c95726d23fb77be2664c7fbdf4dd270e1ec21af1bc815e718a5df865e8bbdac03 +DIST intel-compute-runtime-24.35.30872.32.tar.gz 7376572 BLAKE2B af924c111d288621ddcb14b9d77ff384c632668705e4858ed27424522b6c96e1e7b54012b202c6ade64da668681f3089d0a35d64ecb97ddec642ace8774b3e47 SHA512 2ac8dbefcc1a86b33afd78b8a1d30a959fb980e47402852514d43503df87ea70ea35f192243b78faedce749b3087f244631080f16ddb099a93ec79698176f6b5 +DIST intel-compute-runtime-24.52.32224.5.tar.gz 7418220 BLAKE2B fa1e165cf20e7c31fff15c19700e3589338edc8255b567131c038fb58086a72243994b08e668ecc43fdbc5668177ab6acb95ff32ac40c7703de90778c876b9db SHA512 548b249aab5a21fd94846a96443fd3f766664ea401ba86803f106b8001d4f4f0224d8581952162c31c12b4aa5bc82fc6b4236929c921c0a93763950a7e221363 diff --git a/dev-libs/intel-compute-runtime/intel-compute-runtime-24.35.30872.25.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-24.35.30872.25-r1.ebuild index 26093c05fb99..341100484c5f 100644 --- a/dev-libs/intel-compute-runtime/intel-compute-runtime-24.35.30872.25.ebuild +++ b/dev-libs/intel-compute-runtime/intel-compute-runtime-24.35.30872.25-r1.ebuild @@ -63,6 +63,7 @@ src_configure() { -DCMAKE_INSTALL_LIBDIR="$(get_libdir)" -DBUILD_WITH_L0="$(usex l0)" -DDISABLE_LIBVA="$(usex !vaapi)" + -DNEO_ALLOW_LEGACY_PLATFORMS_SUPPORT="ON" -DNEO_DISABLE_LTO="ON" -DNEO__METRICS_LIBRARY_INCLUDE_DIR="${ESYSROOT}/usr/include" -DKHRONOS_GL_HEADERS_DIR="${ESYSROOT}/usr/include" diff --git a/dev-libs/intel-compute-runtime/intel-compute-runtime-24.35.30872.32.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-24.35.30872.32.ebuild new file mode 100644 index 000000000000..50c31549953b --- /dev/null +++ b/dev-libs/intel-compute-runtime/intel-compute-runtime-24.35.30872.32.ebuild @@ -0,0 +1,84 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CMAKE_BUILD_TYPE="Release" +MY_PN="${PN/intel-/}" +MY_P="${MY_PN}-${PV}" + +inherit cmake flag-o-matic + +DESCRIPTION="Intel Graphics Compute Runtime for oneAPI Level Zero and OpenCL Driver" +HOMEPAGE="https://github.com/intel/compute-runtime" +SRC_URI="https://github.com/intel/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${MY_P}" + +LICENSE="MIT" +SLOT="0/1.5.30872" +KEYWORDS="~amd64" +IUSE="+l0 +vaapi" + +RDEPEND=" + >=dev-util/intel-graphics-compiler-1.0.17791.18 + >=media-libs/gmmlib-22.5.2:= +" + +DEPEND=" + ${RDEPEND} + dev-libs/intel-metrics-discovery:= + >=dev-libs/intel-metrics-library-1.0.182:= + dev-libs/libnl:3 + dev-libs/libxml2:2 + >=dev-util/intel-graphics-system-controller-0.9.5:= + media-libs/mesa + >=virtual/opencl-3 + l0? ( >=dev-libs/level-zero-1.19.2:= ) + vaapi? ( + x11-libs/libdrm[video_cards_intel] + media-libs/libva + ) +" + +BDEPEND="virtual/pkgconfig" + +DOCS=( "README.md" "FAQ.md" ) + +src_prepare() { + # Remove '-Werror' from default + sed -e '/Werror/d' -i CMakeLists.txt || die + + cmake_src_prepare +} + +src_configure() { + # Filtered for two reasons: + # 1) https://github.com/intel/compute-runtime/issues/528 + # 2) bug #930199 + filter-lto + + local mycmakeargs=( + -DCCACHE_ALLOWED="OFF" + -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" + -DCMAKE_INSTALL_LIBDIR="$(get_libdir)" + -DBUILD_WITH_L0="$(usex l0)" + -DDISABLE_LIBVA="$(usex !vaapi)" + -DNEO_ALLOW_LEGACY_PLATFORMS_SUPPORT="ON" + -DNEO_DISABLE_LTO="ON" + -DNEO__METRICS_LIBRARY_INCLUDE_DIR="${ESYSROOT}/usr/include" + -DKHRONOS_GL_HEADERS_DIR="${ESYSROOT}/usr/include" + -DOCL_ICD_VENDORDIR="${EPREFIX}/etc/OpenCL/vendors" + -DSUPPORT_DG1="ON" + -Wno-dev + + # See https://github.com/intel/intel-graphics-compiler/issues/204 + # -DNEO_DISABLE_BUILTINS_COMPILATION="ON" + + # If enabled, tests are automatically run during + # the compile phase and we cannot run them because + # they require permissions to access the hardware. + -DSKIP_UNIT_TESTS="1" + ) + + cmake_src_configure +} diff --git a/dev-libs/intel-compute-runtime/intel-compute-runtime-24.52.32224.5.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-24.52.32224.5.ebuild new file mode 100644 index 000000000000..d4291a73bbd6 --- /dev/null +++ b/dev-libs/intel-compute-runtime/intel-compute-runtime-24.52.32224.5.ebuild @@ -0,0 +1,84 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CMAKE_BUILD_TYPE="Release" +MY_PN="${PN/intel-/}" +MY_P="${MY_PN}-${PV}" + +inherit cmake flag-o-matic + +DESCRIPTION="Intel Graphics Compute Runtime for oneAPI Level Zero and OpenCL Driver" +HOMEPAGE="https://github.com/intel/compute-runtime" +SRC_URI="https://github.com/intel/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${MY_P}" + +LICENSE="MIT" +SLOT="0/1.6.32224" +KEYWORDS="~amd64" +IUSE="+l0 +vaapi" + +RDEPEND=" + >=dev-util/intel-graphics-compiler-2.5.7 + >=media-libs/gmmlib-22.5.2:= +" + +DEPEND=" + ${RDEPEND} + dev-libs/intel-metrics-discovery:= + >=dev-libs/intel-metrics-library-1.0.182:= + dev-libs/libnl:3 + dev-libs/libxml2:2 + >=dev-util/intel-graphics-system-controller-0.9.5:= + media-libs/mesa + >=virtual/opencl-3 + l0? ( >=dev-libs/level-zero-1.19.2:= ) + vaapi? ( + x11-libs/libdrm[video_cards_intel] + media-libs/libva + ) +" + +BDEPEND="virtual/pkgconfig" + +DOCS=( "README.md" "FAQ.md" ) + +src_prepare() { + # Remove '-Werror' from default + sed -e '/Werror/d' -i CMakeLists.txt || die + + cmake_src_prepare +} + +src_configure() { + # Filtered for two reasons: + # 1) https://github.com/intel/compute-runtime/issues/528 + # 2) bug #930199 + filter-lto + + local mycmakeargs=( + -DCCACHE_ALLOWED="OFF" + -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" + -DCMAKE_INSTALL_LIBDIR="$(get_libdir)" + -DBUILD_WITH_L0="$(usex l0)" + -DDISABLE_LIBVA="$(usex !vaapi)" + -DNEO_ALLOW_LEGACY_PLATFORMS_SUPPORT="ON" + -DNEO_DISABLE_LTO="ON" + -DNEO__METRICS_LIBRARY_INCLUDE_DIR="${ESYSROOT}/usr/include" + -DKHRONOS_GL_HEADERS_DIR="${ESYSROOT}/usr/include" + -DOCL_ICD_VENDORDIR="${EPREFIX}/etc/OpenCL/vendors" + -DSUPPORT_DG1="ON" + -Wno-dev + + # See https://github.com/intel/intel-graphics-compiler/issues/204 + # -DNEO_DISABLE_BUILTINS_COMPILATION="ON" + + # If enabled, tests are automatically run during + # the compile phase and we cannot run them because + # they require permissions to access the hardware. + -DSKIP_UNIT_TESTS="1" + ) + + cmake_src_configure +} diff --git a/dev-libs/intel-metrics-discovery/Manifest b/dev-libs/intel-metrics-discovery/Manifest index c9c0766ed2e6..6075aa125632 100644 --- a/dev-libs/intel-metrics-discovery/Manifest +++ b/dev-libs/intel-metrics-discovery/Manifest @@ -1 +1 @@ -DIST metrics-discovery-1.13.176.tar.gz 5398346 BLAKE2B a50920e78404069bc92adbb06b5fa932680a03f8e72845c927aa8f8943eddd03805fad3e25ee5da5407e31a3209f7662b8cebc19fb9bbfd4d2df10b57225f138 SHA512 2c1aaa701a01700672ef1f45d86a8f78582be8f9ec9b160b94a1f1ba82f0567cb6bfafe2ff0cc9e0d3e5406215b7a402635ac128dae8382301077b3cb5ae2836 +DIST metrics-discovery-1.13.179.tar.gz 5630041 BLAKE2B 0a7d44eb70550c0e68b6402e077c3ec3798cd7f50fb894d836d0d361398edc0886ca8114085c76313cfec3c72f041521174291cbe3dcdc42bef8d1001798efd3 SHA512 4e50c0c34f0d0b4470ede001d35ceebd838508e4125dd7e3572ad3d521affa15f20af4551c039f167c79b44a96a4f206aa122c8cbb030377b9584bf8ae9fb737 diff --git a/dev-libs/intel-metrics-discovery/files/intel-metrics-discovery-1.12.170-revert-definitions.patch b/dev-libs/intel-metrics-discovery/files/intel-metrics-discovery-1.12.178-revert-definitions.patch index e8d1d5821e46..4f707e3f4949 100644 --- a/dev-libs/intel-metrics-discovery/files/intel-metrics-discovery-1.12.170-revert-definitions.patch +++ b/dev-libs/intel-metrics-discovery/files/intel-metrics-discovery-1.12.178-revert-definitions.patch @@ -1,18 +1,22 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -443,7 +443,7 @@ +@@ -453,7 +453,6 @@ if ("${BUILD_TYPE}" STREQUAL "release") add_definitions(-DNDEBUG) - # security compiler flags -- add_definitions(-O2 -D_FORTIFY_SOURCE=2 -Wformat) -+ add_definitions(-Wformat) + # optimization flags +- add_definitions(-O2) elseif ("${BUILD_TYPE}" STREQUAL "release-internal" OR "${BUILD_TYPE}" STREQUAL "releaseinternal") add_definitions(-D_RELEASE_INTERNAL) -@@ -467,12 +467,7 @@ +@@ -472,17 +471,10 @@ + add_definitions(-Wno-strict-aliasing) + add_definitions(-Wno-unknown-pragmas) + add_definitions(-Wno-comment) +- add_definitions(-msse) + if ("${BUILD_TYPE}" STREQUAL "release" OR "${BUILD_TYPE}" STREQUAL "release-internal" OR "${BUILD_TYPE}" STREQUAL "releaseinternal") - add_definitions(-Werror=format-security) # treat format string security warnings as errors +- add_definitions(-Werror=format-security) # treat format string security warnings as errors - add_definitions(-Werror) # treat warning as errors add_definitions(-fvisibility=hidden) # to disable exporting internal symbols (by default gcc exports all symbols) - add_definitions(-flto) # enables Link-Time Optimization (LTO) diff --git a/dev-libs/intel-metrics-discovery/intel-metrics-discovery-1.13.176.ebuild b/dev-libs/intel-metrics-discovery/intel-metrics-discovery-1.13.179.ebuild index 728ed054c227..f2ea6aaecbd1 100644 --- a/dev-libs/intel-metrics-discovery/intel-metrics-discovery-1.13.176.ebuild +++ b/dev-libs/intel-metrics-discovery/intel-metrics-discovery-1.13.179.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -21,7 +21,7 @@ KEYWORDS="amd64" DEPEND="x11-libs/libdrm" RDEPEND="${DEPEND}" -PATCHES=( "${FILESDIR}/${PN}-1.12.170-revert-definitions.patch" ) +PATCHES=( "${FILESDIR}/${PN}-1.12.178-revert-definitions.patch" ) src_configure() { local mycmakeargs=( -DLINUX_DISTRO="Gentoo" ) diff --git a/dev-libs/intel-metrics-library/Manifest b/dev-libs/intel-metrics-library/Manifest index d485661a0d2e..5cc80e072f7d 100644 --- a/dev-libs/intel-metrics-library/Manifest +++ b/dev-libs/intel-metrics-library/Manifest @@ -1 +1 @@ -DIST metrics-library-1.0.173.tar.gz 280677 BLAKE2B 0394809b6a7f4d82cae96f045356a474846ff94d8362fea701ed811ecb45c4127aa2a64e66bd77aff37eb555b511159f87c8f459a601a1e98383b42c13987d48 SHA512 45f599e4299072d62c9e4cb205d52ad29492e36120b1f542a89f9e1767e7025cef56774d70ef8233ace7a69863056e8db8ba9ff4f9c6a95fa06508c6be7d9345 +DIST metrics-library-1.0.182.tar.gz 271427 BLAKE2B 16431e1d4010f762a220876bf72b10d87f3c86478ed4f89fad0a56dbd04c2e95da7ef5a89f4f9fe443705d7ca9c8a78891f4eb69046f1e62c8b9dd1fafe18422 SHA512 5632956a5fd541840aa59a88a01a8b498ea94ed27a36f644e65bcfefdfef1e73d36908925d0b00f60bb152953227f1d17e882f554187695944e0b5b09751d3a2 diff --git a/dev-libs/intel-metrics-library/intel-metrics-library-1.0.173.ebuild b/dev-libs/intel-metrics-library/intel-metrics-library-1.0.182.ebuild index 553a918ad5e3..94876ae6b3b0 100644 --- a/dev-libs/intel-metrics-library/intel-metrics-library-1.0.173.ebuild +++ b/dev-libs/intel-metrics-library/intel-metrics-library-1.0.182.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 diff --git a/dev-libs/intel-vc-intrinsics/Manifest b/dev-libs/intel-vc-intrinsics/Manifest index b0812f4b9a02..760cecb08532 100644 --- a/dev-libs/intel-vc-intrinsics/Manifest +++ b/dev-libs/intel-vc-intrinsics/Manifest @@ -1 +1 @@ -DIST intel-vc-intrinsics-0.19.0.tar.gz 146538 BLAKE2B b32e91405a8ca4e56870d41d1d17bc9aa9d3ab94fbb76ef0444591a1fb1415cffc4cdea0c938d8b87844218390a0f190b276abbab133bb443f3c66be87a07544 SHA512 7900273bb37c95605707ce589ba0ff5f414ba7c46c0d41539fc11bef2dece8f7ef8b8ec3219330c36252bbf5de4a99045506b79a1afc1bc7598c26e6335d7fae +DIST intel-vc-intrinsics-0.21.0.tar.gz 146968 BLAKE2B d0605f10b9374490364275fcedc396d8df71c28f051a71463682e981c2620dec84e2b5541fa155a2f38e8a018c3ee5332ce89ad72c97f4ab1d7381ab4c0005be SHA512 5c10b45f26e16074a51878db1dfb85ec0361823e844e358f1df84b272754e7e1ba9f64089fe40f5949ebe38675c214cc933bb872267c83415c5991aec5b060bc diff --git a/dev-libs/intel-vc-intrinsics/intel-vc-intrinsics-0.19.0.ebuild b/dev-libs/intel-vc-intrinsics/intel-vc-intrinsics-0.21.0.ebuild index bfdd04c05969..a8f648f1339f 100644 --- a/dev-libs/intel-vc-intrinsics/intel-vc-intrinsics-0.19.0.ebuild +++ b/dev-libs/intel-vc-intrinsics/intel-vc-intrinsics-0.21.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -23,7 +23,7 @@ KEYWORDS="amd64" DEPEND=" dev-libs/libxml2:2= $(llvm_gen_dep ' - sys-devel/llvm:${LLVM_SLOT} + llvm-core/llvm:${LLVM_SLOT} ') sys-libs/zlib " diff --git a/dev-libs/isa-l/files/isa-l-2.31.0_no-fortify-source.patch b/dev-libs/isa-l/files/isa-l-2.31.0_no-fortify-source.patch new file mode 100644 index 000000000000..36ddb6304035 --- /dev/null +++ b/dev-libs/isa-l/files/isa-l-2.31.0_no-fortify-source.patch @@ -0,0 +1,38 @@ +From: Filip Kobierski <fkobi@pm.me> +Date: Fri, 6 Sep 2024 12:49:09 +0200 +Upstream hardcodes FORTIFY_SOURCE to 2. This patch removes it so it is not redefined when we set it. +This fixes https://bugs.gentoo.org/935525 + +--- + configure.ac | 1 - + make.inc | 2 +- + 2 files changed, 1 insertion(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 72500ee..72bbb54 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -301,7 +301,6 @@ my_CFLAGS="\ + -Wstrict-prototypes \ + -Wtype-limits \ + -fstack-protector \ +--D_FORTIFY_SOURCE=2 \ + " + AC_SUBST([my_CFLAGS]) + +diff --git a/make.inc b/make.inc +index 33baf49..0cfc571 100644 +--- a/make.inc ++++ b/make.inc +@@ -57,7 +57,7 @@ DEBUG_yasm = -g dwarf2 + DEBUG_nasm = -g + + # Default arch= build options +-CFLAGS_ = -Wall -Wchar-subscripts -Wformat-security -Wnested-externs -Wpointer-arith -Wshadow -Wstrict-prototypes -Wtype-limits -fstack-protector -D_FORTIFY_SOURCE=2 ++CFLAGS_ = -Wall -Wchar-subscripts -Wformat-security -Wnested-externs -Wpointer-arith -Wshadow -Wstrict-prototypes -Wtype-limits -fstack-protector + ASFLAGS_ = -f elf64 + ARFLAGS_ = cr $@ + STRIP_gcc = strip -d -R .comment $@ +-- +2.44.2 + diff --git a/dev-libs/isa-l/isa-l-2.31.0.ebuild b/dev-libs/isa-l/isa-l-2.31.0.ebuild index 992207e9e408..cff37c2a7586 100644 --- a/dev-libs/isa-l/isa-l-2.31.0.ebuild +++ b/dev-libs/isa-l/isa-l-2.31.0.ebuild @@ -36,6 +36,7 @@ PATCHES=( "${FILESDIR}"/${PN}-2.30.0_fix-shebang.patch "${FILESDIR}"/${PN}-2.31.0_makefile-no-D.patch "${FILESDIR}"/${PN}-2.31.0_makefile-x86.patch + "${FILESDIR}"/${PN}-2.31.0_no-fortify-source.patch "${FILESDIR}"/${PN}-2.31.0_user-ldflags.patch ) diff --git a/dev-libs/ivykis/Manifest b/dev-libs/ivykis/Manifest index ec37592a16b7..d1f171b29da7 100644 --- a/dev-libs/ivykis/Manifest +++ b/dev-libs/ivykis/Manifest @@ -1,2 +1,3 @@ DIST ivykis-0.42.4.tar.gz 656775 BLAKE2B 9b85dacb74eae99907999d5181029a824c5f0d6aabb41d892353723318f9ff6fc1a2a6296224c7ee407510f7354f2ee934d40b9627a0fd13489bf53b8ff7f115 SHA512 26f4fa28582555004cbe1d80cb042f93deb42b195c7d563ce4048ace25c74bb558455d98d2d8e0e59534fabb2dff6503aff16d0feb7a05fd835b63432f080286 DIST ivykis-0.43.1.tar.gz 669621 BLAKE2B 12ef9aa55f2e07540b265eb2f19eba6436abb5c0dc333b10db3a3918b6cd4cc851191c12782b92f1c2c50b9d761bb2124417823dc19b557f6d3392cea86d4fe2 SHA512 d8c16dfa4b9da419b09fc45315aa930163c55bee1f0e1e630994332783527eec4929a60e75a1866408c666a6f4e2451bbd187d524f2e50179899f71e3bff916c +DIST ivykis-0.43.2.tar.gz 669628 BLAKE2B e19a2c1df3751f83858337b72529b72344d74f675fc65012c5c77b5a9dbcb91d58fea43138dd21c3e09aa94ad971404f50986d8064ec968770eda2c517d55e02 SHA512 58aefe38e32f301c38568613439a5177470bdc5b6240ec3de93c35752b34ff4d839d036ee48764e8e1cdc53d8a1138cc69947b8857349601316081c0aee66caa diff --git a/dev-libs/ivykis/ivykis-0.43.1.ebuild b/dev-libs/ivykis/ivykis-0.43.1.ebuild index a5120de423bc..2c8a7d9d5b12 100644 --- a/dev-libs/ivykis/ivykis-0.43.1.ebuild +++ b/dev-libs/ivykis/ivykis-0.43.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/buytenh/ivykis/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" IUSE="static-libs" src_prepare() { diff --git a/dev-libs/ivykis/ivykis-0.43.2.ebuild b/dev-libs/ivykis/ivykis-0.43.2.ebuild new file mode 100644 index 000000000000..826af0811220 --- /dev/null +++ b/dev-libs/ivykis/ivykis-0.43.2.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Library for asynchronous I/O readiness notification" +HOMEPAGE="https://github.com/buytenh/ivykis" +SRC_URI="https://github.com/buytenh/ivykis/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" +IUSE="static-libs" + +src_prepare() { + default + + eautoreconf +} + +src_configure() { + econf \ + --cache-file="${S}"/config.cache \ + $(use_enable static-libs static) +} + +src_install() { + default + + find "${ED}" -name "*.la" -delete || die +} diff --git a/dev-libs/json-c/json-c-0.18.ebuild b/dev-libs/json-c/json-c-0.18.ebuild index 582ba35e41c2..5f6b3ef8717f 100644 --- a/dev-libs/json-c/json-c-0.18.ebuild +++ b/dev-libs/json-c/json-c-0.18.ebuild @@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]] ; then else SRC_URI="https://s3.amazonaws.com/json-c_releases/releases/${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" + KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" fi LICENSE="MIT" diff --git a/dev-libs/json-glib/Manifest b/dev-libs/json-glib/Manifest index d0d6ff42a81d..2f789fcfd80c 100644 --- a/dev-libs/json-glib/Manifest +++ b/dev-libs/json-glib/Manifest @@ -1 +1,3 @@ +DIST json-glib-1.10.0.tar.xz 252652 BLAKE2B 83f0707c18806c90640fa36208d8aeb46c9902660484c24e4c736b72d35bb0997ab7b0c62fe3f8f4cd5001abb31ca979d75fd0eff54afa57116d360d1ac9e118 SHA512 cafe813c465e69bc002965483359354be0c0af1af8302e93416e25f835103cb9cd2c07ae51783dc28b69512562b3fdd6f62fdcc4c5952d59e667b3fc7740df06 +DIST json-glib-1.10.6.tar.xz 253324 BLAKE2B 125ba305d5d33ecb1a1fbe46322c5035c7f97bd49e8eeef26e3c9c5d829693978fdc10bbe3d926cd4d07f8fd80c9df282d5ff7fe80ab4a6ab8e17c93e9d362d4 SHA512 e1c0e33b17333cf94beb381f505c1819090a11b616dcc23a883f231029dff277c2482823278cbf7b8a07e237d45cbfc7b05f132e1234beff609a739fd5704c6e DIST json-glib-1.8.0.tar.xz 157300 BLAKE2B eef0344c353bb9288efb700a6041342379627b924a042263e011f21140166b57b108f6816e80ac692159b49943f9c1afeb722efafa34e8c60f2fcdf53a0dc034 SHA512 e4fe16bb7c5b72fcf9c0966ac1903ff0cd74ec8eab891db4b94e92353bdcb57b24613b6c2cce7bfa1996603c367d1b4939c12209369dfb915aac0f3804a3a900 diff --git a/dev-libs/json-glib/files/json-glib-1.8.0-werror.patch b/dev-libs/json-glib/files/json-glib-1.8.0-werror.patch new file mode 100644 index 000000000000..776b2465d414 --- /dev/null +++ b/dev-libs/json-glib/files/json-glib-1.8.0-werror.patch @@ -0,0 +1,27 @@ +https://gitlab.gnome.org/GNOME/json-glib/-/commit/a5eb23ca06a6ec345fba376296bd4236b7fb7635 + +From a5eb23ca06a6ec345fba376296bd4236b7fb7635 Mon Sep 17 00:00:00 2001 +From: Emmanuele Bassi <ebassi@gnome.org> +Date: Sun, 26 Nov 2023 17:20:29 +0000 +Subject: [PATCH] build: Gate GIR fatal warnings to werror + +This way we consistently fail early. +--- + json-glib/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/json-glib/meson.build b/json-glib/meson.build +index e13e688..9e51931 100644 +--- a/json-glib/meson.build ++++ b/json-glib/meson.build +@@ -113,7 +113,7 @@ if gir.found() + header: 'json-glib/json-glib.h', + install: true, + extra_args: gir_args, +- fatal_warnings: true, ++ fatal_warnings: get_option('werror'), + ) + else + json_glib_gir = [] +-- +GitLab diff --git a/dev-libs/json-glib/json-glib-1.10.0.ebuild b/dev-libs/json-glib/json-glib-1.10.0.ebuild new file mode 100644 index 000000000000..ee72086f7cdb --- /dev/null +++ b/dev-libs/json-glib/json-glib-1.10.0.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit gnome.org meson-multilib xdg-utils + +DESCRIPTION="Library providing GLib serialization and deserialization for the JSON format" +HOMEPAGE="https://wiki.gnome.org/Projects/JsonGlib" + +LICENSE="LGPL-2.1+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE="gtk-doc +introspection nls test" +RESTRICT="!test? ( test )" +REQUIRED_USE="gtk-doc? ( introspection )" + +RDEPEND=" + >=dev-libs/glib-2.72.0:2[${MULTILIB_USEDEP}] + introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-python/docutils + dev-util/glib-utils + gtk-doc? ( >=dev-util/gi-docgen-2021.6 ) + >=sys-devel/gettext-0.18 + virtual/pkgconfig +" + +src_prepare() { + xdg_environment_reset + default +} + +multilib_src_configure() { + local emesonargs=( + # Never use gi-docgen subproject + --wrap-mode nofallback + -Dinstalled_tests=false + + $(meson_native_use_feature introspection) + $(meson_native_use_feature gtk-doc documentation) + $(meson_native_true man) + + $(meson_feature nls) + $(meson_use test tests) + ) + meson_src_configure +} + +multilib_src_install_all() { + einstalldocs + if use gtk-doc ; then + # TODO: still useful with devhelp 43? + mkdir -p "${ED}"/usr/share/gtk-doc/html || die + mv "${ED}"/usr/share/doc/json-glib-1.0 "${ED}"/usr/share/gtk-doc/html/ || die + fi +} diff --git a/dev-libs/json-glib/json-glib-1.10.6.ebuild b/dev-libs/json-glib/json-glib-1.10.6.ebuild new file mode 100644 index 000000000000..ce3124854c94 --- /dev/null +++ b/dev-libs/json-glib/json-glib-1.10.6.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit gnome.org meson-multilib xdg-utils + +DESCRIPTION="Library providing GLib serialization and deserialization for the JSON format" +HOMEPAGE="https://wiki.gnome.org/Projects/JsonGlib" + +LICENSE="LGPL-2.1+" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" +IUSE="gtk-doc +introspection nls test" +RESTRICT="!test? ( test )" +REQUIRED_USE="gtk-doc? ( introspection )" + +RDEPEND=" + >=dev-libs/glib-2.72.0:2[${MULTILIB_USEDEP}] + introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-python/docutils + dev-util/glib-utils + gtk-doc? ( >=dev-util/gi-docgen-2021.6 ) + >=sys-devel/gettext-0.18 + virtual/pkgconfig +" + +src_prepare() { + xdg_environment_reset + default +} + +multilib_src_configure() { + local emesonargs=( + # Never use gi-docgen subproject + --wrap-mode nofallback + -Dinstalled_tests=false + + $(meson_native_use_feature introspection) + $(meson_native_use_feature gtk-doc documentation) + $(meson_native_true man) + + $(meson_feature nls) + $(meson_use test tests) + ) + meson_src_configure +} + +multilib_src_install_all() { + einstalldocs + if use gtk-doc ; then + # TODO: still useful with devhelp 43? + mkdir -p "${ED}"/usr/share/gtk-doc/html || die + mv "${ED}"/usr/share/doc/json-glib-1.0 "${ED}"/usr/share/gtk-doc/html/ || die + fi +} diff --git a/dev-libs/json-glib/json-glib-1.8.0.ebuild b/dev-libs/json-glib/json-glib-1.8.0.ebuild index 97534a8956e4..04107ec75f33 100644 --- a/dev-libs/json-glib/json-glib-1.8.0.ebuild +++ b/dev-libs/json-glib/json-glib-1.8.0.ebuild @@ -29,6 +29,10 @@ BDEPEND=" virtual/pkgconfig " +PATCHES=( + "${FILESDIR}"/${P}-werror.patch +) + src_prepare() { xdg_environment_reset default diff --git a/dev-libs/jsoncpp/Manifest b/dev-libs/jsoncpp/Manifest index 44699d7bdf27..767768ca9f30 100644 --- a/dev-libs/jsoncpp/Manifest +++ b/dev-libs/jsoncpp/Manifest @@ -1,2 +1 @@ -DIST jsoncpp-1.9.5.tar.gz 216055 BLAKE2B 744275297647be8f1ac7bbf6c818e5106fc122591b3fb68c37cf33f5b3b7d6666e8429bb7ca2ae693202a5a83c274303804e21ebb27f05ba235568bf75a9b375 SHA512 1d06e044759b1e1a4cc4960189dd7e001a0a4389d7239a6d59295af995a553518e4e0337b4b4b817e70da5d9731a4c98655af90791b6287870b5ff8d73ad8873 DIST jsoncpp-1.9.6.tar.gz 212682 BLAKE2B efa5dea68ddc175391200077666204f7ec66cd1f96a889a2a3c53d0e22e1f96ead1a2e7a871940f60dbd4261650f133b83de428b9c8b663fa13bd7ab4b9fdffe SHA512 006d81f9f723dcfe875ebc2147449c07c5246bf97dd7b9eee1909decc914b051d6f3f06feb5c3dfa143d28773fb310aabb04a81dc447cc61513309df8eba8b08 diff --git a/dev-libs/jsoncpp/files/jsoncpp-1.9.6-cmake.patch b/dev-libs/jsoncpp/files/jsoncpp-1.9.6-cmake.patch deleted file mode 100644 index 9e24533ae9f9..000000000000 --- a/dev-libs/jsoncpp/files/jsoncpp-1.9.6-cmake.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 8d9109992e34cdacd3f2750ada5c2460d346898f Mon Sep 17 00:00:00 2001 -From: Rui Chen <rui@chenrui.dev> -Date: Thu, 19 Sep 2024 15:10:21 -0400 -Subject: [PATCH] fix(build): remove `check_required_components` for meson - build - -Signed-off-by: Rui Chen <rui@chenrui.dev> ---- - jsoncppConfig.cmake.meson.in | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/jsoncppConfig.cmake.meson.in b/jsoncppConfig.cmake.meson.in -index 0f4866d6d..be8852d0c 100644 ---- a/jsoncppConfig.cmake.meson.in -+++ b/jsoncppConfig.cmake.meson.in -@@ -4,5 +4,3 @@ - @MESON_STATIC_TARGET@ - - include ( "${CMAKE_CURRENT_LIST_DIR}/jsoncpp-namespaced-targets.cmake" ) -- --check_required_components(JsonCpp) diff --git a/dev-libs/jsoncpp/jsoncpp-1.9.5-r1.ebuild b/dev-libs/jsoncpp/jsoncpp-1.9.5-r1.ebuild deleted file mode 100644 index 54097e4571ac..000000000000 --- a/dev-libs/jsoncpp/jsoncpp-1.9.5-r1.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..13} ) - -inherit meson-multilib python-any-r1 - -DESCRIPTION="C++ JSON reader and writer" -HOMEPAGE="https://github.com/open-source-parsers/jsoncpp/" -SRC_URI=" - https://github.com/open-source-parsers/${PN}/archive/${PV}.tar.gz - -> ${P}.tar.gz -" - -LICENSE="|| ( public-domain MIT )" -SLOT="0/25" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="doc test" -RESTRICT="!test? ( test )" - -BDEPEND=" - ${PYTHON_DEPS} - doc? ( app-text/doxygen ) -" - -multilib_src_configure() { - local emesonargs=( - # Follow Debian, Ubuntu, Arch convention for headers location - # bug #452234 - --includedir include/jsoncpp - -Dtests=$(usex test true false) - ) - meson_src_configure -} - -src_compile() { - meson-multilib_src_compile - - if use doc; then - echo "${PV}" > version || die - "${EPYTHON}" doxybuild.py --doxygen="${EPREFIX}"/usr/bin/doxygen || die - HTML_DOCS=( dist/doxygen/jsoncpp*/. ) - fi -} - -multilib_src_test() { - # increase test timeout due to failures on slower hardware - meson_src_test -t 2 -} diff --git a/dev-libs/jsoncpp/jsoncpp-1.9.5.ebuild b/dev-libs/jsoncpp/jsoncpp-1.9.5.ebuild deleted file mode 100644 index 0fbc59a63899..000000000000 --- a/dev-libs/jsoncpp/jsoncpp-1.9.5.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) - -inherit meson python-any-r1 - -DESCRIPTION="C++ JSON reader and writer" -HOMEPAGE="https://github.com/open-source-parsers/jsoncpp/" -SRC_URI=" - https://github.com/open-source-parsers/${PN}/archive/${PV}.tar.gz - -> ${P}.tar.gz -" - -LICENSE="|| ( public-domain MIT )" -SLOT="0/25" -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="doc test" -RESTRICT="!test? ( test )" - -BDEPEND=" - ${PYTHON_DEPS} - doc? ( app-text/doxygen ) -" - -src_configure() { - local emesonargs=( - # Follow Debian, Ubuntu, Arch convention for headers location - # bug #452234 - --includedir include/jsoncpp - -Dtests=$(usex test true false) - ) - meson_src_configure -} - -src_compile() { - meson_src_compile - - if use doc; then - echo "${PV}" > version || die - "${EPYTHON}" doxybuild.py --doxygen="${EPREFIX}"/usr/bin/doxygen || die - HTML_DOCS=( dist/doxygen/jsoncpp*/. ) - fi -} - -src_test() { - # increase test timeout due to failures on slower hardware - meson_src_test -t 2 -} diff --git a/dev-libs/jsoncpp/jsoncpp-1.9.6-r1.ebuild b/dev-libs/jsoncpp/jsoncpp-1.9.6-r1.ebuild deleted file mode 100644 index 6f29211cc90b..000000000000 --- a/dev-libs/jsoncpp/jsoncpp-1.9.6-r1.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..13} ) - -inherit meson-multilib python-any-r1 - -DESCRIPTION="C++ JSON reader and writer" -HOMEPAGE="https://github.com/open-source-parsers/jsoncpp/" -SRC_URI=" - https://github.com/open-source-parsers/${PN}/archive/${PV}.tar.gz - -> ${P}.tar.gz -" - -LICENSE="|| ( public-domain MIT )" -SLOT="0/26" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="doc test" -RESTRICT="!test? ( test )" - -BDEPEND=" - ${PYTHON_DEPS} - doc? ( app-text/doxygen ) -" - -PATCHES=( - # https://github.com/open-source-parsers/jsoncpp/pull/1570 - "${FILESDIR}/${P}-cmake.patch" -) - -multilib_src_configure() { - local emesonargs=( - # Follow Debian, Ubuntu, Arch convention for headers location - # bug #452234 - --includedir include/jsoncpp - -Dtests=$(usex test true false) - ) - meson_src_configure -} - -src_compile() { - meson-multilib_src_compile - - if use doc; then - echo "${PV}" > version || die - "${EPYTHON}" doxybuild.py --doxygen="${EPREFIX}"/usr/bin/doxygen || die - HTML_DOCS=( dist/doxygen/jsoncpp*/. ) - fi -} - -multilib_src_test() { - # increase test timeout due to failures on slower hardware - meson_src_test -t 2 -} diff --git a/dev-libs/jsoncpp/jsoncpp-1.9.6-r2.ebuild b/dev-libs/jsoncpp/jsoncpp-1.9.6-r2.ebuild index b6de9e2c962f..6e2863de7ec2 100644 --- a/dev-libs/jsoncpp/jsoncpp-1.9.6-r2.ebuild +++ b/dev-libs/jsoncpp/jsoncpp-1.9.6-r2.ebuild @@ -16,7 +16,7 @@ SRC_URI=" LICENSE="|| ( public-domain MIT )" SLOT="0/26" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="doc test" RESTRICT="!test? ( test )" diff --git a/dev-libs/jsoncpp/jsoncpp-1.9.6.ebuild b/dev-libs/jsoncpp/jsoncpp-1.9.6.ebuild deleted file mode 100644 index b38818f791b0..000000000000 --- a/dev-libs/jsoncpp/jsoncpp-1.9.6.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..13} ) - -inherit meson-multilib python-any-r1 - -DESCRIPTION="C++ JSON reader and writer" -HOMEPAGE="https://github.com/open-source-parsers/jsoncpp/" -SRC_URI=" - https://github.com/open-source-parsers/${PN}/archive/${PV}.tar.gz - -> ${P}.tar.gz -" - -LICENSE="|| ( public-domain MIT )" -SLOT="0/26" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="doc test" -RESTRICT="!test? ( test )" - -BDEPEND=" - ${PYTHON_DEPS} - doc? ( app-text/doxygen ) -" - -multilib_src_configure() { - local emesonargs=( - # Follow Debian, Ubuntu, Arch convention for headers location - # bug #452234 - --includedir include/jsoncpp - -Dtests=$(usex test true false) - ) - meson_src_configure -} - -src_compile() { - meson-multilib_src_compile - - if use doc; then - echo "${PV}" > version || die - "${EPYTHON}" doxybuild.py --doxygen="${EPREFIX}"/usr/bin/doxygen || die - HTML_DOCS=( dist/doxygen/jsoncpp*/. ) - fi -} - -multilib_src_test() { - # increase test timeout due to failures on slower hardware - meson_src_test -t 2 -} diff --git a/dev-libs/keybinder/keybinder-0.3.2-r300.ebuild b/dev-libs/keybinder/keybinder-0.3.2-r300.ebuild index cf2d65b3dd45..cf67fa3b6c93 100644 --- a/dev-libs/keybinder/keybinder-0.3.2-r300.ebuild +++ b/dev-libs/keybinder/keybinder-0.3.2-r300.ebuild @@ -11,7 +11,7 @@ S=${WORKDIR}/${MY_P} LICENSE="MIT" SLOT="3" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86" IUSE="+introspection" RDEPEND="x11-libs/gtk+:3[X] diff --git a/dev-libs/kirigami-addons/Manifest b/dev-libs/kirigami-addons/Manifest index e223be4ec49d..1a358965c9fa 100644 --- a/dev-libs/kirigami-addons/Manifest +++ b/dev-libs/kirigami-addons/Manifest @@ -1,2 +1,3 @@ -DIST kirigami-addons-1.4.0.tar.xz 1377508 BLAKE2B 2db4c7d704e30ad68d180ac97b8c1f4f005fddf4d52e9f4a82a460e3e0b267b6a7e018b198e4a628889aea1b38ca5a72e20a02a918e06f8b9a23277328d20d18 SHA512 f9c44436c0b5360fba702cb3ef0a5445d96f4fef023ad74db1ff07cdb362c41e8ab7bfd779cf021bae9578f9d07245ab56c80e243d1b6af70c5d12c5afcbc8b2 DIST kirigami-addons-1.5.0.tar.xz 1502124 BLAKE2B 3298b3ae5d9fdd46ae0b74a69b73f679ba04e6316e2750c24a319e820b566ab2c5fd86389c65fce0e4e2d66140c0f603c0698d4bfb9119d23aa946384ca6ebf6 SHA512 dc4359d61dc24bc970acbacb94924bdfa2dbf699f80cc15dc892b22dc6f89494f6616530152dafa4898f48bf24fa3ef24455efc1dd9c35c903a7c5e91ea9c72a +DIST kirigami-addons-1.6.0.tar.xz 1508992 BLAKE2B c319bc792c869eda8412a8bf1bae67ec954f6f994cb509bde06b00f199c18276128c75ba59586ae7af998625ce98312e440bb9f13152569c5280e0abbc083bfa SHA512 ba033dcd0e70c250dee71298f32f6b88bdfe7f52a4ddcd2445daf6ecf87458610728dc7dfdb09ccaac1a8a7c41f4efcb892d35b2641ce4dd311c231de93ef363 +DIST kirigami-addons-1.7.0.tar.xz 1518680 BLAKE2B ad13723e1429205bb44d300204f828790939e365329310216a227e63d0e43ed8c4433a19dbc626113352d61d9bc625ba9ed7256312ba398a05b84021f9b62858 SHA512 9675f6e92aac6f4785b5e360b6005effba60c6bb4fbdc3ab596ea5c45dbdcb24317a7e5f5f3c5dea4973b210fb4c2cfa76e12f0d006a7813f86da47f37358c8b diff --git a/dev-libs/kirigami-addons/kirigami-addons-1.5.0.ebuild b/dev-libs/kirigami-addons/kirigami-addons-1.5.0.ebuild index bec6e1fe92c3..c264f87d5a38 100644 --- a/dev-libs/kirigami-addons/kirigami-addons-1.5.0.ebuild +++ b/dev-libs/kirigami-addons/kirigami-addons-1.5.0.ebuild @@ -11,7 +11,7 @@ inherit ecm kde.org if [[ ${KDE_BUILD_TYPE} = release ]]; then SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" - KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" + KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86" fi DESCRIPTION="Visual end user components for Kirigami-based applications" diff --git a/dev-libs/kirigami-addons/kirigami-addons-1.4.0.ebuild b/dev-libs/kirigami-addons/kirigami-addons-1.6.0.ebuild index 5c6459c64529..8a339130b282 100644 --- a/dev-libs/kirigami-addons/kirigami-addons-1.4.0.ebuild +++ b/ |