diff options
Diffstat (limited to 'dev-libs')
675 files changed, 9330 insertions, 8296 deletions
diff --git a/dev-libs/FBGEMM/FBGEMM-2023.12.04.ebuild b/dev-libs/FBGEMM/FBGEMM-2023.12.04.ebuild new file mode 100644 index 000000000000..9299ba5bb74c --- /dev/null +++ b/dev-libs/FBGEMM/FBGEMM-2023.12.04.ebuild @@ -0,0 +1,79 @@ +# 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=dbc3157bf256f1339b3fa1fef2be89ac4078be0e + +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" + +S="${WORKDIR}"/${PN}-${CommitId} + +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 )" + +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 edf24ff03da4..5b052896fa9b 100644 --- a/dev-libs/FBGEMM/Manifest +++ b/dev-libs/FBGEMM/Manifest @@ -1,2 +1,3 @@ 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/Ice/Ice-3.7.10-r2.ebuild b/dev-libs/Ice/Ice-3.7.10-r2.ebuild index 4aba9b86d0f6..f5feecafd293 100644 --- a/dev-libs/Ice/Ice-3.7.10-r2.ebuild +++ b/dev-libs/Ice/Ice-3.7.10-r2.ebuild @@ -24,7 +24,7 @@ SRC_URI="https://github.com/zeroc-ice/ice/archive/v${PV}.tar.gz -> ${P}.tar.gz doc? ( https://download.zeroc.com/Ice/$(ver_cut 1-2)/${PN}-3.7.1.pdf )" LICENSE="GPL-2" SLOT="0/37" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 x86" IUSE="debug doc examples php python ruby test" RESTRICT="test" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" diff --git a/dev-libs/aml/aml-0.3.0.ebuild b/dev-libs/aml/aml-0.3.0.ebuild index aeb693e070ed..37b80ef098ff 100644 --- a/dev-libs/aml/aml-0.3.0.ebuild +++ b/dev-libs/aml/aml-0.3.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 2020-2023 Gentoo Authors +# Copyright 2020-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/any1/aml.git" else SRC_URI="https://github.com/any1/aml/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86" + KEYWORDS="amd64 arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv x86" fi LICENSE="ISC" diff --git a/dev-libs/apache-arrow/Manifest b/dev-libs/apache-arrow/Manifest index 8a4ea874530f..211fffcdabdb 100644 --- a/dev-libs/apache-arrow/Manifest +++ b/dev-libs/apache-arrow/Manifest @@ -1,8 +1,3 @@ -DIST apache-arrow-14.0.2.tar.gz 20969982 BLAKE2B 9df119fca564a4140d1143a1ac0614831e4f80846d43439d011b8ca7f5e77461005c96b9430b6dd7ce0ba7496b879a8abc9ffa372e6b455c317abeebb16ae8e4 SHA512 dd6cf6cbb817a48ef5275bb409367e5904526a3c16a17a37ea75101085ea19a71ba6bf936a6f099012e7c528811db1728ef2f14dcb16a1056a22088839280ce0 -DIST apache-arrow-15.0.0.tar.gz 21491996 BLAKE2B 55709d1d181ed5c1482e1eadc9031c692bbd39434ccad17be8c0f3f5af47e3b3d5f262903d1ce09c39442497e14c22c80d7b30215e4de830a4ac82a1b3db34fb SHA512 d5dccaa0907b0e6f2a460e32ae75091942dcb70b51db4aefe2767ee8d99882694607b723a9c06898dda3938d8eb498258d7f9aad11054665b6ea9c2fbaeafa74 -DIST apache-arrow-15.0.1.tar.gz 21499849 BLAKE2B 5f8f91932941105e753b7b7812bf132bd99501ccfac0574b8072e638764cb46694062bcdb8568a474f50de008ede9259b70f16ba7f33ada0f6ec763c21b1c25a SHA512 b426421336c6bc3757626b2743a039d3c7030ad257c3bcf3247a236462dbc140b7eff4476cb727f4d048144a90c1368740c139318f8237d6cc20e87d3efdaf74 -DIST apache-arrow-15.0.2.tar.gz 21503812 BLAKE2B 5a42b3409515d7a09daff33d30e72e828e1df2e009ed746f101f4d8e6dcadb2e9c305a6cb9799d4003e1421ba666d2a2e9ba182c11b0c538fbd1aee4b3ba10ff SHA512 6c83e3be1e5840c30387f088315b74aca8e7c2d060793af70a156effb496a71e3e6af0693188c0f46f8a4a061a263a47095912ef04a5dc8141abd59075b14c78 -DIST apache-arrow-arrow-data-ad82a736c170e97b7c8c035ebd8a801c17eec170.tar.gz 3571641 BLAKE2B e3daae62938b54dbeb8ca9227eddfd2d59864cfafb54a7a7fd7aaa2b2cabd0f2dde58b77b2def086a1759b43c3b5834cb55462cc0b2886b2892329a957afdacb SHA512 ad6fd3343d8a3a6beb5b6269815bc207171905c102698fdb8ed7091e6d829dc51f354293c7686f845e3d49c4a828d9c77958447d965c9da4272260984fea4262 -DIST apache-arrow-arrow-data-d2c73bf78246331d8e58b6f11aa8aa199cbb5929.tar.gz 3570422 BLAKE2B df1f8d1c4e321ca0abdce598b09945aa9e63114199e7f2eb0fc549323dadf703b917efd90c04a2d540d763a44128d76c6ee12788a983d4b9536d04297316b656 SHA512 0be19960b0d22fc2e07bf84f11148e69d6fa82f10627eb2a5e4b762b1d4cf4e151a57c5a1dc761d6d8ed29881ea589e4cfe0cd47d5c7cbf7b6107143b4a45e82 -DIST apache-arrow-parquet-data-b2e7cc755159196e3a068c8594f7acbaecfdaaac.tar.gz 1013835 BLAKE2B cb4e544b6588ddad503f9692ee2eee5d4f1e931f10654b7253e11ffd2feb4c957dec047a1b1644c1f1538a3bf7ea726e5a9ae9b7d0c3bb0d55d27f088b5c5be3 SHA512 d4c2af20d6a88c1beb44770982f4aa324ea4ee375e8f556339074875af15c48f4398d972c1eec35eba5d209e9e62df4bdbf73ebc8148a7bb05ffa2d69c97df61 -DIST apache-arrow-parquet-data-d69d979223e883faef9dc6fe3cf573087243c28a.tar.gz 1022547 BLAKE2B a36f950160a6e033c0ab4fb9ac391be6e71cdadf2bbb7d0210640cc41782921b0e0777425b811a1d688e03842684eb1bfe008ffe359b182bea0f80d3adf658fe SHA512 dfebeca5b99a72a4c069c1030102a6fdd35d4c58cb12fb640bcd0a623cc54e49363f1112fa45da14b16867630dc30bc94bdb2e4cc95f9379dcaa5d7f8f38a3ea +DIST apache-arrow-16.1.0.tar.gz 21707079 BLAKE2B 5541c364351e59e8164f2461546bce3ddc834d70b3a03b815b681187674bdd89ccfb7eb113bf9010c821845b0c1fa51f5321bfea5b20927e6364f6452ec980d2 SHA512 28975f59e1fdde2dba4afaf4a5ba934b63db3a7f27656e2aa0af0f0d2a046c9dbfa9a6082de94629c36d03809b296566a37ea65ec5a2fc17fedac7d21e272d31 +DIST apache-arrow-arrow-data-25d16511e8d42c2744a1d94d90169e3a36e92631.tar.gz 3571960 BLAKE2B c1c076bb3ff6427a45d1a157c60fb13c37786f97d213768c0bbe1ae073b5fb8d23cd402bdcfee303061df56bf3421ea8376f7c4ba9fec04c5cb35a85a32280f2 SHA512 abbc18da8f03b123a2d97eee709e929bbb5d567bf23219bbc63508c0e82ef99d7c0d71ca2d952566b63e968cffd96c5e1c62be9cb658323c949f229ff03234a8 +DIST apache-arrow-parquet-data-74278bc4a1122d74945969e6dec405abd1533ec3.tar.gz 1037654 BLAKE2B c9bb725a16f6706a3859bb36a60b700af62cb5f96546483ef1de0b65900b02b4f9013841d7b3dc70fd0f2fd8969b4d5c72d0fb68972568f61b4a6863a0df6f60 SHA512 18f8e2480079a0fd29eec2b8e5f753af1ee80255f6fc80af4acbf5c56e6dec08e2f9f54d8c5734c929ef901c63e4009c5d830325333fa6cc947d40ff5dcddfa3 diff --git a/dev-libs/apache-arrow/apache-arrow-14.0.2-r1.ebuild b/dev-libs/apache-arrow/apache-arrow-14.0.2-r1.ebuild deleted file mode 100644 index f89a8aecff37..000000000000 --- a/dev-libs/apache-arrow/apache-arrow-14.0.2-r1.ebuild +++ /dev/null @@ -1,124 +0,0 @@ -# Copyright 2023-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -ARROW_DATA_GIT_HASH=d2c73bf78246331d8e58b6f11aa8aa199cbb5929 -PARQUET_DATA_GIT_HASH=b2e7cc755159196e3a068c8594f7acbaecfdaaac - -DESCRIPTION="A cross-language development platform for in-memory data." -HOMEPAGE="https://arrow.apache.org/" -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 - https://github.com/apache/arrow-testing/archive/${ARROW_DATA_GIT_HASH}.tar.gz - -> ${PN}-arrow-data-${ARROW_DATA_GIT_HASH}.tar.gz - ) -" -S="${WORKDIR}/${P}/cpp" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~hppa ~riscv" -IUSE="brotli bzip2 compute dataset +json lz4 parquet re2 snappy ssl test zlib zstd" -RESTRICT="!test? ( test )" - -RDEPEND=" - brotli? ( app-arch/brotli:= ) - bzip2? ( app-arch/bzip2:= ) - compute? ( dev-libs/libutf8proc:= ) - dataset? ( - dev-libs/libutf8proc:= - ) - lz4? ( app-arch/lz4:= ) - parquet? ( - dev-libs/libutf8proc:= - dev-libs/thrift:= - ssl? ( dev-libs/openssl:= ) - ) - re2? ( dev-libs/re2:= ) - snappy? ( app-arch/snappy:= ) - zlib? ( sys-libs/zlib:= ) - zstd? ( app-arch/zstd:= ) -" -DEPEND="${RDEPEND} - dev-cpp/xsimd - >=dev-libs/boost-1.81.0 - json? ( dev-libs/rapidjson ) - test? ( - dev-cpp/gflags - dev-cpp/gtest - ) -" - -REQUIRED_USE=" - test? ( - json - parquet? ( zstd ) - ) - ssl? ( json ) -" - -PATCHES=( - "${FILESDIR}/${PN}-11.0.0-shared-lz4.patch" - "${FILESDIR}"/${PN}-14.0.1-gcc14.patch -) - -src_prepare() { - # use Gentoo CXXFLAGS, specify docdir at src_configure. - sed -i \ - -e '/SetupCxxFlags/d' \ - -e '/set(ARROW_DOC_DIR.*)/d' \ - CMakeLists.txt \ - || die - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DARROW_BUILD_STATIC=OFF - -DARROW_BUILD_TESTS=$(usex test) - -DARROW_COMPUTE=$(usex compute) - -DARROW_CSV=ON - -DARROW_DATASET=$(usex dataset) - -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_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) - -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" - cmake_src_test -} - -src_install() { - cmake_src_install - if use test; then - cd "${D}"/usr/$(get_libdir) - rm -r cmake/ArrowTesting || die - rm libarrow_testing* || die - rm pkgconfig/arrow-testing.pc || die - fi -} diff --git a/dev-libs/apache-arrow/apache-arrow-15.0.0.ebuild b/dev-libs/apache-arrow/apache-arrow-15.0.0.ebuild deleted file mode 100644 index f7e504cdc7fa..000000000000 --- a/dev-libs/apache-arrow/apache-arrow-15.0.0.ebuild +++ /dev/null @@ -1,129 +0,0 @@ -# Copyright 2023-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -# arrow.git: testing -ARROW_DATA_GIT_HASH=ad82a736c170e97b7c8c035ebd8a801c17eec170 -# arrow.git: cpp/submodules/parquet-testing -PARQUET_DATA_GIT_HASH=d69d979223e883faef9dc6fe3cf573087243c28a - -DESCRIPTION="A cross-language development platform for in-memory data." -HOMEPAGE=" - https://arrow.apache.org/ - https://github.com/apache/arrow/ -" -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 - https://github.com/apache/arrow-testing/archive/${ARROW_DATA_GIT_HASH}.tar.gz - -> ${PN}-arrow-data-${ARROW_DATA_GIT_HASH}.tar.gz - ) -" -S="${WORKDIR}/${P}/cpp" - -LICENSE="Apache-2.0" -SLOT="0/$(ver_cut 1)" -KEYWORDS="~amd64 ~hppa ~riscv" -IUSE="brotli bzip2 compute dataset +json lz4 parquet re2 snappy ssl test zlib zstd" -RESTRICT="!test? ( test )" - -RDEPEND=" - brotli? ( app-arch/brotli:= ) - bzip2? ( app-arch/bzip2:= ) - compute? ( dev-libs/libutf8proc:= ) - dataset? ( - dev-libs/libutf8proc:= - ) - lz4? ( app-arch/lz4:= ) - parquet? ( - dev-libs/libutf8proc:= - dev-libs/thrift:= - ssl? ( dev-libs/openssl:= ) - ) - re2? ( dev-libs/re2:= ) - snappy? ( app-arch/snappy:= ) - zlib? ( sys-libs/zlib:= ) - zstd? ( app-arch/zstd:= ) -" -DEPEND="${RDEPEND} - dev-cpp/xsimd - >=dev-libs/boost-1.81.0 - json? ( dev-libs/rapidjson ) - test? ( - dev-cpp/gflags - dev-cpp/gtest - ) -" - -REQUIRED_USE=" - test? ( - json - parquet? ( zstd ) - ) - ssl? ( json ) -" - -PATCHES=( - "${FILESDIR}/${PN}-11.0.0-shared-lz4.patch" - "${FILESDIR}"/${PN}-14.0.1-gcc14.patch -) - -src_prepare() { - # use Gentoo CXXFLAGS, specify docdir at src_configure. - sed -i \ - -e '/SetupCxxFlags/d' \ - -e '/set(ARROW_DOC_DIR.*)/d' \ - CMakeLists.txt \ - || die - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DARROW_BUILD_STATIC=OFF - -DARROW_BUILD_TESTS=$(usex test) - -DARROW_COMPUTE=$(usex compute) - -DARROW_CSV=ON - -DARROW_DATASET=$(usex dataset) - -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_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) - -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" - cmake_src_test -} - -src_install() { - cmake_src_install - if use test; then - cd "${D}"/usr/$(get_libdir) || die - rm -r cmake/ArrowTesting || die - rm libarrow_testing* || die - rm pkgconfig/arrow-testing.pc || die - fi -} diff --git a/dev-libs/apache-arrow/apache-arrow-15.0.2.ebuild b/dev-libs/apache-arrow/apache-arrow-15.0.2.ebuild deleted file mode 100644 index 22a9eab765ca..000000000000 --- a/dev-libs/apache-arrow/apache-arrow-15.0.2.ebuild +++ /dev/null @@ -1,134 +0,0 @@ -# Copyright 2023-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -# arrow.git: testing -ARROW_DATA_GIT_HASH=ad82a736c170e97b7c8c035ebd8a801c17eec170 -# arrow.git: cpp/submodules/parquet-testing -PARQUET_DATA_GIT_HASH=d69d979223e883faef9dc6fe3cf573087243c28a - -DESCRIPTION="A cross-language development platform for in-memory data." -HOMEPAGE=" - https://arrow.apache.org/ - https://github.com/apache/arrow/ -" -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 - https://github.com/apache/arrow-testing/archive/${ARROW_DATA_GIT_HASH}.tar.gz - -> ${PN}-arrow-data-${ARROW_DATA_GIT_HASH}.tar.gz - ) -" -S="${WORKDIR}/${P}/cpp" - -LICENSE="Apache-2.0" -SLOT="0/$(ver_cut 1)" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~riscv ~x86" -IUSE=" - +brotli bzip2 compute dataset +json lz4 +parquet re2 +snappy ssl - test zlib zstd -" -RESTRICT="!test? ( test )" - -RDEPEND=" - brotli? ( app-arch/brotli:= ) - bzip2? ( app-arch/bzip2:= ) - compute? ( dev-libs/libutf8proc:= ) - dataset? ( - dev-libs/libutf8proc:= - ) - lz4? ( app-arch/lz4:= ) - parquet? ( - dev-libs/libutf8proc:= - dev-libs/thrift:= - ssl? ( dev-libs/openssl:= ) - ) - re2? ( dev-libs/re2:= ) - snappy? ( app-arch/snappy:= ) - zlib? ( sys-libs/zlib:= ) - zstd? ( app-arch/zstd:= ) -" -DEPEND="${RDEPEND} - dev-cpp/xsimd - >=dev-libs/boost-1.81.0 - json? ( dev-libs/rapidjson ) - test? ( - dev-cpp/gflags - dev-cpp/gtest - ) -" - -REQUIRED_USE=" - test? ( - json - parquet? ( zstd ) - ) - ssl? ( json ) -" - -PATCHES=( - "${FILESDIR}/${PN}-11.0.0-shared-lz4.patch" - "${FILESDIR}/${PN}-14.0.1-gcc14.patch" - # upstream backports - "${FILESDIR}/${PN}-15.0.1-32bit.patch" -) - -src_prepare() { - # use Gentoo CXXFLAGS, specify docdir at src_configure. - sed -i \ - -e '/SetupCxxFlags/d' \ - -e '/set(ARROW_DOC_DIR.*)/d' \ - CMakeLists.txt \ - || die - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DARROW_BUILD_STATIC=OFF - -DARROW_BUILD_TESTS=$(usex test) - -DARROW_COMPUTE=$(usex compute) - -DARROW_CSV=ON - -DARROW_DATASET=$(usex dataset) - -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_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) - -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" - cmake_src_test -} - -src_install() { - cmake_src_install - if use test; then - cd "${D}"/usr/$(get_libdir) || die - rm -r cmake/ArrowTesting || die - rm libarrow_testing* || die - rm pkgconfig/arrow-testing.pc || die - fi -} diff --git a/dev-libs/apache-arrow/apache-arrow-15.0.1.ebuild b/dev-libs/apache-arrow/apache-arrow-16.1.0.ebuild index c3044b93da01..8b1d7dc7296d 100644 --- a/dev-libs/apache-arrow/apache-arrow-15.0.1.ebuild +++ b/dev-libs/apache-arrow/apache-arrow-16.1.0.ebuild @@ -6,9 +6,9 @@ EAPI=8 inherit cmake # arrow.git: testing -ARROW_DATA_GIT_HASH=ad82a736c170e97b7c8c035ebd8a801c17eec170 +ARROW_DATA_GIT_HASH=25d16511e8d42c2744a1d94d90169e3a36e92631 # arrow.git: cpp/submodules/parquet-testing -PARQUET_DATA_GIT_HASH=d69d979223e883faef9dc6fe3cf573087243c28a +PARQUET_DATA_GIT_HASH=74278bc4a1122d74945969e6dec405abd1533ec3 DESCRIPTION="A cross-language development platform for in-memory data." HOMEPAGE=" @@ -28,7 +28,7 @@ S="${WORKDIR}/${P}/cpp" LICENSE="Apache-2.0" SLOT="0/$(ver_cut 1)" -KEYWORDS="~amd64 ~arm64 ~hppa ~riscv" +KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~riscv ~s390 ~x86" IUSE=" +brotli bzip2 compute dataset +json lz4 +parquet re2 +snappy ssl test zlib zstd @@ -73,9 +73,6 @@ REQUIRED_USE=" PATCHES=( "${FILESDIR}/${PN}-11.0.0-shared-lz4.patch" - "${FILESDIR}/${PN}-14.0.1-gcc14.patch" - # upstream backports - "${FILESDIR}/${PN}-15.0.1-32bit.patch" ) src_prepare() { diff --git a/dev-libs/apache-arrow/files/apache-arrow-14.0.1-gcc14.patch b/dev-libs/apache-arrow/files/apache-arrow-14.0.1-gcc14.patch deleted file mode 100644 index ccaf8cff0e98..000000000000 --- a/dev-libs/apache-arrow/files/apache-arrow-14.0.1-gcc14.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/arrow/filesystem/util_internal.cc 2023-11-23 17:13:03.062791581 +0100 -+++ b/src/arrow/filesystem/util_internal.cc 2023-11-23 17:13:22.441459075 +0100 -@@ -18,6 +18,7 @@ - #include "arrow/filesystem/util_internal.h" - - #include <cerrno> -+#include <algorithm> - - #include "arrow/buffer.h" - #include "arrow/filesystem/path_util.h" diff --git a/dev-libs/apache-arrow/files/apache-arrow-15.0.1-32bit.patch b/dev-libs/apache-arrow/files/apache-arrow-15.0.1-32bit.patch deleted file mode 100644 index d268e565ab76..000000000000 --- a/dev-libs/apache-arrow/files/apache-arrow-15.0.1-32bit.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff --git a/gdb_arrow.py b/gdb_arrow.py -index 6c3af1680..ad40ec499 100644 ---- a/gdb_arrow.py -+++ b/gdb_arrow.py -@@ -304,7 +304,8 @@ def format_timestamp(val, unit): - seconds, subseconds = divmod(val, traits.multiplier) - try: - dt = datetime.datetime.utcfromtimestamp(seconds) -- except (ValueError, OSError): # value out of range for datetime.datetime -+ except (ValueError, OSError, OverflowError): -+ # value out of range for datetime.datetime - pretty = "too large to represent" - else: - pretty = dt.isoformat().replace('T', ' ') -diff --git a/src/arrow/io/file.cc b/src/arrow/io/file.cc -index 543fa90a8..3b18bb7b0 100644 ---- a/src/arrow/io/file.cc -+++ b/src/arrow/io/file.cc -@@ -36,6 +36,7 @@ - #include <cerrno> - #include <cstdint> - #include <cstring> -+#include <limits> - #include <memory> - #include <mutex> - #include <sstream> -@@ -560,17 +561,22 @@ class MemoryMappedFile::MemoryMap - RETURN_NOT_OK(::arrow::internal::FileTruncate(file_->fd(), initial_size)); - } - -- size_t mmap_length = static_cast<size_t>(initial_size); -- if (length > initial_size) { -- return Status::Invalid("mapping length is beyond file size"); -- } -- if (length >= 0 && length < initial_size) { -+ int64_t mmap_length = initial_size; -+ if (length >= 0) { - // memory mapping a file region -- mmap_length = static_cast<size_t>(length); -+ if (length > initial_size) { -+ return Status::Invalid("mapping length is beyond file size"); -+ } -+ mmap_length = length; -+ } -+ if (static_cast<int64_t>(static_cast<size_t>(mmap_length)) != mmap_length) { -+ return Status::CapacityError("Requested memory map length ", mmap_length, -+ " does not fit in a C size_t " -+ "(are you using a 32-bit build of Arrow?"); - } - -- void* result = mmap(nullptr, mmap_length, prot_flags_, map_mode_, file_->fd(), -- static_cast<off_t>(offset)); -+ void* result = mmap(nullptr, static_cast<size_t>(mmap_length), prot_flags_, map_mode_, -+ file_->fd(), static_cast<off_t>(offset)); - if (result == MAP_FAILED) { - return Status::IOError("Memory mapping file failed: ", - ::arrow::internal::ErrnoMessage(errno)); diff --git a/dev-libs/appstream/Manifest b/dev-libs/appstream/Manifest index 14e5aa16b233..fa4206c25397 100644 --- a/dev-libs/appstream/Manifest +++ b/dev-libs/appstream/Manifest @@ -1,3 +1,2 @@ -DIST AppStream-0.15.6.tar.xz 2517688 BLAKE2B 09519205c7dfc5f0715b9d5ae7e99a67673ab499f1e2cb39815edde64defc1aa5059215575278bbcfc4482cd385a79e081c70f6acea3c446c5869dc6b2e18f6c SHA512 7426bc89e22b751de7b3e27d7c07eb1c373f4439f9966868ce5ea410d209b8c5292e03695a34b7a49bfa61e2e62265c7f7cdffc0be871c950193c933f65757ef DIST AppStream-0.16.4.tar.xz 2570176 BLAKE2B ac051b846fd1c7b0cbb3429e0b4c3f81027cddb35ee6bcd5e9d38a09d937abcc37ac4908f68ec55404ae852fd146b4e749832d3ac96443458e86cfe506a6fed4 SHA512 e3a9fc423fe5a2baaaa002871566f320ecd6dbd3a01ab24221afe9b93a69e9afb6bed6d7772c434376501803dc7b2c80b79eda849fcaf4748f9f24a5908a22a8 -DIST AppStream-1.0.2.tar.xz 2629708 BLAKE2B eb31e675cea1c8b9357227c851bdd24f9cb949e232089380a8727630ab8055f0de6bebd74f70f3c1cf84e5420b9d4fef681671a0e4e97265af26d594b2874c48 SHA512 e5c109c383e3bf3af3693bfb3146663767c2c61fac0bd421f2ce52242fe7b869effeacc4d207987321dfeb4ab0ba77ece6c1c6eea054a7365204cd955426517a +DIST AppStream-1.0.3.tar.xz 2644220 BLAKE2B cd7aa28b49c23229ee48b9a69e57a08244f81115e23525695e463930d2296daf80b5c7bb098c89726c220caec8c3e072fd85d77ac808e96c5cf2ff0488ba4ba1 SHA512 9b70d965966d55dbcc6a62d85525fdd5990a28abb1d94b2df91ab1549c24ce9c40d95e2d761c2f24e0c61fe5b74ab6a1f829dda387a8282aa9dff9198dc9610d diff --git a/dev-libs/appstream/appstream-0.15.6.ebuild b/dev-libs/appstream/appstream-0.15.6.ebuild deleted file mode 100644 index 22035505fdee..000000000000 --- a/dev-libs/appstream/appstream-0.15.6.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2023 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/4" -IUSE="apt doc +introspection qt5 test" -RESTRICT="test" # bug 691962 - -RDEPEND=" - >=dev-libs/glib-2.62:2 - dev-libs/libxml2:2 - >=dev-libs/libxmlb-0.3.6:= - dev-libs/libyaml - dev-libs/snowball-stemmer:= - >=net-misc/curl-7.62 - introspection? ( >=dev-libs/gobject-introspection-1.56:= ) - qt5? ( dev-qt/qtcore:5 ) -" -DEPEND="${RDEPEND} - test? ( qt5? ( dev-qt/qttest:5 ) ) -" -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/linguist-tools:5 ) -" - -PATCHES=( "${FILESDIR}"/${P}-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) - -Dinstall-docs=$(usex doc true false) - -Dgir=$(usex introspection true false) - -Dqt=$(usex qt5 true false) - ) - - meson_src_configure -} diff --git a/dev-libs/appstream/appstream-1.0.2.ebuild b/dev-libs/appstream/appstream-1.0.3.ebuild index e59ebce431a1..e59ebce431a1 100644 --- a/dev-libs/appstream/appstream-1.0.2.ebuild +++ b/dev-libs/appstream/appstream-1.0.3.ebuild diff --git a/dev-libs/appstream/files/appstream-0.15.6-disable-Werror-flags.patch b/dev-libs/appstream/files/appstream-0.15.6-disable-Werror-flags.patch deleted file mode 100644 index ca50493e4fd6..000000000000 --- a/dev-libs/appstream/files/appstream-0.15.6-disable-Werror-flags.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- a/meson.build 2022-12-22 23:48:12.000000000 +0100 -+++ b/meson.build 2022-12-24 22:15:49.620891586 +0100 -@@ -95,43 +95,6 @@ - endif - endif - --# a few compiler warning flags we always want enabled --add_project_arguments( -- cc.get_supported_arguments([ -- '-Werror=shadow', -- '-Werror=empty-body', -- '-Werror=strict-prototypes', -- '-Werror=missing-prototypes', -- '-Werror=implicit-function-declaration', -- '-Werror=pointer-arith', -- '-Werror=missing-declarations', -- '-Werror=return-type', -- '-Werror=int-conversion', -- '-Werror=incompatible-pointer-types', -- '-Werror=misleading-indentation', -- '-Werror=missing-include-dirs', -- '-Werror=declaration-after-statement', -- '-Werror=format-security', -- -- '-Wno-missing-field-initializers', -- '-Wno-error=missing-field-initializers', -- '-Wno-unused-parameter', -- '-Wno-error=unused-parameter', -- ]), -- language: 'c' --) --add_project_arguments( -- '-Wno-unused-parameter', -- '-Werror=shadow', -- '-Werror=empty-body', -- '-Werror=pointer-arith', -- '-Werror=init-self', -- '-Werror=missing-declarations', -- '-Werror=return-type', -- '-Werror=misleading-indentation', -- '-Werror=format-security', -- language: 'cpp' --) - add_project_arguments('-DAS_COMPILATION', language: 'c') - - # Vendor extensions in system headers diff --git a/dev-libs/apr/apr-1.7.4-r2.ebuild b/dev-libs/apr/apr-1.7.4-r2.ebuild index d74a3b41b387..1a50b553b4c1 100644 --- a/dev-libs/apr/apr-1.7.4-r2.ebuild +++ b/dev-libs/apr/apr-1.7.4-r2.ebuild @@ -56,12 +56,12 @@ src_configure() { # cause problems for people who switch /bin/sh on the fly to other # shells, so just force libtool to use /bin/bash all the time. export CONFIG_SHELL="${EPREFIX}"/bin/bash - export ac_cv_path_SED="$(basename "$(type -P sed)")" - export ac_cv_path_EGREP="$(basename "$(type -P grep)") -E" - export ac_cv_path_EGREP_TRADITIONAL="$(basename "$(type -P grep)") -E" - export ac_cv_path_FGREP="$(basename "$(type -P grep)") -F" - export ac_cv_path_GREP="$(basename "$(type -P grep)")" - export ac_cv_path_lt_DD="$(basename "$(type -P dd)")" + export ac_cv_path_SED="sed" + export ac_cv_path_EGREP="grep -E" + export ac_cv_path_EGREP_TRADITIONAL="grep -E" + export ac_cv_path_FGREP="grep -F" + export ac_cv_path_GREP="grep" + export ac_cv_path_lt_DD="dd" local myconf=( --enable-layout=gentoo diff --git a/dev-libs/apr/apr-1.7.4-r3.ebuild b/dev-libs/apr/apr-1.7.4-r3.ebuild new file mode 100644 index 000000000000..a7f6b6d58e1d --- /dev/null +++ b/dev-libs/apr/apr-1.7.4-r3.ebuild @@ -0,0 +1,163 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic toolchain-funcs + +DESCRIPTION="Apache Portable Runtime Library" +HOMEPAGE="https://apr.apache.org/" +SRC_URI="mirror://apache/apr/${P}.tar.bz2" + +LICENSE="Apache-2.0" +SLOT="1/${PV%.*}" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="doc old-kernel selinux static-libs +urandom valgrind" + +# See bug #815265 for libcrypt dependency +DEPEND=" + virtual/libcrypt:= + elibc_glibc? ( >=sys-apps/util-linux-2.16 ) +" +RDEPEND=" + ${DEPEND} + selinux? ( sec-policy/selinux-base-policy ) +" +DEPEND+=" valgrind? ( dev-debug/valgrind )" +BDEPEND=" + >=dev-build/libtool-2.4.2 + doc? ( app-text/doxygen ) +" + +DOCS=( CHANGES NOTICE README ) + +PATCHES=( + "${FILESDIR}"/${PN}-1.6.3-skip-known-failing-tests.patch + "${FILESDIR}"/${PN}-1.7.2-libtool.patch + "${FILESDIR}"/${PN}-1.7.2-fix-pkgconfig-libs.patch + "${FILESDIR}"/${PN}-1.7.2-respect-flags.patch + "${FILESDIR}"/${PN}-1.7.2-autoconf-2.72.patch + "${FILESDIR}"/${PN}-1.7.4-config-cross.patch + "${FILESDIR}"/${PN}-1.7.4-config-libdir.patch + "${FILESDIR}"/config.layout.patch +) + +src_prepare() { + default + + mv configure.in configure.ac || die + AT_M4DIR="build" eautoreconf +} + +src_configure() { + tc-export AS CC CPP + + # the libtool script uses bash code in it and at configure time, tries + # to find a bash shell. if /bin/sh is bash, it uses that. this can + # cause problems for people who switch /bin/sh on the fly to other + # shells, so just force libtool to use /bin/bash all the time. + export CONFIG_SHELL="${EPREFIX}"/bin/bash + export ac_cv_path_SED="sed" + export ac_cv_path_EGREP="grep -E" + export ac_cv_path_EGREP_TRADITIONAL="grep -E" + export ac_cv_path_FGREP="grep -F" + export ac_cv_path_GREP="grep" + export ac_cv_path_lt_DD="dd" + + local myconf=( + --enable-layout=gentoo + --enable-nonportable-atomics + --enable-posix-shm + --enable-threads + $(use_enable static-libs static) + $(use_with valgrind) + --with-installbuilddir="${EPREFIX}"/usr/share/${PN}/build + ) + + tc-is-static-only && myconf+=( --disable-dso ) + + if use old-kernel; then + local apr_cv_accept4 apr_cv_dup3 apr_cv_epoll_create1 apr_cv_sock_cloexec + export apr_cv_accept4="no" + export apr_cv_dup3="no" + export apr_cv_epoll_create1="no" + export apr_cv_sock_cloexec="no" + fi + + if tc-is-cross-compiler; then + # The apache project relies heavily on AC_TRY_RUN and doesn't + # have any sane cross-compiling fallback logic. + export \ + ac_cv_file__dev_zero="yes" \ + ac_cv_func_sem_open="yes" \ + ac_cv_mmap__dev_zero="yes" \ + ac_cv_negative_eai="yes" \ + ac_cv_o_nonblock_inherited="no" \ + ac_cv_struct_rlimit="yes" \ + ap_cv_atomic_builtins="yes" \ + apr_cv_accept4="yes" \ + apr_cv_dup3="yes" \ + apr_cv_epoll="yes" \ + apr_cv_epoll_create1="yes" \ + apr_cv_gai_addrconfig="yes" \ + apr_cv_mutex_recursive="yes" \ + apr_cv_mutex_robust_shared="yes" \ + apr_cv_process_shared_works="yes" \ + apr_cv_pthreads_lib="-pthread" \ + apr_cv_sock_cloexec="yes" \ + apr_cv_tcp_nodelay_with_cork="yes" + fi + + if use urandom; then + myconf+=( --with-devrandom=/dev/urandom ) + else + myconf+=( --with-devrandom=/dev/random ) + fi + + # Avoid libapr containing undefined references (underlinked) + # undefined reference to `__sync_val_compare_and_swap_8' + # (May be possible to fix via libatomic linkage in future?) + # bug #740464 + append-atomic-flags + if use x86 || [[ ${LIBS} == *atomic* ]] ; then + myconf+=( --disable-nonportable-atomics ) + fi + + econf "${myconf[@]}" +} + +src_compile() { + if tc-is-cross-compiler; then + # This header is the same across targets, so use the build compiler. + emake tools/gen_test_char + + tc-export_build_env BUILD_CC + ${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} \ + tools/gen_test_char.c -o tools/gen_test_char || die + fi + + emake all $(usev doc dox) +} + +src_test() { + # Building tests in parallel is broken + emake -j1 check +} + +src_install() { + default + + if ! use static-libs; then + find "${ED}" -name '*.la' -delete || die + fi + + if use doc; then + docinto html + dodoc -r docs/dox/html/* + fi + + # This file is only used on AIX systems, which Gentoo is not, + # and causes collisions between the SLOTs, so remove it. + # Even in Prefix, we don't need this on AIX. + rm "${ED}/usr/$(get_libdir)/apr.exp" || die +} diff --git a/dev-libs/apr/files/apr-1.7.4-config-cross.patch b/dev-libs/apr/files/apr-1.7.4-config-cross.patch new file mode 100644 index 000000000000..5101f455230a --- /dev/null +++ b/dev-libs/apr/files/apr-1.7.4-config-cross.patch @@ -0,0 +1,19 @@ +The apr-config script can automatically adjust its paths to help with +cross-compiling, but it only does this if apr itself was originally +cross-compiled, which may not be the case. Forcing it to consider that +it might be cross-compiled doesn't do any harm though. + +Bug: https://bugs.gentoo.org/931829 + +diff -Naur a/apr-config.in b/apr-config.in +--- a/apr-config.in 2023-03-13 10:29:04.000000000 +0000 ++++ b/apr-config.in 2024-05-14 10:23:28.429984195 +0100 +@@ -48,7 +48,7 @@ + # NOTE: the following line is modified during 'make install': alter with care! + location=@APR_CONFIG_LOCATION@ + +-cross_compiling=@APR_CROSS_COMPILING@ ++cross_compiling=maybe + + if test "$cross_compiling" != "no"; then + diff --git a/dev-libs/apr/files/apr-1.7.4-config-libdir.patch b/dev-libs/apr/files/apr-1.7.4-config-libdir.patch new file mode 100644 index 000000000000..aed4aba59f9a --- /dev/null +++ b/dev-libs/apr/files/apr-1.7.4-config-libdir.patch @@ -0,0 +1,17 @@ +Don't add the libdir to the search path or bake the libdir as a runpath when +doing a native build because we always install to a standard location. + +Bug: https://bugs.gentoo.org/385775 + +diff -Naur a/apr-config.in b/apr-config.in +--- a/apr-config.in 2023-03-13 10:29:04.000000000 +0000 ++++ b/apr-config.in 2024-05-14 10:23:28.429984195 +0100 +@@ -233,7 +233,7 @@ + ### avoid using -L if libdir is a "standard" location like /usr/lib + # Since the user is specifying they are linking with libtool, we + # *know* that -R will be recognized by libtool. +- flags="$flags -L$libdir -R$libdir -l${APR_LIBNAME}" ++ flags="$flags -l${APR_LIBNAME}" + elif test "$location" = "crosscompile"; then + flags="$flags -L${APR_TARGET_DIR}/$libdir -l${APR_LIBNAME}" + else diff --git a/dev-libs/argtable/argtable-2.13-r3.ebuild b/dev-libs/argtable/argtable-2.13-r3.ebuild index 30eee172a9f4..bbd3be201745 100644 --- a/dev-libs/argtable/argtable-2.13-r3.ebuild +++ b/dev-libs/argtable/argtable-2.13-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -8,7 +8,7 @@ MY_P=${PN}${MY_PV} DESCRIPTION="An ANSI C library for parsing GNU-style command-line options with minimal fuss" HOMEPAGE="https://argtable.sourceforge.net" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${MY_P}.tar.gz" S="${WORKDIR}"/${MY_P} LICENSE="LGPL-2" diff --git a/dev-libs/argtable/argtable-2.13-r4.ebuild b/dev-libs/argtable/argtable-2.13-r4.ebuild index 2c18502ad2c2..2c929ec0c0ed 100644 --- a/dev-libs/argtable/argtable-2.13-r4.ebuild +++ b/dev-libs/argtable/argtable-2.13-r4.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 @@ -8,7 +8,7 @@ MY_P=${PN}${MY_PV} DESCRIPTION="An ANSI C library for parsing GNU-style command-line options with minimal fuss" HOMEPAGE="https://argtable.sourceforge.net" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${MY_P}.tar.gz" S="${WORKDIR}"/${MY_P} LICENSE="LGPL-2" diff --git a/dev-libs/atf/atf-0.21-r2.ebuild b/dev-libs/atf/atf-0.21-r2.ebuild index 52b664460cb5..bb8ae13b8548 100644 --- a/dev-libs/atf/atf-0.21-r2.ebuild +++ b/dev-libs/atf/atf-0.21-r2.ebuild @@ -1,21 +1,29 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 +inherit flag-o-matic + DESCRIPTION="Libraries to write tests in C, C++ and shell" -HOMEPAGE="https://github.com/jmmv/atf" -SRC_URI="https://github.com/jmmv/atf/releases/download/${P}/${P}.tar.gz" +HOMEPAGE="https://github.com/freebsd/atf" +SRC_URI="https://github.com/freebsd/atf/releases/download/${P}/${P}.tar.gz" LICENSE="BSD BSD-2" SLOT="0" KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="" BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}"/${P}-getopt-solaris.patch ) +src_configure() { + # Uses std::auto_ptr (deprecated in c++11, removed in c++17) + append-cxxflags "-std=c++14" + + default +} + src_install() { default rm -r "${ED}"/usr/tests || die diff --git a/dev-libs/atf/metadata.xml b/dev-libs/atf/metadata.xml index 077cdb6aa203..b2385d19378a 100644 --- a/dev-libs/atf/metadata.xml +++ b/dev-libs/atf/metadata.xml @@ -5,4 +5,7 @@ <email>floppym@gentoo.org</email> <name>Mike Gilbert</name> </maintainer> + <upstream> + <remote-id type="github">freebsd/atf</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-libs/aws-c-cal/metadata.xml b/dev-libs/aws-c-cal/metadata.xml index b8ec77e47205..304f6cf4a68c 100644 --- a/dev-libs/aws-c-cal/metadata.xml +++ b/dev-libs/aws-c-cal/metadata.xml @@ -9,4 +9,7 @@ <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> + <upstream> + <remote-id type="github">awslabs/aws-c-cal</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-libs/aws-c-common/metadata.xml b/dev-libs/aws-c-common/metadata.xml index e467b78655b3..74ef5bba7d8a 100644 --- a/dev-libs/aws-c-common/metadata.xml +++ b/dev-libs/aws-c-common/metadata.xml @@ -9,6 +9,9 @@ <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> + <upstream> + <remote-id type="github">awslabs/aws-c-common</remote-id> + </upstream> <longdescription> Core c99 package for AWS SDK for C. Includes cross-platform primitives, configuration, data structures, and error handling. diff --git a/dev-libs/aws-c-event-stream/metadata.xml b/dev-libs/aws-c-event-stream/metadata.xml index b8ec77e47205..0cde327ac057 100644 --- a/dev-libs/aws-c-event-stream/metadata.xml +++ b/dev-libs/aws-c-event-stream/metadata.xml @@ -9,4 +9,7 @@ <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> + <upstream> + <remote-id type="github">awslabs/aws-c-event-stream</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-libs/aws-c-io/metadata.xml b/dev-libs/aws-c-io/metadata.xml index 728259f43230..ccc2c399cc5a 100644 --- a/dev-libs/aws-c-io/metadata.xml +++ b/dev-libs/aws-c-io/metadata.xml @@ -9,6 +9,9 @@ <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> + <upstream> + <remote-id type="github">awslabs/aws-c-io</remote-id> + </upstream> <longdescription> This is a module for the AWS SDK for C. It handles all IO and TLS work for application protocols. diff --git a/dev-libs/aws-checksums/metadata.xml b/dev-libs/aws-checksums/metadata.xml index 13271d7199fd..1bbf8de9f110 100644 --- a/dev-libs/aws-checksums/metadata.xml +++ b/dev-libs/aws-checksums/metadata.xml @@ -9,6 +9,9 @@ <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> + <upstream> + <remote-id type="github">awslabs/aws-checksums</remote-id> + </upstream> <longdescription> Cross-Platform HW accelerated CRC32c and CRC32 with fallback to efficient SW implementations. C interface with language diff --git a/dev-libs/bemenu/Manifest b/dev-libs/bemenu/Manifest index b504018a63b4..007681967b20 100644 --- a/dev-libs/bemenu/Manifest +++ b/dev-libs/bemenu/Manifest @@ -2,3 +2,4 @@ DIST bemenu-0.6.10.tar.gz 129568 BLAKE2B f81e84e6457175abf11b9dc6c426cb02121b4f1 DIST bemenu-0.6.14.tar.gz 133229 BLAKE2B 6e83143f7cf808002d6f74b37922b96232c13b884b07c1901e483fd4263db2047394914d8bfe5292907e8a89674d9eed7966722cac4deeac36e5c39ada6eab75 SHA512 8d4fabc962e7d2b6ad23012d172292f74e46d3af68f070222e55a748e4b7a14c42f30f78acad14f5bb73abfa6b7932aff25c24b346908ce780ea00f577a848d9 DIST bemenu-0.6.15.tar.gz 134318 BLAKE2B 0739f3bdf5ad7bcc5b5e75577848965b848df8c8c407d574fcad81fe437d14ade11cc86a81bb2ea5b13faac1a035911f7590013ffbbb7366935c33d171fbf479 SHA512 2de6967ce337b37c943585e3aad0efa1cc7161b0f9666298e0e1f2570f13f3c0b9edef1ab80346e906cd8f53056a7b1a019de7240d2766584031d7b8d76276ab DIST bemenu-0.6.16.tar.gz 135025 BLAKE2B 3a6d131606f22357ce48fbe1946fc3e3be920b52e271db37bae4282ec0ee6614262356821568579112c8e2aa1f5dd147f914183a556a06993a862f14ff3acdcb SHA512 b98a5ad4ec60063b800dd122eb07d3a876e52420abd5827d1421b2e956671d6e7be04e97693da39bcc3b40eaecec46ea6103eeaf2885deea96703218182493b5 +DIST bemenu-0.6.21.tar.gz 139797 BLAKE2B f50aeb3f45721c74077457b702a4b5e58395e245b062df52ad1a452d01862269b0e3d984a318191ef3aa2850f6fa5352d98af9c23a2b9976ee595884132e89a5 SHA512 e8eda08c62d6ab01377dbf04160a7ea42f49ee8378066d855d3223cc57290edb51d74ff12c3b1c799304cb8e46e89f37a82660bf208443d60b2eb3c3446d3e02 diff --git a/dev-libs/bemenu/bemenu-0.6.21.ebuild b/dev-libs/bemenu/bemenu-0.6.21.ebuild new file mode 100644 index 000000000000..db7ba32918bd --- /dev/null +++ b/dev-libs/bemenu/bemenu-0.6.21.ebuild @@ -0,0 +1,62 @@ +# Copyright 2019-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="dmenu clone for wayland" +HOMEPAGE="https://github.com/Cloudef/bemenu" +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/Cloudef/bemenu.git" +else + SRC_URI="https://github.com/Cloudef/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +fi + +LICENSE="GPL-3" +SLOT="0" +IUSE="doc ncurses wayland X" + +# Require at least one backend be built +REQUIRED_USE="|| ( ncurses wayland X )" + +RDEPEND=" + ncurses? ( sys-libs/ncurses:= ) + wayland? ( + dev-libs/wayland + x11-libs/cairo + x11-libs/libxkbcommon + x11-libs/pango + ) + X? ( + x11-libs/cairo[X] + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXinerama + x11-libs/libxcb:= + x11-libs/pango[X] + ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + app-text/scdoc + virtual/pkgconfig + doc? ( app-text/doxygen ) + wayland? ( + dev-libs/wayland-protocols + dev-util/wayland-scanner + ) +" + +src_compile() { + tc-export CC + + emake clients $(usev ncurses curses) $(usev X x11) $(usev wayland) PREFIX="${EPREFIX}"/usr libdir=/$(get_libdir) + use doc && emake doxygen PREFIX="${EPREFIX}"/usr libdir=/$(get_libdir) +} + +src_install() { + emake install DESTDIR="${D}" PREFIX="${EPREFIX}"/usr libdir=/$(get_libdir) +} diff --git a/dev-libs/blake3/Manifest b/dev-libs/blake3/Manifest index cab775f96d36..14f82ce4b719 100644 --- a/dev-libs/blake3/Manifest +++ b/dev-libs/blake3/Manifest @@ -1,2 +1,2 @@ -DIST blake3-1.4.1.tar.gz 224891 BLAKE2B c5d20f40ee2c4c35dfa89de8318e246baef2feab23d71e6c73da201c726ea51b42bec2a5769660a18298057591f479a62b29150f91f07b37eed3438f1a78bec1 SHA512 d21025764fb9ae020561ce2301156a69a77c89a4c5e402a27095e5014159d1a8fee340ff1b1db00b5b22f7a9a4d38273132aab13ca5bd639944492f1b31c9ec1 DIST blake3-1.5.0.tar.gz 228053 BLAKE2B 04405b0bea5e0a5a774c84e712f36c61fd695c4cbe203a327741db7138af38fc4deda7c75a149f1850a1ca01a519897fb8e84c2cbe38f9cc084357c5ed61a1ed SHA512 eb782d48240cf2fa8cc3cddd699dce3a362eb480b3ca58a97d54cd3595a0c969e51fe14374b91136036e8e29c8f745efbd5a4d1aaed2c17f23cb89fb756645d0 +DIST blake3-1.5.1.tar.gz 242161 BLAKE2B 12712bcc6413f90bd9d79ee87d73b45ee611032ccfa3f9e73b2c41b080c2a9451db028c9ff32efa546bef19b85e4aa9fc5ecd9fc6b76c34fd347cbc5fe337649 SHA512 a2ac662b0e45d1f4c4ee01a5e556a47c49ab5407a6057034033ce6fd0fc6b88f66dd428d80f5e7c4a8413356cb4b5ab655924d96138213499893e0204d7c8d24 diff --git a/dev-libs/blake3/blake3-1.4.1.ebuild b/dev-libs/blake3/blake3-1.5.1.ebuild index 2bc612e7279e..e24d78d4b198 100644 --- a/dev-libs/blake3/blake3-1.4.1.ebuild +++ b/dev-libs/blake3/blake3-1.5.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2023 Gentoo Authors +# Copyright 2023-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -12,7 +12,4 @@ S="${WORKDIR}/BLAKE3-${PV}/c" LICENSE="|| ( CC0-1.0 Apache-2.0 )" SLOT="0/0" -KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86" - -RDEPEND="" -DEPEND="${RDEPEND}" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" diff --git a/dev-libs/boehm-gc/boehm-gc-8.2.6.ebuild b/dev-libs/boehm-gc/boehm-gc-8.2.6.ebuild index 6dc7665f7aa8..e42c17128546 100644 --- a/dev-libs/boehm-gc/boehm-gc-8.2.6.ebuild +++ b/dev-libs/boehm-gc/boehm-gc-8.2.6.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 ~ia64 ~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 ~ia64 ~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 3d25ce0460ba..48f0e20f3193 100644 --- a/dev-libs/boost/Manifest +++ b/dev-libs/boost/Manifest @@ -1 +1,2 @@ DIST boost_1_84_0.tar.bz2 123110547 BLAKE2B a872ee00402be0383726020f4d13a7df6c2765c52eac2e09aab1604432931d26dd597503f5dcbbf788d7e7528d13c6d1dbfff1e85d22bf92c7828ef74cf2405d SHA512 5dfeb35198bb096e46cf9e131ef0334cb95bc0bf09f343f291b860b112598b3c36111bd8c232439c401a2b2fb832fa0c399a8d5b96afc60bd359dff070154497 +DIST boost_1_85_0.tar.bz2 124015250 BLAKE2B dd72a9299cd78d2c260e1c94e28ba04daaa352f5bd023d99e43caa3540b1e0f8c09fc04b91f68db0ef8532e4a91fdef0b66a80bf0f9f838303bccaf0729bf581 SHA512 b4489813a4192b57626589457932338cfc47c4ec05c19b3a58b2d8df9e95f022ff2f5f452811ff82d1cec4fb0a490e991c8825bad0fb5a81318d07a8788d8ca0 diff --git a/dev-libs/boost/boost-1.85.0-r1.ebuild b/dev-libs/boost/boost-1.85.0-r1.ebuild new file mode 100644 index 000000000000..aff57dceec4b --- /dev/null +++ b/dev-libs/boost/boost-1.85.0-r1.ebuild @@ -0,0 +1,348 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Keep an eye on both of these after releases for patches: +# * https://www.boost.org/patches/ +# * https://www.boost.org/users/history/version_${MY_PV}.html +# (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. + +# FIXME: cleanup subslot after 1.85.0 + +PYTHON_COMPAT=( python3_{10..12} ) + +inherit flag-o-matic multiprocessing python-r1 toolchain-funcs multilib-minimal + +MY_PV="$(ver_rs 1- _)" + +DESCRIPTION="Boost Libraries for C++" +HOMEPAGE="https://www.boost.org/" +SRC_URI="https://boostorg.jfrog.io/artifactory/main/release/${PV}/source/boost_${MY_PV}.tar.bz2" +S="${WORKDIR}/${PN}_${MY_PV}" + +LICENSE="Boost-1.0" +SLOT="0/${PV}.1" # ${PV} instead of the major version due to bug 486122 +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +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 +# tests at all. They are more a way for upstream to check their own code +# on new compilers. Since they would either be completely unreliable +# (failing for no good reason) or completely useless (never failing) +# there is no point in having them in the ebuild to begin with. +RESTRICT="test" + +RDEPEND=" + bzip2? ( app-arch/bzip2:=[${MULTILIB_USEDEP}] ) + icu? ( dev-libs/icu:=[${MULTILIB_USEDEP}] ) + !icu? ( virtual/libiconv[${MULTILIB_USEDEP}] ) + lzma? ( app-arch/xz-utils:=[${MULTILIB_USEDEP}] ) + mpi? ( virtual/mpi[${MULTILIB_USEDEP},cxx,threads] ) + python? ( + ${PYTHON_DEPS} + 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" + +PATCHES=( + "${FILESDIR}"/${PN}-1.81.0-disable_icu_rpath.patch + "${FILESDIR}"/${PN}-1.79.0-build-auto_index-tool.patch + "${FILESDIR}"/${PN}-1.85.0-bcp-filesystem.patch + "${FILESDIR}"/${PN}-1.85.0-python-numpy-2.patch + "${FILESDIR}"/${PN}-1.85.0-container-aliasing.patch +) + +create_user-config.jam() { + local user_config_jam="${BUILD_DIR}"/user-config.jam + if [[ -s ${user_config_jam} ]]; then + einfo "${user_config_jam} already exists, skipping configuration" + return + else + einfo "Creating configuration in ${user_config_jam}" + fi + + local compiler compiler_version compiler_executable="$(tc-getCXX)" + compiler="gcc" + compiler_version="$(gcc-version)" + + if use mpi; then + local mpi_configuration="using mpi ;" + fi + + cat > "${user_config_jam}" <<- __EOF__ || die + using ${compiler} : ${compiler_version} : ${compiler_executable} : <cflags>"${CPPFLAGS} ${CFLAGS}" <cxxflags>"${CPPFLAGS} ${CXXFLAGS}" <linkflags>"${LDFLAGS}" <archiver>"$(tc-getAR)" <ranlib>"$(tc-getRANLIB)" ; + ${mpi_configuration} + __EOF__ + + if multilib_native_use python; then + append_to_user_config() { + local py_config + if tc-is-cross-compiler; then + py_config="using python : ${EPYTHON#python} : : ${ESYSROOT}/usr/include/${EPYTHON} : ${ESYSROOT}/usr/$(get_libdir) ;" + else + py_config="using python : ${EPYTHON#python} : ${PYTHON} : $(python_get_includedir) ;" + fi + echo "${py_config}" >> "${user_config_jam}" || die + } + python_foreach_impl append_to_user_config + fi + + if multilib_native_use python && use numpy; then + einfo "Enabling support for NumPy extensions in Boost.Python" + else + einfo "Disabling support for NumPy extensions in Boost.Python" + + # Boost.Build does not allow for disabling of numpy + # extensions, thereby leading to automagic numpy + # https://github.com/boostorg/python/issues/111#issuecomment-280447482 + sed \ + -e 's/\[ unless \[ python\.numpy \] : <build>no \]/<build>no/g' \ + -i "${BUILD_DIR}"/libs/python/build/Jamfile || die + fi +} + +pkg_setup() { + # Bail out on unsupported build configuration, bug #456792 + if [[ -f "${EROOT}"/etc/site-config.jam ]]; then + if ! grep -q 'gentoo\(debug\|release\)' "${EROOT}"/etc/site-config.jam; then + eerror "You are using custom ${EROOT}/etc/site-config.jam without defined gentoorelease/gentoodebug targets." + eerror "Boost can not be built in such configuration." + eerror "Please, either remove this file or add targets from ${EROOT}/usr/share/boost-build/site-config.jam to it." + die "Unsupported target in ${EROOT}/etc/site-config.jam" + fi + fi +} + +src_prepare() { + default + multilib_copy_sources +} + +ejam() { + create_user-config.jam + + local b2_opts=( "--user-config=${BUILD_DIR}/user-config.jam" ) + if multilib_native_use python; then + append_to_b2_opts() { + b2_opts+=( python="${EPYTHON#python}" ) + } + python_foreach_impl append_to_b2_opts + else + b2_opts+=( --without-python ) + fi + b2_opts+=( "$@" ) + + echo b2 "${b2_opts[@]}" >&2 + b2 "${b2_opts[@]}" +} + +src_configure() { + # Workaround for too many parallel processes requested, bug #506064 + [[ "$(makeopts_jobs)" -gt 64 ]] && MAKEOPTS="${MAKEOPTS} -j64" + + # We don't want to end up with -L/usr/lib on our linker lines + # which then gives us lots of + # skipping incompatible /usr/lib/libc.a when searching for -lc + # warnings + [[ -n ${ESYSROOT} ]] && local icuarg="-sICU_PATH=${ESYSROOT}/usr" + + OPTIONS=( + $(usex debug gentoodebug gentoorelease) + "-j$(makeopts_jobs)" + -q + -d+2 + pch=off + $(usex icu "${icuarg}" '--disable-icu boost.locale.icu=off') + $(usev !mpi --without-mpi) + $(usev !nls --without-locale) + $(usev !context '--without-context --without-coroutine --without-fiber') + $(usev !stacktrace --without-stacktrace) + --boost-build="${BROOT}"/usr/share/b2/src + --layout=system + # building with threading=single is currently not possible + # https://svn.boost.org/trac/boost/ticket/7105 + threading=multi + link=shared + # this seems to be the only way to disable compression algorithms + # https://www.boost.org/doc/libs/1_70_0/libs/iostreams/doc/installation.html#boost-build + -sNO_BZIP2=$(usex bzip2 0 1) + -sNO_LZMA=$(usex lzma 0 1) + -sNO_ZLIB=$(usex zlib 0 1) + -sNO_ZSTD=$(usex zstd 0 1) + ) + + if [[ ${CHOST} == *-darwin* ]]; then + # We need to add the prefix, and in two cases this exceeds, so prepare + # for the largest possible space allocation. + append-ldflags -Wl,-headerpad_max_install_names + fi + + # Use C++17 globally as of 1.80 + append-cxxflags -std=c++17 + + if [[ ${CHOST} != *-darwin* ]]; then + # On modern macOS, file I/O is already 64-bit by default, + # there's no support for special options like O_LARGEFILE. + # Thus, LFS must be disabled. + # + # On other systems, we need to enable LFS explicitly for 64-bit + # offsets on 32-bit hosts (#894564) + append-lfs-flags + fi +} + +multilib_src_compile() { + ejam \ + --prefix="${EPREFIX}"/usr \ + "${OPTIONS[@]}" || die + + if multilib_native_use tools; then + pushd tools >/dev/null || die + ejam \ + --prefix="${EPREFIX}"/usr \ + "${OPTIONS[@]}" \ + || die "Building of Boost tools failed" + popd >/dev/null || die + fi +} + +multilib_src_install() { + ejam \ + --prefix="${ED}"/usr \ + --includedir="${ED}"/usr/include \ + --libdir="${ED}"/usr/$(get_libdir) \ + "${OPTIONS[@]}" install || die "Installation of Boost libraries failed" + + if multilib_native_use tools; then + dobin dist/bin/* + + insinto /usr/share + doins -r dist/share/boostbook + fi + + # boost's build system truely sucks for not having a destdir. Because for + # this reason we are forced to build with a prefix that includes the + # DESTROOT, dynamic libraries on Darwin end messed up, referencing the + # DESTROOT instread of the actual EPREFIX. There is no way out of here + # but to do it the dirty way of manually setting the right install_names. + if [[ ${CHOST} == *-darwin* ]]; then + einfo "Working around completely broken build-system(tm)" + local d + for d in "${ED}"/usr/lib/*.dylib; do + if [[ -f ${d} ]]; then + # fix the "soname" + ebegin " correcting install_name of ${d#${ED}}" + install_name_tool -id "/${d#${D}}" "${d}" + eend $? + # fix references to other libs + # these paths look like this: + # bin.v2/libs/thread/build/gcc-12.1/gentoorelease/pch-off/ + # threadapi-pthread/threading-multi/visibility-hidden/ + # libboost_thread.dylib + refs=$(otool -XL "${d}" | \ + sed -e '1d' -e 's/^\t//' | \ + grep "libboost_" | \ + cut -f1 -d' ') + local r + for r in ${refs}; do + # strip path prefix from references, so we obtain + # something like libboost_thread.dylib. + local r_basename=${r##*/} + + ebegin " correcting reference to ${r_basename}" + install_name_tool -change \ + "${r}" \ + "${EPREFIX}/usr/lib/${r_basename}" \ + "${d}" + eend $? + done + fi + done + fi +} + +multilib_src_install_all() { + if ! use numpy; then + rm -r "${ED}"/usr/include/boost/python/numpy* || die + fi + + if use python; then + if use mpi; then + move_mpi_py_into_sitedir() { + python_moduleinto boost + + python_domodule "${ED}"/usr/$(get_libdir)/boost-${EPYTHON}/mpi.so + rm -r "${ED}"/usr/$(get_libdir)/boost-${EPYTHON} || die + + python_optimize + } + python_foreach_impl move_mpi_py_into_sitedir + else + rm -r "${ED}"/usr/include/boost/mpi/python* || die + fi + else + rm -r "${ED}"/usr/include/boost/{python*,mpi/python*,parameter/aux_/python,parameter/python*} || die + fi + + if ! use nls; then + rm -r "${ED}"/usr/include/boost/locale || die + fi + + if ! use context; then + rm -r "${ED}"/usr/include/boost/context || die + rm -r "${ED}"/usr/include/boost/coroutine{,2} || die + rm "${ED}"/usr/include/boost/asio/spawn.hpp || die + fi + + if use doc; then + # find extraneous files that shouldn't be installed + # as part of the documentation and remove them. + find libs/*/* \( -iname 'test' -o -iname 'src' \) -exec rm -rf '{}' + || die + find doc \( -name 'Jamfile.v2' -o -name 'build' -o -name '*.manifest' \) -exec rm -rf '{}' + || die + find tools \( -name 'Jamfile.v2' -o -name 'src' -o -name '*.cpp' -o -name '*.hpp' \) -exec rm -rf '{}' + || die + + docinto html + dodoc *.{htm,html,png,css} + dodoc -r doc libs more tools + + # To avoid broken links + dodoc LICENSE_1_0.txt + + dosym ../../../../include/boost /usr/share/doc/${PF}/html/boost + fi +} + +pkg_preinst() { + # Yay for having symlinks that are nigh-impossible to remove without + # resorting to dirty hacks like these. Removes lingering symlinks + # from the slotted versions. + local symlink + for symlink in "${EROOT}"/usr/include/boost "${EROOT}"/usr/share/boostbook; do + if [[ -L ${symlink} ]]; then + rm -f "${symlink}" || die + fi + done + + # some ancient installs still have boost cruft lying around + # for unknown reasons, causing havoc for reverse dependencies + # Bug: 607734 + rm -rf "${EROOT}"/usr/include/boost-1_[3-5]? || die +} + +pkg_postinst() { + elog "Boost.Regex is *extremely* ABI sensitive. If you get errors such as" + elog + elog " undefined reference to \`boost::re_detail_$(ver_cut 1)0$(ver_cut 2)00::cpp_regex_traits_implementation" + elog " <char>::transform_primary[abi:cxx11](char const*, char const*) const'" + elog + elog "Then you need to recompile Boost and all its reverse dependencies" + elog "using the same toolchain. In general, *every* change of the C++ toolchain" + elog "requires a complete rebuild of the Boost-dependent ecosystem." + elog + elog "See for instance https://bugs.gentoo.org/638138" +} diff --git a/dev-libs/boost/boost-1.85.0.ebuild b/dev-libs/boost/boost-1.85.0.ebuild new file mode 100644 index 000000000000..ef6dcf165f8c --- /dev/null +++ b/dev-libs/boost/boost-1.85.0.ebuild @@ -0,0 +1,345 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Keep an eye on both of these after releases for patches: +# * https://www.boost.org/patches/ +# * https://www.boost.org/users/history/version_${MY_PV}.html +# (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} ) + +inherit flag-o-matic multiprocessing python-r1 toolchain-funcs multilib-minimal + +MY_PV="$(ver_rs 1- _)" + +DESCRIPTION="Boost Libraries for C++" +HOMEPAGE="https://www.boost.org/" +SRC_URI="https://boostorg.jfrog.io/artifactory/main/release/${PV}/source/boost_${MY_PV}.tar.bz2" +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 ~ia64 ~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 +# tests at all. They are more a way for upstream to check their own code +# on new compilers. Since they would either be completely unreliable +# (failing for no good reason) or completely useless (never failing) +# there is no point in having them in the ebuild to begin with. +RESTRICT="test" + +RDEPEND=" + bzip2? ( app-arch/bzip2:=[${MULTILIB_USEDEP}] ) + icu? ( dev-libs/icu:=[${MULTILIB_USEDEP}] ) + !icu? ( virtual/libiconv[${MULTILIB_USEDEP}] ) + lzma? ( app-arch/xz-utils:=[${MULTILIB_USEDEP}] ) + mpi? ( virtual/mpi[${MULTILIB_USEDEP},cxx,threads] ) + python? ( + ${PYTHON_DEPS} + 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" + +PATCHES=( + "${FILESDIR}"/${PN}-1.81.0-disable_icu_rpath.patch + "${FILESDIR}"/${PN}-1.79.0-build-auto_index-tool.patch + "${FILESDIR}"/${PN}-1.85.0-bcp-filesystem.patch + "${FILESDIR}"/${PN}-1.85.0-python-numpy-2.patch +) + +create_user-config.jam() { + local user_config_jam="${BUILD_DIR}"/user-config.jam + if [[ -s ${user_config_jam} ]]; then + einfo "${user_config_jam} already exists, skipping configuration" + return + else + einfo "Creating configuration in ${user_config_jam}" + fi + + local compiler compiler_version compiler_executable="$(tc-getCXX)" + compiler="gcc" + compiler_version="$(gcc-version)" + + if use mpi; then + local mpi_configuration="using mpi ;" + fi + + cat > "${user_config_jam}" <<- __EOF__ || die + using ${compiler} : ${compiler_version} : ${compiler_executable} : <cflags>"${CPPFLAGS} ${CFLAGS}" <cxxflags>"${CPPFLAGS} ${CXXFLAGS}" <linkflags>"${LDFLAGS}" <archiver>"$(tc-getAR)" <ranlib>"$(tc-getRANLIB)" ; + ${mpi_configuration} + __EOF__ + + if multilib_native_use python; then + append_to_user_config() { + local py_config + if tc-is-cross-compiler; then + py_config="using python : ${EPYTHON#python} : : ${ESYSROOT}/usr/include/${EPYTHON} : ${ESYSROOT}/usr/$(get_libdir) ;" + else + py_config="using python : ${EPYTHON#python} : ${PYTHON} : $(python_get_includedir) ;" + fi + echo "${py_config}" >> "${user_config_jam}" || die + } + python_foreach_impl append_to_user_config + fi + + if multilib_native_use python && use numpy; then + einfo "Enabling support for NumPy extensions in Boost.Python" + else + einfo "Disabling support for NumPy extensions in Boost.Python" + + # Boost.Build does not allow for disabling of numpy + # extensions, thereby leading to automagic numpy + # https://github.com/boostorg/python/issues/111#issuecomment-280447482 + sed \ + -e 's/\[ unless \[ python\.numpy \] : <build>no \]/<build>no/g' \ + -i "${BUILD_DIR}"/libs/python/build/Jamfile || die + fi +} + +pkg_setup() { + # Bail out on unsupported build configuration, bug #456792 + if [[ -f "${EROOT}"/etc/site-config.jam ]]; then + if ! grep -q 'gentoo\(debug\|release\)' "${EROOT}"/etc/site-config.jam; then + eerror "You are using custom ${EROOT}/etc/site-config.jam without defined gentoorelease/gentoodebug targets." + eerror "Boost can not be built in such configuration." + eerror "Please, either remove this file or add targets from ${EROOT}/usr/share/boost-build/site-config.jam to it." + die "Unsupported target in ${EROOT}/etc/site-config.jam" + fi + fi +} + +src_prepare() { + default + multilib_copy_sources +} + +ejam() { + create_user-config.jam + + local b2_opts=( "--user-config=${BUILD_DIR}/user-config.jam" ) + if multilib_native_use python; then + append_to_b2_opts() { + b2_opts+=( python="${EPYTHON#python}" ) + } + python_foreach_impl append_to_b2_opts + else + b2_opts+=( --without-python ) + fi + b2_opts+=( "$@" ) + + echo b2 "${b2_opts[@]}" >&2 + b2 "${b2_opts[@]}" +} + +src_configure() { + # Workaround for too many parallel processes requested, bug #506064 + [[ "$(makeopts_jobs)" -gt 64 ]] && MAKEOPTS="${MAKEOPTS} -j64" + + # We don't want to end up with -L/usr/lib on our linker lines + # which then gives us lots of + # skipping incompatible /usr/lib/libc.a when searching for -lc + # warnings + [[ -n ${ESYSROOT} ]] && local icuarg="-sICU_PATH=${ESYSROOT}/usr" + + OPTIONS=( + $(usex debug gentoodebug gentoorelease) + "-j$(makeopts_jobs)" + -q + -d+2 + pch=off + $(usex icu "${icuarg}" '--disable-icu boost.locale.icu=off') + $(usev !mpi --without-mpi) + $(usev !nls --without-locale) + $(usev !context '--without-context --without-coroutine --without-fiber') + $(usev !stacktrace --without-stacktrace) + --boost-build="${BROOT}"/usr/share/b2/src + --layout=system + # building with threading=single is currently not possible + # https://svn.boost.org/trac/boost/ticket/7105 + threading=multi + link=shared + # this seems to be the only way to disable compression algorithms + # https://www.boost.org/doc/libs/1_70_0/libs/iostreams/doc/installation.html#boost-build + -sNO_BZIP2=$(usex bzip2 0 1) + -sNO_LZMA=$(usex lzma 0 1) + -sNO_ZLIB=$(usex zlib 0 1) + -sNO_ZSTD=$(usex zstd 0 1) + ) + + if [[ ${CHOST} == *-darwin* ]]; then + # We need to add the prefix, and in two cases this exceeds, so prepare + # for the largest possible space allocation. + append-ldflags -Wl,-headerpad_max_install_names + fi + + # Use C++17 globally as of 1.80 + append-cxxflags -std=c++17 + + if [[ ${CHOST} != *-darwin* ]]; then + # On modern macOS, file I/O is already 64-bit by default, + # there's no support for special options like O_LARGEFILE. + # Thus, LFS must be disabled. + # + # On other systems, we need to enable LFS explicitly for 64-bit + # offsets on 32-bit hosts (#894564) + append-lfs-flags + fi +} + +multilib_src_compile() { + ejam \ + --prefix="${EPREFIX}"/usr \ + "${OPTIONS[@]}" || die + + if multilib_native_use tools; then + pushd tools >/dev/null || die + ejam \ + --prefix="${EPREFIX}"/usr \ + "${OPTIONS[@]}" \ + || die "Building of Boost tools failed" + popd >/dev/null || die + fi +} + +multilib_src_install() { + ejam \ + --prefix="${ED}"/usr \ + --includedir="${ED}"/usr/include \ + --libdir="${ED}"/usr/$(get_libdir) \ + "${OPTIONS[@]}" install || die "Installation of Boost libraries failed" + + if multilib_native_use tools; then + dobin dist/bin/* + + insinto /usr/share + doins -r dist/share/boostbook + fi + + # boost's build system truely sucks for not having a destdir. Because for + # this reason we are forced to build with a prefix that includes the + # DESTROOT, dynamic libraries on Darwin end messed up, referencing the + # DESTROOT instread of the actual EPREFIX. There is no way out of here + # but to do it the dirty way of manually setting the right install_names. + if [[ ${CHOST} == *-darwin* ]]; then + einfo "Working around completely broken build-system(tm)" + local d + for d in "${ED}"/usr/lib/*.dylib; do + if [[ -f ${d} ]]; then + # fix the "soname" + ebegin " correcting install_name of ${d#${ED}}" + install_name_tool -id "/${d#${D}}" "${d}" + eend $? + # fix references to other libs + # these paths look like this: + # bin.v2/libs/thread/build/gcc-12.1/gentoorelease/pch-off/ + # threadapi-pthread/threading-multi/visibility-hidden/ + # libboost_thread.dylib + refs=$(otool -XL "${d}" | \ + sed -e '1d' -e 's/^\t//' | \ + grep "libboost_" | \ + cut -f1 -d' ') + local r + for r in ${refs}; do + # strip path prefix from references, so we obtain + # something like libboost_thread.dylib. + local r_basename=${r##*/} + + ebegin " correcting reference to ${r_basename}" + install_name_tool -change \ + "${r}" \ + "${EPREFIX}/usr/lib/${r_basename}" \ + "${d}" + eend $? + done + fi + done + fi +} + +multilib_src_install_all() { + if ! use numpy; then + rm -r "${ED}"/usr/include/boost/python/numpy* || die + fi + + if use python; then + if use mpi; then + move_mpi_py_into_sitedir() { + python_moduleinto boost + + python_domodule "${ED}"/usr/$(get_libdir)/boost-${EPYTHON}/mpi.so + rm -r "${ED}"/usr/$(get_libdir)/boost-${EPYTHON} || die + + python_optimize + } + python_foreach_impl move_mpi_py_into_sitedir + else + rm -r "${ED}"/usr/include/boost/mpi/python* || die + fi + else + rm -r "${ED}"/usr/include/boost/{python*,mpi/python*,parameter/aux_/python,parameter/python*} || die + fi + + if ! use nls; then + rm -r "${ED}"/usr/include/boost/locale || die + fi + + if ! use context; then + rm -r "${ED}"/usr/include/boost/context || die + rm -r "${ED}"/usr/include/boost/coroutine{,2} || die + rm "${ED}"/usr/include/boost/asio/spawn.hpp || die + fi + + if use doc; then + # find extraneous files that shouldn't be installed + # as part of the documentation and remove them. + find libs/*/* \( -iname 'test' -o -iname 'src' \) -exec rm -rf '{}' + || die + find doc \( -name 'Jamfile.v2' -o -name 'build' -o -name '*.manifest' \) -exec rm -rf '{}' + || die + find tools \( -name 'Jamfile.v2' -o -name 'src' -o -name '*.cpp' -o -name '*.hpp' \) -exec rm -rf '{}' + || die + + docinto html + dodoc *.{htm,html,png,css} + dodoc -r doc libs more tools + + # To avoid broken links + dodoc LICENSE_1_0.txt + + dosym ../../../../include/boost /usr/share/doc/${PF}/html/boost + fi +} + +pkg_preinst() { + # Yay for having symlinks that are nigh-impossible to remove without + # resorting to dirty hacks like these. Removes lingering symlinks + # from the slotted versions. + local symlink + for symlink in "${EROOT}"/usr/include/boost "${EROOT}"/usr/share/boostbook; do + if [[ -L ${symlink} ]]; then + rm -f "${symlink}" || die + fi + done + + # some ancient installs still have boost cruft lying around + # for unknown reasons, causing havoc for reverse dependencies + # Bug: 607734 + rm -rf "${EROOT}"/usr/include/boost-1_[3-5]? || die +} + +pkg_postinst() { + elog "Boost.Regex is *extremely* ABI sensitive. If you get errors such as" + elog + elog " undefined reference to \`boost::re_detail_$(ver_cut 1)0$(ver_cut 2)00::cpp_regex_traits_implementation" + elog " <char>::transform_primary[abi:cxx11](char const*, char const*) const'" + elog + elog "Then you need to recompile Boost and all its reverse dependencies" + elog "using the same toolchain. In general, *every* change of the C++ toolchain" + elog "requires a complete rebuild of the Boost-dependent ecosystem." + elog + elog "See for instance https://bugs.gentoo.org/638138" +} diff --git a/dev-libs/boost/files/boost-1.85.0-bcp-filesystem.patch b/dev-libs/boost/files/boost-1.85.0-bcp-filesystem.patch new file mode 100644 index 000000000000..23d94040341d --- /dev/null +++ b/dev-libs/boost/files/boost-1.85.0-bcp-filesystem.patch @@ -0,0 +1,188 @@ +https://bugs.gentoo.org/932240 +https://github.com/boostorg/bcp/commit/cd21e9b4a749a77c24facf2da44f01e032c40842 + +From cd21e9b4a749a77c24facf2da44f01e032c40842 Mon Sep 17 00:00:00 2001 +From: Andrey Semashev <andrey.semashev@gmail.com> +Date: Sun, 24 Mar 2024 14:49:18 +0300 +Subject: [PATCH] Remove usage of deprecated and removed Boost.Filesystem APIs. + +--- + add_dependent_lib.cpp | 5 +++-- + add_path.cpp | 30 +++++++++++++++--------------- + bcp_imp.hpp | 1 + + copy_path.cpp | 8 ++++---- + file_types.cpp | 2 +- + 5 files changed, 24 insertions(+), 22 deletions(-) + +diff --git a/tools/bcp/add_dependent_lib.cpp b/tools/bcp/add_dependent_lib.cpp +index 4852914..521b70d 100644 +--- a/tools/bcp/add_dependent_lib.cpp ++++ b/tools/bcp/add_dependent_lib.cpp +@@ -15,6 +15,7 @@ + #include "bcp_imp.hpp" + #include "fileview.hpp" + #include <boost/regex.hpp> ++#include <boost/filesystem/directory.hpp> + #include <boost/filesystem/operations.hpp> + #include <boost/filesystem/exception.hpp> + #include <iostream> +@@ -43,12 +44,12 @@ static void init_library_scanner(const fs::path& p, bool cvs_mode, const std::st + // + // Don't add files created by build system: + // +- if((p.leaf() == "bin") || (p.leaf() == "bin-stage")) ++ if((p.filename() == "bin") || (p.filename() == "bin-stage")) + return; + // + // Don't add version control directories: + // +- if((p.leaf() == "CVS") || (p.leaf() == ".svn")) ++ if((p.filename() == "CVS") || (p.filename() == ".svn")) + return; + // + // don't add directories not under version control: +diff --git a/tools/bcp/add_path.cpp b/tools/bcp/add_path.cpp +index 8a1fee3..747bb8c 100644 +--- a/tools/bcp/add_path.cpp ++++ b/tools/bcp/add_path.cpp +@@ -15,6 +15,7 @@ + #include "bcp_imp.hpp" + #include "fileview.hpp" + #include <boost/regex.hpp> ++#include <boost/filesystem/directory.hpp> + #include <boost/filesystem/operations.hpp> + #include <boost/filesystem/exception.hpp> + #include <iostream> +@@ -24,8 +25,7 @@ void bcp_implementation::add_path(const fs::path& p) + { + if (m_excluded.find(p) != m_excluded.end()) + return; +- fs::path normalized_path = p; +- normalized_path.normalize(); ++ fs::path normalized_path = p.lexically_normal(); + if(fs::exists(m_boost_path / normalized_path)) + { + if(fs::is_directory(m_boost_path / normalized_path)) +@@ -45,12 +45,12 @@ void bcp_implementation::add_directory(const fs::path& p) + // + // Don't add files created by build system: + // +- if((p.leaf() == "bin") || (p.leaf() == "bin-stage")) ++ if((p.filename() == "bin") || (p.filename() == "bin-stage")) + return; + // + // Don't add version control directories: + // +- if((p.leaf() == "CVS") || (p.leaf() == ".svn")) ++ if((p.filename() == "CVS") || (p.filename() == ".svn")) + return; + // + // don't add directories not under version control: +@@ -180,7 +180,7 @@ void bcp_implementation::add_file(const fs::path& p) + { + // only concatonate if it's a relative path + // rather than a URL: +- fs::path dep(p.branch_path() / s); ++ fs::path dep(p.parent_path() / s); + if(!m_dependencies.count(dep)) + { + m_dependencies[dep] = p; // set up dependency tree +@@ -355,13 +355,13 @@ void bcp_implementation::add_file_dependencies(const fs::path& p, bool scanfile) + continue; + } + include_file = i->str(); +- fs::path test_file(m_boost_path / p.branch_path() / include_file); +- if(fs::exists(test_file) && !fs::is_directory(test_file) && (p.branch_path().string() != "boost")) ++ fs::path test_file(m_boost_path / p.parent_path() / include_file); ++ if(fs::exists(test_file) && !fs::is_directory(test_file) && (p.parent_path().string() != "boost")) + { +- if(!m_dependencies.count(p.branch_path() / include_file)) ++ if(!m_dependencies.count(p.parent_path() / include_file)) + { +- m_dependencies[p.branch_path() / include_file] = p; +- add_pending_path(p.branch_path() / include_file); ++ m_dependencies[p.parent_path() / include_file] = p; ++ add_pending_path(p.parent_path() / include_file); + } + } + else if(fs::exists(m_boost_path / include_file)) +@@ -405,13 +405,13 @@ void bcp_implementation::add_file_dependencies(const fs::path& p, bool scanfile) + ++i; + continue; + } +- fs::path test_file(m_boost_path / p.branch_path() / include_file); +- if(fs::exists(test_file) && !fs::is_directory(test_file) && (p.branch_path().string() != "boost")) ++ fs::path test_file(m_boost_path / p.parent_path() / include_file); ++ if(fs::exists(test_file) && !fs::is_directory(test_file) && (p.parent_path().string() != "boost")) + { +- if(!m_dependencies.count(p.branch_path() / include_file)) ++ if(!m_dependencies.count(p.parent_path() / include_file)) + { +- m_dependencies[p.branch_path() / include_file] = p; +- add_pending_path(p.branch_path() / include_file); ++ m_dependencies[p.parent_path() / include_file] = p; ++ add_pending_path(p.parent_path() / include_file); + } + } + else if(fs::exists(m_boost_path / include_file)) +diff --git a/tools/bcp/bcp_imp.hpp b/tools/bcp/bcp_imp.hpp +index e515581..51c85ba 100644 +--- a/tools/bcp/bcp_imp.hpp ++++ b/tools/bcp/bcp_imp.hpp +@@ -14,6 +14,7 @@ + #include <set> + #include <map> + #include <queue> ++#include <string> + #include <boost/filesystem/path.hpp> + + namespace fs = boost::filesystem; +diff --git a/tools/bcp/copy_path.cpp b/tools/bcp/copy_path.cpp +index 4143c79..6b7a370 100644 +--- a/tools/bcp/copy_path.cpp ++++ b/tools/bcp/copy_path.cpp +@@ -49,18 +49,18 @@ void bcp_implementation::copy_path(const fs::path& p) + if(fs::exists(m_dest_path / p)) + { + std::cout << "Copying (and overwriting) file: " << p.string() << "\n"; +- fs::remove(m_dest_path / p); ++ fs::remove(m_dest_path / p); + } + else + std::cout << "Copying file: " << p.string() << "\n"; + // + // create the path to the new file if it doesn't already exist: + // +- create_path(p.branch_path()); ++ create_path(p.parent_path()); + // + // do text based copy if requested: + // +- if((p.leaf() == "Jamroot") && m_namespace_name.size()) ++ if((p.filename() == "Jamroot") && m_namespace_name.size()) + { + static std::vector<char> v1, v2; + v1.clear(); +@@ -240,7 +240,7 @@ void bcp_implementation::create_path(const fs::path& p) + if(!fs::exists(m_dest_path / p)) + { + // recurse then create the path: +- create_path(p.branch_path()); ++ create_path(p.parent_path()); + fs::create_directory(m_dest_path / p); + } + } +diff --git a/tools/bcp/file_types.cpp b/tools/bcp/file_types.cpp +index 297d304..69f6027 100644 +--- a/tools/bcp/file_types.cpp ++++ b/tools/bcp/file_types.cpp +@@ -52,7 +52,7 @@ bool bcp_implementation::is_binary_file(const fs::path& p) + "|" + "(Jamfile|makefile|configure)", + boost::regex::perl | boost::regex::icase); +- return !boost::regex_match(p.leaf().generic_string(), e); ++ return !boost::regex_match(p.filename().generic_string(), e); + + } + + diff --git a/dev-libs/boost/files/boost-1.85.0-container-aliasing.patch b/dev-libs/boost/files/boost-1.85.0-container-aliasing.patch new file mode 100644 index 000000000000..cfc1215e7023 --- /dev/null +++ b/dev-libs/boost/files/boost-1.85.0-container-aliasing.patch @@ -0,0 +1,408 @@ +https://bugs.gentoo.org/933289 (and https://bugs.gentoo.org/932780, https://bugs.gentoo.org/931587) +https://github.com/freeorion/freeorion/issues/4949 +https://github.com/boostorg/container/issues/252 +https://github.com/boostorg/container/issues/281 +https://github.com/boostorg/container/commit/20ad12f20e661978e90dc7f36d8ab8ac05e5a5a9 + +From 20ad12f20e661978e90dc7f36d8ab8ac05e5a5a9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ion=20Gazta=C3=B1aga?= <igaztanaga@gmail.com> +Date: Sun, 28 Apr 2024 23:29:59 +0200 +Subject: [PATCH] Remove UB in flat_map implementation when the implementation + has a movable std::pair + +--- a/boost/container/allocator_traits.hpp ++++ b/boost/container/allocator_traits.hpp +@@ -32,6 +32,8 @@ + #include <boost/container/detail/mpl.hpp> + #include <boost/container/detail/type_traits.hpp> //is_empty + #include <boost/container/detail/placement_new.hpp> ++#include <boost/container/detail/is_pair.hpp> ++#include <boost/container/detail/addressof.hpp> + #ifndef BOOST_CONTAINER_DETAIL_STD_FWD_HPP + #include <boost/container/detail/std_fwd.hpp> + #endif +@@ -81,6 +83,144 @@ + + namespace boost { + namespace container { ++namespace dtl { ++ ++#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) ++ ++template<class T, class ...Args> ++BOOST_CONTAINER_FORCEINLINE void construct_type(T *p, BOOST_FWD_REF(Args) ...args) ++{ ++ ::new((void*)p, boost_container_new_t()) T(::boost::forward<Args>(args)...); ++} ++ ++template < class Pair, class KeyType, class ... Args> ++typename dtl::enable_if< dtl::is_pair<Pair>, void >::type ++construct_type ++ (Pair* p, try_emplace_t, BOOST_FWD_REF(KeyType) k, BOOST_FWD_REF(Args) ...args) ++{ ++ construct_type(dtl::addressof(p->first), ::boost::forward<KeyType>(k)); ++ BOOST_CONTAINER_TRY{ ++ construct_type(dtl::addressof(p->second), ::boost::forward<Args>(args)...); ++ } ++ BOOST_CONTAINER_CATCH(...) { ++ typedef typename Pair::first_type first_type; ++ dtl::addressof(p->first)->~first_type(); ++ BOOST_CONTAINER_RETHROW ++ } ++ BOOST_CONTAINER_CATCH_END ++} ++ ++#else ++ ++#define BOOST_CONTAINER_ALLOCATOR_TRAITS_CONSTRUCT_TYPEJ(N) \ ++template<class T BOOST_MOVE_I##N BOOST_MOVE_CLASS##N>\ ++BOOST_CONTAINER_FORCEINLINE \ ++ typename dtl::disable_if_c<dtl::is_pair<T>::value, void >::type \ ++construct_type(T *p BOOST_MOVE_I##N BOOST_MOVE_UREF##N)\ ++{\ ++ ::new((void*)p, boost_container_new_t()) T( BOOST_MOVE_FWD##N );\ ++}\ ++// ++BOOST_MOVE_ITERATE_0TO8(BOOST_CONTAINER_ALLOCATOR_TRAITS_CONSTRUCT_TYPEJ) ++#undef BOOST_CONTAINER_ALLOCATOR_TRAITS_CONSTRUCT_TYPEJ ++ ++#define BOOST_CONTAINER_ALLOCATOR_TRAITS_CONSTRUCT_TYPE(N) \ ++template < class Pair, class KeyType BOOST_MOVE_I##N BOOST_MOVE_CLASS##N>\ ++typename dtl::enable_if< dtl::is_pair<Pair>, void >::type construct_type\ ++ (Pair* p, try_emplace_t, BOOST_FWD_REF(KeyType) k BOOST_MOVE_I##N BOOST_MOVE_UREF##N)\ ++{\ ++ construct_type(dtl::addressof(p->first), ::boost::forward<KeyType>(k));\ ++ BOOST_CONTAINER_TRY{\ ++ construct_type(dtl::addressof(p->second) BOOST_MOVE_I##N BOOST_MOVE_FWD##N);\ ++ }\ ++ BOOST_CONTAINER_CATCH(...) {\ ++ typedef typename Pair::first_type first_type;\ ++ dtl::addressof(p->first)->~first_type();\ ++ BOOST_CONTAINER_RETHROW\ ++ }\ ++ BOOST_CONTAINER_CATCH_END\ ++}\ ++// ++BOOST_MOVE_ITERATE_0TO8(BOOST_CONTAINER_ALLOCATOR_TRAITS_CONSTRUCT_TYPE) ++#undef BOOST_CONTAINER_ALLOCATOR_TRAITS_CONSTRUCT_TYPE ++ ++#endif ++ ++template<class T> ++inline ++typename dtl::enable_if<dtl::is_pair<T>, void >::type ++construct_type(T* p) ++{ ++ dtl::construct_type(dtl::addressof(p->first)); ++ BOOST_CONTAINER_TRY{ ++ dtl::construct_type(dtl::addressof(p->second)); ++ } ++ BOOST_CONTAINER_CATCH(...) { ++ typedef typename T::first_type first_type; ++ dtl::addressof(p->first)->~first_type(); ++ BOOST_CONTAINER_RETHROW ++ } ++ BOOST_CONTAINER_CATCH_END ++} ++ ++ ++template<class T, class U> ++inline ++typename dtl::enable_if_c ++ < dtl::is_pair<T>::value ++ , void >::type ++construct_type(T* p, U &u) ++{ ++ dtl::construct_type(dtl::addressof(p->first), u.first); ++ BOOST_CONTAINER_TRY{ ++ dtl::construct_type(dtl::addressof(p->second), u.second); ++ } ++ BOOST_CONTAINER_CATCH(...) { ++ typedef typename T::first_type first_type; ++ dtl::addressof(p->first)->~first_type(); ++ BOOST_CONTAINER_RETHROW ++ } ++ BOOST_CONTAINER_CATCH_END ++} ++ ++template<class T, class U> ++inline ++typename dtl::enable_if_c ++ < dtl::is_pair<typename dtl::remove_reference<T>::type>::value && ++ !boost::move_detail::is_reference<U>::value //This is needed for MSVC10 and ambiguous overloads ++ , void >::type ++construct_type(T* p, BOOST_RV_REF(U) u) ++{ ++ dtl::construct_type(dtl::addressof(p->first), ::boost::move(u.first)); ++ BOOST_CONTAINER_TRY{ ++ dtl::construct_type(dtl::addressof(p->second), ::boost::move(u.second)); ++ } ++ BOOST_CONTAINER_CATCH(...) { ++ typedef typename T::first_type first_type; ++ dtl::addressof(p->first)->~first_type(); ++ BOOST_CONTAINER_RETHROW ++ } ++ BOOST_CONTAINER_CATCH_END ++} ++ ++template<class T, class U, class V> ++inline ++typename dtl::enable_if<dtl::is_pair<T>, void >::type ++construct_type(T* p, BOOST_FWD_REF(U) x, BOOST_FWD_REF(V) y) ++{ ++ dtl::construct_type(dtl::addressof(p->first), ::boost::forward<U>(x)); ++ BOOST_CONTAINER_TRY{ ++ dtl::construct_type(dtl::addressof(p->second), ::boost::forward<V>(y)); ++ } ++ BOOST_CONTAINER_CATCH(...) { ++ typedef typename T::first_type first_type; ++ dtl::addressof(p->first)->~first_type(); ++ BOOST_CONTAINER_RETHROW ++ } ++ BOOST_CONTAINER_CATCH_END ++} ++ ++} //namespace dtl + + #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED + +@@ -419,7 +559,7 @@ struct allocator_traits + + template<class T, class ...Args> + inline static void priv_construct(dtl::false_type, Allocator &, T *p, BOOST_FWD_REF(Args) ...args) +- { ::new((void*)p, boost_container_new_t()) T(::boost::forward<Args>(args)...); } ++ { dtl::construct_type(p, ::boost::forward<Args>(args)...); } + #else // #if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) + public: + +@@ -450,7 +590,7 @@ struct allocator_traits + \ + template<class T BOOST_MOVE_I##N BOOST_MOVE_CLASS##N >\ + inline static void priv_construct(dtl::false_type, Allocator &, T *p BOOST_MOVE_I##N BOOST_MOVE_UREF##N)\ +- { ::new((void*)p, boost_container_new_t()) T(BOOST_MOVE_FWD##N); }\ ++ { dtl::construct_type(p BOOST_MOVE_I##N BOOST_MOVE_FWD##N); }\ + // + BOOST_MOVE_ITERATE_0TO8(BOOST_CONTAINER_ALLOCATOR_TRAITS_PRIV_CONSTRUCT_IMPL) + #undef BOOST_CONTAINER_ALLOCATOR_TRAITS_PRIV_CONSTRUCT_IMPL +--- a/boost/container/detail/construct_in_place.hpp ++++ b/boost/container/detail/construct_in_place.hpp +@@ -24,6 +24,7 @@ + #include <boost/container/allocator_traits.hpp> + #include <boost/container/detail/iterators.hpp> + #include <boost/container/detail/value_init.hpp> ++#include <boost/container/detail/is_pair.hpp> + + namespace boost { + namespace container { +@@ -62,9 +63,42 @@ BOOST_CONTAINER_FORCEINLINE void construct_in_place(Allocator &a, T *dest, empla + + //Assignment + ++template<class T, class U> ++BOOST_CONTAINER_FORCEINLINE ++ typename dtl::disable_if_c ++ < dtl::is_pair<typename dtl::remove_reference<T>::type>::value ++ && dtl::is_pair<typename dtl::remove_reference<U>::type>::value ++ , void>::type ++assign_in_place_ref(T &t, BOOST_FWD_REF(U) u) ++{ t = ::boost::forward<U>(u); } ++ ++template<class T, class U> ++BOOST_CONTAINER_FORCEINLINE ++ typename dtl::enable_if_c ++ < dtl::is_pair<typename dtl::remove_reference<T>::type>::value ++ && dtl::is_pair<typename dtl::remove_reference<U>::type>::value ++ , void>::type ++assign_in_place_ref(T &t, const U &u) ++{ ++ assign_in_place_ref(t.first, u.first); ++ assign_in_place_ref(t.second, u.second); ++} ++ ++template<class T, class U> ++BOOST_CONTAINER_FORCEINLINE ++ typename dtl::enable_if_c ++ < dtl::is_pair<typename dtl::remove_reference<T>::type>::value ++ && dtl::is_pair<typename dtl::remove_reference<U>::type>::value ++ , void>::type ++assign_in_place_ref(T &t, BOOST_RV_REF(U) u) ++{ ++ assign_in_place_ref(t.first, ::boost::move(u.first)); ++ assign_in_place_ref(t.second, ::boost::move(u.second)); ++} ++ + template<class DstIt, class InpIt> + BOOST_CONTAINER_FORCEINLINE void assign_in_place(DstIt dest, InpIt source) +-{ *dest = *source; } ++{ assign_in_place_ref(*dest, *source); } + + template<class DstIt, class U> + BOOST_CONTAINER_FORCEINLINE void assign_in_place(DstIt dest, value_init_construct_iterator<U>) +--- a/boost/container/flat_map.hpp ++++ b/boost/container/flat_map.hpp +@@ -48,6 +48,11 @@ + #include <initializer_list> + #endif + ++#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) ++#define BOOST_CONTAINER_STD_PAIR_IS_MOVABLE ++#endif ++ ++ + namespace boost { + namespace container { + +@@ -58,21 +63,37 @@ class flat_multimap; + + namespace dtl{ + ++#if defined(BOOST_CONTAINER_STD_PAIR_IS_MOVABLE) + template<class D, class S> + BOOST_CONTAINER_FORCEINLINE static D &force(S &s) +-{ return *move_detail::force_ptr<D*>(&s); } ++{ return s; } + + template<class D, class S> + BOOST_CONTAINER_FORCEINLINE static const D &force(const S &s) +-{ return *move_detail::force_ptr<const D*>(&s); } ++{ return s; } ++ ++template<class D> ++BOOST_CONTAINER_FORCEINLINE static D force_copy(D s) ++{ return s; } ++ ++#else //!BOOST_CONTAINER_DOXYGEN_INVOKED ++ ++template<class D, class S> ++BOOST_CONTAINER_FORCEINLINE static D &force(S &s) ++{ return *move_detail::launder_cast<D*>(&s); } ++ ++template<class D, class S> ++BOOST_CONTAINER_FORCEINLINE static const D &force(const S &s) ++{ return *move_detail::launder_cast<const D*>(&s); } + + template<class D, class S> + BOOST_CONTAINER_FORCEINLINE static D force_copy(const S &s) + { +- const D *const vp = move_detail::force_ptr<const D *>(&s); ++ const D *const vp = move_detail::launder_cast<const D *>(&s); + D ret_val(*vp); + return ret_val; + } ++#endif //BOOST_CONTAINER_DOXYGEN_INVOKED + + } //namespace dtl{ + +@@ -118,18 +139,27 @@ class flat_map + private: + BOOST_COPYABLE_AND_MOVABLE(flat_map) + //This is the tree that we should store if pair was movable ++ typedef std::pair<Key, T> std_pair_t; + typedef dtl::flat_tree< +- std::pair<Key, T>, ++ std_pair_t, + dtl::select1st<Key>, + Compare, + AllocatorOrContainer> tree_t; + + //This is the real tree stored here. It's based on a movable pair ++ typedef dtl::pair<Key, T> dtl_pair_t; ++ ++ #ifdef BOOST_CONTAINER_STD_PAIR_IS_MOVABLE ++ typedef std_pair_t impl_pair_t; ++ #else ++ typedef dtl_pair_t impl_pair_t; ++ #endif ++ + typedef dtl::flat_tree< +- dtl::pair<Key, T>, ++ impl_pair_t, + dtl::select1st<Key>, + Compare, +- typename dtl::container_or_allocator_rebind<AllocatorOrContainer, dtl::pair<Key, T> >::type ++ typename dtl::container_or_allocator_rebind<AllocatorOrContainer, impl_pair_t >::type + > impl_tree_t; + impl_tree_t m_flat_tree; // flat tree representing flat_map + +@@ -851,7 +881,7 @@ class flat_map + //! @copydoc ::boost::container::flat_set::nth(size_type) const + BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline + const_iterator nth(size_type n) const BOOST_NOEXCEPT_OR_NOTHROW +- { return dtl::force_copy<iterator>(m_flat_tree.nth(n)); } ++ { return dtl::force_copy<const_iterator>(m_flat_tree.nth(n)); } + + //! @copydoc ::boost::container::flat_set::index_of(iterator) + BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline +@@ -1099,7 +1129,7 @@ class flat_map + template <class Pair> + inline BOOST_CONTAINER_DOC1ST + ( std::pair<iterator BOOST_MOVE_I bool> +- , typename dtl::enable_if_c<dtl::is_convertible<Pair BOOST_MOVE_I impl_value_type>::value ++ , typename dtl::enable_if_c<dtl::is_convertible<Pair BOOST_MOVE_I dtl_pair_t>::value + BOOST_MOVE_I std::pair<iterator BOOST_MOVE_I bool> >::type) + insert(BOOST_FWD_REF(Pair) x) + { +@@ -1153,7 +1183,7 @@ class flat_map + template <class Pair> + inline BOOST_CONTAINER_DOC1ST + ( iterator +- , typename dtl::enable_if_c<dtl::is_convertible<Pair BOOST_MOVE_I impl_value_type>::value ++ , typename dtl::enable_if_c<dtl::is_convertible<Pair BOOST_MOVE_I dtl_pair_t>::value + BOOST_MOVE_I iterator>::type) + insert(const_iterator p, BOOST_FWD_REF(Pair) x) + { +@@ -1777,17 +1807,24 @@ class flat_multimap + #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED + private: + BOOST_COPYABLE_AND_MOVABLE(flat_multimap) ++ typedef std::pair<Key, T> std_pair_t; + typedef dtl::flat_tree< +- std::pair<Key, T>, ++ std_pair_t, + dtl::select1st<Key>, + Compare, + AllocatorOrContainer> tree_t; + //This is the real tree stored here. It's based on a movable pair ++ typedef dtl::pair<Key, T> dtl_pair_t; ++ #ifdef BOOST_CONTAINER_STD_PAIR_IS_MOVABLE ++ typedef std_pair_t impl_pair_t; ++ #else ++ typedef dtl_pair_t impl_pair_t; ++ #endif + typedef dtl::flat_tree< +- dtl::pair<Key, T>, ++ impl_pair_t, + dtl::select1st<Key>, + Compare, +- typename dtl::container_or_allocator_rebind<AllocatorOrContainer, dtl::pair<Key, T> >::type ++ typename dtl::container_or_allocator_rebind<AllocatorOrContainer, impl_pair_t >::type + > impl_tree_t; + impl_tree_t m_flat_tree; // flat tree representing flat_map + +@@ -2388,7 +2425,7 @@ class flat_multimap + //! @copydoc ::boost::container::flat_set::nth(size_type) const + BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline + const_iterator nth(size_type n) const BOOST_NOEXCEPT_OR_NOTHROW +- { return dtl::force_copy<iterator>(m_flat_tree.nth(n)); } ++ { return dtl::force_copy<const_iterator>(m_flat_tree.nth(n)); } + + //! @copydoc ::boost::container::flat_set::index_of(iterator) + BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline +@@ -2477,7 +2514,7 @@ class flat_multimap + template<class Pair> + inline BOOST_CONTAINER_DOC1ST + ( iterator +- , typename dtl::enable_if_c<dtl::is_convertible<Pair BOOST_MOVE_I impl_value_type>::value ++ , typename dtl::enable_if_c<dtl::is_convertible<Pair BOOST_MOVE_I dtl_pair_t>::value + BOOST_MOVE_I iterator >::type) + insert(BOOST_FWD_REF(Pair) x) + { return dtl::force_copy<iterator>(m_flat_tree.emplace_equal(boost::forward<Pair>(x))); } +@@ -2514,7 +2551,7 @@ class flat_multimap + template<class Pair> + inline BOOST_CONTAINER_DOC1ST + ( iterator +- , typename dtl::enable_if_c<dtl::is_convertible<Pair BOOST_MOVE_I impl_value_type>::value ++ , typename dtl::enable_if_c<dtl::is_convertible<Pair BOOST_MOVE_I dtl_pair_t>::value + BOOST_MOVE_I iterator>::type) + insert(const_iterator p, BOOST_FWD_REF(Pair) x) + { diff --git a/dev-libs/boost/files/boost-1.85.0-python-numpy-2.patch b/dev-libs/boost/files/boost-1.85.0-python-numpy-2.patch new file mode 100644 index 000000000000..e7a7d98b8573 --- /dev/null +++ b/dev-libs/boost/files/boost-1.85.0-python-numpy-2.patch @@ -0,0 +1,26 @@ +https://bugs.gentoo.org/932459 +https://github.com/boostorg/python/issues/431 +https://github.com/boostorg/python/pull/432 + +From 33ac06ca59a68266d3d26edf08205d31ddab4a6c Mon Sep 17 00:00:00 2001 +From: Alexis DUBURCQ <alexis.duburcq@gmail.com> +Date: Fri, 15 Mar 2024 14:10:16 +0100 +Subject: [PATCH] Support numpy 2.0.0b1 + +--- a/libs/python/src/numpy/dtype.cpp ++++ b/libs/python/src/numpy/dtype.cpp +@@ -98,7 +98,13 @@ python::detail::new_reference dtype::convert(object const & arg, bool align) + return python::detail::new_reference(reinterpret_cast<PyObject*>(obj)); + } + +-int dtype::get_itemsize() const { return reinterpret_cast<PyArray_Descr*>(ptr())->elsize;} ++int dtype::get_itemsize() const { ++#if NPY_ABI_VERSION < 0x02000000 ++ return reinterpret_cast<PyArray_Descr*>(ptr())->elsize; ++#else ++ return PyDataType_ELSIZE(reinterpret_cast<PyArray_Descr*>(ptr())); ++#endif ++} + + bool equivalent(dtype const & a, dtype const & b) { + // On Windows x64, the behaviour described on diff --git a/dev-libs/c-blosc2/Manifest b/dev-libs/c-blosc2/Manifest index 237885ae473b..48335995ab69 100644 --- a/dev-libs/c-blosc2/Manifest +++ b/dev-libs/c-blosc2/Manifest @@ -1,7 +1,5 @@ DIST c-blosc2-2.10.5.gh.tar.gz 3144174 BLAKE2B a680def405f2383636185ab1b71a42e042dd0c71025bfc898b48f148f4a6bf27cbd38f29512caae9ff5b58f70cb35289b609c84b132c0795915d1fe6c71b3feb SHA512 bc004fe2132a8e36963437d5279506c2f79dcbf11ee1a768954c20d1265d120dc85e67952b567e716105c5716922da8ee8cffd0a5d44bc67093a4cab3075e322 -DIST c-blosc2-2.11.2.gh.tar.gz 3144952 BLAKE2B 312a6778a75badf687ebf0cbd8a7a4887ea183c4ed189f5d58007baf81154fb8de5269ec1066c5d1f75bd8855404915338f012e348f9aa26f10ada7823f68b4f SHA512 667fc69fd99cc792bc3439246b9e89b823e9c7e0fc497775c1aaa1d12c6368582dac2db93770a8cd732f29c1e93b082e108b641f221b3dae614e9b8a644718b0 -DIST c-blosc2-2.11.3.gh.tar.gz 3145288 BLAKE2B 140ca9693f2a779e37d324c6a631cde915b7bd7e16c5d48c779872dbc2a688773c22145bd224b8a7ac8e355b2639d08723ff1e4dc59cd57f2f4da89eea2d2c7c SHA512 51652056e646dd29496d8e7a4c3fc1c84af5f2a389b9057d0189d45fd298d64a581bf9f92f688397ff941dc18e03123cf7cd190fea91e3c127c36ad1d775bf79 -DIST c-blosc2-2.12.0.gh.tar.gz 3148244 BLAKE2B 1c686994cad5df2e8e311f87df922a453ad4b111bd55bc19b9e988d93228c309835fb53ba9111213cf6e0560b172765656a1cf4c46aa1c5d709a2a92401d9072 SHA512 dafd1e08b9d556729abf8e859324c1b4724f43c5bb5829e11a8bf9653216b3afa05436d012a1cc8ca70017e158bee38c4f4aa3d86ebf18d6d7a2712e6bb26f79 -DIST c-blosc2-2.13.0.gh.tar.gz 3150698 BLAKE2B 3020823fad873f13c2e38f21a20c0a40c558a28dd3e2bab86fe4ccdda946b5f2ab8a160cc619f1bca0bf7901515ebaa3a2600fad0f1387c8055fc1042828b3a5 SHA512 83280ea4aedea38167729bfb52797378a94ecf0733c2552283f07aa1fd732e2f565dce3a227e19e10acd855b9690987b90f9dc8a5f6589d208e0c3940b45ecc4 -DIST c-blosc2-2.13.1.gh.tar.gz 3150768 BLAKE2B 3d5e38aef21e4da45c930357d5d282b1fe92b89140b0390ae25371fb84e080f852e7548cd2339114e5c2752522e612e2fa49c3ab92a2223adf760257e5029b2c SHA512 61b08c2ac2ab4ceef1053673012a8dc7975ea5ca314115cd43bc4bfdcfe427007ed920336e66a0128a750f7215c9fcb2f4379b1adc558c380f6931ce5ca591b1 DIST c-blosc2-2.13.2.gh.tar.gz 3152011 BLAKE2B 1bf9826e6eb1babacb0fe6f7f90c5ca6617cf1cf4df269af95c94e175d0a1cc2015905b9cf6a48107f0b10431feb646ec5de095e00dc29f3bab8d53564e7d4fe SHA512 441df73dca3fe210b0df68bfc3da037a05393f80044f5e2c816000a244ade4cf8e223b2fce2127c034c27a35f2742b05fe06c08861e93c02bc7598d5a4b8a917 +DIST c-blosc2-2.14.0.gh.tar.gz 3155739 BLAKE2B 2607ea3e842fce469f04d31b2d92503f270409e952968e7217ca87ebccd64b25aa38282743f7fdb3ba199f71acc246f7ef9fa0b24e33417e6bdf69a68aba62a6 SHA512 74f0df844c722248a1743fa6ce4b20ae526831f29cc66baf6f487e743c9fc65713e089ebab63ebcf43ac7b1201e82f9c7049dfb68cff17116de93f36d9482557 +DIST c-blosc2-2.14.1.gh.tar.gz 3155751 BLAKE2B 6967914214603af724ab523e91cef2c720018c75002402a5d3ac1bf064af27069ee12db80f7ac37ad5136a30a280b37b829fda7c03b87e2a027599d235ed6021 SHA512 952e2331be4747005e82cabdda310f96031dcfe54f9fe92f68ff2efb42aa8dfb3aa9d6c3ab9ce9f94ea52c34322047447db98d530a58eddc9fca6f62872fd272 +DIST c-blosc2-2.14.4.gh.tar.gz 3155712 BLAKE2B 1af67562150b7b0b87fa076114bab0cccfbd12417c13dfae4fbd40e15531ed54f3a315588ac81b15e137f0272ac6c610c48205608be0b9e98ce44218dd200a27 SHA512 4173c7b0cf4f0399a3d36c987d265aacf766f54dc871ca87ebd98d4ecd4fbd24d4b923ffb2d0b59bda359e1fbba29f088d78816d375904b1945e8c40c29dccce diff --git a/dev-libs/c-blosc2/c-blosc2-2.11.2.ebuild b/dev-libs/c-blosc2/c-blosc2-2.11.2.ebuild deleted file mode 100644 index adf6d65c513f..000000000000 --- a/dev-libs/c-blosc2/c-blosc2-2.11.2.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -DESCRIPTION="Blocking, shuffling and lossless compression library" -HOMEPAGE=" - https://www.blosc.org/c-blosc2/c-blosc2.html - https://github.com/Blosc/c-blosc2/ -" -SRC_URI=" - https://github.com/Blosc/c-blosc2/archive/v${PV}.tar.gz - -> ${P}.gh.tar.gz -" - -LICENSE="BSD" -SLOT="0/1" -KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" -IUSE="test +zlib +zstd" -REQUIRED_USE="test? ( zlib zstd )" -RESTRICT="!test? ( test )" - -DEPEND=" - >=app-arch/lz4-1.7.5:= - zlib? ( sys-libs/zlib:= ) - zstd? ( app-arch/zstd:= ) -" -RDEPEND=" - ${DEPEND} -" - -src_configure() { - # remove bundled libs (just in case) - rm -rf internal-complibs || die - - local mycmakeargs=( - -DBUILD_STATIC=OFF - -DBUILD_TESTS=$(usex test) - -DBUILD_BENCHMARKS=OFF - -DBUILD_EXAMPLES=OFF - -DBUILD_FUZZERS=OFF - -DDEACTIVATE_ZLIB=$(usex !zlib) - -DDEACTIVATE_ZSTD=$(usex !zstd) - -DPREFER_EXTERNAL_LZ4=ON - -DPREFER_EXTERNAL_ZLIB=ON - -DPREFER_EXTERNAL_ZSTD=ON - - # force regular zlib, at least for the time being - -DCMAKE_DISABLE_FIND_PACKAGE_ZLIB_NG=ON - - # upstream overrides CMAKE_C_FLAGS, preventing ${CFLAGS} defaults - # from applying, https://github.com/Blosc/c-blosc2/issues/433 - -DCMAKE_C_FLAGS="${CFLAGS}" - ) - cmake_src_configure -} - -src_test() { - # Tests fail in parallel, https://github.com/Blosc/c-blosc2/issues/432 - MAKEOPTS=-j1 cmake_src_test -} diff --git a/dev-libs/c-blosc2/c-blosc2-2.11.3.ebuild b/dev-libs/c-blosc2/c-blosc2-2.11.3.ebuild deleted file mode 100644 index adf6d65c513f..000000000000 --- a/dev-libs/c-blosc2/c-blosc2-2.11.3.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -DESCRIPTION="Blocking, shuffling and lossless compression library" -HOMEPAGE=" - https://www.blosc.org/c-blosc2/c-blosc2.html - https://github.com/Blosc/c-blosc2/ -" -SRC_URI=" - https://github.com/Blosc/c-blosc2/archive/v${PV}.tar.gz - -> ${P}.gh.tar.gz -" - -LICENSE="BSD" -SLOT="0/1" -KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" -IUSE="test +zlib +zstd" -REQUIRED_USE="test? ( zlib zstd )" -RESTRICT="!test? ( test )" - -DEPEND=" - >=app-arch/lz4-1.7.5:= - zlib? ( sys-libs/zlib:= ) - zstd? ( app-arch/zstd:= ) -" -RDEPEND=" - ${DEPEND} -" - -src_configure() { - # remove bundled libs (just in case) - rm -rf internal-complibs || die - - local mycmakeargs=( - -DBUILD_STATIC=OFF - -DBUILD_TESTS=$(usex test) - -DBUILD_BENCHMARKS=OFF - -DBUILD_EXAMPLES=OFF - -DBUILD_FUZZERS=OFF - -DDEACTIVATE_ZLIB=$(usex !zlib) - -DDEACTIVATE_ZSTD=$(usex !zstd) - -DPREFER_EXTERNAL_LZ4=ON - -DPREFER_EXTERNAL_ZLIB=ON - -DPREFER_EXTERNAL_ZSTD=ON - - # force regular zlib, at least for the time being - -DCMAKE_DISABLE_FIND_PACKAGE_ZLIB_NG=ON - - # upstream overrides CMAKE_C_FLAGS, preventing ${CFLAGS} defaults - # from applying, https://github.com/Blosc/c-blosc2/issues/433 - -DCMAKE_C_FLAGS="${CFLAGS}" - ) - cmake_src_configure -} - -src_test() { - # Tests fail in parallel, https://github.com/Blosc/c-blosc2/issues/432 - MAKEOPTS=-j1 cmake_src_test -} diff --git a/dev-libs/c-blosc2/c-blosc2-2.12.0.ebuild b/dev-libs/c-blosc2/c-blosc2-2.14.0.ebuild index 83ec7fc645ac..83ec7fc645ac 100644 --- a/dev-libs/c-blosc2/c-blosc2-2.12.0.ebuild +++ b/dev-libs/c-blosc2/c-blosc2-2.14.0.ebuild diff --git a/dev-libs/c-blosc2/c-blosc2-2.13.0.ebuild b/dev-libs/c-blosc2/c-blosc2-2.14.1.ebuild index 83ec7fc645ac..83ec7fc645ac 100644 --- a/dev-libs/c-blosc2/c-blosc2-2.13.0.ebuild +++ b/dev-libs/c-blosc2/c-blosc2-2.14.1.ebuild diff --git a/dev-libs/c-blosc2/c-blosc2-2.13.1.ebuild b/dev-libs/c-blosc2/c-blosc2-2.14.4.ebuild index 83ec7fc645ac..a2c086f9673c 100644 --- a/dev-libs/c-blosc2/c-blosc2-2.13.1.ebuild +++ b/dev-libs/c-blosc2/c-blosc2-2.14.4.ebuild @@ -16,8 +16,8 @@ SRC_URI=" " LICENSE="BSD" -SLOT="0/1" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +SLOT="0/3" +KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" IUSE="test +zlib +zstd" REQUIRED_USE="test? ( zlib zstd )" RESTRICT="!test? ( test )" diff --git a/dev-libs/cJSON/Manifest b/dev-libs/cJSON/Manifest index 50cc2e280a86..f901e6641f9f 100644 --- a/dev-libs/cJSON/Manifest +++ b/dev-libs/cJSON/Manifest @@ -1 +1,2 @@ DIST cJSON-1.7.17.tar.gz 353748 BLAKE2B 11d47bebc4b6b3a8115234706f1b35af0f450725c2ee36aaf563a5d44e20a7bc0e2b83aaf15aeea3146bdad7467e96bf7d6edcd79ad4f3e5a9ffe40f002cf8d5 SHA512 4feebafa5225297fa3e6a7bf23f8d31b5c3e172f437078c5a07528522ad58ca2e9c72dd9e8611241d2b8321e9aa0a1a9af7743689d1c2001d1d9cb624aae6fa8 +DIST cJSON-1.7.18.tar.gz 354726 BLAKE2B 293c483ed39028a23a49994698be69de16274500298893711d5767c381f51802c52f4981e074b26fd9174c186f9874fdc1811f49272c1b90f8fb82a1a315db60 SHA512 2accb507c6b97222eb5f0232c015b356cf6d248d1247049928731aa8e897378245e62395c232b1ec57d28d1e53ac72c849be85e59c33616a382d40473649f66b diff --git a/dev-libs/cJSON/cJSON-1.7.18.ebuild b/dev-libs/cJSON/cJSON-1.7.18.ebuild new file mode 100644 index 000000000000..81d883d596a3 --- /dev/null +++ b/dev-libs/cJSON/cJSON-1.7.18.ebuild @@ -0,0 +1,30 @@ +# Copyright 2021-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Ultralightweight JSON parser in ANSI C" +HOMEPAGE="https://github.com/DaveGamble/cJSON" +SRC_URI="https://github.com/DaveGamble/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + +src_prepare() { + cmake_src_prepare + + sed -i -e '/-Werror/d' CMakeLists.txt || die +} + +src_configure() { + local mycmakeargs=( + -DENABLE_CJSON_TEST=$(usex test) + ) + + cmake_src_configure +} diff --git a/dev-libs/capstone/Manifest b/dev-libs/capstone/Manifest index 3c41eeac7749..0262b03d1652 100644 --- a/dev-libs/capstone/Manifest +++ b/dev-libs/capstone/Manifest @@ -1,2 +1 @@ -DIST capstone-4.0.2.tar.gz 3439542 BLAKE2B 435729a8fef2dce6495635352101b3befe563c8404efdbb0dccabecbe2bded332221665bacdbcd9043dda72b652b6f29c0e1a548cefb8c64d5b6b9dc174ed3d9 SHA512 7f93534517307b737422a8825b66b2a1f3e1cca2049465d60ab12595940154aaf843ba40ed348fce58de58b990c19a0caef289060eb72898cb008a88c470970e DIST capstone-5.0.1.tar.gz 7654195 BLAKE2B 83f6681d4c9c748df00daf59f7b33637ab72eee661261c22acae40a6db2def70bb6b5339d731244fdbae6f1e1b0b5b22bb6f60c1390a1bebceb97b3f810aedb0 SHA512 350aba77ce2d96b5c25764913591ba80e4497177ae0a8b2c820c6755ee8310848fbfc54e7ccac27fafc2dbc6778118ad92c53d1b5cb601d4fa146dec7d7e11e5 diff --git a/dev-libs/capstone/capstone-4.0.2-r2.ebuild b/dev-libs/capstone/capstone-4.0.2-r2.ebuild deleted file mode 100644 index 579ef58d9929..000000000000 --- a/dev-libs/capstone/capstone-4.0.2-r2.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_OPTIONAL=1 -PYTHON_COMPAT=( python3_{9..11} ) - -inherit cmake distutils-r1 toolchain-funcs - -DESCRIPTION="disassembly/disassembler framework + bindings" -HOMEPAGE="https://www.capstone-engine.org/" -SRC_URI="https://github.com/capstone-engine/capstone/archive/${PV/_rc/-rc}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/4" # libcapstone.so.4 -KEYWORDS="amd64 ~arm ~arm64 ~riscv x86" - -# A few disassembly outputs need an update -RESTRICT="test" - -IUSE="python static-libs test" -RDEPEND="python? ( ${PYTHON_DEPS} )" -DEPEND="${RDEPEND} - python? ( dev-python/setuptools[${PYTHON_USEDEP}] ) -" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -#TODO: needs upstream fixes -#distutils_enable_tests setup.py - -S=${WORKDIR}/${P/_rc/-rc} - -PATCHES=( - "${FILESDIR}"/${P}-libsuffix.patch -) - -wrap_python() { - local phase=$1 - shift - - if use python; then - pushd bindings/python >/dev/null || die - echo distutils-r1_${phase} "$@" - pwd - distutils-r1_${phase} "$@" - popd >/dev/null - fi -} - -src_prepare() { - tc-export RANLIB - cmake_src_prepare - - wrap_python ${FUNCNAME} -} - -src_configure() { - local mycmakeargs=( - -DCAPSTONE_BUILD_TESTS="$(usex test)" - -DCAPSTONE_BUILD_STATIC="$(usex static-libs)" - ) - 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} -} diff --git a/dev-libs/capstone/capstone-5.0.1.ebuild b/dev-libs/capstone/capstone-5.0.1.ebuild index 2e024af16add..3fc30763814c 100644 --- a/dev-libs/capstone/capstone-5.0.1.ebuild +++ b/dev-libs/capstone/capstone-5.0.1.ebuild @@ -35,7 +35,7 @@ DEPEND="${RDEPEND} BDEPEND="${DISTUTILS_DEPS}" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" -distutils_enable_tests setup.py +RESTRICT="!test? ( test )" if [[ ${PV} == *_rc* ]]; then # Upstream doesn't flag release candidates (bug 858350) @@ -90,3 +90,7 @@ src_install() { find "${ED}" -name '*.a' -delete || die fi } + +python_test() { + emake check +} diff --git a/dev-libs/capstone/capstone-9999.ebuild b/dev-libs/capstone/capstone-9999.ebuild index 6d46a0133be7..ae151ecdb8fb 100644 --- a/dev-libs/capstone/capstone-9999.ebuild +++ b/dev-libs/capstone/capstone-9999.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 @@ -35,15 +35,15 @@ 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 - # version 5 releas line. See bug #911481. + # not merged into 5.* releases. Eventually this patch may be needed in the + # version 5 release line. See bug #911481. "${FILESDIR}/${P}-werror.patch" ) -distutils_enable_tests setup.py - if [[ ${PV} == *_rc* ]]; then # Upstream doesn't flag release candidates (bug 858350) QA_PKGCONFIG_VERSION="" @@ -97,3 +97,7 @@ src_install() { find "${ED}" -name '*.a' -delete || die fi } + +python_test() { + emake check +} diff --git a/dev-libs/capstone/files/capstone-4.0.2-libsuffix.patch b/dev-libs/capstone/files/capstone-4.0.2-libsuffix.patch deleted file mode 100644 index 056140be13df..000000000000 --- a/dev-libs/capstone/files/capstone-4.0.2-libsuffix.patch +++ /dev/null @@ -1,12 +0,0 @@ -cmake does not provide 'LIBSUFFIX' variables, but provides 'LIB_SUFFIX'. -https://bugs.gentoo.org/730722 ---- a/capstone.pc.in -+++ b/capstone.pc.in -@@ -1,6 +1,6 @@ - prefix=@CMAKE_INSTALL_PREFIX@ - exec_prefix=${prefix} --libdir=${prefix}/lib@LIBSUFFIX@ -+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ - includedir=${prefix}/include/capstone - - Name: capstone diff --git a/dev-libs/capstone/files/capstone-9999-werror.patch b/dev-libs/capstone/files/capstone-9999-werror.patch index 1ec58fa056a3..d5f09ca7d656 100644 --- a/dev-libs/capstone/files/capstone-9999-werror.patch +++ b/dev-libs/capstone/files/capstone-9999-werror.patch @@ -2,12 +2,12 @@ Bug: https://bugs.gentoo.org/911481 Upstream: https://github.com/capstone-engine/capstone/pull/2114 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -28,7 +28,7 @@ project(capstone - if (MSVC) - add_compile_options(/W1 /w14189) - else() -- add_compile_options(-Werror -Wformat -Wmissing-braces -Wunused-function -Warray-bounds -Wunused-variable -Wparentheses -Wint-in-bool-context) -+ add_compile_options(-Wformat -Wmissing-braces -Wunused-function -Warray-bounds -Wunused-variable -Wparentheses -Wint-in-bool-context) - endif() +@@ -25,7 +25,7 @@ project(capstone + VERSION 5.0 + ) +-set(UNIX_COMPILER_OPTIONS -Werror -Wall -Warray-bounds -Wshift-negative-value -Wreturn-type -Wformat -Wmissing-braces -Wunused-function -Warray-bounds -Wunused-variable -Wparentheses -Wint-in-bool-context -Wmisleading-indentation) ++set(UNIX_COMPILER_OPTIONS -Wall -Warray-bounds -Wshift-negative-value -Wreturn-type -Wformat -Wmissing-braces -Wunused-function -Warray-bounds -Wunused-variable -Wparentheses -Wint-in-bool-context -Wmisleading-indentation) + # maybe-unitialzied is only supported by newer versions of GCC. + # Unfortunately, it is pretty unreliable and reports wrong results. diff --git a/dev-libs/castxml/Manifest b/dev-libs/castxml/Manifest index fc05da820446..81f027076901 100644 --- a/dev-libs/castxml/Manifest +++ b/dev-libs/castxml/Manifest @@ -1,4 +1 @@ -DIST castxml-0.5.1.tar.gz 106918 BLAKE2B 9268f149ea5a511d24cbbd0c7faec5bff5eade5a511961d3bb120409691bf2b8aca7f2978e048a759419c097d9d97219a61a122bd37d4f835c1d86827bfb07e3 SHA512 1dff8f5cc6932a159e1132c0b283a28414ea6007c942cac4ae15a1c31789f5bd29efd65a6b5b63d7bc48b3d68c3550804f31bee2658e51082269fc5ecc15590e -DIST castxml-0.6.1.tar.gz 119089 BLAKE2B 8e7ea8254debc05fb2d145a1945228607bb7f903dd7748d81f7647f16f0814d331f98f4be1ab430bbb509afdb18c998be998496ef2a8a2e563169747cae1c91c SHA512 0477209979679ca5cae05d99e3ae9c2850f19a39a310a376047570d9e14b37e32aa2ebdea41d000194343e6ec9a27f21b0fcdf633d8b74733e655d9de70bc2a5 -DIST castxml-0.6.2.tar.gz 119190 BLAKE2B fd3522a19898d96fbcbf7044d8d4c03ec7a5192df0ec28e04eecee753367aca76e53e7320f788877b449ca90ee4f441ade76e833ec6fdc1a73ad4f5dfa64c0e0 SHA512 eec6495b8ed837031b5d41cb09b8f70c497c865fbef47bc51b5f296fb9db852ded0bd13c45c3f3017d7d1eb5976557634e52369a24ddbf1f2cf9705c321bac3b -DIST castxml-0.6.4.tar.gz 121583 BLAKE2B 9e4992306bc1380b92ff4d8fcfcf24934036aaf4ecbf2b4db4dfb942ce16152c385b64f96ec0559e6e175f06cf15da0635e61324f92ed6fd0cefc7c83326885d SHA512 3494b7a31a397b390c412a5f445e40d92b3f02840a3eaf9fd94cef2c10fdd52b3621b3990056f2d0619a7d09de448a6988160406d3286472a8db5322a9b1caeb +DIST CastXML-0.6.6.tar.gz 122349 BLAKE2B ab2d928386e3128cd05fcc60c02799508e671883cffd33f952eb81167672e4c76057be21d3ba6b3f327051b015894914c83ad66b5ce87e43fa1b251dea5c5371 SHA512 6ba62b91193eb3458cbd0a0838a626528f66972661cc33c6ef87b760f8baa985afe998a467d07fd7d28c1363f5ba74300f5d49c182830d217a4e051a97a4a913 diff --git a/dev-libs/castxml/castxml-0.5.1-r1.ebuild b/dev-libs/castxml/castxml-0.5.1-r1.ebuild deleted file mode 100644 index 3c2b41567323..000000000000 --- a/dev-libs/castxml/castxml-0.5.1-r1.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LLVM_MAX_SLOT=15 -inherit cmake llvm - -DESCRIPTION="C-family abstract syntax tree XML output tool" -HOMEPAGE="https://github.com/CastXML/CastXML" -SRC_URI="https://github.com/CastXML/CastXML/archive/v${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/CastXML-${PV}" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~arm ~riscv ~x86" -IUSE="+man test" -RESTRICT="!test? ( test )" - -# See comment in llvm.eclass for why we don't depend on LLVM if we already -# depend on Clang. -RDEPEND=" - <sys-devel/clang-$((LLVM_MAX_SLOT + 1)):= -" -DEPEND="${RDEPEND}" -BDEPEND=" - ${RDEPEND} - man? ( dev-python/sphinx ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-fix-tests.patch -) - -llvm_check_deps() { - has_version "sys-devel/clang:${LLVM_SLOT}" -} - -src_configure() { - local mycmakeargs=( - -DCastXML_INSTALL_DOC_DIR="share/doc/${PF}" - -DCastXML_INSTALL_MAN_DIR="share/man" - -DSPHINX_MAN="$(usex man)" - -DSPHINX_HTML=OFF - -DBUILD_TESTING="$(usex test)" - ) - cmake_src_configure -} diff --git a/dev-libs/castxml/castxml-0.6.1.ebuild b/dev-libs/castxml/castxml-0.6.1.ebuild deleted file mode 100644 index 61e6bb8b1dff..000000000000 --- a/dev-libs/castxml/castxml-0.6.1.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LLVM_MAX_SLOT=16 -inherit cmake llvm - -DESCRIPTION="C-family abstract syntax tree XML output tool" -HOMEPAGE="https://github.com/CastXML/CastXML" -SRC_URI="https://github.com/CastXML/CastXML/archive/v${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/CastXML-${PV}" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~arm ~riscv ~x86" -IUSE="+man test" -RESTRICT="!test? ( test )" - -# See comment in llvm.eclass for why we don't depend on LLVM if we already -# depend on Clang. -RDEPEND=" - <sys-devel/clang-$((LLVM_MAX_SLOT + 1)):= -" -DEPEND="${RDEPEND}" -BDEPEND=" - ${RDEPEND} - man? ( dev-python/sphinx ) -" - -PATCHES=( -# "${FILESDIR}"/${PN}-fix-tests.patch -) - -llvm_check_deps() { - has_version "sys-devel/clang:${LLVM_SLOT}" -} - -src_configure() { - local mycmakeargs=( - -DCastXML_INSTALL_DOC_DIR="share/doc/${PF}" - -DCastXML_INSTALL_MAN_DIR="share/man" - -DSPHINX_MAN="$(usex man)" - -DSPHINX_HTML=OFF - -DBUILD_TESTING="$(usex test)" - ) - cmake_src_configure -} diff --git a/dev-libs/castxml/castxml-0.6.2.ebuild b/dev-libs/castxml/castxml-0.6.2.ebuild deleted file mode 100644 index 167ac162e324..000000000000 --- a/dev-libs/castxml/castxml-0.6.2.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LLVM_MAX_SLOT=17 -inherit cmake llvm - -DESCRIPTION="C-family abstract syntax tree XML output tool" -HOMEPAGE="https://github.com/CastXML/CastXML" -SRC_URI="https://github.com/CastXML/CastXML/archive/v${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/CastXML-${PV}" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~arm ~riscv ~x86" -IUSE="+man test" -RESTRICT="!test? ( test )" - -# See comment in llvm.eclass for why we don't depend on LLVM if we already -# depend on Clang. -RDEPEND=" - <sys-devel/clang-$((LLVM_MAX_SLOT + 1)):= -" -DEPEND="${RDEPEND}" -BDEPEND=" - ${RDEPEND} - man? ( dev-python/sphinx ) -" - -PATCHES=( -# "${FILESDIR}"/${PN}-fix-tests.patch -) - -llvm_check_deps() { - has_version "sys-devel/clang:${LLVM_SLOT}" -} - -src_configure() { - local mycmakeargs=( - -DCastXML_INSTALL_DOC_DIR="share/doc/${PF}" - -DCastXML_INSTALL_MAN_DIR="share/man" - -DSPHINX_MAN="$(usex man)" - -DSPHINX_HTML=OFF - -DBUILD_TESTING="$(usex test)" - ) - cmake_src_configure -} - -src_test() { - local CMAKE_SKIP_TESTS=( - # Regex doesn't match the full build path - cmd.input-missing - cmd.rsp-missing - - # Gets confused by extra #defines we set for hardening etc (bug #891813) - cmd.cc-gnu-src-cxx-E - cmd.cc-gnu-src-cxx-cmd - cmd.cc-gnu-c-src-c-E - cmd.cc-gnu-c-src-c-cmd - ) - - cmake_src_test -} diff --git a/dev-libs/castxml/castxml-0.6.4.ebuild b/dev-libs/castxml/castxml-0.6.6.ebuild index 415f275dcc3f..4334249f655f 100644 --- a/dev-libs/castxml/castxml-0.6.4.ebuild +++ b/dev-libs/castxml/castxml-0.6.6.ebuild @@ -3,39 +3,37 @@ EAPI=8 -LLVM_MAX_SLOT=17 -inherit cmake llvm +LLVM_COMPAT=( {17..19} ) +inherit cmake llvm-r1 + +MY_P=CastXML-${PV} DESCRIPTION="C-family abstract syntax tree XML output tool" HOMEPAGE="https://github.com/CastXML/CastXML" -SRC_URI="https://github.com/CastXML/CastXML/archive/v${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/CastXML-${PV}" +SRC_URI=" + https://github.com/CastXML/CastXML/archive/v${PV}.tar.gz + -> ${MY_P}.tar.gz +" +S=${WORKDIR}/${MY_P} LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm ~riscv ~x86" +KEYWORDS="amd64 ~arm ~riscv ~x86" IUSE="+man test" RESTRICT="!test? ( test )" -# See comment in llvm.eclass for why we don't depend on LLVM if we already -# depend on Clang. +DEPEND=" + $(llvm_gen_dep ' + sys-devel/clang:${LLVM_SLOT}= + ') +" RDEPEND=" - <sys-devel/clang-$((LLVM_MAX_SLOT + 1)):= + ${DEPEND} " -DEPEND="${RDEPEND}" BDEPEND=" - ${RDEPEND} man? ( dev-python/sphinx ) " -PATCHES=( -# "${FILESDIR}"/${PN}-fix-tests.patch -) - -llvm_check_deps() { - has_version "sys-devel/clang:${LLVM_SLOT}" -} - src_configure() { local mycmakeargs=( -DCastXML_INSTALL_DOC_DIR="share/doc/${PF}" diff --git a/dev-libs/castxml/files/castxml-fix-tests.patch b/dev-libs/castxml/files/castxml-fix-tests.patch deleted file mode 100644 index a48cf4fe5111..000000000000 --- a/dev-libs/castxml/files/castxml-fix-tests.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/test/expect/cmd.cc-msvc-c-src-c-cmd.stderr.txt b/test/expect/cmd.cc-msvc-c-src-c-cmd.stderr.txt -index fb9ae02..33b3df9 100644 ---- a/test/expect/cmd.cc-msvc-c-src-c-cmd.stderr.txt -+++ b/test/expect/cmd.cc-msvc-c-src-c-cmd.stderr.txt -@@ -1 +1 @@ --"clang" .* "-[^i][^"]*" "[^-"][^"]*" "-isystem" "/some/include" "-isystem" "/some/other/include" "-[^i] -+"clang" .* "-[^i][^"]*" "[^-"][^"]*" "-isystem" "/some/include" "-isystem" "/some/other/include" "-([^i]|i[^s]) -diff --git a/test/expect/cmd.cc-msvc-src-cxx-cmd.stderr.txt b/test/expect/cmd.cc-msvc-src-cxx-cmd.stderr.txt -index fb9ae02..33b3df9 100644 ---- a/test/expect/cmd.cc-msvc-src-cxx-cmd.stderr.txt -+++ b/test/expect/cmd.cc-msvc-src-cxx-cmd.stderr.txt -@@ -1 +1 @@ --"clang" .* "-[^i][^"]*" "[^-"][^"]*" "-isystem" "/some/include" "-isystem" "/some/other/include" "-[^i] -+"clang" .* "-[^i][^"]*" "[^-"][^"]*" "-isystem" "/some/include" "-isystem" "/some/other/include" "-([^i]|i[^s]) diff --git a/dev-libs/castxml/metadata.xml b/dev-libs/castxml/metadata.xml index 243288d8ef94..136fc3f53436 100644 --- a/dev-libs/castxml/metadata.xml +++ b/dev-libs/castxml/metadata.xml @@ -9,6 +9,11 @@ <maintainer type="project"> <email>radio@gentoo.org</email> </maintainer> + <maintainer type="person"> + <!-- mostly to take care of dev-python/pygccxml --> + <email>mgorny@gentoo.org</email> + <name>MichaÅ‚ Górny</name> + </maintainer> <upstream> <remote-id type="github">CastXML/CastXML</remote-id> </upstream> diff --git a/dev-libs/cdk/Manifest b/dev-libs/cdk/Manifest index 3f5daadd8820..3ad50fa1d50a 100644 --- a/dev-libs/cdk/Manifest +++ b/dev-libs/cdk/Manifest @@ -1,2 +1,4 @@ DIST cdk-5.0-20230201.tgz 533972 BLAKE2B 8667583ea1401ab04dc43dbd93f8580ee898c351f52552889fb642f38ad85536f5fbcc6724659bff83a1f9adc1addf5632c39d9162b628efd341f45e94b2b823 SHA512 2b072dc5eba66bb043f56c5d558ddafb0d9281160107f901b5b4c262182946b7c55cf5b1bdf0d0536fd7db6d95fd6b3ddd9dd367fccc63bb0d95eb3c98da58fd 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 diff --git a/dev-libs/cdk/cdk-5.0.20240331.ebuild b/dev-libs/cdk/cdk-5.0.20240331.ebuild new file mode 100644 index 000000000000..aa3072aaa56e --- /dev/null +++ b/dev-libs/cdk/cdk-5.0.20240331.ebuild @@ -0,0 +1,63 @@ +# 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 ~ia64 ~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 \ + --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/cglm/Manifest b/dev-libs/cglm/Manifest index 1d362e79ca8d..90819dc8724b 100644 --- a/dev-libs/cglm/Manifest +++ b/dev-libs/cglm/Manifest @@ -1,3 +1,3 @@ -DIST cglm-0.9.0.tar.gz 642861 BLAKE2B d02cb83abeeea793e5ab7b9473a9a26dcaf3e15209b555c34b6981e3becd6edbd94f0687126114a8917d9f4958575f2cf37a846b7fc54fd236d30198d1fe7aaf SHA512 23ad89df9cd80d69caf0fcf59d6acfbea710d9b6ae50634d4a32718d0214d1624df3bf8f874a76a93c3952e97f94ff48b65103035e87519bb9dbfce7fd2af427 -DIST cglm-0.9.1.tar.gz 657554 BLAKE2B 4b24841b248c3d0606e99b1d71301e3008a5fa6044d0eb76759144aa800875ca890a591e276d237cf801cd09dde513f8e42ecc4eb70288effb641682c899d220 SHA512 05c1e8d1dadafe1c9155db40dd1a4c209283c41ad2416c11b09967435f8047471afa5ee521ef6b8ef22c3e8b3988ab0865137057b33441e7851bc57979509dd6 DIST cglm-0.9.2.tar.gz 672575 BLAKE2B 82f119f4eeeb2dadee1b18f41e10e4f47db02cbd9b4d6548fa0b47592973f571bf95294fbbcafaf17bf8b09ebe452f72a93a8882f15479fbce92db3d6e1f2b2e SHA512 d5de879b2510f534dbc82c88b6f4f324088468af7218a635aff08cc3327787f95b0dc896816b9610e5a319cd071bf2443923d3c1d426fd58509f39867d684e5f +DIST cglm-0.9.3.tar.gz 688608 BLAKE2B f72468f320426d1c0a540c805bef741ccccacd86c061b7b07636ed0221b2acc59efa467c5c91470fb376abcfce68d4d2bceb6aa77fecfbca3acd6f6790d434c4 SHA512 0d773dec44e8246600a53e3c4b117d2eca7f2ebb5855bf113186d4a33a92fe5ccbb3c3a7c7a52a369bb7db37d157b3142af76b569f86cacefc5eb0ab269e9c9c +DIST cglm-0.9.4.tar.gz 690840 BLAKE2B 407373eba01fc6867d5fa8ec418eff0f3636d919dfcedf686f29b149c0bc4c1ed8cce5b3c7a1847f9cfab35612f19709d25febad09aaa4ed9ea05e462a97d2a0 SHA512 cfa836d5100912866d0678babca51e0ca818c1424ac8320c49ee55e5f9091403947a0d7b5c633bb0fb5df594d2b4fb01c2f634cc20cbe6266db5f7879488b02f diff --git a/dev-libs/cglm/cglm-0.9.0.ebuild b/dev-libs/cglm/cglm-0.9.3.ebuild index 8adee7688d32..4c21cab228fa 100644 --- a/dev-libs/cglm/cglm-0.9.0.ebuild +++ b/dev-libs/cglm/cglm-0.9.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 2023 Gentoo Authors +# Copyright 2023-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -8,7 +8,7 @@ DOCS_AUTODOC=1 DOCS_DEPEND="dev-python/sphinx-rtd-theme" DOCS_DIR="${S}/docs/source" -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{9..12} ) inherit python-any-r1 docs meson DESCRIPTION="OpenGL Mathematics (glm) for C" diff --git a/dev-libs/cglm/cglm-0.9.1.ebuild b/dev-libs/cglm/cglm-0.9.4.ebuild index 8adee7688d32..4c21cab228fa 100644 --- a/dev-libs/cglm/cglm-0.9.1.ebuild +++ b/dev-libs/cglm/cglm-0.9.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 2023 Gentoo Authors +# Copyright 2023-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -8,7 +8,7 @@ DOCS_AUTODOC=1 DOCS_DEPEND="dev-python/sphinx-rtd-theme" DOCS_DIR="${S}/docs/source" -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{9..12} ) inherit python-any-r1 docs meson DESCRIPTION="OpenGL Mathematics (glm) for C" diff --git a/dev-libs/cjose/Manifest b/dev-libs/cjose/Manifest index 4fa7b26db7a8..1365f12734f1 100644 --- a/dev-libs/cjose/Manifest +++ b/dev-libs/cjose/Manifest @@ -1 +1,2 @@ DIST cjose-0.6.2.2.tar.gz 498461 BLAKE2B 4914019652f47ac12745cb3b8914f66cb41cb8da33f83735d866cac816dd8f6475d12fde4a6e3f58456c463cb7c6c6fdfeb4928c232f94e3fa6b1b4c8e5ef132 SHA512 71a087709816f0aac060a7c5f037068e981366b1809f6ee32e39eaded02ad8be061b0e2fa5093515a8acec10c7f4aca232281004426221b4b7e5edbd203eb49c +DIST cjose-0.6.2.3.tar.gz 500613 BLAKE2B cf5f7f7bcb3e7cfa643a9f9f0e88498874a78cd8799be961a5c1c1ac03f24ef75ec8b0624a7ec4ffa8f9ebedda0e4c35fb0dc72547620b63ada5e719dfe2f778 SHA512 193434afef21fc4889902896d984bf57c64240346de27be94c229491d43e1d309bbb11905be4899fc7f3c1885323ee9480bf30499f37f3174ab9a1e282f5841f diff --git a/dev-libs/cjose/cjose-0.6.2.3.ebuild b/dev-libs/cjose/cjose-0.6.2.3.ebuild new file mode 100644 index 000000000000..e4fd2351b19d --- /dev/null +++ b/dev-libs/cjose/cjose-0.6.2.3.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="C library implementing the Javascript Object Signing and Encryption (JOSE)" +HOMEPAGE="https://github.com/OpenIDC/cjose" + +SRC_URI="https://github.com/OpenIDC/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc test" + +RESTRICT="!test? ( test )" + +RDEPEND=">=dev-libs/jansson-2.11:= + >=dev-libs/openssl-1.0.2u:=" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + doc? ( >=app-text/doxygen-1.8 ) + test? ( >=dev-libs/check-0.9.4 )" + +src_prepare() { + default + + # Remove -Werror from the build, bug #922461 + sed -e 's/ -Werror//' -i src/Makefile.{am,in} || die + + eautoreconf --force --install +} + +src_install() { + default + find "${ED}" -type f -name '*.la' -delete || die +} diff --git a/dev-libs/clog/Manifest b/dev-libs/clog/Manifest new file mode 100644 index 000000000000..4f863c1a0897 --- /dev/null +++ b/dev-libs/clog/Manifest @@ -0,0 +1 @@ +DIST cpuinfo-2023.11.04.tar.gz 3516672 BLAKE2B 4f99781081ae7c0736bac35d8f589918be1466763d57d0b0661c7cdf8a24fccee61d87acae314714bad09da2a15d96d9725b7c2b7a6a9945bb320f96c31b3eb7 SHA512 02dd70f0b95c2cb6d8af4e33072f63f5d72d2314796033ae68bb6b37cb7db18d43dd2cdfedafc896dec0614dbeec9ab507f765f3d958fbda8c0ab3e3a191a87c diff --git a/dev-libs/clog/clog-2023.11.04.ebuild b/dev-libs/clog/clog-2023.11.04.ebuild new file mode 100644 index 000000000000..c7655a4e2224 --- /dev/null +++ b/dev-libs/clog/clog-2023.11.04.ebuild @@ -0,0 +1,40 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit cmake + +CommitId=d6860c477c99f1fce9e28eb206891af3c0e1a1d7 + +DESCRIPTION="C-style (a-la printf) logging library" +HOMEPAGE="https://github.com/pytorch/cpuinfo/" +SRC_URI="https://github.com/pytorch/cpuinfo/archive/${CommitId}.tar.gz + -> cpuinfo-${PV}.tar.gz" + +S="${WORKDIR}"/clog + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" +IUSE="test" + +RDEPEND="!<dev-libs/cpuinfo-${PV}" +BDEPEND="test? ( dev-cpp/gtest )" +RESTRICT="!test? ( test )" + +PATCHES=( "${FILESDIR}"/${P}-test.patch ) + +src_unpack() { + unpack "${A}" + mv cpuinfo-${CommitId}/deps/clog clog || die + rm -r cpuinfo-${CommitId} || die +} + +src_configure() { + local mycmakeargs=( + -DUSE_SYSTEM_LIBS=ON + -DUSE_SYSTEM_GOOGLETEST=ON + -DCLOG_BUILD_TESTS=$(usex test ON OFF) + ) + cmake_src_configure +} diff --git a/dev-libs/clog/files/clog-2023.11.04-test.patch b/dev-libs/clog/files/clog-2023.11.04-test.patch new file mode 100644 index 000000000000..e8027d5962e4 --- /dev/null +++ b/dev-libs/clog/files/clog-2023.11.04-test.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt 2024-05-08 08:34:01.195300008 +0200 ++++ b/CMakeLists.txt 2024-05-08 08:34:19.850068094 +0200 +@@ -93,7 +93,7 @@ + + ADD_EXECUTABLE(clog-test test/clog.cc) + SET_TARGET_PROPERTIES(clog-test PROPERTIES +- CXX_STANDARD 11 ++ CXX_STANDARD 14 + CXX_EXTENSIONS NO) + CLOG_TARGET_RUNTIME_LIBRARY(clog-test) + TARGET_LINK_LIBRARIES(clog-test PRIVATE clog gtest gtest_main) diff --git a/dev-libs/yascreen/metadata.xml b/dev-libs/clog/metadata.xml index a08688b11e34..eec896ddc47d 100644 --- a/dev-libs/yascreen/metadata.xml +++ b/dev-libs/clog/metadata.xml @@ -2,10 +2,10 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>arthurzam@gentoo.org</email> - <name>Arthur Zamarin</name> + <email>tupone@gentoo.org</email> + <name>Tupone Alfredo</name> </maintainer> <upstream> - <remote-id type="github">bbonev/yascreen</remote-id> + <remote-id type="github">pytorch/cpuinfo</remote-id> </upstream> </pkgmetadata> diff --git a/dev-libs/collada-dom/collada-dom-2.5.0-r1.ebuild b/dev-libs/collada-dom/collada-dom-2.5.0-r1.ebuild index f227b381ce14..ed5d9520144b 100644 --- a/dev-libs/collada-dom/collada-dom-2.5.0-r1.ebuild +++ b/dev-libs/collada-dom/collada-dom-2.5.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -27,6 +27,8 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" +PATCHES=( "${FILESDIR}/${PN}-2.5.0-boost-1.85.patch" ) + src_configure() { # bug 618960 append-cxxflags -std=c++14 diff --git a/dev-libs/collada-dom/files/collada-dom-2.5.0-boost-1.85.patch b/dev-libs/collada-dom/files/collada-dom-2.5.0-boost-1.85.patch new file mode 100644 index 000000000000..0a6e6e8869e8 --- /dev/null +++ b/dev-libs/collada-dom/files/collada-dom-2.5.0-boost-1.85.patch @@ -0,0 +1,45 @@ +commit 65222c3c4f800b624e1d547ab7f1eb28e3d6ee59 +Author: Stefan Strogin <stefan@steils.org> +Date: Mon May 27 16:13:09 2024 +0000 + + Fix build for boost 1.85.0, #42 + +diff --git a/dom/include/dae.h b/dom/include/dae.h +index e53388b..03e72f9 100644 +--- a/dom/include/dae.h ++++ b/dom/include/dae.h +@@ -25,7 +25,7 @@ + #pragma warning(disable: 4180 4245) + #endif + #ifndef NO_BOOST +-#include <boost/filesystem/convenience.hpp> ++#include <boost/filesystem.hpp> + #endif + #ifdef _MSC_VER + #pragma warning(pop) +diff --git a/dom/src/dae/daeUtils.cpp b/dom/src/dae/daeUtils.cpp +index de30ca0..45b667f 100644 +--- a/dom/src/dae/daeUtils.cpp ++++ b/dom/src/dae/daeUtils.cpp +@@ -18,7 +18,7 @@ + #endif + + #ifndef NO_BOOST +-#include <boost/filesystem/convenience.hpp> // THIS WAS NOT COMMENTED. ++#include <boost/filesystem.hpp> // THIS WAS NOT COMMENTED. + #endif + + #include <cstdio> // for tmpnam +diff --git a/dom/src/dae/daeZAEUncompressHandler.cpp b/dom/src/dae/daeZAEUncompressHandler.cpp +index da2a344..2550000 100644 +--- a/dom/src/dae/daeZAEUncompressHandler.cpp ++++ b/dom/src/dae/daeZAEUncompressHandler.cpp +@@ -271,7 +271,7 @@ bool daeZAEUncompressHandler::checkAndExtractInternalArchive( const std::string& + bool error = false; + + boost::filesystem::path archivePath(filePath); +- std::string dir = archivePath.branch_path().string(); ++ std::string dir = archivePath.parent_path().string(); + + const std::string& randomSegment = cdom::getRandomFileName(); + std::string tmpDir = dir + cdom::getFileSeparator() + randomSegment + cdom::getFileSeparator(); diff --git a/dev-libs/concurrencykit/Manifest b/dev-libs/concurrencykit/Manifest index c4ba83f50e5e..9da8e6140338 100644 --- a/dev-libs/concurrencykit/Manifest +++ b/dev-libs/concurrencykit/Manifest @@ -1 +1 @@ -DIST concurrencykit-0.7.1.tar.gz 252802 BLAKE2B 907db3b244544a9c46db7432f2c3d07c20652882067157974ce54c71c27f21fdc87d41e068efc71f88392a94895e0de1a8f3ae90605b4267606cfa7d29c7dc35 SHA512 48768e7adf05b818f2951b246c90185071d6c3f874218349183d96b7887830f9505f9fa58576e9933862486e8543097df0ee667518009a3946d1edc19fc253f7 +DIST concurrencykit-0.7.2.tar.gz 257817 BLAKE2B e9b58c2e5fc7f39d03a3800117bc215f933cd5b542c293e07934597788e2d33e33cf6d02bbaa54d829b57e2dcaabcf79220398bef3a903a1d39c70bb5553ccb2 SHA512 c3a93a8bbdab2c81ccbfe8f38a17677b912bc157c231c960330cb130e93c35e3aab6b2fd1695d0ea28dbe3e12297851f1b96ef1ee21ca4e4c0065c91b83f51c3 diff --git a/dev-libs/concurrencykit/concurrencykit-0.7.1-r1.ebuild b/dev-libs/concurrencykit/concurrencykit-0.7.2.ebuild index de592f0bf47a..7eda380be3dd 100644 --- a/dev-libs/concurrencykit/concurrencykit-0.7.1-r1.ebuild +++ b/dev-libs/concurrencykit/concurrencykit-0.7.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 diff --git a/dev-libs/cowsql/Manifest b/dev-libs/cowsql/Manifest index eb2d4154fb4c..4479e4197578 100644 --- a/dev-libs/cowsql/Manifest +++ b/dev-libs/cowsql/Manifest @@ -1 +1 @@ -DIST cowsql-1.15.4.tar.gz 364167 BLAKE2B c633aa4ad0e55954702995003a1651a220bd6bd1b2a14675d50a04596e7652a3453b63e4e32c8d74cf34c4fae6c1f33cb5054bd347d80dc34032d215ee25bd8c SHA512 06d28723eac1a75cffef6b8e0d8e17696ddc8520345d3b5e1fdada86aa5ee1bbd5a66198a36ee7f7776559392e84908980fd54321ff9c8eb2729dec5a6ac9dd7 +DIST cowsql-1.15.6.tar.gz 364548 BLAKE2B 67ccb0cc1481c4d542c2a145c76875b514f4920fe2d3647d1871afa67e6cb7a41c729946c89768b1c522ed22357fb0323d58885ca60141db154da54e3a5a5a0a SHA512 78436fc35ab22fed1aef1d1048e41fbd6ec75a7b8fc95f09bc7468cde0ea8d8851e4ef5ee738699810abf3054826ab7cfd21dc06964603acea240b0fc7943c4d diff --git a/dev-libs/cowsql/cowsql-1.15.4.ebuild b/dev-libs/cowsql/cowsql-1.15.6.ebuild index 6c74e52fded0..de783d5bd04d 100644 --- a/dev-libs/cowsql/cowsql-1.15.4.ebuild +++ b/dev-libs/cowsql/cowsql-1.15.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 2020-2023 Gentoo Authors +# Copyright 2020-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/cowsql/cowsql/archive/refs/tags/v${PV}.tar.gz -> ${P LICENSE="LGPL-3-with-linking-exception" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="amd64 ~arm64 ~x86" IUSE="test" RESTRICT="!test? ( test )" @@ -43,6 +43,10 @@ src_configure() { econf "${myeconfargs[@]}" } +src_test() { + default +} + src_install() { default find "${ED}" -name '*.la' -delete || die diff --git a/dev-libs/cpuinfo/Manifest b/dev-libs/cpuinfo/Manifest index a636f22f3081..11981c5f1443 100644 --- a/dev-libs/cpuinfo/Manifest +++ b/dev-libs/cpuinfo/Manifest @@ -1,3 +1,4 @@ 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 diff --git a/dev-libs/cpuinfo/cpuinfo-2023.11.04.ebuild b/dev-libs/cpuinfo/cpuinfo-2023.11.04.ebuild new file mode 100644 index 000000000000..59286c83bde5 --- /dev/null +++ b/dev-libs/cpuinfo/cpuinfo-2023.11.04.ebuild @@ -0,0 +1,35 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit cmake + +CommitId=d6860c477c99f1fce9e28eb206891af3c0e1a1d7 + +DESCRIPTION="CPU INFOrmation library" +HOMEPAGE="https://github.com/pytorch/cpuinfo/" +SRC_URI="https://github.com/pytorch/${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 + "${FILESDIR}"/${PN}-2023.01.13-test.patch +) + +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/files/cpuinfo-2023.11.04-gentoo.patch b/dev-libs/cpuinfo/files/cpuinfo-2023.11.04-gentoo.patch new file mode 100644 index 000000000000..4603ab9dee0e --- /dev/null +++ b/dev-libs/cpuinfo/files/cpuinfo-2023.11.04-gentoo.patch @@ -0,0 +1,25 @@ +--- a/CMakeLists.txt 2022-05-09 22:00:05.453640876 +0200 ++++ b/CMakeLists.txt 2022-05-09 22:01:11.621691380 +0200 +@@ -130,12 +130,6 @@ + IF(USE_SYSTEM_GOOGLETEST) + FIND_PACKAGE(GTest REQUIRED) + ELSEIF(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() +@@ -344,9 +344,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/cudnn-frontend/Manifest b/dev-libs/cudnn-frontend/Manifest index efcf66a60000..87fb519735df 100644 --- a/dev-libs/cudnn-frontend/Manifest +++ b/dev-libs/cudnn-frontend/Manifest @@ -1,3 +1,5 @@ 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 diff --git a/dev-libs/cudnn-frontend/cudnn-frontend-1.0.3.ebuild b/dev-libs/cudnn-frontend/cudnn-frontend-1.0.3.ebuild new file mode 100644 index 000000000000..10648668e6c9 --- /dev/null +++ b/dev-libs/cudnn-frontend/cudnn-frontend-1.0.3.ebuild @@ -0,0 +1,20 @@ +# 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.1.2.ebuild b/dev-libs/cudnn-frontend/cudnn-frontend-1.1.2.ebuild new file mode 100644 index 000000000000..10648668e6c9 --- /dev/null +++ b/dev-libs/cudnn-frontend/cudnn-frontend-1.1.2.ebuild @@ -0,0 +1,20 @@ +# 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/metadata.xml b/dev-libs/cudnn-frontend/metadata.xml index 3cce6a37e444..48b6ae08078d 100644 --- a/dev-libs/cudnn-frontend/metadata.xml +++ b/dev-libs/cudnn-frontend/metadata.xml @@ -1,7 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person"> + <email>tupone@gentoo.org</email> + <name>Tupone Alfredo</name> + </maintainer> <upstream> <remote-id type="github">NVIDIA/cudnn-frontend</remote-id> </upstream> diff --git a/dev-libs/cutlass/Manifest b/dev-libs/cutlass/Manifest index 103690cedbf2..a597ef5b7303 100644 --- a/dev-libs/cutlass/Manifest +++ b/dev-libs/cutlass/Manifest @@ -1 +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 diff --git a/dev-libs/cutlass/cutlass-3.3.0.ebuild b/dev-libs/cutlass/cutlass-3.3.0.ebuild index d85941a8c5e4..7ba922d88c71 100644 --- a/dev-libs/cutlass/cutlass-3.3.0.ebuild +++ b/dev-libs/cutlass/cutlass-3.3.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 2023 Gentoo Authors +# Copyright 2023-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -29,6 +29,7 @@ src_configure() { ) cuda_add_sandbox -w addpredict /dev/char + addpredict /proc/self/task cmake_src_configure } diff --git a/dev-libs/cutlass/cutlass-3.4.1.ebuild b/dev-libs/cutlass/cutlass-3.4.1.ebuild new file mode 100644 index 000000000000..7ba922d88c71 --- /dev/null +++ b/dev-libs/cutlass/cutlass-3.4.1.ebuild @@ -0,0 +1,39 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cuda cmake + +DESCRIPTION="CUDA Templates for Linear Algebra Subroutines" +HOMEPAGE="https://github.com/NVIDIA/cutlass" +SRC_URI="https://github.com/NVIDIA/${PN}/archive/refs/tags/v${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64" + +BDEPEND="dev-util/nvidia-cuda-toolkit" + +src_prepare() { + cmake_src_prepare + cuda_src_prepare +} + +src_configure() { + mycmakeargs+=( + -DCMAKE_CUDA_FLAGS="$(cuda_gccdir -f | tr -d \")" + -DCUTLASS_ENABLE_HEADERS_ONLY=yes + -DCUTLASS_ENABLE_TESTS=no + ) + cuda_add_sandbox -w + addpredict /dev/char + addpredict /proc/self/task + cmake_src_configure +} + +src_install() { + cmake_src_install + rm -r "${ED}"/usr/test || die +} diff --git a/dev-libs/cvector/cvector-1.0.3.1.ebuild b/dev-libs/cvector/cvector-1.0.3.1.ebuild index 4b7b0bc8f3ab..db39343b5a49 100644 --- a/dev-libs/cvector/cvector-1.0.3.1.ebuild +++ b/dev-libs/cvector/cvector-1.0.3.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ MY_P="${MY_PN}-${PV}" DESCRIPTION="An ANSI C implementation of dynamic arrays (approximation of C++ vectors)" HOMEPAGE="http://cvector.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${PN}/${MY_PN}-$(ver_cut 1-3)/${MY_P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${PN}/${MY_PN}-$(ver_cut 1-3)/${MY_P}.tar.gz" S="${WORKDIR}"/${MY_P} LICENSE="LGPL-2.1" diff --git a/dev-libs/cxxopts/cxxopts-3.0.0-r1.ebuild b/dev-libs/cxxopts/cxxopts-3.0.0-r1.ebuild index 1336e0c4e58c..dfcdc30a3aac 100644 --- a/dev-libs/cxxopts/cxxopts-3.0.0-r1.ebuild +++ b/dev-libs/cxxopts/cxxopts-3.0.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2020-2022 Gentoo Authors +# Copyright 2020-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/jarro2783/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz LICENSE="MIT" SLOT="0/${PV}" -KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" IUSE="icu test" RESTRICT="!test? ( test )" diff --git a/dev-libs/cxxtools/cxxtools-3.0-r2.ebuild b/dev-libs/cxxtools/cxxtools-3.0-r2.ebuild index b87baa58b1ad..b46ea02fa47a 100644 --- a/dev-libs/cxxtools/cxxtools-3.0-r2.ebuild +++ b/dev-libs/cxxtools/cxxtools-3.0-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021-2023 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="http://www.tntnet.org/download/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~amd64 ~sparc ~x86" +KEYWORDS="amd64 ~sparc x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r4.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r4.ebuild index 14ebb5120992..f5eba5bfaf08 100644 --- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r4.ebuild +++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -60,7 +60,12 @@ src_prepare() { src_configure() { export CC_FOR_BUILD="$(tc-getBUILD_CC)" - append-flags -fno-strict-aliasing + # -Werror=lto-type-mismatch + # https://bugs.gentoo.org/894684 + # https://github.com/cyrusimap/cyrus-sasl/pull/771 + # + # Fixed upstream in git master but not released. + use srp && filter-lto if [[ ${CHOST} == *-solaris* ]] ; then # getpassphrase is defined in /usr/include/stdlib.h diff --git a/dev-libs/dbus-c++/dbus-c++-0.9.0-r4.ebuild b/dev-libs/dbus-c++/dbus-c++-0.9.0-r4.ebuild index 808b6f23b8e3..24adb05a6cde 100644 --- a/dev-libs/dbus-c++/dbus-c++-0.9.0-r4.ebuild +++ b/dev-libs/dbus-c++/dbus-c++-0.9.0-r4.ebuild @@ -7,7 +7,7 @@ inherit multilib-minimal DESCRIPTION="Provides a C++ API for D-BUS" HOMEPAGE="https://sourceforge.net/projects/dbus-cplusplus/" -SRC_URI="mirror://sourceforge/dbus-cplusplus/lib${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/dbus-cplusplus/lib${P}.tar.gz" LICENSE="LGPL-2.1+" SLOT="0" diff --git a/dev-libs/dbus-c++/dbus-c++-0.9.0-r5.ebuild b/dev-libs/dbus-c++/dbus-c++-0.9.0-r5.ebuild index aa524e0af5b1..48df7826265a 100644 --- a/dev-libs/dbus-c++/dbus-c++-0.9.0-r5.ebuild +++ b/dev-libs/dbus-c++/dbus-c++-0.9.0-r5.ebuild @@ -7,7 +7,7 @@ inherit multilib-minimal autotools virtualx DESCRIPTION="Provides a C++ API for D-BUS" HOMEPAGE="https://sourceforge.net/projects/dbus-cplusplus/" -SRC_URI="mirror://sourceforge/dbus-cplusplus/lib${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/dbus-cplusplus/lib${P}.tar.gz" LICENSE="LGPL-2.1+" SLOT="0" diff --git a/dev-libs/distorm3/distorm3-3.5.2-r1.ebuild b/dev-libs/distorm3/distorm3-3.5.2-r1.ebuild index c623afc293d7..2b29e61283f4 100644 --- a/dev-libs/distorm3/distorm3-3.5.2-r1.ebuild +++ b/dev-libs/distorm3/distorm3-3.5.2-r1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{9..12} ) inherit distutils-r1 pypi DESCRIPTION="The ultimate disassembler library (X86-32, X86-64)" diff --git a/dev-libs/dotconf/Manifest b/dev-libs/dotconf/Manifest index e83204456597..e564349b5fbc 100644 --- a/dev-libs/dotconf/Manifest +++ b/dev-libs/dotconf/Manifest @@ -1 +1,2 @@ DIST dotconf-1.3.tar.gz 333301 BLAKE2B df3f4c9bc4539ed5b21bd4d6059bd911bb319d9dbe4f48c6d45c34559eaaa646abea847f6d0b35678c12d9b5e89e2f112047557d458be608215d76bb50af004c SHA512 ced0e66f70d11a309e77add1bfac1da8e85dcbe193633bd4bd1ae4bfd043b66880406e93ec18327b8c5d3de8d4bfc5278db6e5cb39b030ee1dabfa1ce267a98e +DIST dotconf-1.4.1.tar.gz 46565 BLAKE2B 8eb7508b6ca13f0f4cc2ca0c1d889ce7801c3d60d826078a23b68807f1c2fa38fed4e638ac4b1a2ddf9c1e204293e57acce29bbd5cf3d6fd12abb140b6cb0d3e SHA512 a6cada8621295b268d4b4fd85bc0c207e78324c9e84754ead2fdf6c1598ec8bdf626f9c24e66063d921c95d73e83b50ab50416a9b4c9a7a631392552ec46f55a diff --git a/dev-libs/dotconf/dotconf-1.3-r2.ebuild b/dev-libs/dotconf/dotconf-1.3-r2.ebuild index 2dedf327663c..5092ea045426 100644 --- a/dev-libs/dotconf/dotconf-1.3-r2.ebuild +++ b/dev-libs/dotconf/dotconf-1.3-r2.ebuild @@ -12,10 +12,8 @@ SRC_URI="mirror://gentoo/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" -IUSE="" DEPEND=">=dev-build/autoconf-2.58" -RDEPEND="" src_configure() { econf --disable-static diff --git a/dev-libs/dotconf/dotconf-1.4.1.ebuild b/dev-libs/dotconf/dotconf-1.4.1.ebuild new file mode 100644 index 000000000000..36d47ae81583 --- /dev/null +++ b/dev-libs/dotconf/dotconf-1.4.1.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} == 9999* ]]; then + inherit git-r3 +fi +inherit autotools toolchain-funcs + +DESCRIPTION="dot.conf configuration file parser" +HOMEPAGE="https://github.com/williamh/dotconf" +if [[ ${PV} == 9999* ]]; then + EGIT_REPO_URI="https://github.com/williamh/dotconf.git" +else + SRC_URI="https://github.com/williamh/dotconf/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +fi + +LICENSE="LGPL-2.1" +SLOT="0" + +DEPEND=">=dev-build/autoconf-2.58" + +src_configure() { + eautoreconf + econf --disable-static +} + +src_compile() { + emake CC="$(tc-getCC)" +} + +src_install() { + default + find "${ED}" -type f -name '*.la' -delete || die +} diff --git a/dev-libs/dotconf/dotconf-9999.ebuild b/dev-libs/dotconf/dotconf-9999.ebuild new file mode 100644 index 000000000000..36d47ae81583 --- /dev/null +++ b/dev-libs/dotconf/dotconf-9999.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} == 9999* ]]; then + inherit git-r3 +fi +inherit autotools toolchain-funcs + +DESCRIPTION="dot.conf configuration file parser" +HOMEPAGE="https://github.com/williamh/dotconf" +if [[ ${PV} == 9999* ]]; then + EGIT_REPO_URI="https://github.com/williamh/dotconf.git" +else + SRC_URI="https://github.com/williamh/dotconf/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +fi + +LICENSE="LGPL-2.1" +SLOT="0" + +DEPEND=">=dev-build/autoconf-2.58" + +src_configure() { + eautoreconf + econf --disable-static +} + +src_compile() { + emake CC="$(tc-getCC)" +} + +src_install() { + default + find "${ED}" -type f -name '*.la' -delete || die +} diff --git a/dev-libs/double-conversion/Manifest b/dev-libs/double-conversion/Manifest index 3d6f44d7022d..01fff72eb715 100644 --- a/dev-libs/double-conversion/Manifest +++ b/dev-libs/double-conversion/Manifest @@ -1 +1,2 @@ DIST double-conversion-3.2.1.tar.gz 7032718 BLAKE2B 4f6fe334388b6cb0ba5edbbef761764bfe36feb83cf73281a4f5e8bb64c96923f3e33919678fe29885de0bc3b388a6e0e91f871808c215d8a3e5cc778325fa01 SHA512 d2feb3098a1d4d6baab5f89bcc29ac2e06d314d552b8c747c6eb6dba5dd165a15dc71200191edb7f05d521c349e12d59cddba3c5db101e1623e0e76e19f21a49 +DIST double-conversion-3.3.0.tar.gz 7033266 BLAKE2B 6eebc85f257ff0bd403ecc32f4ee8d297e3883e0d66f28e004fb71d6d2cfff313e0eeef661896e0985d574e354ad45a293238533116b7d78caafd64ae63de9cd SHA512 51e84eb7a5c407f7bc8f8b8ca19932ece5c9d8ac18aedff7b7620fc67369d9b2aa8c5a6b133e7f8633d7cc5e3788bad6e60b0e48ac08d0a4bc5e4abe7cee1334 diff --git a/dev-libs/double-conversion/double-conversion-3.3.0.ebuild b/dev-libs/double-conversion/double-conversion-3.3.0.ebuild new file mode 100644 index 000000000000..891fb601abb3 --- /dev/null +++ b/dev-libs/double-conversion/double-conversion-3.3.0.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Binary-decimal and decimal-binary conversion routines for IEEE doubles" +HOMEPAGE="https://github.com/google/double-conversion/" +SRC_URI=" + https://github.com/google/double-conversion/archive/refs/tags/v${PV}.tar.gz + -> ${P}.tar.gz +" + +LICENSE="BSD" +SLOT="0/3" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +IUSE="test" +RESTRICT="!test? ( test )" + +src_configure() { + local mycmakeargs=( + -DBUILD_TESTING=$(usex test) + ) + + cmake_src_configure +} diff --git a/dev-libs/double-conversion/metadata.xml b/dev-libs/double-conversion/metadata.xml index effa1fa56fc4..87b47ae3b9ce 100644 --- a/dev-libs/double-conversion/metadata.xml +++ b/dev-libs/double-conversion/metadata.xml @@ -7,6 +7,7 @@ </maintainer> <maintainer type="project"> <email>qt@gentoo.org</email> + <name>Gentoo Qt Project</name> </maintainer> <longdescription lang="en"> This library consists of efficient conversion routines that have diff --git a/dev-libs/dynolog/dynolog-0.3.1_p20230126-r1.ebuild b/dev-libs/dynolog/dynolog-0.3.1_p20230126-r2.ebuild index cd1da77cf928..806fe0946869 100644 --- a/dev-libs/dynolog/dynolog-0.3.1_p20230126-r1.ebuild +++ b/dev-libs/dynolog/dynolog-0.3.1_p20230126-r2.ebuild @@ -58,6 +58,7 @@ RESTRICT="!test? ( test )" DEPEND="dev-cpp/gflags dev-cpp/gtest dev-cpp/glog + dev-libs/pfs net-misc/curl" RDEPEND="${DEPEND}" @@ -72,7 +73,7 @@ PATCHES=( "${FILESDIR}"/${P}-musl.patch ) -CMAKE_SKIP_TESTS=( "Defs.CpuSet" ) +CMAKE_SKIP_TESTS=( "Defs.CpuSet" "KernelCollecterTest.NetworkStatsTest" ) src_prepare() { sed -i \ @@ -82,7 +83,9 @@ src_prepare() { cmake_src_prepare cmake_comment_add_subdirectory third_party/gflags cmake_comment_add_subdirectory third_party/glog + cmake_comment_add_subdirectory third_party/pfs rm -r third_party/googletest || die + rm -r third_party/pfs || die } src_configure() { diff --git a/dev-libs/dynolog/files/dynolog-0.3.1_p20230126-riscv.patch b/dev-libs/dynolog/files/dynolog-0.3.1_p20230126-riscv.patch index 7038dbfe7b12..de661f8ddecb 100644 --- a/dev-libs/dynolog/files/dynolog-0.3.1_p20230126-riscv.patch +++ b/dev-libs/dynolog/files/dynolog-0.3.1_p20230126-riscv.patch @@ -1,10 +1,10 @@ diff -Naur a/hbt/src/common/System.h b/hbt/src/common/System.h --- a/hbt/src/common/System.h 2024-01-21 15:26:26.940486370 +0000 +++ b/hbt/src/common/System.h 2024-01-21 22:22:36.713134358 +0000 -@@ -445,6 +445,14 @@ - asm volatile("mrs %0, cntvct_el0" : "=r"(tstamp)); +@@ -446,6 +446,14 @@ cpu = getCpu(); return tstamp; + } +#elif defined(__riscv) +inline TimeStamp rdtscp(CpuId& cpu) { + TimeStamp tstamp; @@ -12,7 +12,7 @@ diff -Naur a/hbt/src/common/System.h b/hbt/src/common/System.h + asm volatile("rdcycle %0" : "=r"(tstamp)); + cpu = getCpu(); + return tstamp; -+ - } ++} #endif + inline std::pair<TimeStamp, CpuId> rdtscp() { diff --git a/dev-libs/editline/editline-1.17.1.ebuild b/dev-libs/editline/editline-1.17.1.ebuild index eed9640bbec9..0bba672748cf 100644 --- a/dev-libs/editline/editline-1.17.1.ebuild +++ b/dev-libs/editline/editline-1.17.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,10 +10,6 @@ SRC_URI="https://github.com/troglobit/editline/releases/download/${PV}/${P}.tar. LICENSE="Apache-2.0" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="" -RDEPEND="" PATCHES=("${FILESDIR}"/${PN}-1.16.0-rename-man.patch) diff --git a/dev-libs/efl/efl-1.27.0.ebuild b/dev-libs/efl/efl-1.27.0-r1.ebuild index bdb7728d6180..8a4e34ebc62b 100644 --- a/dev-libs/efl/efl-1.27.0.ebuild +++ b/dev-libs/efl/efl-1.27.0-r1.ebuild @@ -49,7 +49,7 @@ RDEPEND="${LUA_DEPS} sys-apps/dbus sys-libs/zlib X? ( - !opengl? ( media-libs/mesa[egl(+),gles2] ) + !opengl? ( media-libs/libglvnd ) media-libs/freetype x11-libs/libX11 x11-libs/libXScrnSaver @@ -113,7 +113,8 @@ RDEPEND="${LUA_DEPS} vnc? ( net-libs/libvncserver ) wayland? ( dev-libs/wayland - media-libs/mesa[gles2,wayland] + media-libs/libglvnd + media-libs/mesa[wayland] x11-libs/libxkbcommon ) webp? ( media-libs/libwebp:= ) @@ -155,8 +156,6 @@ src_prepare() { src_configure() { local emesonargs=( - -Dbuildtype=plain - -D buffer=false -D build-tests=false -D cocoa=false diff --git a/dev-libs/ell/Manifest b/dev-libs/ell/Manifest index cf8f24448f98..fefe56e5c4eb 100644 --- a/dev-libs/ell/Manifest +++ b/dev-libs/ell/Manifest @@ -1,4 +1,3 @@ -DIST ell-0.58.tar.xz 564908 BLAKE2B 8c3d2913db05186b22315f8b9eb62c6009d64d0c30dba4da4eacd92ca3c675a0c6e11aa23b76af710691ef1cabc14dafa157708aa7793939d36eee467a7e543d SHA512 28f0d215d05ae67a9d5aaa0de6c54d2b69d847a6a3127bebabe504c63083937b07d7dfb498f946bd6a40b22387946557dc886591ef87a7d5b926084083146950 -DIST ell-0.61.tar.xz 565920 BLAKE2B 994a5b8b7eaffcf2274e1d020f54ce3f829a50de352a79744de156b59cb9f5b8db39adc53ab6f5728abd501a13815e58eac1c3359024bb22cd28e248a4b8f289 SHA512 0e57125a924ab4772c3c7ccf97040e416810bccd05ce8f0cb4525a4483f32eabc0f431fac3fff7afdc8bb0e145611b944e1f7fa8d10e6337fc7f97f190d9b0f8 DIST ell-0.62.tar.xz 567188 BLAKE2B f7539c5f6eac6150d10b317ec5c5296e2005130c34e43c60cb1ac758fd629b00de81da6ff816031c486986732a707e81eb71ec3dd9dbfafd1e7af53ffd73eca1 SHA512 f0019cddba737879f2567b0295ec4cdf8589b989fdaba70a885253140f742e67e33abfe25fabbf8ecfd5c61336ec9cfe359193e0579b9120a66b13e9593beabf -DIST ell-0.63.tar.xz 567344 BLAKE2B de007676bd7a53c16d7a373aaf4039947daf079efaae1a7185a8f2b2a53bd2a2dfc7dd5c24c2c1f37d539323f9413b21fe072f7d4099e144aa4e4c2efb42c06a SHA512 e91dd7be6a84c5f69351f34695919c93e9171608d9177d92ee2eb0d0a1e50504e554a94bd69b878b94612e535bab045eefb9a1da12790cdada2ec46bf780fe30 +DIST ell-0.64.tar.xz 567908 BLAKE2B 8f49441b0775626170a682d88c704292d2141fa7ad6427e410f96f0d863d60298178c4216194c575b83db1dc4c067665fdb89eb6af4afb17a93d1b47c0bcc2ab SHA512 21035965b6c9d5fced834b8ff232e3c2113ed2061c9e07a2e1a2acddd964e861dfa25d115b8a367e5c980ba7e356a557b750e1abd3f19bcc4456840157114928 +DIST ell-0.65.tar.xz 568172 BLAKE2B 5b8d776970666e7746f2461a06c0b005da34767a0eb41460f17fec18b523d6dbd9537cfc3dadde846984da89c95fc0a62cf69367831a6a1508d2e44b2cb16422 SHA512 b63623ba8c1ab747a2674c54af0dca2b18eba7ef453e585a66c522f0eca625d81f59d7b0cef25ab99da9816bd3c60020505e2ad208c76fe790623886c6691f39 diff --git a/dev-libs/ell/ell-0.61.ebuild b/dev-libs/ell/ell-0.61.ebuild deleted file mode 100644 index 367a5a212600..000000000000 --- a/dev-libs/ell/ell-0.61.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic linux-info - -DESCRIPTION="Embedded Linux Library provides core, low-level functionality for system daemons" -HOMEPAGE="https://git.kernel.org/pub/scm/libs/ell/ell.git" -if [[ "${PV}" == *9999 ]] ; then - inherit autotools git-r3 - EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git" -else - SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" -fi -LICENSE="LGPL-2.1+" -SLOT="0" - -IUSE="pie test" -RESTRICT="!test? ( test )" - -DEPEND="test? ( sys-apps/dbus )" - -CONFIG_CHECK=" - ~TIMERFD - ~EVENTFD - ~CRYPTO_USER_API - ~CRYPTO_USER_API_HASH - ~CRYPTO_MD5 - ~CRYPTO_SHA1 - ~KEY_DH_OPERATIONS -" - -src_prepare() { - default - sed -i -e "s#/tmp/ell-test-bus#/tmp/ell-test-bus-$(uuidgen)#" \ - unit/test-dbus*.c unit/dbus.conf || die - [[ "${PV}" == *9999 ]] && eautoreconf -} - -src_configure() { - append-cflags "-fsigned-char" #662694 - local myeconfargs=( - $(use_enable pie) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - - find "${ED}" -name "*.la" -delete || die -} diff --git a/dev-libs/ell/ell-0.63.ebuild b/dev-libs/ell/ell-0.64.ebuild index 966be50f1a4d..966be50f1a4d 100644 --- a/dev-libs/ell/ell-0.63.ebuild +++ b/dev-libs/ell/ell-0.64.ebuild diff --git a/dev-libs/ell/ell-0.58.ebuild b/dev-libs/ell/ell-0.65.ebuild index aaabc3bdf016..aaabc3bdf016 100644 --- a/dev-libs/ell/ell-0.58.ebuild +++ b/dev-libs/ell/ell-0.65.ebuild diff --git a/dev-libs/faxpp/faxpp-0.4-r2.ebuild b/dev-libs/faxpp/faxpp-0.4-r2.ebuild index 50aaf74f8139..ee47a0521254 100644 --- a/dev-libs/faxpp/faxpp-0.4-r2.ebuild +++ b/dev-libs/faxpp/faxpp-0.4-r2.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DESCRIPTION="Small, fast and conformant XML pull parser written in C" HOMEPAGE="http://faxpp.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" diff --git a/dev-libs/fcgi/fcgi-2.4.1_pre0910052249-r2.ebuild b/dev-libs/fcgi/fcgi-2.4.1_pre0910052249-r2.ebuild index e2d71c2c0bf6..5014a3d10407 100644 --- a/dev-libs/fcgi/fcgi-2.4.1_pre0910052249-r2.ebuild +++ b/dev-libs/fcgi/fcgi-2.4.1_pre0910052249-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="http://www.fastcgi.com/dist/fcgi-$(ver_cut 1-3)-SNAP-$(ver_cut 5).tar.g LICENSE="FastCGI" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="html" S="${WORKDIR}/${PN}-2.4.1-SNAP-0910052249" diff --git a/dev-libs/fddl/fddl-20111124-r2.ebuild b/dev-libs/fddl/fddl-20111124-r2.ebuild new file mode 100644 index 000000000000..681f180b4619 --- /dev/null +++ b/dev-libs/fddl/fddl-20111124-r2.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Free Decision Diagram Library" +HOMEPAGE="http://itval.sourceforge.net/ https://github.com/atomopawn/FDDL" +SRC_URI="https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DOCS=( AUTHORS ChangeLog INSTALL RELEASE ) + +PATCHES=( "${FILESDIR}/${P}-disambiguate-variable-name.patch" ) + +S="${WORKDIR}"/FDDL-master + +src_prepare() { + cmake_src_prepare + + # Remove references to files that were not shipped, + # prefer dynamic linking + sed -i \ + -e 's|unaryoperation.cpp||g' \ + -e 's|unaryoperation.h||g' \ + -e 's|binaryoperation.cpp||g' \ + -e 's|binaryoperation.h||g' \ + -e '/add_library/s/FDDL /FDDL SHARED /' \ + -e '/add_library/s/FDDL /FDDL SHARED /' \ + -e "/^install/s:DESTINATION lib:DESTINATION $(get_libdir):" \ + src/CMakeLists.txt || die + # Do not build tests that depend on above files + sed -i \ + {,tests/}CMakeLists.txt \ + -e '/test_unaryop/d' \ + -e '/test_binaryop/d' \ + || die +} diff --git a/dev-libs/fddl/files/fddl-20111124-disambiguate-variable-name.patch b/dev-libs/fddl/files/fddl-20111124-disambiguate-variable-name.patch new file mode 100644 index 000000000000..c357f0574d29 --- /dev/null +++ b/dev-libs/fddl/files/fddl-20111124-disambiguate-variable-name.patch @@ -0,0 +1,65 @@ +Disambiguate variable name from std::array. + +FAILED: tests/CMakeFiles/test_dynarray.dir/test_dynarray.cpp.o +/usr/bin/x86_64-pc-linux-gnu-g++ -O2 -pipe -march=x86-64 -mtune=generic -MD -MT tests/CMakeFiles/test_dynarray.dir/test_dynarray.cpp.o -MF tests/CMakeFiles/test_dynarray.dir/test_dynarray.cpp.o.d -o tests/CMakeFiles/test_dynarray.dir/test_dynarray.cpp.o -c /var/tmp/portage/dev-libs/fddl-20111124-r1/work/fddl-20111124/tests/test_dynarray.cpp +/var/tmp/portage/dev-libs/fddl-20111124-r1/work/fddl-20111124/tests/test_dynarray.cpp: In function ‘bool test_access()’: +/var/tmp/portage/dev-libs/fddl-20111124-r1/work/fddl-20111124/tests/test_dynarray.cpp:9:11: error: reference to ‘array’ is ambiguous + 9 | *(array[0])=50; + | ^~~~~ +In file included from /usr/lib/gcc/x86_64-pc-linux-gnu/13/include/g++-v13/bits/memory_resource.h:47, + from /usr/lib/gcc/x86_64-pc-linux-gnu/13/include/g++-v13/string:58, + from /usr/lib/gcc/x86_64-pc-linux-gnu/13/include/g++-v13/bits/locale_classes.h:40, + from /usr/lib/gcc/x86_64-pc-linux-gnu/13/include/g++-v13/bits/ios_base.h:41, + from /usr/lib/gcc/x86_64-pc-linux-gnu/13/include/g++-v13/ios:44, + from /usr/lib/gcc/x86_64-pc-linux-gnu/13/include/g++-v13/ostream:40, + from /usr/lib/gcc/x86_64-pc-linux-gnu/13/include/g++-v13/iostream:41, + from /var/tmp/portage/dev-libs/fddl-20111124-r1/work/fddl-20111124/tests/test_dynarray.cpp:1: +/usr/lib/gcc/x86_64-pc-linux-gnu/13/include/g++-v13/tuple:2005:45: note: candidates are: ‘template<class _Tp, long unsigned int _Nm> struct std::array’ + 2005 | template<typename _Tp, size_t _Nm> struct array; + | ^~~~~ +/var/tmp/portage/dev-libs/fddl-20111124-r1/work/fddl-20111124/tests/test_dynarray.cpp:6:15: note: ‘DynArray<int> array’ + 6 | DynArray<int> array; + | ^~~~~ + +diff -Nuar a/tests/test_dynarray.cpp b/tests/test_dynarray.cpp +--- a/tests/test_dynarray.cpp 2024-03-28 14:52:14.811666764 +0000 ++++ b/tests/test_dynarray.cpp 2024-03-28 14:51:55.379667423 +0000 +@@ -3,18 +3,18 @@ + + using namespace std; + +-DynArray<int> array; ++DynArray<int> test_array; + + bool test_access(){ +- *(array[0])=50; +- if (*(array[0]) != 50) ++ *(test_array[0])=50; ++ if (*(test_array[0]) != 50) + return false; + return true; + } + + bool test_extend(){ +- *(array[1024]) = 9999; +- if (*(array[1024]) != 9999) ++ *(test_array[1024]) = 9999; ++ if (*(test_array[1024]) != 9999) + return false; + return true; + } +@@ -23,12 +23,12 @@ + unsigned int fac = 1; + for (unsigned int i=1;i<11;i++){ + fac = fac * i; +- *(array[fac]) = i; ++ *(test_array[fac]) = i; + } + fac = 1; + for (unsigned int i=1; i<11;i++){ + fac = fac * i; +- if (*(array[fac]) != i){ ++ if (*(test_array[fac]) != i){ + return false; + } + } diff --git a/dev-libs/ferrisloki/ferrisloki-3.0.13-r2.ebuild b/dev-libs/ferrisloki/ferrisloki-3.0.13-r2.ebuild deleted file mode 100644 index 3fdf609652cb..000000000000 --- a/dev-libs/ferrisloki/ferrisloki-3.0.13-r2.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit flag-o-matic - -DESCRIPTION="Loki C++ library from Modern C++ Design" -HOMEPAGE="http://www.libferris.com/" -SRC_URI="mirror://sourceforge/witme/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux" -IUSE="static-libs" - -RDEPEND=" - >=dev-libs/libsigc++-2.6:2" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_prepare() { - default - - # derice this damn configure script - sed -i \ - -e '/^CFLAGS/{s: -O3 : :g;s:-Wl,-O1 -Wl,--hash-style=both::;}' \ - -e 's:-lstlport_gcc:-lstlport:' \ - configure || die - - # Fix building with libsigc++-2.6 - find -name '*.h' -exec sed -i '/sigc++\/object.h/d' {} + || die - find -name '*.hh' -exec sed -i '/sigc++\/object.h/d' {} + || die -} - -src_configure() { - append-cxxflags -std=c++11 - - econf \ - --disable-stlport \ - $(use_enable static-libs static) -} - -src_install() { - default - - # package provides .pc files - find "${D}" -name '*.la' -delete || die -} diff --git a/dev-libs/ferrisloki/ferrisloki-3.0.13-r3.ebuild b/dev-libs/ferrisloki/ferrisloki-3.0.13-r3.ebuild index 8dc40fd0ca57..cf5e9372e48a 100644 --- a/dev-libs/ferrisloki/ferrisloki-3.0.13-r3.ebuild +++ b/dev-libs/ferrisloki/ferrisloki-3.0.13-r3.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 @@ -7,11 +7,11 @@ inherit flag-o-matic autotools DESCRIPTION="Loki C++ library from Modern C++ Design" HOMEPAGE="https://data-room-software.org/libferris/" -SRC_URI="mirror://sourceforge/witme/${P}.tar.bz2" +SRC_URI="https://downloads.sourceforge.net/witme/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux" RDEPEND=">=dev-libs/libsigc++-2.6:2" DEPEND="${RDEPEND}" diff --git a/dev-libs/ffcall/ffcall-2.4-r1.ebuild b/dev-libs/ffcall/ffcall-2.4-r1.ebuild index cd0ba85f08fd..d36c133ead5f 100644 --- a/dev-libs/ffcall/ffcall-2.4-r1.ebuild +++ b/dev-libs/ffcall/ffcall-2.4-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit flag-o-matic +inherit flag-o-matic libtool MY_PV="libffcall-${PV}" @@ -40,6 +40,7 @@ src_prepare() { done default + elibtoolize } src_configure() { diff --git a/dev-libs/flatbuffers/Manifest b/dev-libs/flatbuffers/Manifest index 3a1f8f6e659e..080fa756df8b 100644 --- a/dev-libs/flatbuffers/Manifest +++ b/dev-libs/flatbuffers/Manifest @@ -1,2 +1 @@ DIST flatbuffers-24.3.25.gh.tar.gz 2297829 BLAKE2B f3a5a94119a1b1b63fba9126e1cdff7ab712996bfc0d65626a679405f62dfa722bc5de244ef775fba336224b60feff3aa27acf54bed027c4013590b4afbefe7c SHA512 e2a614f4fc526ce07bfe1e1bc79efd3c87acbdb93aee7b42994d4855abd2593f36b5ca1edb53c7dcd470d5fbe14a3e394bd75dcebb4458cc0aeb33d622a3c662 -DIST flatbuffers-24.3.7.gh.tar.gz 2296896 BLAKE2B 439d84a58ed169f6cd980388034f3dfaf53444dc4733b942aeeac24ed805dcf7c4348df8080fdbd899d2b4bc7f1ad75f546f8db3bcbb6fc942b75e2c3877331e SHA512 93541cbc6c1ba96beed77967d89693ebbc532664ee3b39eb9df9ec28871a3a0acb744b9c823afe6d3c480fe34e092306100e67f5b8fbed4432a875e87670019e diff --git a/dev-libs/flatbuffers/flatbuffers-24.3.25.ebuild b/dev-libs/flatbuffers/flatbuffers-24.3.25.ebuild index c03ba67b3e92..ead2e8a0a127 100644 --- a/dev-libs/flatbuffers/flatbuffers-24.3.25.ebuild +++ b/dev-libs/flatbuffers/flatbuffers-24.3.25.ebuild @@ -17,7 +17,7 @@ SRC_URI=" LICENSE="Apache-2.0" SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~riscv x86" IUSE="static-libs test" RESTRICT="!test? ( test )" diff --git a/dev-libs/flatbuffers/flatbuffers-24.3.7.ebuild b/dev-libs/flatbuffers/flatbuffers-24.3.7.ebuild deleted file mode 100644 index ead2e8a0a127..000000000000 --- a/dev-libs/flatbuffers/flatbuffers-24.3.7.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2024 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/folks/Manifest b/dev-libs/folks/Manifest index f63189255e12..aac6d5f6b23b 100644 --- a/dev-libs/folks/Manifest +++ b/dev-libs/folks/Manifest @@ -1,3 +1 @@ -DIST folks-0.15.6.tar.xz 497968 BLAKE2B bb9237fae05a748a18a85d29034e879947c4ffcc1d3dbe7277c8e1f41e6e9c9ec27170e9e7d2ccb6dcc89789d331f7f320648620636e1ee54685906fc67ba4f9 SHA512 8d77c3b4c963d88877798b24da9edd977b3ac4b18568ed75885fa87bf81e0e8f29dc8232352e3fefc0bf2c9bb8ca6cea984d87d946a3892963a158bd4f45dc30 -DIST folks-0.15.7.tar.xz 502128 BLAKE2B b93146b216dd31dbc07cf770130593f830c01568aff3424bf4d0d8588ac651ea225ed6d3b38b9855d82dbef168605145a3a3de49706dd2ab31a4d368636dddf0 SHA512 52657b45678aa2418a44b0c8d332ac207eff18b02ca5c0d1491bdf8bae6552f30f2b6435804adc2a5fa66997f2cea09bdfe399dfaf52f3d8b7a5bde11b137c35 DIST folks-0.15.9.tar.xz 506044 BLAKE2B e239c0ca3b51a5452620f5abaf37b34413b0a5ee867cc682214abd00c21d6375abf1a31755acd69360e47604c61572a63ffbe91f38485be1a83685a98aa34cd0 SHA512 8b1f0afaaf0907a9609863ec913eab75c7f60e3d1fd54e553fdb8d425f33cfb6043171bc5b7cc1dc66b1de702e1a8f5dd229c707d99af47dd3926ec0588c87fd diff --git a/dev-libs/folks/files/0.15.7-bluez-tests-dbusmock-0.30.1.patch b/dev-libs/folks/files/0.15.7-bluez-tests-dbusmock-0.30.1.patch deleted file mode 100644 index 7ab37e0b1bc2..000000000000 --- a/dev-libs/folks/files/0.15.7-bluez-tests-dbusmock-0.30.1.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 9c3212cd6c3f4157e1b9afa5c90d054de1418acf Mon Sep 17 00:00:00 2001 -From: Niels De Graef <ndegraef@redhat.com> -Date: Fri, 12 Jan 2024 22:57:42 +0100 -Subject: [PATCH] Revert "tests/bluez: Follow PairDevice() API change" - -This reverts commit b6b7d41aad9e36e0d0e6ec9822ed2e310923c8fd. - -See https://github.com/martinpitt/python-dbusmock/pull/192 ---- - tests/lib/bluez/backend.vala | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/lib/bluez/backend.vala b/tests/lib/bluez/backend.vala -index 72c688d3..023117e6 100644 ---- a/tests/lib/bluez/backend.vala -+++ b/tests/lib/bluez/backend.vala -@@ -39,7 +39,7 @@ namespace org - - [DBus (name = "PairDevice")] - public abstract void pair_device (string adapter_device_name, -- string device_address, int class_=5898764) throws GLib.Error; -+ string device_address) throws GLib.Error; - - [DBus (name = "BlockDevice")] - public abstract void block_device (string adapter_device_name, --- -GitLab - diff --git a/dev-libs/folks/files/folks-0.15.6-implicit-decl.patch b/dev-libs/folks/files/folks-0.15.6-implicit-decl.patch deleted file mode 100644 index f61d655343e4..000000000000 --- a/dev-libs/folks/files/folks-0.15.6-implicit-decl.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 127bacf86b7ef639c37dd07afc0bf848c005c3c2 Mon Sep 17 00:00:00 2001 -From: Mohammed Anas <triallax@tutanota.com> -Date: Sun, 14 Jan 2024 03:27:31 +0000 -Subject: [PATCH] build: add missing API declaration -include to dummy and EDS - backends - -In 7a9c8133468c1f8eb7fbb0e68a6a7e061b9452fb, the original -`-include redeclare-internal-api.h` was added for autotools. It is -necessary due to vala internals that require guaranteeing a private -ABI's prototype is available when compiling folks, even though vala -doesn't generate that prototype. - -During the port to meson, this `-include` was dropped. - -Without it, `-Werror=implicit-function-declaration` will cause folks to -fail to compile. Implicit function declarations are a terrible feature --- they were part of c89, but c99 removed them without a deprecation -because they were too dangerous to use, notable in a language that -doesn't like to remove features even *with* a deprecation. - -For over two decades, compilers have, by default, allowed this invalid C -anyways, on the grounds that it commonly existed, but modern compilers -are finally starting to enforce this. It will become a fatal error by -default in gcc 14, and clang 16. - -Folks got this right all the way back in 2013; it disappeared by -accident. Let's restore it as originally intended. ---- -Upstream: https://gitlab.gnome.org/GNOME/folks/-/merge_requests/68 - - backends/dummy/lib/meson.build | 1 + - backends/eds/lib/meson.build | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/backends/dummy/lib/meson.build b/backends/dummy/lib/meson.build -index 32448f35..eacc0e7a 100644 ---- a/backends/dummy/lib/meson.build -+++ b/backends/dummy/lib/meson.build -@@ -23,6 +23,7 @@ dummy_backendlib_vala_flags = [ - - dummy_backendlib_c_flags = [ - '-include', 'config.h', -+ '-include', 'folks/redeclare-internal-api.h', - '-DBACKEND_NAME="@0@"'.format(dummy_backend_name), - '-DG_LOG_DOMAIN="@0@"'.format(dummy_backend_name), - ] -diff --git a/backends/eds/lib/meson.build b/backends/eds/lib/meson.build -index 3e3db84c..68d803b3 100644 ---- a/backends/eds/lib/meson.build -+++ b/backends/eds/lib/meson.build -@@ -40,6 +40,7 @@ endif - - eds_backendlib_c_flags = [ - '-include', 'config.h', -+ '-include', 'folks/redeclare-internal-api.h', - '-DBACKEND_NAME="@0@"'.format(eds_backend_name), - '-DG_LOG_DOMAIN="@0@"'.format(eds_backend_name), - ] --- -GitLab - diff --git a/dev-libs/folks/folks-0.15.6-r1.ebuild b/dev-libs/folks/folks-0.15.6-r1.ebuild deleted file mode 100644 index a01a4476a16d..000000000000 --- a/dev-libs/folks/folks-0.15.6-r1.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) - -inherit gnome.org gnome2-utils meson python-any-r1 vala xdg - -DESCRIPTION="Library for aggregating people from multiple sources" -HOMEPAGE="https://wiki.gnome.org/Projects/Folks https://gitlab.gnome.org/GNOME/folks" - -LICENSE="LGPL-2.1+" -SLOT="0/26" # subslot = libfolks soname version -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x86-linux" - -IUSE="bluetooth eds telepathy test utils" -REQUIRED_USE="bluetooth? ( eds )" -RESTRICT="!test? ( test )" - -DEPEND=" - >=dev-libs/glib-2.58:2 - >=dev-libs/libgee-0.10:0.8[introspection] - >=dev-libs/gobject-introspection-1.54:= - telepathy? ( - >=net-libs/telepathy-glib-0.19.9 - dev-libs/dbus-glib - ) - eds? ( >=gnome-extra/evolution-data-server-3.38:= ) - dev-libs/libxml2:2 - utils? ( sys-libs/readline:0= ) -" -# telepathy-mission-control needed at runtime; it is used by the telepathy -# backend via telepathy-glib's AccountManager binding. -RDEPEND="${DEPEND} - bluetooth? ( >=net-wireless/bluez-5[obex] ) - telepathy? ( net-im/telepathy-mission-control ) -" -BDEPEND=" - ${PYTHON_DEPS} - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - $(vala_depend) - telepathy? ( net-libs/telepathy-glib[vala] ) - eds? ( gnome-extra/evolution-data-server[vala] ) - test? ( - sys-apps/dbus - bluetooth? ( - $(python_gen_any_dep ' - dev-python/python-dbusmock[${PYTHON_USEDEP}] - ') - ) - ) -" - -PATCHES=( - # implicit function declaration (Modern C porting): - # - https://bugs.gentoo.org/920098 - # - https://gitlab.gnome.org/GNOME/folks/-/merge_requests/68 - "${FILESDIR}"/folks-0.15.6-implicit-decl.patch -) - -python_check_deps() { - if use test && use bluetooth; then - python_has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]" - fi -} - -src_prepare() { - default - vala_setup - xdg_environment_reset -} - -src_configure() { - local emesonargs=( - $(meson_use bluetooth bluez_backend) - $(meson_use eds eds_backend) - $(meson_use eds ofono_backend) - $(meson_use telepathy telepathy_backend) - -Dzeitgeist=false # last rited package - -Dimport_tool=true - $(meson_use utils inspect_tool) - $(meson_use test tests) - -Dinstalled_tests=false - -Ddocs=false # Needs find_program sedding to specific version; only dev docs, don't bother - ) - meson_src_configure -} - -src_test() { - dbus-run-session meson test -C "${BUILD_DIR}" -t 5 -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} diff --git a/dev-libs/folks/folks-0.15.6.ebuild b/dev-libs/folks/folks-0.15.6.ebuild deleted file mode 100644 index 45afd5a484b8..000000000000 --- a/dev-libs/folks/folks-0.15.6.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) - -inherit gnome.org gnome2-utils meson python-any-r1 vala xdg - -DESCRIPTION="Library for aggregating people from multiple sources" -HOMEPAGE="https://wiki.gnome.org/Projects/Folks https://gitlab.gnome.org/GNOME/folks" - -LICENSE="LGPL-2.1+" -SLOT="0/26" # subslot = libfolks soname version -KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~x86-linux" - -IUSE="bluetooth eds telepathy test utils" -REQUIRED_USE="bluetooth? ( eds )" -RESTRICT="!test? ( test )" - -DEPEND=" - >=dev-libs/glib-2.58:2 - >=dev-libs/libgee-0.10:0.8[introspection] - >=dev-libs/gobject-introspection-1.54:= - telepathy? ( - >=net-libs/telepathy-glib-0.19.9 - dev-libs/dbus-glib - ) - eds? ( >=gnome-extra/evolution-data-server-3.38:= ) - dev-libs/libxml2:2 - utils? ( sys-libs/readline:0= ) -" -# telepathy-mission-control needed at runtime; it is used by the telepathy -# backend via telepathy-glib's AccountManager binding. -RDEPEND="${DEPEND} - bluetooth? ( >=net-wireless/bluez-5[obex] ) - telepathy? ( net-im/telepathy-mission-control ) -" -BDEPEND=" - ${PYTHON_DEPS} - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - $(vala_depend) - telepathy? ( net-libs/telepathy-glib[vala] ) - eds? ( gnome-extra/evolution-data-server[vala] ) - test? ( - sys-apps/dbus - bluetooth? ( - $(python_gen_any_dep ' - dev-python/python-dbusmock[${PYTHON_USEDEP}] - ') - ) - ) -" - -python_check_deps() { - if use test && use bluetooth; then - python_has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]" - fi -} - -src_prepare() { - default - vala_setup - xdg_environment_reset -} - -src_configure() { - local emesonargs=( - $(meson_use bluetooth bluez_backend) - $(meson_use eds eds_backend) - $(meson_use eds ofono_backend) - $(meson_use telepathy telepathy_backend) - -Dzeitgeist=false # last rited package - -Dimport_tool=true - $(meson_use utils inspect_tool) - $(meson_use test tests) - -Dinstalled_tests=false - -Ddocs=false # Needs find_program sedding to specific version; only dev docs, don't bother - ) - meson_src_configure -} - -src_test() { - dbus-run-session meson test -C "${BUILD_DIR}" -t 5 -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} diff --git a/dev-libs/folks/folks-0.15.7.ebuild b/dev-libs/folks/folks-0.15.7.ebuild deleted file mode 100644 index 321ca83f3284..000000000000 --- a/dev-libs/folks/folks-0.15.7.ebuild +++ /dev/null @@ -1,106 +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 gnome.org gnome2-utils meson python-any-r1 vala xdg - -DESCRIPTION="Library for aggregating people from multiple sources" -HOMEPAGE="https://wiki.gnome.org/Projects/Folks https://gitlab.gnome.org/GNOME/folks" - -LICENSE="LGPL-2.1+" -SLOT="0/26" # subslot = libfolks soname version -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x86-linux" - -IUSE="bluetooth eds telepathy test utils" -REQUIRED_USE="bluetooth? ( eds )" -RESTRICT="!test? ( test )" - -DEPEND=" - >=dev-libs/glib-2.58:2 - >=dev-libs/libgee-0.10:0.8[introspection] - >=dev-libs/gobject-introspection-1.54:= - telepathy? ( - >=net-libs/telepathy-glib-0.19.9 - dev-libs/dbus-glib - ) - eds? ( >=gnome-extra/evolution-data-server-3.38:= ) - dev-libs/libxml2:2 - utils? ( sys-libs/readline:0= ) -" -# telepathy-mission-control needed at runtime; it is used by the telepathy -# backend via telepathy-glib's AccountManager binding. -RDEPEND="${DEPEND} - bluetooth? ( >=net-wireless/bluez-5[obex] ) - telepathy? ( net-im/telepathy-mission-control ) -" -BDEPEND=" - ${PYTHON_DEPS} - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - $(vala_depend) - telepathy? ( net-libs/telepathy-glib[vala] ) - eds? ( gnome-extra/evolution-data-server[vala] ) - test? ( - sys-apps/dbus - bluetooth? ( - $(python_gen_any_dep ' - >=dev-python/python-dbusmock-0.30.1[${PYTHON_USEDEP}] - ') - ) - ) -" - -PATCHES=( - # implicit function declaration (Modern C porting): - # - https://bugs.gentoo.org/920098 - # - https://gitlab.gnome.org/GNOME/folks/-/merge_requests/68 - "${FILESDIR}"/folks-0.15.6-implicit-decl.patch - # Fix BluezBackend tests with python-dbusmock-0.30.1 and newer - "${FILESDIR}"/${PV}-bluez-tests-dbusmock-0.30.1.patch -) - -python_check_deps() { - if use test && use bluetooth; then - python_has_version ">=dev-python/python-dbusmock-0.30.1[${PYTHON_USEDEP}]" - fi -} - -src_prepare() { - default - vala_setup - xdg_environment_reset -} - -src_configure() { - local emesonargs=( - $(meson_use bluetooth bluez_backend) - $(meson_use eds eds_backend) - $(meson_use eds ofono_backend) - $(meson_use telepathy telepathy_backend) - -Dzeitgeist=false # last rited package - -Dimport_tool=true - $(meson_use utils inspect_tool) - $(meson_use test tests) - -Dinstalled_tests=false - -Ddocs=false # Needs find_program sedding to specific version; only dev docs, don't bother - ) - meson_src_configure -} - -src_test() { - # Avoid warnings when /etc/profile.d/flatpak.sh from flatpak modified XDG_DATA_DIRS - export XDG_DATA_DIRS="${EPREFIX}"/usr/share - dbus-run-session meson test -C "${BUILD_DIR}" -t 5 || die "tests failed" -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} diff --git a/dev-libs/folks/folks-0.15.9.ebuild b/dev-libs/folks/folks-0.15.9.ebuild index 9eec95007c6c..4bd9b6d1e108 100644 --- a/dev-libs/folks/folks-0.15.9.ebuild +++ b/dev-libs/folks/folks-0.15.9.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Folks https://gitlab.gnome.org/GNOME/f LICENSE="LGPL-2.1+" SLOT="0/26" # subslot = libfolks soname version -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x86-linux" +KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~x86-linux" IUSE="bluetooth eds telepathy test utils" REQUIRED_USE="bluetooth? ( eds )" diff --git a/dev-libs/foma/files/foma-0.10.0_p20220612-fix-incompatible-function-pointer-types.patch b/dev-libs/foma/files/foma-0.10.0_p20220612-fix-incompatible-function-pointer-types.patch new file mode 100644 index 000000000000..ca6e3c3a8f76 --- /dev/null +++ b/dev-libs/foma/files/foma-0.10.0_p20220612-fix-incompatible-function-pointer-types.patch @@ -0,0 +1,71 @@ +https://bugs.gentoo.org/930501 + +--- a/foma/sigma.c ++++ b/foma/sigma.c +@@ -338,8 +338,8 @@ struct ssort { + int number; + }; + +-int ssortcmp(struct ssort *a, struct ssort *b) { +- return(strcmp(a->symbol, b->symbol)); ++int ssortcmp(const void *a, const void *b) { ++ return(strcmp(((struct ssort*) a)->symbol, ((struct ssort*)b)->symbol)); + } + + struct sigma *sigma_copy(struct sigma *sigma) { +@@ -369,7 +369,6 @@ struct sigma *sigma_copy(struct sigma *sigma) { + /* and sorts the sigma based on the symbol string contents */ + + int sigma_sort(struct fsm *net) { +- int(*comp)() = ssortcmp; + int size, i, max, *replacearray; + struct ssort *ssort; + struct sigma *sigma; +@@ -387,7 +386,7 @@ int sigma_sort(struct fsm *net) { + } + } + max = i; +- qsort(ssort, max, sizeof(struct ssort), comp); ++ qsort(ssort, max, sizeof(struct ssort), ssortcmp); + replacearray = malloc(sizeof(int)*(size+3)); + for (i=0; i<max; i++) + replacearray[(ssort+i)->number] = i+3; +--- a/foma/structures.c ++++ b/foma/structures.c +@@ -46,20 +46,18 @@ void *fsm_get_option(unsigned long long option) { + return NULL; + } + +-int linesortcompin(struct fsm_state *a, struct fsm_state *b) { +- return (a->in - b->in); ++int linesortcompin(const void *a, const void *b) { ++ return (((struct fsm_state*)a)->in - ((struct fsm_state*)b)->in); + } + +-int linesortcompout(struct fsm_state *a, struct fsm_state *b) { +- return (a->out - b->out); ++int linesortcompout(const void *a, const void *b) { ++ return (((struct fsm_state*)a)->out - ((struct fsm_state*)b)->out); + } + + void fsm_sort_arcs(struct fsm *net, int direction) { + /* direction 1 = in, direction = 2, out */ + struct fsm_state *fsm; + int i, lasthead, numlines; +- int(*scin)() = linesortcompin; +- int(*scout)() = linesortcompout; + fsm = net->states; + for (i=0, numlines = 0, lasthead = 0 ; (fsm+i)->state_no != -1; i++) { + if ((fsm+i)->state_no != (fsm+i+1)->state_no || (fsm+i)->target == -1) { +@@ -70,9 +68,9 @@ void fsm_sort_arcs(struct fsm *net, int direction) { + if (numlines > 1) { + /* Sort, set numlines = 0 */ + if (direction == 1) +- qsort(fsm+lasthead, numlines, sizeof(struct fsm_state), scin); ++ qsort(fsm+lasthead, numlines, sizeof(struct fsm_state), linesortcompin); + else +- qsort(fsm+lasthead, numlines, sizeof(struct fsm_state), scout); ++ qsort(fsm+lasthead, numlines, sizeof(struct fsm_state), linesortcompout); + } + numlines = 0; + lasthead = i + 1; diff --git a/dev-libs/foma/foma-0.10.0_p20220612-r2.ebuild b/dev-libs/foma/foma-0.10.0_p20220612-r2.ebuild new file mode 100644 index 000000000000..c6d32f53c35d --- /dev/null +++ b/dev-libs/foma/foma-0.10.0_p20220612-r2.ebuild @@ -0,0 +1,43 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +MY_COMMIT="9e8c3df573015a26c84e113ba710ef3d57c8e777" + +DESCRIPTION="Multi-purpose finite-state toolkit" +HOMEPAGE="https://fomafst.github.io/ https://github.com/mhulden/foma" +SRC_URI="https://github.com/mhulden/foma/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/foma-${MY_COMMIT}" + +LICENSE="Apache-2.0" +SLOT="0/0.10" +KEYWORDS="~amd64 ~x86" + +BDEPEND="app-alternatives/yacc + app-alternatives/lex" +DEPEND="sys-libs/readline:= + sys-libs/zlib" +RDEPEND="${DEPEND}" + +CMAKE_USE_DIR="${WORKDIR}/foma-${MY_COMMIT}/foma" + +PATCHES=( + "${FILESDIR}"/foma-0.10.0-gcc-13-fixes.patch + "${FILESDIR}"/foma-0.10-0-fix-BOM_codes-initializer.patch + "${FILESDIR}"/foma-0.10.0_p20220612-fix-incompatible-function-pointer-types.patch +) + +src_test() { + local -x PATH="${BUILD_DIR}:${PATH}" + pushd foma/tests >/dev/null || die + ./run.sh || die + popd >/dev/null || die +} + +src_install() { + cmake_src_install + find "${D}" -name '*.a' -delete || die +} diff --git a/dev-libs/girara/girara-9999.ebuild b/dev-libs/girara/girara-9999.ebuild index 6b506349dbaa..5857ec363588 100644 --- a/dev-libs/girara/girara-9999.ebuild +++ b/dev-libs/girara/girara-9999.ebuild @@ -19,7 +19,7 @@ fi LICENSE="ZLIB" SLOT="0" -IUSE="doc libnotify test" +IUSE="doc test" RESTRICT="!test? ( test )" @@ -32,7 +32,6 @@ RDEPEND=" x11-libs/gdk-pixbuf >=x11-libs/gtk+-3.20:3 x11-libs/pango - libnotify? ( x11-libs/libnotify ) " # Tests are run under virtx DEPEND=" @@ -52,7 +51,6 @@ src_configure() { local -a emesonargs=( -Djson=enabled $(meson_feature doc docs) - $(meson_feature libnotify notify) ) meson_src_configure } diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest index 9e3c87a23426..0967ffcbbf05 100644 --- a/dev-libs/gjs/Manifest +++ b/dev-libs/gjs/Manifest @@ -1,3 +1 @@ -DIST gjs-1.78.1.tar.xz 654556 BLAKE2B 1d723ad2fd15e7ba6b9194cb90f0c0bc7b89c150604beb11ad95e1628ead2bea7ed8b423e1836736013a31e8ff8f3e2400458faa26dcc95d3a6dc36c65957583 SHA512 9a5d02bacbf82364cf5daa69d6613eb38ef34121eb350b2773b87cf1027ccc1b9905b651275fd71036817e710d834d356ee1cecac2f7c83ff571c39e98360286 -DIST gjs-1.78.4.tar.xz 655220 BLAKE2B 0adcc3d0cc88a36b94b2113a6d88ded9be7fa034392fa38abb9ac22a962fb8601a76b6c886500e48c40fbe8708b3164b1d403dd83cd4e77358a4a020e8c15632 SHA512 a402050cee011a84f0ebb6b1512a2e681e792cf559b3182ece0868e57191be64337d6683ebcb8a7ee89ba79c12947a8cbca85f015c6015d26901352b5255c2c4 DIST gjs-1.78.5.tar.xz 656168 BLAKE2B e1458d000998b66fda90e448ca487e591729e003c3e11a939dc474958b6de55783d41db8de5b243a329361f12acc15a8e84f4131650705becb046b68c54a24a2 SHA512 bb25e52dff53bfbde6d2329027d4ff68849740cf753da58f9bdf5a19ea7b029e2517d67978f461f16660dd1aa48b223798e9c0a24cde0ccb62060e4a0c83a02e diff --git a/dev-libs/gjs/gjs-1.78.1.ebuild b/dev-libs/gjs/gjs-1.78.1.ebuild deleted file mode 100644 index 805b43049029..000000000000 --- a/dev-libs/gjs/gjs-1.78.1.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic gnome.org meson virtualx - -DESCRIPTION="Javascript bindings for GNOME" -HOMEPAGE="https://wiki.gnome.org/Projects/Gjs https://gitlab.gnome.org/GNOME/gjs" - -LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )" -SLOT="0" -IUSE="+cairo examples readline sysprof test" -KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-libs/glib-2.66.0:2 - dev-libs/libffi:= - >=dev-libs/gobject-introspection-1.71.1:= - dev-lang/spidermonkey:115 - cairo? ( x11-libs/cairo[X,glib] ) - readline? ( sys-libs/readline:0= ) -" -DEPEND="${RDEPEND} - sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) - test? ( - sys-apps/dbus - >=x11-libs/gtk+-3.20:3[introspection] - ) -" -BDEPEND=" - virtual/pkgconfig -" - -src_configure() { - append-cppflags -DG_DISABLE_CAST_CHECKS - - # On musl, it's required that either gjs, pixman or gnome-shell to be built - # with a larger stack otherwise librsvg fails to render a particular SVG, as - # a result we fail to get gdm or gnome-shell running (greeted with a fail - # whale screen). The bug has been reported to librsvg. This is ideally just - # a temporary workaround until we understand what exactly needs a larger - # stack size, as it's not sufficient to do just librsvg. - # - # Please refer to: - # https://gitlab.gnome.org/GNOME/librsvg/-/issues/686 - # https://gitlab.gnome.org/GNOME/librsvg/-/issues/874 - # - # TODO: Find an actual fix instead of increasing the stack - use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152 - - # FIXME: add systemtap/dtrace support, like in glib:2 - local emesonargs=( - $(meson_feature cairo) - $(meson_feature readline) - $(meson_feature sysprof profiler) - -Dinstalled_tests=false - $(meson_use !test skip_dbus_tests) - $(meson_use !test skip_gtk_tests) - -Db_pch=True # TODO this has to go - ) - meson_src_configure -} - -src_test() { - virtx meson_src_test -} diff --git a/dev-libs/gjs/gjs-1.78.4.ebuild b/dev-libs/gjs/gjs-1.78.4.ebuild deleted file mode 100644 index f9d52d43c6ba..000000000000 --- a/dev-libs/gjs/gjs-1.78.4.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic gnome.org meson virtualx - -DESCRIPTION="Javascript bindings for GNOME" -HOMEPAGE="https://wiki.gnome.org/Projects/Gjs https://gitlab.gnome.org/GNOME/gjs" - -LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )" -SLOT="0" -IUSE="+cairo examples readline sysprof test" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-libs/glib-2.66.0:2 - dev-libs/libffi:= - >=dev-libs/gobject-introspection-1.71.1:= - dev-lang/spidermonkey:115 - cairo? ( x11-libs/cairo[X,glib] ) - readline? ( sys-libs/readline:0= ) -" -DEPEND="${RDEPEND} - sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) - test? ( - sys-apps/dbus - >=x11-libs/gtk+-3.20:3[introspection] - ) -" -BDEPEND=" - virtual/pkgconfig -" - -src_configure() { - append-cppflags -DG_DISABLE_CAST_CHECKS - - # On musl, it's required that either gjs, pixman or gnome-shell to be built - # with a larger stack otherwise librsvg fails to render a particular SVG, as - # a result we fail to get gdm or gnome-shell running (greeted with a fail - # whale screen). The bug has been reported to librsvg. This is ideally just - # a temporary workaround until we understand what exactly needs a larger - # stack size, as it's not sufficient to do just librsvg. - # - # Please refer to: - # https://gitlab.gnome.org/GNOME/librsvg/-/issues/686 - # https://gitlab.gnome.org/GNOME/librsvg/-/issues/874 - # - # TODO: Find an actual fix instead of increasing the stack - use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152 - - # FIXME: add systemtap/dtrace support, like in glib:2 - local emesonargs=( - $(meson_feature cairo) - $(meson_feature readline) - $(meson_feature sysprof profiler) - -Dinstalled_tests=false - $(meson_use !test skip_dbus_tests) - $(meson_use !test skip_gtk_tests) - -Db_pch=True # TODO this has to go - ) - meson_src_configure -} - -src_test() { - virtx meson_src_test -} diff --git a/dev-libs/gjs/gjs-1.78.5.ebuild b/dev-libs/gjs/gjs-1.78.5.ebuild index f9d52d43c6ba..0266c267beac 100644 --- a/dev-libs/gjs/gjs-1.78.5.ebuild +++ b/dev-libs/gjs/gjs-1.78.5.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Gjs https://gitlab.gnome.org/GNOME/gjs LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )" SLOT="0" IUSE="+cairo examples readline sysprof test" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv x86" RESTRICT="!test? ( test )" RDEPEND=" diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest index b5a930af82f4..c46b7e68014f 100644 --- a/dev-libs/glib/Manifest +++ b/dev-libs/glib/Manifest @@ -1,3 +1,4 @@ DIST glib-2.76.4.tar.xz 5274356 BLAKE2B c9ceb514ea81e1e6ab2d0efc82c48c0d8ae6c997fd0e3c56d47a5174b027f785b58266fff73b1d1132e272305126fbff22e3c65d47de46224cd12fa49796d5bc SHA512 f76932dc5090a44880373228e2b162f338415d06f7c90f2950eab1a43bb191c56a1797da4d377594f6a999197fef4defb848039259cfa4105bb68288a928f5b7 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 diff --git a/dev-libs/glib/glib-2.76.4.ebuild b/dev-libs/glib/glib-2.76.4.ebuild index 51da7bfa347f..356bd10b8796 100644 --- a/dev-libs/glib/glib-2.76.4.ebuild +++ b/dev-libs/glib/glib-2.76.4.ebuild @@ -217,7 +217,7 @@ multilib_src_test() { mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" - meson_src_test --timeout-multiplier 2 --no-suite flaky + meson_src_test --timeout-multiplier 20 --no-suite flaky } multilib_src_install() { diff --git a/dev-libs/glib/glib-2.78.3.ebuild b/dev-libs/glib/glib-2.78.3.ebuild index 51da7bfa347f..356bd10b8796 100644 --- a/dev-libs/glib/glib-2.78.3.ebuild +++ b/dev-libs/glib/glib-2.78.3.ebuild @@ -217,7 +217,7 @@ multilib_src_test() { mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" - meson_src_test --timeout-multiplier 2 --no-suite flaky + meson_src_test --timeout-multiplier 20 --no-suite flaky } multilib_src_install() { diff --git a/dev-libs/glib/glib-2.78.4-r1.ebuild b/dev-libs/glib/glib-2.78.4-r1.ebuild index 7bd791bf5334..f3dbbeb1f18b 100644 --- a/dev-libs/glib/glib-2.78.4-r1.ebuild +++ b/dev-libs/glib/glib-2.78.4-r1.ebuild @@ -16,7 +16,7 @@ IUSE="dbus debug +elf gtk-doc +mime selinux static-libs sysprof systemtap test u RESTRICT="!test? ( test )" REQUIRED_USE="gtk-doc? ( test )" # Bug #777636 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" # * elfutils (via libelf) does not build on Windows. gresources are not embedded # within ELF binaries on that platform anyway and inspecting ELF binaries from @@ -188,7 +188,7 @@ multilib_src_configure() { #fi local emesonargs=( - -Dbuildtype=$(usex debug debug plain) + $(meson_feature debug glib_debug) -Ddefault_library=$(usex static-libs both shared) -Druntime_dir="${EPREFIX}"/run $(meson_feature selinux) @@ -226,7 +226,7 @@ multilib_src_test() { mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" - meson_src_test --timeout-multiplier 2 --no-suite flaky + meson_src_test --timeout-multiplier 20 --no-suite flaky } multilib_src_install() { diff --git a/dev-libs/glib/glib-2.78.6.ebuild b/dev-libs/glib/glib-2.78.6.ebuild new file mode 100644 index 000000000000..339ee604f85f --- /dev/null +++ b/dev-libs/glib/glib-2.78.6.ebuild @@ -0,0 +1,320 @@ +# 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..12} ) + +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/" + +LICENSE="LGPL-2.1+" +SLOT="2" +IUSE="dbus debug +elf gtk-doc +mime selinux static-libs sysprof systemtap test utils xattr" +RESTRICT="!test? ( test )" +REQUIRED_USE="gtk-doc? ( test )" # Bug #777636 + +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + +# * 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-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}] + 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 + gtk-doc? ( >=dev-util/gtk-doc-1.33 + app-text/docbook-xml-dtd:4.2 + app-text/docbook-xml-dtd:4.5 ) + 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 +" +# 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}"/${PN}-2.78.4-distutils.patch +) + +python_check_deps() { + python_has_version "dev-python/packaging[${PYTHON_USEDEP}]" +} + +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 + + # 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 + + 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 + + local emesonargs=( + $(meson_feature debug glib_debug) + -Ddefault_library=$(usex static-libs both shared) + -Druntime_dir="${EPREFIX}"/run + $(meson_feature selinux) + $(meson_use xattr) + -Dlibmount=enabled # only used if host_system == 'linux' + -Dman=true + $(meson_use systemtap dtrace) + $(meson_use systemtap) + $(meson_feature sysprof) + $(meson_native_use_bool gtk-doc gtk_doc) + $(meson_use test tests) + -Dinstalled_tests=false + -Dnls=enabled + -Doss_fuzz=disabled + $(meson_native_use_feature elf libelf) + -Dmultiarch=false + ) + meson_src_configure +} + +multilib_src_test() { + export XDG_CONFIG_DIRS=/etc/xdg + export XDG_DATA_DIRS=/usr/local/share:/usr/share + 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 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" + chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" + + 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 + } + multilib_foreach_abi multilib_pkg_postrm + rm -f "${EROOT}"/usr/share/glib-2.0/schemas/gschemas.compiled + fi +} diff --git a/dev-libs/gmime/Manifest b/dev-libs/gmime/Manifest index c5c32b61bb00..f608314fdb57 100644 --- a/dev-libs/gmime/Manifest +++ b/dev-libs/gmime/Manifest @@ -1,3 +1,2 @@ DIST gmime-2.6.23.tar.xz 5216588 BLAKE2B e173a7dbd418663ebbc55b856359bf9286c3791827f9b7f89da48dd7c3609e77312546f9489c08d34a7dcaeb78659789809d5fafc1323cbae9b9f1c4a316c659 SHA512 2ff6718b7a555cd5b34848399f29c7d0aa5a15e1f3cb46e9258c499e874191ee00f41b737386805d3000bad34367d174a25c45d38ba90cba7902400e733afa14 -DIST gmime-3.2.13.tar.xz 2231624 BLAKE2B c1b4af7ea911c6e2cdea01700d76d218028f7a7f3fc0443b15f915658f945b0fd784928eaa572b0a4b1cd2ea6f7b2812de75f066e3dd2bef23ebd4075a393ee9 SHA512 cfbf5d9e8d6cafcb340b6e470acaf7ae0a96581d39119a751b22fcf3ede089cc24accbd26a79ec2a4b7901ce66d7092765e8c388bbfa2138606dbb4b3f81f4d3 DIST gmime-3.2.14.tar.xz 2231340 BLAKE2B bbe147151349c626d92890783a3fccd4b1156b5a9fc305812447f28ec34d5d7694a702f99865ad5ef41737eb4e0d0c08d879e4525f58c272972531c51d436fd6 SHA512 d6127a8567f96784b3f975452cd43a4ef6c8921845feb11974f785576f7ef138f25d20d0f309022893ca445fffb000b4dc98bf65ff3a781ececd5c16b1f0e9c6 diff --git a/dev-libs/gmime/gmime-3.2.13.ebuild b/dev-libs/gmime/gmime-3.2.13.ebuild deleted file mode 100644 index 209667ccf128..000000000000 --- a/dev-libs/gmime/gmime-3.2.13.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic gnome2 vala - -DESCRIPTION="Library for creating and parsing MIME messages" -HOMEPAGE="https://github.com/jstedfast/gmime http://spruce.sourceforge.net/gmime/" -SRC_URI="https://github.com/jstedfast/${PN}/releases/download/${PV}/${P}.tar.xz" - -SLOT="3.0" -LICENSE="LGPL-2.1+" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="crypt doc idn test +vala" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-libs/glib-2.68.0:2 - sys-libs/zlib - crypt? ( >=app-crypt/gpgme-1.8.0:= ) - idn? ( net-dns/libidn2:= ) - vala? ( - $(vala_depend) - >=dev-libs/gobject-introspection-1.30.0:= - ) -" -DEPEND="${RDEPEND} - virtual/libiconv -" -BDEPEND=" - >=dev-build/gtk-doc-am-1.8 - virtual/pkgconfig - doc? ( app-text/docbook-sgml-utils ) -" - -src_prepare() { - gnome2_src_prepare - use vala && vala_setup -} - -src_configure() { - if [[ ${CHOST} == *-solaris* ]]; then - # bug #???, why not use --with-libiconv - append-libs iconv - fi - - gnome2_src_configure \ - --enable-largefile \ - $(use_enable crypt crypto) \ - $(use_enable vala) \ - $(use_with idn libidn) \ - $(usex doc "" DB2HTML=) -} - -src_compile() { - gnome2_src_compile - if use doc; then - emake -C docs/tutorial html - fi -} - -src_install() { - gnome2_src_install - - if use doc ; then - docinto tutorial - dodoc -r docs/tutorial/html/ - fi -} diff --git a/dev-libs/gmime/gmime-3.2.14.ebuild b/dev-libs/gmime/gmime-3.2.14.ebuild index 85c6cca0193c..209667ccf128 100644 --- a/dev-libs/gmime/gmime-3.2.14.ebuild +++ b/dev-libs/gmime/gmime-3.2.14.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/jstedfast/${PN}/releases/download/${PV}/${P}.tar.xz" SLOT="3.0" LICENSE="LGPL-2.1+" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="crypt doc idn test +vala" RESTRICT="!test? ( test )" diff --git a/dev-libs/half/metadata.xml b/dev-libs/half/metadata.xml index e74d41fd607c..b71bc2af0234 100644 --- a/dev-libs/half/metadata.xml +++ b/dev-libs/half/metadata.xml @@ -12,4 +12,7 @@ <email>xgreenlandforwyy@gmail.com</email> <name>Yiyang Wu</name> </maintainer> + <upstream> + <remote-id type="github">ROCm/half</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-libs/hiredict/Manifest b/dev-libs/hiredict/Manifest new file mode 100644 index 000000000000..2f0539354c7c --- /dev/null +++ b/dev-libs/hiredict/Manifest @@ -0,0 +1 @@ +DIST hiredict-1.3.1.tar.gz 118800 BLAKE2B 8d051ff9aa0f3f50acca96fa85c40369665769f4ddc2d5275eb19a279196a5ec571f6099f32b820447cdf89c95f88a0350ca70ed58acedfce82bd4d3cd41ded4 SHA512 208672d4dbdcc8bf21cff494ea2191b97b9d67b2c4b5a4f94e2c165613315b28b09e9e03de0495a069320df671e3f9d22a43209f175c2aae71550b0d832c0112 diff --git a/dev-libs/hiredict/files/hiredict-1.3.1-disable-network-tests.patch b/dev-libs/hiredict/files/hiredict-1.3.1-disable-network-tests.patch new file mode 100644 index 000000000000..94562b57e3ad --- /dev/null +++ b/dev-libs/hiredict/files/hiredict-1.3.1-disable-network-tests.patch @@ -0,0 +1,16 @@ +diff --git a/test.c b/test.c +index 48d53e9..91bc794 100644 +--- a/test.c ++++ b/test.c +@@ -2459,9 +2467,11 @@ int main(int argc, char **argv) { + } + #endif /* HIREDICT_TEST_ASYNC */ + ++#if 0 + cfg.type = CONN_TCP; + printf("\nTesting asynchronous API using polling_adapter TCP (%s:%d):\n", cfg.tcp.host, cfg.tcp.port); + test_async_polling(cfg); ++#endif + if (test_unix_socket) { + cfg.type = CONN_UNIX; + printf("\nTesting asynchronous API using polling_adapter UNIX (%s):\n", cfg.unix_sock.path); diff --git a/dev-libs/hiredict/hiredict-1.3.1.ebuild b/dev-libs/hiredict/hiredict-1.3.1.ebuild new file mode 100644 index 000000000000..bd7927c958a2 --- /dev/null +++ b/dev-libs/hiredict/hiredict-1.3.1.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="Minimalistic C client library for the Redict database" +HOMEPAGE="https://codeberg.org/redict/hiredict" +SRC_URI="https://codeberg.org/redict/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +S=${WORKDIR}/${PN} + +LICENSE="BSD LGPL-3" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64" +IUSE="shim ssl static-libs test" +RESTRICT="!test? ( test )" + +DEPEND=" + ssl? ( dev-libs/openssl:= ) + shim? ( !dev-libs/hiredis ) +" +RDEPEND="${DEPEND}" +BDEPEND=" + test? ( + dev-db/redict + dev-libs/libevent + ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-1.3.1-disable-network-tests.patch +) + +_build() { + tc-export AR CC + local myconf=( + AR="${AR}" + CC="${CC}" + CFLAGS="${CFLAGS}" + LDFLAGS="${LDFLAGS}" + DESTDIR="${ED}" + PREFIX="/usr" + LIBRARY_PATH="$(get_libdir)" + USE_SSL=$(usex ssl 1 0) + TEST_ASYNC=$(usex test 1 0) + DEBUG_FLAGS= + OPTIMIZATION= + USE_WERROR=0 + ) + emake "${myconf[@]}" "$@" +} + +src_compile() { + # The static lib re-uses the same objects as the shared lib, so + # overhead is low w/creating it all the time. It's also needed + # by the tests. + _build dynamic static hiredict{,_ssl}.pc +} + +src_test() { + # Compare with https://codeberg.org/redict/hiredict/src/tag/1.3.1/Makefile#L37 + local REDICT_PID="${T}"/hiredict.pid + local REDICT_SOCK="${T}"/hiredict.sock + local REDICT_PORT=56379 + local REDICT_TEST_CONFIG=" + daemonize yes + pidfile ${REDICT_PID} + port ${REDICT_PORT} + bind 127.0.0.1 + unixsocket //${REDICT_SOCK} + " + + _build hiredict-test + + "${EPREFIX}"/usr/bin/redict-server - <<< "${REDICT_TEST_CONFIG}" || die + ./hiredict-test -h 127.0.0.1 -p ${REDICT_PORT} -s ${REDICT_SOCK} + local ret=$? + + kill "$(<"${REDICT_PID}")" || die + [[ ${ret} != "0" ]] && die "tests failed" +} + +src_install() { + _build install + + if ! use static-libs ; then + find "${ED}" -name '*.a' -delete || die + fi + + if ! use shim; then + find "${ED}" -type d -name 'hiredis' -exec rm -r {} + || die + find "${ED}" -name 'hiredis*.pc' -delete || die + fi +} diff --git a/dev-libs/hiredict/metadata.xml b/dev-libs/hiredict/metadata.xml new file mode 100644 index 000000000000..8184c9d384cc --- /dev/null +++ b/dev-libs/hiredict/metadata.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person" proxied="yes"> + <email>navi@vlhl.dev</email> + <name>Anna (navi) Figueiredo Gomes</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <slots> + <subslots>Reflect ABI of libhiredict.so.</subslots> + </slots> + <upstream> + <remote-id type="codeberg">redict/hiredict</remote-id> + </upstream> + <use> + <flag name="shim"> + Install header shims for the hiredis api. + </flag> + </use> +</pkgmetadata> diff --git a/dev-libs/hiredis/Manifest b/dev-libs/hiredis/Manifest index 171a4ffec6a0..54d9108948d7 100644 --- a/dev-libs/hiredis/Manifest +++ b/dev-libs/hiredis/Manifest @@ -1,2 +1,3 @@ DIST hiredis-1.0.2.tar.gz 98139 BLAKE2B 86d872cfec3d4e925d5d68e4f4faf1301aa6d706bd0406a8080471e14afc2c25db13b9a0937d29baccd457611af8e46922b5379183c7470c9ae1860aac3af096 SHA512 86497a1c21869bbe535378885eee6dbd594ef96325966511a3513f81e501af0f5ac7fed864f3230372f3ac7a23c05bad477fa5aa90b9747c9fb1408028174f9b DIST hiredis-1.1.0.tar.gz 122002 BLAKE2B 74c23816e59ea241c68640f99970ae68536a1cd605ac1a7146bf52e355f5f74b3d39fb81be02741cf776c06b47b9d5acc7ec66bfdcf802dec3ed68fb28a82b1b SHA512 9dad012c144ed24de6aa413a3a10d19a9d0d9ece18dbc388406cd86c5b98cb66c76c586cb559c601ed13a75051d8921dc2882534cc3605513fde47d57276c3bb +DIST hiredis-1.2.0.tar.gz 126216 BLAKE2B 3f0b74205fb4ceb42fb4c1700a9bf95cf2ad2d9880ee1f2da9cbed6096cde5e918b01465ce9d6ec1b29b5934cfa6ab41000ed344a9983cebe6bd1bf64ac0ede1 SHA512 f8984abb29c09e7e6b56e656616c5155f36c53da4161a2d4c85688486411cadcdf20aa1adb9bda208c500b401c750871be1c8d58ba9df5328634d00e9d1b6589 diff --git a/dev-libs/hiredis/files/hiredis-1.1.0-disable-network-tests.patch b/dev-libs/hiredis/files/hiredis-1.1.0-disable-network-tests.patch new file mode 100644 index 000000000000..0bfc281757f8 --- /dev/null +++ b/dev-libs/hiredis/files/hiredis-1.1.0-disable-network-tests.patch @@ -0,0 +1,19 @@ +Gentoo specific patch which disables test requiring non-localhost IP +address. + +diff --git a/test.c b/test.c +index c1065ff..ca21c30 100644 +--- a/test.c ++++ b/test.c +@@ -2151,7 +2151,7 @@ static void test_async_polling(struct config config) { + assert(astest.ac == NULL); + test_cond(astest.disconnect_status == REDIS_OK); + +- if (config.type == CONN_TCP || config.type == CONN_SSL) { ++ if (0) { /* disabled because of blackhole ip */ + /* timeout can only be simulated with network */ + test("Async connect timeout: "); + config.tcp.host = "192.168.254.254"; /* blackhole ip */ +-- +2.43.2 + diff --git a/dev-libs/hiredis/files/hiredis-1.2.0-conditional-werror.patch b/dev-libs/hiredis/files/hiredis-1.2.0-conditional-werror.patch new file mode 100644 index 000000000000..2ab7cf86e089 --- /dev/null +++ b/dev-libs/hiredis/files/hiredis-1.2.0-conditional-werror.patch @@ -0,0 +1,24 @@ +From bff171c9fc83f8abed9a283a3da2dc91a5671419 Mon Sep 17 00:00:00 2001 +From: Romain Geissler <romain.geissler@amadeus.com> +Date: Thu, 13 Jul 2023 12:39:45 +0000 +Subject: [PATCH] Allow disabling the -Werror flag. + +Upstream-commit: https://github.com/redis/hiredis/commit/bff171c9fc83f8abed9a283a3da2dc91a5671419 + +diff --git a/Makefile b/Makefile +index bd2106b1d..56e3d59be 100644 +--- a/Makefile ++++ b/Makefile +@@ -39,7 +39,11 @@ export REDIS_TEST_CONFIG + CC:=$(shell sh -c 'type $${CC%% *} >/dev/null 2>/dev/null && echo $(CC) || echo gcc') + CXX:=$(shell sh -c 'type $${CXX%% *} >/dev/null 2>/dev/null && echo $(CXX) || echo g++') + OPTIMIZATION?=-O3 +-WARNINGS=-Wall -Wextra -Werror -Wstrict-prototypes -Wwrite-strings -Wno-missing-field-initializers ++WARNINGS=-Wall -Wextra -Wstrict-prototypes -Wwrite-strings -Wno-missing-field-initializers ++USE_WERROR?=1 ++ifeq ($(USE_WERROR),1) ++ WARNINGS+=-Werror ++endif + DEBUG_FLAGS?= -g -ggdb + REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CPPFLAGS) $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS) $(PLATFORM_FLAGS) + REAL_LDFLAGS=$(LDFLAGS) diff --git a/dev-libs/hiredis/hiredis-1.0.2-r3.ebuild b/dev-libs/hiredis/hiredis-1.0.2-r3.ebuild index b990a555460f..178cf593343d 100644 --- a/dev-libs/hiredis/hiredis-1.0.2-r3.ebuild +++ b/dev-libs/hiredis/hiredis-1.0.2-r3.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=7 @@ -66,7 +66,7 @@ src_test() { _build hiredis-test "${EPREFIX}"/usr/sbin/redis-server - <<< "${REDIS_TEST_CONFIG}" || die - ./hiredis-test -h 127.0.0.1 -p ${REDIS_PID} -s ${REDIS_SOCK} + ./hiredis-test -h 127.0.0.1 -p ${REDIS_PORT} -s ${REDIS_SOCK} local ret=$? kill "$(<"${REDIS_PID}")" || die diff --git a/dev-libs/hiredis/hiredis-1.1.0-r1.ebuild b/dev-libs/hiredis/hiredis-1.1.0-r1.ebuild index 193ec8133864..00de629c89c3 100644 --- a/dev-libs/hiredis/hiredis-1.1.0-r1.ebuild +++ b/dev-libs/hiredis/hiredis-1.1.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 @@ -13,7 +13,7 @@ LICENSE="BSD" # Always check "Upgrading from ..." in README # e.g. https://github.com/redis/hiredis#upgrading-to-110 SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-solaris" IUSE="examples ssl static-libs test" RESTRICT="!test? ( test )" @@ -27,7 +27,7 @@ BDEPEND=" " PATCHES=( - "${FILESDIR}"/${PN}-1.0.0-disable-network-tests.patch + "${FILESDIR}"/${PN}-1.1.0-disable-network-tests.patch ) src_prepare() { @@ -73,7 +73,7 @@ src_test() { _build hiredis-test "${EPREFIX}"/usr/sbin/redis-server - <<< "${REDIS_TEST_CONFIG}" || die - ./hiredis-test -h 127.0.0.1 -p ${REDIS_PID} -s ${REDIS_SOCK} + ./hiredis-test -h 127.0.0.1 -p ${REDIS_PORT} -s ${REDIS_SOCK} local ret=$? kill "$(<"${REDIS_PID}")" || die diff --git a/dev-libs/hiredis/hiredis-1.2.0.ebuild b/dev-libs/hiredis/hiredis-1.2.0.ebuild new file mode 100644 index 000000000000..10071f0716a4 --- /dev/null +++ b/dev-libs/hiredis/hiredis-1.2.0.ebuild @@ -0,0 +1,92 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="Minimalistic C client library for the Redis database" +HOMEPAGE="https://github.com/redis/hiredis" +SRC_URI="https://github.com/redis/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +# Always check "Upgrading from ..." in README +# e.g. https://github.com/redis/hiredis#upgrading-to-110 +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-solaris" +IUSE="examples ssl static-libs test" +RESTRICT="!test? ( test )" + +DEPEND="ssl? ( dev-libs/openssl:= )" +RDEPEND="${DEPEND}" +BDEPEND=" + test? ( + dev-db/redis + dev-libs/libevent + ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-1.1.0-disable-network-tests.patch + "${FILESDIR}"/${PN}-1.2.0-conditional-werror.patch # bug 930336 +) + +_build() { + local myconf=( + AR="$(tc-getAR)" + CC="$(tc-getCC)" + PREFIX="${EPREFIX}/usr" + LIBRARY_PATH="$(get_libdir)" + USE_SSL=$(usex ssl 1 0) + TEST_ASYNC=$(usex test 1 0) + DEBUG_FLAGS= + OPTIMIZATION= + USE_WERROR=0 + ) + emake "${myconf[@]}" "$@" +} + +src_compile() { + # The static lib re-uses the same objects as the shared lib, so + # overhead is low w/creating it all the time. It's also needed + # by the tests. + _build dynamic static hiredis{,_ssl}.pc +} + +src_test() { + # Compare with https://github.com/redis/hiredis/blob/648763c36e9f6493b13a77da35eb33ef0652b4e2/Makefile#L32 + local REDIS_PID="${T}"/hiredis.pid + local REDIS_SOCK="${T}"/hiredis.sock + local REDIS_PORT=56379 + local REDIS_TEST_CONFIG=" + daemonize yes + pidfile ${REDIS_PID} + port ${REDIS_PORT} + bind 127.0.0.1 + unixsocket //${REDIS_SOCK} + " + + _build hiredis-test + + "${EPREFIX}"/usr/sbin/redis-server - <<< "${REDIS_TEST_CONFIG}" || die + ./hiredis-test -h 127.0.0.1 -p ${REDIS_PORT} -s ${REDIS_SOCK} + local ret=$? + + kill "$(<"${REDIS_PID}")" || die + [[ ${ret} != "0" ]] && die "tests failed" +} + +src_install() { + _build PREFIX="${ED}/usr" install + + if ! use static-libs ; then + find "${ED}" -name '*.a' -delete || die + fi + + insinto /usr/$(get_libdir)/pkgconfig + doins ${PN}.pc + + local DOCS=( CHANGELOG.md README.md ) + use examples && DOCS+=( examples ) + einstalldocs +} diff --git a/dev-libs/http-fetcher/http-fetcher-1.1.0-r2.ebuild b/dev-libs/http-fetcher/http-fetcher-1.1.0-r2.ebuild index 97ad5484327a..f8a27b05eb80 100644 --- a/dev-libs/http-fetcher/http-fetcher-1.1.0-r2.ebuild +++ b/dev-libs/http-fetcher/http-fetcher-1.1.0-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -9,7 +9,7 @@ MY_P="${P/-/_}" DESCRIPTION="Library for downloading files via HTTP using the GET method" HOMEPAGE="http://http-fetcher.sourceforge.net" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${MY_P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" diff --git a/dev-libs/http-fetcher/metadata.xml b/dev-libs/http-fetcher/metadata.xml index d43c15f4310e..954ebaf0701a 100644 --- a/dev-libs/http-fetcher/metadata.xml +++ b/dev-libs/http-fetcher/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>monsieurp@gentoo.org</email> - <name>Patrice Clement</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="sourceforge">http-fetcher</remote-id> </upstream> diff --git a/dev-libs/hyperscan/Manifest b/dev-libs/hyperscan/Manifest deleted file mode 100644 index 92924af20c50..000000000000 --- a/dev-libs/hyperscan/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST hyperscan-5.4.2.tar.gz 1848851 BLAKE2B a4539df7c6a4b5f097effa67bc777c37ff02aae356953acd4ffe871f621c556f6357c37ad813db144ed50af21881838946b7cb5ef9ea345412de908b84497dac SHA512 328f21133161d16b36ebdc7f8b80a7afe7ca9e7e7433348e9bfa9acb5f3641522e8314beea1b219891f4e95f1392ff8036ebb87780fe808b8b4bd15a535e9509 diff --git a/dev-libs/hyperscan/hyperscan-5.4.2.ebuild b/dev-libs/hyperscan/hyperscan-5.4.2.ebuild deleted file mode 100644 index 7c6fac198c94..000000000000 --- a/dev-libs/hyperscan/hyperscan-5.4.2.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) - -inherit cmake flag-o-matic python-any-r1 - -DESCRIPTION="High-performance regular expression matching library" -SRC_URI="https://github.com/intel/hyperscan/archive/v${PV}.tar.gz -> ${P}.tar.gz" -HOMEPAGE=" - https://www.hyperscan.io/ - https://github.com/intel/hyperscan -" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="-* amd64 x86" -IUSE="cpu_flags_x86_avx2 cpu_flags_x86_ssse3" - -RDEPEND="dev-libs/boost:=" -DEPEND="${RDEPEND}" -BDEPEND=" - ${PYTHON_DEPS} - dev-util/ragel -" - -# We can't default this to on as it's against the expectation of -# how CPU_FLAGS_* work for users. -REQUIRED_USE="cpu_flags_x86_ssse3" - -src_prepare() { - # Respect user -O flags - sed -i '/set(OPT_CX*_FLAG/d' CMakeLists.txt || die - - # upstream workaround - append-cxxflags -Wno-redundant-move - cmake_src_prepare -} - -src_configure() { - use cpu_flags_x86_ssse3 && append-flags -mssse3 - use cpu_flags_x86_avx2 && append-flags -mavx2 - - local mycmakeargs=( - -DBUILD_SHARED_LIBS=ON - -DBUILD_STATIC_AND_SHARED=OFF - -DBUILD_EXAMPLES=OFF - -DFAT_RUNTIME=false - ) - cmake_src_configure -} - -src_test() { - "${BUILD_DIR}"/bin/unit-hyperscan || die -} - -pkg_postinst() { - if has_version '<mail-filter/rspamd-3.5'; then - elog "There is known issue with <mail-filter/rspamd-3.5 when hyperscan version changes." - elog "Known workaround is to remove hyperscan databases ${EROOT}/var/lib/rspamd/*.hs*" - elog "See https://github.com/rspamd/rspamd/issues/4409 for more information." - fi -} diff --git a/dev-libs/hyphen/hyphen-2.8.8-r2.ebuild b/dev-libs/hyphen/hyphen-2.8.8-r2.ebuild index f53aaa413168..cdc8be439f21 100644 --- a/dev-libs/hyphen/hyphen-2.8.8-r2.ebuild +++ b/dev-libs/hyphen/hyphen-2.8.8-r2.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DESCRIPTION="ALTLinux hyphenation library" HOMEPAGE="https://hunspell.github.io/" -SRC_URI="mirror://sourceforge/hunspell/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/hunspell/${P}.tar.gz" LICENSE="GPL-2 LGPL-2.1 MPL-1.1" SLOT="0" diff --git a/dev-libs/hyprlang/Manifest b/dev-libs/hyprlang/Manifest index a94df3b903d0..6e10a09ae087 100644 --- a/dev-libs/hyprlang/Manifest +++ b/dev-libs/hyprlang/Manifest @@ -1,2 +1,3 @@ DIST hyprlang-0.4.2.gh.tar.gz 54441 BLAKE2B f87c91ba86fa1e7af1d895d00f537fdd3f3c379a4dd06761cd9bf032b751ee69d9a46863b823aa42cf8d4c0e7e07f543ee583f7ac4978911374f34cce640ff72 SHA512 4e98fa369130f4453d270053d5b3a36587ab77b2948125cffab59ac00267ea43aa5368d177e5862ef57a3c8471ad290889b83cf82ad08fcf35872172ee128963 DIST hyprlang-0.5.0.gh.tar.gz 54809 BLAKE2B d5d83188b4cce021901182d94bcc6466949e6504053217cbf3324f7362e8a9d7cef2040949a172a35b41d9c0de981618d343edd21a70ab8a8005b573f5799e05 SHA512 9e80b936d977d46f9c1a0fc4733c89fb1cf521c767295891427f1ab358f8373839db3fad823f8abfca9d344350813361504f70aa3f6e109b523ab8ec2c3fa833 +DIST hyprlang-0.5.1.gh.tar.gz 56237 BLAKE2B 1d93362d4e121dc0d6e18d27456be71bed088d79646a92a74e41af7ebefd511cef05c12034eb679fd1849c3c95e50e425a52a42da75f274bf39d2956d6bd6d5e SHA512 92bf1e79c41c33e09de25f45e8abfe753736521be06fee298875a68072761bf0254d06d2d312a12b2ae750d8710f50d1666f1b3fbbb95c338398f2b9e80ce454 diff --git a/dev-libs/hyprlang/hyprlang-0.5.0.ebuild b/dev-libs/hyprlang/hyprlang-0.5.0.ebuild index 4c7b562223db..9884a4ce9a12 100644 --- a/dev-libs/hyprlang/hyprlang-0.5.0.ebuild +++ b/dev-libs/hyprlang/hyprlang-0.5.0.ebuild @@ -11,4 +11,4 @@ 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 ~riscv" diff --git a/dev-libs/hyprlang/hyprlang-0.5.1.ebuild b/dev-libs/hyprlang/hyprlang-0.5.1.ebuild new file mode 100644 index 000000000000..4c7b562223db --- /dev/null +++ b/dev-libs/hyprlang/hyprlang-0.5.1.ebuild @@ -0,0 +1,14 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Official implementation library for the hypr config language" +HOMEPAGE="https://github.com/hyprwm/hyprlang" +SRC_URI="https://github.com/hyprwm/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~riscv" diff --git a/dev-libs/icu-layoutex/Manifest b/dev-libs/icu-layoutex/Manifest index 821057a1856d..7a7475da110d 100644 --- a/dev-libs/icu-layoutex/Manifest +++ b/dev-libs/icu-layoutex/Manifest @@ -1,2 +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 diff --git a/dev-libs/icu-layoutex/icu-layoutex-75.1.ebuild b/dev-libs/icu-layoutex/icu-layoutex-75.1.ebuild new file mode 100644 index 000000000000..f87314194366 --- /dev/null +++ b/dev-libs/icu-layoutex/icu-layoutex-75.1.ebuild @@ -0,0 +1,131 @@ +# Copyright 1999-2024 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 + +MY_PV=${PV/_rc/-rc} +MY_PV=${MY_PV//./_} + +DESCRIPTION="External layout part of International Components for Unicode" +HOMEPAGE="https://icu.unicode.org/" +SRC_URI="https://github.com/unicode-org/icu/releases/download/release-${MY_PV/_/-}/icu4c-${MY_PV/-rc/rc}-src.tgz" +SRC_URI+=" verify-sig? ( https://github.com/unicode-org/icu/releases/download/release-${MY_PV/_/-}/icu4c-${MY_PV/-rc/rc}-src.tgz.asc )" +S="${WORKDIR}"/${PN/-layoutex}/source + +LICENSE="BSD" +SLOT="0/${PV%.*}" +#if [[ ${PV} != *_rc* ]] ; then +# KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +#fi +IUSE="debug static-libs test" +RESTRICT="!test? ( test )" + +DEPEND=" + ~dev-libs/icu-${PV}[${MULTILIB_USEDEP}] + dev-libs/icu-le-hb[${MULTILIB_USEDEP}] +" +RDEPEND="${DEPEND}" +BDEPEND=" + virtual/pkgconfig + verify-sig? ( >=sec-keys/openpgp-keys-icu-20221020 ) +" + +PATCHES=( "${FILESDIR}/${PN}-65.1-remove-bashisms.patch" ) + +src_prepare() { + default + + # 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 + + # Fix linking of icudata + sed -i \ + -e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \ + config/mh-linux || die + + eautoreconf +} + +src_configure() { + MAKEOPTS+=" VERBOSE=1" + + if tc-is-cross-compiler; then + mkdir "${WORKDIR}"/host || die + pushd "${WORKDIR}"/host >/dev/null || die + + CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \ + CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \ + RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \ + "${S}"/configure --disable-renaming --disable-debug \ + --disable-samples --enable-static || die + emake + + popd >/dev/null || die + fi + + multilib-minimal_src_configure +} + +multilib_src_configure() { + # https://unicode-org.atlassian.net/browse/ICU-22001 + filter-lto + + local myeconfargs=( + --disable-renaming + # We want a minimal build as this is just for layoutex + # so we disable as much as possible + --disable-samples + --disable-extras + --disable-icuio + + # This is icu-layoutex, so.. + --enable-layoutex + + $(use_enable debug) + $(use_enable static-libs static) + + # Need tools for tests, otherwise get this in configure: + # "## Note: you have disabled ICU's tools. This ICU cannot build its own data or tests. + # ## Expect build failures in the 'data', 'test', and other directories." + # ... although layoutex has no tests right now anyway, but let's keep this + # for the future. + $(use_enable test tools) + $(use_enable test tests) + ) + + tc-is-cross-compiler && myeconfargs+=( + --with-cross-build="${WORKDIR}"/host + ) + + # icu tries to use clang by default + tc-export CC CXX + + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_test() { + # INTLTEST_OPTS: intltest options + # -e: Exhaustive testing + # -l: Reporting of memory leaks + # -v: Increased verbosity + # IOTEST_OPTS: iotest options + # -e: Exhaustive testing + # -v: Increased verbosity + # CINTLTST_OPTS: cintltst options + # -e: Exhaustive testing + # -v: Increased verbosity + emake -C layoutex VERBOSE="1" check +} + +multilib_src_install() { + pushd layoutex &>/dev/null || die + default + popd &>/dev/null || die +} diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest index 821057a1856d..7a7475da110d 100644 --- a/dev-libs/icu/Manifest +++ b/dev-libs/icu/Manifest @@ -1,2 +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 diff --git a/dev-libs/icu/icu-74.2.ebuild b/dev-libs/icu/icu-74.2.ebuild index d95a60360a39..dcfd9ddc6d2b 100644 --- a/dev-libs/icu/icu-74.2.ebuild +++ b/dev-libs/icu/icu-74.2.ebuild @@ -69,6 +69,14 @@ 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. diff --git a/dev-libs/icu/icu-75.1.ebuild b/dev-libs/icu/icu-75.1.ebuild new file mode 100644 index 000000000000..e9aa58d8a42e --- /dev/null +++ b/dev-libs/icu/icu-75.1.ebuild @@ -0,0 +1,179 @@ +# Copyright 1999-2024 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} ) +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 + +MY_PV=${PV/_rc/-rc} +MY_PV=${MY_PV//./_} + +DESCRIPTION="International Components for Unicode" +HOMEPAGE="https://icu.unicode.org/" +SRC_URI="https://github.com/unicode-org/icu/releases/download/release-${MY_PV/_/-}/icu4c-${MY_PV/-rc/rc}-src.tgz" +SRC_URI+=" verify-sig? ( https://github.com/unicode-org/icu/releases/download/release-${MY_PV/_/-}/icu4c-${MY_PV/-rc/rc}-src.tgz.asc )" +S="${WORKDIR}"/${PN}/source + +#if [[ ${PV} != *_rc* ]] ; then +# KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +#fi +LICENSE="BSD" +SLOT="0/${PV%.*}" +IUSE="debug doc examples static-libs test" +RESTRICT="!test? ( test )" + +BDEPEND=" + ${PYTHON_DEPS} + dev-build/autoconf-archive + virtual/pkgconfig + doc? ( app-text/doxygen[dot] ) + verify-sig? ( >=sec-keys/openpgp-keys-icu-20221020 ) +" + +MULTILIB_CHOST_TOOLS=( + /usr/bin/icu-config +) + +PATCHES=( + "${FILESDIR}/${PN}-65.1-remove-bashisms.patch" + "${FILESDIR}/${PN}-64.2-darwin.patch" + "${FILESDIR}/${PN}-68.1-nonunicode.patch" +) + +src_prepare() { + default + + # 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 + + # Fix linking of icudata + sed -i \ + -e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \ + config/mh-linux || die + + # Append doxygen configuration to configure + sed -i \ + -e 's:icudefs.mk:icudefs.mk Doxyfile:' \ + configure.ac || die + + eautoreconf +} + +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 + + if tc-is-cross-compiler; then + mkdir "${WORKDIR}"/host || die + pushd "${WORKDIR}"/host >/dev/null || die + + CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \ + CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \ + RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \ + "${S}"/configure --disable-renaming --disable-debug \ + --disable-samples --enable-static || die + emake + + popd >/dev/null || die + fi + + multilib-minimal_src_configure +} + +multilib_src_configure() { + local myeconfargs=( + --disable-renaming + --disable-samples + # TODO: Merge with dev-libs/icu-layoutex + # Planned to do this w/ 73.2 but seem to get test failures + # only with --enable-layoutex. + --disable-layoutex + $(use_enable debug) + $(use_enable static-libs static) + $(use_enable test tests) + $(multilib_native_use_enable examples samples) + ) + + #if use test ; then + # myeconfargs+=( + # --enable-extras + # --enable-tools + # ) + #else + # myeconfargs+=( + # $(multilib_native_enable extras) + # $(multilib_native_enable tools) + # ) + #fi + + tc-is-cross-compiler && myeconfargs+=( + --with-cross-build="${WORKDIR}"/host + ) + + # Work around cross-endian testing failures with LTO, bug #757681 + if tc-is-cross-compiler && tc-is-lto ; then + myeconfargs+=( --disable-strict ) + fi + + # ICU tries to use clang by default + tc-export CC CXX + + # Make sure we configure with the same shell as we run icu-config + # with, or ECHO_N, ECHO_T and ECHO_C will be wrongly defined + export CONFIG_SHELL="${EPREFIX}/bin/sh" + # Probably have no /bin/sh in prefix-chain + [[ -x ${CONFIG_SHELL} ]] || CONFIG_SHELL="${BASH}" + + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_compile() { + default + + if multilib_is_native_abi && use doc; then + doxygen -u Doxyfile || die + doxygen Doxyfile || die + fi +} + +multilib_src_test() { + # INTLTEST_OPTS: intltest options + # -e: Exhaustive testing + # -l: Reporting of memory leaks + # -v: Increased verbosity + # IOTEST_OPTS: iotest options + # -e: Exhaustive testing + # -v: Increased verbosity + # CINTLTST_OPTS: cintltst options + # -e: Exhaustive testing + # -v: Increased verbosity + emake check +} + +multilib_src_install() { + default + + if multilib_is_native_abi && use doc; then + docinto html + dodoc -r doc/html/* + fi +} + +multilib_src_install_all() { + local HTML_DOCS=( ../readme.html ) + einstalldocs +} diff --git a/dev-libs/igraph/Manifest b/dev-libs/igraph/Manifest index a03b857e7f2b..4c0c33ccd640 100644 --- a/dev-libs/igraph/Manifest +++ b/dev-libs/igraph/Manifest @@ -1,2 +1,4 @@ DIST igraph-0.10.10.tar.gz 4336247 BLAKE2B cef87afe544d09446c999894c44e1d56120cac74b6af5d749835fbf60e5ae0f1676d6754e084f167d23718c6ce9f7b8cee159d3d670d1d5f1f495775c7b0d2f0 SHA512 d4b8d29f9c39f8390c442877183e64c442fccbc6a02b3aed5c1d8871ca5998d1a168f392f8dde26a8c3593ed6c09a66a200ac1155fbde87d368b101011bb122c +DIST igraph-0.10.11.tar.gz 4349830 BLAKE2B 3aae088115148d1f965a52f01c950000097520fb0a150d2ad1fabb96cff434a9b548a6c17a10b9e0ebad3a577c2423ac5260cd28223147d3dc71b0d4fe139a95 SHA512 d6978589f12ed20b87777394b46f47b4ffc045ef693e5b4fc90163b9482361b2bf0ed2bb04aa99bf4a0653f7e4355cd480b0a165213d90ff7188ef6c86147c86 +DIST igraph-0.10.12.tar.gz 4373463 BLAKE2B b7fdd7046185bf501c9302721f6606e6affc0d91c16d195c6bd69e0b32f9dca7af701a963fd4a8b8558ac843fe4a5136c7fce2fe5595db469818e514db2325ac SHA512 1a7b055ab2148fdf04187d785895b930ae2a54ae0240ea9656e129a38347b1caeb28dda5a3a7e34282462363150d7afd25acf8cd335577ed441b8a5cecc0dd25 DIST igraph-0.10.4.tar.gz 4279321 BLAKE2B 4e1fc8e8d6dd38cdb24ec564f51f2924e457376c258497b51d7dd4cec88d2226d5b202cdcfa69560e43fdb3cbd49656511178acd2ed705b4af26b1947a92f1ab SHA512 71bcec5f0ba100aae7614753f9232a4221580b822b4dc120e3a80eab59d70c42aedddb00728eb13faf7e522332c514c2e030314c416ded8a70e5de990ea8039b diff --git a/dev-libs/igraph/igraph-0.10.10.ebuild b/dev-libs/igraph/igraph-0.10.10.ebuild index f270109ee806..7f5111f0726e 100644 --- a/dev-libs/igraph/igraph-0.10.10.ebuild +++ b/dev-libs/igraph/igraph-0.10.10.ebuild @@ -9,7 +9,7 @@ DESCRIPTION="Creating and manipulating undirected and directed graphs" HOMEPAGE="https://igraph.org/" SRC_URI="https://github.com/igraph/igraph/releases/download/${PV}/${P}.tar.gz" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0/0" KEYWORDS="~amd64 ~x86" @@ -43,6 +43,7 @@ src_configure() { -DIGRAPH_USE_INTERNAL_LAPACK=OFF -DIGRAPH_USE_INTERNAL_PLFIT=OFF -DIGRAPH_ENABLE_TLS=$(usex threads) + -DIGRAPH_WARNINGS_AS_ERRORS=OFF -DBUILD_TESTING=$(usex test) ) cmake_src_configure diff --git a/dev-libs/igraph/igraph-0.10.11.ebuild b/dev-libs/igraph/igraph-0.10.11.ebuild new file mode 100644 index 000000000000..280105ef5c8d --- /dev/null +++ b/dev-libs/igraph/igraph-0.10.11.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Creating and manipulating undirected and directed graphs" +HOMEPAGE="https://igraph.org/" +SRC_URI="https://github.com/igraph/igraph/releases/download/${PV}/${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0/0" +KEYWORDS="amd64 x86" + +IUSE="debug test threads" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-libs/gmp:0= + dev-libs/libxml2 + sci-libs/arpack + sci-mathematics/glpk:= + sci-mathematics/plfit + virtual/blas + virtual/lapack" +DEPEND="${RDEPEND}" + +src_configure() { + local mycmakeargs=( + -DUSE_CCACHE=OFF + -DIGRAPH_GLPK_SUPPORT=ON + -DIGRAPH_GRAPHML_SUPPORT=ON + -DIGRAPH_USE_INTERNAL_ARPACK=OFF + -DIGRAPH_USE_INTERNAL_BLAS=OFF + -DIGRAPH_USE_INTERNAL_GLPK=OFF + -DIGRAPH_USE_INTERNAL_GMP=OFF + -DIGRAPH_USE_INTERNAL_LAPACK=OFF + -DIGRAPH_USE_INTERNAL_PLFIT=OFF + -DIGRAPH_ENABLE_TLS=$(usex threads) + -DIGRAPH_WARNINGS_AS_ERRORS=OFF + -DBUILD_TESTING=$(usex test) + ) + cmake_src_configure +} + +src_test() { + cmake_build check +} diff --git a/dev-libs/igraph/igraph-0.10.12.ebuild b/dev-libs/igraph/igraph-0.10.12.ebuild new file mode 100644 index 000000000000..30a8f524a0b5 --- /dev/null +++ b/dev-libs/igraph/igraph-0.10.12.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Creating and manipulating undirected and directed graphs" +HOMEPAGE="https://igraph.org/" +SRC_URI="https://github.com/igraph/igraph/releases/download/${PV}/${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0/0" +KEYWORDS="~amd64 ~x86" + +IUSE="debug test threads" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-libs/gmp:0= + dev-libs/libxml2 + sci-libs/arpack + sci-mathematics/glpk:= + sci-mathematics/plfit + virtual/blas + virtual/lapack" +DEPEND="${RDEPEND}" + +src_configure() { + local mycmakeargs=( + -DUSE_CCACHE=OFF + -DIGRAPH_GLPK_SUPPORT=ON + -DIGRAPH_GRAPHML_SUPPORT=ON + -DIGRAPH_USE_INTERNAL_ARPACK=OFF + -DIGRAPH_USE_INTERNAL_BLAS=OFF + -DIGRAPH_USE_INTERNAL_GLPK=OFF + -DIGRAPH_USE_INTERNAL_GMP=OFF + -DIGRAPH_USE_INTERNAL_LAPACK=OFF + -DIGRAPH_USE_INTERNAL_PLFIT=OFF + -DIGRAPH_ENABLE_TLS=$(usex threads) + -DIGRAPH_WARNINGS_AS_ERRORS=OFF + -DBUILD_TESTING=$(usex test) + ) + cmake_src_configure +} + +src_test() { + cmake_build check +} diff --git a/dev-libs/igraph/igraph-0.10.4-r1.ebuild b/dev-libs/igraph/igraph-0.10.4-r1.ebuild index fd9d1d6f77ec..a8d0b8c64efd 100644 --- a/dev-libs/igraph/igraph-0.10.4-r1.ebuild +++ b/dev-libs/igraph/igraph-0.10.4-r1.ebuild @@ -9,7 +9,7 @@ DESCRIPTION="Creating and manipulating undirected and directed graphs" HOMEPAGE="https://igraph.org/" SRC_URI="https://github.com/igraph/igraph/releases/download/${PV}/${P}.tar.gz" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0/0" KEYWORDS="amd64 x86" @@ -44,6 +44,7 @@ src_configure() { -DIGRAPH_USE_INTERNAL_LAPACK=OFF -DIGRAPH_USE_INTERNAL_PLFIT=OFF -DIGRAPH_ENABLE_TLS=$(usex threads) + -DIGRAPH_WARNINGS_AS_ERRORS=OFF -DBUILD_TESTING=$(usex test) ) cmake_src_configure diff --git a/dev-libs/imath/imath-3.1.11.ebuild b/dev-libs/imath/imath-3.1.11.ebuild index 2c26185bfb10..6da867303ab9 100644 --- a/dev-libs/imath/imath-3.1.11.ebuild +++ b/dev-libs/imath/imath-3.1.11.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}" LICENSE="BSD" SLOT="3/29" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" IUSE="doc large-stack python test" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RESTRICT="!test? ( test )" diff --git a/dev-libs/inih/inih-58.ebuild b/dev-libs/inih/inih-58.ebuild index 24cf8b3e6eba..98e9528ea2d5 100644 --- a/dev-libs/inih/inih-58.ebuild +++ b/dev-libs/inih/inih-58.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}"/inih-r${PV} LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" DOCS=( README.md ) diff --git a/dev-libs/iniparser/iniparser-4.1-r1.ebuild b/dev-libs/iniparser/iniparser-4.1-r1.ebuild index ac8d8d7b29bb..0540dd973ed7 100644 --- a/dev-libs/iniparser/iniparser-4.1-r1.ebuild +++ b/dev-libs/iniparser/iniparser-4.1-r1.ebuild @@ -17,7 +17,7 @@ IUSE="doc examples" BDEPEND="doc? ( app-text/doxygen )" PATCHES=( - ${FILESDIR}/${P}-CVE-null-getstring.patch # upstream, bug #907928 + "${FILESDIR}"/${P}-CVE-null-getstring.patch # upstream, bug #907928 ) _newlib_so_with_symlinks() { diff --git a/dev-libs/iniparser/iniparser-4.1.ebuild b/dev-libs/iniparser/iniparser-4.1.ebuild deleted file mode 100644 index 5d67e75c5866..000000000000 --- a/dev-libs/iniparser/iniparser-4.1.ebuild +++ /dev/null @@ -1,71 +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 ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="doc examples" - -BDEPEND="doc? ( app-text/doxygen )" - -_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/intel-compute-runtime/Manifest b/dev-libs/intel-compute-runtime/Manifest index b0f0cba857ae..ff3374bc3730 100644 --- a/dev-libs/intel-compute-runtime/Manifest +++ b/dev-libs/intel-compute-runtime/Manifest @@ -1,2 +1,2 @@ -DIST intel-compute-runtime-23.52.28202.23.tar.gz 6903413 BLAKE2B ecd16511fc8065cc8e09827a1b333a5d8caa1ec0c815de21b90d896a5d1e6c8225423e748005b5f6012eb0c68da08cf06abaf8431709145bb329a3dd34270222 SHA512 aa33b712af2526f94a3d8508edb3201203c34bf90b0125ed9b9878539066baaedd9b9e1c464b760c38c159b4b4aa3671465ba90c2bdd58626f578e92957093fa -DIST intel-compute-runtime-24.05.28454.17.tar.gz 6963009 BLAKE2B ca4840dedbea06bba7933ba74658eee602a6de19d35ec4baac1d41d5eb3041f16a4e7e82072f98961d19d2e7f97b9f3ad698ff84532f009537d23d7970162fc5 SHA512 f70967c649e7a17eab7fa550a2b344333357717021c16e3116eb47be45ea806bb0fc64795dad21027e7f055318f1e05c9e726c3e735dc3b7336de1839f6eae8e +DIST intel-compute-runtime-24.13.29138.7.tar.gz 7056376 BLAKE2B e09c0a8e4b3f31b53879430401074f9861dc9384524dfe6c2bd87c9f12cd064688b08da1eefc7f9453141b008181bb66f187e4bf8f1fe0db8df4946b3cca6313 SHA512 01b3ded0d42c439314f83e9eac45dcdaaa401128fa83836d2cee4514351b8b43ae0b19a6485a16f5f08ef0d76595e6ee749fe1fff9a5ee04677e3d5ef33408da +DIST intel-compute-runtime-24.17.29377.6.tar.gz 7038804 BLAKE2B feb09b6627b5dbd376a88705fca61514e5f60aa2014617a591451f0be493dedc87e228f8599fd2e2488623fcc827d831f4294fa4b34375a75e17438b76d4fd97 SHA512 9cda876ebdff1a17cb495f95b637c8aac82dc58433da67d1f312b74dd423ca9f536dcbd10454f1e0702e3181b4f5d4eeb2d31d6d99a756749321b128cf1e9cc2 diff --git a/dev-libs/intel-compute-runtime/intel-compute-runtime-23.52.28202.23-r1.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-24.13.29138.7.ebuild index 69877d079fea..6cc55d2ef71c 100644 --- a/dev-libs/intel-compute-runtime/intel-compute-runtime-23.52.28202.23-r1.ebuild +++ b/dev-libs/intel-compute-runtime/intel-compute-runtime-24.13.29138.7.ebuild @@ -20,8 +20,8 @@ KEYWORDS="amd64" IUSE="+l0 +vaapi" RDEPEND=" - >=dev-util/intel-graphics-compiler-1.0.15136.4 - >=media-libs/gmmlib-22.3.5:= + >=dev-util/intel-graphics-compiler-1.0.15985.15 + >=media-libs/gmmlib-22.3.17:= " DEPEND=" @@ -30,10 +30,10 @@ DEPEND=" dev-libs/intel-metrics-library:= dev-libs/libnl:3 dev-libs/libxml2:2 - >=dev-util/intel-graphics-system-controller-0.8.13:= + >=dev-util/intel-graphics-system-controller-0.8.16:= media-libs/mesa >=virtual/opencl-3 - l0? ( >=dev-libs/level-zero-1.14.0:= ) + l0? ( >=dev-libs/level-zero-1.16.1:= ) vaapi? ( x11-libs/libdrm[video_cards_intel] media-libs/libva diff --git a/dev-libs/intel-compute-runtime/intel-compute-runtime-24.05.28454.17-r1.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-24.17.29377.6.ebuild index 717beccf91d2..717beccf91d2 100644 --- a/dev-libs/intel-compute-runtime/intel-compute-runtime-24.05.28454.17-r1.ebuild +++ b/dev-libs/intel-compute-runtime/intel-compute-runtime-24.17.29377.6.ebuild diff --git a/dev-libs/intel-metrics-discovery/Manifest b/dev-libs/intel-metrics-discovery/Manifest index f47b97d72594..a4370e0b4942 100644 --- a/dev-libs/intel-metrics-discovery/Manifest +++ b/dev-libs/intel-metrics-discovery/Manifest @@ -1 +1 @@ -DIST metrics-discovery-1.12.170.tar.gz 4932048 BLAKE2B c4cf382ff29de4319f44863e0e45a0bb424c3f8af93c198723941c35f579e4d25252c99e6726d724483eae74e50a6315933106aa3e3bba8dad1af9a7ed8284fe SHA512 b4bb4465a059c7222b830ae3541eb1d6171d91f03ec131c1f8a079f6e8b2aed7c9f00899ae23744b986e070897eb135eaa4eff882d1cb173c80d6d2ce1ba3955 +DIST metrics-discovery-1.12.171.tar.gz 5219784 BLAKE2B 3927ad270060543d3dbca9e32abfa83661597313a54bec591098c7f0b48443326d4bc3c13f600b8b53ba4ca2850c15c2c2bee7dc117ca38de9bad3c5b4f8d8b5 SHA512 7c08841e86af29465c2d09788d7230bd9401eb02c35eb0e582db68a389c6e867cbb2f9eb38876cd00ffa519633a16c804454d43efd8c32fb61e39bada202708f diff --git a/dev-libs/intel-metrics-discovery/intel-metrics-discovery-1.12.170.ebuild b/dev-libs/intel-metrics-discovery/intel-metrics-discovery-1.12.171.ebuild index 728ed054c227..728ed054c227 100644 --- a/dev-libs/intel-metrics-discovery/intel-metrics-discovery-1.12.170.ebuild +++ b/dev-libs/intel-metrics-discovery/intel-metrics-discovery-1.12.171.ebuild diff --git a/dev-libs/intel-metrics-library/Manifest b/dev-libs/intel-metrics-library/Manifest index 266b6cead2ec..4a5017379276 100644 --- a/dev-libs/intel-metrics-library/Manifest +++ b/dev-libs/intel-metrics-library/Manifest @@ -1 +1 @@ -DIST metrics-library-1.0.156.tar.gz 253010 BLAKE2B c00c58c35f83672ad19cdff64f5df8193543de76c071cd6a9c41de434b635051d90f143aa8a8e5b45d36153b73371c2e77c9b3f4df7104ae54bffd784cd37fa3 SHA512 16a50c62c1d87f4e830f5a916ed95882c04d257f8daf3b8d2f8fb7d8887fe899b9f35429fefe19dc99e0b485d6b1e98cfa4082d793cc867f07ceac68284afb81 +DIST metrics-library-1.0.161.tar.gz 250352 BLAKE2B 5b991aadd5ed477a478763111bdac96374b99dd657db58403753b4504214d703e26156fd65c1ce10eae98bd63f117d6e3e83b178aadc610948b3163b91d1cb7b SHA512 0a6b51bcdd24402b47823465739a64d264a24a17ccbbf950b71d3d3374a5a3cc31726cb5918ad67c16d693e21a2f8eba91f1f8815ed1c6d5ef89163cabeefdf9 diff --git a/dev-libs/intel-metrics-library/intel-metrics-library-1.0.156.ebuild b/dev-libs/intel-metrics-library/intel-metrics-library-1.0.161.ebuild index 553a918ad5e3..553a918ad5e3 100644 --- a/dev-libs/intel-metrics-library/intel-metrics-library-1.0.156.ebuild +++ b/dev-libs/intel-metrics-library/intel-metrics-library-1.0.161.ebuild diff --git a/dev-libs/intel-vc-intrinsics/Manifest b/dev-libs/intel-vc-intrinsics/Manifest index 973618291817..e15621065f10 100644 --- a/dev-libs/intel-vc-intrinsics/Manifest +++ b/dev-libs/intel-vc-intrinsics/Manifest @@ -1,2 +1 @@ -DIST intel-vc-intrinsics-0.16.0.tar.gz 144545 BLAKE2B 9ff71421ec5c45539a5135d8b70eea017a7bc9f788fe0ef760c9cfa58495bd532b371f764208f8c6b077647cd81fbf6c859b075186751129e91e8f7816a82253 SHA512 3fbb828f8c47b36cb33d766f8cb853508b6ffcf71b980465fa3fc7d74383c42cf8f46385f43e1a6180e65eef54c77cf10eff520451e39f6b7ff20fea04c8b894 DIST intel-vc-intrinsics-0.18.0.tar.gz 145201 BLAKE2B 2260949a134cd5dff9e0c2be3dd594b4e780f69f897c3966abc3c5787f0acc1a21d70d91d5825b6b81a9b64de5c0ae1079cc136dbec638757212c0e21ac9fed0 SHA512 db68f1b95bfa1c861bb2788161f355b196cb7f93d86eb9f8bee4dfe77771660985fd6615fc616b79e5823b0d0712c30597c30b9a4be56f7c5bc46626a87fbcda diff --git a/dev-libs/intel-vc-intrinsics/intel-vc-intrinsics-0.16.0.ebuild b/dev-libs/intel-vc-intrinsics/intel-vc-intrinsics-0.16.0.ebuild deleted file mode 100644 index 7afdded993fd..000000000000 --- a/dev-libs/intel-vc-intrinsics/intel-vc-intrinsics-0.16.0.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -CMAKE_BUILD_TYPE="Release" -LLVM_MAX_SLOT="15" -MY_PN="${PN/intel-/}" -MY_P="${MY_PN}-${PV}" -PYTHON_COMPAT=( python3_{10..12} ) - -inherit cmake llvm python-any-r1 - -DESCRIPTION="A set of new intrinsics on top of core LLVM IR instructions" -HOMEPAGE="https://github.com/intel/vc-intrinsics" -SRC_URI="https://github.com/intel/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${MY_P}" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64" - -DEPEND=" - dev-libs/libxml2:2= - sys-devel/llvm:${LLVM_MAX_SLOT} - sys-libs/zlib -" -RDEPEND="${DEPEND}" -BDEPEND="${PYTHON_DEPS}" - -src_configure() { - local mycmakeargs=( - -DLLVM_DIR="$(get_llvm_prefix ${LLVM_MAX_SLOT})" - ) - - cmake_src_configure -} diff --git a/dev-libs/intel-vc-intrinsics/intel-vc-intrinsics-0.18.0.ebuild b/dev-libs/intel-vc-intrinsics/intel-vc-intrinsics-0.18.0.ebuild index 2e67056c8f41..30d735ec61b1 100644 --- a/dev-libs/intel-vc-intrinsics/intel-vc-intrinsics-0.18.0.ebuild +++ b/dev-libs/intel-vc-intrinsics/intel-vc-intrinsics-0.18.0.ebuild @@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64" DEPEND=" dev-libs/libxml2:2= diff --git a/dev-libs/isa-l/Manifest b/dev-libs/isa-l/Manifest index 6f03ccf55882..bfbf741347fa 100644 --- a/dev-libs/isa-l/Manifest +++ b/dev-libs/isa-l/Manifest @@ -1 +1,2 @@ DIST isa-l-2.30.0.tar.gz 649389 BLAKE2B 3364733d61ce16c91891b6da63d2b4fb2bc004761c91f2076a9a6441adaea24af43b6d32caec011c06206e3811e8c9639f8ceaac89fe97800144c7f78c80c350 SHA512 d3ecfb7326097534b06a74b584100336509525ae7cadc6112d0c27e3d8704f3810e18f583d3cc33fa266bfec96db023607622b22ddbf17988ec4bf1bb3b3b9b2 +DIST isa-l-2.31.0.tar.gz 705375 BLAKE2B 80e0c7f7351e4765393fc5734452ab00d84a84fd017a529a0b96d594c045e7e1c23957d292a56fc449e611dc29f3d4cc2a66c75055d1a7fbb31ca1d6f5c4650a SHA512 bbda3cf84e12352728c16d043ae71160569bff9540928eebb986e22d570176162a7f74fba9423d2349d014df061c09fc084343fbc51077415cfae9f692906dd8 diff --git a/dev-libs/isa-l/files/isa-l-2.31.0_makefile-no-D.patch b/dev-libs/isa-l/files/isa-l-2.31.0_makefile-no-D.patch new file mode 100644 index 000000000000..bb99550b2426 --- /dev/null +++ b/dev-libs/isa-l/files/isa-l-2.31.0_makefile-no-D.patch @@ -0,0 +1,16 @@ +--- a/Makefile.am ++++ b/Makefile.am +@@ -136,11 +136,11 @@ + EXTRA_DIST += tools/yasm-filter.sh tools/nasm-filter.sh + EXTRA_DIST += tools/yasm-cet-filter.sh tools/nasm-cet-filter.sh + +-AM_CFLAGS = ${my_CFLAGS} ${INCLUDE} $(src_include) ${ARCH} ${D} ++AM_CFLAGS = ${my_CFLAGS} ${INCLUDE} $(src_include) ${ARCH} ${DIST_D} + if CPU_AARCH64 + AM_CCASFLAGS = ${AM_CFLAGS} + else +-AM_CCASFLAGS = ${yasm_args} ${INCLUDE} ${src_include} ${DEFS} ${D} ++AM_CCASFLAGS = ${yasm_args} ${INCLUDE} ${src_include} ${DEFS} ${DIST_D} + endif + + .asm.s: diff --git a/dev-libs/isa-l/files/isa-l-2.31.0_makefile-x86.patch b/dev-libs/isa-l/files/isa-l-2.31.0_makefile-x86.patch new file mode 100644 index 000000000000..97965a7a9d2c --- /dev/null +++ b/dev-libs/isa-l/files/isa-l-2.31.0_makefile-x86.patch @@ -0,0 +1,12 @@ +--- a/Makefile.am ++++ b/Makefile.am +@@ -67,8 +67,7 @@ + + if CPU_X86_32 + ARCH=-Dx86_32 +-libisal_la_SOURCES += ${lsrc_x86_32} +-other_tests += ${other_tests_x86_32} ++libisal_la_SOURCES += ${lsrc_base_aliases} + endif + + if CPU_AARCH64 diff --git a/dev-libs/isa-l/files/isa-l-2.31.0_user-ldflags.patch b/dev-libs/isa-l/files/isa-l-2.31.0_user-ldflags.patch new file mode 100644 index 000000000000..5162563b3646 --- /dev/null +++ b/dev-libs/isa-l/files/isa-l-2.31.0_user-ldflags.patch @@ -0,0 +1,10 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -83,6 +83,7 @@ + -Wl,-z,noexecstack \ + -Wl,-z,relro \ + -Wl,-z,now \ ++${LDFLAGS} \ + " + AC_MSG_CHECKING([if $LD supports $LDFLAGS]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ diff --git a/dev-libs/isa-l/isa-l-2.31.0.ebuild b/dev-libs/isa-l/isa-l-2.31.0.ebuild new file mode 100644 index 000000000000..a8bd9bde2c95 --- /dev/null +++ b/dev-libs/isa-l/isa-l-2.31.0.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Intelligent Storage Acceleration Library" +HOMEPAGE="https://github.com/intel/isa-l" +SRC_URI="https://github.com/intel/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~riscv -x86" +IUSE="cpu_flags_x86_avx512f" + +# AVX512 support in yasm is still work in progress +BDEPEND=" + amd64? ( + cpu_flags_x86_avx512f? ( >=dev-lang/nasm-2.13 ) + !cpu_flags_x86_avx512f? ( || ( + >=dev-lang/nasm-2.11.01 + >=dev-lang/yasm-1.2.0 + ) ) + ) + x86? ( + cpu_flags_x86_avx512f? ( >=dev-lang/nasm-2.13 ) + !cpu_flags_x86_avx512f? ( || ( + >=dev-lang/nasm-2.11.01 + >=dev-lang/yasm-1.2.0 + ) ) + ) +" + +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_user-ldflags.patch +) + +src_prepare() { + default + + # isa-l does not support arbitrary assemblers on amd64 and x86, + # it must be either nasm or yasm. + if use amd64 || use x86; then + unset AS + fi + + eautoreconf +} + +src_install() { + default + find "${ED}" -name '*.la' -delete || die +} diff --git a/dev-libs/jansson/Manifest b/dev-libs/jansson/Manifest index 8a5efd23fb16..24fa3b4d26fe 100644 --- a/dev-libs/jansson/Manifest +++ b/dev-libs/jansson/Manifest @@ -1 +1 @@ -DIST jansson-2.14.tar.gz 535618 BLAKE2B eb514ff222444d4c0d1ef6b99150e3e43bd4d7a1bec3d66e5ece8bc59ac19a0898d9eb061cacad52afda7fe172ec6df46b5a90952707422f56daae53f82c9427 SHA512 5a592776c7ba8c0b1f5efaf813f77948bbc4bda168a72d221d176af0cf61038e26c1f30795433be10e2fc5069d5763d11852a8574774906a9f8ad261ac30109c +DIST jansson-2.14.tar.bz2 434481 BLAKE2B b7b7e98360fd73f7925b88e3729a7a18307b4f05fed4b37659d24ddc03208469471d508dcd245534f73af3b5e93f595e49e3cb2c99733955b03d471bd5a32f15 SHA512 1a659c0f41b0672757c13ebd16bd10ad7d6484366aefda078aa816266ce4f5638bc121f1ce8c4234b0b9f201ea73c227b9084125857452cbcba058a111e4a6fd diff --git a/dev-libs/jansson/jansson-2.14-r1.ebuild b/dev-libs/jansson/jansson-2.14-r1.ebuild index 1d11fe6ed7f2..f19ea8be4b1a 100644 --- a/dev-libs/jansson/jansson-2.14-r1.ebuild +++ b/dev-libs/jansson/jansson-2.14-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,7 +7,7 @@ inherit toolchain-funcs DESCRIPTION="C library for encoding, decoding and manipulating JSON data" HOMEPAGE="https://www.digip.org/jansson/" -SRC_URI="https://github.com/akheron/jansson/releases/download/v${PV}/${P}.tar.gz" +SRC_URI="https://github.com/akheron/jansson/releases/download/v${PV}/${P}.tar.bz2" LICENSE="MIT" SLOT="0/4" diff --git a/dev-libs/jansson/jansson-2.14-r2.ebuild b/dev-libs/jansson/jansson-2.14-r2.ebuild index 094aa5550e1b..b2f6ab300708 100644 --- a/dev-libs/jansson/jansson-2.14-r2.ebuild +++ b/dev-libs/jansson/jansson-2.14-r2.ebuild @@ -7,7 +7,7 @@ inherit autotools DESCRIPTION="C library for encoding, decoding and manipulating JSON data" HOMEPAGE="https://www.digip.org/jansson/" -SRC_URI="https://github.com/akheron/jansson/releases/download/v${PV}/${P}.tar.gz" +SRC_URI="https://github.com/akheron/jansson/releases/download/v${PV}/${P}.tar.bz2" LICENSE="MIT" SLOT="0/4" diff --git a/dev-libs/json-parser/json-parser-1.1.0_p20211208.ebuild b/dev-libs/json-parser/json-parser-1.1.0_p20211208.ebuild index 2f60fe0f3b4c..184acdce391c 100644 --- a/dev-libs/json-parser/json-parser-1.1.0_p20211208.ebuild +++ b/dev-libs/json-parser/json-parser-1.1.0_p20211208.ebuild @@ -6,7 +6,7 @@ EAPI=8 DISTUTILS_EXT=1 DISTUTILS_OPTIONAL=1 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit distutils-r1 edo toolchain-funcs diff --git a/dev-libs/judy/judy-1.0.5-r4.ebuild b/dev-libs/judy/judy-1.0.5-r4.ebuild index 6dc71de7e895..ea62e281eca7 100644 --- a/dev-libs/judy/judy-1.0.5-r4.ebuild +++ b/dev-libs/judy/judy-1.0.5-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,7 +7,7 @@ inherit autotools DESCRIPTION="A C library that implements a dynamic array" HOMEPAGE="http://judy.sourceforge.net/" -SRC_URI="mirror://sourceforge/judy/Judy-${PV}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/judy/Judy-${PV}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" diff --git a/dev-libs/kirigami-addons/Manifest b/dev-libs/kirigami-addons/Manifest index 23aa171d4e1b..5139b58b28a4 100644 --- a/dev-libs/kirigami-addons/Manifest +++ b/dev-libs/kirigami-addons/Manifest @@ -1,2 +1,2 @@ DIST kirigami-addons-0.11.0.tar.xz 136692 BLAKE2B 26301176ddeaea3aec351207e82dc28a56e465aa6bc6d3bfd23b1feaa5d14cc0821a4c39fdf5eee3d134a8ed9bbcb5e503ee31d3864185c57bb0fcb788744f2d SHA512 f5a721eee6d0ebd37e67cdb5f89aba81136eb4ac23bc042b7d9bedd6a33f96f913353e1d83ec91e6997a8eea5e2834d9203eb7cd286eed1157149ecedeab6b89 -DIST kirigami-addons-1.0.1.tar.xz 981996 BLAKE2B 5e43541925fe11a96771d82f5677e695898816abafa020a20cee6c7e68d8b989d32a66af50d203069332732dcfb50a0071a787f594511ce2b6aeff7cb8aabe73 SHA512 d4f179ff6b1fa00bbf053304588d573feb23760894cb26da9c0a19997026ae7b381c8f90c6695073c69b478fe9aea7f0fec465bcd25c184ec523d02f515f2002 +DIST kirigami-addons-1.2.1.tar.xz 1157936 BLAKE2B 0df5296ac7985d3dfda8c486275938282eee97d94b118be38714549958205d1d6515faa78e3a5347bd11db34535a6cc2f973ff955bd3e1e10c5bb4a96b1f313d SHA512 bdb635f147cb78d0b92bda2c72c72577682cbc3965c232d106113b5de4fb9193e1d18d409d6bc7af2b2aebc613d0c175a27b294e7259bf08e3c41db1ef0601f3 diff --git a/dev-libs/kirigami-addons/kirigami-addons-1.0.1.ebuild b/dev-libs/kirigami-addons/kirigami-addons-1.2.1.ebuild index db9c3d6864e1..6dbb76533a46 100644 --- a/dev-libs/kirigami-addons/kirigami-addons-1.0.1.ebuild +++ b/dev-libs/kirigami-addons/kirigami-addons-1.2.1.ebuild @@ -5,7 +5,7 @@ EAPI=8 ECM_QTHELP="true" ECM_TEST="true" -KFMIN=5.249.0 +KFMIN=6.2.0 QTMIN=6.6.2 inherit ecm kde.org @@ -42,9 +42,3 @@ DEPEND="${COMMON_DEPEND} x11-themes/sound-theme-freedesktop ) " - -src_prepare() { - ecm_src_prepare - - sed -e "/set(KF_MIN_VERSION/s/6.0.0/5.249.0/" -i CMakeLists.txt || die -} diff --git a/dev-libs/kopeninghours/Manifest b/dev-libs/kopeninghours/Manifest index 70caa30f8e66..9f9207f56eb8 100644 --- a/dev-libs/kopeninghours/Manifest +++ b/dev-libs/kopeninghours/Manifest @@ -1,2 +1,2 @@ DIST kopeninghours-23.08.5.tar.xz 72568 BLAKE2B 84e418d95f4a7261786a101882000bed0ca721931cc419e0330edb0f659e38459063d49c75ca643d169e9326ed66694130cfeebef51183c89e02efd02f6f3133 SHA512 a95cd3c446699d8bd95f2f746cb8b4187c7d2027067e5c731afe371a3313a5569780110e8acbf52d125da673aff4b2567da9f2b8c07a4412cf1d7540baad7a14 -DIST kopeninghours-24.02.1.tar.xz 73344 BLAKE2B 4102d4040cea716bf1c12faca7aebf46d22636d2360c554d281f1b67ac9fa46d9b45a7d2d2a84500b2169a7639f1f892bd85899493f2bef0ebcc58f42802655a SHA512 126426103cff6974fa995356df67988dd8438e20ec2d9aa407e396d6971b2fe422e1009331d4d740da4a04eb04ac83eb2b493766b7d7af04209779ed6b9358da +DIST kopeninghours-24.05.0.tar.xz 74620 BLAKE2B f66cca8f28442b15c27d27dc06638de40f249d19a5cb3a6249b4c3d126aa550a9ff19765defb94d0ade27b1fbb1dfda4aa5b4277bc5733406da90b7ad039c70f SHA512 73b74a16b3db5f23e757a482f719669d8027d1c9277decf8f858607e5a75e824245bdf17eb7130a6c0825dbeac85adc056fb86e5f8a93fc37b7f75193e646b4b diff --git a/dev-libs/kopeninghours/kopeninghours-24.02.1.ebuild b/dev-libs/kopeninghours/kopeninghours-24.05.0.ebuild index 796172457765..796172457765 100644 --- a/dev-libs/kopeninghours/kopeninghours-24.02.1.ebuild +++ b/dev-libs/kopeninghours/kopeninghours-24.05.0.ebuild diff --git a/dev-libs/kosmindoormap/Manifest b/dev-libs/kosmindoormap/Manifest index c67e93bfdae8..d63dfb53ee7b 100644 --- a/dev-libs/kosmindoormap/Manifest +++ b/dev-libs/kosmindoormap/Manifest @@ -1,2 +1,2 @@ DIST kosmindoormap-23.08.5.tar.xz 384948 BLAKE2B 0936fe42b0c370dc0c57d475aa771784c75e8350e2d563140c027d047514840f99d6697e36fde027da11e22a92239b6403cf1b18a37aa8e09a3f8814cb6931c8 SHA512 9128cccbd56f51b1e8ad7f7151db0de8952a8348fb74afe3eefeb085979b26d95d1699f260d744c4f3ea5d815109f998829625db480194a8539e782e8c32537c -DIST kosmindoormap-24.02.1.tar.xz 634452 BLAKE2B 4ee7b5da52acf8572604950521fa3bd36da542672b47f3cd07266a394d6745ca7da3994c96663fd529ac9667648f3a9615a2741a8304b26bb97d589dadad4556 SHA512 b81a080f0f9203d50e56356529db4257157bd3604310643965b9e02323d07632cb21b7bf90e6093b5c718e16b7c09c7e95712a91314063aae0bdf99f76704a14 +DIST kosmindoormap-24.05.0.tar.xz 645940 BLAKE2B 3d358e1fddc6b1cd9671939594fd2382ed5317ecd62cf006cbc5075d583731d3e11f810a173dbbdb733612acdc13e80d6d39ddf6782f659eb13e4f5dbc61de9e SHA512 8668493ae241770f57e2e3259fd207600174ae7d23e5c9d0c8d1953c3dcb0921b157004008f3d2aaf6698afd5c5f7f78918ce5d9e4c8d8a5fb3d8305103fb59d diff --git a/dev-libs/kosmindoormap/kosmindoormap-24.02.1.ebuild b/dev-libs/kosmindoormap/kosmindoormap-24.05.0.ebuild index 48e9a9cd47c9..48e9a9cd47c9 100644 --- a/dev-libs/kosmindoormap/kosmindoormap-24.02.1.ebuild +++ b/dev-libs/kosmindoormap/kosmindoormap-24.05.0.ebuild diff --git a/dev-libs/kpublictransport/Manifest b/dev-libs/kpublictransport/Manifest index 638956e890f2..d25f0fe87059 100644 --- a/dev-libs/kpublictransport/Manifest +++ b/dev-libs/kpublictransport/Manifest @@ -1,2 +1,2 @@ DIST kpublictransport-23.08.5.tar.xz 572952 BLAKE2B 9628dfba5f73b76594b3bb97b7e4996267f9bb7f9acc024de003e28dd9754bf1c7226eb85aeae27784752356688abe28ec85b93b028c863f2c8edf9d645fd54d SHA512 43c58c14ee5827579ffcf97c42c4ac844f49c05f5e68f441c6d3d2a32bf074de08f7daf14b3ca32b25101215943601204837e5ad4e7841cd9984745769b4008f -DIST kpublictransport-24.02.1.tar.xz 605936 BLAKE2B d0cedc5fc1295eff47d1f7d35b91b70cc2d4577c88d48a82e10d26143f5099f6668054e4af5ca961bc47af40d72ad28d149c329c3ae5f08655ae89ad89e5ecfa SHA512 e3301da676a68bfbc718504583d41af20d57dc9f56fa1578a595d9ac926a77de65d5ca102452bb3a26dad359d2326b63ee0c442f99121554070e69775a0d7a59 +DIST kpublictransport-24.05.0.tar.xz 667656 BLAKE2B 07c608a9a4585b93699dec39b32bc0497d7f7b83b7673239c0a4cece2bbffc017dd2f2230dd4ddf0e8f6c672ed0183ac1455ffa8329197afc8b9ccafc806ea19 SHA512 8f746ef0871952cd8652e4de4693532b6a517eb36d409d6dbbe0f143622aaaa3ef50370115c130d86e5209dedd5b861f7f2357f7bf916cec9b03ce61cf15ffc7 diff --git a/dev-libs/kpublictransport/kpublictransport-24.02.1.ebuild b/dev-libs/kpublictransport/kpublictransport-24.05.0.ebuild index d68e9ad160b2..d68e9ad160b2 100644 --- a/dev-libs/kpublictransport/kpublictransport-24.02.1.ebuild +++ b/dev-libs/kpublictransport/kpublictransport-24.05.0.ebuild diff --git a/dev-libs/kreport/kreport-3.2.0-r3.ebuild b/dev-libs/kreport/kreport-3.2.0-r3.ebuild index de7477e25d74..d616a54c4a74 100644 --- a/dev-libs/kreport/kreport-3.2.0-r3.ebuild +++ b/dev-libs/kreport/kreport-3.2.0-r3.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_QTHELP="true" ECM_TEST="true" -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{9..12} ) KFMIN=5.82.0 QTMIN=5.15.2 VIRTUALX_REQUIRED="test" diff --git a/dev-libs/leatherman/Manifest b/dev-libs/leatherman/Manifest index 4321fde65787..7ca6271a9449 100644 --- a/dev-libs/leatherman/Manifest +++ b/dev-libs/leatherman/Manifest @@ -1 +1,2 @@ DIST leatherman-1.12.12.tar.gz 818006 BLAKE2B b8174da6ae3f981b9ef44728069502264585b6ec8602125e54e2747c6f4ce1755979c4c7337af176bba234dcb6415acdbdff69b1a4c60ec87b69892043b91353 SHA512 b4041ec59dd716e599c12c31dd5401542efe0739abfc9d508b56dc759ca9bdeb29daac87b626d416f5339fca8909cfa98653a24a39b32bb1cd04baf99c6f1d92 +DIST leatherman-1.12.13.tar.gz 818810 BLAKE2B 3caf99e7a266703e4c84797ecdb5f4006474c5bc7014dee2dddcbf51ec38c0337027c8ee49c52a54d68450abf57605a8482b52d6a63a0fe5f4eeb554adea90c7 SHA512 5d45036839270690f8f6649ea82d3800eec89a6fff92416a2e9831a177a1ddd6b42a33bc8af94a410c65c768c962b5fafc696f579f3de411b41cb5ae88b1372f diff --git a/dev-libs/leatherman/leatherman-1.12.13.ebuild b/dev-libs/leatherman/leatherman-1.12.13.ebuild new file mode 100644 index 000000000000..8f059cdc447e --- /dev/null +++ b/dev-libs/leatherman/leatherman-1.12.13.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +DESCRIPTION="A C++ toolkit" +HOMEPAGE="https://github.com/puppetlabs/leatherman" +SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/${PV}" +KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv sparc x86" +IUSE="debug static-libs test" +#RESTRICT="!test? ( test )" +RESTRICT="test" # restricted til we don't need the shared_nowide patch + +RDEPEND="dev-libs/boost:=[nls] + net-misc/curl" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/portage-sandbox-test-fix.patch + "${FILESDIR}"/1.12.2-shared_nowide.patch +) + +src_prepare() { + sed -i 's/\-Werror\ //g' "cmake/cflags.cmake" || die + # vendored boost lib conflicts with boost 1.73 and above + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DCMAKE_VERBOSE_MAKEFILE=ON + -DCMAKE_BUILD_TYPE=None + -DLEATHERMAN_ENABLE_TESTING=$(usex test) + # We depend on Boost with nls, so this is always true + -DLEATHERMAN_USE_ICU=ON + + -DLEATHERMAN_SHARED=$(usex !static-libs) + ) + + if use debug; then + mycmakeargs+=( + -DCMAKE_BUILD_TYPE=Debug + ) + fi + + cmake_src_configure +} + +src_test() { + "${WORKDIR}/${P}"_build/bin/leatherman_test || die +} diff --git a/dev-libs/level-zero/Manifest b/dev-libs/level-zero/Manifest index 2c63c68a3708..6cababb930b4 100644 --- a/dev-libs/level-zero/Manifest +++ b/dev-libs/level-zero/Manifest @@ -1,2 +1,3 @@ -DIST level-zero-1.15.8.tar.gz 937224 BLAKE2B b433e5ae2396715cd58bdce508d22b44f6b3083a4686f26dfba8a2117ea7547955bedf454d75c06a66e2c36ab4478da345fc86479486d50290ec96cf751a0b23 SHA512 68e531af5a39c8a6a2e242b25871d9177b2c8079837e0f736829ec0959fdb021eb518849e340a0f94abbe8ef879e3fb33e8b277eb676d2f8889bf2f4c3c10d82 -DIST level-zero-1.16.1.tar.gz 999641 BLAKE2B 845964416526428d4848ccc3beebf0eac426ba39ce292cea3dced13803dbeb1d4393930b46a60fc2c59dc9e2f4bba1188b211a57574c58fb7180c44b7a8a028b SHA512 c53b5663494613b7a536816bf8367895aa055ce74d9abc8e8aacc3efb7c081de60480d03693861e2b348698b7da6224ac21fb590bf9311d342a19ca4f416b051 +DIST level-zero-1.16.15.tar.gz 1001798 BLAKE2B 176a2152f9dbc292d221b3a75f7fbf28b863eb2fc3d83e54d3b0b7d504cde866ce376bd57d30b64f4619297732480c7a9add60538953a0cb600af43e465eaf65 SHA512 37f1770f1bfa71fa08d56afed53a4dd1107ff36d8790f7bb0f921237d9d0e90076ef22349e8f289cf8f154ca0e1e0fff6a7dcd55b71468989322b9892962b874 +DIST level-zero-1.17.0.tar.gz 1003951 BLAKE2B 10b7f7513b42e9f4c7671957959c0f7ff1ba3a05c2f39f23964b415e1b1984ae40d13be92c1a2587711181ac35b46d9f1132637aa41c2dfceef2f39f96ac35f6 SHA512 97b9d06b5cd84b1644ca252ac5009d1350f8c72aeb908a3b93bf8e07f91354589ce4fffdd8069b301eac6b704489ca04022aa4a44a7269bc0da3ace7103b5802 +DIST level-zero-1.17.6.tar.gz 1136720 BLAKE2B 89aae9aad33f2aaebb1231dd0cd6aadde692f390fbbfd59933e8df06dc1c5bdd190cdf2887f1f43915f68da130e80e9451359269f8bec6f546f6004214552c13 SHA512 bb412e875d97d1c80a0e67087e6dac1a6ffb91fa50e22deb7649ee3250c0937679d225419b52bfd7938f71a66ac15742a6a215cee7714c27e0f935e04df5b88e diff --git a/dev-libs/level-zero/files/level-zero-1.16.14-spdlog-libfmt.patch b/dev-libs/level-zero/files/level-zero-1.16.14-spdlog-libfmt.patch new file mode 100644 index 000000000000..4d9264e0c49c --- /dev/null +++ b/dev-libs/level-zero/files/level-zero-1.16.14-spdlog-libfmt.patch @@ -0,0 +1,60 @@ +Find the system copy of spdlog which then tells us how to link +against both it & libfmt correctly, rather than accidentally +picking up system spdlog headers and nothing else (defines, needed +libraries, etc) when (for some reason?) FetchContent fails and we don't +realise it. + +TODO: Figure out why FetchContent(?) failing doesn't kill the build +TODO: Add a proper option for this to use the system copy/not + +Bug: https://bugs.gentoo.org/930157 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -57,9 +57,6 @@ elseif(Git_FOUND) + endif() + endif() + +-include(FetchContent) +-set(SPDLOG_ROOT "${FETCHCONTENT_BASE_DIR}/spdlog-src") +- + # Update other relevant variables to include the patch + set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}") + set(CMAKE_PROJECT_VERSION_PATCH "${PROJECT_VERSION_PATCH}") +@@ -166,7 +163,6 @@ endif() + + include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include) + include_directories(${CMAKE_CURRENT_SOURCE_DIR}/source/wrapper/include) +-include_directories(${SPDLOG_ROOT}/include) + + include_directories("${CMAKE_CURRENT_SOURCE_DIR}") + +diff --git a/source/utils/CMakeLists.txt b/source/utils/CMakeLists.txt +index cb6cfb1..4e486d8 100644 +--- a/source/utils/CMakeLists.txt ++++ b/source/utils/CMakeLists.txt +@@ -1,23 +1,11 @@ + # Copyright (C) 2024 Intel Corporation + # SPDX-License-Identifier: MIT + +-include(FetchContent) +-set(SPDLOG_REPO https://github.com/gabime/spdlog) +-set(SPDLOG_TAG v1.13.0) +-FetchContent_Declare( +- spdlog +- GIT_REPOSITORY ${SPDLOG_REPO} +- GIT_TAG ${SPDLOG_TAG} +-) +-FetchContent_makeAvailable(spdlog) ++find_package(spdlog) + + add_library(utils +- STATIC + "logging.h" + "logging.cpp" + ) + +-target_include_directories(utils +- PUBLIC +- ${FETCHCONTENT_BASE_DIR}/spdlog-src/include +-) ++target_link_libraries(utils spdlog::spdlog) diff --git a/dev-libs/level-zero/level-zero-1.15.8.ebuild b/dev-libs/level-zero/level-zero-1.16.15.ebuild index 2633bc02fc74..ee41278ec5f6 100644 --- a/dev-libs/level-zero/level-zero-1.15.8.ebuild +++ b/dev-libs/level-zero/level-zero-1.16.15.ebuild @@ -13,6 +13,14 @@ LICENSE="MIT" SLOT="0/${PV}" KEYWORDS="amd64" +RDEPEND=" + dev-libs/libfmt:= + dev-libs/spdlog:= +" +DEPEND="${RDEPEND}" + +PATCHES=( "${FILESDIR}/${PN}-1.16.14-spdlog-libfmt.patch" ) + src_prepare() { # Don't hardcore -Werror sed -e 's/-Werror//g' -i CMakeLists.txt || die diff --git a/dev-libs/level-zero/level-zero-1.17.0.ebuild b/dev-libs/level-zero/level-zero-1.17.0.ebuild new file mode 100644 index 000000000000..64493a4f0926 --- /dev/null +++ b/dev-libs/level-zero/level-zero-1.17.0.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 + +DESCRIPTION="oneAPI Level Zero headers, loader and validation layer" +HOMEPAGE="https://github.com/oneapi-src/level-zero" +SRC_URI="https://github.com/oneapi-src/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="~amd64" + +RDEPEND=" + dev-libs/libfmt:= + dev-libs/spdlog:= +" +DEPEND="${RDEPEND}" + +PATCHES=( "${FILESDIR}/${PN}-1.16.14-spdlog-libfmt.patch" ) + +src_prepare() { + # Don't hardcore -Werror + sed -e 's/-Werror//g' -i CMakeLists.txt || die + + cmake_src_prepare + + # According to upstream, release tarballs should contain this file but at least + # some of them do not. Fortunately it is trivial to make one ourselves. + echo "$(ver_cut 3)" > "${S}"/VERSION_PATCH || die +} diff --git a/dev-libs/level-zero/level-zero-1.16.1.ebuild b/dev-libs/level-zero/level-zero-1.17.6.ebuild index 5c75496434ba..0067ea74bc54 100644 --- a/dev-libs/level-zero/level-zero-1.16.1.ebuild +++ b/dev-libs/level-zero/level-zero-1.17.6.ebuild @@ -13,6 +13,8 @@ LICENSE="MIT" SLOT="0/${PV}" KEYWORDS="~amd64" +DEPEND="${RDEPEND}" + src_prepare() { # Don't hardcore -Werror sed -e 's/-Werror//g' -i CMakeLists.txt || die diff --git a/dev-libs/leveldb/leveldb-1.23-r5.ebuild b/dev-libs/leveldb/leveldb-1.23-r6.ebuild index b484578cd53d..c963638d5fd9 100644 --- a/dev-libs/leveldb/leveldb-1.23-r5.ebuild +++ b/dev-libs/leveldb/leveldb-1.23-r6.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 @@ -41,6 +41,7 @@ src_configure() { -DHAVE_SNAPPY=$(usex snappy) -DHAVE_TCMALLOC=$(usex tcmalloc) -DLEVELDB_BUILD_TESTS=$(usex test) + -DHAVE_CLANG_THREAD_SAFETY=OFF # adds -Werror to current build and all revdeps ) cmake_src_configure } diff --git a/dev-libs/libaio/libaio-0.3.113-r1.ebuild b/dev-libs/libaio/libaio-0.3.113-r1.ebuild index b931b5e9c63d..0206e9375e8f 100644 --- a/dev-libs/libaio/libaio-0.3.113-r1.ebuild +++ b/dev-libs/libaio/libaio-0.3.113-r1.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://pagure.io/libaio.git" else SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" fi LICENSE="LGPL-2" diff --git a/dev-libs/libassuan/libassuan-2.5.7.ebuild b/dev-libs/libassuan/libassuan-2.5.7.ebuild index 9ad4f60dc2ee..563357cfc0cd 100644 --- a/dev-libs/libassuan/libassuan-2.5.7.ebuild +++ b/dev-libs/libassuan/libassuan-2.5.7.ebuild @@ -19,7 +19,7 @@ SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )" LICENSE="GPL-3 LGPL-2.1" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" # Note: On each bump, update dep bounds on each version from configure.ac! RDEPEND=">=dev-libs/libgpg-error-1.33" diff --git a/dev-libs/libbpf/Manifest b/dev-libs/libbpf/Manifest index 0fcc48146945..930e6db27407 100644 --- a/dev-libs/libbpf/Manifest +++ b/dev-libs/libbpf/Manifest @@ -1,3 +1,5 @@ DIST libbpf-0.8.1.tar.gz 942702 BLAKE2B 084be7d4258500fa894560ed2e52821addcc5d150dcd77fd646271b614d788b7931271be9c3e46fdbc4ed93d053ea3e09023158a8e4a31f9452d10dcb0677b58 SHA512 e3bb602f55215a4f030e564af7321ba6338937c426fcaee478b607f88b0c773c40a0c3f59a2b345bda951a19e79061733f8a3fdc10a6292e92782e65754b584a DIST libbpf-1.2.2.tar.gz 1000104 BLAKE2B 45a2ceabd38b3ea55f466de68d0806df6ae802b509063ca12d670ba972bac3dc5c7e518e8c9904915dbc9877c27ea892a7b857aa03d4e86016969b2d278b0b4a SHA512 bc7620207e6f521b9b5baab00bd81346084b8eabf81bff3ec24e5367d389f2a331a0b082798f8bb5d4fea836c3c0cc961fc881abc3a4e05d91152150bdfe47be DIST libbpf-1.3.0.tar.gz 999282 BLAKE2B 5ee0a45cd06be482c9523ec2a9bb26cf12b89df23f515b037badda868770069d5ffb751c011222b86b1d43034a1cdd537cb263883ed0645641548adc9c9896eb SHA512 59990189538e47765542e9ed6e88bc78c9d29bc077b5666bb1303cf15579c90b3d35a0d631b9bbd4bff2708243dc91d901bd68c119fb74dfd10a3e1066aa9acc +DIST libbpf-1.4.0.tar.gz 1015490 BLAKE2B 46932f972201581f9f5be98063888216fd522ac549561efdec09603dfcbf0132418f50c2aed80d656fd25b235a9dc3b4ffe459cab9445a8508a7af620989072f SHA512 400c91a4870be8bb115f7abcc12c460700980fb6a3afdf43c885b1cdbe28fed1d37142d3987a85e12b4c565787a48f5cd0b07cafff067d91902d70713528929f +DIST libbpf-1.4.2.tar.gz 1016045 BLAKE2B 7529e6521337d45210ee2e3d00aae7c8cac309a4b3f36ffdd9c4a6c4439f266ee654b6ad6abaea2e43310260182bd9ad52ff162339545027050329d8307fe0d5 SHA512 b0faf45e77fc0197239b87d74010bad6b7ef7d48c1b3de2a3960164d9029851e2ad204b92d0cccb2fde2d0dfe44d9fa7f24b35a4917179dbab1bee192d3780db diff --git a/dev-libs/libbpf/libbpf-1.4.0.ebuild b/dev-libs/libbpf/libbpf-1.4.0.ebuild new file mode 100644 index 000000000000..6cd9245fc9a6 --- /dev/null +++ b/dev-libs/libbpf/libbpf-1.4.0.ebuild @@ -0,0 +1,65 @@ +# Copyright 2019-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic toolchain-funcs + +DESCRIPTION="Stand-alone build of libbpf from the Linux kernel" +HOMEPAGE="https://github.com/libbpf/libbpf" + +if [[ ${PV} =~ [9]{4,} ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/libbpf/libbpf.git" +else + SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +fi +S="${WORKDIR}/${P}/src" + +LICENSE="GPL-2 LGPL-2.1 BSD-2" +SLOT="0/$(ver_cut 1-2 ${PV})" +IUSE="static-libs" + +DEPEND=" + sys-kernel/linux-headers + virtual/libelf +" +RDEPEND=" + ${DEPEND} +" +BDEPEND=" + virtual/pkgconfig +" + +DOCS=( + ../{README,SYNC}.md +) + +PATCHES=( + "${FILESDIR}"/libbpf-9999-paths.patch +) + +src_configure() { + append-cflags -fPIC + tc-export CC AR PKG_CONFIG + export LIBSUBDIR="$(get_libdir)" + export PREFIX="${EPREFIX}/usr" + export V=1 +} + +src_install() { + emake \ + DESTDIR="${D}" \ + LIBSUBDIR="${LIBSUBDIR}" \ + install install_uapi_headers + + if ! use static-libs; then + find "${ED}" -name '*.a' -delete || die + fi + + dodoc "${DOCS[@]}" + + insinto /usr/$(get_libdir)/pkgconfig + doins ${PN}.pc +} diff --git a/dev-libs/libbpf/libbpf-1.4.2.ebuild b/dev-libs/libbpf/libbpf-1.4.2.ebuild new file mode 100644 index 000000000000..6cd9245fc9a6 --- /dev/null +++ b/dev-libs/libbpf/libbpf-1.4.2.ebuild @@ -0,0 +1,65 @@ +# Copyright 2019-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic toolchain-funcs + +DESCRIPTION="Stand-alone build of libbpf from the Linux kernel" +HOMEPAGE="https://github.com/libbpf/libbpf" + +if [[ ${PV} =~ [9]{4,} ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/libbpf/libbpf.git" +else + SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +fi +S="${WORKDIR}/${P}/src" + +LICENSE="GPL-2 LGPL-2.1 BSD-2" +SLOT="0/$(ver_cut 1-2 ${PV})" +IUSE="static-libs" + +DEPEND=" + sys-kernel/linux-headers + virtual/libelf +" +RDEPEND=" + ${DEPEND} +" +BDEPEND=" + virtual/pkgconfig +" + +DOCS=( + ../{README,SYNC}.md +) + +PATCHES=( + "${FILESDIR}"/libbpf-9999-paths.patch +) + +src_configure() { + append-cflags -fPIC + tc-export CC AR PKG_CONFIG + export LIBSUBDIR="$(get_libdir)" + export PREFIX="${EPREFIX}/usr" + export V=1 +} + +src_install() { + emake \ + DESTDIR="${D}" \ + LIBSUBDIR="${LIBSUBDIR}" \ + install install_uapi_headers + + if ! use static-libs; then + find "${ED}" -name '*.a' -delete || die + fi + + dodoc "${DOCS[@]}" + + insinto /usr/$(get_libdir)/pkgconfig + doins ${PN}.pc +} diff --git a/dev-libs/libbpf/libbpf-9999.ebuild b/dev-libs/libbpf/libbpf-9999.ebuild index 4bc4f9eafffd..a666bd28bfd5 100644 --- a/dev-libs/libbpf/libbpf-9999.ebuild +++ b/dev-libs/libbpf/libbpf-9999.ebuild @@ -1,10 +1,13 @@ -# Copyright 2019-2022 Gentoo Authors +# Copyright 2019-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 inherit flag-o-matic toolchain-funcs +DESCRIPTION="Stand-alone build of libbpf from the Linux kernel" +HOMEPAGE="https://github.com/libbpf/libbpf" + if [[ ${PV} =~ [9]{4,} ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/libbpf/libbpf.git" @@ -14,18 +17,24 @@ else fi S="${WORKDIR}/${P}/src" -DESCRIPTION="Stand-alone build of libbpf from the Linux kernel" -HOMEPAGE="https://github.com/libbpf/libbpf" - LICENSE="GPL-2 LGPL-2.1 BSD-2" SLOT="0/$(ver_cut 1-2)" IUSE="static-libs" DEPEND=" sys-kernel/linux-headers - virtual/libelf" -RDEPEND="${DEPEND}" -BDEPEND="virtual/pkgconfig" + virtual/libelf +" +RDEPEND=" + ${DEPEND} +" +BDEPEND=" + virtual/pkgconfig +" + +DOCS=( + ../{README,SYNC}.md +) PATCHES=( "${FILESDIR}"/libbpf-9999-paths.patch @@ -49,6 +58,8 @@ src_install() { find "${ED}" -name '*.a' -delete || die fi + dodoc "${DOCS[@]}" + insinto /usr/$(get_libdir)/pkgconfig doins ${PN}.pc } diff --git a/dev-libs/libburn/libburn-1.5.6-r1.ebuild b/dev-libs/libburn/libburn-1.5.6-r1.ebuild index 4fbb4fffbea8..eb026ac0af78 100644 --- a/dev-libs/libburn/libburn-1.5.6-r1.ebuild +++ b/dev-libs/libburn/libburn-1.5.6-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://files.libburnia-project.org/releases/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86" IUSE="debug static-libs" BDEPEND=" diff --git a/dev-libs/libburn/libburn-1.5.6.ebuild b/dev-libs/libburn/libburn-1.5.6.ebuild deleted file mode 100644 index 3af82ed1e139..000000000000 --- a/dev-libs/libburn/libburn-1.5.6.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="Open-source library for reading, mastering and writing optical discs" -HOMEPAGE="https://dev.lovelyhq.com/libburnia/web/wiki/Libburn" -SRC_URI="https://files.libburnia-project.org/releases/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="debug static-libs" - -BDEPEND=" - virtual/pkgconfig -" -DEPEND=" - ${RDEPEND} -" - -src_configure() { - econf \ - $(use_enable static-libs static) \ - --disable-ldconfig-at-install \ - $(use_enable debug) -} - -src_install() { - default - - dodoc CONTRIBUTORS doc/{comments,*.txt} - - docinto cdrskin - dodoc cdrskin/{*.txt,README} - docinto cdrskin/html - dodoc cdrskin/cdrskin_eng.html - - find "${D}" -name '*.la' -delete || die -} diff --git a/dev-libs/libcbor/Manifest b/dev-libs/libcbor/Manifest index 1fa282b57312..2e079000a927 100644 --- a/dev-libs/libcbor/Manifest +++ b/dev-libs/libcbor/Manifest @@ -1 +1,2 @@ DIST libcbor-0.10.2.tar.gz 289450 BLAKE2B 3ef2d7fd7942ff32acbe59db6a4b68ad72dde3af4675ef2ee3c93666360554d6e9a29392dbc4fb3029f9ff821f536b90bfd1c522c9c9c2298ab511322fb53d37 SHA512 23c6177443778d4b4833ec7ed0d0e639a0d4863372e3a38d772fdce2673eae6d5cb2a31a2a021d1a699082ea53494977c907fd0e94149b97cb23a4b6d039228a +DIST libcbor-0.11.0.tar.gz 293563 BLAKE2B 6ac400ee9cabb0ec68355c35f762ea61222152059e70bcf9dc3cf4e06a6599bb6a392197ee979821a0e50c22a5c9e94e5d11458178ed7e26b049c410fddfa24f SHA512 c14aaa55c0c82e09b9eb2cc6847951d1bac8a081a247776c507d5450367da5717b1056bad09fb0f0178311de8754e8f89c060e0fc0f400fafdc42de441421e66 diff --git a/dev-libs/libcbor/libcbor-0.11.0.ebuild b/dev-libs/libcbor/libcbor-0.11.0.ebuild new file mode 100644 index 000000000000..b95c8a94c22b --- /dev/null +++ b/dev-libs/libcbor/libcbor-0.11.0.ebuild @@ -0,0 +1,70 @@ +# Copyright 2020-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 cmake + +DESCRIPTION="CBOR protocol implementation for C and others" +HOMEPAGE="https://github.com/pjk/libcbor" +SRC_URI="https://github.com/PJK/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +IUSE="doc test" + +BDEPEND=" + doc? ( + $(python_gen_any_dep ' + dev-python/sphinx[${PYTHON_USEDEP}] + dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}] + dev-python/breathe[${PYTHON_USEDEP}] + ') + ) + test? ( dev-util/cmocka ) +" + +RESTRICT="!test? ( test )" + +python_check_deps() { + python_has_version \ + "dev-python/sphinx[${PYTHON_USEDEP}]" \ + "dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]" \ + "dev-python/breathe[${PYTHON_USEDEP}]" +} + +pkg_setup() { + use doc && python-any-r1_pkg_setup +} + +src_configure() { + local mycmakeargs=( + -DCMAKE_BUILD_TYPE=Release + -DWITH_TESTS=$(usex test 'ON' 'OFF') + -Wno-dev + ) + + cmake_src_configure +} + +src_compile() { + cmake_src_compile + + if use doc; then + mkdir -p doc/build || die + pushd doc >/dev/null || die + emake -j1 html man + popd >/dev/null || die + fi +} + +src_install() { + cmake_src_install + + if use doc; then + dodoc -r "${S}"/doc/build/html + doman "${S}"/doc/build/man/*.? + fi +} diff --git a/dev-libs/libcec/libcec-6.0.2-r2.ebuild b/dev-libs/libcec/libcec-6.0.2-r2.ebuild index 9d3d2bf12bb9..eb9dc1969acd 100644 --- a/dev-libs/libcec/libcec-6.0.2-r2.ebuild +++ b/dev-libs/libcec/libcec-6.0.2-r2.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) MY_PV=${PV/_p/-} MY_P=${PN}-${MY_PV} -inherit cmake linux-info python-single-r1 toolchain-funcs udev +inherit cmake linux-info python-single-r1 udev DESCRIPTION="Library for communicating with the Pulse-Eight USB HDMI-CEC Adaptor" HOMEPAGE="https://libcec.pulse-eight.com" @@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${MY_P}" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" +KEYWORDS="amd64 ~arm arm64 ~riscv x86" IUSE="cubox exynos kernel-cec python tools udev +xrandr" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" diff --git a/dev-libs/libcgroup/libcgroup-0.41-r6.ebuild b/dev-libs/libcgroup/libcgroup-0.41-r6.ebuild index 0c4c21f022b8..623f41b99e99 100644 --- a/dev-libs/libcgroup/libcgroup-0.41-r6.ebuild +++ b/dev-libs/libcgroup/libcgroup-0.41-r6.ebuild @@ -7,7 +7,7 @@ inherit autotools flag-o-matic linux-info pam systemd DESCRIPTION="Tools and libraries to configure and manage kernel control groups" HOMEPAGE="http://libcg.sourceforge.net/" -SRC_URI="mirror://sourceforge/project/libcg/${PN}/v${PV}/${P}.tar.bz2" +SRC_URI="https://downloads.sourceforge.net/project/libcg/${PN}/v${PV}/${P}.tar.bz2" LICENSE="LGPL-2.1" SLOT="0" diff --git a/dev-libs/libclc/Manifest b/dev-libs/libclc/Manifest index beaf87582ac7..9fbdd9c8f8ba 100644 --- a/dev-libs/libclc/Manifest +++ b/dev-libs/libclc/Manifest @@ -4,7 +4,7 @@ DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db3659 DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447 DIST llvm-project-17.0.6.src.tar.xz 127838860 BLAKE2B d6ede1a9fda8756995c3e0654111941649e15794179641806f18919f1dc68c41ca0cabd5693b5096d05dccc3a391cd20d34af1137bf8af92ed3117a1ce84d1b2 SHA512 6d85bf749e0d77553cc215cbfa61cec4ac4f4f652847f56f946b6a892a99a5ea40b6ab8b39a9708a035001f007986941ccf17e4635260a8b0c1fa59e78d41e30 DIST llvm-project-17.0.6.src.tar.xz.sig 438 BLAKE2B 186e75b6a0fbfe1e85408589c149e1800fcc47d685b74e4260018e05cd08bc793d1d1197c9c50e177eea941a3d0c65cb0c583ce6dae449099b920adf8a508ef7 SHA512 f78c55053a6450625f3e95f52c305110b4468a9854fec75831b65b8d6ceee3c9206ab9e63c4b5fda8be9bd344f72cfbdaae0520ed240abd505e08ebeaa25d340 -DIST llvm-project-18.1.2.src.tar.xz 132060436 BLAKE2B f21fca02fe9e02a3d440595aafbe0572be318ce69cc6285c1bf3dc9187b37ebf4c76f3ea60b6870c441675288f46e5597b069ec451d5026c5161f84daef6b4b2 SHA512 a0d01b018abbdf1609abc7b63911bb4c6c3619b748a0616b66be0843fcaa4240868412c5d1f77fe6dafdfed665b46570e7ce615da58efcaa91e9ddc8481e6fc4 -DIST llvm-project-18.1.2.src.tar.xz.sig 566 BLAKE2B 97c6b6b4a041316e70abd54ff715d87a62410fe5590c9b90548fff5a5121d8d5e028ec681f7e99c130d6c6726835365825286ef0a01c82a98394d9369ea7a390 SHA512 1cd8d1c227782cb43e269696045cea500a43f3c6b786f2cda8d380f5b8fc28d3ada11c41c4a252f2d3db465f767b27ea50c5659faa43d4aa5655cc3ffd6243c2 -DIST llvm-project-6d3cec01a6c29fa4e51ba129fa13dbf55d2b928e.tar.gz 207700152 BLAKE2B 855720b7a9cc7b1d8fdf398394eb5c702dd615c04e7dad51c449cb1c2f46e75f2ccf2ee10fa3a3403d6aec29f557023a11bd8cdb525bc9c3d76c79f23cd15e82 SHA512 ff6269158e165907c69bd3e4d2d6b87b4f4670546b7e290d7e6665e7097ec887d71174fa37bf5e1755524317e8ae8f0c7c7e428049e8b553faa52c614f1f4490 -DIST llvm-project-f3cfe016c5d8429c0dccfa6f85442e2ea0d45a58.tar.gz 208184654 BLAKE2B abd35798f7c921866bb221cecc42aa94915271d0804acbf44dbe5640efb787ef9d928c329eacde768fac4292217ed4d3c4187fba02dd1c826059aeaa1bad33f0 SHA512 513f7278367114ba3fe3271e8a790b62adbca97d280968537e44e5df9a7afb467a5ca93480f4d4fb7c4d5c0734d00ab54559bf68c00f09a1fcff2fee492aa84f +DIST llvm-project-18.1.6.src.tar.xz 132064976 BLAKE2B d38d8026068de371dc4bc288c68c8e441a126cf8e89e55a965f3b9e3a629a37d5743fd7859a60bedaddf27ff2da1e0f08c81806871ef542cb7c3f40b23b22cf5 SHA512 89ec276aa41bb2d76cfc3a72d8e728a9ce9176e02c085338b704790524fe329904cf311381805814faa8a6c79637620c01627bf122a51f89e0f3adb47e5df34c +DIST llvm-project-18.1.6.src.tar.xz.sig 566 BLAKE2B 4b4a1ec2f084b0728134b9c04775db5938e571f1d7c7aa45b985bed490dcfd2cceab2069a43d4ce7766faec703310a376b83565af317e5f60bf10bc06a732395 SHA512 fbae037d39f4f1c13babafd42dee719f3d79f0e2142cc319f59fb319361a1db8ce65fa736a0e2a5e702ac49e3b8323374be6cfa1003f96b0887fa1894e2b6dee +DIST llvm-project-702198fc9ac5dba392f9d9ba7c56467996343c0a.tar.gz 211764675 BLAKE2B b28203faf5c4e51236da3e3abac969cffe6f93ce6757a81b5a577187ec236fc0b124fe6a370d1f4e803deab781606a7caf0b411780cc84ee08a8de942c4fc479 SHA512 b4217403abf4166eb8eccfd304bcaa2e15d5b67c4f996d51e0745d197e4b9eda1dd5a5b1d7c384effc25f53bb1229edda9618e172abe3be1a94a9569f7c5b0b7 +DIST llvm-project-7dc2f6602212bf0a0433c157b70e4fc0d70bb730.tar.gz 211903416 BLAKE2B 4a2f12e0aa234d507d2fc2136a1d98a7624147ce6e401831743e640abcaceb5152c80ba2dc312f9256e4a04be2ad065d1a57dbe5dc24f2d3edc9d65888986710 SHA512 c9eb99f666fc15b29f01a1b2a4b3c6edd3a726033533111e60763c6313a4af8c9dba3396856d6650ac5e666d00941efcc944fac85a4483748bbbea9475e6daf8 diff --git a/dev-libs/libclc/libclc-17.0.6.ebuild b/dev-libs/libclc/libclc-17.0.6.ebuild index 7d478ae4c41e..650f9f41f61d 100644 --- a/dev-libs/libclc/libclc-17.0.6.ebuild +++ b/dev-libs/libclc/libclc-17.0.6.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://libclc.llvm.org/" LICENSE="Apache-2.0-with-LLVM-exceptions || ( MIT BSD )" SLOT="0" -KEYWORDS="amd64 ~arm64 ~riscv x86" +KEYWORDS="amd64 arm64 ~riscv x86" IUSE="+spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi" LLVM_MAX_SLOT=17 diff --git a/dev-libs/libclc/libclc-18.1.2.ebuild b/dev-libs/libclc/libclc-18.1.6.ebuild index 1a8008058811..fc25d8e06fa4 100644 --- a/dev-libs/libclc/libclc-18.1.2.ebuild +++ b/dev-libs/libclc/libclc-18.1.6.ebuild @@ -3,7 +3,7 @@ EAPI=8 -LLVM_COMPAT=( 17 ) +LLVM_COMPAT=( {17..18} ) PYTHON_COMPAT=( python3_{10..12} ) inherit cmake llvm.org llvm-r1 python-any-r1 diff --git a/dev-libs/libclc/libclc-19.0.0.9999.ebuild b/dev-libs/libclc/libclc-19.0.0.9999.ebuild index 15a69aca7556..2b8c5e63c257 100644 --- a/dev-libs/libclc/libclc-19.0.0.9999.ebuild +++ b/dev-libs/libclc/libclc-19.0.0.9999.ebuild @@ -3,8 +3,8 @@ EAPI=8 -LLVM_COMPAT=( {15..17} ) -PYTHON_COMPAT=( python3_{10..12} ) +LLVM_COMPAT=( {17..18} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit cmake llvm.org llvm-r1 python-any-r1 DESCRIPTION="OpenCL C library" diff --git a/dev-libs/libclc/libclc-19.0.0_pre20240316.ebuild b/dev-libs/libclc/libclc-19.0.0_pre20240518.ebuild index 15a69aca7556..d57c9ec1fe3a 100644 --- a/dev-libs/libclc/libclc-19.0.0_pre20240316.ebuild +++ b/dev-libs/libclc/libclc-19.0.0_pre20240518.ebuild @@ -3,7 +3,7 @@ EAPI=8 -LLVM_COMPAT=( {15..17} ) +LLVM_COMPAT=( {17..18} ) PYTHON_COMPAT=( python3_{10..12} ) inherit cmake llvm.org llvm-r1 python-any-r1 diff --git a/dev-libs/libclc/libclc-19.0.0_pre20240322.ebuild b/dev-libs/libclc/libclc-19.0.0_pre20240525.ebuild index 15a69aca7556..2b8c5e63c257 100644 --- a/dev-libs/libclc/libclc-19.0.0_pre20240322.ebuild +++ b/dev-libs/libclc/libclc-19.0.0_pre20240525.ebuild @@ -3,8 +3,8 @@ EAPI=8 -LLVM_COMPAT=( {15..17} ) -PYTHON_COMPAT=( python3_{10..12} ) +LLVM_COMPAT=( {17..18} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit cmake llvm.org llvm-r1 python-any-r1 DESCRIPTION="OpenCL C library" diff --git a/dev-libs/libcpuid/Manifest b/dev-libs/libcpuid/Manifest index 48df6d7ae716..5963ebd2359d 100644 --- a/dev-libs/libcpuid/Manifest +++ b/dev-libs/libcpuid/Manifest @@ -1 +1,2 @@ DIST libcpuid-0.6.4.tar.gz 338722 BLAKE2B ad23c13c48b0244f401a60d07fb569712f24b4d1f2bcd16f8d0240c6a39f8afae8944c9d3b4f486d3e1727157d642915c794fc89f9af315a2c4daf64625fdf25 SHA512 5396301d2a5485c6cf15a2fa8eab0ce28d967fe0dcf0776fec3618b963bc786499032150037f6b9123738e094d41583a331bcea25e502b5025ec6f03d318f77e +DIST libcpuid-0.6.5.tar.gz 370297 BLAKE2B 56394c0f99ee514bad115e614a27e3771e3ab0a27c7e980ed50419f6b22c268461db97aed8c879a66894ea34c788ed7a154ea403ec07a552fb524e321aa931e0 SHA512 c38381e0f768a2cd2a5df601cbcc50d1cb93a276c477bc09e69ff61de01aef30c0b3163f4a0c8e7641caa3cf692d468410ebc90a3cad93e0476cddeb0c444d7b diff --git a/dev-libs/libcpuid/libcpuid-0.6.4.ebuild b/dev-libs/libcpuid/libcpuid-0.6.4.ebuild index 75cb5bcb7074..b50a14f5886c 100644 --- a/dev-libs/libcpuid/libcpuid-0.6.4.ebuild +++ b/dev-libs/libcpuid/libcpuid-0.6.4.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=(python3_{9..11}) +PYTHON_COMPAT=(python3_{9..12}) inherit autotools python-any-r1 diff --git a/dev-libs/libcpuid/libcpuid-0.6.5.ebuild b/dev-libs/libcpuid/libcpuid-0.6.5.ebuild new file mode 100644 index 000000000000..b50a14f5886c --- /dev/null +++ b/dev-libs/libcpuid/libcpuid-0.6.5.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=(python3_{9..12}) + +inherit autotools python-any-r1 + +DESCRIPTION="A small C library for x86 (and x86_64) CPU detection and feature extraction" +HOMEPAGE="http://libcpuid.sourceforge.net/" +SRC_URI="https://github.com/anrieff/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +LICENSE="BSD-2" +SLOT="0/16" +KEYWORDS="~amd64" +IUSE="static-libs test" +RESTRICT="!test? ( test )" + +DEPEND="test? ( ${PYTHON_DEPS} )" + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf "$(use_enable static-libs static)" +} + +src_install() { + default + find "${ED}" -name "*.la" -delete || die +} diff --git a/dev-libs/libdbh/libdbh-5.0.22.ebuild b/dev-libs/libdbh/libdbh-5.0.22.ebuild index d0cddf9b2621..b78825346032 100644 --- a/dev-libs/libdbh/libdbh-5.0.22.ebuild +++ b/dev-libs/libdbh/libdbh-5.0.22.ebuild @@ -9,7 +9,7 @@ MY_P=${PN}2-${PV} DESCRIPTION="A small library to create and manage 64-bit disk based hash tables" HOMEPAGE="https://www.gnu.org/software/libdbh/" -SRC_URI="mirror://sourceforge/dbh/dbh/${PV}/${MY_P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/dbh/dbh/${PV}/${MY_P}.tar.gz" LICENSE="GPL-3+" SLOT="0" diff --git a/dev-libs/libdbusmenu-lxqt/Manifest b/dev-libs/libdbusmenu-lxqt/Manifest new file mode 100644 index 000000000000..6d43f2efade3 --- /dev/null +++ b/dev-libs/libdbusmenu-lxqt/Manifest @@ -0,0 +1 @@ +DIST libdbusmenu-lxqt-0.1.0.tar.xz 39232 BLAKE2B 7c2741609996a33fb1bffb9aff938130e31ebc6796dcf613ccbb2bbf9bae2290fa09bda9777ebec2b819c7ac2ce04ad086483db409c2809517ce7e41729cd71d SHA512 8c09f9bd4b3c60db1666f5a53ea84c67d2d120b215eca6563c32385387e100fe591cb8653a283750444356c61306cf385507edb6a507b22427eb6f18aa972fb5 diff --git a/dev-libs/libdbusmenu-lxqt/files/libdbusmenu-lxqt-0.1.0-cmake.patch b/dev-libs/libdbusmenu-lxqt/files/libdbusmenu-lxqt-0.1.0-cmake.patch new file mode 100644 index 000000000000..835e8eb71c86 --- /dev/null +++ b/dev-libs/libdbusmenu-lxqt/files/libdbusmenu-lxqt-0.1.0-cmake.patch @@ -0,0 +1,129 @@ +From 1be3710c1032eb8eee9fabc59f05f335aeb2e97c Mon Sep 17 00:00:00 2001 +From: Jimi Huotari <chiitoo@gentoo.org> +Date: Wed, 20 Mar 2024 21:01:00 +0200 +Subject: [PATCH] cmake: fix pkgconfig libdir path with general cleanup + +Also use more GNUInstallDirs. + +Adapted from: https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-libs/libdbusmenu-qt/files/libdbusmenu-qt-0.9.3_pre20160218-cmake.patch +--- + CMakeLists.txt | 14 ++++++-------- + cmake/modules/FindQJSON.cmake | 2 +- + dbusmenu-lxqt.pc.in | 6 +++--- + src/CMakeLists.txt | 10 +++++----- + 4 files changed, 15 insertions(+), 17 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3e46428..7bb1e66 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -49,9 +49,7 @@ endif (__DBUSMENU_HAVE_CXX17) + + include(CMakePackageConfigHelpers) + include(GNUInstallDirs) +-set(LIB_DESTINATION "${CMAKE_INSTALL_LIBDIR}") +-set(CMAKECONFIG_INSTALL_DIR "${LIB_DESTINATION}/cmake/dbusmenu-lxqt") +-set(INCLUDE_INSTALL_DIR "include/dbusmenu-lxqt") ++set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR}/dbusmenu-lxqt") + + # dist targets + set(ARCHIVE_NAME libdbusmenu-lxqt-${dbusmenu_lxqt_VERSION}) +@@ -76,7 +74,7 @@ add_dependencies(distcheck dist) + configure_file(dbusmenu-lxqt.pc.in ${CMAKE_BINARY_DIR}/dbusmenu-lxqt.pc @ONLY) + + install(FILES ${CMAKE_BINARY_DIR}/dbusmenu-lxqt.pc +- DESTINATION ${LIB_DESTINATION}/pkgconfig ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig + ) + + add_subdirectory(src) +@@ -91,7 +89,7 @@ if(WITH_DOC) + ) + + install(DIRECTORY ${CMAKE_BINARY_DIR}/html/ +- DESTINATION share/doc/libdbusmenu-lxqt-doc ++ DESTINATION ${CMAKE_INSTALL_DOCDIR} + ) + endif(WITH_DOC) + +@@ -99,7 +97,7 @@ endif(WITH_DOC) + configure_package_config_file( + dbusmenu-lxqt-config.cmake.in + ${CMAKE_BINARY_DIR}/dbusmenu-lxqt-config.cmake +- INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} ++ INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/dbusmenu-lxqt + PATH_VARS INCLUDE_INSTALL_DIR + ) + +@@ -113,6 +111,6 @@ write_basic_package_version_file( + install(FILES + ${CMAKE_BINARY_DIR}/dbusmenu-lxqt-config.cmake + ${CMAKE_BINARY_DIR}/dbusmenu-lxqt-config-version.cmake +- DESTINATION "${CMAKECONFIG_INSTALL_DIR}" ++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/dbusmenu-lxqt" + COMPONENT Devel + ) +diff --git a/cmake/modules/FindQJSON.cmake b/cmake/modules/FindQJSON.cmake +index cd007e1..e1371ce 100644 +--- a/cmake/modules/FindQJSON.cmake ++++ b/cmake/modules/FindQJSON.cmake +@@ -34,7 +34,7 @@ else (QJSON_INCLUDE_DIR AND QJSON_LIBRARIES) + qjson/parser.h + PATHS + ${PC_QJSON_INCLUDE_DIRS} +- ${INCLUDE_INSTALL_DIR} ++ ${CMAKE_INSTALL_INCLUDEDIR} + ${KDE4_INCLUDE_DIR} + ) + +diff --git a/dbusmenu-lxqt.pc.in b/dbusmenu-lxqt.pc.in +index d437851..60e81ad 100644 +--- a/dbusmenu-lxqt.pc.in ++++ b/dbusmenu-lxqt.pc.in +@@ -1,7 +1,7 @@ + prefix=@CMAKE_INSTALL_PREFIX@ +-exec_prefix=@CMAKE_INSTALL_PREFIX@ +-libdir=@CMAKE_INSTALL_PREFIX@/lib +-includedir=@CMAKE_INSTALL_PREFIX@/include/dbusmenu-lxqt ++exec_prefix=${prefix} ++libdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ ++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@/dbusmenu-lxqt + + Name: libdbusmenu-lxqt + Description: Qt implementation of dbusmenu spec +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index e0d65e5..90b801c 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -83,23 +83,23 @@ target_link_libraries(dbusmenu-lxqt + + # Make sure linking to the target adds dbusmenu-lxqt install directory + target_include_directories(dbusmenu-lxqt +- INTERFACE "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>") ++ INTERFACE "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/dbusmenu-lxqt>") + + install(TARGETS dbusmenu-lxqt + EXPORT dbusmenu-lxqt-targets +- LIBRARY DESTINATION ${LIB_DESTINATION} ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION bin + ) + + install(EXPORT dbusmenu-lxqt-targets +- DESTINATION ${CMAKECONFIG_INSTALL_DIR}) ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/dbusmenu-lxqt) + + install(DIRECTORY . +- DESTINATION ${INCLUDE_INSTALL_DIR} ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dbusmenu-lxqt + FILES_MATCHING PATTERN "*.h" + PATTERN "*_p.h" EXCLUDE + ) + + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/dbusmenu_version.h +- DESTINATION ${INCLUDE_INSTALL_DIR} ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dbusmenu-lxqt + ) +-- +2.44.0 + diff --git a/dev-libs/libdbusmenu-lxqt/libdbusmenu-lxqt-0.1.0.ebuild b/dev-libs/libdbusmenu-lxqt/libdbusmenu-lxqt-0.1.0.ebuild new file mode 100644 index 000000000000..c21b6f45c981 --- /dev/null +++ b/dev-libs/libdbusmenu-lxqt/libdbusmenu-lxqt-0.1.0.ebuild @@ -0,0 +1,24 @@ +# Copyright 2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="LXQt DBusMenu Implementation" +HOMEPAGE="https://lxqt-project.org/" + +if [[ ${PV} = 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" +else + SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz" + KEYWORDS="~amd64" +fi + +LICENSE="LGPL-2" +SLOT="0" + +RDEPEND=">=dev-qt/qtbase-6.6:6[dbus,widgets]" + +PATCHES=( "${FILESDIR}/${PN}-0.1.0-cmake.patch" ) diff --git a/dev-libs/libdbusmenu-lxqt/metadata.xml b/dev-libs/libdbusmenu-lxqt/metadata.xml new file mode 100644 index 000000000000..75d62d0c9377 --- /dev/null +++ b/dev-libs/libdbusmenu-lxqt/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>lxqt@gentoo.org</email> + <name>LXQt</name> + </maintainer> + <upstream> + <remote-id type="github">lxqt/libdbusmenu-lxqt</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-libs/libdex/Manifest b/dev-libs/libdex/Manifest index a97ca34b1c7d..873da4389984 100644 --- a/dev-libs/libdex/Manifest +++ b/dev-libs/libdex/Manifest @@ -1,2 +1 @@ -DIST libdex-0.4.1.tar.xz 95492 BLAKE2B 73e660cd5876f41f7e02bdb35cc460888eaf40a62c7431e7fcd2337a2eb953f975a8f6719c0726672be71ab507561413257c140a31cfdcab09491d4228362796 SHA512 80a80c6fcf936da903a64339dff1d6f802f028bfd6e2815bf3b2a3ac6bd0e9fafe3f81b66dd1ee0a6bbd6303cc31fc73b528829e587142a7d269b1b98377ca25 DIST libdex-0.4.3.tar.xz 96820 BLAKE2B 51f6c9a209d8ff19d7e97f4d8cbc9065739f08c555712076c9b6f4d345d56522f31afa1b8dffe8da2cfc128d368d7dc5f6a93757f0fe5cfd0a55de17587d776e SHA512 26691373d560d20cefa3a23e31677259b234cdf623b17b8fb2b6976b03768e86e458d2670aa3b260638b595994f278240e972bf3ff5b765013fb6d3114f46cef diff --git a/dev-libs/libdex/libdex-0.4.1.ebuild b/dev-libs/libdex/libdex-0.4.1.ebuild deleted file mode 100644 index 0c9580a83095..000000000000 --- a/dev-libs/libdex/libdex-0.4.1.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit gnome.org meson vala - -DESCRIPTION="Deferred Execution library for GNOME and GTK" -HOMEPAGE="https://gitlab.gnome.org/GNOME/libdex" - -LICENSE="LGPL-2.1+" -SLOT="0/1" -KEYWORDS="amd64 ~arm64 ~x86" - -IUSE="gtk-doc +introspection sysprof test vala" -REQUIRED_USE=" - gtk-doc? ( introspection ) - vala? ( introspection ) -" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-libs/glib-2.68:2 - >=sys-libs/liburing-0.7:= - introspection? ( dev-libs/gobject-introspection:= ) - sysprof? ( dev-util/sysprof-capture:4 ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - vala? ( $(vala_depend) ) - dev-util/glib-utils - virtual/pkgconfig - gtk-doc? ( dev-util/gi-docgen ) -" - -src_prepare() { - default - use vala && vala_setup -} - -src_configure() { - local emesonargs=( - $(meson_use gtk-doc docs) - -Dexamples=false - $(meson_use vala vapi) - $(meson_feature introspection) - $(meson_use sysprof) - $(meson_use test tests) - ) - meson_src_configure -} - -src_install() { - meson_src_install - - if use gtk-doc; then - mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die - mv "${ED}"/usr/share/doc/${PN}-1 "${ED}"/usr/share/gtk-doc/html/ || die - fi -} diff --git a/dev-libs/libdex/libdex-0.4.3.ebuild b/dev-libs/libdex/libdex-0.4.3.ebuild index 5e1d5e1fb424..93a7becd291c 100644 --- a/dev-libs/libdex/libdex-0.4.3.ebuild +++ b/dev-libs/libdex/libdex-0.4.3.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/libdex" LICENSE="LGPL-2.1+" SLOT="0/1" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="amd64 ~arm64 ~x86" IUSE="+eventfd gtk-doc +introspection +liburing sysprof test vala" REQUIRED_USE=" diff --git a/dev-libs/libdnet/libdnet-1.18.0-r1.ebuild b/dev-libs/libdnet/libdnet-1.18.0-r1.ebuild new file mode 100644 index 000000000000..b7c86a6585cc --- /dev/null +++ b/dev-libs/libdnet/libdnet-1.18.0-r1.ebuild @@ -0,0 +1,98 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +DISTUTILS_EXT=1 +DISTUTILS_OPTIONAL=1 +DISTUTILS_USE_PEP517=setuptools + +inherit autotools distutils-r1 + +DESCRIPTION="Simplified, portable interface to several low-level networking routines" +HOMEPAGE="https://github.com/ofalk/libdnet" +SRC_URI="https://github.com/ofalk/${PN}/archive/${P}.tar.gz" +S="${WORKDIR}/${PN}-${P}" + +LICENSE="LGPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86" +IUSE="python test" +RESTRICT="!test? ( test )" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +DEPEND=" + dev-libs/libbsd + python? ( ${PYTHON_DEPS} ) +" +RDEPEND="${DEPEND}" +BDEPEND=" + python? ( + ${DISTUTILS_DEPS} + dev-python/cython[${PYTHON_USEDEP}] + ) + test? ( dev-libs/check ) +" + +DOCS=( README.md THANKS ) + +src_prepare() { + default + + sed -i \ + -e 's/libcheck.a/libcheck.so/g' \ + configure.ac || die + sed -i \ + -e "s/lib\/libcheck/$(get_libdir)\/libcheck/g" \ + configure.ac || die + sed -i \ + -e 's|-L$libdir ||g' \ + dnet-config.in || die + sed -i \ + -e '/^SUBDIRS/s|python||g' \ + Makefile.am || die + + # Stale e.g. pkg-config macros w/ bashisms + rm aclocal.m4 {config,m4}/libtool.m4 || die + + AT_M4DIR="config" eautoreconf + + if use python; then + cd python || die + distutils-r1_src_prepare + fi +} + +src_configure() { + econf \ + $(use_with python) \ + $(use_enable test check) +} + +src_compile() { + default + + if use python; then + cd python || die + distutils-r1_src_compile + fi +} + +src_test() { + # https://bugs.gentoo.org/778797#c4 + # check_ip needs privileges and check_fw can't work on Linux + emake check XFAIL_TESTS="check_fw check_ip" +} + +src_install() { + default + + if use python; then + cd python || die + unset DOCS + distutils-r1_src_install + fi + + find "${ED}" -name '*.la' -delete || die +} diff --git a/dev-libs/libdnet/libdnet-1.18.0.ebuild b/dev-libs/libdnet/libdnet-1.18.0.ebuild index fd47d46e0186..06d3ec217130 100644 --- a/dev-libs/libdnet/libdnet-1.18.0.ebuild +++ b/dev-libs/libdnet/libdnet-1.18.0.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-${P}" LICENSE="LGPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86" IUSE="python test" RESTRICT="!test? ( test )" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" diff --git a/dev-libs/libebml/libebml-1.4.5.ebuild b/dev-libs/libebml/libebml-1.4.5.ebuild index 7c2f857b9463..0ed1e1d610a5 100644 --- a/dev-libs/libebml/libebml-1.4.5.ebuild +++ b/dev-libs/libebml/libebml-1.4.5.ebuild @@ -11,4 +11,4 @@ SRC_URI="https://dl.matroska.org/downloads/${PN}/${P}.tar.xz" LICENSE="LGPL-2.1" SLOT="0/5" # subslot = soname major version -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" diff --git a/dev-libs/libei/Manifest b/dev-libs/libei/Manifest index 50c1bf564d9b..14d671e41b99 100644 --- a/dev-libs/libei/Manifest +++ b/dev-libs/libei/Manifest @@ -1,3 +1,2 @@ -DIST libei-1.2.0.tar.bz2 174155 BLAKE2B 4b540cb79decd9785f67efa6fa76b984eb7ae2729dd49ac36e240b6a4feb4c54b34626dad93831c873861e3d3fd597c530e7eaaab0150890f0c952a9d75ee178 SHA512 c1d39c2c830df373ff5d7cc3eca330c2d771a26df6f2902d62f639a8a4db9af5370db4b9defe605721dd1f429eae68cbc4249792b3ae26b4c82d269f07a36732 DIST libei-1.2.1.tar.bz2 174636 BLAKE2B b718d2287e83adb43a8dee9ae06499d780b2a50231e9ce452b6e7bfa9e89e9599058628614fb4325d0cef842d6b29ca68eb38b3e547790cd5a7a0ac14728f250 SHA512 ac8e32a381b9555a6b9becab9217a323d79aeba4b3f11e1dbba9f876d566f232f41d0f299f8cb8e5de6707d0dd91e93872edd81532c971e35d1cf33f9f9063b4 DIST munit-fbbdf1467eb0d04a6ee465def2e529e4c87f2118.tar.gz 27724 BLAKE2B 9670c9b7a0b5d9ee6ec8df2dea9e241b043964ecf1fa3f6060ad1d16c40ab6afe47f53c6d4a791003e101a0b363263b858e6e4e445f868292753dd1ee7f7e3ce SHA512 26b5599fd12be627a692823ebf496fa446be7ed04a1233fb42e0667c05109b0f804f76646e289ac660fc815baf45f77ec8caf0ff2ea7fb0b4f87f0038a2b971c diff --git a/dev-libs/libei/libei-1.2.0.ebuild b/dev-libs/libei/libei-1.2.0.ebuild deleted file mode 100644 index 6959da0ea131..000000000000 --- a/dev-libs/libei/libei-1.2.0.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 2023-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="Library for Emulated Input, primarily aimed at the Wayland stack" -HOMEPAGE="https://gitlab.freedesktop.org/libinput/libei" -SRC_URI="https://gitlab.freedesktop.org/libinput/${PN}/-/archive/${PV}/${P}.tar.bz2" -MUNIT_COMMIT="fbbdf1467eb0d04a6ee465def2e529e4c87f2118" -SRC_URI+=" https://github.com/nemequ/munit/archive/${MUNIT_COMMIT}.tar.gz -> munit-${MUNIT_COMMIT}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86" -IUSE="elogind systemd test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-libs/libevdev-1.9.902 - || ( - systemd? ( >=sys-apps/systemd-237 ) - elogind? ( >=sys-auth/elogind-237 ) - sys-libs/basu - ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - virtual/pkgconfig - $(python_gen_any_dep ' - dev-python/attrs[${PYTHON_USEDEP}] - dev-python/jinja[${PYTHON_USEDEP}] - ') - test? ( - $(python_gen_any_dep ' - dev-python/pytest[${PYTHON_USEDEP}] - dev-python/python-dbusmock[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/structlog[${PYTHON_USEDEP}] - ') - ) -" - -python_check_deps() { - if use test; then - python_has_version \ - "dev-python/pytest[${PYTHON_USEDEP}]" \ - "dev-python/python-dbusmock[${PYTHON_USEDEP}]" \ - "dev-python/pyyaml[${PYTHON_USEDEP}]" \ - "dev-python/structlog[${PYTHON_USEDEP}]" \ - || return 1 - fi - python_has_version \ - "dev-python/attrs[${PYTHON_USEDEP}]" \ - "dev-python/jinja[${PYTHON_USEDEP}]" \ - || return 1 -} - -src_unpack() { - if [[ -n ${A} ]]; then - unpack ${A} - mv "${WORKDIR}"/munit-${MUNIT_COMMIT} "${WORKDIR}"/${P}/subprojects/munit || die - rm "${WORKDIR}"/${P}/subprojects/munit.wrap || die - fi -} - -src_prepare() { - default - - sed -i -e 's:^valgrind = .*:valgrind = disabler():g' test/meson.build || die -} - -src_configure() { - local emesonargs=( - -Ddocumentation="" - -Dliboeffis=enabled - $(meson_feature test tests) - ) - if use systemd; then - emesonargs+=(-Dsd-bus-provider=libsystemd) - elif use elogind; then - emesonargs+=(-Dsd-bus-provider=libelogind) - else - emesonargs+=(-Dsd-bus-provider=basu) - fi - meson_src_configure -} - -src_install() { - meson_src_install - - # munit subproject is installed but not wanted - if use test; then - rm "${ED}"/usr/lib*/libmunit.so || die - fi -} diff --git a/dev-libs/libei/libei-1.2.1.ebuild b/dev-libs/libei/libei-1.2.1.ebuild index a32d694b67b1..74c5bdf82a84 100644 --- a/dev-libs/libei/libei-1.2.1.ebuild +++ b/dev-libs/libei/libei-1.2.1.ebuild @@ -14,7 +14,7 @@ SRC_URI+=" https://github.com/nemequ/munit/archive/${MUNIT_COMMIT}.tar.gz -> mun LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86" IUSE="elogind systemd test" RESTRICT="!test? ( test )" @@ -88,6 +88,11 @@ src_configure() { meson_src_configure } +src_test() { + # bug #916777 + meson_src_test --no-suite sigalrm --timeout-multiplier 10 +} + src_install() { meson_src_install diff --git a/dev-libs/libevdev/Manifest b/dev-libs/libevdev/Manifest index 2892eb9d590c..2e3e4325cba5 100644 --- a/dev-libs/libevdev/Manifest +++ b/dev-libs/libevdev/Manifest @@ -1 +1,2 @@ DIST libevdev-1.13.1.tar.xz 455484 BLAKE2B 063eefeebebf5253ce23666e31d67d7268ad97e09f84e0e3a02b1024a92f68e1a4f1fc2508304abf49ab05dba4961b49463b640a18c79ea38ca0c5a9d8bf3e9c SHA512 9b75bad4bc13948854c8dff7a7a46aca6c06d1410ccb000f881bf76055ccac040595c3b24fb1a574be875b5c262eb86820b9ec3383752641bc2047135e5a412f +DIST libevdev-1.13.2.tar.xz 460456 BLAKE2B bdb71525600e2aa3aa264da322e1d7e93270790a48b62baf3df51cf23a6ddf7371cb9de157dd430e632514d1cb3d3b076f8710c43fac4f99e42e7ca503061bee SHA512 558267df0e45d8641a58dddb9fe30e2235ce247d96710189b09512d19d691afbd25189d188bb26bb5092fbbe249fbc7ca60a9e6af4fab535a946d5a3e030a21f diff --git a/dev-libs/libevdev/libevdev-1.13.1.ebuild b/dev-libs/libevdev/libevdev-1.13.1-r1.ebuild index 7178ce1649e7..300b0dba54e8 100644 --- a/dev-libs/libevdev/libevdev-1.13.1.ebuild +++ b/dev-libs/libevdev/libevdev-1.13.1-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit meson-multilib python-any-r1 diff --git a/dev-libs/libevdev/libevdev-1.13.2.ebuild b/dev-libs/libevdev/libevdev-1.13.2.ebuild new file mode 100644 index 000000000000..41612867b124 --- /dev/null +++ b/dev-libs/libevdev/libevdev-1.13.2.ebuild @@ -0,0 +1,50 @@ +# 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="Handler library for evdev events" +HOMEPAGE="https://www.freedesktop.org/wiki/Software/libevdev/ https://gitlab.freedesktop.org/libevdev/libevdev" + +if [[ ${PV} == 9999* ]] ; then + EGIT_REPO_URI="https://gitlab.freedesktop.org/libevdev/libevdev.git" + inherit git-r3 +else + SRC_URI="https://www.freedesktop.org/software/libevdev/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +fi + +LICENSE="MIT" +SLOT="0" +IUSE="doc test" + +DEPEND="test? ( dev-libs/check[${MULTILIB_USEDEP}] )" +BDEPEND=" + ${PYTHON_DEPS} + doc? ( app-text/doxygen ) + virtual/pkgconfig +" +RESTRICT="!test? ( test )" + +multilib_src_configure() { + local emesonargs=( + $(meson_feature doc documentation) + $(meson_feature test tests) + ) + meson_src_configure +} + +multilib_src_test() { + meson_src_test -t 100 +} + +multilib_src_install_all() { + if use doc; then + local HTML_DOCS=( doc/html/. ) + einstalldocs + fi +} diff --git a/dev-libs/libevdev/libevdev-9999.ebuild b/dev-libs/libevdev/libevdev-9999.ebuild index 86afaef46cd2..c29d77531fd3 100644 --- a/dev-libs/libevdev/libevdev-9999.ebuild +++ b/dev-libs/libevdev/libevdev-9999.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit meson-multilib python-any-r1 diff --git a/dev-libs/libezV24/libezV24-0.1.1-r2.ebuild b/dev-libs/libezV24/libezV24-0.1.1-r2.ebuild index e17e282ea685..21e1bcb0b753 100644 --- a/dev-libs/libezV24/libezV24-0.1.1-r2.ebuild +++ b/dev-libs/libezV24/libezV24-0.1.1-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,7 +7,7 @@ inherit toolchain-funcs DESCRIPTION="library that provides an easy API to Linux serial ports" HOMEPAGE="http://ezv24.sourceforge.net" -SRC_URI="mirror://sourceforge/ezv24/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/ezv24/${P}.tar.gz" LICENSE="GPL-2+" SLOT="0" diff --git a/dev-libs/libezV24/libezV24-0.1.1-r3.ebuild b/dev-libs/libezV24/libezV24-0.1.1-r3.ebuild index 14ae567deeec..155857191831 100644 --- a/dev-libs/libezV24/libezV24-0.1.1-r3.ebuild +++ b/dev-libs/libezV24/libezV24-0.1.1-r3.ebuild @@ -7,7 +7,7 @@ inherit toolchain-funcs DESCRIPTION="Library that provides an easy API to Linux serial ports" HOMEPAGE="https://ezv24.sourceforge.net" -SRC_URI="mirror://sourceforge/ezv24/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/ezv24/${P}.tar.gz" LICENSE="GPL-2+" SLOT="0" diff --git a/dev-libs/libffi/libffi-3.4.4-r3.ebuild b/dev-libs/libffi/libffi-3.4.4-r3.ebuild deleted file mode 100644 index 835adbe61215..000000000000 --- a/dev-libs/libffi/libffi-3.4.4-r3.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit multilib-minimal preserve-libs - -MY_PV=${PV/_rc/-rc} -MY_P=${PN}-${MY_PV} - -DESCRIPTION="Portable, high level programming interface to various calling conventions" -HOMEPAGE="https://sourceware.org/libffi/" -SRC_URI="https://github.com/libffi/libffi/releases/download/v${MY_PV}/${MY_P}.tar.gz" -S="${WORKDIR}"/${MY_P} - -LICENSE="MIT" -# This is a core package which is depended on by e.g. Python -# Please use preserve-libs.eclass in pkg_{pre,post}inst to cover users -# with FEATURES="-preserved-libs" or another package manager if SONAME -# changes. -SLOT="0/8" # SONAME=libffi.so.8 -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="debug exec-static-trampoline pax-kernel static-libs test" - -RESTRICT="!test? ( test )" -BDEPEND="test? ( dev-util/dejagnu )" - -PATCHES=( - "${FILESDIR}"/${P}-hppa-large-struct.patch - "${FILESDIR}"/${P}-hppa-closure-function-ptrs.patch - "${FILESDIR}"/${P}-hppa-jump-table.patch - "${FILESDIR}"/${P}-sparc-float-typo.patch - "${FILESDIR}"/${P}-lld-17.patch -) - -src_prepare() { - default - - if [[ ${CHOST} == arm64-*-darwin* ]] ; then - # ensure we use aarch64 asm, not x86 on arm64 - sed -i -e 's/aarch64\*-\*-\*/arm64*-*-*|&/' \ - configure configure.host || die - fi -} - -multilib_src_configure() { - # --includedir= path maintains a few properties: - # 1. have stable name across libffi versions: some packages like - # dev-lang/ghc or kde-frameworks/networkmanager-qt embed - # ${includedir} at build-time. Don't require those to be - # rebuilt unless SONAME changes. bug #695788 - # - # We use /usr/.../${PN} (instead of former /usr/.../${P}). - # - # 2. have ${ABI}-specific location as ffi.h is target-dependent. - # - # We use /usr/$(get_libdir)/... to have ABI identifier. - ECONF_SOURCE="${S}" econf \ - --includedir="${EPREFIX}"/usr/$(get_libdir)/${PN}/include \ - --disable-multi-os-directory \ - $(use_enable static-libs static) \ - $(use_enable exec-static-trampoline exec-static-tramp) \ - $(use_enable pax-kernel pax_emutramp) \ - $(use_enable debug) -} - -multilib_src_test() { - emake -Onone check -} - -multilib_src_install_all() { - einstalldocs - find "${ED}" -name "*.la" -delete || die -} - -pkg_preinst() { - preserve_old_lib /usr/$(get_libdir)/libffi.so.7 -} - -pkg_postinst() { - preserve_old_lib_notify /usr/$(get_libdir)/libffi.so.7 -} diff --git a/dev-libs/libfilezilla/Manifest b/dev-libs/libfilezilla/Manifest index 3dfc3ca499e2..0979e16d5c42 100644 --- a/dev-libs/libfilezilla/Manifest +++ b/dev-libs/libfilezilla/Manifest @@ -1,2 +1,3 @@ DIST libfilezilla-0.45.0.tar.xz 543340 BLAKE2B c85c07d23381d63c6f959e9721fa898982c692cafcd863cd15da7fce7e486bf2031b0d0e1fb18efeb271d1aa497eabe0dff4c14f8ff89fbe3ed880a737fc8f6e SHA512 304838e8cf6e644378c0727bc8b9d2f87287a646db4cb765a04d156717f8c233b8a34085049e4893ec345a1a1d576f0ba33df705dee022e16ff433cddd926ce0 DIST libfilezilla-0.46.0.tar.xz 545396 BLAKE2B 9516260054f7b9d0df0cecf41912536c03f824dd7a43cf8eb52ef7690c3f4edb0ba828fb7fe1c016ac3a4db60a9e6b7a7a03cc90de1bac59439c9f989c3eec5d SHA512 721186993b9af7087033d9acd03ecd70a6a567cd46ded0d26e141ffccba5aed31d5095f3a1d56397280a6f75ad53460c9acbbb3650881e57dccd6f67ccbbf9ba +DIST libfilezilla-0.47.0.tar.xz 551484 BLAKE2B ba35bd990889a779f4c14c5c76c29dc5fed1bb97168e8dec75a59984133d6dbd56850208c55d6549c80dc2069ea007e0a26d7b604dbf9752c6ac018493a96627 SHA512 28af8aeacc5b6b188613c2afebb23477aa0c6908cd2bfe7dc39ba4b69fa67f2d18a64cdefe52968f429b18545fe03c031363b3aa9ed07b2ecb9faa56b1275282 diff --git a/dev-libs/libfilezilla/libfilezilla-0.47.0.ebuild b/dev-libs/libfilezilla/libfilezilla-0.47.0.ebuild new file mode 100644 index 000000000000..47f6003dc73b --- /dev/null +++ b/dev-libs/libfilezilla/libfilezilla-0.47.0.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic + +DESCRIPTION="C++ library offering some basic functionality for platform-independent programs" +HOMEPAGE="https://lib.filezilla-project.org/" +SRC_URI="https://download.filezilla-project.org/${PN}/${P}.tar.xz" + +LICENSE="GPL-2+" +SLOT="0/43" # libfilezilla.so version +KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="test" + +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-libs/nettle:0= + >=net-libs/gnutls-3.5.7:= + virtual/libcrypt:= +" +DEPEND="${RDEPEND} + test? ( dev-util/cppunit )" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${PN}-0.37.1-pthread.patch + "${FILESDIR}"/${PN}-0.41.0-gcc13.patch +) + +pkg_pretend() { + if [[ ${MERGE_TYPE} != binary ]]; then + if ! test-flag-CXX -std=c++14; then + eerror "${P} requires C++14-capable C++ compiler. Your current compiler" + eerror "does not seem to support -std=c++14 option. Please upgrade your compiler" + eerror "to gcc-4.9 or an equivalent version supporting C++14." + die "Currently active compiler does not support -std=c++14" + fi + fi +} + +src_configure() { + if use ppc || use arm || use hppa; then + # bug 727652 + append-libs -latomic + fi + + econf --disable-static +} + +src_install() { + default + find "${ED}" -type f -name "*.la" -delete || die +} diff --git a/dev-libs/libfmt/libfmt-10.2.1.ebuild b/dev-libs/libfmt/libfmt-10.0.0-r1.ebuild index 0914ef073c62..21279049b837 100644 --- a/dev-libs/libfmt/libfmt-10.2.1.ebuild +++ b/dev-libs/libfmt/libfmt-10.0.0-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit cmake +inherit cmake-multilib DESCRIPTION="Small, safe and fast formatting library" HOMEPAGE="https://github.com/fmtlib/fmt" @@ -22,7 +22,7 @@ SLOT="0/${PV}" IUSE="test" RESTRICT="!test? ( test )" -src_configure() { +multilib_src_configure() { local mycmakeargs=( -DFMT_CMAKE_DIR="$(get_libdir)/cmake/fmt" -DFMT_LIB_DIR="$(get_libdir)" diff --git a/dev-libs/libfmt/libfmt-10.2.0.ebuild b/dev-libs/libfmt/libfmt-10.1.0-r1.ebuild index 0914ef073c62..21279049b837 100644 --- a/dev-libs/libfmt/libfmt-10.2.0.ebuild +++ b/dev-libs/libfmt/libfmt-10.1.0-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit cmake +inherit cmake-multilib DESCRIPTION="Small, safe and fast formatting library" HOMEPAGE="https://github.com/fmtlib/fmt" @@ -22,7 +22,7 @@ SLOT="0/${PV}" IUSE="test" RESTRICT="!test? ( test )" -src_configure() { +multilib_src_configure() { local mycmakeargs=( -DFMT_CMAKE_DIR="$(get_libdir)/cmake/fmt" -DFMT_LIB_DIR="$(get_libdir)" diff --git a/dev-libs/libfmt/libfmt-10.1.0.ebuild b/dev-libs/libfmt/libfmt-10.1.1-r1.ebuild index 90083087d20e..21279049b837 100644 --- a/dev-libs/libfmt/libfmt-10.1.0.ebuild +++ b/dev-libs/libfmt/libfmt-10.1.1-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit cmake +inherit cmake-multilib DESCRIPTION="Small, safe and fast formatting library" HOMEPAGE="https://github.com/fmtlib/fmt" @@ -22,7 +22,7 @@ SLOT="0/${PV}" IUSE="test" RESTRICT="!test? ( test )" -src_configure() { +multilib_src_configure() { local mycmakeargs=( -DFMT_CMAKE_DIR="$(get_libdir)/cmake/fmt" -DFMT_LIB_DIR="$(get_libdir)" diff --git a/dev-libs/libfmt/libfmt-10.1.1.ebuild b/dev-libs/libfmt/libfmt-10.1.1.ebuild deleted file mode 100644 index 90083087d20e..000000000000 --- a/dev-libs/libfmt/libfmt-10.1.1.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -DESCRIPTION="Small, safe and fast formatting library" -HOMEPAGE="https://github.com/fmtlib/fmt" - -if [[ ${PV} == *9999 ]] ; then - EGIT_REPO_URI="https://github.com/fmtlib/fmt.git" - inherit git-r3 -else - SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86" - S="${WORKDIR}/fmt-${PV}" -fi - -LICENSE="MIT" -SLOT="0/${PV}" -IUSE="test" -RESTRICT="!test? ( test )" - -src_configure() { - local mycmakeargs=( - -DFMT_CMAKE_DIR="$(get_libdir)/cmake/fmt" - -DFMT_LIB_DIR="$(get_libdir)" - -DFMT_TEST=$(usex test) - ) - cmake_src_configure -} diff --git a/dev-libs/libfmt/libfmt-10.2.0-r1.ebuild b/dev-libs/libfmt/libfmt-10.2.0-r1.ebuild new file mode 100644 index 000000000000..21279049b837 --- /dev/null +++ b/dev-libs/libfmt/libfmt-10.2.0-r1.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake-multilib + +DESCRIPTION="Small, safe and fast formatting library" +HOMEPAGE="https://github.com/fmtlib/fmt" + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/fmtlib/fmt.git" + inherit git-r3 +else + SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86" + S="${WORKDIR}/fmt-${PV}" +fi + +LICENSE="MIT" +SLOT="0/${PV}" +IUSE="test" +RESTRICT="!test? ( test )" + +multilib_src_configure() { + local mycmakeargs=( + -DFMT_CMAKE_DIR="$(get_libdir)/cmake/fmt" + -DFMT_LIB_DIR="$(get_libdir)" + -DFMT_TEST=$(usex test) + ) + cmake_src_configure +} diff --git a/dev-libs/libfmt/libfmt-10.2.1-r1.ebuild b/dev-libs/libfmt/libfmt-10.2.1-r2.ebuild index 2dbd37cc402c..da45c0e71554 100644 --- a/dev-libs/libfmt/libfmt-10.2.1-r1.ebuild +++ b/dev-libs/libfmt/libfmt-10.2.1-r2.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit cmake flag-o-matic +inherit cmake-multilib flag-o-matic DESCRIPTION="Small, safe and fast formatting library" HOMEPAGE="https://github.com/fmtlib/fmt" @@ -22,7 +22,7 @@ SLOT="0/${PV}" IUSE="test" RESTRICT="!test? ( test )" -src_configure() { +multilib_src_configure() { append-lfs-flags local mycmakeargs=( -DFMT_CMAKE_DIR="$(get_libdir)/cmake/fmt" diff --git a/dev-libs/libfmt/libfmt-10.0.0.ebuild b/dev-libs/libfmt/libfmt-9.1.0-r2.ebuild index 90083087d20e..b37fe02a5ea4 100644 --- a/dev-libs/libfmt/libfmt-10.0.0.ebuild +++ b/dev-libs/libfmt/libfmt-9.1.0-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit cmake +inherit cmake-multilib DESCRIPTION="Small, safe and fast formatting library" HOMEPAGE="https://github.com/fmtlib/fmt" @@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]] ; then inherit git-r3 else SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" S="${WORKDIR}/fmt-${PV}" fi @@ -22,7 +22,7 @@ SLOT="0/${PV}" IUSE="test" RESTRICT="!test? ( test )" -src_configure() { +multilib_src_configure() { local mycmakeargs=( -DFMT_CMAKE_DIR="$(get_libdir)/cmake/fmt" -DFMT_LIB_DIR="$(get_libdir)" diff --git a/dev-libs/libfmt/libfmt-9999.ebuild b/dev-libs/libfmt/libfmt-9999.ebuild index 2dbd37cc402c..da45c0e71554 100644 --- a/dev-libs/libfmt/libfmt-9999.ebuild +++ b/dev-libs/libfmt/libfmt-9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit cmake flag-o-matic +inherit cmake-multilib flag-o-matic DESCRIPTION="Small, safe and fast formatting library" HOMEPAGE="https://github.com/fmtlib/fmt" @@ -22,7 +22,7 @@ SLOT="0/${PV}" IUSE="test" RESTRICT="!test? ( test )" -src_configure() { +multilib_src_configure() { append-lfs-flags local mycmakeargs=( -DFMT_CMAKE_DIR="$(get_libdir)/cmake/fmt" diff --git a/dev-libs/libg15/libg15-1.2.7-r1.ebuild b/dev-libs/libg15/libg15-1.2.7-r1.ebuild index 638cbaf73401..90ad1f3e5434 100644 --- a/dev-libs/libg15/libg15-1.2.7-r1.ebuild +++ b/dev-libs/libg15/libg15-1.2.7-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ if [[ ${PV} == *9999 ]]; then ESVN_REPO_URI="https://svn.code.sf.net/p/g15tools/code/trunk/${PN}" else KEYWORDS="amd64 ppc ppc64 x86" - SRC_URI="mirror://sourceforge/g15tools/${P}.tar.bz2" + SRC_URI="https://downloads.sourceforge.net/g15tools/${P}.tar.bz2" fi DESCRIPTION="The libg15 library gives low-level access to the Logitech G15 keyboard" diff --git a/dev-libs/libg15/metadata.xml b/dev-libs/libg15/metadata.xml index 947c62c9e342..215d63df9cf8 100644 --- a/dev-libs/libg15/metadata.xml +++ b/dev-libs/libg15/metadata.xml @@ -1,9 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>robbat2@gentoo.org</email> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="sourceforge">g15tools</remote-id> </upstream> diff --git a/dev-libs/libg15render/files/libg15render-3.0.4-missing-include.patch b/dev-libs/libg15render/files/libg15render-3.0.4-missing-include.patch new file mode 100644 index 000000000000..eeb70bc2c9c6 --- /dev/null +++ b/dev-libs/libg15render/files/libg15render-3.0.4-missing-include.patch @@ -0,0 +1,11 @@ +https://gitlab.com/menelkir/libg15render/-/commit/ea940d38ca5c17685e4c13dcdcde43bbd6ec1fea +--- a/pixel.c ++++ b/pixel.c +@@ -19,6 +19,7 @@ + #include <fcntl.h> + #include <stdlib.h> + #include <math.h> ++#include <unistd.h> + #include "libg15render.h" + + void swap (int *x, int *y){ diff --git a/dev-libs/libg15render/libg15render-1.2-r2.ebuild b/dev-libs/libg15render/libg15render-1.2-r2.ebuild index 8b6133f70f2b..4ee417b73703 100644 --- a/dev-libs/libg15render/libg15render-1.2-r2.ebuild +++ b/dev-libs/libg15render/libg15render-1.2-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,7 +7,7 @@ inherit autotools DESCRIPTION="Small library for display text and graphics on a Logitech G15 keyboard" HOMEPAGE="https://sourceforge.net/projects/g15tools/" -SRC_URI="mirror://sourceforge/g15tools/${P}.tar.bz2" +SRC_URI="https://downloads.sourceforge.net/g15tools/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" diff --git a/dev-libs/libg15render/libg15render-3.0.4-r1.ebuild b/dev-libs/libg15render/libg15render-3.0.4-r1.ebuild new file mode 100644 index 000000000000..bdf4d4d973fc --- /dev/null +++ b/dev-libs/libg15render/libg15render-3.0.4-r1.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Small library for display text and graphics on a Logitech G15 keyboard" +HOMEPAGE="https://gitlab.com/menelkir/libg15render" +if [[ ${PV} == *9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://gitlab.com/menelkir/libg15render.git" +else + SRC_URI="https://gitlab.com/menelkir/${PN}/-/archive/${PV}/${P}.tar.bz2" + KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="truetype" + +RDEPEND=" + >=dev-libs/libg15-3.0 + truetype? ( media-libs/freetype )" +DEPEND="${RDEPEND}" +BDEPEND=" + truetype? ( virtual/pkgconfig )" + +PATCHES=( + "${FILESDIR}/${P}-freetype_pkgconfig.patch" + "${FILESDIR}/${PN}-3.0.4-docdir.patch" + "${FILESDIR}/${P}-missing-include.patch" +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + local myeconfargs=( + --disable-static + $(use_enable truetype ttf) + ) + econf "${myeconfargs[@]}" +} + +src_install() { + default + + # no static archives + find "${ED}" -type f -name '*.la' -delete || die +} diff --git a/dev-libs/libg15render/metadata.xml b/dev-libs/libg15render/metadata.xml index 947c62c9e342..00a0a854f2cd 100644 --- a/dev-libs/libg15render/metadata.xml +++ b/dev-libs/libg15render/metadata.xml @@ -1,10 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>robbat2@gentoo.org</email> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="sourceforge">g15tools</remote-id> + <remote-id type="gitlab">menelkir/libg15render</remote-id> </upstream> </pkgmetadata> diff --git a/dev-libs/libgamin/files/libgamin-0.1.10-crosscompile-fix.patch b/dev-libs/libgamin/files/libgamin-0.1.10-crosscompile-fix.patch index ce3a15b5e160..88de87fe6595 100644 --- a/dev-libs/libgamin/files/libgamin-0.1.10-crosscompile-fix.patch +++ b/dev-libs/libgamin/files/libgamin-0.1.10-crosscompile-fix.patch @@ -1,5 +1,5 @@ ---- configure.in.orig 2009-04-26 23:00:43.445135823 +0300 -+++ configure.in 2009-04-26 23:25:04.042489243 +0300 +--- gamin-0.1.10/configure.in ++++ gamin-0.1.10/configure.in @@ -389,8 +389,7 @@ AC_MSG_CHECKING(abstract socket namespace) diff --git a/dev-libs/libgamin/libgamin-0.1.10-r6.ebuild b/dev-libs/libgamin/libgamin-0.1.10-r7.ebuild index 86fcb2f3bb8d..3e16d85b0e95 100644 --- a/dev-libs/libgamin/libgamin-0.1.10-r6.ebuild +++ b/dev-libs/libgamin/libgamin-0.1.10-r7.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=8 GNOME_ORG_MODULE="gamin" GNOME_TARBALL_SUFFIX="bz2" -inherit autotools epatch gnome.org multilib-minimal +inherit autotools gnome.org multilib-minimal DESCRIPTION="Library providing the FAM File Alteration Monitor API" HOMEPAGE="https://www.gnome.org/~veillard/gamin/" @@ -32,35 +32,35 @@ src_prepare() { mv "${WORKDIR}"/pkg-config-*/pkg.m4 "${WORKDIR}"/ || die # Fix QA warnings, bug #257281, upstream #466791 - epatch "${FILESDIR}"/${PN}-0.1.10-compilewarnings.patch + eapply "${FILESDIR}"/${PN}-0.1.10-compilewarnings.patch if [[ ${CHOST} != *-solaris* ]] ; then # Fix compile warnings; bug #188923 - epatch "${DISTDIR}"/gamin-0.1.9-freebsd.patch.bz2 + eapply "${WORKDIR}"/gamin-0.1.9-freebsd.patch else # (Open)Solaris necessary patches (changes configure.in), unfortunately # conflicts with freebsd patch and breaks some linux installs so it must # only be applied if on solaris. - epatch "${DISTDIR}"/${P}-opensolaris.patch.bz2 + eapply -p0 "${WORKDIR}"/${P}-opensolaris.patch fi # Fix collision problem due to intermediate library, upstream bug #530635 - epatch "${FILESDIR}"/${PN}-0.1.10-noinst-lib.patch + eapply "${FILESDIR}"/${PN}-0.1.10-noinst-lib.patch # Fix compilation with latest glib, bug #382783 - epatch "${FILESDIR}/${PN}-0.1.10-G_CONST_RETURN-removal.patch" + eapply "${FILESDIR}/${PN}-0.1.10-G_CONST_RETURN-removal.patch" # Fix crosscompilation issues, bug #267604 - epatch "${FILESDIR}/${PN}-0.1.10-crosscompile-fix.patch" + eapply "${FILESDIR}/${PN}-0.1.10-crosscompile-fix.patch" # Enable linux specific features on armel, upstream bug #588338 - epatch "${FILESDIR}/${P}-armel-features.patch" + eapply "${FILESDIR}/${P}-armel-features.patch" # Fix possible server deadlock in ih_sub_cancel, upstream bug #667230 - epatch "${FILESDIR}/${PN}-0.1.10-deadlock.patch" + eapply "${FILESDIR}/${PN}-0.1.10-deadlock.patch" # Fix musl build, upstream bug #588337 - epatch "${FILESDIR}/${PN}-0.1.10-musl-pthread.patch" + eapply "${FILESDIR}/${PN}-0.1.10-musl-pthread.patch" # Drop DEPRECATED flags sed -i -e 's:-DG_DISABLE_DEPRECATED:$(NULL):g' server/Makefile.am || die diff --git a/dev-libs/libgaminggear/libgaminggear-0.15.1.ebuild b/dev-libs/libgaminggear/libgaminggear-0.15.1.ebuild index c7184acf5ab2..9c844d7032db 100644 --- a/dev-libs/libgaminggear/libgaminggear-0.15.1.ebuild +++ b/dev-libs/libgaminggear/libgaminggear-0.15.1.ebuild @@ -8,7 +8,7 @@ inherit cmake xdg DESCRIPTION="Provides functionality for gaming input devices" HOMEPAGE="https://sourceforge.net/projects/libgaminggear/" -SRC_URI="mirror://sourceforge/libgaminggear/${P}.tar.bz2" +SRC_URI="https://downloads.sourceforge.net/libgaminggear/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" diff --git a/dev-libs/libgcrypt/libgcrypt-1.10.3-r2.ebuild b/dev-libs/libgcrypt/libgcrypt-1.10.3-r2.ebuild index bbb0d0fd009b..7b2ed8bd2e29 100644 --- a/dev-libs/libgcrypt/libgcrypt-1.10.3-r2.ebuild +++ b/dev-libs/libgcrypt/libgcrypt-1.10.3-r2.ebuild @@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )" LICENSE="LGPL-2.1+ GPL-2+ MIT" SLOT="0/20" # subslot = soname major version -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="+asm cpu_flags_arm_neon cpu_flags_arm_aes cpu_flags_arm_sha1 cpu_flags_arm_sha2 cpu_flags_ppc_altivec cpu_flags_ppc_vsx2 cpu_flags_ppc_vsx3 cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_padlock cpu_flags_x86_sha cpu_flags_x86_sse4_1 doc +getentropy static-libs" # Build system only has --disable-arm-crypto-support right now diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest index b6be2db7ff21..785760c5f147 100644 --- a/dev-libs/libgit2/Manifest +++ b/dev-libs/libgit2/Manifest @@ -1,2 +1,3 @@ DIST libgit2-1.7.2.tar.gz 7548186 BLAKE2B c27870124c7e63a37794014a802a6fce46c577313f3b6081580f920fa842a65305b5bc56aa6ab02cf87c533d6052afdc37317f96aa1fd67387b07f52415ccbe3 SHA512 825737e4a1991fba50ea535f15b0e560ebe76ead752e04aeba36925b944d0da77fe9826a70980a1aa3d0bf9afbedfab79dd92e799c9252931384c89ebec9b012 DIST libgit2-1.8.0.tar.gz 7590126 BLAKE2B f3cc5259a5804bb1e319633269a8c488d7195683e39c178fbe5dc43278736bf15f706c1ca8f72b519ef647033ed11426ea40ceb0dd3ffddae3a35839493d6c54 SHA512 e5634267bd9c6a594c9a954d09c657e7b8aadf213609bf7dd83b99863d0d0c7109a5277617dd508abc2da54ea3f12c2af1908d1aeb73c000e94056e2f3653144 +DIST libgit2-1.8.1.tar.gz 7608949 BLAKE2B 14558400d092dd963becfd3d4966a8d0799811be15fea8c5bc1e91be24f14bb81d33d82b2fb8dd8895e167f634a5d532d62a4609167bcb1d93143275207bbf6d SHA512 7429fbdc46ae44fd359e9260cbe33d9ce9276db810c096f12c43e5d302d01011463cdfd98d604e59780187e020e216e839823a77479dc12f952a37628516af78 diff --git a/dev-libs/libgit2/libgit2-1.7.2.ebuild b/dev-libs/libgit2/libgit2-1.7.2.ebuild index 0189210875a8..e6996dbfbafa 100644 --- a/dev-libs/libgit2/libgit2-1.7.2.ebuild +++ b/dev-libs/libgit2/libgit2-1.7.2.ebuild @@ -44,6 +44,9 @@ src_configure() { -DUSE_HTTP_PARSER=system -DREGEX_BACKEND=pcre2 ) + # https://bugs.gentoo.org/927821 + append-flags -fno-strict-aliasing + filter-lto # https://bugs.gentoo.org/925207 append-lfs-flags cmake_src_configure diff --git a/dev-libs/libgit2/libgit2-1.8.0-r1.ebuild b/dev-libs/libgit2/libgit2-1.8.0-r1.ebuild new file mode 100644 index 000000000000..dbc498fedac5 --- /dev/null +++ b/dev-libs/libgit2/libgit2-1.8.0-r1.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) + +inherit cmake flag-o-matic python-any-r1 + +DESCRIPTION="A linkable library for Git" +HOMEPAGE="https://libgit2.org/" +SRC_URI=" + https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz +" +S=${WORKDIR}/${P/_/-} + +LICENSE="GPL-2-with-linking-exception" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos" +IUSE="examples gssapi +ssh test +threads trace" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-libs/libpcre2:= + net-libs/http-parser:= + sys-libs/zlib + dev-libs/openssl:0= + gssapi? ( virtual/krb5 ) + ssh? ( net-libs/libssh2 ) +" +DEPEND=" + ${RDEPEND} +" +BDEPEND=" + ${PYTHON_DEPS} + virtual/pkgconfig +" + +src_configure() { + local mycmakeargs=( + -DBUILD_TESTS=$(usex test) + -DUSE_SSH=$(usex ssh ON OFF) + -DUSE_GSSAPI=$(usex gssapi ON OFF) + -DUSE_HTTP_PARSER=system + -DREGEX_BACKEND=pcre2 + ) + # https://bugs.gentoo.org/927821 + append-flags -fno-strict-aliasing + filter-lto + # https://bugs.gentoo.org/925207 + append-lfs-flags + cmake_src_configure +} + +src_test() { + if [[ ${EUID} -eq 0 ]] ; then + # repo::iterator::fs_preserves_error fails if run as root + # since root can still access dirs with 0000 perms + ewarn "Skipping tests: non-root privileges are required for all tests to pass" + else + local TEST_VERBOSE=1 + cmake_src_test -R offline + fi +} + +src_install() { + cmake_src_install + dodoc docs/*.{md,txt} + + if use examples ; then + find examples -name '.gitignore' -delete || die + dodoc -r examples + docompress -x /usr/share/doc/${PF}/examples + fi +} diff --git a/dev-libs/libgit2/libgit2-1.8.0.ebuild b/dev-libs/libgit2/libgit2-1.8.1.ebuild index 9f21956dbf5b..baf3a901a1f5 100644 --- a/dev-libs/libgit2/libgit2-1.8.0.ebuild +++ b/dev-libs/libgit2/libgit2-1.8.1.ebuild @@ -39,11 +39,14 @@ BDEPEND=" src_configure() { local mycmakeargs=( -DBUILD_TESTS=$(usex test) - -DUSE_SSH=$(usex ssh) + -DUSE_SSH=$(usex ssh ON OFF) -DUSE_GSSAPI=$(usex gssapi ON OFF) -DUSE_HTTP_PARSER=system -DREGEX_BACKEND=pcre2 ) + # https://bugs.gentoo.org/927821 + append-flags -fno-strict-aliasing + filter-lto # https://bugs.gentoo.org/925207 append-lfs-flags cmake_src_configure diff --git a/dev-libs/libgnt/libgnt-2.14.2.ebuild b/dev-libs/libgnt/libgnt-2.14.2.ebuild index 27ad8d8bb10c..b5bce4a12ebd 100644 --- a/dev-libs/libgnt/libgnt-2.14.2.ebuild +++ b/dev-libs/libgnt/libgnt-2.14.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,7 +7,7 @@ inherit meson DESCRIPTION="Pidgin's GLib Ncurses Toolkit" HOMEPAGE="https://keep.imfreedom.org/libgnt/libgnt" -SRC_URI="mirror://sourceforge/pidgin/${P}.tar.xz" +SRC_URI="https://downloads.sourceforge.net/pidgin/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" diff --git a/dev-libs/libgnt/libgnt-2.14.3.ebuild b/dev-libs/libgnt/libgnt-2.14.3.ebuild index 04d2ce3f3f6b..c5d27eca7bd3 100644 --- a/dev-libs/libgnt/libgnt-2.14.3.ebuild +++ b/dev-libs/libgnt/libgnt-2.14.3.ebuild @@ -7,7 +7,7 @@ inherit flag-o-matic meson DESCRIPTION="Pidgin's GLib Ncurses Toolkit" HOMEPAGE="https://keep.imfreedom.org/libgnt/libgnt" -SRC_URI="mirror://sourceforge/pidgin/${P}.tar.xz" +SRC_URI="https://downloads.sourceforge.net/pidgin/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" diff --git a/dev-libs/libgpg-error/Manifest b/dev-libs/libgpg-error/Manifest index 24f9363b0288..5c24aeb0ee7e 100644 --- a/dev-libs/libgpg-error/Manifest +++ b/dev-libs/libgpg-error/Manifest @@ -2,3 +2,5 @@ DIST libgpg-error-1.47.tar.bz2 1020862 BLAKE2B bc04efa0686b1b7d7cdce045fc080c090 DIST libgpg-error-1.47.tar.bz2.sig 119 BLAKE2B d23ea6c38621407c8f9f0c6bde71abd0e50c136d2e5de9a6cef64627f5d398c344a3438995a2405c4ef148ad8638ef7125f34670819957acd7d597370f1630e5 SHA512 09343016eaf7fcc455f8ce533847153a8a9b7c36f375a8ebe71ef5fc2923edf7b70842f834f52c51874e427869487b74a2286ea0112cffad0d72f79cb6d4eceb DIST libgpg-error-1.48.tar.bz2 1080417 BLAKE2B 4ced63058586558f4d001bcc468f4bd419b8ec29fbd7dbcaa1a21f959d847c9e12c10c548a0038fd4eac0bdfc9907b61e9f6be71c95fc61c964c649e2415dfd7 SHA512 3e9ea99cfb7d706791eb3349a9356b6bc44a53ef8bfa9a4e89afb5203dad5af3f466a039a1764361c0c7f697a6fa668a21d05ceaeb8e44ec5a11d6468998adf2 DIST libgpg-error-1.48.tar.bz2.sig 119 BLAKE2B 36e74c520df1740d48630584cb7093413c7974157038dd0e732cb821d6e3b3386a331be9e94a7f19ea10256bd2902d778d52fe1eeab68065ef9dc2625ac2902c SHA512 302091beddab877acf4355f913fae4bd0a795f0a032f47e0e17c58fe1049833116a743d3470669cff59eab2f6d184b143689763cbb4d0f2f9bcab598e09dc12c +DIST libgpg-error-1.49.tar.bz2 1081175 BLAKE2B f1d7ce3c8b32a1a98495576b4ed7bf938b847a84d0fa3ed585d461ad6b136cf87112055a39b4859301f87f555666d9dbf0dda5ec03ea6270802d98352224071e SHA512 bb4dd3faa8e2ec945e61fb2006697b48a51da7ee510b6650a6ab09c8734a987bc33c9835bc710ca9a9395c088271939091be418efc6ca5130b426c2fbc4959a3 +DIST libgpg-error-1.49.tar.bz2.sig 119 BLAKE2B 6d290318fc8759b6c8bf09a2e2622ed645dded003ffdd76b599cd3ec8af3ca51abf237e35c0c942d78c72e95f6cd644df7eb63fabd8b69b9566bb4f878648f14 SHA512 7f36f603dbb492c4dcafe3eae153b35fede29bf85f50d8908c517330003babd8e357aa54e3f354cd0abbcb9862435d5756ac85aff3c2968ce9fcde8cbf6565de diff --git a/dev-libs/libgpg-error/libgpg-error-1.48.ebuild b/dev-libs/libgpg-error/libgpg-error-1.48.ebuild index 0939b629b21f..490a0a934ee8 100644 --- a/dev-libs/libgpg-error/libgpg-error-1.48.ebuild +++ b/dev-libs/libgpg-error/libgpg-error-1.48.ebuild @@ -19,7 +19,7 @@ SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )" LICENSE="GPL-2 LGPL-2.1" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="common-lisp nls static-libs test" RESTRICT="!test? ( test )" diff --git a/dev-libs/libgpg-error/libgpg-error-1.49.ebuild b/dev-libs/libgpg-error/libgpg-error-1.49.ebuild new file mode 100644 index 000000000000..9a02c2b81471 --- /dev/null +++ b/dev-libs/libgpg-error/libgpg-error-1.49.ebuild @@ -0,0 +1,88 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Maintainers should: +# 1. Join the "Gentoo" project at https://dev.gnupg.org/project/view/27/ +# 2. Subscribe to release tasks like https://dev.gnupg.org/T6159 +# (find the one for the current release then subscribe to it + +# any subsequent ones linked within so you're covered for a while.) + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/gnupg.asc +inherit multilib-minimal toolchain-funcs verify-sig + +DESCRIPTION="Contains error handling functions used by GnuPG software" +HOMEPAGE="https://www.gnupg.org/related_software/libgpg-error" +SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" +SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )" + +LICENSE="GPL-2 LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="common-lisp nls static-libs test" +RESTRICT="!test? ( test )" + +RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )" +DEPEND="${RDEPEND}" +BDEPEND=" + nls? ( sys-devel/gettext ) + verify-sig? ( sec-keys/openpgp-keys-gnupg ) +" + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/gpg-error.h + /usr/include/gpgrt.h +) + +MULTILIB_CHOST_TOOLS=( + /usr/bin/gpg-error-config + /usr/bin/gpgrt-config +) + +src_prepare() { + default + + if use prefix ; then + # don't hardcode /usr/xpg4/bin/sh as shell on Solaris + sed -i -e 's:INSTALLSHELLPATH=/usr/xpg4/bin/sh:INSTALLSHELLPATH=/bin/sh:g' configure.ac configure || die + fi + + # This check breaks multilib + cat <<-EOF > src/gpg-error-config-test.sh.in || die + #!@INSTALLSHELLPATH@ + exit 0 + EOF + + # only necessary for as long as we run eautoreconf, configure.ac + # uses ./autogen.sh to generate PACKAGE_VERSION, but autogen.sh is + # not a pure /bin/sh script, so it fails on some hosts + #sed -i -e "1s:.*:#\!${BASH}:" autogen.sh || die + #eautoreconf +} + +multilib_src_configure() { + local myeconfargs=( + $(multilib_is_native_abi || echo --disable-languages) + $(use_enable common-lisp languages) + $(use_enable nls) + # required for sys-power/suspend[crypt], bug 751568 + $(use_enable static-libs static) + $(use_enable test tests) + + # See bug #699206 and its duplicates wrt gpgme-config + # Upstream no longer install this by default and we should + # seek to disable it at some point. + --enable-install-gpg-error-config + + --enable-threads + CC_FOR_BUILD="$(tc-getBUILD_CC)" + $("${S}/configure" --help | grep -o -- '--without-.*-prefix') + ) + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_install_all() { + einstalldocs + find "${ED}" -type f -name '*.la' -delete || die +} diff --git a/dev-libs/libgpiod/Manifest b/dev-libs/libgpiod/Manifest index cc79e073bb6f..42766fc08d6a 100644 --- a/dev-libs/libgpiod/Manifest +++ b/dev-libs/libgpiod/Manifest @@ -1,4 +1,3 @@ -DIST libgpiod-1.6.3.tar.xz 326068 BLAKE2B eda5409f2db3914ede92690589643211eca3002f8dc53a7c48213602f28158084c8eb8061319923f7a51c7d91650ff58b81b059323b5b9133a28b0bb04f6904d SHA512 f7e48662d02904f3f25976d61aa2cf4af0b8a52f65f184f23dfb6916bde9b86634b211f2696d3459a4f902ba5a79621b2fc47d18d487fd7a159018fe8933e370 DIST libgpiod-1.6.4.tar.xz 334552 BLAKE2B 3bf52dab263638967e0f59c858e22f3d8ec1c9565ba1edd665dff580a883fbc6aa49a944e6df4da8fca9c2df873e222ed4e055c9792ee27d4562b3c2d0c65b79 SHA512 23ea27147039ae34505263dbfbb3ca9985fc671d26e489ccaf150543d4e853f709393f46a8a5a1e682fa91378163bd2db6c689159ef73c3a8d1eeea422eacda0 DIST libgpiod-2.1.1.tar.xz 421164 BLAKE2B 940f2af832a0fc39accecd9cf76864d05f961c0d2e4899d09dc07670bb2a8d8c2704fa43e29e2163f2b486ba65cadce2114f96cf0e7637afece99c543852305f SHA512 d396f1b8f632c3592b2be37e23e5052f4050ab5c1a9de77de5f97ce50fa3115c119dd69b0bbcf59621e92b775bfc81f18a65cca1e57e022752d28c0e01baff6f -DIST libgpiod-2.1.tar.xz 421132 BLAKE2B 97f43854070f19b37f4041c08d33c8156d69a3acd73845849f843223d159602ad8aa59096e1c8a3428bf16488272353a5747c6c95b9f729cb11e53ceeb6b29c2 SHA512 1c20a93fb2a6cf66f4690a5784ac1aeb077ca3da23c1942448f045972092468480e13b13174f327b3b7252bef5f23ffd226c990f11529b1151ba2dc318a47e52 +DIST libgpiod-2.1.2.tar.xz 419964 BLAKE2B 62b1df3af28d0ab4988101f6bcbce750fd5bd7db874a34c196630bc8badaefc8e3c5c60bbf3c4dfff074d4d2f681d3339fc32c9eeecf395b595b91e5727572e5 SHA512 e921ac34692d5ae92a29592e2103229a8b0afcdcfa750e30fbd292554cd2e59fd51aefc8fa2ad1c9ad5ea4a93bb3443e8f6e8f4f1537109b263aba33317106f3 diff --git a/dev-libs/libgpiod/libgpiod-1.6.3-r4.ebuild b/dev-libs/libgpiod/libgpiod-1.6.3-r4.ebuild deleted file mode 100644 index edd9c253a6f3..000000000000 --- a/dev-libs/libgpiod/libgpiod-1.6.3-r4.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit linux-info - -DESCRIPTION="C library and tools for interacting with the linux GPIO character device" -HOMEPAGE="https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/" -SRC_URI="https://mirrors.edge.kernel.org/pub/software/libs/libgpiod/${P}.tar.xz" - -LICENSE="LGPL-2.1" -# Reflects the ABI of libgpiod.so -SLOT="0/2" -KEYWORDS="amd64 arm arm64 ~riscv x86" -IUSE="+tools cxx python test" -RESTRICT="!test? ( test )" - -# --enable-tests enable libgpiod tests [default=no] -# --enable-bindings-cxx enable C++ bindings [default=no] -# --enable-bindings-python -DEPEND=" - test? ( - >=dev-libs/glib-2.50 - >=sys-apps/kmod-18 - >=sys-apps/util-linux-2.33.1 - >=virtual/libudev-215 - ) -" - -pkg_setup() { - CONFIG_CHECK="~GPIO_CDEV_V1" - linux-info_pkg_setup -} - -src_configure() { - local myconf=( - $(use_enable tools) - $(use_enable cxx bindings-cxx) - $(use_enable test tests) - $(use_enable python bindings-python) - ) - - econf "${myconf[@]}" -} - -src_install() { - default - - find "${D}" -name '*.la' -type f -delete || die - find "${D}" -name "*.a" -delete || die -} diff --git a/dev-libs/libgpiod/libgpiod-1.6.4.ebuild b/dev-libs/libgpiod/libgpiod-1.6.4.ebuild index 89067dc6f4b6..cab36b424ecb 100644 --- a/dev-libs/libgpiod/libgpiod-1.6.4.ebuild +++ b/dev-libs/libgpiod/libgpiod-1.6.4.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 @@ -12,7 +12,7 @@ SRC_URI="https://mirrors.edge.kernel.org/pub/software/libs/libgpiod/${P}.tar.xz" LICENSE="LGPL-2.1" # Reflects the ABI of libgpiod.so SLOT="0/2" -KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" +KEYWORDS="amd64 arm arm64 ~riscv x86" IUSE="+tools cxx python test" RESTRICT="!test? ( test )" diff --git a/dev-libs/libgpiod/libgpiod-2.1.ebuild b/dev-libs/libgpiod/libgpiod-2.1.2.ebuild index d3c115ebeb62..63f9fafa352e 100644 --- a/dev-libs/libgpiod/libgpiod-2.1.ebuild +++ b/dev-libs/libgpiod/libgpiod-2.1.2.ebuild @@ -26,14 +26,10 @@ DEPEND=" >=sys-apps/kmod-18 >=sys-apps/util-linux-2.33.1 >=virtual/libudev-215 + cxx? ( <dev-cpp/catch-3.5:0 ) ) " -PATCHES=( - # bug 913899 - "${FILESDIR}"/${PN}-2.1-libtool.patch -) - pkg_setup() { CONFIG_CHECK="~GPIO_CDEV_V1" linux-info_pkg_setup diff --git a/dev-libs/libgudev/files/238-clang18-export-dynamic.patch b/dev-libs/libgudev/files/238-clang18-export-dynamic.patch new file mode 100644 index 000000000000..8894f0116ed0 --- /dev/null +++ b/dev-libs/libgudev/files/238-clang18-export-dynamic.patch @@ -0,0 +1,37 @@ +From a354fcbb911220965f737d38fefe700f7b941cf8 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 16 Jan 2024 12:02:46 -0800 +Subject: [PATCH] meson: Pass --export-dynamic option to linker + +Bypass the compiler driver trying to comprehend and translate it for +linker, since its not clear what the right behavior should be, gcc seems +to translate it into --export-dynamic but clang 18+ rejects it + +| x86_64-yoe-linux-clang: error: unknown argument: '-export-dynamic' + +also see [1] + +This makes it work as intended across gcc and clang + +[1] https://discourse.llvm.org/t/clang-option-export-dynamic-parse-to-e-xport-dynamic-error/72454 +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + gudev/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gudev/meson.build b/gudev/meson.build +index e904203..3ed580b 100644 +--- a/gudev/meson.build ++++ b/gudev/meson.build +@@ -33,7 +33,7 @@ libgudev_c_args = [ + ] + + libgudev_link_args = [ +- '-export-dynamic', ++ '-Wl,--export-dynamic', + '-Wl,--version-script,@0@/libgudev-1.0.sym'.format(top_srcdir), + ] + +-- +GitLab + diff --git a/dev-libs/libgudev/libgudev-238-r2.ebuild b/dev-libs/libgudev/libgudev-238-r2.ebuild new file mode 100644 index 000000000000..7e9eb935f5a6 --- /dev/null +++ b/dev-libs/libgudev/libgudev-238-r2.ebuild @@ -0,0 +1,51 @@ +# Copyright 2015-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit meson-multilib + +DESCRIPTION="GObject bindings for libudev" +HOMEPAGE="https://wiki.gnome.org/Projects/libgudev" +SRC_URI="https://download.gnome.org/sources/libgudev/${PV}/${P}.tar.xz" + +LICENSE="LGPL-2.1+" +SLOT="0/0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE="introspection test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-libs/glib-2.38.0:2[${MULTILIB_USEDEP}] + >=virtual/libudev-251:=[sticky-tags(+),${MULTILIB_USEDEP}] + introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) +" +DEPEND="${RDEPEND} + test? ( dev-util/umockdev[${MULTILIB_USEDEP}] ) +" +BDEPEND=" + dev-util/glib-utils + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${PV}-clang18-export-dynamic.patch #926350 +) + +multilib_src_configure() { + local emesonargs=( + $(meson_native_use_feature introspection) + -Dgtk_doc=false + $(meson_feature test tests) + -Dvapi=disabled + ) + meson_src_configure +} + +src_test() { + # libsandbox interferes somehow. + # There are no access violations, but tests fail. + # https://bugs.gentoo.org/805449 + local -x SANDBOX_ON=0 + meson-multilib_src_test +} diff --git a/dev-libs/libgusb/Manifest b/dev-libs/libgusb/Manifest index d58b688bc74c..3fd71e68eff3 100644 --- a/dev-libs/libgusb/Manifest +++ b/dev-libs/libgusb/Manifest @@ -1,2 +1 @@ -DIST libgusb-0.4.7.tar.xz 51448 BLAKE2B 126d7723e7f47cf1ee4780aaf627c15e8e04a95a765f5c68578d6a31ec1d69578af05b6687224399e657dfaf2f983bad5415b05c19c3334cfc7fc06a58f0a27e SHA512 38f8d4989e3adc46013a9e8ca42511c5de9bbaf23a11654eb47d7c9a9c64b90f0213b77916f8ebd1e6c246aaafa0e1574bb72a19170ae9efa2af9e3f86a4e210 DIST libgusb-0.4.8.tar.xz 51632 BLAKE2B f904bb8a0766a61b0e7d6e5e80d7f0eed5c44537065db2b9bf33cd694fcaa58d93a7cdec37802fd278c2eb7ad2e4de79cd492baa1ead373e31e4d75488999e1e SHA512 b6446761ba4a19b8e7b7fc2bcf26064c89a574c328b794eb3f1723ef71b4100447c5b024bd8163c4e42af935ce0b7e11b93b722871061f7115da0003cc14b001 diff --git a/dev-libs/libgusb/libgusb-0.4.7.ebuild b/dev-libs/libgusb/libgusb-0.4.7.ebuild deleted file mode 100644 index 986ca1a121f6..000000000000 --- a/dev-libs/libgusb/libgusb-0.4.7.ebuild +++ /dev/null @@ -1,72 +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} ) -PYTHON_REQ_USE="xml(+)" - -inherit meson-multilib python-any-r1 vala - -DESCRIPTION="GObject wrapper for libusb" -HOMEPAGE="https://github.com/hughsie/libgusb" -SRC_URI="https://github.com/hughsie/libgusb/releases/download/${PV}/${P}.tar.xz" - -LICENSE="LGPL-2.1+" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86" - -IUSE="gtk-doc +introspection test +vala" -REQUIRED_USE=" - gtk-doc? ( introspection ) - vala? ( introspection ) -" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-libs/glib-2.44.0:2[${MULTILIB_USEDEP}] - virtual/libusb:1[udev,${MULTILIB_USEDEP}] - >=dev-libs/json-glib-1.1.1[${MULTILIB_USEDEP},introspection?] - introspection? ( >=dev-libs/gobject-introspection-1.54:= ) - sys-apps/hwdata -" -DEPEND="${RDEPEND} - test? ( >=dev-util/umockdev-0.17.7[${MULTILIB_USEDEP}] )" -BDEPEND=" - $(python_gen_any_dep 'dev-python/setuptools[${PYTHON_USEDEP}]') - gtk-doc? ( dev-util/gi-docgen ) - vala? ( $(vala_depend) ) - virtual/pkgconfig -" - -python_check_deps() { - python_has_version "dev-python/setuptools[${PYTHON_USEDEP}]" -} - -src_prepare() { - default - use vala && vala_setup -} - -multilib_src_configure() { - local emesonargs=( - -Ddefault_library=shared - $(meson_use test tests) - $(meson_native_use_bool vala vapi) - -Dusb_ids="${EPREFIX}"/usr/share/hwdata/usb.ids - $(meson_native_use_bool gtk-doc docs) - $(meson_native_use_bool introspection) - $(meson_feature test umockdev) - - ) - meson_src_configure -} - -multilib_src_install_all() { - einstalldocs - - if use gtk-doc; then - mkdir -p "${ED}"/usr/share/gtk-doc/ || die - mv "${ED}"/usr/share/{doc,gtk-doc}/libgusb || die - fi -} diff --git a/dev-libs/libgusb/libgusb-0.4.8.ebuild b/dev-libs/libgusb/libgusb-0.4.8.ebuild index 170709802faf..986ca1a121f6 100644 --- a/dev-libs/libgusb/libgusb-0.4.8.ebuild +++ b/dev-libs/libgusb/libgusb-0.4.8.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/hughsie/libgusb/releases/download/${PV}/${P}.tar.xz" LICENSE="LGPL-2.1+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86" IUSE="gtk-doc +introspection test +vala" REQUIRED_USE=" diff --git a/dev-libs/libgweather/Manifest b/dev-libs/libgweather/Manifest index 428eb427cb2d..9a4ea496fc79 100644 --- a/dev-libs/libgweather/Manifest +++ b/dev-libs/libgweather/Manifest @@ -1,2 +1 @@ -DIST libgweather-4.4.0.tar.xz 2808680 BLAKE2B d3bfabd7936a5dc5f6f77cbb5acb3a7b80cebe1f08ff48582e1609cad04051ce8b84959c27576c928233e4625db8831c99d049378908cbe562b48221b6f37392 SHA512 dd232d36b168132a7c7cf06ffff16e88eb6e3e9e003e39b975df3d294ada401ab7d34de386dcc53452de6b0f8c68ff7f0cf6a94492e353828e00d4a1204b5d00 DIST libgweather-4.4.2.tar.xz 2827456 BLAKE2B de53257f15b5b0e38bd41ccf69665e701065db85d144853831f409cd1a7116482bb374a858b022f9fb5eb167203bb393fa4a9087ab2c2272ba1b83dec3efcbb0 SHA512 66012af9bc50dfbb8cdb3d8b1ad7c72b5e8e012d8bbaa5a8d7a841f4bd5b2ebe0a490cc7ea256ea5e1d218f328da8826fb2345aa848fd961da271e64cdf330ad diff --git a/dev-libs/libgweather/libgweather-4.4.0.ebuild b/dev-libs/libgweather/libgweather-4.4.0.ebuild deleted file mode 100644 index 9df29f888f84..000000000000 --- a/dev-libs/libgweather/libgweather-4.4.0.ebuild +++ /dev/null @@ -1,88 +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 gnome.org gnome2-utils meson python-any-r1 vala xdg - -DESCRIPTION="Location and timezone database and weather-lookup library" -HOMEPAGE="https://wiki.gnome.org/Projects/LibGWeather" - -LICENSE="GPL-2+" -SLOT="4/4-0" # subslot = 4-(libgweather-4 soname suffix) - -IUSE="gtk-doc +introspection test +vala" -RESTRICT="!test? ( test )" -REQUIRED_USE=" - vala? ( introspection ) - gtk-doc? ( introspection ) -" - -KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" - -RDEPEND=" - >=dev-libs/glib-2.68.0:2 - >=net-libs/libsoup-2.99.2:3.0 - sci-geosciences/geocode-glib:2 - >=dev-libs/libxml2-2.6.0:2 - dev-libs/json-glib - introspection? ( >=dev-libs/gobject-introspection-1.54:= ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-util/glib-utils - gtk-doc? ( >=dev-util/gi-docgen-2021.6 ) - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - ${PYTHON_DEPS} - $(python_gen_any_dep 'dev-python/pygobject[${PYTHON_USEDEP}]') - vala? ( $(vala_depend) ) -" - -python_check_deps() { - python_has_version -b "dev-python/pygobject[${PYTHON_USEDEP}]" -} - -pkg_setup() { - python-any-r1_pkg_setup -} - -src_prepare() { - default - gnome2_environment_reset - use vala && vala_setup - # The metar test requires network access - if has network-sandbox ${FEATURES}; then - sed -i -e '/metar/d' libgweather/tests/meson.build || die - fi -} - -src_configure() { - local emesonargs=( - $(meson_use vala enable_vala) - $(meson_use gtk-doc gtk_doc) - $(meson_use introspection) - $(meson_use test tests) - -Dsoup2=false - ) - meson_src_configure -} - -src_install() { - meson_src_install - if use gtk-doc; then - mkdir -p "${ED}"/usr/share/gtk-doc/ || die - mv "${ED}"/usr/share/doc/libgweather-4.0 "${ED}"/usr/share/gtk-doc/ || die - fi -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} diff --git a/dev-libs/libgweather/libgweather-4.4.2.ebuild b/dev-libs/libgweather/libgweather-4.4.2.ebuild index 1ff7ca20d5d4..9df29f888f84 100644 --- a/dev-libs/libgweather/libgweather-4.4.2.ebuild +++ b/dev-libs/libgweather/libgweather-4.4.2.ebuild @@ -19,7 +19,7 @@ REQUIRED_USE=" gtk-doc? ( introspection ) " -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" RDEPEND=" >=dev-libs/glib-2.68.0:2 diff --git a/dev-libs/libical/Manifest b/dev-libs/libical/Manifest index 2a93326acfaa..3cd57c8e58d1 100644 --- a/dev-libs/libical/Manifest +++ b/dev-libs/libical/Manifest @@ -1 +1 @@ -DIST libical-3.0.17.tar.gz 909125 BLAKE2B 002eba515280c685db49d7f6781048ca4f86a22fb44a740b459fd8ae8f7dd669cb8a623df16e87913a397fc9b242d75c999e7aea26f09254982d77f1c9f87ac2 SHA512 11fbb4aba7503a3264b0efa30ad56aa923d31ec193bdb0b87b92bc88db9019fa670c8c9ee7998caa3a870e706446a58ead475f31bd703f0d2cb7aabf0f6a3aa7 +DIST libical-3.0.18.tar.gz 908948 BLAKE2B 0d3a665bce64752bbb1d28afea708643e6f52f19d5e5eae576aac40b720661e5c9593ff1e5ae48ef9a6c1b54259a7848847817ae669bbc8ef6b34bf1c7d90ee6 SHA512 53ecf6c14a68d569dd11bfdeb1a072def847a14d189c6af16eab202e004350ee7d9488c6b63e9cb67889e8c2dec90643fef46aec143a915f28270d0752eaa9d5 diff --git a/dev-libs/libical/files/libical-3.0.4-tests.patch b/dev-libs/libical/files/libical-3.0.4-tests.patch deleted file mode 100644 index 7ecf6e1f2d76..000000000000 --- a/dev-libs/libical/files/libical-3.0.4-tests.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 3066463eb407853626277442eba725ddde58b843 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> -Date: Sun, 6 Jan 2019 17:41:10 +0100 -Subject: [PATCH] Try to fix test dir path - ---- - src/test/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt -index b1179c2c..af7ce3fc 100644 ---- a/src/test/CMakeLists.txt -+++ b/src/test/CMakeLists.txt -@@ -27,7 +27,7 @@ add_definitions(-DTEST_DATADIR=${TEST_DATADIR}) - macro(setprops _name) - if(UNIX) - set_tests_properties(${_name} PROPERTIES -- WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/bin" -+ WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/src/test" - ) - endif() - if(WIN32) --- -2.20.1 - diff --git a/dev-libs/libical/libical-3.0.17.ebuild b/dev-libs/libical/libical-3.0.18.ebuild index 93d55917bd08..9570b50ca486 100644 --- a/dev-libs/libical/libical-3.0.17.ebuild +++ b/dev-libs/libical/libical-3.0.18.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{9..12} ) VALA_USE_DEPEND="vapigen" inherit cmake python-any-r1 vala @@ -50,10 +50,7 @@ DOCS=( doc/{AddingOrModifyingComponents.txt,UsingLibical.md} ) -PATCHES=( - "${FILESDIR}/${PN}-3.0.4-tests.patch" - "${FILESDIR}/${PN}-3.0.11-pkgconfig-libdir.patch" -) +PATCHES=( "${FILESDIR}/${PN}-3.0.11-pkgconfig-libdir.patch" ) python_check_deps() { python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" @@ -65,8 +62,6 @@ pkg_setup() { src_prepare() { cmake_src_prepare - - use examples || cmake_comment_add_subdirectory examples use vala && vala_setup } @@ -74,6 +69,7 @@ src_configure() { local mycmakeargs=( -DCMAKE_DISABLE_FIND_PACKAGE_BerkeleyDB=ON -DICAL_BUILD_DOCS=$(usex doc) + -DLIBICAL_BUILD_EXAMPLES=$(use examples) -DICAL_GLIB=$(usex glib) -DGOBJECT_INTROSPECTION=$(usex introspection) -DSHARED_ONLY=$(usex !static-libs) diff --git a/dev-libs/libindicate/files/libindicate-12.10.1-tests-werror.patch b/dev-libs/libindicate/files/libindicate-12.10.1-tests-werror.patch new file mode 100644 index 000000000000..1f669dbc5ec5 --- /dev/null +++ b/dev-libs/libindicate/files/libindicate-12.10.1-tests-werror.patch @@ -0,0 +1,47 @@ +--- a/examples/Makefile.am ++++ b/examples/Makefile.am +@@ -20,7 +20,7 @@ indicate_and_crash_SOURCES = \ + + indicate_and_crash_CFLAGS = \ + -I $(srcdir)/.. \ +- -Wall -Werror \ ++ -Wall \ + $(LIBINDICATE_CFLAGS) + + indicate_and_crash_LDADD = \ +@@ -32,7 +32,7 @@ indicate_alot_SOURCES = \ + + indicate_alot_CFLAGS = \ + -I $(srcdir)/.. \ +- -Wall -Werror \ ++ -Wall \ + $(LIBINDICATE_CFLAGS) + + indicate_alot_LDADD = \ +@@ -44,7 +44,7 @@ listen_and_print_SOURCES = \ + + listen_and_print_CFLAGS = \ + -I $(srcdir)/.. \ +- -Wall -Werror \ ++ -Wall \ + $(LIBINDICATE_CFLAGS) \ + $(LIBINDICATEGTK_CFLAGS) + +@@ -59,7 +59,7 @@ im_client_SOURCES = \ + + im_client_CFLAGS = \ + -I $(srcdir)/.. \ +- -Wall -Werror \ ++ -Wall \ + $(LIBINDICATE_CFLAGS) \ + $(LIBINDICATEGTK_CFLAGS) + +@@ -74,7 +74,7 @@ show_hide_server_SOURCES = \ + + show_hide_server_CFLAGS = \ + -I $(srcdir)/.. \ +- -Wall -Werror \ ++ -Wall \ + $(LIBINDICATE_CFLAGS) + + show_hide_server_LDADD = \ diff --git a/dev-libs/libindicate/libindicate-12.10.1-r4.ebuild b/dev-libs/libindicate/libindicate-12.10.1-r4.ebuild index 7dd3ee3396f3..f4d947713309 100644 --- a/dev-libs/libindicate/libindicate-12.10.1-r4.ebuild +++ b/dev-libs/libindicate/libindicate-12.10.1-r4.ebuild @@ -14,8 +14,8 @@ SRC_URI="https://launchpad.net/${PN}/${PV%.*}/${PV}/+download/${P}.tar.gz" LICENSE="LGPL-2.1 LGPL-3" SLOT="3" KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86" -IUSE="gtk +introspection" -RESTRICT="test" # consequence of the -no-mono.patch +IUSE="gtk +introspection test" +RESTRICT="!test? ( test )" RDEPEND=" dev-libs/dbus-glib @@ -35,9 +35,13 @@ BDEPEND=" gnome-base/gnome-common virtual/pkgconfig $(vala_depend) + test? ( dev-util/dbus-test-runner ) " -PATCHES=( "${FILESDIR}"/${P}-autotools.patch ) +PATCHES=( + "${FILESDIR}"/${P}-autotools.patch + "${FILESDIR}"/${PN}-12.10.1-tests-werror.patch +) src_prepare() { default @@ -51,11 +55,16 @@ src_configure() { econf \ $(use_enable gtk) \ $(use_enable introspection) \ + $(use_enable test tests) \ --disable-python \ --disable-scrollkeeper \ --with-gtk=3 } +src_test() { + emake check XFAIL_TESTS="test-interests test-interests-multi test-max-indicators test-indicator-display test-indicator-display-half" +} + src_install() { default find "${ED}" -name '*.la' -delete || die diff --git a/dev-libs/libisoburn/libisoburn-1.5.6-r1.ebuild b/dev-libs/libisoburn/libisoburn-1.5.6-r1.ebuild index cbaaa66845c3..9da120f44b7a 100644 --- a/dev-libs/libisoburn/libisoburn-1.5.6-r1.ebuild +++ b/dev-libs/libisoburn/libisoburn-1.5.6-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://files.libburnia-project.org/releases/${P}.tar.gz" LICENSE="GPL-2 GPL-3" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86" IUSE="acl debug external-filters external-filters-setuid frontend-optional launch-frontend launch-frontend-setuid libedit readline static-libs xattr zlib" diff --git a/dev-libs/libisoburn/libisoburn-1.5.6.ebuild b/dev-libs/libisoburn/libisoburn-1.5.6.ebuild deleted file mode 100644 index 4960500550dc..000000000000 --- a/dev-libs/libisoburn/libisoburn-1.5.6.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="Creation/expansion of ISO-9660 filesystems on CD/DVD media supported by libburn" -HOMEPAGE="https://dev.lovelyhq.com/libburnia/web/wiki/Libisoburn" -SRC_URI="https://files.libburnia-project.org/releases/${P}.tar.gz" - -LICENSE="GPL-2 GPL-3" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~s390 sparc x86" -IUSE="acl debug external-filters external-filters-setuid frontend-optional - launch-frontend launch-frontend-setuid libedit readline static-libs xattr zlib" - -REQUIRED_USE="frontend-optional? ( || ( launch-frontend launch-frontend-setuid ) )" - -BDEPEND=" - virtual/pkgconfig -" -RDEPEND=" - >=dev-libs/libburn-1.5.6 - >=dev-libs/libisofs-1.5.6 - readline? ( sys-libs/readline:0= ) - !readline? ( - libedit? ( dev-libs/libedit ) - ) - acl? ( virtual/acl ) - xattr? ( sys-apps/attr ) - zlib? ( sys-libs/zlib ) - launch-frontend? ( - dev-lang/tcl:0 - dev-lang/tk:0 - ) - launch-frontend-setuid? ( - dev-lang/tcl:0 - dev-lang/tk:0 - ) - frontend-optional? ( dev-tcltk/bwidget ) -" -DEPEND=" - ${RDEPEND} -" - -src_configure() { - econf \ - $(use_enable static-libs static) \ - $(use_enable readline libreadline) \ - $(usex readline --disable-libedit $(use_enable libedit)) \ - $(use_enable acl libacl) \ - $(use_enable xattr) \ - $(use_enable zlib) \ - --disable-libjte \ - $(use_enable external-filters) \ - $(use_enable external-filters-setuid) \ - $(use_enable launch-frontend) \ - $(use_enable launch-frontend-setuid) \ - --disable-ldconfig-at-install \ - --enable-pkg-check-modules \ - $(use_enable debug) -} - -src_install() { - default - - dodoc CONTRIBUTORS doc/{comments,*.wiki,startup_file.txt} - - docinto frontend - dodoc frontend/README-tcltk - docinto xorriso - dodoc xorriso/{changelog.txt,README_gnu_xorriso} - - find "${D}" -name '*.la' -delete || die -} diff --git a/dev-libs/libisofs/libisofs-1.5.6_p1-r1.ebuild b/dev-libs/libisofs/libisofs-1.5.6_p1-r1.ebuild index bc91f16b5fee..8a18790d28c3 100644 --- a/dev-libs/libisofs/libisofs-1.5.6_p1-r1.ebuild +++ b/dev-libs/libisofs/libisofs-1.5.6_p1-r1.ebuild @@ -12,9 +12,11 @@ DESCRIPTION="Open-source library for reading, mastering and writing optical disc HOMEPAGE="https://dev.lovelyhq.com/libburnia/web/wiki/Libisofs" SRC_URI="https://files.libburnia-project.org/releases/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_PF}" + LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86" IUSE="acl debug static-libs verbose-debug xattr zlib" BDEPEND=" @@ -29,8 +31,6 @@ DEPEND=" ${RDEPEND} " -S="${WORKDIR}/${MY_PF}" - src_prepare() { default diff --git a/dev-libs/libisofs/libisofs-1.5.6_p1.ebuild b/dev-libs/libisofs/libisofs-1.5.6_p1.ebuild deleted file mode 100644 index a1580127c83c..000000000000 --- a/dev-libs/libisofs/libisofs-1.5.6_p1.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MY_PF=${P/_p1/} -MY_P=${MY_PF}.pl01 - -DESCRIPTION="Open-source library for reading, mastering and writing optical discs" -HOMEPAGE="https://dev.lovelyhq.com/libburnia/web/wiki/Libisofs" -SRC_URI="https://files.libburnia-project.org/releases/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="acl debug static-libs verbose-debug xattr zlib" - -BDEPEND=" - virtual/pkgconfig -" -RDEPEND=" - acl? ( virtual/acl ) - xattr? ( sys-apps/attr ) - zlib? ( sys-libs/zlib ) -" -DEPEND=" - ${RDEPEND} -" - -S="${WORKDIR}/${MY_PF}" - -src_configure() { - econf \ - $(use_enable static-libs static) \ - $(use_enable debug) \ - $(use_enable verbose-debug) \ - $(use_enable acl libacl) \ - $(use_enable xattr) \ - $(use_enable zlib) \ - --disable-libjte \ - --disable-ldconfig-at-install -} - -src_install() { - default - - dodoc Roadmap doc/{*.txt,Tutorial} - - find "${D}" -name '*.la' -delete || die -} diff --git a/dev-libs/libjcat/Manifest b/dev-libs/libjcat/Manifest index bec0d8663d85..6331f7ea2ef2 100644 --- a/dev-libs/libjcat/Manifest +++ b/dev-libs/libjcat/Manifest @@ -1 +1,2 @@ DIST libjcat-0.1.14.tar.gz 70018 BLAKE2B 71329e6fc04ef37e5af215c88b4a5a03fbd65143604da57b0357d4bd07896a22a98b9028d8529234655adb37e5cefe226d09d987e798bce17b47fef1e1142d1f SHA512 837a50ad31a736a36bd9df26b151c198e18873df0e7444502b7a6e26a86df15f1df970112f2dd22658960389fdfb78a2c601274e2b5c46ec82fceef5aad778c1 +DIST libjcat-0.2.1.tar.gz 76698 BLAKE2B 62f77c993e47843dddacc9a67b9daac9bd29bef7363ce62125ecd22f9649b8a5ce2de07d74ea6900e9a45feb141caa19761bcffd337530d86a31b6ed94cab164 SHA512 e29fdaae38ade2960ffa7ac3cd41224ccab5fdb351d2ae420ffe0cf0ddb948bba37e9e040cc3046c8593be4622bf018779dfa80f173873b79582061f12c02373 diff --git a/dev-libs/libjcat/libjcat-0.2.1.ebuild b/dev-libs/libjcat/libjcat-0.2.1.ebuild new file mode 100644 index 000000000000..80d7f848471c --- /dev/null +++ b/dev-libs/libjcat/libjcat-0.2.1.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_REQ_USE="xml(+)" + +inherit meson python-any-r1 vala xdg-utils + +DESCRIPTION="Library and tool for reading and writing Jcat files" +HOMEPAGE="https://github.com/hughsie/libjcat" +SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-2.1+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +IUSE="+ed25519 +gpg gtk-doc +introspection +man +pkcs7 test vala" + +RDEPEND="dev-libs/glib:2 + dev-libs/json-glib:= + ed25519? ( + dev-libs/nettle:= + net-libs/gnutls:= + ) + gpg? ( + app-crypt/gpgme:= + dev-libs/libgpg-error + ) + introspection? ( dev-libs/gobject-introspection:= ) + pkcs7? ( net-libs/gnutls:= ) + vala? ( dev-lang/vala:= )" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig + $(python_gen_any_dep ' + dev-python/setuptools[${PYTHON_USEDEP}] + ') + gtk-doc? ( dev-util/gtk-doc ) + man? ( sys-apps/help2man ) + test? ( net-libs/gnutls[tools] )" + +RESTRICT="!test? ( test )" + +python_check_deps() { + python_has_version -b "dev-python/setuptools[${PYTHON_USEDEP}]" +} + +pkg_setup() { + use vala && vala_setup +} + +src_prepare() { + xdg_environment_reset + default +} + +src_configure() { + local emesonargs=( + $(meson_use ed25519) + $(meson_use gtk-doc gtkdoc) + $(meson_use gpg) + $(meson_use introspection) + $(meson_use man) + $(meson_use pkcs7) + $(meson_use test tests) + $(meson_use vala vapi) + ) + meson_src_configure +} + +src_install() { + meson_src_install + + if use test; then + # Preventing tests from being installed in the first place is a moving target, + # just axe them all afterwards. + rm -rf \ + "${ED}"/usr/libexec/installed-tests \ + "${ED}"/usr/share/installed-tests \ + || die + fi +} diff --git a/dev-libs/libjcat/metadata.xml b/dev-libs/libjcat/metadata.xml index aa3846c8eacb..01872545896e 100644 --- a/dev-libs/libjcat/metadata.xml +++ b/dev-libs/libjcat/metadata.xml @@ -13,6 +13,8 @@ in Microsoft Windows. </longdescription> <use> + <flag name="ed25519">Enable ED25519 verification support + via <pkg>dev-libs/nettle</pkg> and <pkg>net-libs/gnutls</pkg></flag> <flag name="gpg">Enable GPG verification support via <pkg>app-crypt/gpgme</pkg></flag> <flag name="pkcs7">Enable PKCS7 verification support via <pkg>net-libs/gnutls</pkg></flag> </use> diff --git a/dev-libs/libjwt/files/libjwt-1.13.1_multi_ssl_atools.patch b/dev-libs/libjwt/files/libjwt-1.13.1_multi_ssl_atools.patch deleted file mode 100644 index 4d92ce0273be..000000000000 --- a/dev-libs/libjwt/files/libjwt-1.13.1_multi_ssl_atools.patch +++ /dev/null @@ -1,233 +0,0 @@ -From: https://github.com/dekeonus/libjwt/tree/feat-multi-ssl - -Enables multiple ssl implemtations to be installed at the same time -default libjwt will default to linking to openssl (if openssl enabled) - - -diff --git a/configure.ac b/configure.ac -index 2b28327..183f163 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -8,25 +8,99 @@ AC_CONFIG_HEADERS([libjwt/config.h]) - - AC_SUBST([AM_CFLAGS], [-Wall]) - --dnl Prefer OpenSSL unless asked to ignore it -+dnl Build with OpenSSL when asked - AC_ARG_WITH([openssl], -- AS_HELP_STRING([--without-openssl], [Ignore presence of OpenSSL libraries and use GnuTLS])) -- --AS_IF([test "x$with_openssl" != "xno"], [ -- PKG_CHECK_MODULES([OPENSSL], [openssl >= 0.9.8]) -- AM_CONDITIONAL([HAVE_OPENSSL], [true]) --], [ -- PKG_CHECK_MODULES([GNUTLS], [gnutls >= 3.5.8]) -- AM_CONDITIONAL([HAVE_OPENSSL], [false]) -+ AS_HELP_STRING([--with-openssl], [Build using OpenSSL library]), -+ [with_openssl=$withval], -+ [blank_openssl=yes]) -+ -+dnl Build with GnutLS when asked -+AC_ARG_WITH([gnutls], -+ AS_HELP_STRING([--with-gnutls], [Build using GnuTLS library]), -+ [with_gnutls=$withval], -+ [blank_gnutls=yes]) -+ -+dnl If no with[out]-'ssl' default to openssl -+AS_IF([test "x$blank_openssl" = "xyes" -a "x$blank_gnutls" = "xyes"], [ -+ with_openssl=yes -+]) -+ -+dnl emulate previous build, without-openssl means build with gnutls -+AS_IF([test "x$with_openssl" = "xno" -a "x$blank_gnutls" = "xyes"], [ -+ with_gnutls=yes -+]) -+ -+AC_ARG_ENABLE([multi-ssl], AS_HELP_STRING([--enable-multi-ssl], -+ [Enable multiple ssl library implementations]), -+ [enable_multi_ssl=$enableval], -+ [enable_multi_ssl=no]) -+ -+AS_IF([test "x$enable_multi_ssl" = "xno"], [ -+ AS_IF([test "x$with_openssl" = "xyes" -a "x$with_gnutls" = "xyes"], [ -+AC_MSG_ERROR([You need to enable multi-ssl to support multiple ssl implementations concurrently]) -+ ]) -+]) -+AM_CONDITIONAL([MULTI_SSL], [test "x$enable_multi_ssl" = "xyes"]) -+ -+AS_IF([test "x$with_openssl" = "xyes"], [ -+ PKG_CHECK_MODULES([OPENSSL], [openssl >= 0.9.8], [found_openssl=yes]) -+]) -+AM_CONDITIONAL([HAVE_OPENSSL], [test "x$found_openssl" = "xyes"]) -+ -+AS_IF([test "x$with_gnutls" = "xyes"], [ -+ PKG_CHECK_MODULES([GNUTLS], [gnutls >= 3.5.8], [found_gnutls=yes]) -+]) -+AM_CONDITIONAL([HAVE_GNUTLS], [test "x$found_gnutls" = "xyes"]) -+ -+AS_IF([test "x$found_openssl" != "xyes" -a "x$found_gnutls" != "xyes"], [ -+ AC_MSG_ERROR([Neither openssl nor gnutls was found]) - ]) - -+dnl work out default, or only, ssl library -+AC_MSG_CHECKING([which ssl library to use as default]) -+AC_ARG_WITH([default-ssl], AS_HELP_STRING([--with-default-ssl@<:@=Lib@:>@], -+ [set default ssl library [openssl|gnutls] for multi-ssl]), -+ [with_default_ssl=$withval], -+ [with_default_ssl=yes]) -+dnl note, yes/blank case will require further nesting, if additional ssl lib support added -+AS_CASE([$with_default_ssl], -+ [openssl], [AS_IF([test "x$found_openssl" = "xyes"], [ssl_impl=openssl], -+ [AC_MSG_ERROR([requested default ssl lib openssl, but openssl not found])] -+ )], -+ [gnutls], [AS_IF([test "x$found_gnutls" = "xyes"], [ssl_impl=gnutls], -+ [AC_MSG_ERROR([requested default ssl lib gnutls, but gnutls not found])] -+ )], -+ [no], [AC_MSG_ERROR([unsupported configuration --without-default-ssl])], -+ [yes], [AS_IF([test "x$found_openssl" = "xyes"], [ssl_impl=openssl], -+ [ssl_impl=gnutls])], -+ [AC_MSG_ERROR([Unknown ssl library $with_default_ssl])] -+) -+AC_MSG_RESULT([$ssl_impl]) -+ - AC_ARG_WITH([examples], - AS_HELP_STRING([--without-examples], [do not build example programs]), -- [], -+ [with_examples=$withval], - [with_examples=yes]) - - AM_CONDITIONAL([BUILD_EXAMPLES], [test "x$with_examples" != "xno"]) - -+dnl should not reach default case, bail out if it triggers -+AS_CASE([$ssl_impl], -+ [openssl], [ -+ AC_SUBST([SSL_DEF_LDFLAGS], [$OPENSSL_LDFLAGS]) -+ AC_SUBST([SSL_DEF_INCLUDES], [$OPENSSL_INCLUDES]) -+ AC_SUBST([SSL_DEF_CFLAGS], [$OPENSSL_CFLAGS]) -+ AC_SUBST([SSL_DEF_LIBS], [$OPENSSL_LIBS]) -+ ], -+ [gnutls], [ -+ AC_SUBST([SSL_DEF_LDFLAGS], [$GNUTLS_LDFLAGS]) -+ AC_SUBST([SSL_DEF_INCLUDES], [$GNUTLS_INCLUDES]) -+ AC_SUBST([SSL_DEF_CFLAGS], [$GNUTLS_CFLAGS]) -+ AC_SUBST([SSL_DEF_LIBS], [$GNUTLS_LIBS]) -+ ], -+ [AC_MSG_ERROR([unable to set default ssl library])] -+) -+ - PKG_CHECK_MODULES([JANSSON], [jansson >= 2.0]) - PKG_CHECK_MODULES([CHECK], [check >= 0.9.4], [true], [true]) - -@@ -46,6 +120,13 @@ DX_PDF_FEATURE(OFF) - DX_PS_FEATURE(OFF) - DX_INIT_DOXYGEN($PACKAGE_NAME, doxygen.cfg) - -+ -+AM_COND_IF([MULTI_SSL], [ -+ AM_COND_IF([HAVE_OPENSSL], -+ [AC_CONFIG_FILES([libjwt/libjwt-ossl.pc])]) -+ AM_COND_IF([HAVE_GNUTLS], -+ [AC_CONFIG_FILES([libjwt/libjwt-gnutls.pc])]) -+ ]) - AC_CONFIG_FILES([ - Makefile - include/Makefile -diff --git a/libjwt/Makefile.am b/libjwt/Makefile.am -index 9600317..c69b424 100644 ---- a/libjwt/Makefile.am -+++ b/libjwt/Makefile.am -@@ -8,11 +8,44 @@ else - libjwt_la_SOURCES += jwt-gnutls.c - endif - -+if MULTI_SSL -+if HAVE_OPENSSL -+lib_LTLIBRARIES += libjwt-ossl.la -+libjwt_ossl_la_SOURCES = jwt.c base64.c jwt-openssl.c -+endif -+if HAVE_GNUTLS -+lib_LTLIBRARIES += libjwt-gnutls.la -+libjwt_gnutls_la_SOURCES = jwt.c base64.c jwt-gnutls.c -+endif -+endif -+ - # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html --libjwt_la_LDFLAGS = -version-info 9:1:8 $(OPENSSL_LDFLAGS) $(GNUTLS_LDFLAGS) $(JANSSON_LDFLAGS) -no-undefined --libjwt_la_CPPFLAGS = -I$(top_srcdir)/include $(OPENSSL_INCLUDES) $(GNUTLS_INCLUDES) $(CODE_COVERAGE_CPPFLAGS) -Wall --libjwt_la_CFLAGS = $(JANSSON_CFLAGS) $(OPENSSL_CFLAGS) $(GNUTLS_CFLAGS) $(CODE_COVERAGE_CFLAGS) -D_GNU_SOURCE --libjwt_la_LIBADD = $(JANSSON_LIBS) $(OPENSSL_LIBS) $(GNUTLS_LIBS) $(CODE_COVERAGE_LDFLAGS) -+libjwt_la_LDFLAGS = -version-info 9:1:8 $(SSL_DEF_LDFLAGS) $(JANSSON_LDFLAGS) -no-undefined -+libjwt_la_CPPFLAGS = -I$(top_srcdir)/include $(SSL_DEF_INCLUDES) $(CODE_COVERAGE_CPPFLAGS) -Wall -+libjwt_la_CFLAGS = $(JANSSON_CFLAGS) $(SSL_DEF_CFLAGS) $(CODE_COVERAGE_CFLAGS) -D_GNU_SOURCE -+libjwt_la_LIBADD = $(JANSSON_LIBS) $(SSL_DEF_LIBS) $(CODE_COVERAGE_LDFLAGS) -+if MULTI_SSL -+if HAVE_OPENSSL -+libjwt_ossl_la_LDFLAGS = -version-info 9:1:8 $(OPENSSL_LDFLAGS) $(JANSSON_LDFLAGS) -no-undefined -+libjwt_ossl_la_CPPFLAGS = -I$(top_srcdir)/include $(OPENSSL_INCLUDES) $(CODE_COVERAGE_CPPFLAGS) -Wall -+libjwt_ossl_la_CFLAGS = $(JANSSON_CFLAGS) $(OPENSSL_CFLAGS) $(CODE_COVERAGE_CFLAGS) -D_GNU_SOURCE -+libjwt_ossl_la_LIBADD = $(JANSSON_LIBS) $(OPENSSL_LIBS) $(CODE_COVERAGE_LDFLAGS) -+endif -+if HAVE_GNUTLS -+libjwt_gnutls_la_LDFLAGS = -version-info 9:1:8 $(GNUTLS_LDFLAGS) $(JANSSON_LDFLAGS) -no-undefined -+libjwt_gnutls_la_CPPFLAGS = -I$(top_srcdir)/include $(GNUTLS_INCLUDES) $(CODE_COVERAGE_CPPFLAGS) -Wall -+libjwt_gnutls_la_CFLAGS = $(JANSSON_CFLAGS) $(GNUTLS_CFLAGS) $(CODE_COVERAGE_CFLAGS) -D_GNU_SOURCE -+libjwt_gnutls_la_LIBADD = $(JANSSON_LIBS) $(GNUTLS_LIBS) $(CODE_COVERAGE_LDFLAGS) -+endif -+endif - - pkgconfiglibdir = $(libdir)/pkgconfig - pkgconfiglib_DATA = libjwt.pc -+if MULTI_SSL -+if HAVE_OPENSSL -+pkgconfiglib_DATA += libjwt-ossl.pc -+endif -+if HAVE_GNUTLS -+pkgconfiglib_DATA += libjwt-gnutls.pc -+endif -+endif -diff --git a/libjwt/libjwt-gnutls.pc.in b/libjwt/libjwt-gnutls.pc.in -new file mode 100644 -index 0000000..63962ee ---- /dev/null -+++ b/libjwt/libjwt-gnutls.pc.in -@@ -0,0 +1,12 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: @PACKAGE_NAME@ -+Description: JWT C Library -+Version: @PACKAGE_VERSION@ -+ -+Cflags: -I${includedir} -+Libs: -L${libdir} -ljwt-gnutls -+Libs.private: @JANSSON_LIBS@ @GNUTLS_LIBS@ -diff --git a/libjwt/libjwt-ossl.pc.in b/libjwt/libjwt-ossl.pc.in -new file mode 100644 -index 0000000..98c0ebe ---- /dev/null -+++ b/libjwt/libjwt-ossl.pc.in -@@ -0,0 +1,12 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: @PACKAGE_NAME@ -+Description: JWT C Library -+Version: @PACKAGE_VERSION@ -+ -+Cflags: -I${includedir} -+Libs: -L${libdir} -ljwt-ossl -+Libs.private: @JANSSON_LIBS@ @OPENSSL_LIBS@ -diff --git a/libjwt/libjwt.pc.in b/libjwt/libjwt.pc.in -index 0c81d36..0bb64f4 100644 ---- a/libjwt/libjwt.pc.in -+++ b/libjwt/libjwt.pc.in -@@ -9,4 +9,4 @@ Version: @PACKAGE_VERSION@ - - Cflags: -I${includedir} - Libs: -L${libdir} -ljwt --Libs.private: @JANSSON_LIBS@ @OPENSSL_LIBS@ -+Libs.private: @JANSSON_LIBS@ @SSL_DEF_LIBS@ diff --git a/dev-libs/libjwt/files/libjwt-1.16.0_multi_ssl_atools.patch b/dev-libs/libjwt/files/libjwt-1.16.0_multi_ssl_atools.patch deleted file mode 100644 index 972b2fdad312..000000000000 --- a/dev-libs/libjwt/files/libjwt-1.16.0_multi_ssl_atools.patch +++ /dev/null @@ -1,348 +0,0 @@ -From: https://github.com/dekeonus/libjwt/tree/feat-multi-ssl - -Enables multiple ssl implemtations to be installed at the same time -default libjwt will default to linking to openssl (if openssl enabled) - - -diff --git a/configure.ac b/configure.ac -index 6061add..447dd10 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -6,27 +6,105 @@ LT_INIT([]) - AC_CONFIG_MACRO_DIR([m4]) - AC_CONFIG_HEADERS([libjwt/config.h]) - -+AC_SUBST([LIBJWT_LTVERSION], [11:1:9]) - AC_SUBST([AM_CFLAGS], [-Wall]) - --dnl Prefer OpenSSL unless asked to ignore it -+dnl Build with OpenSSL when asked - AC_ARG_WITH([openssl], -- AS_HELP_STRING([--without-openssl], [Ignore presence of OpenSSL libraries and use GnuTLS])) -- --AS_IF([test "x$with_openssl" != "xno"], [ -- PKG_CHECK_MODULES([OPENSSL], [openssl >= 0.9.8]) -- AM_CONDITIONAL([HAVE_OPENSSL], [true]) --], [ -- PKG_CHECK_MODULES([GNUTLS], [gnutls >= 3.6.0]) -- AM_CONDITIONAL([HAVE_OPENSSL], [false]) -+ AS_HELP_STRING([--with-openssl], [Build using OpenSSL library]), -+ [with_openssl=$withval], -+ [blank_openssl=yes]) -+ -+dnl Build with GnutLS when asked -+AC_ARG_WITH([gnutls], -+ AS_HELP_STRING([--with-gnutls], [Build using GnuTLS library]), -+ [with_gnutls=$withval], -+ [blank_gnutls=yes]) -+ -+dnl If no with[out]-'ssl' default to openssl -+AS_IF([test "x$blank_openssl" = "xyes" -a "x$blank_gnutls" = "xyes"], [ -+ with_openssl=yes -+]) -+ -+dnl emulate previous build, without-openssl means build with gnutls -+AS_IF([test "x$with_openssl" = "xno" -a "x$blank_gnutls" = "xyes"], [ -+ with_gnutls=yes -+]) -+ -+AC_ARG_ENABLE([multi-ssl], AS_HELP_STRING([--enable-multi-ssl], -+ [Enable multiple ssl library implementations]), -+ [enable_multi_ssl=$enableval], -+ [enable_multi_ssl=no]) -+ -+AS_IF([test "x$enable_multi_ssl" = "xno"], [ -+ AS_IF([test "x$with_openssl" = "xyes" -a "x$with_gnutls" = "xyes"], [ -+AC_MSG_ERROR([You need to enable multi-ssl to support multiple ssl implementations concurrently]) -+ ]) -+]) -+AM_CONDITIONAL([MULTI_SSL], [test "x$enable_multi_ssl" = "xyes"]) -+ -+AS_IF([test "x$with_openssl" = "xyes"], [ -+ PKG_CHECK_MODULES([OPENSSL], [openssl >= 0.9.8], [found_openssl=yes]) -+]) -+AM_CONDITIONAL([HAVE_OPENSSL], [test "x$found_openssl" = "xyes"]) -+ -+AS_IF([test "x$with_gnutls" = "xyes"], [ -+ PKG_CHECK_MODULES([GNUTLS], [gnutls >= 3.6.0], [found_gnutls=yes]) -+]) -+AM_CONDITIONAL([HAVE_GNUTLS], [test "x$found_gnutls" = "xyes"]) -+ -+AS_IF([test "x$found_openssl" != "xyes" -a "x$found_gnutls" != "xyes"], [ -+ AC_MSG_ERROR([Neither openssl nor gnutls was found]) - ]) - -+dnl work out default, or only, ssl library -+AC_MSG_CHECKING([which ssl library to use as default]) -+AC_ARG_WITH([default-ssl], AS_HELP_STRING([--with-default-ssl@<:@=Lib@:>@], -+ [set default ssl library [openssl|gnutls] for multi-ssl]), -+ [with_default_ssl=$withval], -+ [with_default_ssl=yes]) -+dnl note, yes/blank case will require further nesting, if additional ssl lib support added -+AS_CASE([$with_default_ssl], -+ [openssl], [AS_IF([test "x$found_openssl" = "xyes"], [ssl_impl=openssl], -+ [AC_MSG_ERROR([requested default ssl lib openssl, but openssl not found])] -+ )], -+ [gnutls], [AS_IF([test "x$found_gnutls" = "xyes"], [ssl_impl=gnutls], -+ [AC_MSG_ERROR([requested default ssl lib gnutls, but gnutls not found])] -+ )], -+ [no], [AC_MSG_ERROR([unsupported configuration --without-default-ssl])], -+ [yes], [AS_IF([test "x$found_openssl" = "xyes"], [ssl_impl=openssl], -+ [ssl_impl=gnutls])], -+ [AC_MSG_ERROR([Unknown ssl library $with_default_ssl])] -+) -+AC_MSG_RESULT([$ssl_impl]) -+ - AC_ARG_WITH([examples], - AS_HELP_STRING([--without-examples], [do not build example programs]), -- [], -+ [with_examples=$withval], - [with_examples=yes]) - - AM_CONDITIONAL([BUILD_EXAMPLES], [test "x$with_examples" != "xno"]) - -+dnl should not reach default case, bail out if it triggers -+AS_CASE([$ssl_impl], -+ [openssl], [ -+ AC_SUBST([SSL_DEF_LDFLAGS], [$OPENSSL_LDFLAGS]) -+ AC_SUBST([SSL_DEF_INCLUDES], [$OPENSSL_INCLUDES]) -+ AC_SUBST([SSL_DEF_CFLAGS], [$OPENSSL_CFLAGS]) -+ AC_SUBST([SSL_DEF_LIBS], [$OPENSSL_LIBS]) -+ ], -+ [gnutls], [ -+ AC_SUBST([SSL_DEF_LDFLAGS], [$GNUTLS_LDFLAGS]) -+ AC_SUBST([SSL_DEF_INCLUDES], [$GNUTLS_INCLUDES]) -+ AC_SUBST([SSL_DEF_CFLAGS], [$GNUTLS_CFLAGS]) -+ AC_SUBST([SSL_DEF_LIBS], [$GNUTLS_LIBS]) -+ ], -+ [AC_MSG_ERROR([unable to set default ssl library])] -+) -+AM_CONDITIONAL([SSL_DEF_OPENSSL], [test "x$ssl_impl" = "xopenssl"]) -+dnl currently unused, for additional ssl implementations -+dnl AM_CONDITIONAL([SSL_DEF_GNUTLS], [test "x$ssl_impl" = "xgnutls"]) -+ - PKG_CHECK_MODULES([JANSSON], [jansson >= 2.0]) - PKG_CHECK_MODULES([CHECK], [check >= 0.9.4], [true], [true]) - -@@ -44,6 +122,13 @@ DX_PDF_FEATURE(OFF) - DX_PS_FEATURE(OFF) - DX_INIT_DOXYGEN($PACKAGE_NAME, doxygen.cfg) - -+ -+AM_COND_IF([MULTI_SSL], [ -+ AM_COND_IF([HAVE_OPENSSL], -+ [AC_CONFIG_FILES([libjwt/libjwt-ossl.pc])]) -+ AM_COND_IF([HAVE_GNUTLS], -+ [AC_CONFIG_FILES([libjwt/libjwt-gnutls.pc])]) -+ ]) - AC_CONFIG_FILES([ - Makefile - include/Makefile -diff --git a/libjwt/Makefile.am b/libjwt/Makefile.am -index 21ea12d..b837d53 100644 ---- a/libjwt/Makefile.am -+++ b/libjwt/Makefile.am -@@ -4,17 +4,51 @@ lib_LTLIBRARIES = libjwt.la - - libjwt_la_SOURCES = jwt.c base64.c - --if HAVE_OPENSSL -+if SSL_DEF_OPENSSL - libjwt_la_SOURCES += jwt-openssl.c - else -+## SSL_DEF_GNUTLS - libjwt_la_SOURCES += jwt-gnutls.c - endif - -+if MULTI_SSL -+if HAVE_OPENSSL -+lib_LTLIBRARIES += libjwt-ossl.la -+libjwt_ossl_la_SOURCES = jwt.c base64.c jwt-openssl.c -+endif -+if HAVE_GNUTLS -+lib_LTLIBRARIES += libjwt-gnutls.la -+libjwt_gnutls_la_SOURCES = jwt.c base64.c jwt-gnutls.c -+endif -+endif -+ - # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html --libjwt_la_LDFLAGS = -version-info 11:1:9 $(OPENSSL_LDFLAGS) $(GNUTLS_LDFLAGS) $(JANSSON_LDFLAGS) -no-undefined --libjwt_la_CPPFLAGS = -I$(top_srcdir)/include $(OPENSSL_INCLUDES) $(GNUTLS_INCLUDES) $(CODE_COVERAGE_CPPFLAGS) -Wall --libjwt_la_CFLAGS = $(JANSSON_CFLAGS) $(OPENSSL_CFLAGS) $(GNUTLS_CFLAGS) $(CODE_COVERAGE_CFLAGS) -D_GNU_SOURCE --libjwt_la_LIBADD = $(JANSSON_LIBS) $(OPENSSL_LIBS) $(GNUTLS_LIBS) $(CODE_COVERAGE_LDFLAGS) -+libjwt_la_LDFLAGS = -version-info $(LIBJWT_LTVERSION) $(SSL_DEF_LDFLAGS) $(JANSSON_LDFLAGS) -no-undefined -+libjwt_la_CPPFLAGS = -I$(top_srcdir)/include $(SSL_DEF_INCLUDES) $(CODE_COVERAGE_CPPFLAGS) -Wall -+libjwt_la_CFLAGS = $(JANSSON_CFLAGS) $(SSL_DEF_CFLAGS) $(CODE_COVERAGE_CFLAGS) -D_GNU_SOURCE -+libjwt_la_LIBADD = $(JANSSON_LIBS) $(SSL_DEF_LIBS) $(CODE_COVERAGE_LDFLAGS) -+if MULTI_SSL -+if HAVE_OPENSSL -+libjwt_ossl_la_LDFLAGS = -version-info $(LIBJWT_LTVERSION) $(OPENSSL_LDFLAGS) $(JANSSON_LDFLAGS) -no-undefined -+libjwt_ossl_la_CPPFLAGS = -I$(top_srcdir)/include $(OPENSSL_INCLUDES) $(CODE_COVERAGE_CPPFLAGS) -Wall -+libjwt_ossl_la_CFLAGS = $(JANSSON_CFLAGS) $(OPENSSL_CFLAGS) $(CODE_COVERAGE_CFLAGS) -D_GNU_SOURCE -+libjwt_ossl_la_LIBADD = $(JANSSON_LIBS) $(OPENSSL_LIBS) $(CODE_COVERAGE_LDFLAGS) -+endif -+if HAVE_GNUTLS -+libjwt_gnutls_la_LDFLAGS = -version-info $(LIBJWT_LTVERSION) $(GNUTLS_LDFLAGS) $(JANSSON_LDFLAGS) -no-undefined -+libjwt_gnutls_la_CPPFLAGS = -I$(top_srcdir)/include $(GNUTLS_INCLUDES) $(CODE_COVERAGE_CPPFLAGS) -Wall -+libjwt_gnutls_la_CFLAGS = $(JANSSON_CFLAGS) $(GNUTLS_CFLAGS) $(CODE_COVERAGE_CFLAGS) -D_GNU_SOURCE -+libjwt_gnutls_la_LIBADD = $(JANSSON_LIBS) $(GNUTLS_LIBS) $(CODE_COVERAGE_LDFLAGS) -+endif -+endif - - pkgconfiglibdir = $(libdir)/pkgconfig - pkgconfiglib_DATA = libjwt.pc -+if MULTI_SSL -+if HAVE_OPENSSL -+pkgconfiglib_DATA += libjwt-ossl.pc -+endif -+if HAVE_GNUTLS -+pkgconfiglib_DATA += libjwt-gnutls.pc -+endif -+endif -diff --git a/libjwt/libjwt-gnutls.pc.in b/libjwt/libjwt-gnutls.pc.in -new file mode 100644 -index 0000000..63962ee ---- /dev/null -+++ b/libjwt/libjwt-gnutls.pc.in -@@ -0,0 +1,12 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: @PACKAGE_NAME@ -+Description: JWT C Library -+Version: @PACKAGE_VERSION@ -+ -+Cflags: -I${includedir} -+Libs: -L${libdir} -ljwt-gnutls -+Libs.private: @JANSSON_LIBS@ @GNUTLS_LIBS@ -diff --git a/libjwt/libjwt-ossl.pc.in b/libjwt/libjwt-ossl.pc.in -new file mode 100644 -index 0000000..98c0ebe ---- /dev/null -+++ b/libjwt/libjwt-ossl.pc.in -@@ -0,0 +1,12 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: @PACKAGE_NAME@ -+Description: JWT C Library -+Version: @PACKAGE_VERSION@ -+ -+Cflags: -I${includedir} -+Libs: -L${libdir} -ljwt-ossl -+Libs.private: @JANSSON_LIBS@ @OPENSSL_LIBS@ -diff --git a/libjwt/libjwt.pc.in b/libjwt/libjwt.pc.in -index 0c81d36..0bb64f4 100644 ---- a/libjwt/libjwt.pc.in -+++ b/libjwt/libjwt.pc.in -@@ -9,4 +9,4 @@ Version: @PACKAGE_VERSION@ - - Cflags: -I${includedir} - Libs: -L${libdir} -ljwt --Libs.private: @JANSSON_LIBS@ @OPENSSL_LIBS@ -+Libs.private: @JANSSON_LIBS@ @SSL_DEF_LIBS@ -diff --git a/tests/Makefile.am b/tests/Makefile.am -index 6ca2a46..b64ad20 100644 ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -11,6 +11,14 @@ TESTS = \ - jwt_ec \ - jwt_validate - -+if MULTI_SSL -+if HAVE_OPENSSL -+include ossl_tests.mk -+endif -+if HAVE_GNUTLS -+include gnutls_tests.mk -+endif -+endif - check_PROGRAMS = $(TESTS) - - AM_CPPFLAGS = -I$(top_srcdir)/include -diff --git a/tests/gnutls_tests.mk b/tests/gnutls_tests.mk -new file mode 100644 -index 0000000..a6b4997 ---- /dev/null -+++ b/tests/gnutls_tests.mk -@@ -0,0 +1,35 @@ -+## for jwttest in $(jwttests) -+## do -+## TESTS += $(sslimpl)_$(jwttest) -+## $(sslimpl)_$(jwttest)_SOURCES = $(jwttest).c -+## $(sslimpl)_$(jwttest)_LDADD = -ljwt-$(sslimpl) $(CHECK_LIBS) -+## done -+ -+TESTS += gnutls_jwt_new -+gnutls_jwt_new_SOURCES = jwt_new.c -+gnutls_jwt_new_LDADD = -ljwt-gnutls $(CHECK_LIBS) -+TESTS += gnutls_jwt_grant -+gnutls_jwt_grant_SOURCES = jwt_grant.c -+gnutls_jwt_grant_LDADD = -ljwt-gnutls $(CHECK_LIBS) -+TESTS += gnutls_jwt_header -+gnutls_jwt_header_SOURCES = jwt_header.c -+gnutls_jwt_header_LDADD = -ljwt-gnutls $(CHECK_LIBS) -+TESTS += gnutls_jwt_dump -+gnutls_jwt_dump_SOURCES = jwt_dump.c -+gnutls_jwt_dump_LDADD = -ljwt-gnutls $(CHECK_LIBS) -+TESTS += gnutls_jwt_encode -+gnutls_jwt_encode_SOURCES = jwt_encode.c -+gnutls_jwt_encode_LDADD = -ljwt-gnutls $(CHECK_LIBS) -+TESTS += gnutls_jwt_rsa -+gnutls_jwt_rsa_SOURCES = jwt_rsa.c -+gnutls_jwt_rsa_LDADD = -ljwt-gnutls $(CHECK_LIBS) -+TESTS += gnutls_jwt_rsa_pss -+gnutls_jwt_rsa_pss_SOURCES = jwt_rsa_pss.c -+gnutls_jwt_rsa_pss_LDADD = -ljwt-gnutls $(CHECK_LIBS) -+TESTS += gnutls_jwt_ec -+gnutls_jwt_ec_SOURCES = jwt_ec.c -+gnutls_jwt_ec_LDADD = -ljwt-gnutls $(CHECK_LIBS) -+TESTS += gnutls_jwt_validate -+gnutls_jwt_validate_SOURCES = jwt_validate.c -+gnutls_jwt_validate_LDADD = -ljwt-gnutls $(CHECK_LIBS) -+ -diff --git a/tests/ossl_tests.mk b/tests/ossl_tests.mk -new file mode 100644 -index 0000000..83d0a99 ---- /dev/null -+++ b/tests/ossl_tests.mk -@@ -0,0 +1,35 @@ -+## for jwttest in $(jwttests) -+## do -+## TESTS += $(sslimpl)_$(jwttest) -+## $(sslimpl)_$(jwttest)_SOURCES = $(jwttest).c -+## $(sslimpl)_$(jwttest)_LDADD = -ljwt-$(sslimpl) $(CHECK_LIBS) -+## done -+ -+TESTS += ossl_jwt_new -+ossl_jwt_new_SOURCES = jwt_new.c -+ossl_jwt_new_LDADD = -ljwt-ossl $(CHECK_LIBS) -+TESTS += ossl_jwt_grant -+ossl_jwt_grant_SOURCES = jwt_grant.c -+ossl_jwt_grant_LDADD = -ljwt-ossl $(CHECK_LIBS) -+TESTS += ossl_jwt_header -+ossl_jwt_header_SOURCES = jwt_header.c -+ossl_jwt_header_LDADD = -ljwt-ossl $(CHECK_LIBS) -+TESTS += ossl_jwt_dump -+ossl_jwt_dump_SOURCES = jwt_dump.c -+ossl_jwt_dump_LDADD = -ljwt-ossl $(CHECK_LIBS) -+TESTS += ossl_jwt_encode -+ossl_jwt_encode_SOURCES = jwt_encode.c -+ossl_jwt_encode_LDADD = -ljwt-ossl $(CHECK_LIBS) -+TESTS += ossl_jwt_rsa -+ossl_jwt_rsa_SOURCES = jwt_rsa.c -+ossl_jwt_rsa_LDADD = -ljwt-ossl $(CHECK_LIBS) -+TESTS += ossl_jwt_rsa_pss -+ossl_jwt_rsa_pss_SOURCES = jwt_rsa_pss.c -+ossl_jwt_rsa_pss_LDADD = -ljwt-ossl $(CHECK_LIBS) -+TESTS += ossl_jwt_ec -+ossl_jwt_ec_SOURCES = jwt_ec.c -+ossl_jwt_ec_LDADD = -ljwt-ossl $(CHECK_LIBS) -+TESTS += ossl_jwt_validate -+ossl_jwt_validate_SOURCES = jwt_validate.c -+ossl_jwt_validate_LDADD = -ljwt-ossl $(CHECK_LIBS) -+ diff --git a/dev-libs/libkpass/libkpass-6-r2.ebuild b/dev-libs/libkpass/libkpass-6-r2.ebuild index a1d6d59750cc..aa9235147b08 100644 --- a/dev-libs/libkpass/libkpass-6-r2.ebuild +++ b/dev-libs/libkpass/libkpass-6-r2.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DESCRIPTION="Libkpass is a C implementation to access KeePass 1.x format password databases" HOMEPAGE="https://sourceforge.net/projects/libkpass/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" LICENSE="GPL-3+" SLOT="0" diff --git a/dev-libs/libksba/Manifest b/dev-libs/libksba/Manifest index 3204285fa2ac..c1e1649791c2 100644 --- a/dev-libs/libksba/Manifest +++ b/dev-libs/libksba/Manifest @@ -1,4 +1,4 @@ DIST libksba-1.6.5.tar.bz2 708400 BLAKE2B 934bde6412de6c1f3062b101930d7b2beac3f6e3f2fbeb5c964a6252b68a3b70c7cb3a48c7eac04b7f1d2ea3c717e1c7e164c1bc6113b46244b9dd130c64b540 SHA512 959312ac0bb2dabcdd22217266daccdf3938d62ff2936c767cade76888757ece1bb6fe79f2c679db03d1baf3919757265d0ded216fee8b8d235e94a70fcf05de DIST libksba-1.6.5.tar.bz2.sig 119 BLAKE2B 70f290ed44160af2882b5f2543965e3003dd0fd106ab6eaa1f7dfbb878d1f0402c16f3e802af6be589e501e17d0ead82c03afe73c8353b314c8cafb24e7d4a11 SHA512 e70f136edcf29bf931eccaf930e0ae644fd372e0a6f472599898d2fd5e44e64ab2cea63b0be2b1d9a468f73f607881dfdf06adfe6d1fc9ebd66b21e4c245f837 DIST libksba-1.6.6.tar.bz2 708510 BLAKE2B 9985b16e946d6b407b5acbf005610cfb2f01d2a733ddff110e329dec8d95bd248cce6e9936d441676a4b06f031cc9122e26146a0f6d36cb343fb9ec16aef3627 SHA512 3b30bef9452ae0c52b4a52e9145fbd6dc57cf7a2b59302e3af063db6b45384e8ed7af62604efd7939b9e0cb5931e946b15609888e9699fafe4acbb0cbf138087 -DIST libksba-1.6.6.tar.bz2.sig 119 BLAKE2B ec4b72d612bb20c280316de7a66ffe697c65caf52e451621b42965d7d5b3e53577fc5b9c41ad5f5c09e42d90654d82afad8462f0baaf757e122fffedcd35d4ce SHA512 5ab4f890819ee3638660fa2ce529223e1798da53508d0cc2db5a9f0b21a242863037f5e81cdf2805e6cafb56e22412005f01cbe7b6344f3eb1a38f7cff98520d +DIST libksba-1.6.6.tar.bz2.sig 238 BLAKE2B 0d62b39821dee0a3f921e87190247cacec1fcde253d26773a378f3a55a61468feba7b79fc875b1b2b8735f9ff310467dc30d8e5b5b06f37bd1ef4744a3fbfeec SHA512 053b594044ea2d5ad90341e14cf9969e3d8695e4671586cbcdf12d33c7864bf258fcf4474ea09db9612677cb239cb629d6b61799f684a1d838a57c0b53e27bf8 diff --git a/dev-libs/libliftoff/Manifest b/dev-libs/libliftoff/Manifest index a8c10dec1933..0411a11032dc 100644 --- a/dev-libs/libliftoff/Manifest +++ b/dev-libs/libliftoff/Manifest @@ -1,2 +1,2 @@ -DIST libliftoff-0.3.0.tar.gz 31691 BLAKE2B 7584518f709b9a6eb975ece00b4e194de2d1e8dde71d831600b13785b8cef86b5e36493068c2345f02b85c20454d88a7cabc6082170591e7769c44f9894fd2be SHA512 696f771aef60a9bcd71e1e2e04b5abea4f3c67a0aae231f360b43cdb5835a2181f482372ab1128fe152b0cb214786f924c33ee9ecf13dfe08c1b260d03d241a4 DIST libliftoff-0.4.1.tar.gz 36504 BLAKE2B 23e73a9bb10a3c80caa21719bc2b857d612606f68559792731c04bf5b32d072b798e6f1a44da172910fbd2fbe6b439ef27d3848bf5c993a9f2a4d062a1038581 SHA512 4144dda17775a2b6f9f32bb62de9119365e93625ffeb6fb16c49224fcbe76991c18e66382a458ac4a648e5d72879c52be089ef3673e825edc158d73c97c874dc +DIST libliftoff-0.5.0.tar.gz 39076 BLAKE2B a5c35c734a5ba4049661ce336401bd88d393001d7c49786d486146998d39530c364f7752b53968f5ab48f5eb774fa9c4245087bdb016f459a729991377023f61 SHA512 ce808f6a087f1f629cfebef95bfc7e216a09fb409b96b3c9f6b84d9d986ce50c5d7bf5b45c68e8baa99566b3627d754c269855b6f4ec3be63ae7b9f5109d5f08 diff --git a/dev-libs/libliftoff/libliftoff-0.3.0.ebuild b/dev-libs/libliftoff/libliftoff-0.5.0.ebuild index bb61df9cef3f..7056705fe1a1 100644 --- a/dev-libs/libliftoff/libliftoff-0.3.0.ebuild +++ b/dev-libs/libliftoff/libliftoff-0.5.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -8,9 +8,9 @@ inherit meson DESCRIPTION="Lightweight KMS plane library" HOMEPAGE="https://gitlab.freedesktop.org/emersion/libliftoff" SRC_URI="https://gitlab.freedesktop.org/emersion/${PN}/-/releases/v${PV}/downloads/${P}.tar.gz" -KEYWORDS="~amd64" LICENSE="MIT" SLOT="0" +KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86" RDEPEND=" x11-libs/libdrm diff --git a/dev-libs/libliftoff/metadata.xml b/dev-libs/libliftoff/metadata.xml index 96b4fdc27920..f1762d449434 100644 --- a/dev-libs/libliftoff/metadata.xml +++ b/dev-libs/libliftoff/metadata.xml @@ -5,4 +5,7 @@ <email>chewi@gentoo.org</email> <name>James Le Cuirot</name> </maintainer> + <upstream> + <remote-id type="freedesktop-gitlab">emersion/libliftoff</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-libs/liblouis/Manifest b/dev-libs/liblouis/Manifest index 1f385d6b1315..30f47c85c63e 100644 --- a/dev-libs/liblouis/Manifest +++ b/dev-libs/liblouis/Manifest @@ -1,2 +1,3 @@ DIST liblouis-3.23.0.tar.gz 16738612 BLAKE2B b4508d27eaa9669bb2a1fbaac55edb3a85d3d2df18a8b26f4c9c396579b04614da3b3bcd6af45459d9129d2b81a920262dcb8fef7bee4290752174411fd66109 SHA512 25819758fc987ed378c439c5d40efd2692247a6020a40e5909320021e518e0518f5b022dda4ea5c7006a0f1ce2a4225d4ee1404560987bb2dd83504d58aa09db DIST liblouis-3.25.0.tar.gz 16939419 BLAKE2B f67dc1ee3aa9eb32fcf0693b3a31d40c56f048b393785011ec2b4c61611a3ab67d181d1e76148c489e443e3b0c4d5f7846ac1b4810ffa2c6a6e1d081cceab6ae SHA512 4e6456f30e845b955e98346cb94bdd4eaa6aff30f3e29fbd4e91c5bb58d1182c679fbf8afa27d7031c80d5755ae8567b830fa57c175522a038ef18d1bdc0707d +DIST liblouis-3.29.0.tar.gz 17073843 BLAKE2B b7735f4c59c46cef55f4748b54395b95f4f3623be37bd42bbed4249232d5ab4ad966e4f08945f91516be30f19735ed774411cfe4bc8e1c7822f04af2d0b0db27 SHA512 c2f51686e869921658a95a58102799ebcf45da9b73f7d81912462451236134be7c148b78f35a1e0586cd349bbcb62238218c9ae547092bed9303238c22963589 diff --git a/dev-libs/liblouis/liblouis-3.29.0.ebuild b/dev-libs/liblouis/liblouis-3.29.0.ebuild new file mode 100644 index 000000000000..fdd585cad1e6 --- /dev/null +++ b/dev-libs/liblouis/liblouis-3.29.0.ebuild @@ -0,0 +1,106 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..13} ) +DISTUTILS_SINGLE_IMPL=1 +DISTUTILS_USE_PEP517=setuptools +inherit distutils-r1 + +DESCRIPTION="An open-source braille translator and back-translator" +HOMEPAGE="https://github.com/liblouis/liblouis" +SRC_URI="https://github.com/liblouis/liblouis/releases/download/v${PV}/${P}.tar.gz" + +LICENSE="LGPL-2.1+" +SLOT="0/20" # follows LIBLOUIS_CURRENT in configure.ac +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="test" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" +RESTRICT="!test? ( test )" + +# texlive-core for patgen which is required by lou_maketable +RDEPEND=" + ${PYTHON_DEPS} + app-text/texlive-core + test? ( dev-libs/libyaml ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + ${DISTUTILS_DEPS} + ${PYTHON_DEPS} + sys-apps/help2man +" + +src_prepare() { + default + + #1. bug #913705 + #2. Use correct python version + sed -i \ + -e "s|\$CURDIR/lou_maketable.d|${EPREFIX}/usr/libexec/lou_maketable|" \ + -e "s|python3|${EPYTHON}|" \ + tools/lou_maketable.d/lou_maketable.in || die + + pushd python > /dev/null || die + distutils-r1_src_prepare + popd > /dev/null || die +} + +src_configure() { + # -fanalyzer substantially slows down the build and isn't useful for + # us. It's useful for upstream as it's static analysis, but it's not + # useful when just getting something built. + export gl_cv_warn_c__fanalyzer=no + + econf --enable-ucs4 $(use_with test yaml) +} + +src_compile() { + default + + pushd python > /dev/null || die + # setup.py imports liblouis to get the version number, + # and this causes the shared library to be dlopened + # at build-time. Hack around it with LD_PRELOAD. + # Thanks ArchLinux. + LD_PRELOAD+=":${S}/liblouis/.libs/liblouis.so" distutils-r1_src_compile + popd > /dev/null || die +} + +src_test() { + default + + pushd python > /dev/null || die + LD_PRELOAD+=":${S}/liblouis/.libs/liblouis.so" distutils-r1_src_test + popd > /dev/null || die +} + +python_test() { + local -x LOUIS_TABLEPATH="${S}"/tables + "${EPYTHON}" tests/test_louis.py || die +} + +python_install() { + distutils-r1_python_install + python_scriptinto /usr/libexec/lou_maketable + python_doexe ../tools/lou_maketable.d/*.py +} + +src_install() { + pushd python > /dev/null || die + LD_PRELOAD+=":${S}/liblouis/.libs/liblouis.so" distutils-r1_src_install + popd > /dev/null || die + + # These need to be after distutils src_install, or it'll try to install them from under python/ as well + DOCS=( README AUTHORS NEWS ChangeLog doc/liblouis.txt ) + HTML_DOCS=( doc/liblouis.html ) + default + + # bug #913705 + mkdir -p "${ED}"/usr/libexec/lou_maketable || die + mv "${ED}"/usr/bin/lou_maketable.d/*.{mk,pl,sh} "${ED}"/usr/libexec/lou_maketable/ || die + rm -r "${ED}"/usr/bin/lou_maketable.d || die + + find "${ED}" -name '*.la' -delete || die +} diff --git a/dev-libs/libltdl/Manifest b/dev-libs/libltdl/Manifest index d36ba6c57618..1fd702479965 100644 --- a/dev-libs/libltdl/Manifest +++ b/dev-libs/libltdl/Manifest @@ -1 +1,2 @@ DIST libtool-2.4.7.tar.xz 1016040 BLAKE2B 5e022586337637dd634bd40578ad944bec6e3b8de41f95d55777b90cc88cbc4badb3d76cbf0e638166ece1ea7de828e83590e1e6bac30c1e4b1c254a11a742f2 SHA512 47f4c6de40927254ff9ba452612c0702aea6f4edc7e797f0966c8c6bf0340d533598976cdba17f0bdc64545572e71cd319bbb587aa5f47cd2e7c1d96f873a3da +DIST libtool-2.5.0.tar.xz 1032148 BLAKE2B a166423dae1000eb0a8d17f3872ed55b3338444ac61f51752f43a5886bc22fd233e060c7f4c8c7fa093bf50e589f03b755c628199534ef7b8a41935e1bf9d887 SHA512 7b426fe9550a7899de93c372d2c355867be02f7bb39f2b1de06ff30cb34c81bf89759c835bdb23081cef60bfeb39b786ed90bac43e7300956fd8ee1f7dc0a609 diff --git a/dev-libs/libltdl/libltdl-2.5.0.ebuild b/dev-libs/libltdl/libltdl-2.5.0.ebuild new file mode 100644 index 000000000000..0dc5df4fd2b2 --- /dev/null +++ b/dev-libs/libltdl/libltdl-2.5.0.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Please bump with dev-build/libtool. + +inherit multilib-minimal flag-o-matic + +MY_P="libtool-${PV}" + +DESCRIPTION="A shared library tool for developers" +HOMEPAGE="https://www.gnu.org/software/libtool/" +if ! [[ $(( $(ver_cut 2) % 2 )) -eq 0 ]] ; then + SRC_URI="https://alpha.gnu.org/gnu/libtool/${MY_P}.tar.xz" +else + SRC_URI="mirror://gnu/libtool/${MY_P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +fi + +S="${WORKDIR}"/${MY_P}/libltdl + +LICENSE="GPL-2" +SLOT="0" +IUSE="static-libs" +# libltdl doesn't have a testsuite. Don't bother trying. +RESTRICT="test" + +BDEPEND="app-arch/xz-utils" + +multilib_src_configure() { + # bug #907427 + filter-lto + + append-lfs-flags + ECONF_SOURCE="${S}" \ + econf \ + --enable-ltdl-install \ + $(use_enable static-libs static) +} + +multilib_src_install() { + emake DESTDIR="${D}" install + + # While the libltdl.la file is not used directly, the m4 ltdl logic + # keys off of its existence when searching for ltdl support. # bug #293921 + #use static-libs || find "${D}" -name libltdl.la -delete +} diff --git a/dev-libs/liblzw/liblzw-0.2-r1.ebuild b/dev-libs/liblzw/liblzw-0.2-r1.ebuild index 199a30521694..0ee10d1aacfb 100644 --- a/dev-libs/liblzw/liblzw-0.2-r1.ebuild +++ b/dev-libs/liblzw/liblzw-0.2-r1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 DESCRIPTION="small C library for reading LZW compressed files (.Z)" HOMEPAGE="https://github.com/vapier/liblzw" -SRC_URI="mirror://sourceforge/freestdf/${P}.tar.lzma" +SRC_URI="https://downloads.sourceforge.net/freestdf/${P}.tar.lzma" LICENSE="public-domain" SLOT="0" diff --git a/dev-libs/liblzw/metadata.xml b/dev-libs/liblzw/metadata.xml index a2512173cc43..53ca0eb36bd7 100644 --- a/dev-libs/liblzw/metadata.xml +++ b/dev-libs/liblzw/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <name>Mike Frysinger</name> - <email>vapier@gentoo.org</email> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="sourceforge">freestdf</remote-id> <remote-id type="github">vapier/liblzw</remote-id> diff --git a/dev-libs/libmaa/libmaa-1.3.2-r1.ebuild b/dev-libs/libmaa/libmaa-1.3.2-r1.ebuild index 6e6b092c09bb..52b75594a341 100644 --- a/dev-libs/libmaa/libmaa-1.3.2-r1.ebuild +++ b/dev-libs/libmaa/libmaa-1.3.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,7 +7,7 @@ inherit autotools DESCRIPTION="Library with low-level data structures which are helpful for writing compilers" HOMEPAGE="http://www.dict.org/" -SRC_URI="mirror://sourceforge/dict/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/dict/${P}.tar.gz" LICENSE="LGPL-2" SLOT="0" diff --git a/dev-libs/libmaa/libmaa-1.4.7.ebuild b/dev-libs/libmaa/libmaa-1.4.7.ebuild index c75763f85f2c..635965695b66 100644 --- a/dev-libs/libmaa/libmaa-1.4.7.ebuild +++ b/dev-libs/libmaa/libmaa-1.4.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 2023 Gentoo Authors +# Copyright 2023-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,7 +7,7 @@ inherit multiprocessing toolchain-funcs DESCRIPTION="Library with low-level data structures which are helpful for writing compilers" HOMEPAGE="http://www.dict.org/" -SRC_URI="mirror://sourceforge/dict/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/dict/${P}.tar.gz" LICENSE="MIT" SLOT="0/4" diff --git a/dev-libs/libmanette/Manifest b/dev-libs/libmanette/Manifest index 7fbfe9154320..232e5955215a 100644 --- a/dev-libs/libmanette/Manifest +++ b/dev-libs/libmanette/Manifest @@ -1,2 +1 @@ -DIST libmanette-0.2.6.tar.xz 43236 BLAKE2B 3b2a6979aa368117fa5d61623c26e6cca61388770ad77e759c3427fcba64d40361b1e1a4f87a2931281edbf5c2943a44c2ee3b0485ef52ddbf183a9e72344892 SHA512 e10a1b3e493a6472b0cf7562e3dfbba839ee69bb878676b2e3521363e9ff7c5df7d379923a4781366797e889f3c8985397080ae606264dc9bd3a4459bce0513c DIST libmanette-0.2.7.tar.xz 43928 BLAKE2B 10978109c22defc1fa3361ef08d824ec5a67fda86b020504322fb86db0f7157617daf34db6ddaf0c2221ad9419b04cad07fad17bb6de103b198c7664cee12c4d SHA512 c3ebaba901731d3f106379befba1c4020aa32dcd224ced7f24aab37e547644080202dfcdd0e8cbd0cb6c864410f038e483502d357ab9842ae0f25e9570d120ef diff --git a/dev-libs/libmanette/libmanette-0.2.6.ebuild b/dev-libs/libmanette/libmanette-0.2.6.ebuild deleted file mode 100644 index f60d2061f5df..000000000000 --- a/dev-libs/libmanette/libmanette-0.2.6.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit gnome.org meson vala xdg - -DESCRIPTION="Simple GObject game controller library" -HOMEPAGE="https://gitlab.gnome.org/aplazas/libmanette" - -LICENSE="LGPL-2.1+" -SLOT="0" -KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86" -IUSE="gtk-doc +introspection +udev +vala test" -RESTRICT="!test? ( test )" -REQUIRED_USE="vala? ( introspection )" - -RDEPEND=" - >=dev-libs/glib-2.50:2 - udev? ( dev-libs/libgudev[introspection?] ) - dev-libs/libevdev - introspection? ( >=dev-libs/gobject-introspection-1.56:= ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - gtk-doc? ( - dev-util/gtk-doc - app-text/docbook-xml-dtd:4.3 - ) - vala? ( $(vala_depend) ) - virtual/pkgconfig -" - -src_prepare() { - xdg_src_prepare - use vala && vala_src_prepare -} - -src_configure() { - local emesonargs=( - -Ddemos=false - $(meson_use test build-tests) - -Dinstall-tests=false - $(meson_use gtk-doc doc) - $(meson_use introspection) - $(meson_use vala vapi) - $(meson_feature udev gudev) - ) - meson_src_configure -} diff --git a/dev-libs/libmanette/libmanette-0.2.7.ebuild b/dev-libs/libmanette/libmanette-0.2.7.ebuild index 267234ca8018..10c2fcc7c933 100644 --- a/dev-libs/libmanette/libmanette-0.2.7.ebuild +++ b/dev-libs/libmanette/libmanette-0.2.7.ebuild @@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/aplazas/libmanette" LICENSE="LGPL-2.1+" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86" IUSE="gtk-doc +introspection +udev +vala test" RESTRICT="!test? ( test )" REQUIRED_USE="vala? ( introspection )" diff --git a/dev-libs/libmcrypt/libmcrypt-2.5.8-r6.ebuild b/dev-libs/libmcrypt/libmcrypt-2.5.8-r6.ebuild index 592c4a66ef6e..811df19604d7 100644 --- a/dev-libs/libmcrypt/libmcrypt-2.5.8-r6.ebuild +++ b/dev-libs/libmcrypt/libmcrypt-2.5.8-r6.ebuild @@ -7,7 +7,7 @@ inherit autotools flag-o-matic DESCRIPTION="Provides an uniform interface to access several encryption algorithms" HOMEPAGE="https://mcrypt.sourceforge.net" -SRC_URI="mirror://sourceforge/mcrypt/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/mcrypt/${P}.tar.gz" LICENSE="GPL-2+ LGPL-2.1+" SLOT="0" diff --git a/dev-libs/libmcrypt/libmcrypt-2.5.8-r7.ebuild b/dev-libs/libmcrypt/libmcrypt-2.5.8-r7.ebuild index a92b77a045aa..70f48ed9e326 100644 --- a/dev-libs/libmcrypt/libmcrypt-2.5.8-r7.ebuild +++ b/dev-libs/libmcrypt/libmcrypt-2.5.8-r7.ebuild @@ -7,7 +7,7 @@ inherit autotools flag-o-matic DESCRIPTION="Provides an uniform interface to access several encryption algorithms" HOMEPAGE="https://mcrypt.sourceforge.net" -SRC_URI="mirror://sourceforge/mcrypt/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/mcrypt/${P}.tar.gz" LICENSE="GPL-2+ LGPL-2.1+" SLOT="0" diff --git a/dev-libs/libmirage/metadata.xml b/dev-libs/libmirage/metadata.xml index 503cdce610da..9ca78d7c3f4b 100644 --- a/dev-libs/libmirage/metadata.xml +++ b/dev-libs/libmirage/metadata.xml @@ -7,5 +7,6 @@ </maintainer> <upstream> <remote-id type="sourceforge">cdemu</remote-id> + <remote-id type="github">cdemu/cdemu</remote-id> </upstream> </pkgmetadata> diff --git a/dev-libs/libnatspec/libnatspec-0.3.0.ebuild b/dev-libs/libnatspec/libnatspec-0.3.0.ebuild index 0fbcec33e9e8..d6fde3e9c93e 100644 --- a/dev-libs/libnatspec/libnatspec-0.3.0.ebuild +++ b/dev-libs/libnatspec/libnatspec-0.3.0.ebuild @@ -7,7 +7,7 @@ inherit autotools DESCRIPTION="library to smooth charset/localization issues" HOMEPAGE="http://natspec.sourceforge.net/" -SRC_URI="mirror://sourceforge/natspec/${P}.tar.bz2" +SRC_URI="https://downloads.sourceforge.net/natspec/${P}.tar.bz2" LICENSE="LGPL-2.1" SLOT="0" diff --git a/dev-libs/libnl/libnl-3.9.0.ebuild b/dev-libs/libnl/libnl-3.9.0.ebuild index b80abc5153fd..c1977e5ebeaa 100644 --- a/dev-libs/libnl/libnl-3.9.0.ebuild +++ b/dev-libs/libnl/libnl-3.9.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -8,7 +8,7 @@ EAPI=8 DISTUTILS_EXT=1 DISTUTILS_OPTIONAL=1 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit autotools distutils-r1 multilib-minimal LIBNL_P=${P/_/-} @@ -22,7 +22,7 @@ if [[ ${PV} == 9999 ]] ; then inherit git-r3 else SRC_URI="https://github.com/thom311/${PN}/releases/download/${PN}${LIBNL_DIR}/${P/_rc/-rc}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" S="${WORKDIR}/${LIBNL_P}" fi diff --git a/dev-libs/libnl/libnl-9999.ebuild b/dev-libs/libnl/libnl-9999.ebuild index b80abc5153fd..1f693f3fcd9b 100644 --- a/dev-libs/libnl/libnl-9999.ebuild +++ b/dev-libs/libnl/libnl-9999.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 @@ -8,7 +8,7 @@ EAPI=8 DISTUTILS_EXT=1 DISTUTILS_OPTIONAL=1 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit autotools distutils-r1 multilib-minimal LIBNL_P=${P/_/-} diff --git a/dev-libs/liboil/files/liboil-0.3.17-c99-configure.patch b/dev-libs/liboil/files/liboil-0.3.17-c99-configure.patch new file mode 100644 index 000000000000..7feba8a24d99 --- /dev/null +++ b/dev-libs/liboil/files/liboil-0.3.17-c99-configure.patch @@ -0,0 +1,21 @@ +https://bugs.gentoo.org/906533 +--- a/m4/as-unaligned-access.m4 ++++ b/m4/as-unaligned-access.m4 +@@ -19,6 +19,7 @@ AC_DEFUN([AS_UNALIGNED_ACCESS], [ + fi + if test x"$as_cv_unaligned_access" = x ; then + AC_TRY_RUN([ ++#include <string.h> + int main(int argc, char **argv) + { + char array[] = "ABCDEFGH"; +--- a/configure ++++ b/configure +@@ -12022,6 +12022,7 @@ else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + ++#include <string.h> + int main(int argc, char **argv) + { + char array[] = "ABCDEFGH"; diff --git a/dev-libs/liboil/liboil-0.3.17-r4.ebuild b/dev-libs/liboil/liboil-0.3.17-r5.ebuild index ca36144b8ac9..cc494faf3d93 100644 --- a/dev-libs/liboil/liboil-0.3.17-r4.ebuild +++ b/dev-libs/liboil/liboil-0.3.17-r5.ebuild @@ -21,7 +21,10 @@ BDEPEND=" dev-build/gtk-doc-am virtual/pkgconfig" -PATCHES=( "${FILESDIR}"/${P}-amd64-cpuid.patch ) +PATCHES=( + "${FILESDIR}"/${P}-amd64-cpuid.patch + "${FILESDIR}"/${P}-c99-configure.patch +) src_prepare() { [[ ${CHOST} == *x32 ]] && PATCHES+=( "${FILESDIR}"/${PN}-0.3.17-x32.patch ) @@ -43,6 +46,8 @@ src_configure() { strip-flags filter-flags -O? append-flags -O2 + # bug #931004 + filter-lto # For use with Clang, which is the only compiler on OSX, bug #576646 [[ ${CHOST} == *-darwin* ]] && append-flags -fheinous-gnu-extensions diff --git a/dev-libs/libotf/libotf-0.9.16.ebuild b/dev-libs/libotf/libotf-0.9.16-r1.ebuild index af118cd89a6f..4ea3d257b157 100644 --- a/dev-libs/libotf/libotf-0.9.16.ebuild +++ b/dev-libs/libotf/libotf-0.9.16-r1.ebuild @@ -1,11 +1,12 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 + inherit autotools DESCRIPTION="Library for handling OpenType fonts (OTF)" -HOMEPAGE="http://www.nongnu.org/m17n/" +HOMEPAGE="https://www.nongnu.org/m17n/" SRC_URI="mirror://nongnu/m17n/${P}.tar.gz" LICENSE="LGPL-2.1" @@ -20,14 +21,12 @@ RDEPEND=">=media-libs/freetype-2.4.9 x11-libs/libXt )" DEPEND="${RDEPEND} - virtual/pkgconfig X? ( x11-base/xorg-proto x11-libs/libICE x11-libs/libXmu )" - -DOCS="AUTHORS ChangeLog NEWS README" +BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}"/${PN}-0.9.13-build.patch diff --git a/dev-libs/libp11/libp11-0.4.12-r1.ebuild b/dev-libs/libp11/libp11-0.4.12-r1.ebuild deleted file mode 100644 index 6590012a74ae..000000000000 --- a/dev-libs/libp11/libp11-0.4.12-r1.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="Abstraction layer to simplify PKCS#11 API" -HOMEPAGE="https://github.com/opensc/libp11/wiki" -SRC_URI="https://github.com/OpenSC/${PN}/releases/download/${P}/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="doc static-libs" - -RDEPEND="dev-libs/openssl:=[bindist(+)]" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig - doc? ( app-text/doxygen )" - -src_configure() { - econf \ - --enable-shared \ - $(use_enable static-libs static) \ - $(use_enable doc api-doc) -} - -src_install() { - default - - find "${ED}" -name '*.la' -delete || die -} diff --git a/dev-libs/libp11/libp11-0.4.12-r6.ebuild b/dev-libs/libp11/libp11-0.4.12-r7.ebuild index 857488c8b4ab..fb5a4c7faf18 100644 --- a/dev-libs/libp11/libp11-0.4.12-r6.ebuild +++ b/dev-libs/libp11/libp11-0.4.12-r7.ebuild @@ -11,18 +11,17 @@ SRC_URI="https://github.com/OpenSC/${PN}/releases/download/${P}/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" IUSE="doc static-libs test" RESTRICT="!test? ( test )" RDEPEND=" - dev-libs/openssl:=[bindist(+)] + >=dev-libs/openssl-3.0.0:=[bindist(+)] !~dev-libs/openssl-3.2.0 !=dev-libs/openssl-3.2.1-r0 - || ( - >=dev-libs/openssl-3.1.5-r1 - <dev-libs/openssl-3.0.12 - ) + !=dev-libs/openssl-3.0.13-r1 + !=dev-libs/openssl-3.0.13-r0 + !~dev-libs/openssl-3.0.12 " DEPEND="${RDEPEND} test? ( dev-libs/softhsm ) diff --git a/dev-libs/libpcre-debian/libpcre-debian-8-r2.ebuild b/dev-libs/libpcre-debian/libpcre-debian-8-r3.ebuild index 01cd18656c14..ecc28e2f0357 100644 --- a/dev-libs/libpcre-debian/libpcre-debian-8-r2.ebuild +++ b/dev-libs/libpcre-debian/libpcre-debian-8-r3.ebuild @@ -1,12 +1,13 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit multilib-minimal DESCRIPTION="libpcre(posix).so.3 symlinks for compatibility with Debian" -HOMEPAGE="http://www.pcre.org/" +HOMEPAGE="https://www.pcre.org/" +S="${WORKDIR}" LICENSE="BSD" SLOT="3" @@ -14,8 +15,6 @@ KEYWORDS="~amd64 ~x86" RDEPEND="dev-libs/libpcre:${SLOT}[${MULTILIB_USEDEP}]" -S="${WORKDIR}" - multilib_src_install() { dosym ../$(multilib_is_native_abi && echo ../../$(get_libdir)/)libpcre.so.1 \ /usr/$(get_libdir)/debiancompat/libpcre.so.3 diff --git a/dev-libs/libpcre/libpcre-8.45-r1.ebuild b/dev-libs/libpcre/libpcre-8.45-r1.ebuild index 486937c58cb3..7705ae51633c 100644 --- a/dev-libs/libpcre/libpcre-8.45-r1.ebuild +++ b/dev-libs/libpcre/libpcre-8.45-r1.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="http://www.pcre.org/" MY_P="pcre-${PV/_rc/-RC}" if [[ ${PV} != *_rc* ]] ; then # Only the final releases are available here. - SRC_URI="mirror://sourceforge/pcre/${MY_P}.tar.bz2 + SRC_URI="https://downloads.sourceforge.net/pcre/${MY_P}.tar.bz2 https://ftp.pcre.org/pub/pcre/${MY_P}.tar.bz2 ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${MY_P}.tar.bz2" else diff --git a/dev-libs/libpcre/libpcre-8.45-r2.ebuild b/dev-libs/libpcre/libpcre-8.45-r2.ebuild index c87877646d81..8c710120137f 100644 --- a/dev-libs/libpcre/libpcre-8.45-r2.ebuild +++ b/dev-libs/libpcre/libpcre-8.45-r2.ebuild @@ -11,7 +11,7 @@ MY_P="pcre-${PV/_rc/-RC}" if [[ ${PV} != *_rc* ]] ; then # Only the final releases are available here. SRC_URI=" - mirror://sourceforge/pcre/${MY_P}.tar.bz2 + https://downloads.sourceforge.net/pcre/${MY_P}.tar.bz2 https://ftp.pcre.org/pub/pcre/${MY_P}.tar.bz2 ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${MY_P}.tar.bz2 " diff --git a/dev-libs/libpcre/libpcre-8.45-r3.ebuild b/dev-libs/libpcre/libpcre-8.45-r3.ebuild index 6147da6ca44c..e528590ffb70 100644 --- a/dev-libs/libpcre/libpcre-8.45-r3.ebuild +++ b/dev-libs/libpcre/libpcre-8.45-r3.ebuild @@ -11,7 +11,7 @@ MY_P="pcre-${PV/_rc/-RC}" if [[ ${PV} != *_rc* ]] ; then # Only the final releases are available here. SRC_URI=" - mirror://sourceforge/pcre/${MY_P}.tar.bz2 + https://downloads.sourceforge.net/pcre/${MY_P}.tar.bz2 https://ftp.pcre.org/pub/pcre/${MY_P}.tar.bz2 ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${MY_P}.tar.bz2 " diff --git a/dev-libs/libpcre2/libpcre2-10.42-r2.ebuild b/dev-libs/libpcre2/libpcre2-10.42-r2.ebuild index 961f1925e593..b3cf5cb10cb5 100644 --- a/dev-libs/libpcre2/libpcre2-10.42-r2.ebuild +++ b/dev-libs/libpcre2/libpcre2-10.42-r2.ebuild @@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="BSD" SLOT="0/3" # libpcre2-posix.so version -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="bzip2 +jit libedit +pcre16 +pcre32 +readline static-libs unicode valgrind zlib" REQUIRED_USE="?? ( libedit readline )" diff --git a/dev-libs/libpcre2/libpcre2-10.43.ebuild b/dev-libs/libpcre2/libpcre2-10.43.ebuild index eebbe19389eb..c76ff00031b1 100644 --- a/dev-libs/libpcre2/libpcre2-10.43.ebuild +++ b/dev-libs/libpcre2/libpcre2-10.43.ebuild @@ -21,7 +21,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="BSD" SLOT="0/3" # libpcre2-posix.so version if [[ ${PV} != *_rc* ]] ; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi IUSE="bzip2 +jit libedit +pcre16 +pcre32 +readline static-libs unicode valgrind zlib" REQUIRED_USE="?? ( libedit readline )" diff --git a/dev-libs/libpfm/Manifest b/dev-libs/libpfm/Manifest index c28fc8a712d5..5bc7edb2faf3 100644 --- a/dev-libs/libpfm/Manifest +++ b/dev-libs/libpfm/Manifest @@ -1,2 +1,3 @@ DIST libpfm-4.11.0.tar.gz 1043686 BLAKE2B 99b4f1a5156316139603cf50cf42c13c548a0b196435bfc92bc26ebd3f8d7ec9584255978d4f3fbff45cddc937269961e9d2b65d065632ae635e9ca45c179a54 SHA512 633035b8a7b35973437572095cdc80d422b2a1a61e74e14f106db95fa8e44e4518e591699cc457f828b8f2fb63f60eef6d0c7535c6b4c9a6c3a70d4550b3c3c7 DIST libpfm-4.12.0.tar.gz 1109288 BLAKE2B 035133d98305317b8331de9f3d986bf37b290cc80d2b944e9bac1c48a8659984ac190a0af1abe64bd9e0fee465f31ca11e3a35702f8a8da8a8a480a1aa625ac7 SHA512 dc47d862d619241db4a077a98b3f71a68f04be1be41e10c7b7dd2e596e6c79e9e0ff1d1028798dfb280553f98296b4b57339b4e6675749e1497dc1c9de06d9f8 +DIST libpfm-4.13.0.tar.gz 1128221 BLAKE2B 71fddec8993acec5c14d140d80804d41a12ae2fe22368b74bf94f10f95f51946bf9150b4329ca481756228366fc86b1ff5f795a97de181d211dc175c374a5653 SHA512 e61b210aa2ce80f0e47603c88eee2e4f2fe30ca2c0e194a5472b6a8de3bf9dc1085e5261bbb9ddbe5b6531c4b391fb34f20d038e5ebd8e6f4c14c2112aee508f diff --git a/dev-libs/libpfm/libpfm-4.11.0.ebuild b/dev-libs/libpfm/libpfm-4.11.0.ebuild index feb30cf33428..5faa54c87118 100644 --- a/dev-libs/libpfm/libpfm-4.11.0.ebuild +++ b/dev-libs/libpfm/libpfm-4.11.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,7 +7,7 @@ inherit toolchain-funcs DESCRIPTION="Hardware-based performance monitoring interface for Linux" HOMEPAGE="http://perfmon2.sourceforge.net" -SRC_URI="mirror://sourceforge/perfmon2/${PN}4/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/perfmon2/${PN}4/${P}.tar.gz" LICENSE="GPL-2 MIT" SLOT="0/4" diff --git a/dev-libs/libpfm/libpfm-4.12.0.ebuild b/dev-libs/libpfm/libpfm-4.12.0.ebuild index 2405d1039040..d368aee65973 100644 --- a/dev-libs/libpfm/libpfm-4.12.0.ebuild +++ b/dev-libs/libpfm/libpfm-4.12.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,7 +7,7 @@ inherit toolchain-funcs DESCRIPTION="Hardware-based performance monitoring interface for Linux" HOMEPAGE="http://perfmon2.sourceforge.net" -SRC_URI="mirror://sourceforge/perfmon2/${PN}4/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/perfmon2/${PN}4/${P}.tar.gz" LICENSE="GPL-2 MIT" SLOT="0/4" diff --git a/dev-libs/libpfm/libpfm-4.13.0.ebuild b/dev-libs/libpfm/libpfm-4.13.0.ebuild new file mode 100644 index 000000000000..e0a4d2729761 --- /dev/null +++ b/dev-libs/libpfm/libpfm-4.13.0.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="Hardware-based performance monitoring interface for Linux" +HOMEPAGE="http://perfmon2.sourceforge.net" +SRC_URI="https://downloads.sourceforge.net/perfmon2/${PN}4/${P}.tar.gz" + +LICENSE="GPL-2 MIT" +SLOT="0/4" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="static-libs" + +src_prepare() { + default + + sed -e "s:SLDFLAGS=:SLDFLAGS=\$(LDFLAGS) :g" \ + -i lib/Makefile || die + sed -e "s:LIBDIR=\$(PREFIX)/lib:LIBDIR=\$(PREFIX)/$(get_libdir):g" \ + -i config.mk || die +} + +src_compile() { + # 'DBG=' unsets '-Werror' and other optional flags, bug #664294 + emake AR="$(tc-getAR)" CC="$(tc-getCC)" DBG= +} + +src_test() { + cd tests || die + ./validate || die +} + +src_install() { + emake DESTDIR="${D}" LDCONFIG=true PREFIX="${EPREFIX}/usr" install + dodoc README + + if ! use static-libs ; then + find "${ED}" -name '*.a' -delete || die + fi + + find "${ED}" -name '*.la' -delete || die +} diff --git a/dev-libs/libpsl-native/Manifest b/dev-libs/libpsl-native/Manifest index 60ff7aec2d55..71a6e7de2338 100644 --- a/dev-libs/libpsl-native/Manifest +++ b/dev-libs/libpsl-native/Manifest @@ -1,2 +1 @@ -DIST libpsl-native-7.3.2.tar.gz 288949 BLAKE2B 9547d0144ec1bd48d4f9272ae7c7237fbc052a852908a535047f2f9a41a7a0f7c36868fe697c77ec37d4705a119ac3f4f6961f7ff8ad7c80f8ec176839e34dd3 SHA512 5ff7c730c000e1d8ccbf48e01a1233889df3ddda3c280cbf37298a1731354dde30f0637b62567a8679dec4ea27a2184d9559026c3a86c793c6c8c12ec629c90d DIST libpsl-native-7.4.0.tar.gz 288919 BLAKE2B b38b35d3f1ebf2b7deeb90ff78c7c00e2e51f7b115a1622a878e7870de4dae53458a16b325fe7059b6faf7157701f14e179c8cb12648ff5ffd44694ce9a6ead2 SHA512 bfd1c00834bfd2a7fdba0cf5ae3bb82efb959fdc2f538d05bde150b98d417012647115c6893fc53db0b20170ea40be238ef017044a8076798c02578bd14884f9 diff --git a/dev-libs/libpsl-native/files/libpsl-native-7.3.2-cmake.patch b/dev-libs/libpsl-native/files/libpsl-native-7.3.2-cmake.patch deleted file mode 100644 index a8222f074713..000000000000 --- a/dev-libs/libpsl-native/files/libpsl-native-7.3.2-cmake.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,9 +1,7 @@ - cmake_minimum_required(VERSION 2.8.11) - project(PSL-NATIVE) - --# Can't use add_compile_options with 2.8.11 --set(CMAKE_BUILD_TYPE "Release") --set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Werror -fstack-protector-strong -fpie -DFORTIFY_SOURCE=2 -O2") -+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") - - if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,relro,-z,now") -@@ -11,15 +9,11 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl") - endif() - --set(LIBRARY_OUTPUT_PATH "${PROJECT_SOURCE_DIR}/../powershell-unix") -+option(TESTING "Enable tests" OFF) - --if (CMAKE_SYSTEM_PROCESSOR MATCHES "arm*") -- message(STATUS "Building for ARM, no tests") -- add_subdirectory(src) --else () -- # test in BUILD_DIR -- message(STATUS "Tests enabled") -- enable_testing() -- add_subdirectory(src) -- add_subdirectory(test) --endif () -+add_subdirectory(src) -+ -+if(TESTING) -+ enable_testing() -+ add_subdirectory(test) -+endif() diff --git a/dev-libs/libpsl-native/libpsl-native-7.3.2.ebuild b/dev-libs/libpsl-native/libpsl-native-7.3.2.ebuild deleted file mode 100644 index db376c436a36..000000000000 --- a/dev-libs/libpsl-native/libpsl-native-7.3.2.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MY_PN="PowerShell-Native" - -inherit cmake - -DESCRIPTION="Functionality missing from .NET Core via system calls" -HOMEPAGE="https://github.com/PowerShell/PowerShell-Native/" - -if [[ "${PV}" == *9999* ]] ; then - inherit git-r3 - - EGIT_REPO_URI="https://github.com/PowerShell/${MY_PN}.git" - S="${WORKDIR}/${P}/src/${PN}" -else - SRC_URI="https://github.com/PowerShell/${MY_PN}/archive/v${PV}.tar.gz - -> ${P}.tar.gz" - S="${WORKDIR}/${MY_PN}-${PV}/src/${PN}" - - KEYWORDS="~amd64 ~arm ~arm64 ~x86" -fi - -LICENSE="MIT" -SLOT="0/$(ver_cut 1-2)" -RESTRICT="test" # Fails. - -PATCHES=( - "${FILESDIR}/${PN}-7.3.2-cmake.patch" - "${FILESDIR}/${PN}-7.3.2-test-cmake.patch" -) - -src_install() { - dolib.so "${BUILD_DIR}/src/${PN}.so" - - einstalldocs -} diff --git a/dev-libs/libpsl-native/libpsl-native-7.4.0.ebuild b/dev-libs/libpsl-native/libpsl-native-7.4.0.ebuild index 41a8ae927cc9..0fb2de0c2006 100644 --- a/dev-libs/libpsl-native/libpsl-native-7.4.0.ebuild +++ b/dev-libs/libpsl-native/libpsl-native-7.4.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -21,7 +21,7 @@ else -> ${P}.tar.gz" S="${WORKDIR}/${MY_PN}-${PV}/src/${PN}" - KEYWORDS="~amd64 ~arm ~arm64 ~x86" + KEYWORDS="amd64 arm arm64 ~x86" fi LICENSE="MIT" diff --git a/dev-libs/libpwquality/files/libpwquality-1.4.4-pam_pwquality-include.patch b/dev-libs/libpwquality/files/libpwquality-1.4.4-pam_pwquality-include.patch deleted file mode 100644 index 2ed638c1e34a..000000000000 --- a/dev-libs/libpwquality/files/libpwquality-1.4.4-pam_pwquality-include.patch +++ /dev/null @@ -1,35 +0,0 @@ -https://github.com/libpwquality/libpwquality/pull/62 - -From 27057c6cbf528108c35df934280c7dd83e8d5ce9 Mon Sep 17 00:00:00 2001 -From: Sam James <sam@gentoo.org> -Date: Wed, 7 Sep 2022 05:42:17 +0100 -Subject: [PATCH] pam_pwquality: add include for - pam_modutil_check_user_in_passwd - -After 9084c1b032161cdb53d5f66132a91bdc207faecf, one gets: -``` -pam_pwquality.c: In function 'check_local_user': -pam_pwquality.c:102:16: error: implicit declaration of function 'pam_modutil_check_user_in_passwd' [-Werror=implicit-function-declaration] - 102 | return pam_modutil_check_user_in_passwd(pamh, user, NULL) == PAM_SUCCESS; - | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -cc1: some warnings being treated as errors -make[2]: *** [Makefile:634: pam_pwquality.lo] Error 1 -make[2]: *** Waiting for unfinished jobs.... -``` - -We need to include security/pam_modutil.h when appropriate. - -Signed-off-by: Sam James <sam@gentoo.org> ---- a/src/pam_pwquality.c -+++ b/src/pam_pwquality.c -@@ -34,6 +34,10 @@ - #include <security/_pam_macros.h> - #include <security/pam_ext.h> - -+#ifdef HAVE_PAM_CHECK_USER_IN_PASSWD -+#include <security/pam_modutil.h> -+#endif -+ - /* argument parsing */ - #define PAM_DEBUG_ARG 0x0001 - diff --git a/dev-libs/libpwquality/libpwquality-1.4.5-r1.ebuild b/dev-libs/libpwquality/libpwquality-1.4.5-r1.ebuild index 86d7c956d46c..6d3790bc64a6 100644 --- a/dev-libs/libpwquality/libpwquality-1.4.5-r1.ebuild +++ b/dev-libs/libpwquality/libpwquality-1.4.5-r1.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2" LICENSE="|| ( BSD GPL-2 )" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" IUSE="pam python static-libs" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" diff --git a/dev-libs/libpwquality/libpwquality-1.4.5-r2.ebuild b/dev-libs/libpwquality/libpwquality-1.4.5-r2.ebuild new file mode 100644 index 000000000000..bc73b9832fda --- /dev/null +++ b/dev-libs/libpwquality/libpwquality-1.4.5-r2.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +DISTUTILS_EXT=1 +DISTUTILS_OPTIONAL=1 +DISTUTILS_USE_PEP517=setuptools +inherit libtool pam distutils-r1 + +DESCRIPTION="Library for password quality checking and generating random passwords" +HOMEPAGE="https://github.com/libpwquality/libpwquality" +SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2" + +LICENSE="|| ( BSD GPL-2 )" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +IUSE="pam python static-libs" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +BDEPEND=" + >=sys-devel/gettext-0.18.2 + virtual/pkgconfig + python? ( + ${DISTUTILS_DEPS} + ${PYTHON_DEPS} + ) +" +RDEPEND=" + >=sys-libs/cracklib-2.8:=[static-libs(+)?] + pam? ( sys-libs/pam ) + python? ( ${PYTHON_DEPS} ) +" +DEPEND="${RDEPEND}" + +src_prepare() { + default + elibtoolize + + if use python ; then + cd python || die + distutils-r1_src_prepare + fi +} + +src_configure() { + # Install library in /lib for pam + local myeconfargs=( + --libdir="${EPREFIX}/usr/$(get_libdir)" + $(use_enable pam) + --with-securedir="${EPREFIX}/$(getpam_mod_dir)" + --disable-python-bindings + $(use_enable static-libs static) + ) + + econf "${myeconfargs[@]}" + + if use python; then + cd python || die + distutils-r1_src_configure + fi +} + +src_compile() { + default + if use python; then + cd python || die + distutils-r1_src_compile + fi +} + +src_test() { + default + if use python; then + cd python || die + distutils-r1_src_test + fi +} + +src_install() { + default + + if use python; then + cd python || die + distutils-r1_src_install + fi + + find "${ED}" -name '*.la' -delete || die +} diff --git a/dev-libs/libpwquality/libpwquality-1.4.5.ebuild b/dev-libs/libpwquality/libpwquality-1.4.5.ebuild deleted file mode 100644 index 87db7e77e81e..000000000000 --- a/dev-libs/libpwquality/libpwquality-1.4.5.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) -inherit pam python-r1 usr-ldscript - -DESCRIPTION="Library for password quality checking and generating random passwords" -HOMEPAGE="https://github.com/libpwquality/libpwquality" -SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2" - -LICENSE="|| ( BSD GPL-2 )" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="pam python static-libs" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -BDEPEND=" - >=sys-devel/gettext-0.18.2 - virtual/pkgconfig -" -RDEPEND=" - >=sys-libs/cracklib-2.8:=[static-libs(+)?] - pam? ( sys-libs/pam ) - python? ( ${PYTHON_DEPS} ) -" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/${PN}-1.4.4-pam_pwquality-include.patch -) - -src_prepare() { - default - # ensure pkgconfig files go in /usr - sed -e "s:\(pkgconfigdir *=\).*:\1 ${EPREFIX}/usr/$(get_libdir)/pkgconfig:" \ - -i src/Makefile.{am,in} || die "sed failed" - - if use python ; then - # bug #830397 - export SETUPTOOLS_USE_DISTUTILS=stdlib - python_copy_sources - fi -} - -src_configure() { - # Install library in /lib for pam - configuring() { - local sitedir - econf \ - --libdir="${EPREFIX}/$(get_libdir)" \ - $(use_enable pam) \ - --with-securedir="${EPREFIX}/$(getpam_mod_dir)" \ - $(use_enable python python-bindings) \ - $(usex python "--with-pythonsitedir=$(use python && python_get_sitedir)" "") \ - $(use_enable static-libs static) - } - if_use_python_python_foreach_impl configuring -} - -src_compile() { - if_use_python_python_foreach_impl default -} - -src_test() { - if_use_python_python_foreach_impl default -} - -src_install() { - if_use_python_python_foreach_impl default - if use static-libs; then - # Do not install static libs in /lib - mkdir -p "${ED}/usr/$(get_libdir)" - mv "${ED}/$(get_libdir)/libpwquality.a" "${ED}/usr/$(get_libdir)/" || die - gen_usr_ldscript libpwquality.so - fi - find "${ED}" -name '*.la' -delete || die -} - -if_use_python_python_foreach_impl() { - if use python; then - python_foreach_impl run_in_build_dir "$@" - else - "$@" - fi -} diff --git a/dev-libs/libpy/libpy-0.2.5-r2.ebuild b/dev-libs/libpy/libpy-0.2.5-r3.ebuild index e11055754550..285956b05a94 100644 --- a/dev-libs/libpy/libpy-0.2.5-r2.ebuild +++ b/dev-libs/libpy/libpy-0.2.5-r3.ebuild @@ -1,9 +1,9 @@ -# Copyright 2021-2023 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) DISTUTILS_EXT=1 DISTUTILS_USE_PEP517=setuptools inherit flag-o-matic distutils-r1 diff --git a/dev-libs/libqt5pas/libqt5pas-1.2.9.ebuild b/dev-libs/libqt5pas/libqt5pas-1.2.9.ebuild index cd2b7135bb7c..090fe8251feb 100644 --- a/dev-libs/libqt5pas/libqt5pas-1.2.9.ebuild +++ b/dev-libs/libqt5pas/libqt5pas-1.2.9.ebuild @@ -1,4 +1,4 @@ -# Copyright 2020-2022 Gentoo Authors +# Copyright 2020-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -9,7 +9,7 @@ MY_P="lazarus-2.2.4-0" DESCRIPTION="Free Pascal Qt5 bindings library updated by lazarus IDE." HOMEPAGE="https://gitlab.com/freepascal.org/lazarus/lazarus" -SRC_URI="mirror://sourceforge/lazarus/${MY_P}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/lazarus/${MY_P}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~x86" LICENSE="LGPL-3" diff --git a/dev-libs/libqtxdg/metadata.xml b/dev-libs/libqtxdg/metadata.xml index 6e916dfc3d4d..fdcb4167d5e0 100644 --- a/dev-libs/libqtxdg/metadata.xml +++ b/dev-libs/libqtxdg/metadata.xml @@ -5,10 +5,6 @@ <email>lxqt@gentoo.org</email> <name>LXQt</name> </maintainer> - <maintainer type="project"> - <email>qt@gentoo.org</email> - <name>Gentoo Qt Project</name> - </maintainer> <upstream> <remote-id type="github">lxqt/libqtxdg</remote-id> </upstream> diff --git a/dev-libs/libratbag/Manifest b/dev-libs/libratbag/Manifest index 9c0909368ccd..619b6ab36a94 100644 --- a/dev-libs/libratbag/Manifest +++ b/dev-libs/libratbag/Manifest @@ -1,3 +1 @@ -DIST libratbag-0.15.tar.gz 249492 BLAKE2B 0f5b35800cb9f82cb892dacd5e3b041843cf5513507ee4882ec5b3f8c8aec8a24594736f2eb1c8e373a0ee38ace1e6328cbd4816d6e5b2cd1f2154ebd803a5fa SHA512 add47a6b3d771de77c6307e128a549f5295e216059b5a2375aa6b2b6bbebcf9a93d7bf148181b3f39f855976e9b6f57072dd9198d07828bebe85409f4ad994aa -DIST libratbag-0.16.tar.gz 253080 BLAKE2B ede56838c822519b4fe4c6846f5d6d237104fc06f96fb17aa62b4c712965f00827973ebe732ee5ac9a16f101baf0b63eb445fbb97746df3b8ed24d6e085b34e1 SHA512 b3f2fee39ec85c0e08d257753241fb0e553de53eb7409a3b95f93a0fac3989a9411c53c915e72bef19bcfc5682fe9cdafaeb1f41f2718ab02766859f565415e3 DIST libratbag-0.17.tar.gz 279273 BLAKE2B 7252afc8bca5d95c24d61dbd68c4e486550df7d6d9fa74a8c9d2a58c6363ed2ee289c0d02cdd72c968618f5c08a0687c97836dd2c47b457ba4228f4716b50cb9 SHA512 80ab5c895d83e28b6b6adcd0669854944d7932ef037c8d64b923a7362399e861475e9d81c5ee2cf814f654d7796b00a81314cc177f34e13c8684d525974068c8 diff --git a/dev-libs/libratbag/files/libratbag-0.16-musl-error.h.patch b/dev-libs/libratbag/files/libratbag-0.16-musl-error.h.patch deleted file mode 100644 index a3b0b187c154..000000000000 --- a/dev-libs/libratbag/files/libratbag-0.16-musl-error.h.patch +++ /dev/null @@ -1,69 +0,0 @@ -# Since musl doesn't provide error.h we need to check before adding it. If -# error.h is present in system only then we include it else we use err.h. -# Already there exists a bug report for this upstream [1]. The devs are open to -# a custom implementation of error but for now this patch for do it. -# -# [1]: https://github.com/libratbag/libratbag/issues/1253 -# -# Closes: https://bugs.gentoo.org/830557 ---- a/meson.build -+++ b/meson.build -@@ -74,8 +74,13 @@ dep_libevdev = dependency('libevdev') - dep_glib = dependency('glib-2.0') - dep_json_glib = dependency('json-glib-1.0') - dep_lm = cc.find_library('m') -+error_exists = cc.has_header('error.h') - dep_unistring = cc.find_library('unistring') - -+if error_exists -+ add_global_arguments('-DHAVE_ERROR_H', language : 'c') -+endif -+ - if get_option('logind-provider') == 'elogind' - dep_logind = dependency('libelogind', version : '>=227') - else ---- a/tools/hidpp10-dump-page.c -+++ b/tools/hidpp10-dump-page.c -@@ -23,7 +23,12 @@ - - #include <config.h> - #include <errno.h> -+#ifdef HAVE_ERROR_H - #include <error.h> -+#else -+#include <err.h> -+#define error(status, errno, ...) err(status, __VA_ARGS__) -+#endif - #include <fcntl.h> - - #include <hidpp10.h> ---- a/tools/hidpp20-dump-page.c -+++ b/tools/hidpp20-dump-page.c -@@ -23,7 +23,12 @@ - - #include <config.h> - #include <errno.h> -+#ifdef HAVE_ERROR_H - #include <error.h> -+#else -+#include <err.h> -+#define error(status, errno, ...) err(status, __VA_ARGS__) -+#endif - #include <fcntl.h> - - #include <hidpp20.h> ---- a/tools/hidpp20-reset.c -+++ b/tools/hidpp20-reset.c -@@ -23,7 +23,12 @@ - - #include <config.h> - #include <errno.h> -+#ifdef HAVE_ERROR_H - #include <error.h> -+#else -+#include <err.h> -+#define error(status, errno, ...) err(status, __VA_ARGS__) -+#endif - #include <fcntl.h> - - #include <hidpp20.h> diff --git a/dev-libs/libratbag/files/libratbag-0.17-python3.12-imp.patch b/dev-libs/libratbag/files/libratbag-0.17-python3.12-imp.patch new file mode 100644 index 000000000000..6ded679b1bad --- /dev/null +++ b/dev-libs/libratbag/files/libratbag-0.17-python3.12-imp.patch @@ -0,0 +1,38 @@ +https://bugs.gentoo.org/929423 +https://github.com/libratbag/libratbag/pull/1569 +https://github.com/libratbag/libratbag/commit/27b0d4a2d9cd21fa9f11a0770d94c578db6324d1 +--- a/tools/toolbox.py ++++ b/tools/toolbox.py +@@ -21,7 +21,8 @@ + # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + # DEALINGS IN THE SOFTWARE. + +-import imp ++import importlib.util ++import importlib.machinery + import os + import subprocess + import sys +@@ -45,8 +46,11 @@ def import_non_standard_path(name, path): + # If any of the following calls raises an exception, + # there's a problem we can't handle -- let the caller handle it. + +- with open(path, 'rb') as fp: +- module = imp.load_module(name, fp, os.path.basename(path), ('.py', 'rb', imp.PY_SOURCE)) ++ loader = importlib.machinery.SourceFileLoader(name, path) ++ spec = importlib.util.spec_from_file_location(name, path, loader=loader) ++ module = importlib.util.module_from_spec(spec) ++ sys.modules[name] = module ++ loader.exec_module(module) + + return module + +@@ -107,7 +111,7 @@ def sync_dbus(): + main_context.iteration(False) + + +-ratbagctl = import_non_standard_path(RATBAGCTL_NAME, RATBAGCTL_PATH) ++import_non_standard_path(RATBAGCTL_NAME, RATBAGCTL_PATH) + + from ratbagctl import open_ratbagd, get_parser, RatbagError, RatbagErrorCapability # NOQA + diff --git a/dev-libs/libratbag/libratbag-0.17.ebuild b/dev-libs/libratbag/libratbag-0.17-r1.ebuild index 79d932aef8d8..e1cf833f0ff6 100644 --- a/dev-libs/libratbag/libratbag-0.17.ebuild +++ b/dev-libs/libratbag/libratbag-0.17-r1.ebuild @@ -9,11 +9,17 @@ inherit meson python-single-r1 systemd udev DESCRIPTION="Library to configure gaming mice" HOMEPAGE="https://github.com/libratbag/libratbag" -SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/libratbag/libratbag.git" +else + SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~x86" IUSE="doc elogind systemd test" REQUIRED_USE=" ${PYTHON_REQUIRED_USE} diff --git a/dev-libs/libratbag/libratbag-0.15.ebuild b/dev-libs/libratbag/libratbag-0.17-r2.ebuild index ba7c076793e6..7620f30d382d 100644 --- a/dev-libs/libratbag/libratbag-0.15.ebuild +++ b/dev-libs/libratbag/libratbag-0.17-r2.ebuild @@ -3,17 +3,23 @@ EAPI=8 -PYTHON_COMPAT=( python3_10 ) +PYTHON_COMPAT=( python3_{10..12} ) inherit meson python-single-r1 systemd udev DESCRIPTION="Library to configure gaming mice" HOMEPAGE="https://github.com/libratbag/libratbag" -SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/libratbag/libratbag.git" +else + SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~x86" IUSE="doc elogind systemd test" REQUIRED_USE=" ${PYTHON_REQUIRED_USE} @@ -61,6 +67,10 @@ DEPEND=" dev-libs/gobject-introspection " +PATCHES=( + "${FILESDIR}"/libratbag-0.17-python3.12-imp.patch +) + src_prepare() { default @@ -98,4 +108,5 @@ pkg_postinst() { elog 'You need to be in "plugdev" group in order to access the' elog 'ratbagd dbus interface' fi + elog 'You may be required to create and/or be part of the "games" group if you intend on using piper' } diff --git a/dev-libs/libratbag/libratbag-0.16.ebuild b/dev-libs/libratbag/libratbag-9999.ebuild index ad08ddd3c6db..47fc210ab543 100644 --- a/dev-libs/libratbag/libratbag-0.16.ebuild +++ b/dev-libs/libratbag/libratbag-9999.ebuild @@ -3,17 +3,23 @@ EAPI=8 -PYTHON_COMPAT=( python3_10 ) +PYTHON_COMPAT=( python3_{10..12} ) inherit meson python-single-r1 systemd udev DESCRIPTION="Library to configure gaming mice" HOMEPAGE="https://github.com/libratbag/libratbag" -SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/libratbag/libratbag.git" +else + SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~x86" IUSE="doc elogind systemd test" REQUIRED_USE=" ${PYTHON_REQUIRED_USE} @@ -61,10 +67,6 @@ DEPEND=" dev-libs/gobject-introspection " -PATCHES=( - "${FILESDIR}"/${PN}-0.16-musl-error.h.patch -) - src_prepare() { default @@ -102,4 +104,5 @@ pkg_postinst() { elog 'You need to be in "plugdev" group in order to access the' elog 'ratbagd dbus interface' fi + elog 'You may be required to create and/or be part of the "games" group if you intend on using piper' } diff --git a/dev-libs/librdkafka/Manifest b/dev-libs/librdkafka/Manifest index 3a72062c282c..e53816e500da 100644 --- a/dev-libs/librdkafka/Manifest +++ b/dev-libs/librdkafka/Manifest @@ -1,3 +1 @@ -DIST librdkafka-1.8.2.tar.gz 4097028 BLAKE2B 37a3190417e973ea4629012e358ff61cda45eb0134448dd0054fd1f1cac57f3543b133331b0b0d518f219f30f79f7665a214c75084d6a8474687b7e686395724 SHA512 8c8ae291129b78e3b8367307ad1b1715af1438cd76d7160d64d13a58adf84c7c9f51efeba4656f55e101c25e4cb744db0d8bb5c01a2decb229e4567d16bdcb22 -DIST librdkafka-2.1.1.tar.gz 4281061 BLAKE2B 8200c2aee0d04109cb78f13b186cf907f3260ee6a17a2fffc4f7706ed9cbea9436eb31d17167e9af783495ef2365f7401bbdc671d5a8d7e7f2ecb9b5c7d57fbb SHA512 6bf1761e7ed1820b587fda24277f6606ec046da281064df13c4380f49a92f3e2b165614b9c622d46b27078ec024a4dc211610e500e597265e8219f8869c4d203 DIST librdkafka-2.2.0.tar.gz 4340164 BLAKE2B 394c9fd25db0a3a02b16fec3d5d5acc4808b4c8a6c8e025e71f15a91c6311206bf4d7c863860be36483c150bb10955cdc98ba0f088fa493b20ae52154e2a83d0 SHA512 1a85b5864efdeece1327e461b62a378f24b73eb7174168f630aeff01d4a5074d6b2f15744bc267665fcfc6384e804df00c20b7271ecd85a98dca84746b86b4d9 diff --git a/dev-libs/librdkafka/librdkafka-1.8.2.ebuild b/dev-libs/librdkafka/librdkafka-1.8.2.ebuild deleted file mode 100644 index b58580b204e0..000000000000 --- a/dev-libs/librdkafka/librdkafka-1.8.2.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="8" - -PYTHON_COMPAT=( python3_{9..11} ) - -inherit python-any-r1 toolchain-funcs - -DESCRIPTION="Apache Kafka C/C++ client library" -HOMEPAGE="https://github.com/confluentinc/librdkafka" - -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="https://github.com/confluentinc/${PN}.git" - - inherit git-r3 -else - SRC_URI="https://github.com/confluentinc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86" -fi - -LICENSE="BSD-2" - -# subslot = soname version -SLOT="0/1" - -IUSE="lz4 sasl ssl static-libs zstd" - -LIB_DEPEND=" - lz4? ( app-arch/lz4:=[static-libs(+)] ) - sasl? ( dev-libs/cyrus-sasl:=[static-libs(+)] ) - ssl? ( dev-libs/openssl:0=[static-libs(+)] ) - zstd? ( app-arch/zstd:=[static-libs(+)] ) - sys-libs/zlib:=[static-libs(+)] -" -# which: https://github.com/confluentinc/librdkafka/pull/4353 -BDEPEND=" - sys-apps/which - virtual/pkgconfig - ${PYTHON_DEPS} -" - -RDEPEND="!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )" - -DEPEND=" - ${RDEPEND} - static-libs? ( ${LIB_DEPEND} ) -" - -pkg_setup() { - python-any-r1_pkg_setup -} - -src_prepare() { - default - - if [[ ${PV} != "9999" ]]; then - sed -i \ - -e "s/^\(export RDKAFKA_GITVER=\).*/\1\"${PV}@release\"/" \ - tests/run-test.sh || die - fi -} - -src_configure() { - tc-export AR CC CXX LD NM OBJDUMP PKG_CONFIG STRIP - - local myeconf=( - --prefix="${EPREFIX}/usr" - --build="${CBUILD}" - --host="${CHOST}" - --mandir="${EPREFIX}/usr/share/man" - --infodir="${EPREFIX}/usr/share/info" - --datadir="${EPREFIX}/usr/share" - --sysconfdir="${EPREFIX}/etc" - --localstatedir="${EPREFIX}/var" - --libdir="${EPREFIX}/usr/$(get_libdir)" - --no-cache - --no-download - --disable-debug-symbols - $(use_enable lz4) - $(use_enable sasl) - $(usex static-libs '--enable-static' '') - $(use_enable ssl) - $(use_enable zstd) - ) - - ./configure ${myeconf[@]} || die -} - -src_test() { - # Simulate CI so we do not fail when tests are running longer than expected, - # https://github.com/confluentinc/librdkafka/blob/v1.6.1/tests/0062-stats_event.c#L101-L116 - local -x CI=true - - emake -C tests run_local -} - -src_install() { - emake -j1 \ - DESTDIR="${D}" \ - docdir="/usr/share/doc/${PF}" \ - install - - if ! use static-libs; then - find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die - fi -} diff --git a/dev-libs/librdkafka/librdkafka-2.1.1.ebuild b/dev-libs/librdkafka/librdkafka-2.1.1.ebuild deleted file mode 100644 index b58580b204e0..000000000000 --- a/dev-libs/librdkafka/librdkafka-2.1.1.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="8" - -PYTHON_COMPAT=( python3_{9..11} ) - -inherit python-any-r1 toolchain-funcs - -DESCRIPTION="Apache Kafka C/C++ client library" -HOMEPAGE="https://github.com/confluentinc/librdkafka" - -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="https://github.com/confluentinc/${PN}.git" - - inherit git-r3 -else - SRC_URI="https://github.com/confluentinc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86" -fi - -LICENSE="BSD-2" - -# subslot = soname version -SLOT="0/1" - -IUSE="lz4 sasl ssl static-libs zstd" - -LIB_DEPEND=" - lz4? ( app-arch/lz4:=[static-libs(+)] ) - sasl? ( dev-libs/cyrus-sasl:=[static-libs(+)] ) - ssl? ( dev-libs/openssl:0=[static-libs(+)] ) - zstd? ( app-arch/zstd:=[static-libs(+)] ) - sys-libs/zlib:=[static-libs(+)] -" -# which: https://github.com/confluentinc/librdkafka/pull/4353 -BDEPEND=" - sys-apps/which - virtual/pkgconfig - ${PYTHON_DEPS} -" - -RDEPEND="!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )" - -DEPEND=" - ${RDEPEND} - static-libs? ( ${LIB_DEPEND} ) -" - -pkg_setup() { - python-any-r1_pkg_setup -} - -src_prepare() { - default - - if [[ ${PV} != "9999" ]]; then - sed -i \ - -e "s/^\(export RDKAFKA_GITVER=\).*/\1\"${PV}@release\"/" \ - tests/run-test.sh || die - fi -} - -src_configure() { - tc-export AR CC CXX LD NM OBJDUMP PKG_CONFIG STRIP - - local myeconf=( - --prefix="${EPREFIX}/usr" - --build="${CBUILD}" - --host="${CHOST}" - --mandir="${EPREFIX}/usr/share/man" - --infodir="${EPREFIX}/usr/share/info" - --datadir="${EPREFIX}/usr/share" - --sysconfdir="${EPREFIX}/etc" - --localstatedir="${EPREFIX}/var" - --libdir="${EPREFIX}/usr/$(get_libdir)" - --no-cache - --no-download - --disable-debug-symbols - $(use_enable lz4) - $(use_enable sasl) - $(usex static-libs '--enable-static' '') - $(use_enable ssl) - $(use_enable zstd) - ) - - ./configure ${myeconf[@]} || die -} - -src_test() { - # Simulate CI so we do not fail when tests are running longer than expected, - # https://github.com/confluentinc/librdkafka/blob/v1.6.1/tests/0062-stats_event.c#L101-L116 - local -x CI=true - - emake -C tests run_local -} - -src_install() { - emake -j1 \ - DESTDIR="${D}" \ - docdir="/usr/share/doc/${PF}" \ - install - - if ! use static-libs; then - find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die - fi -} diff --git a/dev-libs/librdkafka/librdkafka-2.2.0-r1.ebuild b/dev-libs/librdkafka/librdkafka-2.2.0-r1.ebuild index bcc0c17af6ab..86c99f805fc2 100644 --- a/dev-libs/librdkafka/librdkafka-2.2.0-r1.ebuild +++ b/dev-libs/librdkafka/librdkafka-2.2.0-r1.ebuild @@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]]; then inherit git-r3 else SRC_URI="https://github.com/confluentinc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" + KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86" fi LICENSE="BSD-2" @@ -45,6 +45,7 @@ RDEPEND="net-misc/curl DEPEND=" ${RDEPEND} + elibc_musl? ( sys-libs/queue-standalone ) static-libs? ( ${LIB_DEPEND} ) " diff --git a/dev-libs/librdkafka/librdkafka-2.2.0.ebuild b/dev-libs/librdkafka/librdkafka-2.2.0.ebuild deleted file mode 100644 index c22046c164f6..000000000000 --- a/dev-libs/librdkafka/librdkafka-2.2.0.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="8" - -PYTHON_COMPAT=( python3_{9..12} ) - -inherit python-any-r1 toolchain-funcs - -DESCRIPTION="Apache Kafka C/C++ client library" -HOMEPAGE="https://github.com/confluentinc/librdkafka" - -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="https://github.com/confluentinc/${PN}.git" - - inherit git-r3 -else - SRC_URI="https://github.com/confluentinc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86" -fi - -LICENSE="BSD-2" - -# subslot = soname version -SLOT="0/1" - -IUSE="lz4 sasl ssl static-libs zstd" - -LIB_DEPEND=" - lz4? ( app-arch/lz4:=[static-libs(+)] ) - sasl? ( dev-libs/cyrus-sasl:=[static-libs(+)] ) - ssl? ( dev-libs/openssl:0=[static-libs(+)] ) - zstd? ( app-arch/zstd:=[static-libs(+)] ) - sys-libs/zlib:=[static-libs(+)] -" -# which: https://github.com/confluentinc/librdkafka/pull/4353 -BDEPEND=" - sys-apps/which - virtual/pkgconfig - ${PYTHON_DEPS} -" - -RDEPEND="net-misc/curl - !static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )" - -DEPEND=" - ${RDEPEND} - static-libs? ( ${LIB_DEPEND} ) -" - -pkg_setup() { - python-any-r1_pkg_setup -} - -src_prepare() { - default - - if [[ ${PV} != "9999" ]]; then - sed -i \ - -e "s/^\(export RDKAFKA_GITVER=\).*/\1\"${PV}@release\"/" \ - tests/run-test.sh || die - fi -} - -src_configure() { - tc-export AR CC CXX LD NM OBJDUMP PKG_CONFIG STRIP - - local myeconf=( - --prefix="${EPREFIX}/usr" - --build="${CBUILD}" - --host="${CHOST}" - --mandir="${EPREFIX}/usr/share/man" - --infodir="${EPREFIX}/usr/share/info" - --datadir="${EPREFIX}/usr/share" - --sysconfdir="${EPREFIX}/etc" - --localstatedir="${EPREFIX}/var" - --libdir="${EPREFIX}/usr/$(get_libdir)" - --no-cache - --no-download - --disable-debug-symbols - $(use_enable lz4) - $(use_enable sasl) - $(usex static-libs '--enable-static' '') - $(use_enable ssl) - $(use_enable zstd) - ) - - ./configure ${myeconf[@]} || die -} - -src_test() { - # Simulate CI so we do not fail when tests are running longer than expected, - # https://github.com/confluentinc/librdkafka/blob/v1.6.1/tests/0062-stats_event.c#L101-L116 - local -x CI=true - - emake -C tests run_local -} - -src_install() { - emake -j1 \ - DESTDIR="${D}" \ - docdir="/usr/share/doc/${PF}" \ - install - - if ! use static-libs; then - find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die - fi -} diff --git a/dev-libs/libretls/libretls-3.8.1.ebuild b/dev-libs/libretls/libretls-3.8.1.ebuild index 988269d3cce4..8dd27de640a8 100644 --- a/dev-libs/libretls/libretls-3.8.1.ebuild +++ b/dev-libs/libretls/libretls-3.8.1.ebuild @@ -3,6 +3,8 @@ EAPI=8 +inherit libtool + DESCRIPTION="Port of libtls from LibreSSL to OpenSSL" HOMEPAGE="https://git.causal.agency/libretls/about/" SRC_URI="https://causal.agency/libretls/${P}.tar.gz" @@ -21,6 +23,18 @@ BDEPEND=" virtual/pkgconfig " +QA_CONFIG_IMPL_DECL_SKIP+=( + # checks for va_copy and __va_copy as a fallback, ignores result of + # latter if former exists. The latter is private and doesn't exist + # on musl; ignore it since it doesn't even matter. bug #906534 + __va_copy +) + +src_prepare() { + default + elibtoolize +} + src_install() { default find "${ED}" -name '*.la' -delete || die diff --git a/dev-libs/libsecp256k1/Manifest b/dev-libs/libsecp256k1/Manifest index d2b9249101ad..d00b8ba77df6 100644 --- a/dev-libs/libsecp256k1/Manifest +++ b/dev-libs/libsecp256k1/Manifest @@ -3,5 +3,6 @@ DIST libsecp256k1-0.3.1.tar.gz 2560292 BLAKE2B 70ff57e222dd47d0e63a40653d4e7b4e7 DIST libsecp256k1-0.3.2.tar.gz 2566680 BLAKE2B bf0a5ac1edbc115247148912822a2cefe798651f6c6a480422eee90eba96ebbfba772d561e321ac2bf7a0f8261f8ccd9f3af0e66e196f1e861aa550ee1303f27 SHA512 18104b72dd5d1f5e776d72c31c36247e450736437b453b59cf6ec86f84fedeafcf231e266c1ddad727befd9864c65a779000d01e6cef4b9a6485850afebc8a81 DIST libsecp256k1-0.4.0.tar.gz 2607093 BLAKE2B abbd68580e5e35478d74cad13e0e55a175d2000a0a071dc0812655a47ee262572c1e6944d2d5c8f3dd2b798a72e90be7b64d76f7be25e85ba2471e03254a8fb0 SHA512 84cc115a74d39bc4173012f321ae13195ae92bb96f1dcdcb01fe8392fd5b2437addfa63a1654d07f70e67f0ea6e27978134196442b9ae25bc6f9159ee9ef6527 DIST libsecp256k1-0.4.1.tar.gz 2614189 BLAKE2B 50de3e2699afa6b80aa64b9c593a6eff98d779706fde3cbb9b54ae0b596c584538abfc9f6d03cdcfd92e6df46db287049a83609e4f5dbb197fd067202f728810 SHA512 68d057d6820ca77006a16d6997c1e8240480b2d6e8d6a4d68188c699c476b71a46850dd3bc217e53a2ebd518b4db37d669058d2104d89cb2a356ba54892ad447 +DIST libsecp256k1-0.5.0.tar.gz 1960832 BLAKE2B 118e3bb1d8e0a4493debae3b1feb68ff5a93348bbed32486779416cc2359dd65d8cfaa7bb47afca8b4ddb214b7ce05c9997896fd256ad73df35ec51a8966fe69 SHA512 b8511b0d8b581d371ee48f2c8a5a72930e7a0686a860200e56e83e2f58a63f2d781af75829d922e98f6648d361e20efde29abcf52c086b77647457c6c3586e78 DIST libsecp256k1-v0.1_pre20190401.tgz 166663 BLAKE2B 68c9fc3fda6af56452f32edeae5dcb5a92f68bc3fb39a397c532951c6392347df14ea0347bbe05cab43158512e0d9f5ea87bd8f69bece1b04440860ebb8065ee SHA512 8c4945e93cb5ff241482ba4426b25162a7ae3b26860edc10c91d06b1c396887202ad971f4d38e035828352531b87fc29087a12b675e43da44f23c9ea3b6c0cc8 DIST libsecp256k1-v0.1_pre20201028.tgz 200051 BLAKE2B 90d636049b411e02703feb2661006900a55f952f60e76e2b7147a5afe8e391a06a80d6ae1489b1e7f2382176c7ea831526465a85bca09156dc6d37b417fcb33b SHA512 54a0fa21b64dd6836e4227de51f3539afe06e0e2f352683397d6adb5dd0508af443d2e25f91e90e1ae366b261965fe7d438292314705baee799cf37421644958 diff --git a/dev-libs/libsecp256k1/libsecp256k1-0.5.0.ebuild b/dev-libs/libsecp256k1/libsecp256k1-0.5.0.ebuild new file mode 100644 index 000000000000..8552fa52421f --- /dev/null +++ b/dev-libs/libsecp256k1/libsecp256k1-0.5.0.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +MyPN=secp256k1 + +DESCRIPTION="Optimized C library for EC operations on curve secp256k1" +HOMEPAGE="https://github.com/bitcoin-core/secp256k1" +SRC_URI="https://github.com/bitcoin-core/secp256k1/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +S="${WORKDIR}/${MyPN}-${PV}" + +LICENSE="MIT" +SLOT="0/2" # subslot is "$((_LIB_VERSION_CURRENT-_LIB_VERSION_AGE))" from configure.ac +KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +IUSE="+asm +ecdh +ellswift experimental +extrakeys lowmem +recovery +schnorr test valgrind" +RESTRICT="!test? ( test )" + +REQUIRED_USE=" + asm? ( || ( amd64 arm ) arm? ( experimental ) ) + schnorr? ( extrakeys ) +" +BDEPEND=" + dev-build/autoconf-archive + virtual/pkgconfig + valgrind? ( dev-debug/valgrind ) +" + +PATCHES=( + "${FILESDIR}/0.4.0-fix-cross-compile.patch" +) + +src_prepare() { + default + eautoreconf + + # Generate during build + rm -f src/precomputed_ecmult.c src/precomputed_ecmult_gen.c || die +} + +src_configure() { + local myeconfargs=( + --disable-benchmark + $(use_enable experimental) + $(use_enable test tests) + $(use_enable test exhaustive-tests) + $(use_enable {,module-}ecdh) + $(use_enable {,module-}ellswift) + $(use_enable {,module-}extrakeys) + $(use_enable {,module-}recovery) + $(use_enable schnorr module-schnorrsig) + $(use_with asm asm "$(usex arm arm32 auto)") + $(usev lowmem '--with-ecmult-window=4 --with-ecmult-gen-kb=2') + $(use_with valgrind) + ) + econf "${myeconfargs[@]}" +} + +src_install() { + default + find "${ED}" -name '*.la' -delete || die +} diff --git a/dev-libs/libserdes/metadata.xml b/dev-libs/libserdes/metadata.xml index db463f3eeb66..ad2a4b15b4c8 100644 --- a/dev-libs/libserdes/metadata.xml +++ b/dev-libs/libserdes/metadata.xml @@ -5,4 +5,7 @@ <email>williamh@gentoo.org</email> <name>William Hubbs</name> </maintainer> + <upstream> + <remote-id type="github">confluentinc/libserdes</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-libs/libsigc++/Manifest b/dev-libs/libsigc++/Manifest index 7e682adae929..399171deb23e 100644 --- a/dev-libs/libsigc++/Manifest +++ b/dev-libs/libsigc++/Manifest @@ -1,3 +1,2 @@ DIST libsigc++-2.12.0.tar.xz 5002560 BLAKE2B f4d42dfbac95be974a5e49a7bcfd4c97fb0423f5bcc9d0bda79e6cee6bab54ae77969a3e5c58094264068c38212a0ff66b3dae2a519c4101bdfa170e94767641 SHA512 88e382e274a574a4b6129e23916054642e1696c663a4bb84f05e14a401f0cb56d0a0bf8c3a6273aec36ce121ce18a338b6d491fb213bcdf5a627bd382719e021 -DIST libsigc++-3.4.0.tar.xz 949316 BLAKE2B f12e8199333f5d23827a33718e884835af79ae90f3aa9d71944b5277783f171ed17b81453b46ee9c46e945f3fd6f5152707723dfdc471c992375f0efb6a253ef SHA512 1677d5151db5e74388d8ba4f5cf316f1e5c92aa380c0725ea62ee41f10f549296d528a8998dfa4767ca699782c93f756c072de9e0e07e52307f61ff72c952fe4 DIST libsigc++-3.6.0.tar.xz 991392 BLAKE2B b060d6437ac1253d9a58971a5b5e6203691f3718b1fb220a47a9f1a73fdcce746a036c0193743bdda8cc2d0ed722a84eda4a53f2449606f6f190771d0543b61d SHA512 fa79067b4fecf68501288b93eed3d3e7017899cb8a02d3106a41f6dd1818f7b8c724a5b38d4b9ac89699fd8084976f9ad8eca8e832a45a5b6dc7cae5db99cb56 diff --git a/dev-libs/libsigc++/libsigc++-3.4.0.ebuild b/dev-libs/libsigc++/libsigc++-3.4.0.ebuild deleted file mode 100644 index 38c4be7f1d0c..000000000000 --- a/dev-libs/libsigc++/libsigc++-3.4.0.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -inherit gnome.org flag-o-matic meson-multilib - -DESCRIPTION="Typesafe callback system for standard C++" -HOMEPAGE="https://libsigcplusplus.github.io/libsigcplusplus/ - https://github.com/libsigcplusplus/libsigcplusplus" - -LICENSE="LGPL-2.1+" -SLOT="3" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="gtk-doc test" -RESTRICT="!test? ( test )" - -BDEPEND=" - gtk-doc? ( - app-text/doxygen[dot] - dev-lang/perl - dev-libs/libxslt - ) -" - -multilib_src_configure() { - filter-flags -fno-exceptions #84263 - - local emesonargs=( - -Dbuild-examples=false - $(meson_native_use_bool gtk-doc build-documentation) - $(meson_use test build-tests) - ) - meson_src_configure -} - -multilib_src_install_all() { - # Note: html docs are installed into /usr/share/doc/libsigc++-3.0 - # We can't use /usr/share/doc/${PF} because of links from glibmm etc. docs - :; -} diff --git a/dev-libs/libsigc++/libsigc++-3.6.0.ebuild b/dev-libs/libsigc++/libsigc++-3.6.0.ebuild index 561412f738b9..38c4be7f1d0c 100644 --- a/dev-libs/libsigc++/libsigc++-3.6.0.ebuild +++ b/dev-libs/libsigc++/libsigc++-3.6.0.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://libsigcplusplus.github.io/libsigcplusplus/ LICENSE="LGPL-2.1+" SLOT="3" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="gtk-doc test" RESTRICT="!test? ( test )" diff --git a/dev-libs/libsodium/Manifest b/dev-libs/libsodium/Manifest index e2368db28f37..4d9f70e54033 100644 --- a/dev-libs/libsodium/Manifest +++ b/dev-libs/libsodium/Manifest @@ -1,6 +1,4 @@ -DIST libsodium-1.0.18_p20220618.tar.gz 1869858 BLAKE2B 60d46f722c4e5c9896226e3e03c31768a2183bae80a535234b23ac5bc9a2c3632d6c891ce72cbc1d6dc633a15b539111e322c2d210f993f99d6e5bd32f8a8b63 SHA512 14d1c6109de2ac02ba6cb5541746275f6deb25302b60cb3f65a7922b34d2c3bd5f17a4d730acf77a53d5837be00228c68fa06c6a2e9095ea97f6d8c4b782ab6b -DIST libsodium-1.0.18_p20220618.tar.gz.minisig 318 BLAKE2B a2cba3c62ca5a84e7897373cdfe4033c636c652c848bf9beff15765d359f1dd2a8834dc3a4d4443d0b9418a59a94309cf9c5c917ae9c8965778411e21f98e4e6 SHA512 ca1ac892b41c5cb6dd1ba9d4bbde8e75987e66023d29cfc81839bbb3b99efa215f7db1ef903c375dd9d2d5a76f6064b3c7eab833081d21983693b7db87175160 -DIST libsodium-1.0.19.tar.gz 1945523 BLAKE2B de43520150b55760142d186404cc3e49471c6e911a7a590c7ae08bc61e928c063c459555f49cd88155238fb0008ef3924b6d7c14ba9cff2f90f1e96201e1259c SHA512 8e9b6d796f6330e00921ce37f1b43545966094250938626ae227deef5fd1279f2fc18b5cd55e23484732a27df4d919cf0d2f07b9c2f1aa0c0ef689e668b0d439 -DIST libsodium-1.0.19.tar.gz.minisig 318 BLAKE2B e86e653107478d9e9281894632baafda57358229f2d56fcaf55591098e38d6be72ed2f599a7f2c16d5b9978d2cbfe8e07db4e772b053a832a61fd325fc1efae4 SHA512 8b5993bd7e541a5913ea1659c1009c4edefd9b5907e0a7c9090fa604c23d77006ad9d9a897d66243162742d63ce9bc1f2c81091d50a584f1495dd3bd87d4451e DIST libsodium-1.0.19_p20240117.tar.gz 1946650 BLAKE2B 6faa56733ed28f34d58b41a71a41d6ba6369e2f5686e01169f83d5fe955523825bd250cfd59e15515b24f67cef1610af41749b6f56bc370e7f77708a86bd7684 SHA512 2cefd883b60fba5522bf4a6f3c73f9bc54164340400377089eea8fbb01447f1137fcb7f6183845a6c5e2aad51982122a356272b4eda5452d7b550a65aa576140 DIST libsodium-1.0.19_p20240117.tar.gz.minisig 318 BLAKE2B f951b547f53b2569ed1493dcdbff1cc93519437f56cdf97a764d61a7e1fa98b383b49d4f4a9c4b7b199e2060037971f293796e641bd689c9cd6c7ae2c90b7a20 SHA512 202f9686fabcb7b362923b7f1eeac8544c5f21e7eaa0b4cdd7329733a62a5ec9efd18713bc63187055149525a066540a6904776870d718fd3b238b71ba4b9a35 +DIST libsodium-1.0.20.tar.gz 1925167 BLAKE2B 2f1d8b2dc8a65f95433132b12bdccb7e0e4750326b05c4f42ddd3a74bf568faa2515384bfe94bba2ef420aff35c515d3d44945ea5a68f72e6a73b3a9b5bb234c SHA512 7ea165f3c1b1609790e30a16348b9dfdc5731302da00c07c65e125c8ab115c75419a5631876973600f8a4b560ca2c8267001770b68f2eb3eebc9ba095d312702 +DIST libsodium-1.0.20.tar.gz.minisig 318 BLAKE2B b5939a9ca9b25332c39484b3ef02ced54aa75b2dc732d384d4f42daa0b6bd276f0c3359a8cbe8c97d8ab76b8c49e9f66959dcf350e3cf00fae10a279826109ae SHA512 fc5a4282093d58eb42559f88ccf75ea3788449afda9d882d313714e448e78ef11c22ff1e52091af026f6bf3ba01917d606040b1dca240dd1a32278c901b4affb diff --git a/dev-libs/libsodium/files/libsodium-1.0.10-cpuflags.patch b/dev-libs/libsodium/files/libsodium-1.0.10-cpuflags.patch deleted file mode 100644 index e03a703d7fae..000000000000 --- a/dev-libs/libsodium/files/libsodium-1.0.10-cpuflags.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -344,6 +344,10 @@ - [AC_MSG_RESULT(no)]) - CFLAGS="$oldcflags" - -+AC_ARG_ENABLE(sse4_1, [AS_HELP_STRING(--disable-sse4_1,Do not use sse4.1 code)], -+ AS_IF([test "x$enableval" = "xyes"], check_sse4_1="yes", check_sse4_1="no"), -+ check_sse4_1="yes") -+AS_IF([test "$check_sse4_1" = "yes"],[ - oldcflags="$CFLAGS" - AX_CHECK_COMPILE_FLAG([-msse4.1], [CFLAGS="$CFLAGS -msse4.1"]) - AC_MSG_CHECKING(for SSE4.1 instructions set) -@@ -356,6 +360,7 @@ - AX_CHECK_COMPILE_FLAG([-msse4.1], [CFLAGS_SSE41="-msse4.1"])], - [AC_MSG_RESULT(no)]) - CFLAGS="$oldcflags" -+ ]) - - oldcflags="$CFLAGS" - AX_CHECK_COMPILE_FLAG([-mavx], [CFLAGS="$CFLAGS -mavx"]) -@@ -393,6 +398,10 @@ - [AC_MSG_RESULT(no)]) - CFLAGS="$oldcflags" - -+AC_ARG_ENABLE(aesni, [AS_HELP_STRING(--disable-aesni,Do not use aesni code)], -+ AS_IF([test "x$enableval" = "xyes"], check_aesni="yes", check_aesni="no"), -+ check_aesni="yes") -+AS_IF([test "$check_aesni" = "yes"],[ - oldcflags="$CFLAGS" - AX_CHECK_COMPILE_FLAG([-maes], [CFLAGS="$CFLAGS -maes"]) - AX_CHECK_COMPILE_FLAG([-mpclmul], [CFLAGS="$CFLAGS -mpclmul"]) -@@ -410,6 +419,7 @@ - ], - [AC_MSG_RESULT(no)]) - CFLAGS="$oldcflags" -+ ]) - - ]) - diff --git a/dev-libs/libsodium/libsodium-1.0.18_p20220618.ebuild b/dev-libs/libsodium/libsodium-1.0.18_p20220618.ebuild deleted file mode 100644 index bcd05ad21ed0..000000000000 --- a/dev-libs/libsodium/libsodium-1.0.18_p20220618.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libsodium.minisig -VERIFY_SIG_METHOD=minisig -inherit autotools multilib-minimal verify-sig - -DESCRIPTION="Portable fork of NaCl, a higher-level cryptographic library" -HOMEPAGE="https://libsodium.org" - -if [[ ${PV} == *_p* ]] ; then - MY_P=${PN}-$(ver_cut 1-3)-stable-$(ver_cut 5-) - - # We use _pN to represent 'stable releases' - # These are backports from upstream to the last release branch - # See https://download.libsodium.org/libsodium/releases/README.html - SRC_URI=" - https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_P}.tar.gz -> ${P}.tar.gz - verify-sig? ( https://dev.gentoo.org/~sam/distfiles/dev-libs/libsodium/${MY_P}.tar.gz.minisig -> ${P}.tar.gz.minisig ) - " -else - SRC_URI=" - https://download.libsodium.org/${PN}/releases/${P}.tar.gz - verify-sig? ( https://download.libsodium.org/${PN}/releases/${P}.tar.gz.minisig ) - " -fi - -S="${WORKDIR}"/${PN}-stable - -LICENSE="ISC" -SLOT="0/23" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos" -IUSE="+asm minimal static-libs +urandom" - -CPU_USE=( cpu_flags_x86_{aes,sse4_1} ) -IUSE+=" ${CPU_USE[@]}" - -BDEPEND=" verify-sig? ( sec-keys/minisig-keys-libsodium )" - -PATCHES=( - "${FILESDIR}"/${PN}-1.0.10-cpuflags.patch -) - -src_prepare() { - default - - eautoreconf -} - -multilib_src_configure() { - local myeconfargs=( - $(use_enable asm) - $(use_enable cpu_flags_x86_aes aesni) - $(use_enable cpu_flags_x86_sse4_1 sse4_1) - $(use_enable minimal) - $(use_enable static-libs static) - $(use_enable !urandom blocking-random) - ) - - # --disable-pie is needed on x86, see bug #512734 - # TODO: Check if still needed? - if [[ ${ABI} == x86 ]] ; then - myeconfargs+=( --disable-pie ) - fi - - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_install_all() { - default - find "${ED}" -type f -name "*.la" -delete || die -} diff --git a/dev-libs/libsodium/libsodium-1.0.19-r1.ebuild b/dev-libs/libsodium/libsodium-1.0.19-r1.ebuild deleted file mode 100644 index 575daa8a5059..000000000000 --- a/dev-libs/libsodium/libsodium-1.0.19-r1.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-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/libsodium.minisig -VERIFY_SIG_METHOD=minisig -inherit autotools multilib-minimal verify-sig - -DESCRIPTION="Portable fork of NaCl, a higher-level cryptographic library" -HOMEPAGE="https://libsodium.org" - -if [[ ${PV} == *_p* ]] ; then - MY_P=${PN}-$(ver_cut 1-3)-stable-$(ver_cut 5-) - - # We use _pN to represent 'stable releases' - # These are backports from upstream to the last release branch - # See https://download.libsodium.org/libsodium/releases/README.html - SRC_URI=" - https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_P}.tar.gz -> ${P}.tar.gz - verify-sig? ( https://dev.gentoo.org/~sam/distfiles/dev-libs/libsodium/${MY_P}.tar.gz.minisig -> ${P}.tar.gz.minisig ) - " -else - SRC_URI=" - https://download.libsodium.org/${PN}/releases/${P}.tar.gz - verify-sig? ( https://download.libsodium.org/${PN}/releases/${P}.tar.gz.minisig ) - " -fi - -S="${WORKDIR}"/${PN}-stable - -LICENSE="ISC" -SLOT="0/26" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos" -IUSE="+asm minimal static-libs +urandom" - -CPU_USE=( cpu_flags_x86_{aes,sse4_1} ) -IUSE+=" ${CPU_USE[@]}" - -BDEPEND=" verify-sig? ( sec-keys/minisig-keys-libsodium )" - -PATCHES=( - "${FILESDIR}"/${PN}-1.0.10-cpuflags.patch -) - -src_prepare() { - default - - eautoreconf -} - -multilib_src_configure() { - local myeconfargs=( - $(use_enable asm) - $(use_enable cpu_flags_x86_aes aesni) - $(use_enable cpu_flags_x86_sse4_1 sse4_1) - $(use_enable minimal) - $(use_enable static-libs static) - $(use_enable !urandom blocking-random) - ) - - # --disable-pie is needed on x86, see bug #512734 - # TODO: Check if still needed? - if [[ ${ABI} == x86 ]] ; then - myeconfargs+=( --disable-pie ) - fi - - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_install_all() { - default - find "${ED}" -type f -name "*.la" -delete || die -} diff --git a/dev-libs/libsodium/libsodium-1.0.19_p20240117.ebuild b/dev-libs/libsodium/libsodium-1.0.19_p20240117.ebuild index bb62d58a0e8c..3654a117b23e 100644 --- a/dev-libs/libsodium/libsodium-1.0.19_p20240117.ebuild +++ b/dev-libs/libsodium/libsodium-1.0.19_p20240117.ebuild @@ -31,7 +31,7 @@ S="${WORKDIR}"/${PN}-stable LICENSE="ISC" SLOT="0/26" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos" IUSE="+asm static-libs +urandom" CPU_USE=( cpu_flags_x86_{aes,sse4_1} ) diff --git a/dev-libs/libsodium/libsodium-1.0.19-r2.ebuild b/dev-libs/libsodium/libsodium-1.0.20.ebuild index 476c85b1202a..35a5bc16739b 100644 --- a/dev-libs/libsodium/libsodium-1.0.19-r2.ebuild +++ b/dev-libs/libsodium/libsodium-1.0.20.ebuild @@ -20,6 +20,7 @@ if [[ ${PV} == *_p* ]] ; then https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_P}.tar.gz -> ${P}.tar.gz verify-sig? ( https://dev.gentoo.org/~sam/distfiles/dev-libs/libsodium/${MY_P}.tar.gz.minisig -> ${P}.tar.gz.minisig ) " + S="${WORKDIR}"/${PN}-stable else SRC_URI=" https://download.libsodium.org/${PN}/releases/${P}.tar.gz @@ -27,11 +28,9 @@ else " fi -S="${WORKDIR}"/${PN}-stable - LICENSE="ISC" SLOT="0/26" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos" IUSE="+asm static-libs +urandom" CPU_USE=( cpu_flags_x86_{aes,sse4_1} ) @@ -39,8 +38,12 @@ IUSE+=" ${CPU_USE[@]}" BDEPEND=" verify-sig? ( sec-keys/minisig-keys-libsodium )" +QA_CONFIG_IMPL_DECL_SKIP=( + _rdrand64_step # depends on target, bug #924154 +) + PATCHES=( - "${FILESDIR}"/${PN}-1.0.10-cpuflags.patch + "${FILESDIR}"/${PN}-1.0.19-cpuflags.patch ) src_prepare() { diff --git a/dev-libs/libspnav/libspnav-0.2.3-r1.ebuild b/dev-libs/libspnav/libspnav-0.2.3-r1.ebuild index 34350b98da4a..b10f9ecccbb6 100644 --- a/dev-libs/libspnav/libspnav-0.2.3-r1.ebuild +++ b/dev-libs/libspnav/libspnav-0.2.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -8,7 +8,7 @@ inherit toolchain-funcs MY_PN='spacenav' DESCRIPTION="libspnav is a replacement for the magellan library with a cleaner API" HOMEPAGE="http://spacenav.sourceforge.net/" -SRC_URI="mirror://sourceforge/project/${MY_PN}/${MY_PN}%20library%20%28SDK%29/${PN}%20${PV}/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/project/${MY_PN}/${MY_PN}%20library%20%28SDK%29/${PN}%20${PV}/${P}.tar.gz" LICENSE="BSD" SLOT="0" KEYWORDS="amd64 ~arm ~arm64 ppc64 ~riscv x86" diff --git a/dev-libs/libthreadar/libthreadar-1.4.0.ebuild b/dev-libs/libthreadar/libthreadar-1.4.0.ebuild index 6fd22b2a4b63..f25dd5a27e7e 100644 --- a/dev-libs/libthreadar/libthreadar-1.4.0.ebuild +++ b/dev-libs/libthreadar/libthreadar-1.4.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021-2022 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,7 +7,7 @@ inherit autotools DESCRIPTION="Threading library used by dar archiver" HOMEPAGE="https://sourceforge.net/projects/libthreadar/" -SRC_URI="mirror://sourceforge/libthreadar/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/libthreadar/${P}.tar.gz" LICENSE="LGPL-3" SLOT="0" diff --git a/dev-libs/libtommath/Manifest b/dev-libs/libtommath/Manifest index 701ebd802e6a..433619a4f62c 100644 --- a/dev-libs/libtommath/Manifest +++ b/dev-libs/libtommath/Manifest @@ -1,2 +1 @@ -DIST ltm-1.2.0.tar.xz 622120 BLAKE2B 1537dad7da5c14264f03280e9d49fa0b7e6c1c4924c805f202d31c60569b9e3bee40674301d67b0f5b049c1c2dc5ec71b6c566ff5c9b8168d16840b031acc400 SHA512 6f9ccd0691831f07f86ddc81cb6145504b3d5da66dd3e92312c64cce0ea986fa4e08ba65ca8991aaebe56702c2d7c15f309696785b813dffb4c112a4ad04b203 DIST ltm-1.2.1.tar.xz 635728 BLAKE2B b1464843af4a33f2ba0c824fe2dd080227c6b761b3f8059bbc5229f36d601aecc8bcb20c386718c71a1bc01f69e532647689b43252bd15143f809f7072de449e SHA512 50c9459357aa7f5076af93de6701c617da0dbbf2230a2f4468062704a6cd6e9d3c2fbb27016f68a7e1d6b35d6ddb2088630b24ea6acc20ed8c19594913d36e95 diff --git a/dev-libs/libtommath/libtommath-1.2.0-r2.ebuild b/dev-libs/libtommath/libtommath-1.2.0-r2.ebuild deleted file mode 100644 index f17fc77a6642..000000000000 --- a/dev-libs/libtommath/libtommath-1.2.0-r2.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools toolchain-funcs - -DESCRIPTION="Optimized and portable routines for integer theoretic applications" -HOMEPAGE="https://www.libtom.net/" -SRC_URI="https://github.com/libtom/libtommath/releases/download/v${PV}/ltm-${PV}.tar.xz" - -LICENSE="Unlicense" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="doc examples static-libs" - -BDEPEND="dev-build/libtool" - -PATCHES=( - "${FILESDIR}"/${P}-sparc.patch -) - -src_prepare() { - default - - # need libtool for cross compilation, bug #376643 - cat <<-EOF > configure.ac - AC_INIT(libtommath, 0) - AM_INIT_AUTOMAKE - LT_INIT - AC_CONFIG_FILES(Makefile) - AC_OUTPUT - EOF - - touch NEWS README AUTHORS ChangeLog Makefile.am || die - - eautoreconf - - export LIBTOOL="${S}"/libtool -} - -src_configure() { - econf $(use_enable static-libs static) -} - -_emake() { - emake \ - CC="$(tc-getCC)" \ - AR="$(tc-getAR)" \ - RANLIB="$(tc-getRANLIB)" \ - IGNORE_SPEED=1 \ - DESTDIR="${ED}" \ - PREFIX="${EPREFIX}/usr" \ - LIBPATH="/usr/$(get_libdir)" \ - INCPATH="/usr/include" \ - "$@" -} - -src_compile() { - # Replace hard-coded libdir=${exec_prefix}/lib. - sed -i -e "/libdir=/s:/lib:/$(get_libdir):" libtommath.pc.in || die - - _emake -f makefile.shared -} - -src_test() { - # Tests must be built statically - # (i.e. without -f makefile.shared) - _emake test - - ./test || die -} - -src_install() { - _emake -f makefile.shared install - - if [[ ${CHOST} == *-darwin* ]] ; then - local path="usr/$(get_libdir)/libtommath.${PV}.dylib" - install_name_tool -id "${EPREFIX}/${path}" "${ED}/${path}" || die "Failed to adjust install_name" - fi - - # We only link against -lc, so drop the .la file. - find "${ED}" -name '*.la' -delete || die - if ! use static-libs ; then - find "${ED}" -name "*.a" -delete || die - fi - - dodoc changes.txt - - use doc && dodoc doc/*.pdf - - if use examples ; then - docinto demo - dodoc demo/*.c - fi -} diff --git a/dev-libs/libtraceevent/Manifest b/dev-libs/libtraceevent/Manifest index 195d6b5bee98..268f70c14099 100644 --- a/dev-libs/libtraceevent/Manifest +++ b/dev-libs/libtraceevent/Manifest @@ -1,3 +1,2 @@ -DIST libtraceevent-1.6.3.tar.gz 140072 BLAKE2B 416fa68e2604c3cc71323171b084261e38f08f630a03afda0e2ecc4860c8b08dae10b2abaa2afae54d2b4e382720b43a6616a9ab8599759de102af918eeb24fc SHA512 8064eb18dda6fdbff020759ed92e785b87d34be9ebc30cb6085785edeb8d7252cabf8d33d8738a3ec407672a3d891884d0f0b4c551fce26c76fa8eaf61b9e2f5 -DIST libtraceevent-1.7.2.tar.gz 148242 BLAKE2B 03eae9ea7a8cdf6b015af95031d6fbe8638361f8b0db836f48e9ef47c814465fad583440f80f0103e08758712bd24f7562e1a8678ab24d4a1749a0b88efa7a85 SHA512 aa6d14e6d2e8e64c7d53ba9f93d47331d5f1b5a5a624891ec18a08b0d4e3e82f7845d29957bb3fe4360151bb5870a67c69d5cb1f758bb2956d946221f186546e DIST libtraceevent-1.7.3.tar.gz 152363 BLAKE2B dcbca01f2246045f4f2377f91118e2468bca4344686b9e0349d04270543fea5648d5c227bdaf6e716d623bab8d03cec7a869bf67d03ca6a7836014854bbe40b8 SHA512 81302cb24a3fc71e8bd6a0ba975a2699eaa629ac0e90837bf8fc8e23e04156827d19b25544cdb506b0bf76d5f08699264c9ecb979f9218bdee6b0b0e7339b1e0 +DIST libtraceevent-1.8.2.tar.gz 155682 BLAKE2B afadd9f559bdc071b3741ce42b8bf0c320523f2b39c437bcf4180f277eb804c33b2feac447fae15a869164475fb5f019ef171b69be32c46b74e5f22a3ed3808b SHA512 52b7a23e8bf04feaa568199c99c98217fcb8df1b99d46197ef9edcea19b42e71ff9d2e6c45ebf5335ec782d636ad3d14be4acae5a9e5158650f5f62813081fa2 diff --git a/dev-libs/libtraceevent/libtraceevent-1.6.3.ebuild b/dev-libs/libtraceevent/libtraceevent-1.6.3.ebuild deleted file mode 100644 index 4be481f862ec..000000000000 --- a/dev-libs/libtraceevent/libtraceevent-1.6.3.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 2019-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit toolchain-funcs - -DESCRIPTION="Linux kernel trace event library" -HOMEPAGE="https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/" - -if [[ ${PV} =~ [9]{4,} ]]; then - EGIT_REPO_URI="git://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/" - inherit git-r3 -else - SRC_URI="https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/snapshot/${P}.tar.gz" - KEYWORDS="amd64 ~arm64 x86" -fi - -LICENSE="LGPL-2.1" -SLOT="0" -IUSE="doc" - -RDEPEND=" - !<dev-util/trace-cmd-3.0 -" -BDEPEND=" - doc? ( app-text/xmlto app-text/asciidoc ) -" - -src_configure() { - EMAKE_FLAGS=( - "prefix=${EPREFIX}/usr" - "libdir=${EPREFIX}/usr/$(get_libdir)" - "CC=$(tc-getCC)" - "AR=$(tc-getAR)" - VERBOSE=1 - ) -} - -src_compile() { - emake "${EMAKE_FLAGS[@]}" - use doc && emake doc -} - -src_install() { - emake "${EMAKE_FLAGS[@]}" DESTDIR="${ED}" install - # can't prevent installation of the static lib with parameters - rm "${ED}/usr/$(get_libdir)/libtraceevent.a" || die - use doc && emake "${EMAKE_FLAGS[@]}" DESTDIR="${ED}" install-doc -} diff --git a/dev-libs/libtraceevent/libtraceevent-1.7.2.ebuild b/dev-libs/libtraceevent/libtraceevent-1.7.2.ebuild deleted file mode 100644 index 7e83bab0bd27..000000000000 --- a/dev-libs/libtraceevent/libtraceevent-1.7.2.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 2019-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit toolchain-funcs - -DESCRIPTION="Linux kernel trace event library" -HOMEPAGE="https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/" - -if [[ ${PV} =~ [9]{4,} ]]; then - EGIT_REPO_URI="git://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/" - inherit git-r3 -else - SRC_URI="https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/snapshot/${P}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~riscv ~x86" -fi - -LICENSE="LGPL-2.1" -SLOT="0" -IUSE="doc test" -RESTRICT="!test? ( test )" - -RDEPEND=" - !<dev-util/trace-cmd-3.0 -" -BDEPEND=" - doc? ( - app-text/asciidoc - app-text/xmlto - ) - test? ( dev-util/cunit ) -" - -src_configure() { - EMAKE_FLAGS=( - "prefix=${EPREFIX}/usr" - "libdir=${EPREFIX}/usr/$(get_libdir)" - "CC=$(tc-getCC)" - "AR=$(tc-getAR)" - VERBOSE=1 - ) -} - -src_compile() { - emake "${EMAKE_FLAGS[@]}" - use doc && emake "${EMAKE_FLAGS[@]}" doc -} - -src_test() { - emake "${EMAKE_FLAGS[@]}" test -} - -src_install() { - emake "${EMAKE_FLAGS[@]}" DESTDIR="${ED}" install - # can't prevent installation of the static lib with parameters - rm "${ED}/usr/$(get_libdir)/libtraceevent.a" || die - use doc && emake "${EMAKE_FLAGS[@]}" DESTDIR="${ED}" install-doc -} diff --git a/dev-libs/libtraceevent/libtraceevent-1.8.2.ebuild b/dev-libs/libtraceevent/libtraceevent-1.8.2.ebuild new file mode 100644 index 000000000000..4fa3852012cb --- /dev/null +++ b/dev-libs/libtraceevent/libtraceevent-1.8.2.ebuild @@ -0,0 +1,48 @@ +# Copyright 2019-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson + +DESCRIPTION="Linux kernel trace event library" +HOMEPAGE="https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/" + +if [[ ${PV} =~ [9]{4,} ]]; then + EGIT_REPO_URI="git://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/" + inherit git-r3 +else + SRC_URI="https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/snapshot/${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" +fi + +LICENSE="LGPL-2.1" +SLOT="0" +IUSE="doc test" +RESTRICT="!test? ( test )" + +RDEPEND=" + !<dev-util/trace-cmd-3.0 +" +BDEPEND=" + app-text/asciidoc + app-text/xmlto + test? ( dev-util/cunit ) +" + +src_configure() { + local emesonargs=( + -Dasciidoctor=false + -Ddoc=$(usex doc true false) + ) + + # TODO: get docs & tests optional upstream + meson_src_configure +} + +src_install() { + # TODO: get docs & tests optional upstream + meson_src_install + + find "${ED}" -type f -name '*.a' -delete || die +} diff --git a/dev-libs/libtracefs/Manifest b/dev-libs/libtracefs/Manifest index 234705e75a8f..fcc9ea55ab68 100644 --- a/dev-libs/libtracefs/Manifest +++ b/dev-libs/libtracefs/Manifest @@ -1,4 +1,2 @@ -DIST libtracefs-1.6.1.tar.gz 193086 BLAKE2B 53f6740c7f06e1d618594e03ec7fbda273bbeb87bfda67acfad1e1670fd69670187c7267af1abcd1502c338499dc8d4ffe28a213b3ad17ff5a6e2b435c1c242f SHA512 9fa9b470869bdc0134cc72eb7a9e0131638c3416d24e403c7fc819d49a5e521ca8c852ece4ac87d6a744c32846a2567c44c1e3b8b329f77db2d89e57c9e36340 -DIST libtracefs-1.6.3.tar.gz 193859 BLAKE2B 89029e59590f4e25c5d39d5b638c381e966e8dee055bf7873492a6cdc8b1e1df90cad84a8db4e1abcacbc43fbb23c9fefbdb53123a409a19d07925e7a39efcdb SHA512 273d008644b5d205def79fa8c1db51f21327c02abee16dfc706cfa7ad421be111ac3280b2dd493a8be5f4d9f2fdcb471d7de17e6b3e56df7cb2f1a11b4e1bfaa -DIST libtracefs-1.6.4.tar.gz 193967 BLAKE2B 24ca0affbd3343429c096795ea25fca6b96c5e806fff197149db290a4b3ed4ad642738a74d395c025b2a5813d9a14ada9b36be8bc0bdbc31d110542fb49ce1ae SHA512 0db20393272ce75c9132fc189993929545f41ac00cc9b0fdbb6adcb4bcda41433f05c047d06d9774f9b00b9e3ed3cfed3879e75365e72c0bb705cf16449e06c4 DIST libtracefs-1.7.0.tar.gz 205716 BLAKE2B 7e11ed75e65ddfb6e95fa67db2d3a3000e722108b6cb9d8efe7f057bf96afa608f0452e42090dab077b59044d3cbaebf2e4361812b994943964ea611b0ec6a49 SHA512 8b95c798a9013c0278da1c68ab4625446e1cc9d437eed91a6ce16660e7787f0af04ab65ce0dba536039f2facca39c50df5e45335b1af630e7bcce70b584e2f0c +DIST libtracefs-1.8.0.tar.gz 224662 BLAKE2B 06ee6872ec5cd6c671ee2ddd3de19356ffa560b3ae20318e36be6a95bfe37bf61233841e32c530ab0a3463d13dd57ff1b09bba296663b25d76da2a2ea3e89f51 SHA512 2d9728186de63f03a2222d56efe6b373c038519ad1e81dd10d97640c296696df6b0661743dcd9e851edda5225342ea10a8746434439f7ad878e26780b797eb6c diff --git a/dev-libs/libtracefs/files/libtracefs-1.8.0-mmap.patch b/dev-libs/libtracefs/files/libtracefs-1.8.0-mmap.patch new file mode 100644 index 000000000000..15000318863d --- /dev/null +++ b/dev-libs/libtracefs/files/libtracefs-1.8.0-mmap.patch @@ -0,0 +1,25 @@ +Subject: [PATCH] libtracefs meson: build tracefs-mmap by default + +Accordingly to Makefile let's add tracefs-mmap.c to build, this is needed +for linking by other object files. + +Link: https://lore.kernel.org/linux-trace-devel/20240110203925.266999-1-giulio.benetti@benettiengineering.com +--- + src/meson.build | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/meson.build b/src/meson.build +index 5b76554..f7a98b9 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -11,6 +11,7 @@ sources= [ + 'tracefs-instance.c', + 'tracefs-kprobes.c', + 'tracefs-marker.c', ++ 'tracefs-mmap.c', + 'tracefs-record.c', + 'tracefs-sqlhist.c', + 'tracefs-tools.c', +-- +2.43.0 + diff --git a/dev-libs/libtracefs/libtracefs-1.6.1-r2.ebuild b/dev-libs/libtracefs/libtracefs-1.6.1-r2.ebuild deleted file mode 100644 index e5a02ff37b52..000000000000 --- a/dev-libs/libtracefs/libtracefs-1.6.1-r2.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 2019-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit toolchain-funcs - -DESCRIPTION="Linux kernel trace file system library" -HOMEPAGE="https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/" - -if [[ ${PV} =~ [9]{4,} ]]; then - EGIT_REPO_URI="git://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/" - inherit git-r3 -else - SRC_URI="https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/snapshot/${P}.tar.gz" - KEYWORDS="amd64 ~arm64 ~x86" -fi - -LICENSE="LGPL-2.1" -SLOT="0" -IUSE="doc" - -RDEPEND=" - !<dev-util/trace-cmd-3.1.4-r2 - >=dev-libs/libtraceevent-1.3.0 -" -DEPEND="${RDEPEND}" -# source-highlight is needed, see bug https://bugs.gentoo.org/865469 -BDEPEND=" - virtual/pkgconfig - doc? ( app-text/xmlto app-text/asciidoc dev-util/source-highlight ) -" - -src_configure() { - EMAKE_FLAGS=( - "prefix=${EPREFIX}/usr" - "libdir=${EPREFIX}/usr/$(get_libdir)" - "CC=$(tc-getCC)" - "AR=$(tc-getAR)" - VERBOSE=1 - ) -} - -src_compile() { - emake "${EMAKE_FLAGS[@]}" - use doc && emake doc -} - -src_install() { - emake "${EMAKE_FLAGS[@]}" DESTDIR="${ED}" install - # can't prevent installation of the static lib with parameters - rm "${ED}/usr/$(get_libdir)/libtracefs.a" || die - # install-doc is wrong target, see https://bugs.gentoo.org/865465 - use doc && emake "${EMAKE_FLAGS[@]}" DESTDIR="${ED}" install_doc -} diff --git a/dev-libs/libtracefs/libtracefs-1.6.3-r2.ebuild b/dev-libs/libtracefs/libtracefs-1.6.3-r2.ebuild deleted file mode 100644 index 8586159db3f2..000000000000 --- a/dev-libs/libtracefs/libtracefs-1.6.3-r2.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 2019-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit toolchain-funcs - -DESCRIPTION="Linux kernel trace file system library" -HOMEPAGE="https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/" - -if [[ ${PV} =~ [9]{4,} ]]; then - EGIT_REPO_URI="git://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/" - inherit git-r3 -else - SRC_URI="https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/snapshot/${P}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~riscv ~x86" -fi - -LICENSE="LGPL-2.1" -SLOT="0" -IUSE="doc" - -RDEPEND=" - !<dev-util/trace-cmd-3.1.4-r2 - >=dev-libs/libtraceevent-1.3.0 -" -DEPEND="${RDEPEND}" -# source-highlight is needed, see bug https://bugs.gentoo.org/865469 -BDEPEND=" - virtual/pkgconfig - doc? ( app-text/xmlto app-text/asciidoc dev-util/source-highlight ) -" - -src_configure() { - EMAKE_FLAGS=( - "prefix=${EPREFIX}/usr" - "libdir=${EPREFIX}/usr/$(get_libdir)" - "CC=$(tc-getCC)" - "AR=$(tc-getAR)" - VERBOSE=1 - ) -} - -src_compile() { - emake "${EMAKE_FLAGS[@]}" - use doc && emake doc -} - -src_install() { - emake "${EMAKE_FLAGS[@]}" DESTDIR="${ED}" install - # can't prevent installation of the static lib with parameters - rm "${ED}/usr/$(get_libdir)/libtracefs.a" || die - # install-doc is wrong target, see https://bugs.gentoo.org/865465 - use doc && emake "${EMAKE_FLAGS[@]}" DESTDIR="${ED}" install_doc -} diff --git a/dev-libs/libtracefs/libtracefs-1.6.4-r1.ebuild b/dev-libs/libtracefs/libtracefs-1.6.4-r1.ebuild deleted file mode 100644 index 0fa9a748d6ad..000000000000 --- a/dev-libs/libtracefs/libtracefs-1.6.4-r1.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 2019-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit toolchain-funcs - -DESCRIPTION="Linux kernel trace file system library" -HOMEPAGE="https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/" - -if [[ ${PV} =~ [9]{4,} ]]; then - EGIT_REPO_URI="git://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/" - inherit git-r3 -else - SRC_URI="https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/snapshot/${P}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~riscv ~x86" -fi - -LICENSE="LGPL-2.1" -SLOT="0" -IUSE="doc" - -RDEPEND=" - !<dev-util/trace-cmd-3.1.4-r2 - >=dev-libs/libtraceevent-1.3.0 -" -DEPEND="${RDEPEND}" -# source-highlight is needed, see bug https://bugs.gentoo.org/865469 -BDEPEND=" - virtual/pkgconfig - doc? ( app-text/xmlto app-text/asciidoc dev-util/source-highlight ) -" - -src_prepare() { - default - sed -i -e "s|share/doc/libtracefs-doc|share/doc/libtracefs-${PV}|g" \ - Documentation/Makefile || die -} - -src_configure() { - EMAKE_FLAGS=( - "prefix=${EPREFIX}/usr" - "libdir=${EPREFIX}/usr/$(get_libdir)" - "CC=$(tc-getCC)" - "AR=$(tc-getAR)" - VERBOSE=1 - ) -} - -src_compile() { - emake "${EMAKE_FLAGS[@]}" - use doc && emake doc -} - -src_install() { - emake "${EMAKE_FLAGS[@]}" DESTDIR="${ED}" install - # can't prevent installation of the static lib with parameters - rm "${ED}/usr/$(get_libdir)/libtracefs.a" || die - # install-doc is wrong target, see https://bugs.gentoo.org/865465 - use doc && emake "${EMAKE_FLAGS[@]}" DESTDIR="${ED}" install_doc -} diff --git a/dev-libs/libtracefs/libtracefs-1.8.0.ebuild b/dev-libs/libtracefs/libtracefs-1.8.0.ebuild new file mode 100644 index 000000000000..b1d311a9f1cc --- /dev/null +++ b/dev-libs/libtracefs/libtracefs-1.8.0.ebuild @@ -0,0 +1,53 @@ +# Copyright 2019-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson + +DESCRIPTION="Linux kernel trace file system library" +HOMEPAGE="https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/" + +if [[ ${PV} =~ [9]{4,} ]]; then + EGIT_REPO_URI="git://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/" + inherit git-r3 +else + SRC_URI="https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/snapshot/${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" +fi + +LICENSE="LGPL-2.1" +SLOT="0" + +# Please double check the minimum libtraceevent version! +RDEPEND=" + >=dev-libs/libtraceevent-1.8.1 +" +DEPEND="${RDEPEND}" +# source-highlight is needed, see bug https://bugs.gentoo.org/865469 +BDEPEND=" + app-text/asciidoc + app-text/xmlto + dev-util/source-highlight + app-alternatives/yacc + app-alternatives/lex + virtual/pkgconfig +" + +PATCHES=( "${FILESDIR}/${P}-mmap.patch" ) + +src_configure() { + local emesonargs=( + -Dasciidoctor=false + -Ddoc=false + ) + + # TODO: get docs & tests optional upstream + meson_src_configure +} + +src_install() { + meson_src_install + + find "${ED}" -type f -name '*.a' -delete || die +} diff --git a/dev-libs/libtsm/Manifest b/dev-libs/libtsm/Manifest index a935ba342777..a29ed58ccf33 100644 --- a/dev-libs/libtsm/Manifest +++ b/dev-libs/libtsm/Manifest @@ -1 +1 @@ -DIST libtsm-4.0.2.tar.gz 148135 BLAKE2B 4d81d5a19003ca1487e85bcea22604990e88770484a08a072105a2f193a0c7aa40832c9a81197c0fa26acc9c8d39d1ab796d4b92fa6af790f5ef803b8c68af05 SHA512 58eb955012fd154b7c165d799d0f80c9a71a504481e78471103fd299f2e73f3b7d89487387166895a9a5996165344335baa56f0550317caaa2eec6b0bad55e59 +DIST libtsm-4.0.2_p20231223.tar.gz 157342 BLAKE2B 082637022397b210ef95e1a0f827d4d340f60bf7a6f962d4c86087c0c604dea5fe2bd3a9e879008353726a5d6b4588da93b5c68b37501fa47c9c3cccf10de431 SHA512 f428969b8e108159671c6bb10898dcf07e829b7f2118e52331ca48d5f0efc212c14e42f5ac909adda5c5473980341828d085043687636c378f598479d7cb37ef diff --git a/dev-libs/libtsm/files/libtsm-clang16-static_assert-fix.patch b/dev-libs/libtsm/files/libtsm-clang16-static_assert-fix.patch new file mode 100644 index 000000000000..702ae5faaa4d --- /dev/null +++ b/dev-libs/libtsm/files/libtsm-clang16-static_assert-fix.patch @@ -0,0 +1,10 @@ +Bug: https://bugs.gentoo.org/895052 +--- a/cmake/CompileOptions.cmake ++++ b/cmake/CompileOptions.cmake +@@ -1,5 +1,5 @@ + # Set compiler flags +-set(CMAKE_C_STANDARD 99) ++set(CMAKE_C_STANDARD 11) + set(CMAKE_C_STANDARD_REQUIRED ON) + + # analogous to AC_USE_SYSTEM_EXTENSIONS in configure.ac diff --git a/dev-libs/libtsm/libtsm-4.0.2.ebuild b/dev-libs/libtsm/libtsm-4.0.2.ebuild deleted file mode 100644 index eb01dbb7c6d8..000000000000 --- a/dev-libs/libtsm/libtsm-4.0.2.ebuild +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -DESCRIPTION="Terminal Emulator State Machine" -HOMEPAGE="https://github.com/Aetf/libtsm" -SRC_URI="https://github.com/Aetf/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1 MIT" -SLOT="0/4" -KEYWORDS="~amd64 ~x86" -IUSE="" - -PATCHES=( "${FILESDIR}/${PN}-cmake.patch" ) diff --git a/dev-libs/libtsm/libtsm-4.0.2_p20231223.ebuild b/dev-libs/libtsm/libtsm-4.0.2_p20231223.ebuild new file mode 100644 index 000000000000..c61a7f827c19 --- /dev/null +++ b/dev-libs/libtsm/libtsm-4.0.2_p20231223.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +COMMIT="69922bde02c7af83b4d48a414cc6036af7388626" + +DESCRIPTION="Terminal Emulator State Machine" +HOMEPAGE="https://github.com/Aetf/libtsm" +SRC_URI="https://github.com/Aetf/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" +S=${WORKDIR}/${PN}-${COMMIT} + +LICENSE="LGPL-2.1 MIT" +SLOT="0/4" +KEYWORDS="~amd64 ~x86" + +PATCHES=( + "${FILESDIR}/${PN}-cmake.patch" + "${FILESDIR}/${PN}-clang16-static_assert-fix.patch" +) diff --git a/dev-libs/libucl/Manifest b/dev-libs/libucl/Manifest index e934da0c046a..d74b4cc231c5 100644 --- a/dev-libs/libucl/Manifest +++ b/dev-libs/libucl/Manifest @@ -1,2 +1,3 @@ DIST libucl-0.8.1.tar.gz 2028394 BLAKE2B 18fda317b4b4aed3d6b72c599d191f141bf4722d1c08244deda9c5e77300e2bef7de029889a05d9b4573472928d9d49a797123ac392a4cdd3b690ac277ad673d SHA512 36a059561eadb2dd7253ca22ff56f6a0c6cdd28580e28451c0cf47e1aec321a2e1589fc83ccb2033346f2dbca31a7e6afa9666ea544a0c190b7f80ed0e9f45af DIST libucl-0.9.0.tar.gz 2043656 BLAKE2B eb2aeb1a818caffbadee9e351d144cc58d149b88e171750e1edfb679c9a42d1c0e8ef2a2dac763445e215370a359791f65364658d3d138e2262a46eba341c0f1 SHA512 a7bcb03dc3b5e3b8e5c141fb3edee0c749e20d63ad69fba4d3c6ca56ef56b1130287b0f497de37bf9789c2263a46121c662fedc7a870354c2849d2e14d90cab5 +DIST libucl-0.9.2.tar.gz 2044512 BLAKE2B c0290584517df16ea0e06aa8b5e8c62e8d4f883242a06bec0c385e4d0f5fe8092e076dcb80754963bfca38a9dff62744946096ae16eb547bfc61ffb158951ac4 SHA512 4df54788406baf81c80156cadd938b33aa9a16859981aaa4f82ff447183d87016f647ed22fcdf29fda51b25a58f99f7a1892305aff7c97615f05c125f5966066 diff --git a/dev-libs/libucl/libucl-0.9.2.ebuild b/dev-libs/libucl/libucl-0.9.2.ebuild new file mode 100644 index 000000000000..3c35afc0af65 --- /dev/null +++ b/dev-libs/libucl/libucl-0.9.2.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..3} ) +inherit lua-single autotools + +DESCRIPTION="Universal configuration library parser" +HOMEPAGE="https://github.com/vstakhov/libucl" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/vstakhov/libucl.git" +else + SRC_URI="https://github.com/vstakhov/libucl/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="BSD-2" +SLOT="0/9" +IUSE="lua +regex sign urls +utils static-libs test" +REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )" +RESTRICT="!test? ( test )" + +DEPEND="!!dev-libs/ucl + lua? ( ${LUA_DEPS} ) + urls? ( net-misc/curl ) + sign? ( dev-libs/openssl:0= ) +" +BDEPEND="${DEPEND} + virtual/pkgconfig +" +RDEPEND="${DEPEND}" + +DOCS=( README.md doc/api.md ) + +pkg_setup() { + use lua && lua-single_pkg_setup +} + +src_prepare() { + default + eautoreconf +} + +src_configure() { + local myeconfargs=( + "$(use_enable lua)" + "$(use_enable regex)" + "$(use_enable sign signatures)" + "$(use_enable urls)" + "$(use_enable utils)" + ) + use lua && myeconfargs+=( + LUA_INCLUDE="$(lua_get_CFLAGS)" + LIB_LIBS="$(lua_get_LIBS)" + ) + econf "${myeconfargs[@]}" +} + +src_install() { + default + use lua && DOCS+=( "doc/lua_api.md" ) + einstalldocs + if ! use static-libs; then + find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || \ + die "error while deleting static library" + fi +} diff --git a/dev-libs/libunique/libunique-1.1.6-r2.ebuild b/dev-libs/libunique/libunique-1.1.6-r3.ebuild index 220e05249093..ed73d65d71df 100644 --- a/dev-libs/libunique/libunique-1.1.6-r2.ebuild +++ b/dev-libs/libunique/libunique-1.1.6-r3.ebuild @@ -1,7 +1,8 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 + GNOME2_LA_PUNT="yes" GNOME_TARBALL_SUFFIX="bz2" @@ -21,7 +22,8 @@ RDEPEND=" x11-libs/libX11 dbus? ( >=dev-libs/dbus-glib-0.70 - sys-apps/dbus[X] ) + sys-apps/dbus[X] + ) introspection? ( >=dev-libs/gobject-introspection-0.6.3:= ) " DEPEND="${RDEPEND} @@ -50,7 +52,6 @@ PATCHES=( src_configure() { gnome2_src_configure \ --disable-maintainer-flags \ - --disable-static \ --enable-bacon \ $(use_enable introspection) \ $(usex debug --enable-debug=yes ' ') \ @@ -58,7 +59,7 @@ src_configure() { } src_test() { - cd "${S}/tests" + cd "${S}/tests" || die cp "${FILESDIR}/run-tests" . || die "Unable to cp \${FILESDIR}/run-tests" virtx emake -f run-tests } diff --git a/dev-libs/libunique/libunique-3.0.2-r1.ebuild b/dev-libs/libunique/libunique-3.0.2-r2.ebuild index 973d210fa476..8d2bab6fbd94 100644 --- a/dev-libs/libunique/libunique-3.0.2-r1.ebuild +++ b/dev-libs/libunique/libunique-3.0.2-r2.ebuild @@ -1,7 +1,8 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 + GNOME2_LA_PUNT="yes" inherit gnome2 virtualx @@ -11,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Attic/LibUnique" LICENSE="LGPL-2.1" SLOT="3" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" IUSE="debug +introspection" RDEPEND=" @@ -32,7 +33,6 @@ DEPEND="${RDEPEND} src_configure() { # --disable-dbus means gdbus is used instead of dbus-glib gnome2_src_configure \ - --disable-static \ --disable-maintainer-flags \ --disable-dbus \ $(usex debug --enable-debug=yes ' ') \ @@ -40,7 +40,7 @@ src_configure() { } src_test() { - cd "${S}/tests" + cd "${S}/tests" || die cp "${FILESDIR}/run-tests" . || die "Unable to cp \${FILESDIR}/run-tests" virtx emake -f run-tests } diff --git a/dev-libs/libunistring/libunistring-1.2.ebuild b/dev-libs/libunistring/libunistring-1.2.ebuild index 3650da85e1b8..46e9e200aa8d 100644 --- a/dev-libs/libunistring/libunistring-1.2.ebuild +++ b/dev-libs/libunistring/libunistring-1.2.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" LICENSE="|| ( LGPL-3+ GPL-2+ ) || ( FDL-1.2 GPL-3+ )" # Check regularly even on "minor" bumps SLOT="0/5" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="doc static-libs" QA_CONFIG_IMPL_DECL_SKIP=( diff --git a/dev-libs/libusb/libusb-1.0.27-r1.ebuild b/dev-libs/libusb/libusb-1.0.27-r1.ebuild index b956c08ca087..ceeda526d11c 100644 --- a/dev-libs/libusb/libusb-1.0.27-r1.ebuild +++ b/dev-libs/libusb/libusb-1.0.27-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.bz2" LICENSE="LGPL-2.1" SLOT="1" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" IUSE="debug doc examples static-libs test udev" RESTRICT="!test? ( test )" REQUIRED_USE="static-libs? ( !udev )" diff --git a/dev-libs/libutf8proc/libutf8proc-2.9.0.ebuild b/dev-libs/libutf8proc/libutf8proc-2.9.0.ebuild index 5baa00aa6fdd..7b01fcb92ad9 100644 --- a/dev-libs/libutf8proc/libutf8proc-2.9.0.ebuild +++ b/dev-libs/libutf8proc/libutf8proc-2.9.0.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/JuliaStrings/${PN#lib}/releases/download/v${PV}/${P# LICENSE="MIT" SLOT="0/${PV}" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" IUSE="cjk static-libs test" RESTRICT="!test? ( test )" diff --git a/dev-libs/libuv/Manifest b/dev-libs/libuv/Manifest index 08d6094e36ce..1c5d46d282d2 100644 --- a/dev-libs/libuv/Manifest +++ b/dev-libs/libuv/Manifest @@ -1,3 +1,2 @@ -DIST libuv-1.47.0.tar.gz 1316016 BLAKE2B 6c530f8625366a9bf3f99ac4eb6b3bf3d4f6a05f98848e08cdab884934d79862cf8e79dd2d506ec734d701faab517eba2215063dce4b4216add5cfd6bfebd82e SHA512 3d0e76c4e29c5de14fddda07409f8db30dc64261d1c0bdfce7f70eb8f5ac911707fe662e81c4f117e4068cb0728158fc2b8255f8aa497c0f688e46c7fb93a5b3 DIST libuv-1.48.0.tar.gz 1314877 BLAKE2B 7595797ab732109516ce280fa2efa3474e82e78890087408c7f5b1457ce8f44e53878581bb8d473795e298d7390dd8a269dd2e8970e10b50a2c0bbe1cce187cc SHA512 7ae3a4c02f654a26056db1541e52ccc4c54aaea39c33585f0cf6949af997d0a0a29f30a294c8df6e92f6f6af7ce64c2766b1a2cc67f342e3e139cd55b7326c94 DIST libuv-1.48.0.tar.gz.sig 833 BLAKE2B f0982f7723fa81afe3fe668fc4497fb182a6093f38b185aba4f7359a3248062e7953acaba3f7fd739c9ff5b590664e4b7b81ee138442ffccd46c989c0a10345b SHA512 3a6441bb250badb7bb54a102dd7a1cf47ee4e0ed93ff0369c5b6a4b1e5440e613d85530f19c9ebdc586a97dfe1e06af09e2f90c13448e875dbaee1c703efa955 diff --git a/dev-libs/libuv/files/libuv-1.47.0-darwin17.patch b/dev-libs/libuv/files/libuv-1.47.0-darwin17.patch deleted file mode 100644 index 3fa90de83288..000000000000 --- a/dev-libs/libuv/files/libuv-1.47.0-darwin17.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 4785ad6337aac8b78224291f0848f25fc8cb41c9 Mon Sep 17 00:00:00 2001 -From: Sergey Fedorov <vital.had@gmail.com> -Date: Sat, 18 Nov 2023 16:57:40 +0800 -Subject: [PATCH] unix: unbreak macOS < 10.14 (#4230) - -From fc70430b09c49032d41ae97db26da10e20941e75 Mon Sep 17 00:00:00 2001 -From: Bo Anderson <mail@boanderson.me> -Date: Fri, 24 Nov 2023 10:17:52 +0000 -Subject: [PATCH] unix: correct pwritev conditional (#4233) - - -diff --git a/src/unix/fs.c b/src/unix/fs.c -index 891306daedc..4de0643a6c3 100644 ---- a/src/unix/fs.c -+++ b/src/unix/fs.c -@@ -84,7 +84,9 @@ - - #if defined(__CYGWIN__) || \ - (defined(__HAIKU__) && B_HAIKU_VERSION < B_HAIKU_VERSION_1_PRE_BETA_5) || \ -- (defined(__sun) && !defined(__illumos__)) -+ (defined(__sun) && !defined(__illumos__)) || \ -+ (defined(__APPLE__) && !TARGET_OS_IPHONE && \ -+ MAC_OS_X_VERSION_MIN_REQUIRED < 110000) - #define preadv(fd, bufs, nbufs, off) \ - pread(fd, (bufs)->iov_base, (bufs)->iov_len, off) - #define pwritev(fd, bufs, nbufs, off) \ diff --git a/dev-libs/libuv/files/libuv-1.47.0-hppa-kernel.patch b/dev-libs/libuv/files/libuv-1.47.0-hppa-kernel.patch deleted file mode 100644 index 1871ae221395..000000000000 --- a/dev-libs/libuv/files/libuv-1.47.0-hppa-kernel.patch +++ /dev/null @@ -1,32 +0,0 @@ -https://github.com/libuv/libuv/commit/f1444293652cf5478a67b9305271d73ad6d36232 - -From f1444293652cf5478a67b9305271d73ad6d36232 Mon Sep 17 00:00:00 2001 -From: matoro <12038583+matoro@users.noreply.github.com> -Date: Wed, 15 Nov 2023 17:57:06 -0500 -Subject: [PATCH] linux: disable io_uring on hppa below kernel 6.1.51 (#4224) - -First kernel with support is 6.1, was only fully functional from .51 -onwards: https://lore.kernel.org/all/cb912694-b1fe-dbb0-4d8c-d608f3526905@gmx.de/ - -Co-authored-by: matoro <matoro@users.noreply.github.com> ---- a/src/unix/linux.c -+++ b/src/unix/linux.c -@@ -487,8 +487,16 @@ static int uv__use_io_uring(void) { - use = atomic_load_explicit(&use_io_uring, memory_order_relaxed); - - if (use == 0) { -+ use = uv__kernel_version() >= -+#if defined(__hppa__) -+ /* io_uring first supported on parisc in 6.1, functional in .51 */ -+ /* https://lore.kernel.org/all/cb912694-b1fe-dbb0-4d8c-d608f3526905@gmx.de/ */ -+ /* 6.1.51 */ 0x060133 -+#else - /* Older kernels have a bug where the sqpoll thread uses 100% CPU. */ -- use = uv__kernel_version() >= /* 5.10.186 */ 0x050ABA ? 1 : -1; -+ /* 5.10.186 */ 0x050ABA -+#endif -+ ? 1 : -1; - - /* But users can still enable it if they so desire. */ - val = getenv("UV_USE_IO_URING"); - diff --git a/dev-libs/libuv/files/libuv-1.47.0-ipv6-tests.patch b/dev-libs/libuv/files/libuv-1.47.0-ipv6-tests.patch deleted file mode 100644 index 20176dc7aba0..000000000000 --- a/dev-libs/libuv/files/libuv-1.47.0-ipv6-tests.patch +++ /dev/null @@ -1,54 +0,0 @@ -https://github.com/libuv/libuv/issues/4211 -https://github.com/libuv/libuv/pull/4220 -https://github.com/libuv/libuv/commit/54d8364c2406758b572621af381f1d83e01ae46c - -From 54d8364c2406758b572621af381f1d83e01ae46c Mon Sep 17 00:00:00 2001 -From: Ben Noordhuis <info@bnoordhuis.nl> -Date: Tue, 14 Nov 2023 22:09:30 +0100 -Subject: [PATCH] test: check if ipv6 link-local traffic is routable (#4220) - -Fixes: https://github.com/libuv/libuv/issues/4211 ---- a/test/test-tcp-connect6-error.c -+++ b/test/test-tcp-connect6-error.c -@@ -23,6 +23,7 @@ - #include "task.h" - #include <stdio.h> - #include <stdlib.h> -+#include <string.h> - - - static int connect_cb_called = 0; -@@ -75,9 +76,13 @@ TEST_IMPL(tcp_connect6_error_fault) { - - - TEST_IMPL(tcp_connect6_link_local) { -+ uv_interface_address_t* ifs; -+ uv_interface_address_t* p; - struct sockaddr_in6 addr; - uv_connect_t req; - uv_tcp_t server; -+ int ok; -+ int n; - - if (!can_ipv6()) - RETURN_SKIP("IPv6 not supported"); -@@ -90,6 +95,18 @@ TEST_IMPL(tcp_connect6_link_local) { - RETURN_SKIP("Test does not currently work in QEMU"); - #endif /* defined(__QEMU__) */ - -+ /* Check there's an interface that routes link-local (fe80::/10) traffic. */ -+ ASSERT_OK(uv_interface_addresses(&ifs, &n)); -+ for (p = ifs; p < &ifs[n]; p++) -+ if (p->address.address6.sin6_family == AF_INET6) -+ if (!memcmp(&p->address.address6.sin6_addr, "\xfe\x80", 2)) -+ break; -+ ok = (p < &ifs[n]); -+ uv_free_interface_addresses(ifs, n); -+ -+ if (!ok) -+ RETURN_SKIP("IPv6 link-local traffic not supported"); -+ - ASSERT_OK(uv_ip6_addr("fe80::0bad:babe", 1337, &addr)); - ASSERT_OK(uv_tcp_init(uv_default_loop(), &server)); - - diff --git a/dev-libs/libuv/libuv-1.47.0-r1.ebuild b/dev-libs/libuv/libuv-1.47.0-r1.ebuild deleted file mode 100644 index c102af94ad4c..000000000000 --- a/dev-libs/libuv/libuv-1.47.0-r1.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools - -DESCRIPTION="Cross-platform asychronous I/O" -HOMEPAGE="https://github.com/libuv/libuv" - -if [[ ${PV} = 9999* ]]; then - EGIT_REPO_URI="https://github.com/libuv/libuv.git" - inherit git-r3 -else - SRC_URI="https://github.com/libuv/libuv/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -fi - -LICENSE="BSD BSD-2 ISC MIT" -SLOT="0/1" - -BDEPEND=" - dev-build/libtool - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/${P}-ipv6-tests.patch - "${FILESDIR}"/${P}-hppa-kernel.patch - "${FILESDIR}"/${P}-darwin17.patch # upstream -) - -src_prepare() { - default - - echo "m4_define([UV_EXTRA_AUTOMAKE_FLAGS], [serial-tests])" \ - > m4/libuv-extra-automake-flags.m4 || die - - if [[ ${CHOST} == *-darwin* && ${CHOST##*darwin} -le 9 ]] ; then - eapply "${FILESDIR}"/${PN}-1.41.0-darwin.patch - fi - - # Upstream fails to ship a configure script - eautoreconf -} - -src_configure() { - local myeconfargs=( - cc_cv_cflags__g=no - ) - - econf "${myeconfargs[@]}" -} - -src_install() { - default - - find "${ED}" -name '*.la' -delete || die -} diff --git a/dev-libs/libwacom/Manifest b/dev-libs/libwacom/Manifest index 087008f73bd8..15b5c4b67c06 100644 --- a/dev-libs/libwacom/Manifest +++ b/dev-libs/libwacom/Manifest @@ -1,4 +1,5 @@ DIST libwacom-2.10.0.tar.xz 114952 BLAKE2B ec9226feeac9998bc8b1886967db1ef5ea34312717eec5cce31796ffb2209cd479f6b2c1f7e2fe63c7c26ff7bdc93cf33a04314caefe84bb1113693086a78de5 SHA512 dc62db42596e14ace8463bc6bb115503d55f14c23a2a259b2169746e21b25eeeaacc09d7d1dd85c3e05f6dc5f3d96a3c757b2c93b171673e8f869337408495f9 +DIST libwacom-2.11.0.tar.xz 116056 BLAKE2B 2091859e036d928bc62543a56ea6ca0e2a879f83000437bc73560c334533a1b7b17e36a4f730c51f5b944cea6dbed0bc90b924c1f2112cd8f4bf0cb82505a0b7 SHA512 66823d97d165b428ddbfc3539572c94e2138b0732bc1c9e97c5ee071982fe8b82ead1302a5c308cbd1038e283fdfd7db853ef4a822c946f85a63b8247877a8a9 DIST libwacom-2.6.0.tar.xz 110288 BLAKE2B 321bacccab84f287141257b4c7af12822fca976c335027d399765fdbbb2c59eabcc76f40d4fd83c7cf1cdc88e2c57ccd317b1922ea3dddb98cf2a0847e920ff1 SHA512 aacf234e77bd976de2e2a687294c5ab704dca5a70df01fa2485441029e4faa34bec2824c455642115ae79f5cbbac41d064569e4eb2788655c324b37149009d26 DIST libwacom-2.7.0.tar.xz 111424 BLAKE2B 2cb046a7390c017680a2a67197896b0613fa3b0ca65d388b5d760fba1438c3079786efa77a5b69d26dce7b8813436ca4240500ef00d77e11427fee81df912d64 SHA512 47dd8fc7b82fce88ae9d857bcbecec2e45f2a83e832a5e1f97d5b09f77a2dacd53a470e08e756217fe7c5ef4420fdd8d3e3c37071336f7a3dce522b9fa781583 DIST libwacom-2.8.0.tar.xz 112244 BLAKE2B cc9bd7118f8e8d8d4ee3a22a6af20f00b95a3660cbc7c0822b7c067c1e78d89a9615db710cd8f3fbcf3a14ccdd434a2694dbb3ce0ef9bdd540b456c774927536 SHA512 b374ee8ded4f5cb7961699d2b9826ad69a3089f9a3073b4275596e1036f0e08813fba09c98653e852da73781c34c779e3faf20dab66eff667812a655e153f133 diff --git a/dev-libs/libwacom/libwacom-2.10.0.ebuild b/dev-libs/libwacom/libwacom-2.10.0.ebuild index ec6ea6420bb5..4b992460e769 100644 --- a/dev-libs/libwacom/libwacom-2.10.0.ebuild +++ b/dev-libs/libwacom/libwacom-2.10.0.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/linuxwacom/${PN}/releases/download/${P}/${P}.tar.xz" LICENSE="MIT" SLOT="0/9" # libwacom SONAME -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86" IUSE="doc test" RESTRICT="!test? ( test )" diff --git a/dev-libs/libwacom/libwacom-2.11.0.ebuild b/dev-libs/libwacom/libwacom-2.11.0.ebuild new file mode 100644 index 000000000000..ec6ea6420bb5 --- /dev/null +++ b/dev-libs/libwacom/libwacom-2.11.0.ebuild @@ -0,0 +1,68 @@ +# 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 udev + +DESCRIPTION="Library for identifying Wacom tablets and their model-specific features" +HOMEPAGE="https://github.com/linuxwacom/libwacom" +SRC_URI="https://github.com/linuxwacom/${PN}/releases/download/${P}/${P}.tar.xz" + +LICENSE="MIT" +SLOT="0/9" # libwacom SONAME +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="doc test" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-libs/glib:2 + dev-libs/libevdev + dev-libs/libgudev:= +" +DEPEND="${RDEPEND}" +BDEPEND=" + ${PYTHON_DEPS} + virtual/pkgconfig + doc? ( app-text/doxygen ) + test? ( + $(python_gen_any_dep ' + dev-python/libevdev[${PYTHON_USEDEP}] + dev-python/pyudev[${PYTHON_USEDEP}] + dev-python/pytest[${PYTHON_USEDEP}] + ') + ) +" + +python_check_deps() { + use test || return 0 + python_has_version \ + "dev-python/libevdev[${PYTHON_USEDEP}]" \ + "dev-python/pyudev[${PYTHON_USEDEP}]" \ + "dev-python/pytest[${PYTHON_USEDEP}]" +} + +src_prepare() { + default + + # Don't call systemd daemon-reload in the test suite + sed -i -e '/daemon-reload/d' test/test_udev_rules.py || die +} + +src_configure() { + local emesonargs=( + $(meson_feature doc documentation) + $(meson_feature test tests) + -Dudev-dir=$(get_udevdir) + ) + meson_src_configure +} + +pkg_postinst() { + udev_reload +} + +pkg_postrm() { + udev_reload +} diff --git a/dev-libs/libx86/libx86-1.1-r6.ebuild b/dev-libs/libx86/libx86-1.1-r6.ebuild index 924c7e02a2ab..fccee762e710 100644 --- a/dev-libs/libx86/libx86-1.1-r6.ebuild +++ b/dev-libs/libx86/libx86-1.1-r6.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://www.codon.org.uk/~mjg59/${PN}/downloads/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~arm -ppc -riscv -sparc ~x86" +KEYWORDS="amd64 ~arm -ppc -riscv -sparc x86" PATCHES=( # fix compile failure with linux-headers-2.6.26, bug 235599 diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest index 417300261f0f..48e9a7661a7c 100644 --- a/dev-libs/libxml2/Manifest +++ b/dev-libs/libxml2/Manifest @@ -1,6 +1,8 @@ DIST libxml2-2.11.7.tar.xz 2628860 BLAKE2B 9aa553b09ec20fe01272ceafb59bf76b480f3cfc57084a527d09797dc39987e59635f8f7b1591060ef6a27adfcc07d8c8e8a907ee7ed04da0a108aae1517cd52 SHA512 202b0523d982eb5269dcb4644d8ab2ea31404771069462cdd6c5cd7e6672e0e50371ceb334133bb8f2c0a42f133e8f40c3f582bba5fc71ab168a2b18d4cfd81d +DIST libxml2-2.11.8.tar.xz 2628212 BLAKE2B 7a9f62b9e6628e71462b0ae2a43947e398c8b948d57280ee5ac64a7cd0a13d39aa4cc55148421f999e5a04e19ca1ae2cb84884f85f3e22559cb45d8a7fca7d45 SHA512 b8c38365172b9f46e2da4dd696f5df4f917d05cc33456079d3d042578543c0f951da207361958ba8699a9f7256889f063737ba80dba8bb9720c8434be1ca723f DIST libxml2-2.12.5.tar.xz 2643452 BLAKE2B b63ade8b18d98701e95b79ac2199bfc4ca89c6085c48c3d0970945ae526558ee2137622ee8b4af5391f86e663a3f06a7e1aaad5f57eb639fc9da74704e2280f3 SHA512 da5c5afb95db80342d78d4371d029bf10ce5cd601b24b294272d9996f82357bd5262a15a2b44b0904a14471c8ff0c9fd9c796f164246551f02ee19a8f083f926 DIST libxml2-2.12.6.tar.xz 2643124 BLAKE2B 677589cf063b109018aafc04a1564242ba1a9d88b2c511f583d4aa511c13aff15254a9d5f6ea2c294902338b0c0207ff59c51298e128981d57f86367ddc1a803 SHA512 19d6901c0f189813e8bd20ffdfbb29d8545ca30154d1f3cc82624d64e4db3cfbe8eef7e8ccc1e195289f1bf94bb50fefcf11a95badb0ddeb845b4e4ea5a819ac +DIST libxml2-2.12.7.tar.xz 2641980 BLAKE2B 19abc2a7824212b1de3ceb1e8e3bbb39cb5feb31f8f6e1b1701a8255f34aadbbd01631e8011fd1207d2e711372a893034a99cb4aaa779a1df22d49d339dbfc76 SHA512 88b5f3e0a7c6704926e662a46ba0606d901efbcd70a36bd39fe034e29ee42d66d7296358761e04272c9696192a1380bda55852b2a0b14a05a7a083a08e125f5f DIST xmlts20130923.tar.gz 641522 BLAKE2B 63a47bc69278ef510cd0b3779aed729e1b309e30efa0015d28ed051cc03f9dfddb447ab57b07b3393e8f47393d15473b0e199c34cb1f5f746b15ddfaa55670be SHA512 d5c4d26b324ed21f4e0641cd7f8b76dbf9de80df8b519982e44d41c960df29fd03618e02e9693b2d11ad06d19c4a965274c95a048ec3b9653eacb919a7f8b733 DIST xsts-2002-01-16.tar.gz 6894439 BLAKE2B 1e9ec63d2c104655e64249e07440a04d862fcbcd4d4e19745d81b34994319b510a531c9d6df1491fae1e90b5d0764f0f1a827251ca8df5d613178b0eab01ef25 SHA512 43300af6d39c1e2221b0ed7318fe14c7464eeb6eb030ed1e22eb29b4ab17f014e2a4c8887c3a46ae5d243e3072da27f00f4e285498ae6f1288177d38d1108288 DIST xsts-2004-01-14.tar.gz 2761085 BLAKE2B 41545995fb3a65d053257c376c07d45ffd1041a433bfbdb46d4dd87a5afb60c18c8629a3d988323f9e7a1d709775b5a7e5930276a7121c0725a22705c0976e36 SHA512 32854388d7e720ad67156baf50bf2bae7bd878ca3e35fd7e44e57cad3f434f69d56bbbedd61509f8a1faf01c9eae74a078df8fe130780b182c05c05cb1c39ebe diff --git a/dev-libs/libxml2/libxml2-2.11.8.ebuild b/dev-libs/libxml2/libxml2-2.11.8.ebuild new file mode 100644 index 000000000000..efd633ea121b --- /dev/null +++ b/dev-libs/libxml2/libxml2-2.11.8.ebuild @@ -0,0 +1,200 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Note: Please bump in sync with dev-libs/libxslt + +PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_REQ_USE="xml(+)" +inherit flag-o-matic python-r1 multilib-minimal + +XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite" +XSTS_NAME_1="xmlschema2002-01-16" +XSTS_NAME_2="xmlschema2004-01-14" +XSTS_TARBALL_1="xsts-2002-01-16.tar.gz" +XSTS_TARBALL_2="xsts-2004-01-14.tar.gz" +XMLCONF_TARBALL="xmlts20130923.tar.gz" + +DESCRIPTION="XML C parser and toolkit" +HOMEPAGE="https://gitlab.gnome.org/GNOME/libxml2/-/wikis/home" +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/libxml2" + inherit autotools git-r3 +else + inherit gnome.org libtool + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +fi + +SRC_URI+=" + test? ( + ${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1} + ${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2} + https://www.w3.org/XML/Test/${XMLCONF_TARBALL} + ) +" +S="${WORKDIR}/${PN}-${PV%_rc*}" + +LICENSE="MIT" +SLOT="2" +IUSE="debug examples +ftp icu lzma +python readline static-libs test" +RESTRICT="!test? ( test )" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND=" + virtual/libiconv + >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] + icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] ) + lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] ) + python? ( ${PYTHON_DEPS} ) + readline? ( sys-libs/readline:= ) +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +if [[ ${PV} == 9999 ]] ; then + BDEPEND+=" dev-build/gtk-doc-am" +fi + +MULTILIB_CHOST_TOOLS=( + /usr/bin/xml2-config +) + +PATCHES=( + "${FILESDIR}"/${PN}-2.11.5-CVE-2023-45322.patch +) + +src_unpack() { + if [[ ${PV} == 9999 ]] ; then + git-r3_src_unpack + else + local tarname=${P/_rc/-rc}.tar.xz + + # ${A} isn't used to avoid unpacking of test tarballs into ${WORKDIR}, + # as they are needed as tarballs in ${S}/xstc instead and not unpacked + unpack ${tarname} + + if [[ -n ${PATCHSET_VERSION} ]] ; then + unpack ${PN}-${PATCHSET_VERSION}.tar.xz + fi + fi + + cd "${S}" || die + + if use test ; then + cp "${DISTDIR}/${XSTS_TARBALL_1}" \ + "${DISTDIR}/${XSTS_TARBALL_2}" \ + "${S}"/xstc/ \ + || die "Failed to install test tarballs" + unpack ${XMLCONF_TARBALL} + fi +} + +src_prepare() { + default + + if [[ ${PV} == 9999 ]] ; then + eautoreconf + else + # Please do not remove, as else we get references to PORTAGE_TMPDIR + # in /usr/lib/python?.?/site-packages/libxml2mod.la among things. + elibtoolize + fi +} + +multilib_src_configure() { + # Filter seemingly problematic CFLAGS (bug #26320) + filter-flags -fprefetch-loop-arrays -funroll-loops + + # Notes: + # The meaning of the 'debug' USE flag does not apply to the --with-debug + # switch (enabling the libxml2 debug module). See bug #100898. + libxml2_configure() { + ECONF_SOURCE="${S}" econf \ + --enable-ipv6 \ + $(use_with ftp) \ + $(use_with debug run-debug) \ + $(use_with icu) \ + $(use_with lzma) \ + $(use_enable static-libs static) \ + $(multilib_native_use_with readline) \ + $(multilib_native_use_with readline history) \ + "$@" + } + + # Build python bindings separately + libxml2_configure --without-python + + multilib_is_native_abi && use python && + python_foreach_impl run_in_build_dir libxml2_configure --with-python +} + +libxml2_py_emake() { + pushd "${BUILD_DIR}"/python >/dev/null || die + + emake top_builddir="${NATIVE_BUILD_DIR}" "$@" + + popd >/dev/null || die +} + +multilib_src_compile() { + default + + if multilib_is_native_abi && use python ; then + NATIVE_BUILD_DIR="${BUILD_DIR}" + python_foreach_impl run_in_build_dir libxml2_py_emake all + fi +} + +multilib_src_test() { + ln -s "${S}"/xmlconf || die + + emake check + + multilib_is_native_abi && use python && + python_foreach_impl run_in_build_dir libxml2_py_emake check +} + +multilib_src_install() { + emake DESTDIR="${D}" install + + multilib_is_native_abi && use python && + python_foreach_impl run_in_build_dir libxml2_py_emake DESTDIR="${D}" install + + # Hack until automake release is made for the optimise fix + # https://git.savannah.gnu.org/cgit/automake.git/commit/?id=bde43d0481ff540418271ac37012a574a4fcf097 + multilib_is_native_abi && use python && python_foreach_impl python_optimize +} + +multilib_src_install_all() { + einstalldocs + + if ! use examples ; then + rm -rf "${ED}"/usr/share/doc/${PF}/examples || die + rm -rf "${ED}"/usr/share/doc/${PF}/python/examples || die + fi + + rm -rf "${ED}"/usr/share/doc/${PN}-python-${PVR} || die + + find "${ED}" -name '*.la' -delete || die +} + +pkg_postinst() { + # We don't want to do the xmlcatalog during stage1, as xmlcatalog will not + # be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887. + if [[ -n "${ROOT}" ]]; then + elog "Skipping XML catalog creation for stage building (bug #208887)." + else + # Need an XML catalog, so no-one writes to a non-existent one + CATALOG="${EROOT}/etc/xml/catalog" + + # We don't want to clobber an existing catalog though, + # only ensure that one is there + # <obz@gentoo.org> + if [[ ! -e "${CATALOG}" ]]; then + [[ -d "${EROOT}/etc/xml" ]] || mkdir -p "${EROOT}/etc/xml" + "${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}" + einfo "Created XML catalog in ${CATALOG}" + fi + fi +} diff --git a/dev-libs/libxml2/libxml2-2.12.6.ebuild b/dev-libs/libxml2/libxml2-2.12.6.ebuild index c4d87530a6d4..3d915e2ccc5b 100644 --- a/dev-libs/libxml2/libxml2-2.12.6.ebuild +++ b/dev-libs/libxml2/libxml2-2.12.6.ebuild @@ -23,7 +23,7 @@ if [[ ${PV} == 9999 ]] ; then inherit autotools git-r3 else inherit gnome.org libtool - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi SRC_URI+=" diff --git a/dev-libs/libxml2/libxml2-2.12.7.ebuild b/dev-libs/libxml2/libxml2-2.12.7.ebuild new file mode 100644 index 000000000000..c4d87530a6d4 --- /dev/null +++ b/dev-libs/libxml2/libxml2-2.12.7.ebuild @@ -0,0 +1,196 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Note: Please bump in sync with dev-libs/libxslt + +PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_REQ_USE="xml(+)" +inherit flag-o-matic python-r1 multilib-minimal + +XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite" +XSTS_NAME_1="xmlschema2002-01-16" +XSTS_NAME_2="xmlschema2004-01-14" +XSTS_TARBALL_1="xsts-2002-01-16.tar.gz" +XSTS_TARBALL_2="xsts-2004-01-14.tar.gz" +XMLCONF_TARBALL="xmlts20130923.tar.gz" + +DESCRIPTION="XML C parser and toolkit" +HOMEPAGE="https://gitlab.gnome.org/GNOME/libxml2/-/wikis/home" +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/libxml2" + inherit autotools git-r3 +else + inherit gnome.org libtool + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +fi + +SRC_URI+=" + test? ( + ${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1} + ${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2} + https://www.w3.org/XML/Test/${XMLCONF_TARBALL} + ) +" +S="${WORKDIR}/${PN}-${PV%_rc*}" + +LICENSE="MIT" +SLOT="2" +IUSE="debug examples +ftp icu lzma +python readline static-libs test" +RESTRICT="!test? ( test )" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND=" + virtual/libiconv + >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] + icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] ) + lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] ) + python? ( ${PYTHON_DEPS} ) + readline? ( sys-libs/readline:= ) +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +if [[ ${PV} == 9999 ]] ; then + BDEPEND+=" dev-build/gtk-doc-am" +fi + +MULTILIB_CHOST_TOOLS=( + /usr/bin/xml2-config +) + +src_unpack() { + if [[ ${PV} == 9999 ]] ; then + git-r3_src_unpack + else + local tarname=${P/_rc/-rc}.tar.xz + + # ${A} isn't used to avoid unpacking of test tarballs into ${WORKDIR}, + # as they are needed as tarballs in ${S}/xstc instead and not unpacked + unpack ${tarname} + + if [[ -n ${PATCHSET_VERSION} ]] ; then + unpack ${PN}-${PATCHSET_VERSION}.tar.xz + fi + fi + + cd "${S}" || die + + if use test ; then + cp "${DISTDIR}/${XSTS_TARBALL_1}" \ + "${DISTDIR}/${XSTS_TARBALL_2}" \ + "${S}"/xstc/ \ + || die "Failed to install test tarballs" + unpack ${XMLCONF_TARBALL} + fi +} + +src_prepare() { + default + + if [[ ${PV} == 9999 ]] ; then + eautoreconf + else + # Please do not remove, as else we get references to PORTAGE_TMPDIR + # in /usr/lib/python?.?/site-packages/libxml2mod.la among things. + elibtoolize + fi +} + +multilib_src_configure() { + # Filter seemingly problematic CFLAGS (bug #26320) + filter-flags -fprefetch-loop-arrays -funroll-loops + + # Notes: + # The meaning of the 'debug' USE flag does not apply to the --with-debug + # switch (enabling the libxml2 debug module). See bug #100898. + libxml2_configure() { + ECONF_SOURCE="${S}" econf \ + --enable-ipv6 \ + $(use_with ftp) \ + $(use_with debug run-debug) \ + $(use_with icu) \ + $(use_with lzma) \ + $(use_enable static-libs static) \ + $(multilib_native_use_with readline) \ + $(multilib_native_use_with readline history) \ + "$@" + } + + # Build python bindings separately + libxml2_configure --without-python + + multilib_is_native_abi && use python && + python_foreach_impl run_in_build_dir libxml2_configure --with-python +} + +libxml2_py_emake() { + pushd "${BUILD_DIR}"/python >/dev/null || die + + emake top_builddir="${NATIVE_BUILD_DIR}" "$@" + + popd >/dev/null || die +} + +multilib_src_compile() { + default + + if multilib_is_native_abi && use python ; then + NATIVE_BUILD_DIR="${BUILD_DIR}" + python_foreach_impl run_in_build_dir libxml2_py_emake all + fi +} + +multilib_src_test() { + ln -s "${S}"/xmlconf || die + + emake check + + multilib_is_native_abi && use python && + python_foreach_impl run_in_build_dir libxml2_py_emake check +} + +multilib_src_install() { + emake DESTDIR="${D}" install + + multilib_is_native_abi && use python && + python_foreach_impl run_in_build_dir libxml2_py_emake DESTDIR="${D}" install + + # Hack until automake release is made for the optimise fix + # https://git.savannah.gnu.org/cgit/automake.git/commit/?id=bde43d0481ff540418271ac37012a574a4fcf097 + multilib_is_native_abi && use python && python_foreach_impl python_optimize +} + +multilib_src_install_all() { + einstalldocs + + if ! use examples ; then + rm -rf "${ED}"/usr/share/doc/${PF}/examples || die + rm -rf "${ED}"/usr/share/doc/${PF}/python/examples || die + fi + + rm -rf "${ED}"/usr/share/doc/${PN}-python-${PVR} || die + + find "${ED}" -name '*.la' -delete || die +} + +pkg_postinst() { + # We don't want to do the xmlcatalog during stage1, as xmlcatalog will not + # be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887. + if [[ -n "${ROOT}" ]]; then + elog "Skipping XML catalog creation for stage building (bug #208887)." + else + # Need an XML catalog, so no-one writes to a non-existent one + CATALOG="${EROOT}/etc/xml/catalog" + + # We don't want to clobber an existing catalog though, + # only ensure that one is there + # <obz@gentoo.org> + if [[ ! -e "${CATALOG}" ]]; then + [[ -d "${EROOT}/etc/xml" ]] || mkdir -p "${EROOT}/etc/xml" + "${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}" + einfo "Created XML catalog in ${CATALOG}" + fi + fi +} diff --git a/dev-libs/libxmlb/Manifest b/dev-libs/libxmlb/Manifest index 4194e64753f0..fcb0d2199be7 100644 --- a/dev-libs/libxmlb/Manifest +++ b/dev-libs/libxmlb/Manifest @@ -1 +1,3 @@ DIST libxmlb-0.3.14.tar.gz 127096 BLAKE2B d99ec674385cd8dc31d92b14ac1539138b00c980ba3561fd406099a64afdf2f8b6fa2d808b5a33daafbcbc5ef87e20a02a534f860699f78bc71aa55d4b507d51 SHA512 6c77b9475ca3430270ca29e3d1c5720740c54ff55da76501495da315ea039500e64791689600aa59f3003ff54d030203616ad468169c296bf34434a68e24df50 +DIST libxmlb-0.3.18.tar.gz 131331 BLAKE2B 8ee200c28b5159a895d601700b6553945b23e321d2266a0438a176747be4922b81bdbc9b9a27c3ff8490f8d40fd5e2d6e7eb5c2ca21484438a55adc54c6d3be3 SHA512 2576aca6b7651cf484694ad157914982ef1e3949ea641b4181966e5d5292b3d8c16318fe61b14d8c7e6d0e0d184ed30d498f874f5ada196f0ca69c6180d9061f +DIST libxmlb-0.3.19.tar.gz 131490 BLAKE2B 1455e14a90f29865f304b16cbf0355966e7fd0766f8033cb2b2bc9fe28ad0a1266c1e06faaeb3677a683be56bc2fd9a64094d958f00358292fae55949229ab9a SHA512 07db2e99b2f78f6e99cccbf5ca250978955d5a9bf18aaa675b2292d1df438fc3f98a5d0e8ddcfa41e686782f35947fe92b54b520b4e6e278d6e5c871e7491271 diff --git a/dev-libs/libxmlb/libxmlb-0.3.18.ebuild b/dev-libs/libxmlb/libxmlb-0.3.18.ebuild new file mode 100644 index 000000000000..1d407706e7cc --- /dev/null +++ b/dev-libs/libxmlb/libxmlb-0.3.18.ebuild @@ -0,0 +1,75 @@ +# 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="Library to help create and query binary XML blobs" +HOMEPAGE="https://github.com/hughsie/libxmlb" +SRC_URI="https://github.com/hughsie/libxmlb/archive/${PV}.tar.gz -> ${P}.tar.gz" +LICENSE="LGPL-2.1+" +SLOT="0/2" # libxmlb.so version + +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" +IUSE="doc introspection +lzma stemmer test +zstd" + +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-libs/glib:2 + sys-apps/util-linux + lzma? ( app-arch/xz-utils ) + stemmer? ( dev-libs/snowball-stemmer:= ) + zstd? ( app-arch/zstd:= ) +" + +DEPEND=" + ${RDEPEND} + doc? ( dev-util/gtk-doc ) + introspection? ( dev-libs/gobject-introspection ) +" + +BDEPEND=" + ${PYTHON_DEPS} + >=dev-build/meson-0.47.0 + virtual/pkgconfig + introspection? ( + $(python_gen_any_dep 'dev-python/setuptools[${PYTHON_USEDEP}]') + ) +" + +python_check_deps() { + python_has_version -b "dev-python/setuptools[${PYTHON_USEDEP}]" +} + +pkg_setup() { + python-any-r1_pkg_setup +} + +src_configure() { + local emesonargs=( + $(meson_feature lzma) + $(meson_feature zstd) + $(meson_use doc gtkdoc) + $(meson_use introspection) + $(meson_use stemmer) + $(meson_use test tests) + ) + meson_src_configure +} + +src_install() { + meson_src_install + + if use test; then + # Preventing tests from being installed in the first place is a moving target, + # just axe them all afterwards. + rm -rf \ + "${ED}"/usr/libexec/installed-tests \ + "${ED}"/usr/share/installed-tests \ + || die + fi +} diff --git a/dev-libs/libxmlb/libxmlb-0.3.19.ebuild b/dev-libs/libxmlb/libxmlb-0.3.19.ebuild new file mode 100644 index 000000000000..1d407706e7cc --- /dev/null +++ b/dev-libs/libxmlb/libxmlb-0.3.19.ebuild @@ -0,0 +1,75 @@ +# 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="Library to help create and query binary XML blobs" +HOMEPAGE="https://github.com/hughsie/libxmlb" +SRC_URI="https://github.com/hughsie/libxmlb/archive/${PV}.tar.gz -> ${P}.tar.gz" +LICENSE="LGPL-2.1+" +SLOT="0/2" # libxmlb.so version + +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" +IUSE="doc introspection +lzma stemmer test +zstd" + +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-libs/glib:2 + sys-apps/util-linux + lzma? ( app-arch/xz-utils ) + stemmer? ( dev-libs/snowball-stemmer:= ) + zstd? ( app-arch/zstd:= ) +" + +DEPEND=" + ${RDEPEND} + doc? ( dev-util/gtk-doc ) + introspection? ( dev-libs/gobject-introspection ) +" + +BDEPEND=" + ${PYTHON_DEPS} + >=dev-build/meson-0.47.0 + virtual/pkgconfig + introspection? ( + $(python_gen_any_dep 'dev-python/setuptools[${PYTHON_USEDEP}]') + ) +" + +python_check_deps() { + python_has_version -b "dev-python/setuptools[${PYTHON_USEDEP}]" +} + +pkg_setup() { + python-any-r1_pkg_setup +} + +src_configure() { + local emesonargs=( + $(meson_feature lzma) + $(meson_feature zstd) + $(meson_use doc gtkdoc) + $(meson_use introspection) + $(meson_use stemmer) + $(meson_use test tests) + ) + meson_src_configure +} + +src_install() { + meson_src_install + + if use test; then + # Preventing tests from being installed in the first place is a moving target, + # just axe them all afterwards. + rm -rf \ + "${ED}"/usr/libexec/installed-tests \ + "${ED}"/usr/share/installed-tests \ + || die + fi +} diff --git a/dev-libs/libzia/Manifest b/dev-libs/libzia/Manifest index a972b3b817db..39dbd8fb8cdb 100644 --- a/dev-libs/libzia/Manifest +++ b/dev-libs/libzia/Manifest @@ -1,2 +1 @@ -DIST libzia-4.55.tar.gz 646922 BLAKE2B 0430757bce57458b33dbd7c315b88258b5d1364aea958a6b31e7e90a7f544cf64ba4409ffde9b2ab7088b6c8a33e433a3c334e7fc61e22a4bb8b693b53532000 SHA512 05d91c59b070f1230a0919c07757afa25f4bfca6585501d1ee013ca2c5994967329682624c2a9e13cba686640ddb145ca093e3e341141fd301e780a98c6b30a7 -DIST libzia-4.58.tar.gz 647123 BLAKE2B c1d7963e108847f1198a3b21d9972a614f5a830afddba2d7fbbdae7794e622851e6c5e11910c5b932eb4733521e58df74a4649ee7d15add08336c1b8db1588e1 SHA512 1a5e54083821708a2c34f2385c646c97fc48962dc4615ef364bded57a8d578ce05d15a8bd890c061cf97dd56e7b240a0c97621e12295b64c7396b2227ae729a8 +DIST libzia-4.59.tar.gz 647238 BLAKE2B 5e7d5eef5a316d3580789f4054652c533301d5737b01a125eb5387d6b444f2e3c3e1097f2f9738c7271dd569728e6eb3eb4d4d9bbd39c612991a72dddf6a58f3 SHA512 b9204d51d9901938b8f0e9a5ce1edb656ea90f3cb495d5885f2c5f3f440a9601ce77acb1ef7b44fe1dcf11b3251b7564bcc2c3987cb9b469c4aed2fe2f503bfd diff --git a/dev-libs/libzia/libzia-4.58.ebuild b/dev-libs/libzia/libzia-4.58.ebuild deleted file mode 100644 index 0fe1254dbfda..000000000000 --- a/dev-libs/libzia/libzia-4.58.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools flag-o-matic - -DESCRIPTION="Platform abstraction code for tucnak package" -HOMEPAGE="http://tucnak.nagano.cz" -SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="ftdi" - -RDEPEND="dev-libs/glib:2 - x11-libs/gtk+:2 - media-libs/libsdl2 - media-libs/sdl2-ttf - media-libs/libpng:0 - ftdi? ( dev-embedded/libftdi:1 ) - elibc_musl? ( sys-libs/libunwind )" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -MAKEOPTS+=" -j1" - -src_prepare() { - eapply_user - sed -i -e "s/docsdir/#docsdir/g" \ - -e "s/docs_/#docs_/g" Makefile.am || die - - # fix build for MUSL (bug #832235) - if use elibc_musl ; then - sed -i -e "s/ backtrace(/ unw_backtrace(/" src/zbfd.c || die - fi - eautoreconf -} - -src_configure() { - use elibc_musl && append-libs -lunwind - econf \ - $(use_with ftdi) --with-sdl \ - --with-png --without-bfd \ - --disable-static -} - -src_install() { - emake DESTDIR="${D}" install - find "${D}" -name '*.la' -type f -delete || die -} diff --git a/dev-libs/libzia/libzia-4.55.ebuild b/dev-libs/libzia/libzia-4.59.ebuild index 557c11cf75df..557c11cf75df 100644 --- a/dev-libs/libzia/libzia-4.55.ebuild +++ b/dev-libs/libzia/libzia-4.59.ebuild diff --git a/dev-libs/link-grammar/Manifest b/dev-libs/link-grammar/Manifest index 19aff333d5ec..75d64829e040 100644 --- a/dev-libs/link-grammar/Manifest +++ b/dev-libs/link-grammar/Manifest @@ -1 +1 @@ -DIST link-grammar-5.12.3.tar.gz 4704751 BLAKE2B a7f0fe39c51ed26ea764d583b38b21cfce6e596c6cd94db6ba47b3606a2b6cd9e56bd6fedeb104dbb345baedae3e144af96999739dda9daa9a9e5886bd98d2f4 SHA512 e0fdb78ec03042119011afea005a62829317fd0bc20afcd94e3f234c9c5252ed9c57d717b75368ac4a63dd8493bd86f551870299925f3b9b95b11915f48d8abe +DIST link-grammar-5.12.4.tar.gz 4720724 BLAKE2B 6573895298128165d7f840a13aad124418dbd1b9c70436dbe2bd65b3fd1883777e72da13f5196031696edb7cdc6c9d86acd5fdd4d1aa8fb295a136b2ba0568cf SHA512 fd5318c21202c17902de996882fd8630c7e95622b8ebe6877a334df22ff678a6040e0519bdabfa1138aaefdf3a7c20cbfe9e65bdce4dfe568729c9ba5a2d6fe5 diff --git a/dev-libs/link-grammar/files/link-grammar-5.12.3-Wimplicit-function-declaration.patch b/dev-libs/link-grammar/files/link-grammar-5.12.3-Wimplicit-function-declaration.patch deleted file mode 100644 index 55ca89c09b94..000000000000 --- a/dev-libs/link-grammar/files/link-grammar-5.12.3-Wimplicit-function-declaration.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 3cbc9ddfd4c3a3e407338619fa383d24da05b23d Mon Sep 17 00:00:00 2001 -From: David Seifert <soap@gentoo.org> -Date: Sun, 7 May 2023 16:02:23 +0200 -Subject: [PATCH] Use correct guard macro for glibc heap functions - -* `__GNUC__` == Compiling with `-std=gnu*` -* `__GLIBC__` == Compiling against glibc - -Bug: https://bugs.gentoo.org/903749 ---- - link-grammar/parse/extract-links.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/link-grammar/parse/extract-links.c b/link-grammar/parse/extract-links.c -index a6129ac7a..e2ce266bc 100644 ---- a/link-grammar/parse/extract-links.c -+++ b/link-grammar/parse/extract-links.c -@@ -278,7 +278,7 @@ void free_extractor(extractor_t * pex) - pex->x_table_size = 0; - pex->x_table = NULL; - --#if defined __GNUC__ -+#if defined __GLIBC__ - // MST parsing can result in pathological cases, with almost a - // billion elts in the Parse_choice_pool. This blows up the - // resident-set size (RSS) over time. Avoid this issue by trimming. -@@ -294,7 +294,7 @@ void free_extractor(extractor_t * pex) - - xfree((void *) pex, sizeof(extractor_t)); - --#if defined __GNUC__ -+#if defined __GLIBC__ - // malloc_trim() is a gnu extension. An alternative would be - // to call madvise(MADV_DONTNEED) but this is more complicated. - if (trim) malloc_trim(0); diff --git a/dev-libs/link-grammar/link-grammar-5.12.3.ebuild b/dev-libs/link-grammar/link-grammar-5.12.4.ebuild index 9b58401971bf..a78bbab12177 100644 --- a/dev-libs/link-grammar/link-grammar-5.12.3.ebuild +++ b/dev-libs/link-grammar/link-grammar-5.12.4.ebuild @@ -3,13 +3,13 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit autotools python-r1 out-of-source DESCRIPTION="A Syntactic English parser" HOMEPAGE="https://www.abisource.com/projects/link-grammar/ https://www.link.cs.cmu.edu/link/" -SRC_URI="https://www.abisource.com/downloads/${PN}/${PV}/${P}.tar.gz" +SRC_URI="https://www.gnucash.org/link-grammar/downloads/${PV}/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0/5" @@ -29,13 +29,9 @@ DEPEND="${RDEPEND}" BDEPEND=" dev-lang/swig:0 dev-build/autoconf-archive + sys-devel/flex virtual/pkgconfig" -PATCHES=( - # upstreamed (https://github.com/opencog/link-grammar/pull/1471) - "${FILESDIR}"/${P}-Wimplicit-function-declaration.patch -) - QA_CONFIG_IMPL_DECL_SKIP=( # _AC_UNDECLARED_BUILTIN false positive strchr @@ -66,6 +62,8 @@ my_src_configure() { $(use_enable aspell) $(use_enable hunspell) $(usev hunspell --with-hunspell-dictdir="${EPREFIX}"/usr/share/myspell) + # requires flex, since reflex support is flaky, #890158 + LEX="flex" ) econf \ diff --git a/dev-libs/log4cplus/Manifest b/dev-libs/log4cplus/Manifest index e18c3d1eaed9..aeac6e36da7b 100644 --- a/dev-libs/log4cplus/Manifest +++ b/dev-libs/log4cplus/Manifest @@ -1 +1 @@ -DIST log4cplus-2.0.7.tar.bz2 1210637 BLAKE2B 59e9c3c351c7893c7e9c39e9d12616579cff3b4dfdd3e069f0adb4b75fb2b46d6fe8efceea2b6103c5531a723f015518bf10ce6a581724b6ae5f49e994b74c72 SHA512 9d1b36d0c2347dd9d9ab8852114b8138f56063c51625eaab7f4c680ee852e1e6872c6712465b10057ec9e42305b83d956f6753100dfd3ec58518d6620cc4106c +DIST log4cplus-2.0.7.tar.xz 930924 BLAKE2B b36022403c070df5dfd57e2d61ca87d9bf56ff951e525be83f6bca77c0f39f4065fe18a2de4fd79fe5b4cb0d5953bee76dffd65e8d8ffb847a48166a0e6a7207 SHA512 5f5a84f215a00b52313cf75bce19a450e810300f232cd29582a23a24b426bfb62047099792243f8ec5347a8c04eb7744237b1ed4615f4a8913575406486c59c5 diff --git a/dev-libs/log4cplus/log4cplus-2.0.7.ebuild b/dev-libs/log4cplus/log4cplus-2.0.7.ebuild index 4e644ec1eb20..83bb995a3864 100644 --- a/dev-libs/log4cplus/log4cplus-2.0.7.ebuild +++ b/dev-libs/log4cplus/log4cplus-2.0.7.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 @@ -7,7 +7,7 @@ inherit cmake DESCRIPTION="C++ port of the Log for Java (log4j) logging library" HOMEPAGE="https://log4cplus.sourceforge.io/ https://github.com/log4cplus/log4cplus" -SRC_URI="mirror://sourceforge/project/${PN}/${PN}-stable/${PV}/${P}.tar.bz2" +SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}-stable/${PV}/${P}.tar.xz" LICENSE="|| ( Apache-2.0 BSD-2 )" SLOT="0/3" diff --git a/dev-libs/log4cpp/log4cpp-1.1.3-r2.ebuild b/dev-libs/log4cpp/log4cpp-1.1.3-r2.ebuild index 9677088e324a..e73fe69e5d42 100644 --- a/dev-libs/log4cpp/log4cpp-1.1.3-r2.ebuild +++ b/dev-libs/log4cpp/log4cpp-1.1.3-r2.ebuild @@ -7,7 +7,7 @@ inherit autotools DESCRIPTION="C++ classes for flexible logging to files, syslog and other destinations" HOMEPAGE="http://log4cpp.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" S="${WORKDIR}/${PN}" LICENSE="LGPL-2.1" diff --git a/dev-libs/log4cpp/log4cpp-1.1.3-r3.ebuild b/dev-libs/log4cpp/log4cpp-1.1.3-r3.ebuild index 5c9baefc2b99..4f5b087204d6 100644 --- a/dev-libs/log4cpp/log4cpp-1.1.3-r3.ebuild +++ b/dev-libs/log4cpp/log4cpp-1.1.3-r3.ebuild @@ -7,7 +7,7 @@ inherit autotools flag-o-matic DESCRIPTION="C++ classes for flexible logging to files, syslog and other destinations" HOMEPAGE="https://log4cpp.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" S="${WORKDIR}/${PN}" LICENSE="LGPL-2.1" diff --git a/dev-libs/log4cpp/log4cpp-1.1.4.ebuild b/dev-libs/log4cpp/log4cpp-1.1.4.ebuild index 3b679658a0e5..a3223acb40bc 100644 --- a/dev-libs/log4cpp/log4cpp-1.1.4.ebuild +++ b/dev-libs/log4cpp/log4cpp-1.1.4.ebuild @@ -7,7 +7,7 @@ inherit autotools flag-o-matic DESCRIPTION="C++ classes for flexible logging to files, syslog and other destinations" HOMEPAGE="https://log4cpp.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" S="${WORKDIR}/${PN}" LICENSE="LGPL-2.1" diff --git a/dev-libs/log4sh/log4sh-1.4.2.ebuild b/dev-libs/log4sh/log4sh-1.4.2.ebuild index 09caddd99216..9464b3d9655c 100644 --- a/dev-libs/log4sh/log4sh-1.4.2.ebuild +++ b/dev-libs/log4sh/log4sh-1.4.2.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 DESCRIPTION="A flexible logging framework for shell scripts" HOMEPAGE="https://sourceforge.net/projects/log4sh" -SRC_URI="mirror://sourceforge/${PN}/${P}.tgz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tgz" LICENSE="LGPL-2.1" SLOT="0" diff --git a/dev-libs/mimalloc/Manifest b/dev-libs/mimalloc/Manifest index 1570e67ef6a4..38ab22ecce28 100644 --- a/dev-libs/mimalloc/Manifest +++ b/dev-libs/mimalloc/Manifest @@ -1 +1,4 @@ DIST mimalloc-2.1.2.tar.gz 1163868 BLAKE2B bba29671fdca81b682edeefe16a1239640ea28fee4e44c97d0422ae81e0b3e7141c733459ccafc6672780157af67ff7d2a10cf4157180e003b458332a79d8481 SHA512 927b046e67783b325a6e41e3a9a6d3d78306fa1c82255defd1f3a7a60a27fd809a601f65b1b27fa38f2064e124f29856d7c0e5ccc33c54c2e4b6ebb9816d74b1 +DIST mimalloc-2.1.4.tar.gz 1133761 BLAKE2B 6271f54b8c0c0397bc0d7fb909009e05b9119c15ad3f926a82f078f3ffa7320503cc679487414d3b8e17bb41b17a43f71982727f80c7288b3b2d473992d706e5 SHA512 cdc43b212b9c67cd50b31bfae875387e3099165260fec995681a4079ca107c275452c2aadc5ee9a177391d1856750e0e2b104191bbb9829aeb5a42406267832e +DIST mimalloc-2.1.6.tar.gz 1134456 BLAKE2B 1d4d0053e6c6b582d2c82f573b61dba7b3d1d6748999d313493d9db5bfb62e7379b48c72f88afab4e8b609971974488c9d42f96e2486d5905e2a9d78730d3231 SHA512 cbecca799be7a38b291c44ac765aa6ce36c6aeb0f064da942c568da38073350a122e7d1553e7929ee4f72f61ab3b767fa565f252cfd819463d2e1c73c25c5163 +DIST mimalloc-2.1.7.tar.gz 1181422 BLAKE2B 2c4c2d61837ab315e00a5c12d1c74c8f003aa3e9159403194ba61f5dfef2f4c2497b83487f07b20ba506ecde40a6754df6b7048a3818af58168ca90b8ed44470 SHA512 4e30976758015c76a146acc1bfc8501e2e5c61b81db77d253de0d58a8edef987669243f232210667b32ef8da3a33286642acb56ba526fd24c4ba925b44403730 diff --git a/dev-libs/mimalloc/mimalloc-2.1.4.ebuild b/dev-libs/mimalloc/mimalloc-2.1.4.ebuild new file mode 100644 index 000000000000..a09a864cbf24 --- /dev/null +++ b/dev-libs/mimalloc/mimalloc-2.1.4.ebuild @@ -0,0 +1,36 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake-multilib flag-o-matic + +DESCRIPTION="A compact general purpose allocator with excellent performance" +HOMEPAGE="https://github.com/microsoft/mimalloc" +SRC_URI="https://github.com/microsoft/mimalloc/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/2" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x86" +IUSE="hardened test valgrind" +RESTRICT="!test? ( test )" + +DEPEND="valgrind? ( dev-debug/valgrind )" + +src_configure() { + local mycmakeargs=( + -DMI_SECURE=$(usex hardened) + -DMI_INSTALL_TOPLEVEL=ON + -DMI_BUILD_TESTS=$(usex test) + -DMI_BUILD_OBJECT=OFF + -DMI_BUILD_STATIC=OFF + -DMI_TRACK_VALGRIND=$(usex valgrind) + -DMI_LIBC_MUSL=$(usex elibc_musl) + ) + + # Bug #923177, #931778: append -latomic if it is available + test-flags-CCLD "-latomic" &>/dev/null && + mycmakeargs+=( -DMI_USE_LIBATOMIC=ON ) + + cmake-multilib_src_configure +} diff --git a/dev-libs/mimalloc/mimalloc-2.1.6.ebuild b/dev-libs/mimalloc/mimalloc-2.1.6.ebuild new file mode 100644 index 000000000000..164388f44adf --- /dev/null +++ b/dev-libs/mimalloc/mimalloc-2.1.6.ebuild @@ -0,0 +1,39 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake-multilib flag-o-matic + +DESCRIPTION="A compact general purpose allocator with excellent performance" +HOMEPAGE="https://github.com/microsoft/mimalloc" +SRC_URI="https://github.com/microsoft/mimalloc/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/2" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x86" +IUSE="hardened test valgrind" +RESTRICT="!test? ( test )" + +DEPEND="valgrind? ( dev-debug/valgrind )" + +src_configure() { + local mycmakeargs=( + -DMI_SECURE=$(usex hardened) + -DMI_INSTALL_TOPLEVEL=ON + -DMI_BUILD_TESTS=$(usex test) + -DMI_BUILD_OBJECT=OFF + -DMI_BUILD_STATIC=OFF + -DMI_TRACK_VALGRIND=$(usex valgrind) + -DMI_LIBC_MUSL=$(usex elibc_musl) + ) + + # XXX: Should be able to clean this up after 2.1.6 + # https://github.com/microsoft/mimalloc/pull/898 + # + # Bug #923177, #931778: append -latomic if it is available + test-flags-CCLD "-latomic" &>/dev/null && + mycmakeargs+=( -DMI_USE_LIBATOMIC=ON ) + + cmake-multilib_src_configure +} diff --git a/dev-libs/mimalloc/mimalloc-2.1.7.ebuild b/dev-libs/mimalloc/mimalloc-2.1.7.ebuild new file mode 100644 index 000000000000..f7bb6dcf66e8 --- /dev/null +++ b/dev-libs/mimalloc/mimalloc-2.1.7.ebuild @@ -0,0 +1,32 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake-multilib + +DESCRIPTION="A compact general purpose allocator with excellent performance" +HOMEPAGE="https://github.com/microsoft/mimalloc" +SRC_URI="https://github.com/microsoft/mimalloc/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/2" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x86" +IUSE="hardened test valgrind" +RESTRICT="!test? ( test )" + +DEPEND="valgrind? ( dev-debug/valgrind )" + +src_configure() { + local mycmakeargs=( + -DMI_SECURE=$(usex hardened) + -DMI_INSTALL_TOPLEVEL=ON + -DMI_BUILD_TESTS=$(usex test) + -DMI_BUILD_OBJECT=OFF + -DMI_BUILD_STATIC=OFF + -DMI_TRACK_VALGRIND=$(usex valgrind) + -DMI_LIBC_MUSL=$(usex elibc_musl) + ) + + cmake-multilib_src_configure +} diff --git a/dev-libs/miniz/Manifest b/dev-libs/miniz/Manifest index 02a0e3369c0c..636a018f5d56 100644 --- a/dev-libs/miniz/Manifest +++ b/dev-libs/miniz/Manifest @@ -1,2 +1,3 @@ DIST miniz-2.2.0.tar.gz 113592 BLAKE2B 110a71712396fb22075818f681d2e691b8b361e6c8eb786485f9fd3a1e00fcfc95bae4d470b8b1644a1e9674e69617abdba70e337f318969096db222f7a4c3d2 SHA512 0bb2b0ac627715b90ff9fd69ca8958a0bea387bd7ddf5c200daba953b98ef788092e3009842f4f123234e85570159250c8897a30c1c1f2d4dea9bca9837f6111 DIST miniz-3.0.1.tar.gz 115742 BLAKE2B 4727e55bf2ad4cf716677e6135912df61b9081f2a3a2d6a13efc77ff64a1ec8e736c089330106a81f613dac3840bc09f3aea93f6b432d832f14a6b12ba534d70 SHA512 c1cf028ceb6c12abc83ffb636753d9470155e055d2e834ab23c1c1bc9ee2ef7c7fec689cb92e3496336f850e1d1675489b0450b84e4c7e68d7066142d8df76b6 +DIST miniz-3.0.2.tar.gz 115766 BLAKE2B 57260dc5d2f382f85fb7648d4e9fb9fcca63689cdd75f27b3cf84266b112e04031cc6b5f298e3155d4b8fd635704c713572c8ed76b5a8a2f0adb737c63051f1d SHA512 426054403121f84a2ac365f7545b35fb217b41061aebaffce483568d3d374d453ab87987c599a85f1f745e0ec7144a3181ed9b100f354e2823f165ba286b0611 diff --git a/dev-libs/miniz/miniz-3.0.2.ebuild b/dev-libs/miniz/miniz-3.0.2.ebuild new file mode 100644 index 000000000000..32d829ee6e85 --- /dev/null +++ b/dev-libs/miniz/miniz-3.0.2.ebuild @@ -0,0 +1,16 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="A lossless, high performance data compression library" +HOMEPAGE="https://github.com/richgel999/miniz" +SRC_URI="https://github.com/richgel999/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" + +DOCS=( ChangeLog.md readme.md ) diff --git a/dev-libs/mpdecimal/Manifest b/dev-libs/mpdecimal/Manifest new file mode 100644 index 000000000000..925cbb7e68f4 --- /dev/null +++ b/dev-libs/mpdecimal/Manifest @@ -0,0 +1,2 @@ +DIST dectest.zip 791733 BLAKE2B ba74ee96f6687ce34cac8406fd7fd1f743d72647a5f883f1054829d992d4dc0f61c9e3b88e2529f425cc2fbda14dfc372b3fbfafe6553baabb3244172fed712f SHA512 05f9d12aec1ebfc9ca211b01705b41c5cd1bbc54d9aa6c4799b40fb3ab1835433fd1a277735d26d2530c3793c58b107b3abb1c31f64340e5e9d7856d92c821cf +DIST mpdecimal-4.0.0.tar.gz 315325 BLAKE2B aed5b6d5c03b12017989bbac9a166366e800ce5ee8d2fad5a1b81def48877126233998df306968902c728776616b1c06ce0ef05ea066c07daf841a53541a09f9 SHA512 7610ac53ac79f7a8a33fa7a3e61515810444ec73ebca859df7a9ddc18e96b990c99323172810c9cc7f6d6e1502c0be308cd443d6c2d5d0c871648e4842e05d59 diff --git a/dev-libs/zthread/metadata.xml b/dev-libs/mpdecimal/metadata.xml index 7f7a727d1d59..076793e3f54b 100644 --- a/dev-libs/zthread/metadata.xml +++ b/dev-libs/mpdecimal/metadata.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <remote-id type="sourceforge">zthread</remote-id> - </upstream> + <maintainer type="person"> + <email>mgorny@gentoo.org</email> + <name>MichaÅ‚ Górny</name> + </maintainer> </pkgmetadata> diff --git a/dev-libs/mpdecimal/mpdecimal-4.0.0.ebuild b/dev-libs/mpdecimal/mpdecimal-4.0.0.ebuild new file mode 100644 index 000000000000..57dd4df31436 --- /dev/null +++ b/dev-libs/mpdecimal/mpdecimal-4.0.0.ebuild @@ -0,0 +1,63 @@ +# Copyright 2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Correctly-rounded arbitrary precision decimal floating point arithmetic" +HOMEPAGE="https://www.bytereef.org/mpdecimal/" +SRC_URI=" + https://www.bytereef.org/software/mpdecimal/releases/${P}.tar.gz + test? ( + https://speleotrove.com/decimal/dectest.zip + ) +" + +LICENSE="BSD-2" +SLOT="$(ver_cut 1)" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE="cxx test" +RESTRICT="!test? ( test )" + +BDEPEND=" + test? ( + app-arch/unzip + ) +" + +src_unpack() { + unpack "${P}.tar.gz" + if use test; then + mkdir "${P}/tests/testdata" || die + cd "${P}/tests/testdata" || die + unpack dectest.zip + fi +} + +src_prepare() { + default + + # sigh + sed -i -e "s:/lib:/$(get_libdir):" lib*/.pc/*.pc.in || die +} + +src_configure() { + local myconf=( + # just COPYRIGHT.txt + --docdir=/removeme + $(use_enable cxx) + ) + + # more sigh + # https://bugs.gentoo.org/931599 + local -x LDXXFLAGS="${LDFLAGS}" LD="${CC}" LDXX="${CXX}" + econf "${myconf[@]}" +} + +src_test() { + emake check +} + +src_install() { + default + rm -r "${D}/removeme" || die +} diff --git a/dev-libs/mxml/Manifest b/dev-libs/mxml/Manifest index 905f517aa128..f48bdf977e33 100644 --- a/dev-libs/mxml/Manifest +++ b/dev-libs/mxml/Manifest @@ -1 +1,2 @@ DIST mxml-3.3.1.tar.gz 1554784 BLAKE2B e0d599fd947dfef72edae40c1e70ea76c92105128dd46e772a7c71f9293cab3339c980396dffe105246cad64d0474935cc1939005ad9a2bffc8e8107f025a466 SHA512 43e6a92806d9c3f5db39fbf960c15ebfa6d92ef98274b7ce39b57724d6c26ad4362d6d8f3c1023efda92e6a815df068e5038a0cd479562b6be9dbdda8e827a41 +DIST mxml-4.0.3.tar.gz 1576958 BLAKE2B fe65513190bc8c03b8a66fb6711f9dcc846c19cdf67c17908fd5795408fead3e6ae2c11c8d4ca1c10be7b68d54ab87c602ab6ca3e5386d26ff75753d4dbe6476 SHA512 5855ea90c32a250ca0943389c768f1b9d9a231762d9b678d56bcb55c12d90a51b28c66940355e945b3d315bd764001e05ede576de976132768eb1eecb2667bba diff --git a/dev-libs/mxml/mxml-4.0.3.ebuild b/dev-libs/mxml/mxml-4.0.3.ebuild new file mode 100644 index 000000000000..05352aedb401 --- /dev/null +++ b/dev-libs/mxml/mxml-4.0.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 autotools toolchain-funcs + +DESCRIPTION="A small XML parsing library that you can use to read XML data files or strings" +HOMEPAGE=" + https://github.com/michaelrsweet/mxml + https://www.msweet.org/mxml/ +" +SRC_URI="https://github.com/michaelrsweet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Mini-XML" +SLOT="4" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~sparc x86" +IUSE="static-libs test threads" +RESTRICT="!test? ( test )" + +BDEPEND="virtual/pkgconfig" + +src_prepare() { + default + + # Don't hardcode FORTIFY_SOURCE + sed -e 's/-D_FORTIFY_SOURCE=3//g' -i configure || die + sed -e 's/-D_FORTIFY_SOURCE=3//g' -i configure.ac || die + + # Don't run always tests + # Enable verbose compiling + sed -e '/ALLTARGETS/s/testmxml//g' -e '/.SILENT:/d' -i Makefile.in || die + eautoconf +} + +src_configure() { + local myeconfargs=( + AR="$(tc-getAR)" + $(use_enable static-libs static) + $(use_enable threads) + --with-docdir=/usr/share/doc/"${PF}" + --with-dsoflags="${LDFLAGS}" + --with-ldflags="${LDFLAGS}" + + ) + + econf "${myeconfargs[@]}" +} + +src_compile() { + default + use test && emake testmxml +} + +src_test() { + emake test +} + +src_install() { + emake DSTROOT="${ED}" install +} diff --git a/dev-libs/ncnn/Manifest b/dev-libs/ncnn/Manifest index 592ae5fadcbd..21d62df6542b 100644 --- a/dev-libs/ncnn/Manifest +++ b/dev-libs/ncnn/Manifest @@ -1 +1 @@ -DIST ncnn-20240102.tar.gz 12791570 BLAKE2B 8a84353343d32bea1ef163a83cdef783a8a6077282e94a012d21a17b2e0d8c78c576ebd1dc5c9ec89364942b4ce69ab44d544648fe2dbd5fda4797b3b65adfd8 SHA512 31bc3c2f461a00241fb8f69ca6ea8cc590af6618856b1b84a048bde924e4b474fd883ad5d54dbfbdd1e5b59015889e15ffc4fbafccb3e42e052a02071f2017b1 +DIST ncnn-20240410.tar.gz 12835689 BLAKE2B b4c2ffdf525719dca81d020695f03cd963c3a1f1a0ecc61b6e08c75da212d280210bf1be9b54343a771661fef747675e7f08d0dd9e3ea942adfda1e07d1f6868 SHA512 61865af26aecc6b0eccdfd46c5b3f6e4dd06d7409298051c91d141e64b8c15690f2f982c0aeb3a11d3a575061ab7606710cb0e710f4cb6539c7a14ff440aaaf7 diff --git a/dev-libs/ncnn/ncnn-20240102-r1.ebuild b/dev-libs/ncnn/ncnn-20240410.ebuild index 0a726c51cc3e..3ca6898ed9c5 100644 --- a/dev-libs/ncnn/ncnn-20240102-r1.ebuild +++ b/dev-libs/ncnn/ncnn-20240410.ebuild @@ -60,5 +60,9 @@ src_configure() { -DNCNN_VULKAN=$(usex vulkan) ) + # temporary workaround due to a >=clang-18 regression (bug #929228) + tc-is-clang && [[ $(clang-major-version) -ge 18 ]] && + mycmakeargs+=( -DNCNN_AVX512BF16=no ) + cmake_src_configure } diff --git a/dev-libs/newt/Manifest b/dev-libs/newt/Manifest index 78e8d9dbbf42..397932fcbcff 100644 --- a/dev-libs/newt/Manifest +++ b/dev-libs/newt/Manifest @@ -1,2 +1 @@ -DIST newt-0.52.23.tar.gz 128884 BLAKE2B 283809ac259475588b2f277e6c14ddc2981204f8d6c4963aa9ca7bf87376d2025e9edcc3194804bd6928f75deef706758e1868ba730fd06856ed0a95e534be00 SHA512 8040b01178311532c31642daae5bffc9c0f1917d28957164a02b3f5bd402e6561ff6faee75a936f72485eb71004238ede78c1973a970451fb5aaccff231887c7 DIST newt-0.52.24.tar.gz 128895 BLAKE2B fff7b3831f53a33b2d4f009fae0eb5603aef79c50f89e7f7179b80be837db35e44ecc860e4dc85e46195a59a87c12b2feae2ab043bef2fee0ea35a6efeded474 SHA512 999d8109dd3d74d04e813e84dc2e348278016dce7a678a1566197cf8fbc87810257b8a29fa766d29d48dc18bf4e1508b022460f15503fb6d029b3a05528b50be diff --git a/dev-libs/newt/files/newt-0.52.14-tcl.patch b/dev-libs/newt/files/newt-0.52.14-tcl.patch deleted file mode 100644 index 4e10d2baae9e..000000000000 --- a/dev-libs/newt/files/newt-0.52.14-tcl.patch +++ /dev/null @@ -1,108 +0,0 @@ -diff --git a/whiptcl.c b/whiptcl.c -index 8688780..7219911 100644 ---- a/whiptcl.c -+++ b/whiptcl.c -@@ -137,45 +137,45 @@ static int wtCmd(ClientData clientData, Tcl_Interp * interp, int argc, - - if (arg < -1) { - /* this could buffer oveflow, bug we're not setuid so I don't care */ -- interp->result = malloc(200); -- interp->freeProc = TCL_DYNAMIC; -- sprintf(interp->result, "%s: %s\n", -+ char *tmp = malloc(200); -+ sprintf(tmp, "%s: %s\n", - poptBadOption(optCon, POPT_BADOPTION_NOALIAS), - poptStrerror(arg)); -+ Tcl_SetResult(interp, tmp, TCL_DYNAMIC); - - return TCL_ERROR; - } - - if (mode == MODE_NONE) { -- interp->result = "no dialog mode was specified"; -+ Tcl_SetResultString(interp, "no dialog mode was specified"); - return TCL_ERROR; - } else if (rc) { -- interp->result = "multiple modes were specified"; -+ Tcl_SetResultString(interp, "multiple modes were specified"); - return TCL_ERROR; - } - - if (!(text = poptGetArg(optCon))) { -- interp->result = "missing text parameter"; -+ Tcl_SetResultString(interp, "missing text parameter"); - return TCL_ERROR; - } - - if (!(nextArg = poptGetArg(optCon))) { -- interp->result = "height missing"; -+ Tcl_SetResultString(interp, "height missing"); - return TCL_ERROR; - } - height = strtoul(nextArg, &end, 10); - if (*end) { -- interp->result = "height is not a number"; -+ Tcl_SetResultString(interp, "height is not a number"); - return TCL_ERROR; - } - - if (!(nextArg = poptGetArg(optCon))) { -- interp->result = "width missing"; -+ Tcl_SetResultString(interp, "width missing"); - return TCL_ERROR; - } - width = strtoul(nextArg, &end, 10); - if (*end) { -- interp->result = "width is not a number"; -+ Tcl_SetResultString(interp, "width is not a number"); - return TCL_ERROR; - } - -@@ -196,33 +196,30 @@ static int wtCmd(ClientData clientData, Tcl_Interp * interp, int argc, - case MODE_YESNO: - rc = messageBox(text, height, width, MSGBOX_YESNO, flags); - if (rc == DLG_OKAY) -- interp->result = "yes"; -+ Tcl_SetResultString(interp, "yes"); - else -- interp->result = "no"; -+ Tcl_SetResultString(interp, "no"); - if (rc == DLG_ERROR) rc = 0; - break; - - case MODE_INPUTBOX: - rc = inputBox(text, height, width, optCon, flags, &result); - if (rc ==DLG_OKAY) { -- interp->result = result; -- interp->freeProc = TCL_DYNAMIC; -+ Tcl_SetResult(interp, result, TCL_DYNAMIC); - } - break; - - case MODE_MENU: - rc = listBox(text, height, width, optCon, flags, default_item, &result); - if (rc==DLG_OKAY) { -- interp->result = result; -- interp->freeProc = TCL_DYNAMIC; -+ Tcl_SetResult(interp, result, TCL_DYNAMIC); - } - break; - - case MODE_RADIOLIST: - rc = checkList(text, height, width, optCon, 1, flags, &selections); - if (rc==DLG_OKAY) { -- interp->result = selections[0]; -- interp->freeProc = TCL_DYNAMIC; -+ Tcl_SetResult(interp, selections[0], TCL_DYNAMIC); - - free(selections); - } -@@ -247,7 +244,7 @@ static int wtCmd(ClientData clientData, Tcl_Interp * interp, int argc, - newtPopWindow(); - - if (rc == DLG_ERROR) { -- interp->result = "bad paramter for whiptcl dialog box"; -+ Tcl_SetResultString(interp, "bad paramter for whiptcl dialog box"); - return TCL_ERROR; - } - diff --git a/dev-libs/newt/files/newt-0.52.22-gold.patch b/dev-libs/newt/files/newt-0.52.22-gold.patch deleted file mode 100644 index add9ce872dfd..000000000000 --- a/dev-libs/newt/files/newt-0.52.22-gold.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ur a/configure.ac b/configure.ac ---- a/configure.ac 2022-11-21 07:58:11.000000000 -0600 -+++ b/configure.ac 2022-11-21 20:56:42.211913050 -0600 -@@ -24,7 +24,8 @@ - AC_MSG_CHECKING([for GNU ld]) - LD=$($CC -print-prog-name=ld 2>&5) - --if test $($LD -v 2>&1 | $ac_cv_path_GREP -c "GNU ld") = 0; then -+if test $($LD -v 2>&1 | $ac_cv_path_GREP -c "GNU ld") = 0 -a \ -+ test $($LD -v 2>&1 | $ac_cv_path_GREP -c "GNU gold") = 0; then - # Not - GNU_LD="" - AC_MSG_RESULT([no]) diff --git a/dev-libs/newt/newt-0.52.23-r1.ebuild b/dev-libs/newt/newt-0.52.23-r1.ebuild deleted file mode 100644 index 14380493db38..000000000000 --- a/dev-libs/newt/newt-0.52.23-r1.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) - -inherit autotools python-r1 toolchain-funcs - -MY_PV="r$(ver_rs 1- -)" - -DESCRIPTION="Redhat's Newt windowing toolkit development files" -HOMEPAGE="https://pagure.io/newt" -SRC_URI="https://github.com/mlichvar/newt/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86" -IUSE="gpm nls tcl" -RESTRICT="test" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND=" - ${PYTHON_DEPS} - >=dev-libs/popt-1.6 - =sys-libs/slang-2* - gpm? ( sys-libs/gpm ) - tcl? ( >=dev-lang/tcl-8.5:0 ) - " -DEPEND="${RDEPEND}" -BDEPEND="sys-devel/gettext" - -PATCHES=( - "${FILESDIR}"/${PN}-0.52.23-gold.patch - "${FILESDIR}"/${PN}-0.52.21-python-sitedir.patch -) - -S=${WORKDIR}/${PN}-${MY_PV} - -src_prepare() { - sed -i Makefile.in \ - -e 's|$(SHCFLAGS) -o|$(LDFLAGS) &|g' \ - -e 's|-g -o|$(CFLAGS) $(LDFLAGS) -o|g' \ - -e 's|-shared -o|$(CFLAGS) $(LDFLAGS) &|g' \ - -e 's|instroot|DESTDIR|g' \ - -e 's| make | $(MAKE) |g' \ - -e "s| ar | $(tc-getAR) |g" \ - || die "sed Makefile.in" - - if [[ -n ${LINGUAS} ]]; then - local lang langs - for lang in ${LINGUAS}; do - test -r po/${lang}.po && langs="${langs} ${lang}.po" - done - sed -i po/Makefile \ - -e "/^CATALOGS = /cCATALOGS = ${langs}" \ - || die "sed po/Makefile" - fi - - default - eautoreconf - - # can't build out-of-source - python_copy_sources -} - -src_configure() { - configuring() { - econf \ - PYTHONVERS="${PYTHON}" \ - $(use_with gpm gpm-support) \ - $(use_with tcl) \ - $(use_enable nls) - } - python_foreach_impl run_in_build_dir configuring -} - -src_compile() { - building() { - emake PYTHONVERS="${EPYTHON}" - } - python_foreach_impl run_in_build_dir building -} - -src_install() { - installit() { - emake \ - DESTDIR="${D}" \ - PYTHON_SITEDIR="$(python_get_sitedir)" \ - PYTHONVERS="${EPYTHON}" \ - install - python_optimize - } - python_foreach_impl run_in_build_dir installit - dodoc peanuts.py popcorn.py tutorial.sgml - doman whiptail.1 - einstalldocs - - # don't want static archives - rm "${ED}"/usr/$(get_libdir)/libnewt.a || die -} diff --git a/dev-libs/newt/newt-0.52.23.ebuild b/dev-libs/newt/newt-0.52.23.ebuild deleted file mode 100644 index f4565ff37ed1..000000000000 --- a/dev-libs/newt/newt-0.52.23.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) - -inherit autotools python-r1 toolchain-funcs - -MY_PV="r$(ver_rs 1- -)" - -DESCRIPTION="Redhat's Newt windowing toolkit development files" -HOMEPAGE="https://pagure.io/newt" -SRC_URI="https://github.com/mlichvar/newt/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86" -IUSE="gpm nls tcl" -RESTRICT="test" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND=" - ${PYTHON_DEPS} - >=dev-libs/popt-1.6 - =sys-libs/slang-2* - gpm? ( sys-libs/gpm ) - tcl? ( >=dev-lang/tcl-8.5:0 ) - " -DEPEND="${RDEPEND}" -BDEPEND="sys-devel/gettext" - -PATCHES=( - "${FILESDIR}"/${PN}-0.52.22-gold.patch -# "${FILESDIR}"/${PN}-0.52.14-tcl.patch - "${FILESDIR}"/${PN}-0.52.21-python-sitedir.patch -) - -S=${WORKDIR}/${PN}-${MY_PV} - -src_prepare() { - sed -i Makefile.in \ - -e 's|$(SHCFLAGS) -o|$(LDFLAGS) &|g' \ - -e 's|-g -o|$(CFLAGS) $(LDFLAGS) -o|g' \ - -e 's|-shared -o|$(CFLAGS) $(LDFLAGS) &|g' \ - -e 's|instroot|DESTDIR|g' \ - -e 's| make | $(MAKE) |g' \ - -e "s| ar | $(tc-getAR) |g" \ - || die "sed Makefile.in" - - if [[ -n ${LINGUAS} ]]; then - local lang langs - for lang in ${LINGUAS}; do - test -r po/${lang}.po && langs="${langs} ${lang}.po" - done - sed -i po/Makefile \ - -e "/^CATALOGS = /cCATALOGS = ${langs}" \ - || die "sed po/Makefile" - fi - - default - eautoreconf - - # can't build out-of-source - python_copy_sources -} - -src_configure() { - configuring() { - econf \ - PYTHONVERS="${PYTHON}" \ - $(use_with gpm gpm-support) \ - $(use_with tcl) \ - $(use_enable nls) - } - python_foreach_impl run_in_build_dir configuring -} - -src_compile() { - building() { - emake PYTHONVERS="${EPYTHON}" - } - python_foreach_impl run_in_build_dir building -} - -src_install() { - installit() { - emake \ - DESTDIR="${D}" \ - PYTHON_SITEDIR="$(python_get_sitedir)" \ - PYTHONVERS="${EPYTHON}" \ - install - python_optimize - } - python_foreach_impl run_in_build_dir installit - dodoc peanuts.py popcorn.py tutorial.sgml - doman whiptail.1 - einstalldocs - - # don't want static archives - rm "${ED}"/usr/$(get_libdir)/libnewt.a || die -} diff --git a/dev-libs/newt/newt-0.52.24.ebuild b/dev-libs/newt/newt-0.52.24.ebuild index 2fdfcec485bd..35ed84283890 100644 --- a/dev-libs/newt/newt-0.52.24.ebuild +++ b/dev-libs/newt/newt-0.52.24.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://github.com/mlichvar/newt/archive/${MY_PV}.tar.gz -> ${P}.tar.gz LICENSE="LGPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86" IUSE="gpm nls tcl" RESTRICT="test" diff --git a/dev-libs/nmeap/nmeap-0.3-r2.ebuild b/dev-libs/nmeap/nmeap-0.3-r2.ebuild index ada71a745ed8..98901544f3dc 100644 --- a/dev-libs/nmeap/nmeap-0.3-r2.ebuild +++ b/dev-libs/nmeap/nmeap-0.3-r2.ebuild @@ -7,7 +7,7 @@ inherit toolchain-funcs DESCRIPTION="Extensible NMEA-0183 (GPS) data parser in standard C" HOMEPAGE="http://nmeap.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" LICENSE="BSD" SLOT="0" diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest index f149c1b512b6..c12179849b44 100644 --- a/dev-libs/nss/Manifest +++ b/dev-libs/nss/Manifest @@ -1,5 +1,3 @@ +DIST nss-3.100.tar.gz 76746058 BLAKE2B 3e114ff7ae5b06a05af9cd62315cbc8d56bf3153126be857b935c5f8db52defcfc2ef13820a896127172a5cb3628c0773965d29a928f41cb5c43630e64095344 SHA512 725c10ffc02fc17347a213b42fabad789aec2c6352fe803b4ad166695ab59495849e9a69684578eb274faf818ec2277f2d433167cdd27997dcf8d8e94dd4df34 DIST nss-3.90.2.tar.gz 72215444 BLAKE2B 74b8eebf5f053dcebd9c6e6ef17c6113ac42a01f910f4ba621dadb09739d5a6090d022800d2c3a4bc0c58413f03512ca611ead1098488d303f1ee1e4bca5c222 SHA512 048a0c0a06fef8cd9c363ac511b9d6125ec131a306c5e093525a937f9e8740f1a2163f274c9a3907ed38331b2fb99b22b528b5e89da1e186c9ba9473d959ef4a -DIST nss-3.91-fixed-certs.tar.xz 11300 BLAKE2B 85f191b85c7caf1ee24f92a2ff76f7660a1afd64d6c8d9da84f521aea18cb12bdf3d08426c47302a4b444b0e4b4ed2f2251ed8234d5bc0006b00cd4b97aacc51 SHA512 88d2a47ba160f93f2f2c88a1e2a591c516d19209bd77cc18111c8538d9cf86498cbfd57c7e36478819bde307d90ba31e0a12a9c17320ae5dc736d02959a32a3a -DIST nss-3.91.tar.gz 72267945 BLAKE2B 7dcd680311a5503007c0bb738ec24b50e40841470592c2d8dd542b3bdf085a6e4816f1fab4cb6b86220ff3e39a828f57a0a9172e3d1c2c82537eab6558a50226 SHA512 65258a4ea0b8c06ec49dd411eabe860ad5d7c3873beb27f8f43e10ef6be020b1522112df9deaeed27f23fd72f13cc7554e9c1854cd97e4716de419f722aff020 -DIST nss-3.99.tar.gz 76753982 BLAKE2B b6ce605232934644b6d80682615eac2fa171078fcdd75316ab2accc55caeaed5b548f16c2cef5cefcfb37b96a4d6eb918785be3aa195a561e46d2d3fd8fa217b SHA512 8ae032f3cb8eadfe524505d20e430b90ed25af2b4732b2cf286c435b0fcd5701d2f5c48bd2cfb3f9aa0bfdf503c1f3d5394cf34f860f51a1141cc4a7586bba32 DIST nss-cacert-class1-class3-r2.patch 21925 BLAKE2B 7627ff9a09f084c19d72d0490676865e3cab3ca7c920ae1ce4bea2db664f37fd0aa84fcda919809a516891ab2a62e2e7a43a9d6ada4c231adfe4c216525fac7d SHA512 1ce6ff9ab310aaca9005eafb461338b291df8523cc7044e096cd75774ce746c26eed19ec6bb2643c6c67f94650f2f309463492d80a90568f38ce2557f8ada2f4 diff --git a/dev-libs/nss/files/nss-3.23-hppa-byte_order.patch b/dev-libs/nss/files/nss-3.23-hppa-byte_order.patch deleted file mode 100644 index 63cfaddb808c..000000000000 --- a/dev-libs/nss/files/nss-3.23-hppa-byte_order.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- nss/lib/dbm/include/mcom_db.h -+++ nss/lib/dbm/include/mcom_db.h -@@ -110,11 +110,13 @@ - #endif /* !BYTE_ORDER */ - #endif /* __sun */ - -+#ifndef BYTE_ORDER - #if defined(__hpux) || defined(__hppa) - #define BYTE_ORDER BIG_ENDIAN - #define BIG_ENDIAN 4321 - #define LITTLE_ENDIAN 1234 /* LSB first: i386, vax, all NT risc */ - #endif -+#endif /* !BYTE_ORDER */ - - #if defined(AIXV3) || defined(AIX) - /* BYTE_ORDER, LITTLE_ENDIAN, BIG_ENDIAN are all defined here */ diff --git a/dev-libs/nss/files/nss-3.90-remove-support-of-curve25519.patch b/dev-libs/nss/files/nss-3.90-remove-support-of-curve25519.patch new file mode 100644 index 000000000000..d883db8181d1 --- /dev/null +++ b/dev-libs/nss/files/nss-3.90-remove-support-of-curve25519.patch @@ -0,0 +1,78 @@ +# HG changeset patch +# User Natalia Kulatova <nkulatova@mozilla.com> +# Date 1687519432 0 +# Fri Jun 23 11:23:52 2023 +0000 +# Node ID 653f4c1b58425219c0e9c005d555994a3fe1fa72 +# Parent f095bf91ffaa273ea38ca6df34c905e5442de012 +Bug 1836925 - Removing the support of Curve25519 r=bbeurdouche,nss-reviewers + +Differential Revision: https://phabricator.services.mozilla.com/D180068 + +diff -r f095bf91ffaa -r 653f4c1b5842 lib/freebl/Makefile +--- a/lib/freebl/Makefile Fri Jun 23 08:56:27 2023 +0000 ++++ b/lib/freebl/Makefile Fri Jun 23 11:23:52 2023 +0000 +@@ -568,9 +568,6 @@ + HAVE_INT128_SUPPORT = 1 + DEFINES += -DHAVE_INT128_SUPPORT + else ifeq (1,$(CC_IS_GCC)) +- ifeq ($(CPU_ARCH),x86_64) +- SUPPORTS_VALE_CURVE25519 = 1 +- endif + ifneq (,$(filter 4.6 4.7 4.8 4.9,$(word 1,$(GCC_VERSION)).$(word 2,$(GCC_VERSION)))) + HAVE_INT128_SUPPORT = 1 + DEFINES += -DHAVE_INT128_SUPPORT +@@ -595,11 +592,6 @@ + DEFINES += -DKRML_VERIFIED_UINT128 + endif + +-ifdef SUPPORTS_VALE_CURVE25519 +- VERIFIED_SRCS += Hacl_Curve25519_64.c +- DEFINES += -DHACL_CAN_COMPILE_INLINE_ASM +-endif +- + ifndef NSS_DISABLE_CHACHAPOLY + ifeq ($(CPU_ARCH),x86_64) + ifndef NSS_DISABLE_AVX2 +diff -r f095bf91ffaa -r 653f4c1b5842 lib/freebl/freebl.gyp +--- a/lib/freebl/freebl.gyp Fri Jun 23 08:56:27 2023 +0000 ++++ b/lib/freebl/freebl.gyp Fri Jun 23 11:23:52 2023 +0000 +@@ -866,12 +866,6 @@ + }], + ], + }], +- [ 'supports_vale_curve25519==1', { +- 'defines': [ +- # The Makefile does version-tests on GCC, but we're not doing that here. +- 'HACL_CAN_COMPILE_INLINE_ASM', +- ], +- }], + [ 'OS=="linux" or OS=="android"', { + 'conditions': [ + [ 'target_arch=="x64"', { +@@ -934,11 +928,6 @@ + 'variables': { + 'module': 'nss', + 'conditions': [ +- [ 'target_arch=="x64" and cc_is_gcc==1', { +- 'supports_vale_curve25519%': 1, +- }, { +- 'supports_vale_curve25519%': 0, +- }], + [ 'target_arch=="x64" or target_arch=="arm64" or target_arch=="aarch64"', { + 'have_int128_support%': 1, + }, { +diff -r f095bf91ffaa -r 653f4c1b5842 lib/freebl/freebl_base.gypi +--- a/lib/freebl/freebl_base.gypi Fri Jun 23 08:56:27 2023 +0000 ++++ b/lib/freebl/freebl_base.gypi Fri Jun 23 11:23:52 2023 +0000 +@@ -154,11 +154,6 @@ + 'ecl/curve25519_32.c', + ], + }], +- ['supports_vale_curve25519==1', { +- 'sources': [ +- 'verified/Hacl_Curve25519_64.c', +- ], +- }], + ['(target_arch!="ppc64" and target_arch!="ppc64le") or disable_altivec==1', { + 'sources': [ + # Gyp does not support per-file cflags, so working around like this. diff --git a/dev-libs/nss/files/nss-3.90.2-backport-D180718.patch b/dev-libs/nss/files/nss-3.90.2-backport-D180718.patch new file mode 100644 index 000000000000..102ed5227488 --- /dev/null +++ b/dev-libs/nss/files/nss-3.90.2-backport-D180718.patch @@ -0,0 +1,35 @@ +https://github.com/nss-dev/nss/commit/6ab861ba652985ce5985a3fb1ddc87a15aac5027 +https://bugzilla.mozilla.org/show_bug.cgi?id=1835357 +https://phabricator.services.mozilla.com/D180718 + +From 6ab861ba652985ce5985a3fb1ddc87a15aac5027 Mon Sep 17 00:00:00 2001 +From: Robert Relyea <rrelyea@redhat.com> +Date: Mon, 12 Jun 2023 11:18:03 -0700 +Subject: [PATCH] Bug 1835357 dbtests.sh failure in "certutil dump keys with + explicit default trust flags" r=jschanck + + Fix the time value so we don't fail on slower or overloaded platforms. + + bob + +Differential Revision: https://phabricator.services.mozilla.com/D180718 + +--HG-- +extra : rebase_source : 3fb50de29dbf5f635cae10e962eb995c25cd108a +--- + tests/dbtests/dbtests.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/dbtests/dbtests.sh b/tests/dbtests/dbtests.sh +index b0b195d4d0..c82ea85caf 100755 +--- a/tests/dbtests/dbtests.sh ++++ b/tests/dbtests/dbtests.sh +@@ -366,7 +366,7 @@ dbtest_main() + RARRAY=($dtime) + TIMEARRAY=(${RARRAY[1]//./ }) + echo "${TIMEARRAY[0]} seconds" +- test ${TIMEARRAY[0]} -lt 2 ++ test ${TIMEARRAY[0]} -lt 5 + ret=$? + html_msg ${ret} 0 "certutil dump keys with explicit default trust flags" + fi diff --git a/dev-libs/nss/nss-3.99.ebuild b/dev-libs/nss/nss-3.100.ebuild index 0977ca4223fb..0977ca4223fb 100644 --- a/dev-libs/nss/nss-3.99.ebuild +++ b/dev-libs/nss/nss-3.100.ebuild diff --git a/dev-libs/nss/nss-3.90.2.ebuild b/dev-libs/nss/nss-3.90.2-r1.ebuild index 930fe521611a..254fcbac0a89 100644 --- a/dev-libs/nss/nss-3.90.2.ebuild +++ b/dev-libs/nss/nss-3.90.2-r1.ebuild @@ -39,6 +39,8 @@ PATCHES=( "${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch" "${FILESDIR}"/nss-3.87-use-clang-as-bgo892686.patch "${FILESDIR}"/nss-3.90.2-bmo-1885749-disable-ASM-C25519-on-non-X86_64.patch + "${FILESDIR}"/nss-3.90-remove-support-of-curve25519.patch + "${FILESDIR}/${PN}-3.90.2-backport-D180718.patch" ) src_prepare() { diff --git a/dev-libs/nss/nss-3.91.ebuild b/dev-libs/nss/nss-3.91.ebuild deleted file mode 100644 index dc4d953a74ad..000000000000 --- a/dev-libs/nss/nss-3.91.ebuild +++ /dev/null @@ -1,423 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic multilib toolchain-funcs multilib-minimal - -NSPR_VER="4.35" -RTM_NAME="NSS_${PV//./_}_RTM" - -# nss-3.91-fixed-certs.tar.xz is a workaround for older NSS versions to -# fix tests for bug #914837. -DESCRIPTION="Mozilla's Network Security Services library that implements PKI support" -HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS" -SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz - cacert? ( https://dev.gentoo.org/~whissi/dist/ca-certificates/nss-cacert-class1-class3-r2.patch ) - test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-3.91-fixed-certs.tar.xz )" - -LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris" -IUSE="cacert test +utils cpu_flags_ppc_altivec cpu_flags_x86_avx2 cpu_flags_x86_sse3 cpu_flags_ppc_vsx" -RESTRICT="!test? ( test )" -# pkg-config called by nss-config -> virtual/pkgconfig in RDEPEND -RDEPEND=" - >=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}] - >=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}] - >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] - virtual/pkgconfig -" -DEPEND="${RDEPEND}" -BDEPEND="dev-lang/perl" - -S="${WORKDIR}/${P}/${PN}" - -MULTILIB_CHOST_TOOLS=( - /usr/bin/nss-config -) - -PATCHES=( - "${FILESDIR}/${PN}-3.53-gentoo-fixups.patch" - "${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch" - "${FILESDIR}/${PN}-3.23-hppa-byte_order.patch" - "${FILESDIR}"/nss-3.87-use-clang-as-bgo892686.patch -) - -src_prepare() { - default - - if use cacert ; then - eapply -p2 "${DISTDIR}"/nss-cacert-class1-class3-r2.patch - fi - - pushd coreconf >/dev/null || die - # hack nspr paths - echo 'INCLUDES += -I$(DIST)/include/dbm' \ - >> headers.mk || die "failed to append include" - - # modify install path - sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \ - -i source.mk || die - - # Respect LDFLAGS - sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk - - # Workaround make-4.4's change to sub-make, bmo#1800237, bgo#882069 - sed -i -e "s/^CPU_TAG = _.*/CPU_TAG = _$(nssarch)/" Linux.mk || die - - popd >/dev/null || die - - # Fix pkgconfig file for Prefix - sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \ - config/Makefile || die - - # use host shlibsign if need be #436216 - if tc-is-cross-compiler ; then - sed -i \ - -e 's:"${2}"/shlibsign:shlibsign:' \ - cmd/shlibsign/sign.sh || die - fi - - # dirty hack - sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \ - lib/ssl/config.mk || die - sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \ - cmd/platlibs.mk || die - - if use test ; then - cp "${WORKDIR}"/${PN}-3.91-fixed-certs/* tests/libpkix/certs/ || die - fi - - multilib_copy_sources - - strip-flags -} - -multilib_src_configure() { - # Ensure we stay multilib aware - sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" config/Makefile || die -} - -nssarch() { - # Most of the arches are the same as $ARCH - local t=${1:-${CHOST}} - case ${t} in - *86*-pc-solaris2*) echo "i86pc" ;; - aarch64*) echo "aarch64" ;; - hppa*) echo "parisc" ;; - i?86*) echo "i686" ;; - x86_64*) echo "x86_64" ;; - *) tc-arch ${t} ;; - esac -} - -nssbits() { - local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS" - if [[ ${1} == BUILD_ ]]; then - cc=$(tc-getBUILD_CC) - else - cc=$(tc-getCC) - fi - echo > "${T}"/test.c || die - ${cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}/${1}test.o" || die - case $(file "${T}/${1}test.o") in - *32-bit*x86-64*) echo USE_X32=1;; - *64-bit*|*ppc64*|*x86_64*) echo USE_64=1;; - *32-bit*|*ppc*|*i386*) ;; - *) die "Failed to detect whether ${cc} builds 64bits or 32bits, disable distcc if you're using it, please";; - esac -} - -multilib_src_compile() { - # use ABI to determine bit'ness, or fallback if unset - local buildbits mybits - case "${ABI}" in - n32) mybits="USE_N32=1";; - x32) mybits="USE_X32=1";; - s390x|*64) mybits="USE_64=1";; - ${DEFAULT_ABI}) - einfo "Running compilation test to determine bit'ness" - mybits=$(nssbits) - ;; - esac - # bitness of host may differ from target - if tc-is-cross-compiler; then - buildbits=$(nssbits BUILD_) - fi - - local makeargs=( - CC="$(tc-getCC)" - CCC="$(tc-getCXX)" - AR="$(tc-getAR) rc \$@" - RANLIB="$(tc-getRANLIB)" - OPTIMIZER= - ${mybits} - disable_ckbi=0 - ) - - # Take care of nspr settings #436216 - local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)" - unset NSPR_INCLUDE_DIR - - export NSS_ALLOW_SSLKEYLOGFILE=1 - export NSS_ENABLE_WERROR=0 #567158 - export BUILD_OPT=1 - export NSS_USE_SYSTEM_SQLITE=1 - export NSDISTMODE=copy - export FREEBL_NO_DEPEND=1 - export FREEBL_LOWHASH=1 - export NSS_SEED_ONLY_DEV_URANDOM=1 - export USE_SYSTEM_ZLIB=1 - export ZLIB_LIBS=-lz - export ASFLAGS="" - # Fix build failure on arm64 - export NS_USE_GCC=1 - # Detect compiler type and set proper environment value - if tc-is-gcc; then - export CC_IS_GCC=1 - elif tc-is-clang; then - export CC_IS_CLANG=1 - fi - - export NSS_DISABLE_GTESTS=$(usex !test 1 0) - - # Include exportable custom settings defined by users, #900915 - # Two examples uses: - # EXTRA_NSSCONF="MYONESWITCH=1" - # EXTRA_NSSCONF="MYVALUE=0 MYOTHERVALUE=1 MYTHIRDVALUE=1" - # e.g. - # EXTRA_NSSCONF="NSS_ALLOW_SSLKEYLOGFILE=0" - # or - # EXTRA_NSSCONF="NSS_ALLOW_SSLKEYLOGFILE=0 NSS_ENABLE_WERROR=1" - # etc. - if [[ -n "${EXTRA_NSSCONF}" ]]; then - ewarn "EXTRA_NSSCONF applied, please disable custom settings before reporting bugs." - read -a myextranssconf <<< "${EXTRA_NSSCONF}" - - for (( i=0; i<${#myextranssconf[@]}; i++ )); do - export "${myextranssconf[$i]}" - echo "exported ${myextranssconf[$i]}" - done - fi - - # explicitly disable altivec/vsx if not requested - # https://bugs.gentoo.org/789114 - case ${ARCH} in - ppc*) - use cpu_flags_ppc_altivec || export NSS_DISABLE_ALTIVEC=1 - use cpu_flags_ppc_vsx || export NSS_DISABLE_CRYPTO_VSX=1 - ;; - esac - - use cpu_flags_x86_avx2 || export NSS_DISABLE_AVX2=1 - use cpu_flags_x86_sse3 || export NSS_DISABLE_SSE3=1 - - local d - - # Build the host tools first. - LDFLAGS="${BUILD_LDFLAGS}" \ - XCFLAGS="${BUILD_CFLAGS}" \ - NSPR_LIB_DIR="${T}/fakedir" \ - emake -C coreconf \ - CC="$(tc-getBUILD_CC)" \ - ${buildbits-${mybits}} - makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" ) - - # Then build the target tools. - for d in . lib/dbm ; do - CPPFLAGS="${myCPPFLAGS}" \ - XCFLAGS="${CFLAGS} ${CPPFLAGS}" \ - NSPR_LIB_DIR="${T}/fakedir" \ - emake "${makeargs[@]}" -C ${d} OS_TEST="$(nssarch)" - done -} - -multilib_src_test() { - einfo "Tests can take a *long* time, especially on a multilib system." - einfo "30-45+ minutes per lib configuration. Bug #852755" - - # https://www.linuxfromscratch.org/blfs/view/svn/postlfs/nss.html - # https://firefox-source-docs.mozilla.org/security/nss/legacy/nss_sources_building_testing/index.html#running_the_nss_test_suite - # https://www-archive.mozilla.org/projects/security/pki/nss/testnss_32.html (older) - export BUILD_OPT=1 - export HOST="localhost" - export DOMSUF="localdomain" - export USE_IP=TRUE - export IP_ADDRESS="127.0.0.1" - # Per README, this is recommended to make run tests quicker. - export NSS_CYCLES="standard" - - NSINSTALL="${PWD}/$(find -type f -name nsinstall)" - - cd "${BUILD_DIR}"/tests || die - # Hack to get current objdir (prefixed dir where built binaries are) - # Without this, at least multilib tests go wrong when building the amd64 variant - # after x86. - local objdir=$(find "${BUILD_DIR}"/dist -maxdepth 1 -iname Linux* | rev | cut -d/ -f1 | rev) - - # Can tweak to a subset of tests in future if we need to, but would prefer not - OBJDIR="${objdir}" DIST="${BUILD_DIR}/dist" MOZILLA_ROOT="${BUILD_DIR}" ./all.sh || die -} - -# Altering these 3 libraries breaks the CHK verification. -# All of the following cause it to break: -# - stripping -# - prelink -# - ELF signing -# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html -# Either we have to NOT strip them, or we have to forcibly resign after -# stripping. -#local_libdir="$(get_libdir)" -#export STRIP_MASK=" -# */${local_libdir}/libfreebl3.so* -# */${local_libdir}/libnssdbm3.so* -# */${local_libdir}/libsoftokn3.so*" - -export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3" - -generate_chk() { - local shlibsign="$1" - local libdir="$2" - einfo "Resigning core NSS libraries for FIPS validation" - shift 2 - local i - for i in ${NSS_CHK_SIGN_LIBS} ; do - local libname=lib${i}.so - local chkname=lib${i}.chk - "${shlibsign}" \ - -i "${libdir}"/${libname} \ - -o "${libdir}"/${chkname}.tmp \ - && mv -f \ - "${libdir}"/${chkname}.tmp \ - "${libdir}"/${chkname} \ - || die "Failed to sign ${libname}" - done -} - -cleanup_chk() { - local libdir="$1" - shift 1 - local i - for i in ${NSS_CHK_SIGN_LIBS} ; do - local libfname="${libdir}/lib${i}.so" - # If the major version has changed, then we have old chk files. - [ ! -f "${libfname}" -a -f "${libfname}.chk" ] \ - && rm -f "${libfname}.chk" - done -} - -multilib_src_install() { - pushd dist >/dev/null || die - - dodir /usr/$(get_libdir) - cp -L */lib/*$(get_libname) "${ED}"/usr/$(get_libdir) || die "copying shared libs failed" - local i - for i in crmf freebl nssb nssckfw ; do - cp -L */lib/lib${i}.a "${ED}"/usr/$(get_libdir) || die "copying libs failed" - done - - # Install nss-config and pkgconfig file - dodir /usr/bin - cp -L */bin/nss-config "${ED}"/usr/bin || die - dodir /usr/$(get_libdir)/pkgconfig - cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig || die - - # create an nss-softokn.pc from nss.pc for libfreebl and some private headers - # bug 517266 - sed -e 's#Libs:#Libs: -lfreebl#' \ - -e 's#Cflags:#Cflags: -I${includedir}/private#' \ - */lib/pkgconfig/nss.pc >"${ED}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \ - || die "could not create nss-softokn.pc" - - # all the include files - insinto /usr/include/nss - doins public/nss/*.{h,api} - insinto /usr/include/nss/private - doins private/nss/{blapi,alghmac,cmac}.h - - popd >/dev/null || die - - local f nssutils - # Always enabled because we need it for chk generation. - nssutils=( shlibsign ) - - if multilib_is_native_abi ; then - if use utils; then - # The tests we do not need to install. - #nssutils_test="bltest crmftest dbtest dertimetest - #fipstest remtest sdrtest" - # checkcert utils has been removed in nss-3.22: - # https://bugzilla.mozilla.org/show_bug.cgi?id=1187545 - # https://hg.mozilla.org/projects/nss/rev/df1729d37870 - # certcgi has been removed in nss-3.36: - # https://bugzilla.mozilla.org/show_bug.cgi?id=1426602 - nssutils+=( - addbuiltin - atob - baddbdir - btoa - certutil - cmsutil - conflict - crlutil - derdump - digest - makepqg - mangle - modutil - multinit - nonspr10 - ocspclnt - oidcalc - p7content - p7env - p7sign - p7verify - pk11mode - pk12util - pp - rsaperf - selfserv - signtool - signver - ssltap - strsclnt - symkeyutil - tstclnt - vfychain - vfyserv - ) - # install man-pages for utils (bug #516810) - doman doc/nroff/*.1 - fi - pushd dist/*/bin >/dev/null || die - for f in ${nssutils[@]}; do - dobin ${f} - done - popd >/dev/null || die - fi -} - -pkg_postinst() { - multilib_pkg_postinst() { - # We must re-sign the libraries AFTER they are stripped. - local shlibsign="${EROOT}/usr/bin/shlibsign" - # See if we can execute it (cross-compiling & such). #436216 - "${shlibsign}" -h >&/dev/null - if [[ $? -gt 1 ]] ; then - shlibsign="shlibsign" - fi - generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir) - } - - multilib_foreach_abi multilib_pkg_postinst -} - -pkg_postrm() { - multilib_pkg_postrm() { - cleanup_chk "${EROOT}"/usr/$(get_libdir) - } - - multilib_foreach_abi multilib_pkg_postrm -} diff --git a/dev-libs/oneDNN/Manifest b/dev-libs/oneDNN/Manifest index 4ebc5241e90d..c77be3b8984d 100644 --- a/dev-libs/oneDNN/Manifest +++ b/dev-libs/oneDNN/Manifest @@ -1,3 +1,4 @@ -DIST oneDNN-3.3.3.tar.gz 11577369 BLAKE2B 85df74235d70d30d69ebb1702dcb328466d38046b37f4078b1d6880c7cbe079d095e53e5c9e2f0f77daca057cae62e661ac1bf919e8f128cf9c76a847dc0425d SHA512 bb4a6b33b3191b9e517a321dd089b7debb528dd2d4be48f52626308fe0e1dbea3fa6149fd9debe6aa23f11224ac80e4d3ee1e251d2007faf9bcc262bb895de71 DIST oneDNN-3.3.4.tar.gz 11577725 BLAKE2B abfcf14f8f7ade2341004d3afdb2879814b50edb76dcc677f0c97aa061e3f5c958a8810fb3eb90926c7dc5d007406daf7b73e9ce660f8c0094a49338e9255f8c SHA512 ff31f3f6b59529aad47d5a8154572aa8d7e8267c4b8150aa32eeac7baa378e1dbfdc1adc6d503ebf1bd132bc09446019abf80e5dd8b54bd6aebfb08b7fb6b066 +DIST oneDNN-3.3.6.tar.gz 11579147 BLAKE2B 280103e99a90ee450ff1077bac6408f25f1ed32d86f908210b7e6a897692478a766e8d709dc3a42b06d90659aa9396a537708ea34c03c2da229c8e7a119d2c1e SHA512 02f51f61823300fb6beba833b4644c9eae5e3f7741453cf0a09d55f7cad9fc86d63e4bb1f17cbf92c37e8ecf1af109f300e110ff6191c1d26cd1350fe1f8d14f +DIST oneDNN-3.4.3.tar.gz 12866333 BLAKE2B c1fe1d485ed174e08e6eada6d26eb1c94a99667343fc47a8492e34c66ee85e576ae71308805b76e87774446d2fa7c9496dd16546a5d592c654a9e10db0a1e582 SHA512 eb60137ee0196cd82e1e0300ba1c58afbedb342d9619c474d399946c7dcb34f8ca1211fad1070cd531189340b2ac1f3926ec4a95f72be8aef485e5f54a795bda DIST oneDNN-3.4.tar.gz 12858442 BLAKE2B 56af66755b133d8f6590d3712b4d8c7e331c5b6e4d92f99c7773a6be64331fa2a03159cf96ab4d979d0586c2bf060757895393eca5a2b06af2cfe80b80642aff SHA512 8a4ae6251e12ee641a432011da8360e08866ac005a5930d3a6278ce470d8b4a88afbd5538504274ca5e0bf053845efb41c834acaab83121d9d986a41f31ff718 diff --git a/dev-libs/oneDNN/oneDNN-3.3.3-r1.ebuild b/dev-libs/oneDNN/oneDNN-3.3.6.ebuild index f67b93c73e22..f67b93c73e22 100644 --- a/dev-libs/oneDNN/oneDNN-3.3.3-r1.ebuild +++ b/dev-libs/oneDNN/oneDNN-3.3.6.ebuild diff --git a/dev-libs/oneDNN/oneDNN-3.4.3.ebuild b/dev-libs/oneDNN/oneDNN-3.4.3.ebuild new file mode 100644 index 000000000000..f63e938f040c --- /dev/null +++ b/dev-libs/oneDNN/oneDNN-3.4.3.ebuild @@ -0,0 +1,133 @@ +# Copyright 2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DOCS_BUILDER="doxygen" +DOCS_DIR="${WORKDIR}/${P}_build" + +# oneDNN has its own FindBLAS.cmake file to find MKL (in a non-standard way). +# Removing of CMake modules is disabled. +CMAKE_REMOVE_MODULES_LIST=( none ) + +# There is additional sphinx documentation but we are missing dependency doxyrest. +inherit cmake docs multiprocessing toolchain-funcs + +DESCRIPTION="oneAPI Deep Neural Network Library" +HOMEPAGE="https://github.com/oneapi-src/oneDNN" +SRC_URI="https://github.com/oneapi-src/oneDNN/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" + +IUSE="test mkl cblas static-libs +openmp" + +RESTRICT="!test? ( test )" + +DEPEND=" + mkl? ( sci-libs/mkl ) + cblas? ( !mkl? ( virtual/cblas ) ) +" +RDEPEND="${DEPEND}" +BDEPEND=" + openmp? ( + || ( + sys-devel/gcc[openmp] + sys-devel/clang-runtime[openmp] + ) + ) +" + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +src_configure() { + if ! use openmp ; then + ewarn "WARNING: oneDNN is being built with sequential runtime." + ewarn "Proceeding might lead to highly sub-optimal performance." + ewarn "Conside enabling \"openmp\" USE flag." + fi + + local mycmakeargs=( + -DDNNL_LIBRARY_TYPE=$(usex static-libs STATIC SHARED) + -DDNNL_CPU_RUNTIME=$(usex openmp OMP SEQ) + -DDNNL_GPU_RUNTIME=NONE + -DDNNL_BUILD_EXAMPLES=OFF + -DDNNL_BUILD_TESTS="$(usex test)" + -DDNNL_ENABLE_CONCURRENT_EXEC=OFF + -DDNNL_ENABLE_JIT_PROFILING=ON + -DDNNL_ENABLE_ITT_TASKS=ON + -DDNNL_ENABLE_PRIMITIVE_CACHE=ON + -DDNNL_ENABLE_MAX_CPU_ISA=ON + -DDNNL_ENABLE_CPU_ISA_HINTS=ON + -DDNNL_ENABLE_WORKLOAD=TRAINING + -DDNNL_ENABLE_PRIMITIVE=ALL + -DDNNL_ENABLE_PRIMITIVE_GPU_ISA=ALL + -DDNNL_EXPERIMENTAL=OFF + -DDNNL_VERBOSE=ON + -DDNNL_DEV_MODE=OFF + -DDNNL_AARCH64_USE_ACL=OFF + -DDNNL_GPU_VENDOR=INTEL + -DDNNL_LIBRARY_NAME=dnnl + -DONEDNN_BUILD_GRAPH=ON + -DONEDNN_ENABLE_GRAPH_DUMP=OFF + -DONEDNN_EXPERIMENTAL_GRAPH_COMPILER_BACKEND=OFF + -DDNNL_ENABLE_PRIMITIVE_CPU_ISA=ALL + -DONEDNN_ENABLE_GEMM_KERNELS_ISA=ALL + -Wno-dev + ) + + if use mkl ; then + if [ -e "${EPREFIX}"/opt/intel/oneapi/mkl/latest/env/vars.sh ]; then + source "${EPREFIX}"/opt/intel/oneapi/mkl/latest/env/vars.sh || die + else + # bug 923109: sci-libs/mkl-2020.4.304 has no vars.sh, configure it manually + export CPATH="${EPREFIX}"/usr/include/mkl + export MKLROOT="${EPREFIX}"/usr + fi + + mycmakeargs+=( -DDNNL_BLAS_VENDOR=MKL ) + elif use cblas; then + mycmakeargs+=( -DDNNL_BLAS_VENDOR=ANY -DBLA_VENDOR=Generic -DBLAS_LIBRARIES=-lcblas ) + else + mycmakeargs+=( -DDNNL_BLAS_VENDOR=NONE ) + fi + + cmake_src_configure +} + +src_compile() { + cmake_src_compile + docs_compile +} + +src_install() { + cmake_src_install + + # Correct docdir + mv "${ED}/usr/share/doc/dnnl"* "${ED}/usr/share/doc/${PF}" || die +} + +src_test() { + local CMAKE_SKIP_TESTS=( + # Crashes in sandbox (see #922886 and #923013); + # waits for sys-apps/sandbox-2.39 release and stabilization. + test_graph_unit_interface + test_graph_unit_dnnl_layout_propagator + test_graph_unit_dnnl_op_executable + test_graph_unit_utils + ) + + if use openmp ; then + # Don't run tests in parallel, each test is already parallelized + OMP_NUM_THREADS=$(makeopts_jobs) cmake_src_test -j1 + else + cmake_src_test + fi +} diff --git a/dev-libs/opencl-clang/opencl-clang-15.0.0-r1.ebuild b/dev-libs/opencl-clang/opencl-clang-15.0.0-r1.ebuild index b8ecb8f410af..3f15a5cc35a3 100644 --- a/dev-libs/opencl-clang/opencl-clang-15.0.0-r1.ebuild +++ b/dev-libs/opencl-clang/opencl-clang-15.0.0-r1.ebuild @@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${PV}" LICENSE="UoI-NCSA" SLOT="$(ver_cut 1)" -KEYWORDS="~amd64 ~riscv" +KEYWORDS="amd64 ~riscv" RDEPEND=" dev-util/spirv-llvm-translator:${SLOT}= diff --git a/dev-libs/opencl-clang/opencl-clang-15.0.0.ebuild b/dev-libs/opencl-clang/opencl-clang-15.0.0.ebuild deleted file mode 100644 index 7436266e2cb8..000000000000 --- a/dev-libs/opencl-clang/opencl-clang-15.0.0.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LLVM_MAX_SLOT="15" - -inherit cmake llvm - -DESCRIPTION="OpenCL-oriented thin wrapper library around clang" -HOMEPAGE="https://github.com/intel/opencl-clang" -SRC_URI="https://github.com/intel/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${PN}-${PV}" - -LICENSE="UoI-NCSA" -SLOT="$(ver_cut 1)" -KEYWORDS="amd64 ~riscv" - -RDEPEND=" - dev-util/spirv-llvm-translator:${SLOT}= - sys-devel/clang:${SLOT}=[static-analyzer] - sys-devel/llvm:${SLOT}= -" - -DEPEND="${RDEPEND}" - -PATCHES=( "${FILESDIR}"/${PN}-8.0.0-clang_library_dir.patch ) - -src_configure() { - local mycmakeargs=( - -DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix ${LLVM_MAX_SLOT})" - -DCLANG_LIBRARY_DIRS="${EPREFIX}"/usr/lib/clang - -Wno-dev - ) - - cmake_src_configure -} diff --git a/dev-libs/opencl-clang/opencl-clang-16.0.0-r1.ebuild b/dev-libs/opencl-clang/opencl-clang-16.0.0-r1.ebuild deleted file mode 100644 index ef8366ddbd2b..000000000000 --- a/dev-libs/opencl-clang/opencl-clang-16.0.0-r1.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LLVM_MAX_SLOT="16" - -inherit cmake llvm - -DESCRIPTION="OpenCL-oriented thin wrapper library around clang" -HOMEPAGE="https://github.com/intel/opencl-clang" -SRC_URI="https://github.com/intel/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${PN}-${PV}" - -LICENSE="UoI-NCSA" -SLOT="$(ver_cut 1)" -KEYWORDS="amd64 ~riscv" - -RDEPEND=" - dev-util/spirv-llvm-translator:${SLOT}= - sys-devel/clang:${SLOT}=[static-analyzer] - sys-devel/llvm:${SLOT}= -" - -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/${PN}-16.0.0-clang_library_dir.patch - "${FILESDIR}"/${PN}-16.0.0-cxx17.patch - "${FILESDIR}"/${PN}-16.0.0-llvm.patch - "${FILESDIR}"/${PN}-16.0.0-standalone-build.patch -) - -src_configure() { - local mycmakeargs=( - -DCLANG_LIBRARY_DIRS="${EPREFIX}"/usr/lib - -DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix ${LLVM_MAX_SLOT})" - -Wno-dev - ) - - cmake_src_configure -} diff --git a/dev-libs/opencl-clang/opencl-clang-16.0.0-r2.ebuild b/dev-libs/opencl-clang/opencl-clang-16.0.0-r2.ebuild index 8e4cfe79db97..55691f305c43 100644 --- a/dev-libs/opencl-clang/opencl-clang-16.0.0-r2.ebuild +++ b/dev-libs/opencl-clang/opencl-clang-16.0.0-r2.ebuild @@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${PV}" LICENSE="UoI-NCSA" SLOT="$(ver_cut 1)" -KEYWORDS="~amd64 ~riscv" +KEYWORDS="amd64 ~riscv" RDEPEND=" dev-util/spirv-llvm-translator:${SLOT}= diff --git a/dev-libs/opencl-clang/opencl-clang-17.0.0.ebuild b/dev-libs/opencl-clang/opencl-clang-17.0.0.ebuild index 65dcb960a1bd..d28584d7b154 100644 --- a/dev-libs/opencl-clang/opencl-clang-17.0.0.ebuild +++ b/dev-libs/opencl-clang/opencl-clang-17.0.0.ebuild @@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${PV}" LICENSE="UoI-NCSA" SLOT="$(ver_cut 1)" -KEYWORDS="~amd64 ~riscv" +KEYWORDS="amd64 ~riscv" RDEPEND=" dev-util/spirv-llvm-translator:${SLOT}= diff --git a/dev-libs/opencl-icd-loader/opencl-icd-loader-2023.12.14.ebuild b/dev-libs/opencl-icd-loader/opencl-icd-loader-2023.12.14.ebuild index 3531e3631cf7..abed85a0a6dc 100644 --- a/dev-libs/opencl-icd-loader/opencl-icd-loader-2023.12.14.ebuild +++ b/dev-libs/opencl-icd-loader/opencl-icd-loader-2023.12.14.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 @@ -14,7 +14,7 @@ SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}. LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~loong ppc64 ~riscv x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-libs/opencryptoki/opencryptoki-3.6.1-r1.ebuild b/dev-libs/opencryptoki/opencryptoki-3.6.1-r1.ebuild index 069fc5eb73bc..5ab79025d6a4 100644 --- a/dev-libs/opencryptoki/opencryptoki-3.6.1-r1.ebuild +++ b/dev-libs/opencryptoki/opencryptoki-3.6.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,7 +7,7 @@ inherit autotools flag-o-matic DESCRIPTION="PKCS#11 provider cryptographic hardware" HOMEPAGE="https://sourceforge.net/projects/opencryptoki" -SRC_URI="mirror://sourceforge/opencryptoki/${PV}/${P}.tgz" +SRC_URI="https://downloads.sourceforge.net/opencryptoki/${PV}/${P}.tgz" S="${WORKDIR}/${PN}" # Upstream is looking into relicensing it into CPL-1.0 entirely; the CCA diff --git a/dev-libs/openct/openct-0.6.20-r5.ebuild b/dev-libs/openct/openct-0.6.20-r5.ebuild index c26193b88277..c9552d7c8680 100644 --- a/dev-libs/openct/openct-0.6.20-r5.ebuild +++ b/dev-libs/openct/openct-0.6.20-r5.ebuild @@ -7,11 +7,11 @@ inherit autotools flag-o-matic udev DESCRIPTION="library for accessing smart card terminals" HOMEPAGE="https://github.com/OpenSC/openct/wiki" -SRC_URI="mirror://sourceforge/opensc/${PN}/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/opensc/${PN}/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" IUSE="doc debug pcsc-lite selinux usb" DEPEND=" diff --git a/dev-libs/openobex/metadata.xml b/dev-libs/openobex/metadata.xml index 845fa66f774c..4a0f60cd5772 100644 --- a/dev-libs/openobex/metadata.xml +++ b/dev-libs/openobex/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>bircoph@gentoo.org</email> - <name>Andrew Savchenko</name> - </maintainer> + <!-- maintainer-needed --> <use> <flag name="irda">Enable IrDA support</flag> </use> diff --git a/dev-libs/openobex/openobex-1.7.2-r3.ebuild b/dev-libs/openobex/openobex-1.7.2-r3.ebuild index a1011af44aa0..db4db851aa64 100644 --- a/dev-libs/openobex/openobex-1.7.2-r3.ebuild +++ b/dev-libs/openobex/openobex-1.7.2-r3.ebuild @@ -7,7 +7,7 @@ inherit cmake udev DESCRIPTION="Implementation of the OBEX protocol used for transferring data to mobile devices" HOMEPAGE="https://sourceforge.net/projects/openobex/" -SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}-Source.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${PV}/${P}-Source.tar.gz" LICENSE="GPL-2 LGPL-2.1" SLOT="0/2" diff --git a/dev-libs/opensc/Manifest b/dev-libs/opensc/Manifest index de041bb4fbc4..d29912a059a4 100644 --- a/dev-libs/opensc/Manifest +++ b/dev-libs/opensc/Manifest @@ -1,2 +1 @@ -DIST opensc-0.24.0.tar.gz 2440952 BLAKE2B afacdd151d169dd1840ecd6df1cec99a9805598d7b7af81e17b648f146cd1b3ad1d3dcae19ed94cf8ce0dbbd5b4285af9653af5ef5739d53908ce30a49544adb SHA512 0fd2ea858874ae0b85c8fe8c4b920988693a47ca95b26449a1e95f86e17b76000f236c1f75d63ee133306e01a965155da5e14c1b8a59053b85026ecb58fb97bb -DIST opensc-0.25.0.tar.gz 2406137 BLAKE2B 07c7de7fa1c258a90b1acbfbc01383f204ad88169ae1d3681f240e881ab80652dc9b04ba452a433576847caa5ef49d35608b3f895e965fec9e79da231ecabab2 SHA512 c220607a543b1fcf7c89e051e7c7ca3908abab6c022818b01a6219becdbad217708fb3c5fe2fe2218ac82be0f174c5694e5fa07c6e0ae540cf3171462a23eee6 +DIST opensc-0.25.1.tar.gz 2395579 BLAKE2B cc7994cad78083c8eeafc947e90c06178209edc825cb14b54bc4281d37c6dae1006ab2c9b9566823ef90626a4134bce96a9806bebc455a389216d7953da6b873 SHA512 6277abb31f903af68b4c19f549fc881b69d7aa9a55ba39936386118eadde86b62853ba2906cd165d9b1ad9090e1aa4d2b236bf19650aa228ed776b3f4d9f8805 diff --git a/dev-libs/opensc/opensc-0.24.0.ebuild b/dev-libs/opensc/opensc-0.24.0.ebuild deleted file mode 100644 index 4168ed5b24be..000000000000 --- a/dev-libs/opensc/opensc-0.24.0.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools bash-completion-r1 - -DESCRIPTION="Libraries and applications to access smartcards" -HOMEPAGE="https://github.com/OpenSC/OpenSC/wiki" - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/OpenSC/OpenSC.git" -else - SRC_URI="https://github.com/OpenSC/OpenSC/releases/download/${PV}/${P}.tar.gz" - KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86" -fi - -LICENSE="LGPL-2.1" -SLOT="0" -IUSE="ctapi doc openct notify pace +pcsc-lite readline secure-messaging ssl test zlib" -RESTRICT="!test? ( test )" - -RDEPEND="zlib? ( sys-libs/zlib ) - readline? ( sys-libs/readline:0= ) - ssl? ( dev-libs/openssl:0= ) - openct? ( >=dev-libs/openct-0.5.0 ) - pace? ( dev-libs/openpace:= ) - pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 ) - notify? ( dev-libs/glib:2 )" -DEPEND="${RDEPEND} - app-text/docbook-xsl-stylesheets - dev-libs/libxslt - test? ( dev-util/cmocka )" -BDEPEND="virtual/pkgconfig" - -REQUIRED_USE=" - pcsc-lite? ( !openct !ctapi ) - openct? ( !pcsc-lite !ctapi ) - ctapi? ( !pcsc-lite !openct ) - || ( pcsc-lite openct ctapi )" - -src_prepare() { - default - eautoreconf -} - -src_configure() { - # don't want to run upstream's clang-tidy checks - export ac_cv_path_CLANGTIDY="" - - econf \ - --with-completiondir="$(get_bashcompdir)" \ - --disable-strict \ - --enable-man \ - $(use_enable ctapi) \ - $(use_enable doc) \ - $(use_enable notify) \ - $(use_enable openct) \ - $(use_enable pace openpace) \ - $(use_enable pcsc-lite pcsc) \ - $(use_enable readline) \ - $(use_enable secure-messaging sm) \ - $(use_enable ssl openssl) \ - $(use_enable test cmocka) \ - $(use_enable zlib) -} - -src_install() { - default - - insinto /etc/pkcs11/modules/ - doins "${FILESDIR}"/opensc.module - - find "${ED}" -name '*.la' -delete || die -} diff --git a/dev-libs/opensc/opensc-0.25.0.ebuild b/dev-libs/opensc/opensc-0.25.0.ebuild deleted file mode 100644 index 18fa3aefc24a..000000000000 --- a/dev-libs/opensc/opensc-0.25.0.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools bash-completion-r1 - -DESCRIPTION="Libraries and applications to access smartcards" -HOMEPAGE="https://github.com/OpenSC/OpenSC/wiki" - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/OpenSC/OpenSC.git" -else - SRC_URI="https://github.com/OpenSC/OpenSC/releases/download/${PV}/${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -fi - -LICENSE="LGPL-2.1" -SLOT="0/11" -IUSE="ctapi doc openct notify pace +pcsc-lite readline secure-messaging ssl test zlib" -RESTRICT="!test? ( test )" - -RDEPEND="zlib? ( sys-libs/zlib ) - readline? ( sys-libs/readline:0= ) - ssl? ( dev-libs/openssl:0= ) - openct? ( >=dev-libs/openct-0.5.0 ) - pace? ( dev-libs/openpace:= ) - pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 ) - notify? ( dev-libs/glib:2 )" -DEPEND="${RDEPEND} - app-text/docbook-xsl-stylesheets - dev-libs/libxslt - test? ( dev-util/cmocka )" -BDEPEND="virtual/pkgconfig" - -REQUIRED_USE=" - pcsc-lite? ( !openct !ctapi ) - openct? ( !pcsc-lite !ctapi ) - ctapi? ( !pcsc-lite !openct ) - || ( pcsc-lite openct ctapi )" - -src_prepare() { - default - eautoreconf -} - -src_configure() { - # don't want to run upstream's clang-tidy checks - export ac_cv_path_CLANGTIDY="" - - econf \ - --with-completiondir="$(get_bashcompdir)" \ - --disable-strict \ - --enable-man \ - $(use_enable ctapi) \ - $(use_enable doc) \ - $(use_enable notify) \ - $(use_enable openct) \ - $(use_enable pace openpace) \ - $(use_enable pcsc-lite pcsc) \ - $(use_enable readline) \ - $(use_enable secure-messaging sm) \ - $(use_enable ssl openssl) \ - $(use_enable test cmocka) \ - $(use_enable zlib) -} - -src_install() { - default - - insinto /etc/pkcs11/modules/ - doins "${FILESDIR}"/opensc.module - - find "${ED}" -name '*.la' -delete || die -} diff --git a/dev-libs/opensc/opensc-0.25.0-r1.ebuild b/dev-libs/opensc/opensc-0.25.1.ebuild index 5fbac563e07a..98f3d13a9b10 100644 --- a/dev-libs/opensc/opensc-0.25.0-r1.ebuild +++ b/dev-libs/opensc/opensc-0.25.1.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then EGIT_REPO_URI="https://github.com/OpenSC/OpenSC.git" else SRC_URI="https://github.com/OpenSC/OpenSC/releases/download/${PV}/${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" fi LICENSE="LGPL-2.1" diff --git a/dev-libs/openssl-compat/openssl-compat-1.0.2u-r2.ebuild b/dev-libs/openssl-compat/openssl-compat-1.0.2u-r2.ebuild index e6142b6ffb6e..00f2576c4730 100644 --- a/dev-libs/openssl-compat/openssl-compat-1.0.2u-r2.ebuild +++ b/dev-libs/openssl-compat/openssl-compat-1.0.2u-r2.ebuild @@ -38,7 +38,7 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz LICENSE="openssl" SLOT="1.0.0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x86-linux" IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla tls-compression" RESTRICT="!bindist? ( bindist ) diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest index 8738e9282251..b49215f484a5 100644 --- a/dev-libs/openssl/Manifest +++ b/dev-libs/openssl/Manifest @@ -3,13 +3,11 @@ DIST openssl-1.0.2t-bindist-1.0.tar.xz 13872 BLAKE2B b2aade96a6e0ca6209a39e205b1 DIST openssl-1.0.2u.tar.gz 5355412 BLAKE2B b2ff2a10e5851af5aca4093422a9a072c794e87b997263826c1c35910c040f695fac63decac5856cb49399ed03d410f97701d9fd4e1ebfbcacd8f3a74ce8bf57 SHA512 c455bb309e20e2c2d47fdc5619c734d107d5c8c38c1409903ce979acc120b0d5fa0312917c0aa0d630e402d092a703d4249643f36078e8528a3cafc9dac6ab32 DIST openssl-1.1.1w.tar.gz 9893384 BLAKE2B 2fdba6ca0188928ab2f74e606136afca66cfa0467170fa6298ef160b64ac6fdcad1e81e5dd14013ce0e9921d0f7417edec531cd0beaf1196fec704c2c6d48395 SHA512 b4c625fe56a4e690b57b6a011a225ad0cb3af54bd8fb67af77b5eceac55cc7191291d96a660c5b568a08a2fbf62b4612818e7cca1bb95b2b6b4fc649b0552b6d DIST openssl-1.1.1w.tar.gz.asc 833 BLAKE2B d990be69ed913509d52b78e7473668429d4485adb29ef03e4612dd0cadbac4f04c7289d8e5baf6f397bcedeaac9f802f18fc719964d882ae0514ed1ca16ae277 SHA512 0f3d7aa48b1cabf8dd43e8108aeed10a4dffb4f5a244d4da9c86ea358b0c8b90c46da561d21e01c567c2f5035d824ed82ec104aad1776b7f33a1be85990e98ef -DIST openssl-3.0.11.tar.gz 15198318 BLAKE2B e522573aa72c8f6ffef82f20de36178fc6f97a8fee8443df4bf1bd9a6448b315742e9cb698717c1b7d9a91d0768d7ce08d55956ddc415b9dc6cb33fe3a98131b SHA512 393e7262cce0e7980d1cbba861291c8791f6c2a290e9867895c4310ab6e16b449067d8b780ae6081dc8d42529a4f32d545c66e8b1e69d301281d92f1882c85b7 -DIST openssl-3.0.11.tar.gz.asc 833 BLAKE2B e6e2636d5bb5fffb86833e64437fb440bbfd1c4e2bfbfdd72280cf1ce388b70d30eeea56ef6f3bb673e7dcd12020d993ef95f96bf099ded38e8cde4b549b38fa SHA512 3c1fe94fc46861870d99d1edcfe3c151272f7864dde36b66e87a0c79d2289e9ed5cfc48bfa65ba0e88eadcb3cc8307d702e01155f48af8ffc2d4f8fbbf3aa03c -DIST openssl-3.0.12.tar.gz 15204575 BLAKE2B 1f00e33a5ed64a51cf28f0dbe7d53a9197c1edae7538dea9573394ee4dc03a885483d74b0b47a78b9067e87b4f420b9d7103f351bfec91710c168051cb7148df SHA512 63e003653dd1126c66e278969a626cdf0801b97da8b7076824d661e4a77e1572c3171cf7f006c972b95bcfa284889ee0362d8a46a851f7d8e743e2a1fe593b24 -DIST openssl-3.0.12.tar.gz.asc 833 BLAKE2B 5c7914e0449a1f2fad433544fa637263b237c2637b86960f904a7840ef6bd627728dfa45373e03a6ce7a0a4570d03e1dcd0188059bd5dbcc83d49d10be64dd39 SHA512 072d1572e6cc5240fed69c01b1f7f74958ceba33cec3b0a7f0db5929dc884381320fb737ec6b38f95ef81c855e2d382d7ecd19431a328b08efad70288ec4a964 DIST openssl-3.0.13.tar.gz 15294843 BLAKE2B 869aa5f70a8c1d0cac6027e9261530df70ab5a8b448c785f5f8ff3f206e742c5364424132d0e109a6449af9b4082c4c179c7103dccb16a4539f776ca834c8ccc SHA512 22f4096781f0b075f5bf81bd39a0f97e111760dfa73b6f858f6bb54968a7847944d74969ae10f9a51cc21a2f4af20d9a4c463649dc824f5e439e196d6764c4f9 DIST openssl-3.0.13.tar.gz.asc 833 BLAKE2B 519515b6faa505d68ff9acc30db9515fac494145086fa5ad9561c39385a6fabb39ad9de10fedd49c8fc716ec59ea1b13ec5e6b466e549ea9f29b8d0bb74ba7b3 SHA512 c52d97c93d16f3ca2a7026fb25890482b6d86c37b5ab686c56b0e08522743ec4ea3f84afa4deb64b0df0d9a16b557430c4d4139ab42ffcf97d769b61d1e6197c DIST openssl-3.1.5.tar.gz 15663524 BLAKE2B a12eb88b0a4f2d927123e0d3ca7d2f80f2bdc867c710d24700fe39b631b93d90c73c3deceff151a9fa818ac88026eb798f3253f22d03c839ab9574086fa61eee SHA512 82e2ac6b3d9b03f8fc66d2ec421246e989eb702eb94586515abfb5afb5300391a0beedf6a2602f61ac10896b41e5608feeeeb4d37714fa17ac0f2ce465249fa9 DIST openssl-3.1.5.tar.gz.asc 833 BLAKE2B 633502ec0a87074136d7ea42d9ac5f3df53523560d2a97410b5b57d28d916336da95ab5521c10f94202e3a0995331f0e17bdcf8843135634a5d5a95cfafc7b21 SHA512 48187bb8a7bdbd8b76fdcca736d2b03e2a89330b304eefb4e9620f570c741c60f2023307d8619ba1fa101a99223f94895e7be57ced6547a4fb06bd4c3677533a DIST openssl-3.2.1.tar.gz 17733249 BLAKE2B 960222e0305166160e5ab000e29650b92063bf726551ee9ad46060166d99738d1e3a5b86fd28b14c8f4fb3a72f5aa70850defb87c02990acff3dbcbdac40b347 SHA512 bab2b2419319f1feffaba4692f03edbf13b44d1090c6e075a2d69dad67a2d51e64e6edbf83456a26c83900a726d20d2c4ee4ead9c94b322fd0b536f3b5a863c4 DIST openssl-3.2.1.tar.gz.asc 833 BLAKE2B a1d25fe30bf1804d13a8b6b98edf56be5bf744d9e2706f4169455c24efe2e3a361487d00d0d4bac240c3f0170693d77a39dd0d4ee5c792d2247aa00c47e74ebf SHA512 de39516c7b77612f33cdc830a8d13ef6bcd91c03d24a6ed105480f140f9e1ad7049844e234c96a516d62e0e33ce90442ffd0f309ea674884c735f04d8562f372 +DIST openssl-3.3.0.tar.gz 18038030 BLAKE2B c68efaf8aca87961f396e305acc767b56d651b9adf4fd2c9d9b5a3266e35da4b856c6ed34be47d656c782aade975f20317a6759913b33d29d7eb088e638fa501 SHA512 1f9daeee6542e1b831c65f1f87befaef98ccedc3abc958c9d17f064ef771924c30849e3ff880f94eed4aaa9d81ea105e3bc8815e6d2e4d6b60b5e890f14fc5da +DIST openssl-3.3.0.tar.gz.asc 833 BLAKE2B 207b9fd53de6f57fe24d6a6e5e9f735b7649258bb2873b6c1e29b7d2689c9a75774dbf09392be40f8a8ab240e4e6c745e2864155e8b0f2f3f5ca3b45051e869a SHA512 8750daa607e6bfd2326a4d4f04c9c04608d9fa852fc1515acf1fcf3d1ad33b8ba8435d9ef1ac3a032fecd09aa90446c53996045506bcfbddb7544bb61b26af24 diff --git a/dev-libs/openssl/files/gentoo.config-1.0.4 b/dev-libs/openssl/files/gentoo.config-1.0.4 index 5f205781ae3e..d32ce877a34a 100644 --- a/dev-libs/openssl/files/gentoo.config-1.0.4 +++ b/dev-libs/openssl/files/gentoo.config-1.0.4 @@ -32,6 +32,7 @@ if [[ $1 == "test" ]] ; then "i686-apple-darwinX |darwin-i386-cc" \ "i386-apple-darwinX |darwin-i386-cc" \ "powerpc-apple-darwinX |darwin-ppc-cc" \ + "arm64-apple-darwinX |darwin-arm64-cc" \ "i586-pc-winnt |winnt-parity" \ "s390-ibm-linux-gnu |linux-generic32 -DB_ENDIAN" \ "s390x-linux-gnu |linux64-s390x" \ @@ -155,6 +156,7 @@ darwin) powerpc) machine=ppc-cc;; i?86*) machine=i386-cc;; x86_64) machine=x86_64-cc; system=${system}64;; + arm64) machine=arm64-cc; system=${system}64;; esac ;; hpux) diff --git a/dev-libs/openssl/files/openssl-3.0.13-CVE-2024-2511.patch b/dev-libs/openssl/files/openssl-3.0.13-CVE-2024-2511.patch new file mode 100644 index 000000000000..fff4fb72837b --- /dev/null +++ b/dev-libs/openssl/files/openssl-3.0.13-CVE-2024-2511.patch @@ -0,0 +1,141 @@ +https://www.openssl.org/news/secadv/20240408.txt +https://bugs.gentoo.org/930047 +https://github.com/openssl/openssl/commit/b52867a9f618bb955bed2a3ce3db4d4f97ed8e5d +https://github.com/openssl/openssl/commit/cc9ece9118eeacccc3571c2ee852f8ba067d0607 + +From b52867a9f618bb955bed2a3ce3db4d4f97ed8e5d Mon Sep 17 00:00:00 2001 +From: Matt Caswell <matt@openssl.org> +Date: Tue, 5 Mar 2024 15:43:53 +0000 +Subject: [PATCH] Fix unconstrained session cache growth in TLSv1.3 + +In TLSv1.3 we create a new session object for each ticket that we send. +We do this by duplicating the original session. If SSL_OP_NO_TICKET is in +use then the new session will be added to the session cache. However, if +early data is not in use (and therefore anti-replay protection is being +used), then multiple threads could be resuming from the same session +simultaneously. If this happens and a problem occurs on one of the threads, +then the original session object could be marked as not_resumable. When we +duplicate the session object this not_resumable status gets copied into the +new session object. The new session object is then added to the session +cache even though it is not_resumable. + +Subsequently, another bug means that the session_id_length is set to 0 for +sessions that are marked as not_resumable - even though that session is +still in the cache. Once this happens the session can never be removed from +the cache. When that object gets to be the session cache tail object the +cache never shrinks again and grows indefinitely. + +CVE-2024-2511 + +Reviewed-by: Neil Horman <nhorman@openssl.org> +Reviewed-by: Tomas Mraz <tomas@openssl.org> +(Merged from https://github.com/openssl/openssl/pull/24044) + +(cherry picked from commit 7e4d731b1c07201ad9374c1cd9ac5263bdf35bce) +--- a/ssl/ssl_lib.c ++++ b/ssl/ssl_lib.c +@@ -3736,9 +3736,10 @@ void ssl_update_cache(SSL *s, int mode) + + /* + * If the session_id_length is 0, we are not supposed to cache it, and it +- * would be rather hard to do anyway :-) ++ * would be rather hard to do anyway :-). Also if the session has already ++ * been marked as not_resumable we should not cache it for later reuse. + */ +- if (s->session->session_id_length == 0) ++ if (s->session->session_id_length == 0 || s->session->not_resumable) + return; + + /* +--- a/ssl/ssl_sess.c ++++ b/ssl/ssl_sess.c +@@ -152,16 +152,11 @@ SSL_SESSION *SSL_SESSION_new(void) + return ss; + } + +-SSL_SESSION *SSL_SESSION_dup(const SSL_SESSION *src) +-{ +- return ssl_session_dup(src, 1); +-} +- + /* + * Create a new SSL_SESSION and duplicate the contents of |src| into it. If + * ticket == 0 then no ticket information is duplicated, otherwise it is. + */ +-SSL_SESSION *ssl_session_dup(const SSL_SESSION *src, int ticket) ++static SSL_SESSION *ssl_session_dup_intern(const SSL_SESSION *src, int ticket) + { + SSL_SESSION *dest; + +@@ -285,6 +280,27 @@ SSL_SESSION *ssl_session_dup(const SSL_SESSION *src, int ticket) + return NULL; + } + ++SSL_SESSION *SSL_SESSION_dup(const SSL_SESSION *src) ++{ ++ return ssl_session_dup_intern(src, 1); ++} ++ ++/* ++ * Used internally when duplicating a session which might be already shared. ++ * We will have resumed the original session. Subsequently we might have marked ++ * it as non-resumable (e.g. in another thread) - but this copy should be ok to ++ * resume from. ++ */ ++SSL_SESSION *ssl_session_dup(const SSL_SESSION *src, int ticket) ++{ ++ SSL_SESSION *sess = ssl_session_dup_intern(src, ticket); ++ ++ if (sess != NULL) ++ sess->not_resumable = 0; ++ ++ return sess; ++} ++ + const unsigned char *SSL_SESSION_get_id(const SSL_SESSION *s, unsigned int *len) + { + if (len) +--- a/ssl/statem/statem_srvr.c ++++ b/ssl/statem/statem_srvr.c +@@ -2338,9 +2338,8 @@ int tls_construct_server_hello(SSL *s, WPACKET *pkt) + * so the following won't overwrite an ID that we're supposed + * to send back. + */ +- if (s->session->not_resumable || +- (!(s->ctx->session_cache_mode & SSL_SESS_CACHE_SERVER) +- && !s->hit)) ++ if (!(s->ctx->session_cache_mode & SSL_SESS_CACHE_SERVER) ++ && !s->hit) + s->session->session_id_length = 0; + + if (usetls13) { + +From cc9ece9118eeacccc3571c2ee852f8ba067d0607 Mon Sep 17 00:00:00 2001 +From: Matt Caswell <matt@openssl.org> +Date: Fri, 15 Mar 2024 17:58:42 +0000 +Subject: [PATCH] Hardening around not_resumable sessions + +Make sure we can't inadvertently use a not_resumable session + +Related to CVE-2024-2511 + +Reviewed-by: Neil Horman <nhorman@openssl.org> +Reviewed-by: Tomas Mraz <tomas@openssl.org> +(Merged from https://github.com/openssl/openssl/pull/24044) + +(cherry picked from commit c342f4b8bd2d0b375b0e22337057c2eab47d9b96) +--- a/ssl/ssl_sess.c ++++ b/ssl/ssl_sess.c +@@ -531,6 +531,12 @@ SSL_SESSION *lookup_sess_in_cache(SSL *s, const unsigned char *sess_id, + ret = s->session_ctx->get_session_cb(s, sess_id, sess_id_len, ©); + + if (ret != NULL) { ++ if (ret->not_resumable) { ++ /* If its not resumable then ignore this session */ ++ if (!copy) ++ SSL_SESSION_free(ret); ++ return NULL; ++ } + ssl_tsan_counter(s->session_ctx, + &s->session_ctx->stats.sess_cb_hit); + diff --git a/dev-libs/openssl/files/openssl-3.0.13-p11-segfault.patch b/dev-libs/openssl/files/openssl-3.0.13-p11-segfault.patch new file mode 100644 index 000000000000..73b131ab7928 --- /dev/null +++ b/dev-libs/openssl/files/openssl-3.0.13-p11-segfault.patch @@ -0,0 +1,79 @@ +https://bugs.gentoo.org/916328 +https://github.com/opendnssec/SoftHSMv2/issues/729 +https://github.com/openssl/openssl/issues/22508 +https://github.com/openssl/openssl/commit/ad6cbe4b7f57a783a66a7ae883ea0d35ef5f82b6 + +From ad6cbe4b7f57a783a66a7ae883ea0d35ef5f82b6 Mon Sep 17 00:00:00 2001 +From: Tomas Mraz <tomas@openssl.org> +Date: Fri, 15 Dec 2023 13:45:50 +0100 +Subject: [PATCH] Revert "Improved detection of engine-provided private + "classic" keys" + +This reverts commit 2b74e75331a27fc89cad9c8ea6a26c70019300b5. + +The commit was wrong. With 3.x versions the engines must be themselves +responsible for creating their EVP_PKEYs in a way that they are treated +as legacy - either by using the respective set1 calls or by setting +non-default EVP_PKEY_METHOD. + +The workaround has caused more problems than it solved. + +Fixes #22945 + +Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com> +Reviewed-by: Neil Horman <nhorman@openssl.org> +(Merged from https://github.com/openssl/openssl/pull/23063) + +(cherry picked from commit 39ea78379826fa98e8dc8c0d2b07e2c17cd68380) +--- a/crypto/engine/eng_pkey.c ++++ b/crypto/engine/eng_pkey.c +@@ -79,48 +79,6 @@ EVP_PKEY *ENGINE_load_private_key(ENGINE *e, const char *key_id, + ERR_raise(ERR_LIB_ENGINE, ENGINE_R_FAILED_LOADING_PRIVATE_KEY); + return NULL; + } +- /* We enforce check for legacy key */ +- switch (EVP_PKEY_get_id(pkey)) { +- case EVP_PKEY_RSA: +- { +- RSA *rsa = EVP_PKEY_get1_RSA(pkey); +- EVP_PKEY_set1_RSA(pkey, rsa); +- RSA_free(rsa); +- } +- break; +-# ifndef OPENSSL_NO_EC +- case EVP_PKEY_SM2: +- case EVP_PKEY_EC: +- { +- EC_KEY *ec = EVP_PKEY_get1_EC_KEY(pkey); +- EVP_PKEY_set1_EC_KEY(pkey, ec); +- EC_KEY_free(ec); +- } +- break; +-# endif +-# ifndef OPENSSL_NO_DSA +- case EVP_PKEY_DSA: +- { +- DSA *dsa = EVP_PKEY_get1_DSA(pkey); +- EVP_PKEY_set1_DSA(pkey, dsa); +- DSA_free(dsa); +- } +- break; +-#endif +-# ifndef OPENSSL_NO_DH +- case EVP_PKEY_DH: +- { +- DH *dh = EVP_PKEY_get1_DH(pkey); +- EVP_PKEY_set1_DH(pkey, dh); +- DH_free(dh); +- } +- break; +-#endif +- default: +- /*Do nothing */ +- break; +- } +- + return pkey; + } + + diff --git a/dev-libs/openssl/files/openssl-3.1.5-CVE-2024-2511.patch b/dev-libs/openssl/files/openssl-3.1.5-CVE-2024-2511.patch new file mode 100644 index 000000000000..c5b7dfe449f7 --- /dev/null +++ b/dev-libs/openssl/files/openssl-3.1.5-CVE-2024-2511.patch @@ -0,0 +1,137 @@ +https://www.openssl.org/news/secadv/20240408.txt +https://bugs.gentoo.org/930047 +https://github.com/openssl/openssl/commit/7e4d731b1c07201ad9374c1cd9ac5263bdf35bce +https://github.com/openssl/openssl/commit/c342f4b8bd2d0b375b0e22337057c2eab47d9b96 + +From 7e4d731b1c07201ad9374c1cd9ac5263bdf35bce Mon Sep 17 00:00:00 2001 +From: Matt Caswell <matt@openssl.org> +Date: Tue, 5 Mar 2024 15:43:53 +0000 +Subject: [PATCH] Fix unconstrained session cache growth in TLSv1.3 + +In TLSv1.3 we create a new session object for each ticket that we send. +We do this by duplicating the original session. If SSL_OP_NO_TICKET is in +use then the new session will be added to the session cache. However, if +early data is not in use (and therefore anti-replay protection is being +used), then multiple threads could be resuming from the same session +simultaneously. If this happens and a problem occurs on one of the threads, +then the original session object could be marked as not_resumable. When we +duplicate the session object this not_resumable status gets copied into the +new session object. The new session object is then added to the session +cache even though it is not_resumable. + +Subsequently, another bug means that the session_id_length is set to 0 for +sessions that are marked as not_resumable - even though that session is +still in the cache. Once this happens the session can never be removed from +the cache. When that object gets to be the session cache tail object the +cache never shrinks again and grows indefinitely. + +CVE-2024-2511 + +Reviewed-by: Neil Horman <nhorman@openssl.org> +Reviewed-by: Tomas Mraz <tomas@openssl.org> +(Merged from https://github.com/openssl/openssl/pull/24044) +--- a/ssl/ssl_lib.c ++++ b/ssl/ssl_lib.c +@@ -3737,9 +3737,10 @@ void ssl_update_cache(SSL *s, int mode) + + /* + * If the session_id_length is 0, we are not supposed to cache it, and it +- * would be rather hard to do anyway :-) ++ * would be rather hard to do anyway :-). Also if the session has already ++ * been marked as not_resumable we should not cache it for later reuse. + */ +- if (s->session->session_id_length == 0) ++ if (s->session->session_id_length == 0 || s->session->not_resumable) + return; + + /* +--- a/ssl/ssl_sess.c ++++ b/ssl/ssl_sess.c +@@ -154,16 +154,11 @@ SSL_SESSION *SSL_SESSION_new(void) + return ss; + } + +-SSL_SESSION *SSL_SESSION_dup(const SSL_SESSION *src) +-{ +- return ssl_session_dup(src, 1); +-} +- + /* + * Create a new SSL_SESSION and duplicate the contents of |src| into it. If + * ticket == 0 then no ticket information is duplicated, otherwise it is. + */ +-SSL_SESSION *ssl_session_dup(const SSL_SESSION *src, int ticket) ++static SSL_SESSION *ssl_session_dup_intern(const SSL_SESSION *src, int ticket) + { + SSL_SESSION *dest; + +@@ -287,6 +282,27 @@ SSL_SESSION *ssl_session_dup(const SSL_SESSION *src, int ticket) + return NULL; + } + ++SSL_SESSION *SSL_SESSION_dup(const SSL_SESSION *src) ++{ ++ return ssl_session_dup_intern(src, 1); ++} ++ ++/* ++ * Used internally when duplicating a session which might be already shared. ++ * We will have resumed the original session. Subsequently we might have marked ++ * it as non-resumable (e.g. in another thread) - but this copy should be ok to ++ * resume from. ++ */ ++SSL_SESSION *ssl_session_dup(const SSL_SESSION *src, int ticket) ++{ ++ SSL_SESSION *sess = ssl_session_dup_intern(src, ticket); ++ ++ if (sess != NULL) ++ sess->not_resumable = 0; ++ ++ return sess; ++} ++ + const unsigned char *SSL_SESSION_get_id(const SSL_SESSION *s, unsigned int *len) + { + if (len) +--- a/ssl/statem/statem_srvr.c ++++ b/ssl/statem/statem_srvr.c +@@ -2338,9 +2338,8 @@ int tls_construct_server_hello(SSL *s, WPACKET *pkt) + * so the following won't overwrite an ID that we're supposed + * to send back. + */ +- if (s->session->not_resumable || +- (!(s->ctx->session_cache_mode & SSL_SESS_CACHE_SERVER) +- && !s->hit)) ++ if (!(s->ctx->session_cache_mode & SSL_SESS_CACHE_SERVER) ++ && !s->hit) + s->session->session_id_length = 0; + + if (usetls13) { + +From c342f4b8bd2d0b375b0e22337057c2eab47d9b96 Mon Sep 17 00:00:00 2001 +From: Matt Caswell <matt@openssl.org> +Date: Fri, 15 Mar 2024 17:58:42 +0000 +Subject: [PATCH] Hardening around not_resumable sessions + +Make sure we can't inadvertently use a not_resumable session + +Related to CVE-2024-2511 + +Reviewed-by: Neil Horman <nhorman@openssl.org> +Reviewed-by: Tomas Mraz <tomas@openssl.org> +(Merged from https://github.com/openssl/openssl/pull/24044) +--- a/ssl/ssl_sess.c ++++ b/ssl/ssl_sess.c +@@ -533,6 +533,12 @@ SSL_SESSION *lookup_sess_in_cache(SSL *s, const unsigned char *sess_id, + ret = s->session_ctx->get_session_cb(s, sess_id, sess_id_len, ©); + + if (ret != NULL) { ++ if (ret->not_resumable) { ++ /* If its not resumable then ignore this session */ ++ if (!copy) ++ SSL_SESSION_free(ret); ++ return NULL; ++ } + ssl_tsan_counter(s->session_ctx, + &s->session_ctx->stats.sess_cb_hit); + diff --git a/dev-libs/openssl/files/openssl-3.2.1-CVE-2024-2511.patch b/dev-libs/openssl/files/openssl-3.2.1-CVE-2024-2511.patch new file mode 100644 index 000000000000..d5b40447d745 --- /dev/null +++ b/dev-libs/openssl/files/openssl-3.2.1-CVE-2024-2511.patch @@ -0,0 +1,137 @@ +https://www.openssl.org/news/secadv/20240408.txt +https://bugs.gentoo.org/930047 +https://github.com/openssl/openssl/commit/e9d7083e241670332e0443da0f0d4ffb52829f08 +https://github.com/openssl/openssl/commit/4d67109432646c113887b0aa8091fb0d1b3057e6 + +From e9d7083e241670332e0443da0f0d4ffb52829f08 Mon Sep 17 00:00:00 2001 +From: Matt Caswell <matt@openssl.org> +Date: Tue, 5 Mar 2024 15:43:53 +0000 +Subject: [PATCH] Fix unconstrained session cache growth in TLSv1.3 + +In TLSv1.3 we create a new session object for each ticket that we send. +We do this by duplicating the original session. If SSL_OP_NO_TICKET is in +use then the new session will be added to the session cache. However, if +early data is not in use (and therefore anti-replay protection is being +used), then multiple threads could be resuming from the same session +simultaneously. If this happens and a problem occurs on one of the threads, +then the original session object could be marked as not_resumable. When we +duplicate the session object this not_resumable status gets copied into the +new session object. The new session object is then added to the session +cache even though it is not_resumable. + +Subsequently, another bug means that the session_id_length is set to 0 for +sessions that are marked as not_resumable - even though that session is +still in the cache. Once this happens the session can never be removed from +the cache. When that object gets to be the session cache tail object the +cache never shrinks again and grows indefinitely. + +CVE-2024-2511 + +Reviewed-by: Neil Horman <nhorman@openssl.org> +Reviewed-by: Tomas Mraz <tomas@openssl.org> +(Merged from https://github.com/openssl/openssl/pull/24043) +--- a/ssl/ssl_lib.c ++++ b/ssl/ssl_lib.c +@@ -4457,9 +4457,10 @@ void ssl_update_cache(SSL_CONNECTION *s, int mode) + + /* + * If the session_id_length is 0, we are not supposed to cache it, and it +- * would be rather hard to do anyway :-) ++ * would be rather hard to do anyway :-). Also if the session has already ++ * been marked as not_resumable we should not cache it for later reuse. + */ +- if (s->session->session_id_length == 0) ++ if (s->session->session_id_length == 0 || s->session->not_resumable) + return; + + /* +--- a/ssl/ssl_sess.c ++++ b/ssl/ssl_sess.c +@@ -127,16 +127,11 @@ SSL_SESSION *SSL_SESSION_new(void) + return ss; + } + +-SSL_SESSION *SSL_SESSION_dup(const SSL_SESSION *src) +-{ +- return ssl_session_dup(src, 1); +-} +- + /* + * Create a new SSL_SESSION and duplicate the contents of |src| into it. If + * ticket == 0 then no ticket information is duplicated, otherwise it is. + */ +-SSL_SESSION *ssl_session_dup(const SSL_SESSION *src, int ticket) ++static SSL_SESSION *ssl_session_dup_intern(const SSL_SESSION *src, int ticket) + { + SSL_SESSION *dest; + +@@ -265,6 +260,27 @@ SSL_SESSION *ssl_session_dup(const SSL_SESSION *src, int ticket) + return NULL; + } + ++SSL_SESSION *SSL_SESSION_dup(const SSL_SESSION *src) ++{ ++ return ssl_session_dup_intern(src, 1); ++} ++ ++/* ++ * Used internally when duplicating a session which might be already shared. ++ * We will have resumed the original session. Subsequently we might have marked ++ * it as non-resumable (e.g. in another thread) - but this copy should be ok to ++ * resume from. ++ */ ++SSL_SESSION *ssl_session_dup(const SSL_SESSION *src, int ticket) ++{ ++ SSL_SESSION *sess = ssl_session_dup_intern(src, ticket); ++ ++ if (sess != NULL) ++ sess->not_resumable = 0; ++ ++ return sess; ++} ++ + const unsigned char *SSL_SESSION_get_id(const SSL_SESSION *s, unsigned int *len) + { + if (len) +--- a/ssl/statem/statem_srvr.c ++++ b/ssl/statem/statem_srvr.c +@@ -2445,9 +2445,8 @@ CON_FUNC_RETURN tls_construct_server_hello(SSL_CONNECTION *s, WPACKET *pkt) + * so the following won't overwrite an ID that we're supposed + * to send back. + */ +- if (s->session->not_resumable || +- (!(SSL_CONNECTION_GET_CTX(s)->session_cache_mode & SSL_SESS_CACHE_SERVER) +- && !s->hit)) ++ if (!(SSL_CONNECTION_GET_CTX(s)->session_cache_mode & SSL_SESS_CACHE_SERVER) ++ && !s->hit) + s->session->session_id_length = 0; + + if (usetls13) { + +From 4d67109432646c113887b0aa8091fb0d1b3057e6 Mon Sep 17 00:00:00 2001 +From: Matt Caswell <matt@openssl.org> +Date: Fri, 15 Mar 2024 17:58:42 +0000 +Subject: [PATCH] Hardening around not_resumable sessions + +Make sure we can't inadvertently use a not_resumable session + +Related to CVE-2024-2511 + +Reviewed-by: Neil Horman <nhorman@openssl.org> +Reviewed-by: Tomas Mraz <tomas@openssl.org> +(Merged from https://github.com/openssl/openssl/pull/24043) +--- a/ssl/ssl_sess.c ++++ b/ssl/ssl_sess.c +@@ -519,6 +519,12 @@ SSL_SESSION *lookup_sess_in_cache(SSL_CONNECTION *s, + sess_id, sess_id_len, ©); + + if (ret != NULL) { ++ if (ret->not_resumable) { ++ /* If its not resumable then ignore this session */ ++ if (!copy) ++ SSL_SESSION_free(ret); ++ return NULL; ++ } + ssl_tsan_counter(s->session_ctx, + &s->session_ctx->stats.sess_cb_hit); + diff --git a/dev-libs/openssl/files/openssl-3.2.1-riscv.patch b/dev-libs/openssl/files/openssl-3.2.1-riscv.patch new file mode 100644 index 000000000000..51256cf434e2 --- /dev/null +++ b/dev-libs/openssl/files/openssl-3.2.1-riscv.patch @@ -0,0 +1,70 @@ +# Bug: https://bugs.gentoo.org/923956 +# Upstream PR: https://github.com/openssl/openssl/pull/23752 +--- a/providers/implementations/ciphers/cipher_aes_gcm_hw.c ++++ b/providers/implementations/ciphers/cipher_aes_gcm_hw.c +@@ -142,9 +142,9 @@ static const PROV_GCM_HW aes_gcm = { + # include "cipher_aes_gcm_hw_armv8.inc" + #elif defined(PPC_AES_GCM_CAPABLE) && defined(_ARCH_PPC64) + # include "cipher_aes_gcm_hw_ppc.inc" +-#elif defined(__riscv) && __riscv_xlen == 64 ++#elif defined(OPENSSL_CPUID_OBJ) && defined(__riscv) && __riscv_xlen == 64 + # include "cipher_aes_gcm_hw_rv64i.inc" +-#elif defined(__riscv) && __riscv_xlen == 32 ++#elif defined(OPENSSL_CPUID_OBJ) && defined(__riscv) && __riscv_xlen == 32 + # include "cipher_aes_gcm_hw_rv32i.inc" + #else + const PROV_GCM_HW *ossl_prov_aes_hw_gcm(size_t keybits) +--- a/providers/implementations/ciphers/cipher_aes_hw.c ++++ b/providers/implementations/ciphers/cipher_aes_hw.c +@@ -142,9 +142,9 @@ const PROV_CIPHER_HW *ossl_prov_cipher_hw_aes_##mode(size_t keybits) \ + # include "cipher_aes_hw_t4.inc" + #elif defined(S390X_aes_128_CAPABLE) + # include "cipher_aes_hw_s390x.inc" +-#elif defined(__riscv) && __riscv_xlen == 64 ++#elif defined(OPENSSL_CPUID_OBJ) && defined(__riscv) && __riscv_xlen == 64 + # include "cipher_aes_hw_rv64i.inc" +-#elif defined(__riscv) && __riscv_xlen == 32 ++#elif defined(OPENSSL_CPUID_OBJ) && defined(__riscv) && __riscv_xlen == 32 + # include "cipher_aes_hw_rv32i.inc" + #else + /* The generic case */ +--- a/providers/implementations/ciphers/cipher_aes_ocb_hw.c ++++ b/providers/implementations/ciphers/cipher_aes_ocb_hw.c +@@ -104,7 +104,7 @@ static const PROV_CIPHER_HW aes_t4_ocb = { \ + if (SPARC_AES_CAPABLE) \ + return &aes_t4_ocb; + +-#elif defined(__riscv) && __riscv_xlen == 64 ++#elif defined(OPENSSL_CPUID_OBJ) && defined(__riscv) && __riscv_xlen == 64 + + static int cipher_hw_aes_ocb_rv64i_zknd_zkne_initkey(PROV_CIPHER_CTX *vctx, + const unsigned char *key, +@@ -126,7 +126,7 @@ static const PROV_CIPHER_HW aes_rv64i_zknd_zkne_ocb = { \ + if (RISCV_HAS_ZKND_AND_ZKNE()) \ + return &aes_rv64i_zknd_zkne_ocb; + +-#elif defined(__riscv) && __riscv_xlen == 32 ++#elif defined(OPENSSL_CPUID_OBJ) && defined(__riscv) && __riscv_xlen == 32 + + static int cipher_hw_aes_ocb_rv32i_zknd_zkne_initkey(PROV_CIPHER_CTX *vctx, + const unsigned char *key, +--- a/providers/implementations/ciphers/cipher_aes_xts_hw.c ++++ b/providers/implementations/ciphers/cipher_aes_xts_hw.c +@@ -159,7 +159,7 @@ static const PROV_CIPHER_HW aes_xts_t4 = { \ + if (SPARC_AES_CAPABLE) \ + return &aes_xts_t4; + +-#elif defined(__riscv) && __riscv_xlen == 64 ++#elif defined(OPENSSL_CPUID_OBJ) && defined(__riscv) && __riscv_xlen == 64 + + static int cipher_hw_aes_xts_rv64i_zknd_zkne_initkey(PROV_CIPHER_CTX *ctx, + const unsigned char *key, +@@ -185,7 +185,7 @@ static const PROV_CIPHER_HW aes_xts_rv64i_zknd_zkne = { \ + if (RISCV_HAS_ZKND_AND_ZKNE()) \ + return &aes_xts_rv64i_zknd_zkne; + +-#elif defined(__riscv) && __riscv_xlen == 32 ++#elif defined(OPENSSL_CPUID_OBJ) && defined(__riscv) && __riscv_xlen == 32 + + static int cipher_hw_aes_xts_rv32i_zknd_zkne_initkey(PROV_CIPHER_CTX *ctx, + const unsigned char *key, diff --git a/dev-libs/openssl/files/openssl-3.2.1-s390x.patch b/dev-libs/openssl/files/openssl-3.2.1-s390x.patch new file mode 100644 index 000000000000..3cbf4854e12e --- /dev/null +++ b/dev-libs/openssl/files/openssl-3.2.1-s390x.patch @@ -0,0 +1,31 @@ +https://bugs.gentoo.org/923957 +https://github.com/openssl/openssl/pull/23458 +https://github.com/openssl/openssl/commit/5fa5d59750db9df00f4871949a66020ac44f4f9c + +From 5fa5d59750db9df00f4871949a66020ac44f4f9c Mon Sep 17 00:00:00 2001 +From: Ingo Franzki <ifranzki@linux.ibm.com> +Date: Fri, 2 Feb 2024 10:20:55 +0100 +Subject: [PATCH] s390x: Fix build on s390x with 'disable-asm' + +Do not define S390X_MOD_EXP for a NO_ASM build, this would result in +unresolved externals for s390x_mod_exp and s390x_crt. + +Signed-off-by: Ingo Franzki <ifranzki@linux.ibm.com> + +Reviewed-by: Hugo Landau <hlandau@openssl.org> +Reviewed-by: Tomas Mraz <tomas@openssl.org> +(Merged from https://github.com/openssl/openssl/pull/23458) + +(cherry picked from commit a5b0c568dbefddd154f99011d7ce76cfbfadb67a) +--- a/include/crypto/bn.h ++++ b/include/crypto/bn.h +@@ -116,7 +116,8 @@ OSSL_LIB_CTX *ossl_bn_get_libctx(BN_CTX *ctx); + + extern const BIGNUM ossl_bn_inv_sqrt_2; + +-#if defined(OPENSSL_SYS_LINUX) && !defined(FIPS_MODULE) && defined (__s390x__) ++#if defined(OPENSSL_SYS_LINUX) && !defined(FIPS_MODULE) && defined (__s390x__) \ ++ && !defined (OPENSSL_NO_ASM) + # define S390X_MOD_EXP + #endif + diff --git a/dev-libs/openssl/openssl-3.0.11.ebuild b/dev-libs/openssl/openssl-3.0.11.ebuild deleted file mode 100644 index 9437bff8e937..000000000000 --- a/dev-libs/openssl/openssl-3.0.11.ebuild +++ /dev/null @@ -1,288 +0,0 @@ -# Copyright 1999-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/openssl.org.asc -inherit edo flag-o-matic linux-info toolchain-funcs -inherit multilib multilib-minimal multiprocessing preserve-libs verify-sig - -DESCRIPTION="Robust, full-featured Open Source Toolkit for the Transport Layer Security (TLS)" -HOMEPAGE="https://www.openssl.org/" - -MY_P=${P/_/-} - -if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI="https://github.com/openssl/openssl.git" - - inherit git-r3 -else - SRC_URI="mirror://openssl/source/${MY_P}.tar.gz - verify-sig? ( mirror://openssl/source/${MY_P}.tar.gz.asc )" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -fi - -S="${WORKDIR}"/${MY_P} - -LICENSE="Apache-2.0" -SLOT="0/3" # .so version of libssl/libcrypto -IUSE="+asm cpu_flags_x86_sse2 fips ktls rfc3779 sctp static-libs test tls-compression vanilla verify-sig weak-ssl-ciphers" -RESTRICT="!test? ( test )" - -COMMON_DEPEND=" - tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] ) -" -BDEPEND=" - >=dev-lang/perl-5 - sctp? ( >=net-misc/lksctp-tools-1.0.12 ) - test? ( - sys-apps/diffutils - app-alternatives/bc - sys-process/procps - ) - verify-sig? ( >=sec-keys/openpgp-keys-openssl-20230801 )" - -DEPEND="${COMMON_DEPEND}" -RDEPEND="${COMMON_DEPEND}" -PDEPEND="app-misc/ca-certificates" - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/openssl/configuration.h -) - -pkg_setup() { - if use ktls ; then - if kernel_is -lt 4 18 ; then - ewarn "Kernel implementation of TLS (USE=ktls) requires kernel >=4.18!" - else - CONFIG_CHECK="~TLS ~TLS_DEVICE" - ERROR_TLS="You will be unable to offload TLS to kernel because CONFIG_TLS is not set!" - ERROR_TLS_DEVICE="You will be unable to offload TLS to kernel because CONFIG_TLS_DEVICE is not set!" - use test && CONFIG_CHECK+=" ~CRYPTO_USER_API_SKCIPHER" - - linux-info_pkg_setup - fi - fi - - [[ ${MERGE_TYPE} == binary ]] && return - - # must check in pkg_setup; sysctl doesn't work with userpriv! - if use test && use sctp ; then - # test_ssl_new will fail with "Ensure SCTP AUTH chunks are enabled in kernel" - # if sctp.auth_enable is not enabled. - local sctp_auth_status=$(sysctl -n net.sctp.auth_enable 2>/dev/null) - if [[ -z "${sctp_auth_status}" ]] || [[ ${sctp_auth_status} != 1 ]] ; then - die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!" - fi - fi -} - -src_unpack() { - # Can delete this once test fix patch is dropped - if use verify-sig ; then - # Needed for downloaded patch (which is unsigned, which is fine) - verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.gz{,.asc} - fi - - default -} - -src_prepare() { - # Make sure we only ever touch Makefile.org and avoid patching a file - # that gets blown away anyways by the Configure script in src_configure - rm -f Makefile - - if ! use vanilla ; then - PATCHES+=( - # Add patches which are Gentoo-specific customisations here - ) - fi - - default - - if use test && use sctp && has network-sandbox ${FEATURES} ; then - einfo "Disabling test '80-test_ssl_new.t' which is known to fail with FEATURES=network-sandbox ..." - rm test/recipes/80-test_ssl_new.t || die - fi - - # Test fails depending on kernel configuration, bug #699134 - rm test/recipes/30-test_afalg.t || die -} - -src_configure() { - # Keep this in sync with app-misc/c_rehash - SSL_CNF_DIR="/etc/ssl" - - # Quiet out unknown driver argument warnings since openssl - # doesn't have well-split CFLAGS and we're making it even worse - # and 'make depend' uses -Werror for added fun (bug #417795 again) - tc-is-clang && append-flags -Qunused-arguments - - # We really, really need to build OpenSSL w/ strict aliasing disabled. - # It's filled with violations and it *will* result in miscompiled - # code. This has been in the ebuild for > 10 years but even in 2022, - # it's still relevant: - # - https://github.com/llvm/llvm-project/issues/55255 - # - https://github.com/openssl/openssl/issues/12247 - # - https://github.com/openssl/openssl/issues/18225 - # - https://github.com/openssl/openssl/issues/18663#issuecomment-1181478057 - # Don't remove the no strict aliasing bits below! - filter-flags -fstrict-aliasing - append-flags -fno-strict-aliasing - # The OpenSSL developers don't test with LTO right now, it leads to various - # warnings/errors (which may or may not be false positives), it's considered - # unsupported, and it's not tested in CI: https://github.com/openssl/openssl/issues/18663. - filter-lto - - append-flags $(test-flags-CC -Wa,--noexecstack) - - # bug #895308 - append-atomic-flags - # Configure doesn't respect LIBS - export LDLIBS="${LIBS}" - - # bug #197996 - unset APPS - # bug #312551 - unset SCRIPTS - # bug #311473 - unset CROSS_COMPILE - - tc-export AR CC CXX RANLIB RC - - multilib-minimal_src_configure -} - -multilib_src_configure() { - use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; } - - local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal") - - # See if our toolchain supports __uint128_t. If so, it's 64bit - # friendly and can use the nicely optimized code paths, bug #460790. - #local ec_nistp_64_gcc_128 - # - # Disable it for now though (bug #469976) - # Do NOT re-enable without substantial discussion first! - # - #echo "__uint128_t i;" > "${T}"/128.c - #if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then - # ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128" - #fi - - local sslout=$(bash "${FILESDIR}/gentoo.config-1.0.4") - einfo "Using configuration: ${sslout:-(openssl knows best)}" - - # https://github.com/openssl/openssl/blob/master/INSTALL.md#enable-and-disable-features - local myeconfargs=( - ${sslout} - - $(use cpu_flags_x86_sse2 || echo "no-sse2") - enable-camellia - enable-ec - enable-ec2m - enable-sm2 - enable-srp - $(use elibc_musl && echo "no-async") - enable-idea - enable-mdc2 - enable-rc5 - $(use fips && echo "enable-fips") - $(use_ssl asm) - $(use_ssl ktls) - $(use_ssl rfc3779) - $(use_ssl sctp) - $(use test || echo "no-tests") - $(use_ssl tls-compression zlib) - $(use_ssl weak-ssl-ciphers) - - --prefix="${EPREFIX}"/usr - --openssldir="${EPREFIX}"${SSL_CNF_DIR} - --libdir=$(get_libdir) - - shared - threads - ) - - edo perl "${S}/Configure" "${myeconfargs[@]}" -} - -multilib_src_compile() { - emake build_sw - - if multilib_is_native_abi; then - emake build_docs - fi -} - -multilib_src_test() { - # VFP = show subtests verbosely and show failed tests verbosely - # Normal V=1 would show everything verbosely but this slows things down. - emake HARNESS_JOBS="$(makeopts_jobs)" -Onone VFP=1 test -} - -multilib_src_install() { - # Only -j1 is supported for the install targets: - # https://github.com/openssl/openssl/issues/21999#issuecomment-1771150305 - emake DESTDIR="${D}" -j1 install_sw - if use fips; then - emake DESTDIR="${D}" -j1 install_fips - # Regen this in pkg_preinst, bug 900625 - rm "${ED}${SSL_CNF_DIR}"/fipsmodule.cnf || die - fi - - if multilib_is_native_abi; then - emake DESTDIR="${D}" -j1 install_ssldirs - emake DESTDIR="${D}" DOCDIR='$(INSTALLTOP)'/share/doc/${PF} -j1 install_docs - fi - - # This is crappy in that the static archives are still built even - # when USE=static-libs. But this is due to a failing in the openssl - # build system: the static archives are built as PIC all the time. - # Only way around this would be to manually configure+compile openssl - # twice; once with shared lib support enabled and once without. - if ! use static-libs ; then - rm "${ED}"/usr/$(get_libdir)/lib{crypto,ssl}.a || die - fi -} - -multilib_src_install_all() { - # openssl installs perl version of c_rehash by default, but - # we provide a shell version via app-misc/c_rehash - rm "${ED}"/usr/bin/c_rehash || die - - dodoc {AUTHORS,CHANGES,NEWS,README,README-PROVIDERS}.md doc/*.txt doc/${PN}-c-indent.el - - # Create the certs directory - keepdir ${SSL_CNF_DIR}/certs - - # bug #254521 - dodir /etc/sandbox.d - echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl - - diropts -m0700 - keepdir ${SSL_CNF_DIR}/private -} - -pkg_preinst() { - if use fips; then - # Regen fipsmodule.cnf, bug 900625 - ebegin "Running openssl fipsinstall" - "${ED}/usr/bin/openssl" fipsinstall -quiet \ - -out "${ED}${SSL_CNF_DIR}/fipsmodule.cnf" \ - -module "${ED}/usr/$(get_libdir)/ossl-modules/fips.so" - eend $? - fi - - preserve_old_lib /usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1) \ - /usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1.1) -} - -pkg_postinst() { - ebegin "Running 'openssl rehash ${EROOT}${SSL_CNF_DIR}/certs' to rebuild hashes (bug #333069)" - openssl rehash "${EROOT}${SSL_CNF_DIR}/certs" - eend $? - - preserve_old_lib_notify /usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1) \ - /usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1.1) -} diff --git a/dev-libs/openssl/openssl-3.0.13.ebuild b/dev-libs/openssl/openssl-3.0.13-r2.ebuild index a709a5ecde4a..7419ab042851 100644 --- a/dev-libs/openssl/openssl-3.0.13.ebuild +++ b/dev-libs/openssl/openssl-3.0.13-r2.ebuild @@ -50,6 +50,11 @@ MULTILIB_WRAPPED_HEADERS=( /usr/include/openssl/configuration.h ) +PATCHES=( + "${FILESDIR}"/${P}-CVE-2024-2511.patch + "${FILESDIR}"/${P}-p11-segfault.patch +) + pkg_setup() { if use ktls ; then if kernel_is -lt 4 18 ; then diff --git a/dev-libs/openssl/openssl-3.1.5-r1.ebuild b/dev-libs/openssl/openssl-3.1.5-r2.ebuild index 23a3463ec688..1c3b048b75a0 100644 --- a/dev-libs/openssl/openssl-3.1.5-r1.ebuild +++ b/dev-libs/openssl/openssl-3.1.5-r2.ebuild @@ -55,6 +55,7 @@ MULTILIB_WRAPPED_HEADERS=( PATCHES=( "${FILESDIR}"/${P}-p11-segfault.patch + "${FILESDIR}"/${P}-CVE-2024-2511.patch ) pkg_setup() { diff --git a/dev-libs/openssl/openssl-3.2.1-r1.ebuild b/dev-libs/openssl/openssl-3.2.1-r2.ebuild index 24ae65f3321f..fb480821f325 100644 --- a/dev-libs/openssl/openssl-3.2.1-r1.ebuild +++ b/dev-libs/openssl/openssl-3.2.1-r2.ebuild @@ -58,6 +58,10 @@ MULTILIB_WRAPPED_HEADERS=( PATCHES=( "${FILESDIR}"/${P}-p11-segfault.patch + # bug 923956 (drop on next version bump) + "${FILESDIR}"/${P}-riscv.patch + "${FILESDIR}"/${P}-CVE-2024-2511.patch + "${FILESDIR}"/${P}-s390x.patch ) pkg_setup() { @@ -146,8 +150,8 @@ src_configure() { append-flags $(test-flags-CC -Wa,--noexecstack) - # bug #895308 - append-atomic-flags + # bug #895308 -- check inserts GNU ld-compatible arguments + [[ ${CHOST} == *-darwin* ]] || append-atomic-flags # Configure doesn't respect LIBS export LDLIBS="${LIBS}" diff --git a/dev-libs/openssl/openssl-3.0.12.ebuild b/dev-libs/openssl/openssl-3.3.0.ebuild index 9437bff8e937..97ec87920e44 100644 --- a/dev-libs/openssl/openssl-3.0.12.ebuild +++ b/dev-libs/openssl/openssl-3.3.0.ebuild @@ -17,19 +17,25 @@ if [[ ${PV} == 9999 ]] ; then inherit git-r3 else - SRC_URI="mirror://openssl/source/${MY_P}.tar.gz - verify-sig? ( mirror://openssl/source/${MY_P}.tar.gz.asc )" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + SRC_URI=" + mirror://openssl/source/${MY_P}.tar.gz + verify-sig? ( mirror://openssl/source/${MY_P}.tar.gz.asc ) + " + + #if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then + # KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + #fi fi S="${WORKDIR}"/${MY_P} LICENSE="Apache-2.0" -SLOT="0/3" # .so version of libssl/libcrypto +SLOT="0/$(ver_cut 1)" # .so version of libssl/libcrypto IUSE="+asm cpu_flags_x86_sse2 fips ktls rfc3779 sctp static-libs test tls-compression vanilla verify-sig weak-ssl-ciphers" RESTRICT="!test? ( test )" COMMON_DEPEND=" + !<net-misc/openssh-9.2_p1-r3 tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] ) " BDEPEND=" @@ -40,8 +46,8 @@ BDEPEND=" app-alternatives/bc sys-process/procps ) - verify-sig? ( >=sec-keys/openpgp-keys-openssl-20230801 )" - + verify-sig? ( >=sec-keys/openpgp-keys-openssl-20240424 ) +" DEPEND="${COMMON_DEPEND}" RDEPEND="${COMMON_DEPEND}" PDEPEND="app-misc/ca-certificates" @@ -50,6 +56,9 @@ MULTILIB_WRAPPED_HEADERS=( /usr/include/openssl/configuration.h ) +PATCHES=( +) + pkg_setup() { if use ktls ; then if kernel_is -lt 4 18 ; then @@ -90,7 +99,7 @@ src_unpack() { src_prepare() { # Make sure we only ever touch Makefile.org and avoid patching a file # that gets blown away anyways by the Configure script in src_configure - rm -f Makefile + rm -f Makefile || die if ! use vanilla ; then PATCHES+=( @@ -136,8 +145,8 @@ src_configure() { append-flags $(test-flags-CC -Wa,--noexecstack) - # bug #895308 - append-atomic-flags + # bug #895308 -- check inserts GNU ld-compatible arguments + [[ ${CHOST} == *-darwin* ]] || append-atomic-flags # Configure doesn't respect LIBS export LDLIBS="${LIBS}" @@ -177,6 +186,7 @@ multilib_src_configure() { local myeconfargs=( ${sslout} + $(multilib_is_native_abi || echo "no-docs") $(use cpu_flags_x86_sse2 || echo "no-sse2") enable-camellia enable-ec @@ -209,16 +219,18 @@ multilib_src_configure() { multilib_src_compile() { emake build_sw - - if multilib_is_native_abi; then - emake build_docs - fi } multilib_src_test() { + # See https://github.com/openssl/openssl/blob/master/test/README.md for options. + # # VFP = show subtests verbosely and show failed tests verbosely # Normal V=1 would show everything verbosely but this slows things down. - emake HARNESS_JOBS="$(makeopts_jobs)" -Onone VFP=1 test + # + # -j1 here for https://github.com/openssl/openssl/issues/21999, but it + # shouldn't matter as tests were already built earlier, and HARNESS_JOBS + # controls running the tests. + emake -Onone -j1 HARNESS_JOBS="$(makeopts_jobs)" VFP=1 test } multilib_src_install() { diff --git a/dev-libs/optix/optix-7.5.0.ebuild b/dev-libs/optix/optix-7.5.0.ebuild index 3de080857121..93173c78a603 100644 --- a/dev-libs/optix/optix-7.5.0.ebuild +++ b/dev-libs/optix/optix-7.5.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -41,7 +41,7 @@ unset i LICENSE="NVIDIA-SDK" SLOT="0" -KEYWORDS="~amd64 ~arm64" +KEYWORDS="amd64 ~arm64" RESTRICT="bindist mirror !headers-only? ( fetch )" IUSE="+headers-only" diff --git a/dev-libs/pegtl/pegtl-3.2.7.ebuild b/dev-libs/pegtl/pegtl-3.2.7.ebuild index 88a9c2105f41..579d10e6af54 100644 --- a/dev-libs/pegtl/pegtl-3.2.7.ebuild +++ b/dev-libs/pegtl/pegtl-3.2.7.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 @@ -12,7 +12,7 @@ S="${WORKDIR}/${P^^}" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86" PATCHES=( "${FILESDIR}"/${PN}-3.2.1-werror.patch diff --git a/dev-libs/pfs/Manifest b/dev-libs/pfs/Manifest new file mode 100644 index 000000000000..53ded16be40e --- /dev/null +++ b/dev-libs/pfs/Manifest @@ -0,0 +1 @@ +DIST pfs-0.10.0.tar.gz 239987 BLAKE2B 60c918e184cd2896da8df35daa5b33fb5a90a776d1297ffc48fa15fc0bab5c852e23418924b7427f6fe3fcce30a21ed7a291b5ab02cdd42d41b2189d5add8b28 SHA512 f8f46e664142f8b52f97f8c5974a8ae0a2002dca1a778f23e23b7d4da4d184c87441928cd5d0b40cc2106b2bb7cb9be330bdda0c4374a66acaf10edff069563f diff --git a/dev-libs/pfs/files/pfs-0.10.0-Werror.patch b/dev-libs/pfs/files/pfs-0.10.0-Werror.patch new file mode 100644 index 000000000000..c319d4b6e984 --- /dev/null +++ b/dev-libs/pfs/files/pfs-0.10.0-Werror.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt 2024-05-21 20:11:22.098008343 +0200 ++++ b/CMakeLists.txt 2024-05-21 20:11:35.538853965 +0200 +@@ -31,7 +31,7 @@ + # Actual configuration + # ------------------------------------------------------------------------ + +-add_compile_options (-std=c++11 -Wall -Wextra -pedantic -Werror) ++add_compile_options (-std=c++11 -Wall -Wextra -pedantic) + + set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/out) + set (CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) diff --git a/dev-libs/hyperscan/metadata.xml b/dev-libs/pfs/metadata.xml index dc4b2f2b7d54..e8b86cf9074c 100644 --- a/dev-libs/hyperscan/metadata.xml +++ b/dev-libs/pfs/metadata.xml @@ -2,10 +2,10 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>arkamar@gentoo.org</email> - <name>Petr VanÄ›k</name> + <email>tupone@gentoo.org</email> + <name>Tupone Alfredo</name> </maintainer> <upstream> - <remote-id type="github">intel/hyperscan</remote-id> + <remote-id type="github">dtrugman/pfs</remote-id> </upstream> </pkgmetadata> diff --git a/dev-libs/pfs/pfs-0.10.0.ebuild b/dev-libs/pfs/pfs-0.10.0.ebuild new file mode 100644 index 000000000000..f40731e44a48 --- /dev/null +++ b/dev-libs/pfs/pfs-0.10.0.ebuild @@ -0,0 +1,35 @@ +# Copyright 2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Production grade, very easy to use, procfs parsing library in C++" +HOMEPAGE="https://github.com/dtrugman/pfs" +SRC_URI="https://github.com/dtrugman/${PN}/archive/refs/tags/v${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" +IUSE="test" +RESTRICT="!test? ( test )" + +PATCHES=( "${FILESDIR}"/${P}-Werror.patch ) + +src_prepare() { + rm test/test_proc_stat.cpp | dir + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -Dpfs_BUILD_TESTS=$(usex test) + ) + cmake_src_configure +} + +src_test() { + "${BUILD_DIR}"/out/unittest || die +} diff --git a/dev-libs/plasma-wayland-protocols/Manifest b/dev-libs/plasma-wayland-protocols/Manifest index d97aa1805490..655cfb3137d8 100644 --- a/dev-libs/plasma-wayland-protocols/Manifest +++ b/dev-libs/plasma-wayland-protocols/Manifest @@ -1 +1,2 @@ DIST plasma-wayland-protocols-1.12.0.tar.xz 44272 BLAKE2B 05f6c7e496d8be7d215ceeed6059230bb609c43c81eba363fc85e49279f2322a5c7c6cedebd9987d1f6d4edefad01eb84039cd949de730607e9ee4bb9a9c2c01 SHA512 4894493e117669d7ab54b385e2a40d69ddce7cb860b68d9a28f9032d63cad6004858f984ad8ece34567e0e806ccb3f973852596b905d2618b60115ccf9c82886 +DIST plasma-wayland-protocols-1.13.0.tar.xz 45016 BLAKE2B 179bc29e79c210008e9f0b54cd50ce6350b0e575f746dbb6d2fe0dc0db4c4c1b98e29cd2b2faa98ce2049b001f2b2e8cbef9cded64db6823f8f56973e92cea8e SHA512 7e335df79a9b614701330d1dd4aa37803a35a5fa409f4d9456f487383c9c3c02414f74551363b22694e7fea9c4c2427ead3213d984c3673c90348e7f890826af diff --git a/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.13.0.ebuild b/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.13.0.ebuild new file mode 100644 index 000000000000..05f74e583c2b --- /dev/null +++ b/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.13.0.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake kde.org + +DESCRIPTION="Plasma Specific Protocols for Wayland" +HOMEPAGE="https://invent.kde.org/libraries/plasma-wayland-protocols" + +if [[ ${KDE_BUILD_TYPE} = release ]]; then + SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +fi + +LICENSE="LGPL-2.1" +SLOT="0" + +BDEPEND=" + dev-libs/libpcre2:* + >=kde-frameworks/extra-cmake-modules-5.115.0:* + || ( + dev-qt/qtbase:6 + dev-qt/qtcore:5 + ) +" + +ecm_src_configure() { + local mycmakeargs=( + -DKDE_INSTALL_USE_QT_SYS_PATHS=ON # ecm.eclass + -DKDE_INSTALL_DOCBUNDLEDIR="${EPREFIX}/usr/share/help" # ecm.eclass + ) + + cmake_src_configure +} diff --git a/dev-libs/pocketfft/Manifest b/dev-libs/pocketfft/Manifest index 21f04969b6f5..6afacd0b6f91 100644 --- a/dev-libs/pocketfft/Manifest +++ b/dev-libs/pocketfft/Manifest @@ -1 +1,2 @@ DIST pocketfft-2021.11.23.tar.gz 26769 BLAKE2B 80eb02a2a73d46febf562c3c0b7ad86ee5d9f93b41057c99f9f7f767b7cd2e6b7bc3986e67faaca6e69b9d7e2402febb8d427cb8c57badcafcc5ea0dafd04b20 SHA512 d212cfa34ecde2f38b789d218b5ed4fb9069e41f9d35587dd058b8af89cf22e79a1c8f8ddf2d47d794fa23a7e363cb0631b25461ae3fc9fc5d58e1bdf6356600 +DIST pocketfft-2023.12.30.tar.gz 26923 BLAKE2B 8e4db14899953a210101c63f2766200f96f2f6510dfe27dbc9edd89eea78d53834cc9f749ec37b393e4159be1fd9614745250331d52d417eca365490cbe5b80f SHA512 078f52440bd85107f7a26c2e6d8ad86d6900a178161b5a1b39b694146535915dbd0825bf6d6f187fe1a2ea0f14e5da7a6b32e57d149c9147377eb6bd5ce2394c diff --git a/dev-libs/pocketfft/pocketfft-2023.12.30.ebuild b/dev-libs/pocketfft/pocketfft-2023.12.30.ebuild new file mode 100644 index 000000000000..eab264d2972e --- /dev/null +++ b/dev-libs/pocketfft/pocketfft-2023.12.30.ebuild @@ -0,0 +1,22 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CommitId=9d3ab05a7fffbc71a492bc6a17be034e83e8f0fe + +DESCRIPTION="PocketFFT for C++" +HOMEPAGE="https://github.com/mreineck/pocketfft/" +SRC_URI="https://github.com/mreineck/${PN}/archive/${CommitId}.tar.gz + -> ${P}.tar.gz" + +S="${WORKDIR}"/${PN}-${CommitId} + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64" + +src_install() { + doheader pocketfft_hdronly.h + default +} diff --git a/dev-libs/poco/Manifest b/dev-libs/poco/Manifest index e53e47643ea1..dded174642a2 100644 --- a/dev-libs/poco/Manifest +++ b/dev-libs/poco/Manifest @@ -1,3 +1,2 @@ -DIST poco-1.11.2.tar.gz 10935312 BLAKE2B 66b4cdb6cb4b5dd4f5f0eee744e1d147d66e98561ec4286ed09693b638d565fbf084c3e40eff3f6a9a88cff167b1d774da08e8c8424986aefe13d029a540afe2 SHA512 3f9e46dbfb0a85f19389b269725cb6272172d993d8239f13da8110c0c6ce9ed2b6595708d5dba91a027292c74358c87da988e22587a74011e84707816a6a277c -DIST poco-1.12.2.tar.gz 11268579 BLAKE2B fe23216884d1effb7e93072c5e90d5eabf813c6cf0326af5c4b6d3646d54e5411966485e97d50960df97cd545b3a265eb4b43c1cb041ff97b4457f53f6bd06bc SHA512 86b6b106e9a677397c73139e949a65925e78611cad478fc4206a6a7365613307fc1549b1160faf6ca8f02fb7f7ae58858c3913cb701111b7cbb5ffcbe5363bb3 DIST poco-1.12.4.tar.gz 11296139 BLAKE2B 45e1214616e78041d5ca512cee46621c006fe21f51231f3261dc40ca4941eb3cd4e52db493aa826779784f9d3f35cfd08e3e9d08fb35ebec2d610fb6528c635a SHA512 730700a24b5a00d44aa85914e7d3c9eff76969a123a67315ba5e9b2d18c0ace70d2664d8a611496851f497aa4985d36685a67813a95e814461ae0fffdb460d91 +DIST poco-1.13.3.tar.gz 11332562 BLAKE2B 04380cae92bbd2427873f0ea1a3fcade244ee5168390e26081983ded9faaf22e456bdd4ae87f9c77bafc92155f860ea9f56678ec2204bcd7c51a871e7f00d759 SHA512 084064fb462c9e7993d069ebdf395802af900ed92c5b294465a2c246162bb86caa3505985de329e8110d3e9fb3bc39ae9536d523843729d4ed5ce00c35289d92 diff --git a/dev-libs/poco/metadata.xml b/dev-libs/poco/metadata.xml index 47052fc34e8a..f73e85906ed1 100644 --- a/dev-libs/poco/metadata.xml +++ b/dev-libs/poco/metadata.xml @@ -33,7 +33,6 @@ done quickly and working on the features that make their application unique. <flag name="7z">Add Support for the 7z archive format</flag> <flag name="activerecord">Add ActiveRecord support</flag> <flag name="cppparser">Build and install a minimal C++ parser</flag> - <flag name="crypto" restrict="<=dev-libs/poco-1.12.2-r1">Encryption and digital signing classes</flag> <flag name="data">Database abstraction layer to easily send/retrieve data to/from various databases</flag> <flag name="file2pagecompiler">Utility to convert ordinary files to Page Compiler source files</flag> <flag name="json">Add JSON support</flag> @@ -44,6 +43,7 @@ done quickly and working on the features that make their application unique. <flag name="pagecompiler">Simple compiler translating HTML pages containing embedded C++ code into HTTPRequestHandler classes</flag> <flag name="pocodoc">POCO documentation generator</flag> <flag name="prometheus">Add prometheus monitoring system support</flag> + <flag name="ssl">Encryption and digital signing classes</flag> <flag name="util">Several utility classes (like logger, timer, config file parser)</flag> <flag name="zip">Add support for the zip & gz archive formats</flag> </use> diff --git a/dev-libs/poco/poco-1.11.2-r1.ebuild b/dev-libs/poco/poco-1.11.2-r1.ebuild deleted file mode 100644 index e9754d726988..000000000000 --- a/dev-libs/poco/poco-1.11.2-r1.ebuild +++ /dev/null @@ -1,141 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -DESCRIPTION="C++ libraries for building network-based applications" -HOMEPAGE="https://pocoproject.org/" -SRC_URI="https://github.com/pocoproject/${PN}/archive/${P}-release.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${PN}-${P}-release" - -LICENSE="Boost-1.0" -SLOT="0" -KEYWORDS="amd64 arm arm64 ppc64 x86" -IUSE="7z activerecord cppparser +crypto +data examples +file2pagecompiler iodbc +json mariadb +mongodb mysql +net odbc +pagecompiler pdf pocodoc sqlite +ssl test +util +xml +zip" -RESTRICT="!test? ( test )" -REQUIRED_USE=" - 7z? ( xml ) - file2pagecompiler? ( pagecompiler ) - iodbc? ( odbc ) - mongodb? ( data ) - mysql? ( data ) - odbc? ( data ) - pagecompiler? ( json net util xml ) - pocodoc? ( cppparser util xml ) - sqlite? ( data ) - ssl? ( util ) - test? ( data? ( sqlite ) json util xml ) -" - -BDEPEND="virtual/pkgconfig" -RDEPEND=" - >=dev-libs/libpcre-8.42 - activerecord? ( !app-arch/arc ) - mysql? ( !mariadb? ( dev-db/mysql-connector-c:0= ) - mariadb? ( dev-db/mariadb-connector-c:0= ) ) - odbc? ( - iodbc? ( dev-db/libiodbc ) - !iodbc? ( dev-db/unixODBC ) - ) - sqlite? ( dev-db/sqlite:3 ) - ssl? ( - dev-libs/openssl:0= - ) - xml? ( dev-libs/expat ) - zip? ( sys-libs/zlib ) -" -DEPEND="${RDEPEND}" - -PATCHES=( "${FILESDIR}/${PN}-1.10.1-iodbc-incdir.patch" ) - -src_prepare() { - cmake_src_prepare - - if use test ; then - # ignore missing tests on experimental library - # and tests requiring running DB-servers, internet connections, etc. - sed -i -e '/testsuite/d' \ - {Data/{MySQL,ODBC},MongoDB,Net,NetSSL_OpenSSL,PDF,Redis}/CMakeLists.txt || die - # Poco expands ~ using passwd, which does not match $HOME in the build environment - sed -i -e '/CppUnit_addTest.*testExpand/d' \ - Foundation/testsuite/src/PathTest.cpp || die - # ignore failing Crypto test since upstream does not seem to care, - # see https://github.com/pocoproject/poco/issues/1209 - sed -i -e '/RSATest, testRSACipherLarge/d' \ - Crypto/testsuite/src/RSATest.cpp || die - fi - - if use mariadb ; then - # Fix MariaDB detection - sed -i -e 's~/usr/include/mysql~~' \ - -e 's/STATUS "Couldn/FATAL_ERROR "Couldn/' \ - cmake/FindMySQL.cmake || die - else - # Fix MySQL detection - sed -i -e 's/mysqlclient_r/mysqlclient/' \ - -e 's/STATUS "Couldn/FATAL_ERROR "Couldn/' \ - cmake/FindMySQL.cmake || die - fi - - # Add missing directory that breaks the build - mkdir -p Encodings/testsuite/data || die - - if ! use iodbc ; then - sed -i -e 's|iodbc||' cmake/FindODBC.cmake || die - fi -} - -src_configure() { - # apache support is dead and buggy, https://github.com/pocoproject/poco/issues/1764 - local mycmakeargs=( - -DPOCO_UNBUNDLED=ON - -DENABLE_APACHECONNECTOR=OFF - -DENABLE_ACTIVERECORD="$(usex activerecord)" - -DENABLE_ACTIVERECORD_COMPILER="$(usex activerecord)" - -DENABLE_CPPPARSER="$(usex cppparser)" - -DENABLE_CRYPTO="$(usex ssl)" - -DENABLE_DATA="$(usex data)" - -DENABLE_DATA_MYSQL="$(usex mysql)" - -DENABLE_DATA_ODBC="$(usex odbc)" - -DENABLE_DATA_SQLITE="$(usex sqlite)" - -DENABLE_DATA_POSTGRESQL=OFF - -DENABLE_JSON="$(usex util)" - -DENABLE_MONGODB="$(usex mongodb)" - -DENABLE_NET="$(usex net)" - -DENABLE_NETSSL="$(usex ssl)" - -DENABLE_NETSSL_WIN=OFF - -DENABLE_PAGECOMPILER="$(usex pagecompiler)" - -DENABLE_PAGECOMPILER_FILE2PAGE="$(usex file2pagecompiler)" - -DENABLE_PDF="$(usex pdf)" - -DENABLE_POCODOC="$(usex pocodoc)" - -DENABLE_SEVENZIP="$(usex 7z)" - -DENABLE_TESTS="$(usex test)" - -DENABLE_UTIL="$(usex util)" - -DENABLE_XML="$(usex xml)" - -DENABLE_ZIP="$(usex zip)" - ) - - cmake_src_configure -} - -src_test() { - POCO_BASE="${S}" cmake_src_test -} - -src_install() { - cmake_src_install - - if use examples ; then - for sd in */samples ; do - docinto examples/${sd%/samples} - dodoc -r ${sd} - done - - find "${D}/usr/share/doc/${PF}/examples" \ - -iname "*.sln" -or -iname "*.vcproj" -or \ - -iname "*.vmsbuild" -or -iname "*.properties" \ - | xargs rm -v || die - fi -} diff --git a/dev-libs/poco/poco-1.12.2-r2.ebuild b/dev-libs/poco/poco-1.13.3.ebuild index 61de015e64b6..1ab18c28679e 100644 --- a/dev-libs/poco/poco-1.12.2-r2.ebuild +++ b/dev-libs/poco/poco-1.13.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,11 +11,13 @@ SRC_URI="https://github.com/pocoproject/${PN}/archive/${P}-release.tar.gz -> ${P S="${WORKDIR}/${PN}-${P}-release" LICENSE="Boost-1.0" -SLOT="0" +# SHARED_LIBRARY_VERSION -> "${S}"/libversion +SLOT="0/103" KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" IUSE="7z activerecord cppparser +data examples +file2pagecompiler iodbc +json jwt mariadb +mongodb mysql +net odbc +pagecompiler pdf pocodoc postgres prometheus sqlite +ssl test +util +xml +zip" RESTRICT="!test? ( test )" REQUIRED_USE=" + activerecord? ( util xml ) 7z? ( xml ) file2pagecompiler? ( pagecompiler ) iodbc? ( odbc ) @@ -28,15 +30,19 @@ REQUIRED_USE=" pocodoc? ( cppparser util xml ) sqlite? ( data ) ssl? ( util ) - test? ( data? ( sqlite ) json util xml ) + test? ( data? ( sqlite ) activerecord json jwt pdf util xml ) +" + +BDEPEND=" + test? ( dev-util/cppunit ) + virtual/pkgconfig " -BDEPEND="virtual/pkgconfig" RDEPEND=" >=dev-libs/libpcre2-10.40 activerecord? ( !app-arch/arc ) - mysql? ( dev-db/mysql-connector-c:0= ) - mariadb? ( dev-db/mariadb-connector-c:0= ) + mysql? ( dev-db/mysql-connector-c:= ) + mariadb? ( dev-db/mariadb-connector-c:= ) postgres? ( dev-db/postgresql:= ) odbc? ( iodbc? ( dev-db/libiodbc ) @@ -44,30 +50,29 @@ RDEPEND=" ) sqlite? ( dev-db/sqlite:3 ) ssl? ( - dev-libs/openssl:0= + dev-libs/openssl:= ) xml? ( dev-libs/expat ) zip? ( sys-libs/zlib:= ) " DEPEND="${RDEPEND}" -PATCHES=( "${FILESDIR}/${PN}-1.10.1-iodbc-incdir.patch" ) - src_prepare() { cmake_src_prepare + if [[ ${SLOT} != 0/$(< "${S}"/libversion) ]] ; then + die "Please update subslot in ebuild to the version in ${S}/libversion!" + fi + if use test ; then # ignore missing tests on experimental library # and tests requiring running DB-servers, internet connections, etc. sed -i -e '/testsuite/d' \ - {Data/{MySQL,ODBC},MongoDB,Net,NetSSL_OpenSSL,PDF,Redis}/CMakeLists.txt || die + {Data/{MySQL,ODBC},MongoDB,Net,NetSSL_OpenSSL,Redis}/CMakeLists.txt || die + # Poco expands ~ using passwd, which does not match $HOME in the build environment sed -i -e '/CppUnit_addTest.*testExpand/d' \ Foundation/testsuite/src/PathTest.cpp || die - # ignore failing Crypto test since upstream does not seem to care, - # see https://github.com/pocoproject/poco/issues/1209 - sed -i -e '/RSATest, testRSACipherLarge/d' \ - Crypto/testsuite/src/RSATest.cpp || die fi # Fix MariaDB and MySQL detection @@ -76,9 +81,6 @@ src_prepare() { -e 's/STATUS "Couldn/FATAL_ERROR "Couldn/' \ cmake/FindMySQL.cmake || die - # Add missing directory that breaks the build - mkdir -p Encodings/testsuite/data || die - if ! use iodbc ; then sed -i -e 's|iodbc||' cmake/FindODBC.cmake || die fi diff --git a/dev-libs/protobuf-c/Manifest b/dev-libs/protobuf-c/Manifest index 9e824fc64956..fac581b01b10 100644 --- a/dev-libs/protobuf-c/Manifest +++ b/dev-libs/protobuf-c/Manifest @@ -1 +1,2 @@ DIST protobuf-c-1.4.1.tar.gz 513596 BLAKE2B b5e87a3154863581b81790a26b6b522c2b3ad138e966053f20c6264b4a7677d6c5bff8e27faa7c6cfa9e982b72b06e2f518a3def9f6db13241c3cb3ee9afc8f6 SHA512 190a4aa5c607853e6bf860b0974deb21e4f7f6209e810251eaca9612b59ea676779b0ca217fb1572914ffb8de3315a7d24f162b14d447ee671a9adc5b1271e41 +DIST protobuf-c-1.5.0.tar.gz 507251 BLAKE2B 7b428655901f4fd74b67b75419552e7c02065a5291aed4dcc1d55b98c986caa9ccf846eb5e98e0954420c3e5bea559b0078843e00daa7b5c63465eec21e28204 SHA512 175c9fc901cab88308730eea982dd62b1e0decdceb80aa53be163f17a440b4acecb834a784beab5cd71186413a322a323f4539758a8727ca51801cf92f9bd3da diff --git a/dev-libs/protobuf-c/protobuf-c-1.5.0.ebuild b/dev-libs/protobuf-c/protobuf-c-1.5.0.ebuild new file mode 100644 index 000000000000..ee2370a3fa6e --- /dev/null +++ b/dev-libs/protobuf-c/protobuf-c-1.5.0.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools multilib-minimal + +MY_PV="${PV/_/-}" +MY_P="${PN}-${MY_PV}" + +DESCRIPTION="Protocol Buffers implementation in C" +HOMEPAGE="https://github.com/protobuf-c/protobuf-c" +SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${MY_PV}/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" + +LICENSE="BSD-2" +# Subslot == SONAME version +SLOT="0/1.0.0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE="static-libs" + +BDEPEND=" + >=dev-libs/protobuf-3:0 + virtual/pkgconfig +" +DEPEND=">=dev-libs/protobuf-3:0=[${MULTILIB_USEDEP}]" +RDEPEND="${DEPEND}" + +src_prepare() { + default + eautoreconf +} + +multilib_src_configure() { + local myeconfargs=( + $(use_enable static-libs static) + ) + + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_install_all() { + find "${ED}" -name '*.la' -type f -delete || die + einstalldocs +} diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest index 8695f23be04a..491e8fa19f28 100644 --- a/dev-libs/protobuf/Manifest +++ b/dev-libs/protobuf/Manifest @@ -2,3 +2,4 @@ DIST protobuf-21.12.tar.gz 5141166 BLAKE2B 33500612d103afb817062486a741e8e5503f8 DIST protobuf-21.9.tar.gz 5110670 BLAKE2B a4f5b7f58e1c5904ca990b100a72992f6f56177b28773f8de8c99e4158391d33cfb8aa8575915887fc9ae4294faf81d4ff6b470bc07b394bfd5885a09ba0fafe SHA512 6954b42d21921e630173b7848c056ab95635627d8eddec960f3db2ddda13eedde00520a9b350722e76e2998649eb8ebe10758e1db938b6a91e38ff3295b1b7c1 DIST protobuf-22.5.tar.gz 4924661 BLAKE2B d69c73f4ebfddf45fd94b4f5f898faf00256fe674f2cbc0443c60a88d7a0f47fb96f2f6262879927c6da88095b4ea3ee7fd4c471c100bf42a2bae9edf48c07f1 SHA512 058ab2fec5b11007972e6043071056d1944c3b6fe1d31246cddba8eb57686e3b5280f6ad3d58e78940ca63005e74a8de3c72237f9f7c5066548c5a2513ddc584 DIST protobuf-23.3.tar.gz 5043803 BLAKE2B ee2edee230969555c9ef95069c7b1d6c23c3d1f8ea1b2249fb3e9f6fcf63312c6e10e9da65b80629fb08d5fb08d05a19bb9c752c25b892c1e3fd6f18b9279eb3 SHA512 646af367dbc61b42e322cf0b335f360e428b272e2b1f5361b2f17c18d3dc9dddd615e1279436028b1a42275a0beadda37c2c934fc27d6c892131cc8d526d8b3b +DIST protobuf-26.1.tar.gz 5957903 BLAKE2B 1a7faab2f56aa0995801a80f73a812c7fc38a00af0bf25bdd5eecf7aec27a86a575ea2fb8484787d19c9ac6e46007c9864e79464f529c446f31af732981feed1 SHA512 0363ac09f92d8e040491425d444c8dca0b9b430e02d2dff6e2b28a0c2b2bea0d33a47f50bc9e2e2d4e8e22b65a02009a20c0066fb89c75df93a7b703dda42ed4 diff --git a/dev-libs/protobuf/files/protobuf-26.1-disable-32-bit-tests.patch b/dev-libs/protobuf/files/protobuf-26.1-disable-32-bit-tests.patch new file mode 100644 index 000000000000..dfbda168d58e --- /dev/null +++ b/dev-libs/protobuf/files/protobuf-26.1-disable-32-bit-tests.patch @@ -0,0 +1,37 @@ +https://github.com/protocolbuffers/protobuf/issues/8460 +--- a/src/google/protobuf/any_test.cc ++++ b/src/google/protobuf/any_test.cc +@@ -40,9 +40,8 @@ TEST(AnyTest, TestPackAndUnpack) { + } + + TEST(AnyTest, TestPackFromSerializationExceedsSizeLimit) { +-#if defined(_MSC_VER) && defined(_M_IX86) +- GTEST_SKIP() << "This toolchain can't allocate that much memory."; +-#endif ++ // Filter out this test on 32-bit architectures. ++ if(sizeof(void*) < 8) return; + protobuf_unittest::TestAny submessage; + submessage.mutable_text()->resize(INT_MAX, 'a'); + protobuf_unittest::TestAny message; + +https://github.com/protocolbuffers/protobuf/issues/8459 +--- a/src/google/protobuf/arena_unittest.cc ++++ b/src/google/protobuf/arena_unittest.cc +@@ -1373,6 +1373,8 @@ TEST(ArenaTest, MessageLiteOnArena) { + uint64_t Align8(uint64_t n) { return (n + 7) & -8; } + + TEST(ArenaTest, SpaceAllocated_and_Used) { ++ // Filter out this test on 32-bit architectures. ++ if(sizeof(void*) < 8) return; + Arena arena_1; + EXPECT_EQ(0, arena_1.SpaceAllocated()); + EXPECT_EQ(0, arena_1.SpaceUsed()); +@@ -1453,6 +1455,8 @@ TEST(ArenaTest, Alignment) { + } + + TEST(ArenaTest, BlockSizeSmallerThanAllocation) { ++ // Filter out this test on 32-bit architectures. ++ if(sizeof(void*) < 8) return; + for (size_t i = 0; i <= 8; ++i) { + ArenaOptions opt; + opt.start_block_size = opt.max_block_size = i; diff --git a/dev-libs/protobuf/protobuf-22.5.ebuild b/dev-libs/protobuf/protobuf-22.5.ebuild index dc99040c5f31..ff582edbc198 100644 --- a/dev-libs/protobuf/protobuf-22.5.ebuild +++ b/dev-libs/protobuf/protobuf-22.5.ebuild @@ -25,11 +25,13 @@ RESTRICT="!test? ( test )" BDEPEND="emacs? ( app-editors/emacs:* )" DEPEND=" - >=dev-cpp/abseil-cpp-20230125:=[${MULTILIB_USEDEP}] + <dev-cpp/abseil-cpp-20240116.2:=[${MULTILIB_USEDEP},test?] + >=dev-cpp/abseil-cpp-20230125:=[${MULTILIB_USEDEP},test?] zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] ) test? ( >=dev-cpp/gtest-1.9[${MULTILIB_USEDEP}] ) " RDEPEND=" + <dev-cpp/abseil-cpp-20240116.2:=[${MULTILIB_USEDEP}] >=dev-cpp/abseil-cpp-20230125:=[${MULTILIB_USEDEP}] emacs? ( app-editors/emacs:* ) zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] ) diff --git a/dev-libs/protobuf/protobuf-23.3-r2.ebuild b/dev-libs/protobuf/protobuf-23.3-r2.ebuild index c9721bfd61ce..88af8ad53ef9 100644 --- a/dev-libs/protobuf/protobuf-23.3-r2.ebuild +++ b/dev-libs/protobuf/protobuf-23.3-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 2008-2023 Gentoo Authors +# Copyright 2008-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -25,11 +25,13 @@ RESTRICT="!test? ( test )" BDEPEND="emacs? ( app-editors/emacs:* )" DEPEND=" - >=dev-cpp/abseil-cpp-20230125.3:=[${MULTILIB_USEDEP}] + <dev-cpp/abseil-cpp-20240116.2:=[${MULTILIB_USEDEP},test?] + >=dev-cpp/abseil-cpp-20230125.3:=[${MULTILIB_USEDEP},test?] zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] ) test? ( >=dev-cpp/gtest-1.9[${MULTILIB_USEDEP}] ) " RDEPEND=" + <dev-cpp/abseil-cpp-20240116.2:=[${MULTILIB_USEDEP}] >=dev-cpp/abseil-cpp-20230125.3:=[${MULTILIB_USEDEP}] emacs? ( app-editors/emacs:* ) zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] ) diff --git a/dev-libs/protobuf/protobuf-26.1.ebuild b/dev-libs/protobuf/protobuf-26.1.ebuild new file mode 100644 index 000000000000..8b99e882da51 --- /dev/null +++ b/dev-libs/protobuf/protobuf-26.1.ebuild @@ -0,0 +1,108 @@ +# Copyright 2008-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake-multilib elisp-common toolchain-funcs + +if [[ "${PV}" == *9999 ]]; then + inherit git-r3 + + EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf.git" + EGIT_SUBMODULES=() +else + SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" +fi + +DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data" +HOMEPAGE="https://protobuf.dev/" + +LICENSE="BSD" +SLOT="0/$(ver_cut 1-2).0" +IUSE="emacs examples test zlib" +RESTRICT="!test? ( test )" + +BDEPEND="emacs? ( app-editors/emacs:* )" +DEPEND=" + >=dev-cpp/abseil-cpp-20230125.3:=[${MULTILIB_USEDEP},test?] + zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] ) + test? ( >=dev-cpp/gtest-1.9[${MULTILIB_USEDEP}] ) +" +RDEPEND=" + >=dev-cpp/abseil-cpp-20230125.3:=[${MULTILIB_USEDEP}] + emacs? ( app-editors/emacs:* ) + zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] ) +" + +PATCHES=( + "${FILESDIR}/${P}-disable-32-bit-tests.patch" + "${FILESDIR}/${PN}-23.3-static_assert-failure.patch" +) + +DOCS=( CONTRIBUTORS.txt README.md ) + +src_configure() { + if tc-ld-is-gold; then + # https://sourceware.org/bugzilla/show_bug.cgi?id=24527 + tc-ld-disable-gold + fi + + cmake-multilib_src_configure +} + +multilib_src_configure() { + local mycmakeargs=( + -Dprotobuf_DISABLE_RTTI=ON + -Dprotobuf_BUILD_EXAMPLES=$(usex examples) + -Dprotobuf_WITH_ZLIB=$(usex zlib) + -Dprotobuf_BUILD_TESTS=$(usex test) + -Dprotobuf_ABSL_PROVIDER=package + ) + use test && mycmakeargs+=(-Dprotobuf_USE_EXTERNAL_GTEST=ON) + + cmake_src_configure +} + +src_compile() { + cmake-multilib_src_compile + + if use emacs; then + elisp-compile editors/protobuf-mode.el + fi +} + +multilib_src_install_all() { + find "${ED}" -name "*.la" -delete || die + + if [[ ! -f "${ED}/usr/$(get_libdir)/libprotobuf.so.${SLOT#*/}" ]]; then + eerror "No matching library found with SLOT variable, currently set: ${SLOT}\n" \ + "Expected value: ${ED}/usr/$(get_libdir)/libprotobuf.so.${SLOT#*/}" + die "Please update SLOT variable" + fi + + insinto /usr/share/vim/vimfiles/syntax + doins editors/proto.vim + insinto /usr/share/vim/vimfiles/ftdetect + doins "${FILESDIR}/proto.vim" + + if use emacs; then + elisp-install ${PN} editors/protobuf-mode.el* + elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el" + fi + + if use examples; then + DOCS+=(examples) + docompress -x /usr/share/doc/${PF}/examples + fi + + einstalldocs +} + +pkg_postinst() { + use emacs && elisp-site-regen +} + +pkg_postrm() { + use emacs && elisp-site-regen +} diff --git a/dev-libs/pslib/pslib-0.4.6.ebuild b/dev-libs/pslib/pslib-0.4.6.ebuild index d99a7f9ba545..d554739c4e28 100644 --- a/dev-libs/pslib/pslib-0.4.6.ebuild +++ b/dev-libs/pslib/pslib-0.4.6.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 @@ -7,7 +7,7 @@ inherit autotools DESCRIPTION="pslib is a C-library to create PostScript files on the fly" HOMEPAGE="https://pslib.sourceforge.net/" -SRC_URI="mirror://sourceforge/pslib/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/pslib/${P}.tar.gz" LICENSE="GPL-2+" SLOT="0" diff --git a/dev-libs/qcustomplot/Manifest b/dev-libs/qcustomplot/Manifest index ad63881c1367..3dcd20c8c631 100644 --- a/dev-libs/qcustomplot/Manifest +++ b/dev-libs/qcustomplot/Manifest @@ -1,4 +1,2 @@ -DIST qcustomplot-sharedlib-2.0.1.tar.gz 1963 BLAKE2B 294877d929564767009a8a4409111408eda1eb4e0cc64b48e644d25f30ef18151c2df1f0c5caa4e95c5b75dd492e795f97077e47bb927ff9637a2da9a2ec757e SHA512 ce90540fca7226eac37746327e1939a9c7af38fc2595f385ed04d6d1f49560da08fb5fae15d1b9d22b6ba578583f70de8f89ef26796770d41bf599c1b15c535d DIST qcustomplot-sharedlib-2.1.1.tar.gz 2315 BLAKE2B 5ded041a46a35dece817749479cba83da260407e387a339c5fba57a37897118b20cd50f362e78ea4a35c9babc5f6c73c235a671a17b5b0423b00e472c0a8eb60 SHA512 c661e4a835066fee92b254fbd7b825dbd5c58973189ff2099a01308cb81fe6bf3bac1456f5da91f01c6265f8f548f61b57e237d00a9b5c2c94acf1a024baa18e -DIST qcustomplot-source-2.0.1.tar.gz 319140 BLAKE2B 868133f5126eea0aa8f80d34272f854de93b60575e3eed1b52211bec5ed96886503ba5c7f15c6f0ff15f3f67e35db6e5333adfc7465cee40768a65ed1b7275da SHA512 b44abbd8fd95970a829bbb6e7becc0765e24bd8f05958c8c1223303b68fb4c0a64f503cf0a2fe4fc53957e6e61a6618500475cff3e81ed0ab387a9eada2c83a3 DIST qcustomplot-source-2.1.1.tar.gz 372955 BLAKE2B 985ce5fbfe2888ac2346a8c694e832f8d9e3d20ae1c2f93af8757f6a7c803e24ae429c11240aeaf9e79625d8eb0e8a835dca023b73eac4ca1338d21434bd3c67 SHA512 1feb4f45ef90d7709edb26c9964f0ec85ef4aa30f0a7e9fcd803fae586875e8d6744dbcfe08b21f461816ca426c8a6612f8e9c7ef9d3f5a7150c3de8fa5ee57d diff --git a/dev-libs/qcustomplot/metadata.xml b/dev-libs/qcustomplot/metadata.xml index 610d2d8ea120..115e9d64a669 100644 --- a/dev-libs/qcustomplot/metadata.xml +++ b/dev-libs/qcustomplot/metadata.xml @@ -1,8 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>qt@gentoo.org</email> - <name>Gentoo Qt Project</name> - </maintainer> + <!-- maintainer-needed --> </pkgmetadata> diff --git a/dev-libs/qcustomplot/qcustomplot-2.0.1.ebuild b/dev-libs/qcustomplot/qcustomplot-2.0.1.ebuild deleted file mode 100644 index dcd0e02408fe..000000000000 --- a/dev-libs/qcustomplot/qcustomplot-2.0.1.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit qmake-utils - -DESCRIPTION="Qt C++ widget for plotting and data visualization" -HOMEPAGE="https://www.qcustomplot.com/" -SRC_URI=" - https://www.qcustomplot.com/release/${PV}/QCustomPlot-sharedlib.tar.gz -> ${PN}-sharedlib-${PV}.tar.gz - https://www.qcustomplot.com/release/${PV}/QCustomPlot-source.tar.gz -> ${PN}-source-${PV}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux" -IUSE="" - -RDEPEND=" - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtprintsupport:5 - dev-qt/qtwidgets:5 -" -DEPEND="${RDEPEND}" - -S=${WORKDIR}/${PN}-source - -src_prepare() { - default - - sed \ - -e 's:../../::g' \ - -e '/CONFIG/s:shared.*:shared:g' \ - "${WORKDIR}"/${PN}-sharedlib/sharedlib-compilation/sharedlib-compilation.pro > ${PN}.pro || die -} - -src_configure() { - eqmake5 -} - -src_install() { - dolib.so lib${PN}* - doheader ${PN}.h - dodoc changelog.txt -} diff --git a/dev-libs/qcustomplot/qcustomplot-2.1.1.ebuild b/dev-libs/qcustomplot/qcustomplot-2.1.1.ebuild index 2aaa20581c29..2f6a8359e81e 100644 --- a/dev-libs/qcustomplot/qcustomplot-2.1.1.ebuild +++ b/dev-libs/qcustomplot/qcustomplot-2.1.1.ebuild @@ -14,7 +14,7 @@ S=${WORKDIR}/${PN}-source LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux" IUSE="" RDEPEND=" diff --git a/dev-libs/qoauth/metadata.xml b/dev-libs/qoauth/metadata.xml index 610d2d8ea120..115e9d64a669 100644 --- a/dev-libs/qoauth/metadata.xml +++ b/dev-libs/qoauth/metadata.xml @@ -1,8 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>qt@gentoo.org</email> - <name>Gentoo Qt Project</name> - </maintainer> + <!-- maintainer-needed --> </pkgmetadata> diff --git a/dev-libs/qr-code-generator/qr-code-generator-1.8.0.ebuild b/dev-libs/qr-code-generator/qr-code-generator-1.8.0.ebuild index 14b0abdb85b2..4a82614b6f10 100644 --- a/dev-libs/qr-code-generator/qr-code-generator-1.8.0.ebuild +++ b/dev-libs/qr-code-generator/qr-code-generator-1.8.0.ebuild @@ -18,7 +18,7 @@ S="${WORKDIR}/QR-Code-generator-${PV}" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc64" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" src_prepare() { # Move the CMake files into the project root. diff --git a/dev-libs/qtkeychain/Manifest b/dev-libs/qtkeychain/Manifest index be66d503e662..77206317a586 100644 --- a/dev-libs/qtkeychain/Manifest +++ b/dev-libs/qtkeychain/Manifest @@ -1 +1,2 @@ DIST qtkeychain-0.14.2.tar.gz 50915 BLAKE2B eed35eec296b62fec90e83e98c3ab817aa05f7cefd74c3790ce2f7c38c051d5b95b3664e688bef0cfe7b06583e844782f60454bb67b48f6507fc33c780c62bf0 SHA512 d681f60a6954a8fcb37039cfb1a6d69f5aee19f30313d65072c40cee1880c302b9f2ad3d994ae7a775b17479f443231774804ca438ef6b5e7ec25533d5d9f3c2 +DIST qtkeychain-0.14.3.tar.gz 50948 BLAKE2B 4f2189b2d6a1faf7b5041baeb1c2f00498d0297a8028799ab646aa92189d569114c76b45528d15a72d7cee8dc6252797bebd3e2849034e703709a3b41f74a805 SHA512 d1d87553db94bf54da1373016a847476e6cd608db6d427ed72532658e2272501daf45d7c9976efdde2f26ab3810ba9dbfec2518d46dee5a76ecaa369bfee2e4a diff --git a/dev-libs/qtkeychain/qtkeychain-0.14.3.ebuild b/dev-libs/qtkeychain/qtkeychain-0.14.3.ebuild new file mode 100644 index 000000000000..40b5710678fd --- /dev/null +++ b/dev-libs/qtkeychain/qtkeychain-0.14.3.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake multibuild + +DESCRIPTION="Qt API for storing passwords securely" +HOMEPAGE="https://github.com/frankosterfeld/qtkeychain" + +if [[ ${PV} != *9999* ]]; then + SRC_URI="https://github.com/frankosterfeld/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86" +else + inherit git-r3 + EGIT_REPO_URI="https://github.com/frankosterfeld/${PN}.git" +fi + +LICENSE="BSD-2" +SLOT="0/1" +IUSE="keyring +qt5 qt6" +REQUIRED_USE="|| ( qt5 qt6 )" + +DEPEND=" + keyring? ( + app-crypt/libsecret + dev-libs/glib:2 + ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + ) + qt6? ( dev-qt/qtbase:6[dbus] ) +" +RDEPEND="${DEPEND}" +BDEPEND=" + qt5? ( dev-qt/linguist-tools:5 ) + qt6? ( dev-qt/qttools:6[linguist] ) +" + +DOCS=( ChangeLog ReadMe.md ) + +pkg_setup() { + MULTIBUILD_VARIANTS=( $(usev qt5) $(usev qt6) ) +} + +src_configure() { + my_src_configure() { + local mycmakeargs=( + -DECM_MKSPECS_INSTALL_DIR="${EPREFIX}"/usr/$(get_libdir)/${MULTIBUILD_VARIANT}/mkspecs + -DBUILD_TEST_APPLICATION=OFF + -DBUILD_TRANSLATIONS=ON + -DLIBSECRET_SUPPORT=$(usex keyring) + ) + + if [[ ${MULTIBUILD_VARIANT} == qt6 ]]; then + mycmakeargs+=( -DBUILD_WITH_QT6=ON ) + else + mycmakeargs+=( -DBUILD_WITH_QT6=OFF ) + fi + + cmake_src_configure + } + + multibuild_foreach_variant my_src_configure +} + +src_compile() { + multibuild_foreach_variant cmake_src_compile +} + +src_install() { + multibuild_foreach_variant cmake_src_install +} diff --git a/dev-libs/qxlsx/Manifest b/dev-libs/qxlsx/Manifest index 5e17cb5068c1..f5ccfe9b1376 100644 --- a/dev-libs/qxlsx/Manifest +++ b/dev-libs/qxlsx/Manifest @@ -1,2 +1 @@ -DIST qxlsx-1.4.6.tar.gz 4705107 BLAKE2B 9329412c949d2eaaab9a1d536ca2680da0649ef8b7a07bda6f20dd3c3214db8abac458fde25f41afc8b8b22442b6b83820cefa6031ef27de857d49ebfbed774b SHA512 14651096d35889354ffc97ca80146fb6704901db210b90d5de4157ee67adddb2021a27969777369162b0f5424b31bc50596ecd86e2f6f138c329a7cf4f2161a8 DIST qxlsx-1.4.7.tar.gz 4705261 BLAKE2B 8be35b86ef7f025d5cc0875275406a65e1624592d7c8fa97d743223ab143011de9e71dc40eb62d83edc28c16c5d9e9c8092ea082cd8898db277e8a94e1ea10e6 SHA512 5ca8841413d5bddf1cec2c6eb4434ae18c533231adf32a8157790ba81c0b305c7f02a70475492a45ce11d1d6cf6e483bd30cafe8629aa564a46cb749e1b43f43 diff --git a/dev-libs/qxlsx/files/qxlsx-1.4.6-headers.patch b/dev-libs/qxlsx/files/qxlsx-1.4.6-headers.patch deleted file mode 100644 index 90dd81fb8c88..000000000000 --- a/dev-libs/qxlsx/files/qxlsx-1.4.6-headers.patch +++ /dev/null @@ -1,26 +0,0 @@ -https://github.com/QtExcel/QXlsx/pull/279 - -From 8c3e6633e3c901bc5a5cd477383421b0980dcd26 Mon Sep 17 00:00:00 2001 -From: Alexey Sokolov <sokolov@google.com> -Date: Mon, 17 Apr 2023 23:43:59 +0100 -Subject: [PATCH] Fix #278 - -There's no real reason to install the same headers twice, but at least -now clients of the library can build again ---- - QXlsx/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/QXlsx/CMakeLists.txt b/QXlsx/CMakeLists.txt -index 4fa7f7f..074922a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -179,7 +179,7 @@ PRIVATE - ${QXLSX_HEADERPATH} - PUBLIC - $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/header> -- $<INSTALL_INTERFACE:include/QXlsx> -+ $<INSTALL_INTERFACE:include/QXlsxQt${QT_VERSION_MAJOR}> - ) - - set_target_properties(QXlsx PROPERTIES diff --git a/dev-libs/qxlsx/qxlsx-1.4.6.ebuild b/dev-libs/qxlsx/qxlsx-1.4.6.ebuild deleted file mode 100644 index b00b67caf83e..000000000000 --- a/dev-libs/qxlsx/qxlsx-1.4.6.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit multibuild cmake - -DESCRIPTION="Excel file(*.xlsx) reader/writer library using Qt" - -HOMEPAGE="https://github.com/QtExcel/QXlsx" -SRC_URI="https://github.com/QtExcel/QXlsx/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -# soversion -SLOT="0/0.1.4.4" -KEYWORDS="amd64 ppc ppc64 ~riscv x86" - -IUSE="qt5 qt6" -REQUIRED_USE="|| ( qt5 qt6 )" - -RDEPEND=" - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5= - ) - qt6? ( - dev-qt/qtbase:6=[gui] - ) -" -DEPEND="${RDEPEND}" - -S="${WORKDIR}/QXlsx-${PV}/QXlsx" - -PATCHES=( - "${FILESDIR}/qxlsx-1.4.6-headers.patch" -) - -pkg_setup() { - MULTIBUILD_VARIANTS=( $(usev qt5) $(usev qt6) ) -} - -src_configure() { - my_src_configure() { - local mycmakeargs=( - -DQT_VERSION_MAJOR="${MULTIBUILD_VARIANT/qt/}" - ) - - cmake_src_configure - } - - multibuild_foreach_variant my_src_configure -} - -src_compile() { - multibuild_foreach_variant cmake_src_compile -} - -src_install() { - multibuild_foreach_variant cmake_src_install -} diff --git a/dev-libs/qxlsx/qxlsx-1.4.7.ebuild b/dev-libs/qxlsx/qxlsx-1.4.7.ebuild index e11dac21a2ef..328515ace716 100644 --- a/dev-libs/qxlsx/qxlsx-1.4.7.ebuild +++ b/dev-libs/qxlsx/qxlsx-1.4.7.ebuild @@ -15,7 +15,7 @@ LICENSE="MIT" SLOT="0/0.1.4.4" KEYWORDS="amd64 ppc ppc64 ~riscv x86" -IUSE="qt5 qt6" +IUSE="+qt5 qt6" REQUIRED_USE="|| ( qt5 qt6 )" RDEPEND=" diff --git a/dev-libs/raft/Manifest b/dev-libs/raft/Manifest index dc76a4688a6c..c390ca568bfe 100644 --- a/dev-libs/raft/Manifest +++ b/dev-libs/raft/Manifest @@ -1,2 +1 @@ -DIST raft-0.19.1.tar.gz 354736 BLAKE2B cfdb9a1948311debe99b56e0f9c1f19fb858248ab1138648e26a21d965cc488aea504711415ff569d2e80a15414a1f15ca9b34ff9b3de62b03580755cefe30b3 SHA512 4990dca1f61dcda82acaf043a5b81dd9a3b92a0f3e0be9b2c339d764be338220f2fab31ed8bae535153b1d81c86364d447774b52da2c8b90c5daa7b8718d7ae2 -DIST raft-0.22.0.tar.gz 365710 BLAKE2B b5084867ebd7e80f59edebcf5feb83cc7ffbf798deecbf96d3b31c0de7213c8fc1e3e5f558602f5864fb04f8de0326ee2f70d2f6164a08dd444a8db95593c328 SHA512 0ebda5764c866443ee2749c0c8fe798f111ed500b9d59bc9536d01e01ee82a8ed72125fb02e6a0c3bf51e4004520d4c5fdb583220599cb22bb9a8e6dd9d1a54b +DIST raft-0.22.1.tar.gz 362393 BLAKE2B b6fc8f8e9dc6801ac8ad1b9d94f984b249b83def00a08776292500b079bb777330e8a83cf40153bfb1baae921105788d758c9f61a021d5519d5c27048b6be8b9 SHA512 fb4ea98321336daaa605e1c3cd55f672860fc8894d479fdff4e1862a4eb5622dbaf7a943e030dd2bcdaa14cc639e7e11ac43d71f00bdbd27f12c6b67653b70e4 diff --git a/dev-libs/raft/raft-0.19.1.ebuild b/dev-libs/raft/raft-0.19.1.ebuild deleted file mode 100644 index 5a8cef29a47d..000000000000 --- a/dev-libs/raft/raft-0.19.1.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 2020-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools - -DESCRIPTION="C implementation of the Raft consensus protocol" -HOMEPAGE="https://github.com/cowsql/raft" -SRC_URI="https://github.com/cowsql/raft/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-3-with-linking-exception" - -# Upstream change from canonical to cowsql resetted SONAME, 3 -> 0. bgo#915960 -SLOT="0/0" -KEYWORDS="amd64 ~arm64 ~x86" -IUSE="lz4 test zfs" -RESTRICT="!test? ( test )" - -DEPEND="dev-libs/libuv:= - lz4? ( app-arch/lz4:= )" -RDEPEND="${DEPEND}" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/raft-0.10.0-toggle-zfs.patch -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - # --disable-hardening: most of these are covered on non-hardened Gentoo already. - local myeconfargs=( - --enable-uv - - --disable-backtrace - --disable-benchmark - --disable-debug - --disable-example - --disable-hardening - --disable-sanitize - --disable-static - - $(use_enable test fixture) - - $(use_with lz4) - $(use_with zfs) - ) - - econf "${myeconfargs[@]}" -} - -src_install() { - default - find "${ED}" -name '*.la' -delete || die -} diff --git a/dev-libs/raft/raft-0.22.0.ebuild b/dev-libs/raft/raft-0.22.1.ebuild index 39daa1268bef..39daa1268bef 100644 --- a/dev-libs/raft/raft-0.22.0.ebuild +++ b/dev-libs/raft/raft-0.22.1.ebuild diff --git a/dev-libs/rapidjson/rapidjson-1.1.0-r4.ebuild b/dev-libs/rapidjson/rapidjson-1.1.0-r4.ebuild index 4e119e95d79d..1c16b109ab96 100644 --- a/dev-libs/rapidjson/rapidjson-1.1.0-r4.ebuild +++ b/dev-libs/rapidjson/rapidjson-1.1.0-r4.ebuild @@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]] ; then inherit git-r3 else SRC_URI="https://github.com/miloyip/rapidjson/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86" + KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86" S="${WORKDIR}/rapidjson-${PV}" fi diff --git a/dev-libs/s2n/metadata.xml b/dev-libs/s2n/metadata.xml index ff907dea8127..2d66499958c7 100644 --- a/dev-libs/s2n/metadata.xml +++ b/dev-libs/s2n/metadata.xml @@ -9,6 +9,9 @@ <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> + <upstream> + <remote-id type="github">aws/s2n-tls</remote-id> + </upstream> <longdescription> s2n is a C99 implementation of the TLS/SSL protocols that is designed to be simple, small, fast, and with security as a priority. It is released and licensed under the Apache License 2.0. diff --git a/dev-libs/sentry-native/Manifest b/dev-libs/sentry-native/Manifest index 362a9b0c7c7e..7bdbc02ae51a 100644 --- a/dev-libs/sentry-native/Manifest +++ b/dev-libs/sentry-native/Manifest @@ -1,3 +1,2 @@ -DIST sentry-native-0.6.5.tar.gz 325573 BLAKE2B 6308bef5cc194c3eb8f6f30d1ee894f3d7528d31604f26d6d54cfcc1545ef561346f60c9f35e80662431ad6145cf27a4adac70255b01f230551a541fd4dae709 SHA512 0c0be06f72f53277c9a34ca6514dc96ad14b4239ee92ae65e00d45a515ce13bc314982a651c476ddbb453079ea3fc3fa0bb75cc683dce046f69f0fe1d024f32e -DIST sentry-native-0.6.6.tar.gz 325897 BLAKE2B 0613e41aa1163c9ceb6d0aff2ad5db36d84fc0c86d3ebe9993b5e1a0ed06bcb811f0f58b20c6abfa3abbc3c2a5db655908372d439ec67412f4d152d82111509c SHA512 ee39641ee3138b92e33b29d8bfbb454f61d5ab5621d71e199be8bcbbfc220a3456372e3757a820a69c5f2ad4be474216a6b816d3e1fb483479f39ebd864a09dd DIST sentry-native-0.6.7.tar.gz 326571 BLAKE2B 5678e406573fa1281b995cf897b556c064831a835960819760ce36e79704fdbf363b637c61adaf14446ba394e057cecbc7a940cb61a2d4c9fd97b5c2ff67647a SHA512 8c5ec1fff2f99acddac8964c415b470a8e5a53967de9fa84444d78d49ed05f592a2c5373688cf87a86ec7cb4c2fe076f9d50443b6ddb9f479713655664d330fb +DIST sentry-native-0.7.2.tar.gz 330431 BLAKE2B f6651d4397075d67cc1069205e38654ba6c98c64adee03c968f45b1ea2441b0954b90543585ae04c75457edbbc05df4ae0aec242e1570e2716bc8505a11f5a67 SHA512 4a086c87dda82a5109681d014f9d33535d43805f4149ad09609b81da001a7e9c9eb6850ea1b0c2c781072d76725a08341dde1e57be20b26a9ff72f4984f51e8a diff --git a/dev-libs/sentry-native/sentry-native-0.6.6.ebuild b/dev-libs/sentry-native/sentry-native-0.6.6.ebuild deleted file mode 100644 index 1e3a691a642a..000000000000 --- a/dev-libs/sentry-native/sentry-native-0.6.6.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -DESCRIPTION="Sentry SDK for C, C++ and native applications" -HOMEPAGE="https://sentry.io/ https://github.com/getsentry/sentry-native" -SRC_URI="https://github.com/getsentry/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" -IUSE="+breakpad +curl test" - -RESTRICT="!test? ( test )" - -RDEPEND=" - breakpad? ( - dev-util/breakpad - virtual/pkgconfig - ) - curl? ( net-misc/curl ) -" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/${PN}-0.6.5_cmake-breakpad.patch - "${FILESDIR}"/${PN}-0.6.5_no-fuzz-test.patch -) - -src_configure() { - local mycmakeargs=( - -DSENTRY_BUILD_EXAMPLES=OFF - -DSENTRY_BACKEND=$(usex breakpad "breakpad" "inproc") - -DSENTRY_BUILD_TESTS=$(usex test) - -DSENTRY_TRANSPORT=$(usex curl "curl" "none") - ) - # Avoid "not used by the project" warnings when USE=-breakpad - if use breakpad; then - mycmakeargs+=( -DSENTRY_BREAKPAD_SYSTEM=ON ) - fi - - cmake_src_configure -} diff --git a/dev-libs/sentry-native/sentry-native-0.6.5-r1.ebuild b/dev-libs/sentry-native/sentry-native-0.7.2.ebuild index 1e3a691a642a..debfa4792b27 100644 --- a/dev-libs/sentry-native/sentry-native-0.6.5-r1.ebuild +++ b/dev-libs/sentry-native/sentry-native-0.7.2.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 @@ -21,12 +21,14 @@ RDEPEND=" dev-util/breakpad virtual/pkgconfig ) - curl? ( net-misc/curl ) + curl? ( + net-misc/curl + sys-libs/zlib + ) " DEPEND="${RDEPEND}" PATCHES=( - "${FILESDIR}"/${PN}-0.6.5_cmake-breakpad.patch "${FILESDIR}"/${PN}-0.6.5_no-fuzz-test.patch ) @@ -36,6 +38,7 @@ src_configure() { -DSENTRY_BACKEND=$(usex breakpad "breakpad" "inproc") -DSENTRY_BUILD_TESTS=$(usex test) -DSENTRY_TRANSPORT=$(usex curl "curl" "none") + -DSENTRY_TRANSPORT_COMPRESSION=$(usex curl) ) # Avoid "not used by the project" warnings when USE=-breakpad if use breakpad; then diff --git a/dev-libs/serdisplib/serdisplib-2.02-r2.ebuild b/dev-libs/serdisplib/serdisplib-2.02-r2.ebuild index ba4565132b83..bfa265f1922f 100644 --- a/dev-libs/serdisplib/serdisplib-2.02-r2.ebuild +++ b/dev-libs/serdisplib/serdisplib-2.02-r2.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 @@ -7,7 +7,7 @@ inherit udev DESCRIPTION="Library to drive several displays with built-in controllers or display modules" HOMEPAGE="http://serdisplib.sourceforge.net" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" LICENSE="GPL-2+" SLOT="0" diff --git a/dev-libs/sexpp/Manifest b/dev-libs/sexpp/Manifest index 35a444c64a97..fa1a6f6a7e8d 100644 --- a/dev-libs/sexpp/Manifest +++ b/dev-libs/sexpp/Manifest @@ -1 +1,2 @@ DIST sexpp-0.8.6.tar.gz 46857 BLAKE2B 5ff8eaf3ba81af243e6780604b51b43743ed7f9de6121c1de273bbbd51d42e3feed3c00357c85ccaa5e808d2e5f753f58b5f96fea38f5b50b2b2bd9ee658be74 SHA512 b2698a397ef1b161a722e1834bc62f6d2b27c403faa27d97e1e137cc7315e004252ac75bbaaf817bc705f7830cb89665bb23ba8d18904fedd6c2f01c5f1e6f0f +DIST sexpp-0.8.7.tar.gz 46958 BLAKE2B 1b7d45f00769b54c152c25e3befe73db628b8db880ed8b14cc3e1b4c07f90859d2994cbc3a03cad7dfdcc2a20ec4df4263bd04b17ef27f1d3a96e46e6d214923 SHA512 28b93626887da3c1228ddbb9b8566f2d9895f263a1fc31ac2cfa6fc0215cb6a8ec31900255335792bfd580d10f53dd3f88274df83f8c0ddff62ebe35dce7da08 diff --git a/dev-libs/sexpp/sexpp-0.8.7.ebuild b/dev-libs/sexpp/sexpp-0.8.7.ebuild new file mode 100644 index 000000000000..4a743cb01b32 --- /dev/null +++ b/dev-libs/sexpp/sexpp-0.8.7.ebuild @@ -0,0 +1,35 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="S-expressions parser and generator library in C++" +HOMEPAGE="https://github.com/rnpgp/sexpp" +SRC_URI="https://github.com/rnpgp/sexpp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~x86" +IUSE="cli test" + +BDEPEND="virtual/pkgconfig + test? ( dev-cpp/gtest )" + +RESTRICT="!test? ( test )" + +src_configure() { + local mycmakeargs=( + -DBUILD_SHARED_LIBS=on + + -DDOWNLOAD_GTEST=off + + -DWITH_COVERAGE=off + -DWITH_SANITIZERS=off + -DWITH_SEXP_CLI=$(usex cli on off) + -DWITH_SEXP_TESTS=$(usex test on off) + ) + + cmake_src_configure +} diff --git a/dev-libs/simde/Manifest b/dev-libs/simde/Manifest index 01cd007712a6..701b574baabc 100644 --- a/dev-libs/simde/Manifest +++ b/dev-libs/simde/Manifest @@ -1 +1,2 @@ DIST simde-0.8.0.tar.gz 7455442 BLAKE2B 511f609e2588cc39b45a5a3e7f93648d9651e9e3f90220947b7f559ca6281a0db9f876d0692abf24d63528bb84e0ee49da1a165a16eeb91de84639a100a6527b SHA512 b0667583565ea9e59d18a07c7a3cb46710868c9572663e314278ca2004747e337e34f6b927c9c5d29e161caba8ec0428e5299b6e878e226b9f33597a1584b91d +DIST simde-0.8.2.tar.gz 7468969 BLAKE2B 55824ac6d525de475285b430e96c91d7e7cdf363cb42742e55cc8b6e44e5d59d2e07d59fe37897d4bc2023fca35bd908772e01ba95681a00c8f9464dccb0f742 SHA512 4e42d7140c0afae507773527c6c0c07e6f0cdad59a1d42ebcf4bd223fc9f71e91a2e3db7746aca3c0c5ad2a13333c2322ce1e384c7d699ddfe33bed6f107aec5 diff --git a/dev-libs/simde/files/simde-0.8.2-musl.patch b/dev-libs/simde/files/simde-0.8.2-musl.patch new file mode 100644 index 000000000000..fa1c796aec00 --- /dev/null +++ b/dev-libs/simde/files/simde-0.8.2-musl.patch @@ -0,0 +1,19 @@ +This workaround patch should be removable when musl implements C23 +functions (technically this isn't a __GLIBC__-only quirk, but used +due to lack of anything known that's better beside running a build +test for it). + +https://bugs.gentoo.org/926488 +https://github.com/simd-everywhere/simde/issues/1001 +--- a/simde/simde-math.h ++++ b/simde/simde-math.h +@@ -1268,3 +1268,3 @@ + #if \ +- ((!defined(HEDLEY_EMSCRIPTEN_VERSION) || HEDLEY_EMSCRIPTEN_VERSION_CHECK(3, 1, 43)) && HEDLEY_HAS_BUILTIN(__builtin_roundeven)) || \ ++ (defined(__GLIBC__) && (!defined(HEDLEY_EMSCRIPTEN_VERSION) || HEDLEY_EMSCRIPTEN_VERSION_CHECK(3, 1, 43)) && HEDLEY_HAS_BUILTIN(__builtin_roundeven)) || \ + HEDLEY_GCC_VERSION_CHECK(10,0,0) +@@ -1288,3 +1288,3 @@ + #if \ +- ((!defined(HEDLEY_EMSCRIPTEN_VERSION) || HEDLEY_EMSCRIPTEN_VERSION_CHECK(3, 1, 43)) && HEDLEY_HAS_BUILTIN(__builtin_roundevenf)) || \ ++ (defined(__GLIBC__) && (!defined(HEDLEY_EMSCRIPTEN_VERSION) || HEDLEY_EMSCRIPTEN_VERSION_CHECK(3, 1, 43)) && HEDLEY_HAS_BUILTIN(__builtin_roundevenf)) || \ + HEDLEY_GCC_VERSION_CHECK(10,0,0) diff --git a/dev-libs/simde/simde-0.8.0-r1.ebuild b/dev-libs/simde/simde-0.8.0-r1.ebuild index faa2b4cedb06..9591e89b2fec 100644 --- a/dev-libs/simde/simde-0.8.0-r1.ebuild +++ b/dev-libs/simde/simde-0.8.0-r1.ebuild @@ -14,7 +14,7 @@ SRC_URI=" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="amd64 arm64 x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-libs/simde/simde-0.8.2.ebuild b/dev-libs/simde/simde-0.8.2.ebuild new file mode 100644 index 000000000000..3d57056117ff --- /dev/null +++ b/dev-libs/simde/simde-0.8.2.ebuild @@ -0,0 +1,45 @@ +# Copyright 2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson + +DESCRIPTION="Header-only library providing implementations of SIMD instruction sets" +HOMEPAGE="https://simd-everywhere.github.io/blog/" +SRC_URI=" + https://github.com/simd-everywhere/simde/archive/refs/tags/v${PV/_/-}.tar.gz + -> ${P}.tar.gz +" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 arm64 x86" +IUSE="test" +RESTRICT="!test? ( test )" + +PATCHES=( + "${FILESDIR}"/${PN}-0.8.2-musl.patch +) + +src_configure() { + # *FLAGS are only used for tests (nothing that is installed), and + # upstream tests with specific *FLAGS and is otherwise flaky with + # -march=native, -mno-*, and such -- unset to be spared headaches. + unset {C,CPP,CXX,LD}FLAGS + + local emesonargs=( + $(meson_use test tests) + ) + + meson_src_configure +} + +src_test() { + if use x86; then + # https://github.com/simd-everywhere/simde/issues/867 (bug #926706) + meson_src_test $(meson_src_test --list | grep -Ev '(dbsad|fpclass)') + else + meson_src_test + fi +} diff --git a/dev-libs/simdjson/Manifest b/dev-libs/simdjson/Manifest index 456066e66f29..5890ae7d86ad 100644 --- a/dev-libs/simdjson/Manifest +++ b/dev-libs/simdjson/Manifest @@ -1,4 +1,4 @@ DIST simdjson-3.6.3.gh.tar.gz 2302220 BLAKE2B c46eeb8a07460cc5427fc35714fd262069cd3d913732e6037d808281d0fed0e82e0423dfd16abaeb515264559fe4454c42f81211354723eb21b212decfe7834b SHA512 b9fa7e554ded4e6cbe9d70ee29aa5b582e58b8b2ada1a781e58746082bb7d31791a4e2ea8b43d9391d783e61e489554f260448029c0b7e730cc69dc44f4aa86a -DIST simdjson-3.6.4.gh.tar.gz 2301736 BLAKE2B 512effe54c6d36e31c95983cd9bd2ddb000c979c5050cb0c4b8ae2eae743ec50720e15ccf8b457b085d7d5bea24e0a0f793cba97a0af35dedbe59cab105ab2b9 SHA512 30dbc39166f092808d8642a2e4ca37c10999c511aa90e349409b3f4765c638498070ed9ed53ec7bfda9a9442557c7407ee0468a0845d53346d4a990f6d8c3c5b -DIST simdjson-3.7.1.gh.tar.gz 2319851 BLAKE2B 06de2f3dbdb65e7cd5aa418ecb7db27ae01f1e205e355f4d8cb38929d284407bb3edc93a5ee13e30457123ee83bdee35923a265ada520ff94365d1eb71de6ccb SHA512 536f2cd174d50890611942accdcc5b41f5a0d0bc6f03d5627a64c75fa6d88efc9bf4304da4c4607b472223d2a713edaeecbfa66e0e7e5efa1f45a60c93eee96a +DIST simdjson-3.9.1.gh.tar.gz 2636602 BLAKE2B 82c4956ebc902574ed1b36196097c6c07e9ca0f11384f71b260ae95ff5e7c436ce016da417197f84c21ece0ae2239fc1c4e02cf63672fae98b3fa69831de3adb SHA512 b8c091e7ecce4cdc67f538ab6715ce89bff16e68f6d56bdc37e05ab0b110b90bc6b039d5c76e2dceef9e30f35cb6ace5e4e230d4c70e928329a376f989b23bed +DIST simdjson-3.9.3.gh.tar.gz 2643869 BLAKE2B f2e0f8d13a234c7ee639a57333b66a464312a20bd67f808688f6456ded7b6bdac75d857b10207adc03e05d89e701efe874d068774a90c3082d9e83792ed784d1 SHA512 893ce0cb380b1418438f5910262325031f8071c4577589a491713f91c980964b4105c1e1aa7f2b9373deed40ecf6b48fe48a1aa243151e424f138f5418e4821c DIST simdjson-data-a5b13babe65c1bba7186b41b43d4cbdc20a5c470.tar.gz 6635706 BLAKE2B 563376147f18d590a176a5a0398365db1a3e677b773c018f335efa7fff05ac22ac5dc37613792082a32e6c9b91a773a590f7dfd15efa5ba660f9142b128b28a7 SHA512 168198404b11b8c76ff4f53645d7b5a88a5c72b4a5b6646b4410859ec3416ae9b37fc59f7d2f014ccc785615ea5c31dc00b145dbb1a7acb701b94029dd4ea1e1 diff --git a/dev-libs/simdjson/simdjson-3.7.1.ebuild b/dev-libs/simdjson/simdjson-3.9.1.ebuild index 86f2f2dbe6cf..03dcee295b1f 100644 --- a/dev-libs/simdjson/simdjson-3.7.1.ebuild +++ b/dev-libs/simdjson/simdjson-3.9.1.ebuild @@ -17,8 +17,8 @@ SRC_URI=" " LICENSE="Apache-2.0 Boost-1.0 BSD MIT" -SLOT="0/20" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +SLOT="0/22" +KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" IUSE="+all-impls test tools" BDEPEND=" diff --git a/dev-libs/simdjson/simdjson-3.6.4.ebuild b/dev-libs/simdjson/simdjson-3.9.3.ebuild index efb2ca0d1cde..1936e556eb93 100644 --- a/dev-libs/simdjson/simdjson-3.6.4.ebuild +++ b/dev-libs/simdjson/simdjson-3.9.3.ebuild @@ -17,8 +17,8 @@ SRC_URI=" " LICENSE="Apache-2.0 Boost-1.0 BSD MIT" -SLOT="0/19" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +SLOT="0/22" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" IUSE="+all-impls test tools" BDEPEND=" @@ -36,9 +36,9 @@ RESTRICT="!test? ( test )" PATCHES=( "${FILESDIR}/simdjson-1.0.0-dont-bundle-cxxopts.patch" "${FILESDIR}/simdjson-0.9.0-tests.patch" - "${FILESDIR}/simdjson-1.0.0-dont-fetch-data-tarball.patch" "${FILESDIR}/simdjson-1.0.0-install-tools.patch" "${FILESDIR}/simdjson-3.1.7-tests.patch" + "${FILESDIR}/simdjson-3.7.1-data-optional.patch" ) DOCS=( @@ -51,7 +51,8 @@ DOCS=( src_prepare() { if use test; then - mv "${WORKDIR}/${PN}-data-${DATA_HASH}" "${S}/dependencies/${PN}-data" || die + mkdir "${S}/dependencies/.cache" || die + mv "${WORKDIR}/${PN}-data-${DATA_HASH}" "${S}/dependencies/.cache/${PN}-data" || die fi sed -e 's:-Werror ::' -i cmake/developer-options.cmake || die diff --git a/dev-libs/softhsm/Manifest b/dev-libs/softhsm/Manifest index ecf0dc98c3eb..cd1921ec4c2c 100644 --- a/dev-libs/softhsm/Manifest +++ b/dev-libs/softhsm/Manifest @@ -1 +1,2 @@ +DIST softhsm-2.6.1-patches.tar.xz 7460 BLAKE2B e9c5496ff1a79121ab62e77ab6541a1678d4254395622aaf76c4b8fdcabbd6144caba5c171e28744ae181169826d2523c9ddf73859ca9ca6bb7a5fdf36a8ea8e SHA512 35330e969d7de532f3b6a0821dc5faa40726dcdd9c62f5e78d05cfec1c35057e183dba0ed638388f3d0ad1bd536b4fbb3cc1ff060e133109cee9681c8ac48052 DIST softhsm-2.6.1.tar.gz 1066766 BLAKE2B 0295c5f40235c8abd8879a8c6f7fbe8e8d686ee03355006e9c90c0f2f7135eaf6794a3d39febda1b1ed6e5d48dcacb1e14dae85fb0efb884d0d719bfc6624b92 SHA512 e77137096ff2ac2f5396971efbaa2007188855a8f723cb511182c6c5e5a353b3f98297442758e77a18c3a378c0ca3fce8abe090977f0f4f8d526de204fd523fb diff --git a/dev-libs/softhsm/metadata.xml b/dev-libs/softhsm/metadata.xml index 73e6a5df718a..61d4cdeef207 100644 --- a/dev-libs/softhsm/metadata.xml +++ b/dev-libs/softhsm/metadata.xml @@ -6,4 +6,7 @@ <flag name="gost">Enable gost algorithm</flag> <flag name="migration-tool">Build db migration tool</flag> </use> + <upstream> + <remote-id type="github">opendnssec/SoftHSMv2</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-libs/softhsm/softhsm-2.6.1-r3.ebuild b/dev-libs/softhsm/softhsm-2.6.1-r3.ebuild new file mode 100644 index 000000000000..4e6bb2768abb --- /dev/null +++ b/dev-libs/softhsm/softhsm-2.6.1-r3.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic + +DESCRIPTION="A software PKCS#11 implementation" +HOMEPAGE="https://www.opendnssec.org/" +SRC_URI="https://www.opendnssec.org/files/source/${P}.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-2.6.1-patches.tar.xz" + +LICENSE="BSD" +SLOT="2" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" +IUSE="gost migration-tool test" + +RESTRICT="!test? ( test )" + +RDEPEND=" + migration-tool? ( dev-db/sqlite:3= ) + dev-libs/openssl:= + !~dev-libs/softhsm-2.0.0:0 +" +DEPEND="${RDEPEND}" +BDEPEND=" + sys-devel/gcc:=[cxx] + virtual/pkgconfig + test? ( dev-util/cppunit ) +" + +DOCS=( NEWS README.md ) + +PATCHES=( + "${WORKDIR}"/${PN}-2.6.1-patches/${PN}-2.6.1-onexit.patch + "${WORKDIR}"/${PN}-2.6.1-patches/${PN}-2.6.1-openssl3-tests.patch + "${WORKDIR}"/${PN}-2.6.1-patches/${PN}-2.6.1-uninitialised.patch + "${WORKDIR}"/${PN}-2.6.1-patches/${PN}-2.6.1-prevent-global-deleted-objects-access.patch +) + +src_configure() { + # Test failures with LTO (bug #867637) + append-flags -fno-strict-aliasing + filter-lto + + econf \ + --with-crypto-backend=openssl \ + --disable-p11-kit \ + --localstatedir="${EPREFIX}/var" \ + --enable-ecc \ + $(use_enable gost) \ + $(use_with migration-tool migrate) +} + +src_install() { + default + + find "${ED}" -name '*.la' -delete || die + + keepdir /var/lib/softhsm/tokens +} diff --git a/dev-libs/spdlog/spdlog-1.11.0-r4.ebuild b/dev-libs/spdlog/spdlog-1.11.0-r4.ebuild new file mode 100644 index 000000000000..02a505623954 --- /dev/null +++ b/dev-libs/spdlog/spdlog-1.11.0-r4.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake-multilib + +DESCRIPTION="Fast C++ logging library" +HOMEPAGE="https://github.com/gabime/spdlog" + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/gabime/${PN}" +else + SRC_URI="https://github.com/gabime/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + +fi + +LICENSE="MIT" +SLOT="0/1" +IUSE="test static-libs" +RESTRICT="!test? ( test )" + +BDEPEND=" + virtual/pkgconfig +" + +DEPEND=" + >=dev-libs/libfmt-9.1.0-r2[${MULTILIB_USEDEP}] +" + +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}/${PN}-force_external_fmt.patch" + "${FILESDIR}/${PN}-fmt-10.patch" + "${FILESDIR}/${PN}-musl-1.2.4.patch" +) + +multilib_src_prepare() { + cmake_src_prepare + rm -r include/spdlog/fmt/bundled || die "Failed to delete bundled libfmt" +} + +multilib_src_configure() { + local mycmakeargs=( + -DSPDLOG_BUILD_BENCH=no + -DSPDLOG_BUILD_EXAMPLE=no + -DSPDLOG_FMT_EXTERNAL=yes + -DSPDLOG_BUILD_SHARED=$(usex static-libs) + -DSPDLOG_BUILD_TESTS=$(usex test) + ) + + cmake_src_configure +} diff --git a/dev-libs/spdlog/spdlog-1.12.0-r3.ebuild b/dev-libs/spdlog/spdlog-1.12.0-r3.ebuild new file mode 100644 index 000000000000..298801759f76 --- /dev/null +++ b/dev-libs/spdlog/spdlog-1.12.0-r3.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake-multilib + +DESCRIPTION="Fast C++ logging library" +HOMEPAGE="https://github.com/gabime/spdlog" + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/gabime/${PN}" +else + SRC_URI="https://github.com/gabime/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +fi + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +IUSE="test static-libs" +RESTRICT="!test? ( test )" + +BDEPEND=" + virtual/pkgconfig + test? ( + >=dev-cpp/catch-3.4.0 + ) +" +DEPEND=" + >=dev-libs/libfmt-9.1.0-r2[${MULTILIB_USEDEP}] +" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}/${PN}-force_external_fmt.patch" + "${FILESDIR}/${P}-fix-tests.patch" +) + +multilib_src_prepare() { + cmake_src_prepare + rm -r include/spdlog/fmt/bundled || die "Failed to delete bundled libfmt" +} + +multilib_src_configure() { + local mycmakeargs=( + -DSPDLOG_BUILD_BENCH=no + -DSPDLOG_BUILD_EXAMPLE=no + -DSPDLOG_FMT_EXTERNAL=yes + -DSPDLOG_BUILD_SHARED=$(usex static-libs) + -DSPDLOG_BUILD_TESTS=$(usex test) + ) + + cmake_src_configure +} diff --git a/dev-libs/spdlog/spdlog-1.13.0.ebuild b/dev-libs/spdlog/spdlog-1.13.0-r2.ebuild index bdb630b7d8d3..3ece901957d2 100644 --- a/dev-libs/spdlog/spdlog-1.13.0.ebuild +++ b/dev-libs/spdlog/spdlog-1.13.0-r2.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit cmake +inherit cmake-multilib DESCRIPTION="Fast C++ logging library" HOMEPAGE="https://github.com/gabime/spdlog" @@ -18,7 +18,7 @@ fi LICENSE="MIT" SLOT="0/$(ver_cut 1-2)" -IUSE="test" +IUSE="test static-libs" RESTRICT="!test? ( test )" BDEPEND=" @@ -28,7 +28,7 @@ BDEPEND=" ) " DEPEND=" - >=dev-libs/libfmt-8.0.0:= + >=dev-libs/libfmt-9.1.0-r2[${MULTILIB_USEDEP}] " RDEPEND="${DEPEND}" @@ -36,17 +36,17 @@ PATCHES=( "${FILESDIR}/${PN}-force_external_fmt.patch" ) -src_prepare() { +multilib_src_prepare() { cmake_src_prepare rm -r include/spdlog/fmt/bundled || die "Failed to delete bundled libfmt" } -src_configure() { +multilib_src_configure() { local mycmakeargs=( -DSPDLOG_BUILD_BENCH=no -DSPDLOG_BUILD_EXAMPLE=no -DSPDLOG_FMT_EXTERNAL=yes - -DSPDLOG_BUILD_SHARED=yes + -DSPDLOG_BUILD_SHARED=$(usex static-libs) -DSPDLOG_BUILD_TESTS=$(usex test) ) diff --git a/dev-libs/spdlog/spdlog-9999.ebuild b/dev-libs/spdlog/spdlog-9999.ebuild index 55c4ac137dc1..3ece901957d2 100644 --- a/dev-libs/spdlog/spdlog-9999.ebuild +++ b/dev-libs/spdlog/spdlog-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit cmake +inherit cmake-multilib DESCRIPTION="Fast C++ logging library" HOMEPAGE="https://github.com/gabime/spdlog" @@ -13,20 +13,22 @@ if [[ ${PV} == *9999 ]]; then EGIT_REPO_URI="https://github.com/gabime/${PN}" else SRC_URI="https://github.com/gabime/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi LICENSE="MIT" SLOT="0/$(ver_cut 1-2)" -IUSE="test" +IUSE="test static-libs" RESTRICT="!test? ( test )" BDEPEND=" virtual/pkgconfig - test? ( dev-cpp/catch:0 ) + test? ( + >=dev-cpp/catch-3.4.0 + ) " DEPEND=" - >=dev-libs/libfmt-8.0.0:= + >=dev-libs/libfmt-9.1.0-r2[${MULTILIB_USEDEP}] " RDEPEND="${DEPEND}" @@ -34,17 +36,17 @@ PATCHES=( "${FILESDIR}/${PN}-force_external_fmt.patch" ) -src_prepare() { +multilib_src_prepare() { cmake_src_prepare rm -r include/spdlog/fmt/bundled || die "Failed to delete bundled libfmt" } -src_configure() { +multilib_src_configure() { local mycmakeargs=( -DSPDLOG_BUILD_BENCH=no -DSPDLOG_BUILD_EXAMPLE=no -DSPDLOG_FMT_EXTERNAL=yes - -DSPDLOG_BUILD_SHARED=yes + -DSPDLOG_BUILD_SHARED=$(usex static-libs) -DSPDLOG_BUILD_TESTS=$(usex test) ) diff --git a/dev-libs/template-glib/Manifest b/dev-libs/template-glib/Manifest index 82d553c1ab86..f9e0eafff4e0 100644 --- a/dev-libs/template-glib/Manifest +++ b/dev-libs/template-glib/Manifest @@ -1,2 +1 @@ -DIST template-glib-3.36.1.tar.xz 64580 BLAKE2B 3dbedb59c769ec169d469ae6640d9319c8d3ec09aa91cadc4be64290401f36b83e514c0dc8c03fb0eddefef0ddc0a717fdbad12e67c9aaf6d4b291b00b289d02 SHA512 7c00d750f7d58e98f2d6c9baa6fa84efde1cce2eaacfb334ef0ee19d0583373d303d67d43cc290cd1a41239f2ee804077e104bb4799b70cfd6760ac3fb04178e DIST template-glib-3.36.2.tar.xz 64832 BLAKE2B 63d413b8474ea641cb8ad3eecc69f4fefbb1b3d5b9a3ec1bc4dd7ddd3526ca3c8599bf811041df6685daa868ff5c302d650b1fc956a441a5d2b80adc069453ae SHA512 226247151c932931a3c5c0f2278929ab6e6e82edbcab10dead5723ee4b8ef5c6d12775491b1aed7e7ccfee8b794be69a8c457e6639a63fdfc2b6e41d7efc2bee diff --git a/dev-libs/template-glib/template-glib-3.36.1.ebuild b/dev-libs/template-glib/template-glib-3.36.1.ebuild deleted file mode 100644 index 52a0c01b99f1..000000000000 --- a/dev-libs/template-glib/template-glib-3.36.1.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit gnome.org meson vala - -DESCRIPTION="Templating library for GLib" -HOMEPAGE="https://gitlab.gnome.org/GNOME/template-glib" - -LICENSE="LGPL-2.1+" -SLOT="0/1" -KEYWORDS="amd64 ~arm64 x86" - -IUSE="gtk-doc +introspection test vala" -RESTRICT="!test? ( test )" -REQUIRED_USE="vala? ( introspection )" - -RDEPEND=" - dev-libs/glib:2 - dev-libs/gobject-introspection:= -" # depends on go-i unconditionally for own functionality, USE flag controls GIR/typelib generation -DEPEND="${RDEPEND}" -BDEPEND=" - vala? ( $(vala_depend) ) - dev-util/glib-utils - app-alternatives/yacc - app-alternatives/lex - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - gtk-doc? ( dev-util/gtk-doc ) -" - -src_prepare() { - default - use vala && vala_setup -} - -src_configure() { - local emesonargs=( - -Dtracing=false # extra trace debugging that would make things slower - -Dprofiling=false # -pg passing - $(meson_feature introspection) - $(meson_use vala vapi) - $(meson_use gtk-doc gtk_doc) - $(meson_use test tests) - ) - meson_src_configure -} diff --git a/dev-libs/template-glib/template-glib-3.36.2.ebuild b/dev-libs/template-glib/template-glib-3.36.2.ebuild index 504e96a9f923..52a0c01b99f1 100644 --- a/dev-libs/template-glib/template-glib-3.36.2.ebuild +++ b/dev-libs/template-glib/template-glib-3.36.2.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/template-glib" LICENSE="LGPL-2.1+" SLOT="0/1" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="amd64 ~arm64 x86" IUSE="gtk-doc +introspection test vala" RESTRICT="!test? ( test )" diff --git a/dev-libs/thrift/Manifest b/dev-libs/thrift/Manifest index 2d2ae1450f40..88cdbc2d6cce 100644 --- a/dev-libs/thrift/Manifest +++ b/dev-libs/thrift/Manifest @@ -1,2 +1,3 @@ DIST thrift-0.16.0.tar.gz 4085114 BLAKE2B 17c35096f6848fb0795e4cb125fed3068c8e1e53f67f404f4dcab67df7a42fc049a7d615591c861eb9e59e3333e21f185e8615663008bc7c846a03722ea8b834 SHA512 468fff6be2def85959fdf8adac92a0cfa7f786083b3bafb2c31427dfe5725f4d10962052d13ea960828f6a317778d35e66b602744a570212352bfc637ae586e0 DIST thrift-0.18.1.tar.gz 4310494 BLAKE2B 3e6c7e03059341e79d3f58e16b55761888b530b3d31dd22853026486a1303725ee5d5e6e5dd7a5e6bf8e57a2d3cf36ffc829cdb194d990cadedfc63f4f3e0874 SHA512 9c9a462aa8b6fddefd5bb9d2c950570eb2d3beaa7c9d37fceee677bdc1fdeb521b796f4eeee8a1fd9a7649f84449f6c0572305210e67402eb97682ca7f6e851b +DIST thrift-0.20.0.tar.gz 4397667 BLAKE2B 23422fdcdf7e0dbce8bc0f8017f54b5848594e2da21de56834152c17c74da7d1c4df23c5b57cf3ba811bb03f1a8588ddf1c2a05222bb726aceda4292a15af21e SHA512 8dc77f666e60141a6b3cf7ee1407b08a0e80d176f8ccfee69317d7df89ab87aea2c7b3ba3e59d4561835edf1ce23762443ad5aeed0099bf075b010853d5eb1cd diff --git a/dev-libs/thrift/thrift-0.18.1-r1.ebuild b/dev-libs/thrift/thrift-0.18.1-r1.ebuild index e0169f0d7fe4..e7fbc703524a 100644 --- a/dev-libs/thrift/thrift-0.18.1-r1.ebuild +++ b/dev-libs/thrift/thrift-0.18.1-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://apache/thrift/${PV}/${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0/0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc64 ~riscv ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc64 ~riscv ~s390 ~x86" IUSE="libevent lua +ssl test" RESTRICT="!test? ( test )" diff --git a/dev-libs/thrift/thrift-0.20.0.ebuild b/dev-libs/thrift/thrift-0.20.0.ebuild new file mode 100644 index 000000000000..f57f4a9b262a --- /dev/null +++ b/dev-libs/thrift/thrift-0.20.0.ebuild @@ -0,0 +1,59 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="C++ bindings for Apache Thrift" +HOMEPAGE="https://thrift.apache.org/lib/cpp.html" +SRC_URI="mirror://apache/thrift/${PV}/${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc64 ~riscv ~s390 ~x86" +IUSE="libevent lua +ssl test" + +RESTRICT="!test? ( test )" + +DEPEND=" + dev-libs/boost:=[nls(+)] + dev-libs/openssl:= + sys-libs/zlib:= + libevent? ( dev-libs/libevent:= ) +" +RDEPEND="${DEPEND}" +BDEPEND=" + app-alternatives/lex + app-alternatives/yacc +" + +REQUIRED_USE=" + test? ( ssl libevent ) +" + +PATCHES=( + "${FILESDIR}/thrift-0.16.0-network-tests.patch" + "${FILESDIR}/thrift-0.18.1-tests.patch" +) + +src_configure() { + local mycmakeargs=( + -DBUILD_CPP=ON + -DBUILD_C_GLIB=OFF + -DBUILD_JAVA=OFF + -DBUILD_JAVASCRIPT=OFF + -DBUILD_NODEJS=OFF + -DBUILD_PYTHON=OFF + -DBUILD_TESTING=$(usex test 'ON' 'OFF') + -DWITH_LIBEVENT=$(usex libevent 'ON' 'OFF') + -DWITH_OPENSSL=$(usex ssl 'ON' 'OFF') + -DWITH_ZLIB=ON + -Wno-dev + ) + cmake_src_configure +} + +src_test() { + MAKEOPTS="-j1" cmake_src_test +} diff --git a/dev-libs/tinyxml/tinyxml-2.6.2-r4.ebuild b/dev-libs/tinyxml/tinyxml-2.6.2-r4.ebuild index 583bc4f9b670..3c1d6e51237d 100644 --- a/dev-libs/tinyxml/tinyxml-2.6.2-r4.ebuild +++ b/dev-libs/tinyxml/tinyxml-2.6.2-r4.ebuild @@ -7,7 +7,7 @@ inherit flag-o-matic toolchain-funcs multilib DESCRIPTION="Simple and small C++ XML parser" HOMEPAGE="http://www.grinninglizard.com/tinyxml/index.html" -SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV//./_}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${PN}_${PV//./_}.tar.gz" LICENSE="ZLIB" SLOT="0" diff --git a/dev-libs/tinyxml/tinyxml-2.6.2-r5.ebuild b/dev-libs/tinyxml/tinyxml-2.6.2-r5.ebuild index 7d8e263e06fb..4852caef55ee 100644 --- a/dev-libs/tinyxml/tinyxml-2.6.2-r5.ebuild +++ b/dev-libs/tinyxml/tinyxml-2.6.2-r5.ebuild @@ -7,7 +7,7 @@ inherit flag-o-matic toolchain-funcs multilib DESCRIPTION="Simple and small C++ XML parser" HOMEPAGE="http://www.grinninglizard.com/tinyxml/index.html" -SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV//./_}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${PN}_${PV//./_}.tar.gz" LICENSE="ZLIB" SLOT="0" diff --git a/dev-libs/tllist/tllist-1.1.0.ebuild b/dev-libs/tllist/tllist-1.1.0.ebuild index 16e17ecdb39f..facaeaaf4c59 100644 --- a/dev-libs/tllist/tllist-1.1.0.ebuild +++ b/dev-libs/tllist/tllist-1.1.0.ebuild @@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}" LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 ~arm64 ~ppc64" +KEYWORDS="amd64 arm64 ppc64" src_install() { meson_src_install diff --git a/dev-libs/totem-pl-parser/totem-pl-parser-3.26.6-r1.ebuild b/dev-libs/totem-pl-parser/totem-pl-parser-3.26.6-r1.ebuild index ff7a94ed5c57..e0c1d14df6fc 100644 --- a/dev-libs/totem-pl-parser/totem-pl-parser-3.26.6-r1.ebuild +++ b/dev-libs/totem-pl-parser/totem-pl-parser-3.26.6-r1.ebuild @@ -11,7 +11,7 @@ LICENSE="LGPL-2+" SLOT="0/18" IUSE="archive crypt gtk-doc +introspection test +uchardet" RESTRICT="!test? ( test )" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86" RDEPEND=" >=dev-libs/glib-2.56:2 diff --git a/dev-libs/totem-pl-parser/totem-pl-parser-3.26.6.ebuild b/dev-libs/totem-pl-parser/totem-pl-parser-3.26.6.ebuild deleted file mode 100644 index 99a530f0613a..000000000000 --- a/dev-libs/totem-pl-parser/totem-pl-parser-3.26.6.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit gnome.org meson xdg - -DESCRIPTION="Playlist parsing library" -HOMEPAGE="https://developer.gnome.org/totem-pl-parser/stable/" - -LICENSE="LGPL-2+" -SLOT="0/18" -IUSE="archive crypt gtk-doc +introspection test +uchardet" -RESTRICT="!test? ( test )" -KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86" - -RDEPEND=" - >=dev-libs/glib-2.56:2 - archive? ( >=app-arch/libarchive-3:0= ) - dev-libs/libxml2:2 - crypt? ( dev-libs/libgcrypt:0= ) - uchardet? ( app-i18n/uchardet ) - introspection? ( >=dev-libs/gobject-introspection-1.54:= ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-util/glib-utils - gtk-doc? ( - >=dev-util/gtk-doc-1.14 - app-text/docbook-xml-dtd:4.3 - ) - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - test? ( - gnome-base/gvfs[http] - sys-apps/dbus - ) -" - -PATCHES=( - "${FILESDIR}"/${PV}-plparser-Fix-uninitialized-variable-error.patch -) - -src_prepare() { - # Disable tests requiring network access, bug #346127 - # 3rd test fails on upgrade, not once installed - # Leio: I consider network tests important for ensuring full functionality, thus trying with them again */ - #sed -e 's:\(g_test_add_func.*/parser/resolution.*\):/*\1*/:' \ - # -e 's:\(g_test_add_func.*/parser/parsing/itms_link.*\):/*\1*/:' \ - # -e 's:\(g_test_add_func.*/parser/parsability.*\):/*\1*/:'\ - # -i plparse/tests/parser.c || die "sed failed" - - xdg_src_prepare -} - -src_configure() { - # uninstalled-tests is abused to switch from loading live FS helper - # to in-build-tree helper, check on upgrades this is not having other - # consequences, bug #630242 - local emesonargs=( - -Denable-libarchive=$(usex archive) - -Denable-libgcrypt=$(usex crypt) - -Denable-uchardet=$(usex uchardet) - $(meson_use gtk-doc enable-gtk-doc) - $(meson_use introspection) - ) - meson_src_configure -} - -src_test() { - # This is required as told by upstream in bgo#629542 - GVFS_DISABLE_FUSE=1 dbus-run-session meson test -C "${BUILD_DIR}" -} diff --git a/dev-libs/tre/tre-0.8.0_p20210321-r3.ebuild b/dev-libs/tre/tre-0.8.0_p20210321-r3.ebuild index 06fb94e53c49..e3e624a817b4 100644 --- a/dev-libs/tre/tre-0.8.0_p20210321-r3.ebuild +++ b/dev-libs/tre/tre-0.8.0_p20210321-r3.ebuild @@ -1,11 +1,12 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_USE_PEP517=setuptools COMMIT="6092368aabdd0dbb0fbceb2766a37b98e0ff6911" -PYTHON_COMPAT=( python3_{8..11} pypy3 ) +PYTHON_COMPAT=( python3_{10..12} pypy3 ) +DISTUTILS_EXT=1 DISTUTILS_OPTIONAL=1 inherit autotools distutils-r1 diff --git a/dev-libs/tree-sitter-bash/tree-sitter-bash-0.21.0-r1.ebuild b/dev-libs/tree-sitter-bash/tree-sitter-bash-0.21.0-r1.ebuild index b9d109250cad..7187ba2308ac 100644 --- a/dev-libs/tree-sitter-bash/tree-sitter-bash-0.21.0-r1.ebuild +++ b/dev-libs/tree-sitter-bash/tree-sitter-bash-0.21.0-r1.ebuild @@ -12,4 +12,4 @@ HOMEPAGE="https://github.com/tree-sitter/tree-sitter-bash" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos" diff --git a/dev-libs/tree-sitter-c-sharp/Manifest b/dev-libs/tree-sitter-c-sharp/Manifest index b1da3146b0bb..e8c40083b407 100644 --- a/dev-libs/tree-sitter-c-sharp/Manifest +++ b/dev-libs/tree-sitter-c-sharp/Manifest @@ -1,2 +1,3 @@ DIST tree-sitter-c-sharp-0.19.1.tar.gz 842687 BLAKE2B 741a6be6052d739b9aa066adce84b492aa48726653a03e7b58bfc6b5e35d6b928b02deb32b568500a156466d39fd430abe1a452d24213ca4f999d01ddc081bd6 SHA512 74b91086d2aeaba5be7932cc2a479040291db754bdca46bd59cb3af8e42b38e9113d99de3b88d4c1dc41227e2e84ee18715a01709af72c374f0b6c8f36cd94eb DIST tree-sitter-c-sharp-0.20.0.tar.gz 1050470 BLAKE2B 2ee76331cffcc60729537a72c0e9e9d1fd65ff9292724371354085c1eec03769b1664a09dc75bfd2abdd16b4ef2c12006bec3acfe7b4f31fd59afab1b8167cee SHA512 31530ff57d02b84c8e7e7183abb927c40839500afc225cfdbe685495962c3f129ea459efaf73abbb76951bfc14b890cbdfa9a847b3ae92c8db495d173d0e0e08 +DIST tree-sitter-c-sharp-0.21.1.tar.gz 1576411 BLAKE2B c89cd47c93ff96a01fdcf5d55971bb49326ec4cb4f37438247f0c5a0a7a083e62265f07fdb3a6b7d18f2ac13e8afa5705a5092cf7ff90f92f8fa0b9d9073a3e3 SHA512 43fe2c31ae73efff91af15d40f9b3d4b468c5b118de7b029c5c2338885bc27fedca21fe6361700012a1d5c80ff7426ef9ce2f7226da44be8302d727858e7aebb diff --git a/dev-libs/tree-sitter-java/tree-sitter-java-0.19.1.ebuild b/dev-libs/tree-sitter-c-sharp/tree-sitter-c-sharp-0.21.1.ebuild index d90c0532fc87..c1e7e5bd3167 100644 --- a/dev-libs/tree-sitter-java/tree-sitter-java-0.19.1.ebuild +++ b/dev-libs/tree-sitter-c-sharp/tree-sitter-c-sharp-0.21.1.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 inherit tree-sitter-grammar -DESCRIPTION="Java grammar for Tree-sitter" -HOMEPAGE="https://github.com/tree-sitter/tree-sitter-java" +DESCRIPTION="C# grammar for Tree-sitter" +HOMEPAGE="https://github.com/tree-sitter/tree-sitter-c-sharp" LICENSE="MIT" SLOT="0" diff --git a/dev-libs/tree-sitter-c/Manifest b/dev-libs/tree-sitter-c/Manifest index 4428775d5f8a..2d25f4806183 100644 --- a/dev-libs/tree-sitter-c/Manifest +++ b/dev-libs/tree-sitter-c/Manifest @@ -1,3 +1,4 @@ DIST tree-sitter-c-0.20.6.tar.gz 337801 BLAKE2B 96dfe37535aca85d2bae15af0a2d59a99bd6861a9a32957b6ae9a4fe02ac1a8e8c4f649760e5eccf68f224b30992aa1656a8b3e11da8a3bb43e07c62f4b26063 SHA512 047b47ef9190f3894083be2b8b26dd33c06d87bba6b960e63e9787112b374a76e2239171b89bb346a27b886396c2054a4ecc1e42d4f83a23ab62060907fe2198 DIST tree-sitter-c-0.20.7.tar.gz 377856 BLAKE2B c18e23d010a6d2db9c6171134ae536c299e6fdb51b1d4c8693475b1249e6f1420a352d8e1aa3e10281a230acf4953196ab0e59248da7f9ab9995c8e9576da1e8 SHA512 42199156796dc6fb427b57c67c1fc5105c315b812a5ade813466dddd76b1b5c37957c071b52a58e4f46b5a55f189de13eab92ff8b6adea45ce07aa2322c5c357 DIST tree-sitter-c-0.21.0.tar.gz 426566 BLAKE2B dbd2cf89d2ac79e5c6ec7b6e16e588d74b6ed0b467beb411fa32643ed70434193a155510d1649cd074efc98d4e04acdb1a3799c99c8cc6e836bacc444836fff0 SHA512 1ed2b48b6adda606c7074da650c089040e04873bfb666ab08f4c7f67e8077de3760e0b1610c2519d69d3eb48c101cf8e441d2b29622a075b4a6992efbc324abb +DIST tree-sitter-c-0.21.1.tar.gz 367056 BLAKE2B 062bfcc3c5a8a2db00423592186ca8b4d0928bdcd00bcd086386cffa4ce906c3ad098725f2e3632f941c47ddc8a21015ccfc9d5e3547399582d4932c4ae4b640 SHA512 d8eee9ee78434809068f7030e9f5c27d425d746b877d70b0f7680b4349577a155b13a03bdf9e4c37e927af33a0d4e4d14672ab5fd86a27bfe1fc18b300eb5fcd diff --git a/dev-libs/tree-sitter-c/tree-sitter-c-0.21.0.ebuild b/dev-libs/tree-sitter-c/tree-sitter-c-0.21.0.ebuild index f589df316253..7acbae161e6d 100644 --- a/dev-libs/tree-sitter-c/tree-sitter-c-0.21.0.ebuild +++ b/dev-libs/tree-sitter-c/tree-sitter-c-0.21.0.ebuild @@ -12,4 +12,4 @@ HOMEPAGE="https://github.com/tree-sitter/tree-sitter-c" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64" diff --git a/dev-libs/tree-sitter-c/tree-sitter-c-0.21.1.ebuild b/dev-libs/tree-sitter-c/tree-sitter-c-0.21.1.ebuild new file mode 100644 index 000000000000..f589df316253 --- /dev/null +++ b/dev-libs/tree-sitter-c/tree-sitter-c-0.21.1.ebuild @@ -0,0 +1,15 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +TS_BINDINGS=( python ) + +inherit tree-sitter-grammar + +DESCRIPTION="C grammar for Tree-sitter" +HOMEPAGE="https://github.com/tree-sitter/tree-sitter-c" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64" diff --git a/dev-libs/tree-sitter-cpp/Manifest b/dev-libs/tree-sitter-cpp/Manifest index 60fdd43c7ad2..8ae1ed3ef255 100644 --- a/dev-libs/tree-sitter-cpp/Manifest +++ b/dev-libs/tree-sitter-cpp/Manifest @@ -1,3 +1,4 @@ -DIST tree-sitter-cpp-0.20.0.tar.gz 504679 BLAKE2B 654f72f7a56a66dccf437ba5a2b2b5f627358ae58aeaafe9a507e0876443937d42b244ddb34b8a72a6723c28e6c10c95851b1fdb2775b3080c344426c0386e4d SHA512 c97d02c8250c93721ed5b951c97cdb1cf6558e20cbef353a33c9937f6b3116e328bbdd4e9e7a70a23dba3e144cbd6318e37ebbb9b6345ac085c62100d09ff34d -DIST tree-sitter-cpp-0.20.0_p20230410.tar.gz 715821 BLAKE2B fa867ce4e16dd1044007cf366bc711a6eb85dd6fee11796aa32d9bcee4ffbec3b83b7cd56333d5d79c3eb5e6f6e966291626d6edbb7660aed4b4e144caa18e60 SHA512 0d48722962909a708eec0c401e08f71f9eb3e742dc6bbdb0cfc9cb2b31c187b222866f279346de68726811db461f12fa6b1453bafe49d64f6c340a94a6a7abe6 DIST tree-sitter-cpp-0.20.3.tar.gz 1056333 BLAKE2B 3b1fc2509da265b2f49ec1a9bef7b005b06eba0311432af9e2e97977ec3a568a8ee531375f5330e624675f5b12711c4cf3306959ec82d21f1017380fb6e28b7a SHA512 62630953cb873dccbf6203b90ac6bd62fb596a615c71603c93b4fdc1e21d456c8f6ba74576e9e86732dbce2b7deaa082ea35eddf7fd7387d1ba13236757dfaab +DIST tree-sitter-cpp-0.20.5.tar.gz 1442677 BLAKE2B ee9e058cca7727d567869d58568b3808efad7b1f4059089682b31ac39fd623213111078250eb034fb66be51f502f693f65686fb89ba8865866ded7ed1f195b5a SHA512 0afe19dc868bce8fef7114c0553ed3af2c479fc84257959a617dd6acf695fb13a91468a3daddafd39cac11f7d5a72ba988bd29d7d7f1987d7486ae4d1dc7f746 +DIST tree-sitter-cpp-0.21.0.tar.gz 1482410 BLAKE2B b15467c3525416fcc925fd8c3480200362ee8ae41528757cebc113090d5678dcfa47bac4b54e32e791dba954de15fd3bba68e6ecdedbc55bb61095487de386c4 SHA512 70be7b446e5acf0f439fbf1d4c9d649e8e8bc8ea044d0d3f3644e3047eaa5468eabefd5552f98fa39d34030cce654db25371008ddbc27a64d3df14611ac3061c +DIST tree-sitter-cpp-0.22.0.tar.gz 1253356 BLAKE2B 6834cba10f8f5f0981620d69c3ebe2b4efe6815bfd35e00ef333ef96900d418b0204375b93f84989e826c225849cd6f7e8520bd8c2f4195f6e2ed8db41dc1b6d SHA512 68ec7378a6abc3154090bf7f14b95f646c44ac09e309ec5161906f42641e568171412fd4c30360680982af5e621cac4d51a1cfe03695117560a3a5eeed73d22d diff --git a/dev-libs/tree-sitter-cpp/tree-sitter-cpp-0.20.5.ebuild b/dev-libs/tree-sitter-cpp/tree-sitter-cpp-0.20.5.ebuild new file mode 100644 index 000000000000..6fa20973c00b --- /dev/null +++ b/dev-libs/tree-sitter-cpp/tree-sitter-cpp-0.20.5.ebuild @@ -0,0 +1,16 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit tree-sitter-grammar + +DESCRIPTION="C++ grammar for Tree-sitter" +HOMEPAGE="https://github.com/tree-sitter/tree-sitter-cpp" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64" + +# requires test data from tree-sitter-c +RESTRICT="test" diff --git a/dev-libs/tree-sitter-cpp/tree-sitter-cpp-0.20.0.ebuild b/dev-libs/tree-sitter-cpp/tree-sitter-cpp-0.21.0.ebuild index 654df3497df3..18804881eaed 100644 --- a/dev-libs/tree-sitter-cpp/tree-sitter-cpp-0.20.0.ebuild +++ b/dev-libs/tree-sitter-cpp/tree-sitter-cpp-0.21.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/tree-sitter/tree-sitter-cpp" LICENSE="MIT" SLOT="0" -KEYWORDS="amd64" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64" # requires test data from tree-sitter-c RESTRICT="test" diff --git a/dev-libs/tree-sitter-cpp/tree-sitter-cpp-0.20.0_p20230410.ebuild b/dev-libs/tree-sitter-cpp/tree-sitter-cpp-0.22.0.ebuild index 7d1911486869..40d03e0e7ae2 100644 --- a/dev-libs/tree-sitter-cpp/tree-sitter-cpp-0.20.0_p20230410.ebuild +++ b/dev-libs/tree-sitter-cpp/tree-sitter-cpp-0.22.0.ebuild @@ -3,16 +3,12 @@ EAPI=8 -inherit tree-sitter-grammar +TS_BINDINGS=( python ) -# Upstream has not created a release in a while, and there have been -# some changes that fix weirdness with Emacs tree-sitter-mode. -GIT_COMMIT="0b6d0eb9abdf7cea31961cd903eeed5bbd0aae74" +inherit tree-sitter-grammar DESCRIPTION="C++ grammar for Tree-sitter" HOMEPAGE="https://github.com/tree-sitter/tree-sitter-cpp" -SRC_URI="https://github.com/tree-sitter/${PN}/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}"/${PN}-${GIT_COMMIT} LICENSE="MIT" SLOT="0" diff --git a/dev-libs/tree-sitter-css/Manifest b/dev-libs/tree-sitter-css/Manifest index 013ca3062931..020fecc893b6 100644 --- a/dev-libs/tree-sitter-css/Manifest +++ b/dev-libs/tree-sitter-css/Manifest @@ -1,2 +1,2 @@ -DIST tree-sitter-css-0.19.0.tar.gz 80823 BLAKE2B 5a011981bea8dca3ea51d3615c88eeefb2e0dafae52a947b58a930f9521cfd5759ff22812d4f49283453cc86f52372a798dd507b1982fb55dba086156a5842fb SHA512 8811118f8506ae6cc25bf30285361b751902cd4af9d25cd64eccacd1721cacd8b66277c7c950c825fe6e72ac3155dbd39c24ee94090faaae9ee8b67ce61fc1c4 DIST tree-sitter-css-0.20.0.tar.gz 93887 BLAKE2B 5f5962de37fa6a65dd531a54515b24ccb78932f17d15884adfe00cb1098a86ece3894c2e7f54a8936ad7fa1c76e5dcb89453999e3ffd3f3d894c9e112407e4a2 SHA512 0b4c45de304a5a18834a85665b5da5eaf7adc968c509de6cb95b98a08b2987be7b13f2cbb7181da04cf23e199942d9daf788a12cd2f4b8d85767ef1250196825 +DIST tree-sitter-css-0.21.0.tar.gz 114817 BLAKE2B 6a1acfd884e764903155fae31921fccd878ed858f73eae799d25c603c7740aaa908b5d746f66c429940c55818c279bba21ded5638999c7c96229f4adbbfd8d6e SHA512 2f653e74293516d950ced883ece1ed3f6ceb7e895e54207a561c3ae61e63284a4001ae138aaf75afb46fc2efe8e50e3e551c469cd7f675f8cfcc3415e89d07d0 diff --git a/dev-libs/tree-sitter-css/files/tree-sitter-css-0.20.0-test-selector.patch b/dev-libs/tree-sitter-css/files/tree-sitter-css-0.20.0-test-selector.patch new file mode 100644 index 000000000000..bbcec7e47e23 --- /dev/null +++ b/dev-libs/tree-sitter-css/files/tree-sitter-css-0.20.0-test-selector.patch @@ -0,0 +1,14 @@ +https://bugs.gentoo.org/928010 +https://github.com/tree-sitter/tree-sitter-css/issues/47 +https://github.com/tree-sitter/tree-sitter/issues/3238 +--- a/test/corpus/selectors.txt ++++ b/test/corpus/selectors.txt +@@ -102,7 +102,7 @@ a::first-line {} + (block))) + + ========================= +-::slotted pseudo element ++slotted pseudo element + ========================= + + ::slotted(button) {} diff --git a/dev-libs/tree-sitter-css/tree-sitter-css-0.20.0.ebuild b/dev-libs/tree-sitter-css/tree-sitter-css-0.20.0.ebuild index a1f48ed9e145..632f1a55a2fa 100644 --- a/dev-libs/tree-sitter-css/tree-sitter-css-0.20.0.ebuild +++ b/dev-libs/tree-sitter-css/tree-sitter-css-0.20.0.ebuild @@ -11,3 +11,9 @@ HOMEPAGE="https://github.com/tree-sitter/tree-sitter-css" LICENSE="MIT" SLOT="0" KEYWORDS="amd64" + +PATCHES=( + # https://bugs.gentoo.org/928010 + # Test name beginning with :: is incompatible with tree-sitter >0.22 + "${FILESDIR}"/${PN}-0.20.0-test-selector.patch +) diff --git a/dev-libs/tree-sitter-css/tree-sitter-css-0.19.0.ebuild b/dev-libs/tree-sitter-css/tree-sitter-css-0.21.0.ebuild index db311c39a97c..195fe7aaff43 100644 --- a/dev-libs/tree-sitter-css/tree-sitter-css-0.19.0.ebuild +++ b/dev-libs/tree-sitter-css/tree-sitter-css-0.21.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -10,4 +10,10 @@ HOMEPAGE="https://github.com/tree-sitter/tree-sitter-css" LICENSE="MIT" SLOT="0" -KEYWORDS="amd64" +KEYWORDS="~amd64" + +PATCHES=( + # https://bugs.gentoo.org/928010 + # Test name beginning with :: is incompatible with tree-sitter >0.22 + "${FILESDIR}"/${PN}-0.20.0-test-selector.patch +) diff --git a/dev-libs/tree-sitter-go/Manifest b/dev-libs/tree-sitter-go/Manifest index 5e4d96e64955..939f1d87e1d4 100644 --- a/dev-libs/tree-sitter-go/Manifest +++ b/dev-libs/tree-sitter-go/Manifest @@ -1,2 +1,2 @@ -DIST tree-sitter-go-0.19.1.tar.gz 160180 BLAKE2B f92bbb342eae3a7705dbd6f6564a16fdbad1a25c405970bca1e8df01ff6d0c20b45f9849a0d13d53e2f56d95b71db0f7813765f64e0dcdfd9ca617d1f71e688d SHA512 8390dd3e39daa42ec5254b4c6c0b15fec0caa7ae64a9ec3b9116a10f9e9f1b6940cd88c8cf14dc50b28b97ea588ff302ebd16f3c88e0bd6983e76b5526a31b45 DIST tree-sitter-go-0.20.0-2.tar.gz 195753 BLAKE2B eca2965c0d7bba3c639e092845ac98d05936e9d87290dca2a283dcd6afb1151f8d63aba907337fee79e9fd9b0d901edfda62ec936ef948f57dc663c9d906715b SHA512 ff438a6c84454f38cdefe506f5da787007cb50b3d41bcb9c7f26ed7d951a3268e6bf0b32f2e750d0e4233516c1e4a827c24af831020f81f268fe825adcd5f836 +DIST tree-sitter-go-0.21.0.tar.gz 210048 BLAKE2B 3589922c610d6a8f32fb753cb91f2c925a2bd4d63dc5b32cc37bb7723b7b6eb7339135cc2dd1629c6aa42684c4fe376dd1364bd928fc8c48100471203b68b627 SHA512 c12725c85ab6836fc6554edc64bc2f005d62e45c3d69d07811138cd09d29635399f70ba5837ead05f5827a327a1666bb4134475c99e2f8da81bd3412e4946a59 diff --git a/dev-libs/tree-sitter-go/tree-sitter-go-0.19.1.ebuild b/dev-libs/tree-sitter-go/tree-sitter-go-0.21.0.ebuild index 4193e530e8c5..93b08dfb8456 100644 --- a/dev-libs/tree-sitter-go/tree-sitter-go-0.19.1.ebuild +++ b/dev-libs/tree-sitter-go/tree-sitter-go-0.21.0.ebuild @@ -1,9 +1,8 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -TS_PV=rust-0.19.1 inherit tree-sitter-grammar DESCRIPTION="Go grammar for Tree-sitter" @@ -11,4 +10,4 @@ HOMEPAGE="https://github.com/tree-sitter/tree-sitter-go" LICENSE="MIT" SLOT="0" -KEYWORDS="amd64" +KEYWORDS="amd64 ~arm64" diff --git a/dev-libs/tree-sitter-haskell/Manifest b/dev-libs/tree-sitter-haskell/Manifest index 2efa7e45c361..c31f35b4a5f5 100644 --- a/dev-libs/tree-sitter-haskell/Manifest +++ b/dev-libs/tree-sitter-haskell/Manifest @@ -1 +1,2 @@ DIST tree-sitter-haskell-0.13.0_p20211114.tar.gz 834925 BLAKE2B d7cadc960ddb49efa6c439dfc13b674d398a4576fb85fd5ef12b4015049fd629722fe0d2788ab4c0052f1a3a6baa9fe5de925d86f7098495429190871340823b SHA512 db3f2ddd20195521a5a03d6ecf1305dc222343ba54ebdabf0cc68db680553908ce6d0ccba4fdcf9073e4f5187b2a6fae6364bda935167ca8d4e421500a86fdfa +DIST tree-sitter-haskell-0.15.0.tar.gz 1574593 BLAKE2B 47559f768d3c03da63d74b02aba9cb788a1f20223187d2ba67730b3cf2921036ccf9f3df22d82a958adb1b46022f76f148dd251f7fe0483e482bd877d789a9bf SHA512 22368c46cd6e0652ed717c954b55f582125489a410bfe17027b7d0d0d7854789c342140e4908080ad5bd177e14ded928215daf514b7954bc6a31ab7fa19016f0 diff --git a/dev-libs/tree-sitter-typescript/tree-sitter-typescript-0.20.1.ebuild b/dev-libs/tree-sitter-haskell/tree-sitter-haskell-0.15.0.ebuild index 3826613aff5d..48de3a1e6531 100644 --- a/dev-libs/tree-sitter-typescript/tree-sitter-typescript-0.20.1.ebuild +++ b/dev-libs/tree-sitter-haskell/tree-sitter-haskell-0.15.0.ebuild @@ -5,9 +5,8 @@ EAPI=8 inherit tree-sitter-grammar -DESCRIPTION="TypeScript grammar for Tree-sitter" -HOMEPAGE="https://github.com/tree-sitter/tree-sitter-typescript" -S="${WORKDIR}"/${P}/typescript +DESCRIPTION="Haskell grammar for Tree-sitter" +HOMEPAGE="https://github.com/tree-sitter/tree-sitter-haskell" LICENSE="MIT" SLOT="0" diff --git a/dev-libs/tree-sitter-html/Manifest b/dev-libs/tree-sitter-html/Manifest index db1836e41c70..53427fc68a48 100644 --- a/dev-libs/tree-sitter-html/Manifest +++ b/dev-libs/tree-sitter-html/Manifest @@ -1 +1,3 @@ DIST tree-sitter-html-0.19.0.tar.gz 18785 BLAKE2B 40a2f8a1b4d9943ed15003073e8499fb58aea00979359f793c30c4e7d431905620c20f8e77286a56dbc040642081effa61a7ed9fdd3d61d44bfadfb327793ed1 SHA512 7816e5f4e74c7a64a4fb715000123f5350dc3c6ebfbf5d71ea6dd660cd58a7b4327413ef3e8efa8c177c7308f43bb8b4d60fddbcf518a99841148a37aba95b71 +DIST tree-sitter-html-0.20.2.tar.gz 28880 BLAKE2B 0c17bb4a29174535cc0789221b631889122bc89e9a3883d53501acadade7723bafd15aae8373fb9c6135c0fea485202ea68ec45a855e21c2d7b7eda3fe0e0c58 SHA512 4ebdc4cdff525e54d774bde6b53ced5d8d0e2fea5cd54f006c39354544752856c520ce7b53eb268b6ef60185236102b8003b5de389fdb85454126b6ee689bb61 +DIST tree-sitter-html-0.20.3.tar.gz 45084 BLAKE2B fca267fca9ddfb0651b1e596f422d9093852e0b06391f192f9b525df379048d2e74fab472bd4ecfb0fa229ff34546d648a644bfc3f746e8ecb24ad8b4558419c SHA512 572cbdeca6c57d8fc389b8736acfb6a4ac2b3bd8704445ca7a006d75e0a3c37faa9abd75ead54d586e25b5550f72324c407271b451dd5ed94fafb09e8a6ad352 diff --git a/dev-libs/tree-sitter-java/tree-sitter-java-0.20.0.ebuild b/dev-libs/tree-sitter-html/tree-sitter-html-0.20.2.ebuild index 5b79a06f012a..55a42a78b64c 100644 --- a/dev-libs/tree-sitter-java/tree-sitter-java-0.20.0.ebuild +++ b/dev-libs/tree-sitter-html/tree-sitter-html-0.20.2.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 inherit tree-sitter-grammar -DESCRIPTION="Java grammar for Tree-sitter" -HOMEPAGE="https://github.com/tree-sitter/tree-sitter-java" +DESCRIPTION="HTML grammar for Tree-sitter" +HOMEPAGE="https://github.com/tree-sitter/tree-sitter-html" LICENSE="MIT" SLOT="0" diff --git a/dev-libs/tree-sitter-html/tree-sitter-html-0.20.3.ebuild b/dev-libs/tree-sitter-html/tree-sitter-html-0.20.3.ebuild new file mode 100644 index 000000000000..a4bd66d4c12f --- /dev/null +++ b/dev-libs/tree-sitter-html/tree-sitter-html-0.20.3.ebuild @@ -0,0 +1,15 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +TS_BINDINGS=( python ) + +inherit tree-sitter-grammar + +DESCRIPTION="HTML grammar for Tree-sitter" +HOMEPAGE="https://github.com/tree-sitter/tree-sitter-html" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~riscv ~s390 ~x86" diff --git a/dev-libs/tree-sitter-java/Manifest b/dev-libs/tree-sitter-java/Manifest index 3797e2552640..9a93dd4f91c9 100644 --- a/dev-libs/tree-sitter-java/Manifest +++ b/dev-libs/tree-sitter-java/Manifest @@ -1,4 +1,2 @@ -DIST tree-sitter-java-0.19.1.tar.gz 134115 BLAKE2B 92b2388d644659fa84646deeff06cda9c1c3bf3dbf6d06bda8e8dea14c2e748813cbaec440a458f98e0f1182e7543ca6a1d4c30ecbd2ba7733e09acf3aeff623 SHA512 71bd34132785f1b95538ce321eba4d6258fff309abf6150852b749336d7ffa5e4bd06f52fb5b6db2e2845592e6faf2ad4cac226289a0078f06cf2fc2f74152bb -DIST tree-sitter-java-0.20.0.tar.gz 166695 BLAKE2B 6a618894746f113692997ba683fd3185e0f321f82bef3a7a11226a81f28e40b9973f74cc7010035983da1f5a6f2cbc493688c8bac47381fcd1d1010d03d4db5c SHA512 e6a341879e0eb889be7ff26a7f675e8bcb6f85de040f7d09029421b43bf4069a62889fdc7bd6b8e4afabd2b93df1bdfd86853b1cc6c2daf69f84ea68ede217d5 -DIST tree-sitter-java-0.20.1.tar.gz 176841 BLAKE2B eda966d8c648fc0192ab34b6ed8f2b87a6eff4dd05f47d54ec87659f62e497f7793d6949452504102fefe41c38bea4f51051484cd338b8a407030a3f7c888907 SHA512 07179852060198989c980462e2006083440895f37feb29b639d3c8ce8cb6a84a1b826e11d136821d398c34b0f989a23fce2ddf4ef0391b6f1ebb611b3004d1fc DIST tree-sitter-java-0.20.2.tar.gz 200727 BLAKE2B 03c9b805ad94b852fc9e02f1e266cae9010636cd33ffd2a7f3da1076843aced2358f95022476476edd0b201efb87b164f31bdd610654f182cc627fd762c39cb8 SHA512 188b4d4c5aad6367ab25e5bbc3b7f56fe1b6108ee1dbe072d71a7376e52793364fad004e2f79d1aa6e18176d5642afef982a40b8da127d4252f2ea10d4bf874c +DIST tree-sitter-java-0.21.0.tar.gz 218672 BLAKE2B 8138dbfdb76aebd1067be3a6c97543c71d601b3b5475e14b050251e163a0f1fff97003505ef4c3f997b34f588470acd5e46df70e54afead8dc2f80b020cb41a3 SHA512 236159990182f2cab0fd50ab1f43898f021243a37e7517f7c8df039296f08e1fe615889a0fd0677eae3abd6a495333ed56be5164f43855cb9ef8e0cc4f2b70c9 diff --git a/dev-libs/tree-sitter-java/tree-sitter-java-0.20.1.ebuild b/dev-libs/tree-sitter-java/tree-sitter-java-0.21.0.ebuild index 19ac8915ea50..21de8dbc5b4e 100644 --- a/dev-libs/tree-sitter-java/tree-sitter-java-0.20.1.ebuild +++ b/dev-libs/tree-sitter-java/tree-sitter-java-0.21.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 diff --git a/dev-libs/tree-sitter-javascript/Manifest b/dev-libs/tree-sitter-javascript/Manifest index ac157e77d251..c46994c8c152 100644 --- a/dev-libs/tree-sitter-javascript/Manifest +++ b/dev-libs/tree-sitter-javascript/Manifest @@ -1,4 +1,3 @@ -DIST tree-sitter-javascript-0.20.0.tar.gz 278831 BLAKE2B cd66005e7ebdae154a192ff556d4cb35e91d93a2ab645a24b9492217858278adc1f7917a7dc5033bbcfd84ca7ef41a3e7ebb1ff934bb09b79c8923469110e1de SHA512 778e0f2f5bf276d7ffb6eab0fe3f7473b56605de707c8e2f491fbb5826da94067b9f1bc476306013267001b5ecaab11a956e896b78520cdedd27006fac97fe41 DIST tree-sitter-javascript-0.20.1-2.tar.gz 371027 BLAKE2B 5bd9b11f1e10ff37950b2142031bebd3b5f6111818a21bf5a7d97a8a27a5340bd09cd139d76846141ed64a824f82f1e1394b90d8622192524d7db9a02ed95223 SHA512 5341311b419cf763c0a6d23348eba0e38b417ba07c2def341027223347d850c28b86db6add136dbf73cd5296133823a4548493ee649e09247dfbe5bcbaaab76d -DIST tree-sitter-javascript-0.20.3.tar.gz 394552 BLAKE2B e578299df6645b3529e8b82385a8060a8e25f122faf63f4e7f0ecc6ddbec7f29986c552a83dba9cf0bc8866225e749e3c9c0a5a9556e6266e8e731cf09af4def SHA512 31fd1b645fcbdd6670bc6b00e6c4adc2ce440aa35ba9b530a6161849fd70d0a38f8539727d321ba2bbc60a8d9bcf33296b561f8921115a8e68c50a40b253bbc4 DIST tree-sitter-javascript-0.20.4.tar.gz 396452 BLAKE2B b33c4c44fb59985af7809ef9bd015d12dac185999993570164de4ac87a60cde28cf4c1232a06dd3e312ce256f2b021ef5fa500fd9e0772a3fb657f74256500a4 SHA512 65171e5af35c9c5cc9a6c54792d2194b197e130ec277b35e67e04b654082bcb1b98cb9bbe497bbe1dde69f582e5cdca01cba4f40682b7b587fd19e89b88f3dd6 +DIST tree-sitter-javascript-0.21.0.tar.gz 367344 BLAKE2B 7698b918db7fb49bd73ee03757fa17d5f6c0adc14a279410e2bc924123b1a187e6018b534bc1d2b6cbc41e5f42f7b4b6541c65d4f70d6345dda31c719bf479c6 SHA512 c83d7525e3639e237b9f81cac38d0290a3257aa98dba62f079abfb234f3cbd3de23e0b275da85878d3ab4b8de03384dc4e8a8512641b17ff0aca2e3a722947a6 diff --git a/dev-libs/tree-sitter-javascript/tree-sitter-javascript-0.20.0.ebuild b/dev-libs/tree-sitter-javascript/tree-sitter-javascript-0.20.0.ebuild deleted file mode 100644 index a082528027b0..000000000000 --- a/dev-libs/tree-sitter-javascript/tree-sitter-javascript-0.20.0.ebuild +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -TS_PV=rust-0.20.0 -inherit tree-sitter-grammar - -DESCRIPTION="JavaScript grammar for Tree-sitter" -HOMEPAGE="https://github.com/tree-sitter/tree-sitter-javascript" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64" diff --git a/dev-libs/tree-sitter-javascript/tree-sitter-javascript-0.20.4.ebuild b/dev-libs/tree-sitter-javascript/tree-sitter-javascript-0.20.4.ebuild index a95e21c0d4a6..ec9248a60d3d 100644 --- a/dev-libs/tree-sitter-javascript/tree-sitter-javascript-0.20.4.ebuild +++ b/dev-libs/tree-sitter-javascript/tree-sitter-javascript-0.20.4.ebuild @@ -10,4 +10,4 @@ HOMEPAGE="https://github.com/tree-sitter/tree-sitter-javascript" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64" diff --git a/dev-libs/tree-sitter-javascript/tree-sitter-javascript-0.20.3.ebuild b/dev-libs/tree-sitter-javascript/tree-sitter-javascript-0.21.0.ebuild index a95e21c0d4a6..8112b3196ccb 100644 --- a/dev-libs/tree-sitter-javascript/tree-sitter-javascript-0.20.3.ebuild +++ b/dev-libs/tree-sitter-javascript/tree-sitter-javascript-0.21.0.ebuild @@ -3,6 +3,8 @@ EAPI=8 +TS_BINDINGS=( python ) + inherit tree-sitter-grammar DESCRIPTION="JavaScript grammar for Tree-sitter" @@ -10,4 +12,4 @@ HOMEPAGE="https://github.com/tree-sitter/tree-sitter-javascript" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~riscv ~s390 ~x86" diff --git a/dev-libs/tree-sitter-json/Manifest b/dev-libs/tree-sitter-json/Manifest index 1a24898111fe..fccaf007e65b 100644 --- a/dev-libs/tree-sitter-json/Manifest +++ b/dev-libs/tree-sitter-json/Manifest @@ -1,3 +1,4 @@ DIST tree-sitter-json-0.19.0.tar.gz 11102 BLAKE2B 8530b53dffa59fcc844501dcbfc9fc8a39a4d4fda6653e02b17261c23da43c8f3dd2bcb1e312a58861ea9af7835d4f2b9208e7960bfaec8ffeecd754e04416d0 SHA512 f4ef90d1ff7cb96093e7b54fb0b4904f7c19256c2e0938c03f81d89f3699f0c0922da54d1d770aa786b9cf10b08f9afa762771a207546a29cf7ff7f1710dadb6 DIST tree-sitter-json-0.20.1.tar.gz 15576 BLAKE2B d6b9d3c931453440c2557814184b629640e4a0dd9b763ba8aec51aeb8322b021d0bfd8e4385445ef527100f67db507d3c934480457a7a5ed60a2d035fda44f13 SHA512 30ae91cec4c9e63acfd2bd0c62b313d48a50ec722ff5c793b8b51910a02a9c6f8697a866ec7bbde3c7f14b2bdcfc12be3650d7a8e6f23fde80527cc235a3768e DIST tree-sitter-json-0.20.2.tar.gz 15647 BLAKE2B 524933bf7af4df87d78497912c7865c20b2cc3e9b099401aac612c8c6d382fbc8f8704515abcb1e579fbac7734d23545f91ac7600e978a2924567998e5166834 SHA512 511376b7be02c624bc48b0a46dd937f1a5d6def3d2a15a7b61cf71b846ecf98ef8af93f05f861152270ea0dcacc18940f8c25bfbad69e9d5c520485d25dab7f5 +DIST tree-sitter-json-0.21.0.tar.gz 34737 BLAKE2B 104229cd039b41fb79ccdab3b30e0e59a96a3aa46c060bf50cc093acfe4510150ad5caaf39f49045d478d9f67f863ff6289ba7ab59aaa27871ebb77ffc66a453 SHA512 37ee6a511e15eeb832c7a49d74d977724fecfe24943472047e2100aa18bf4e64f297b1a8e8e37f1d2223614dd9ceec038abd84b5f1fcc00bb67289b70de2ebd2 diff --git a/dev-libs/tree-sitter-json/tree-sitter-json-0.20.2.ebuild b/dev-libs/tree-sitter-json/tree-sitter-json-0.20.2.ebuild index 5e272e100507..bc7df5806d4d 100644 --- a/dev-libs/tree-sitter-json/tree-sitter-json-0.20.2.ebuild +++ b/dev-libs/tree-sitter-json/tree-sitter-json-0.20.2.ebuild @@ -10,4 +10,4 @@ HOMEPAGE="https://github.com/tree-sitter/tree-sitter-json" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~arm64" +KEYWORDS="amd64 ~arm64" diff --git a/dev-libs/tree-sitter-json/tree-sitter-json-0.21.0.ebuild b/dev-libs/tree-sitter-json/tree-sitter-json-0.21.0.ebuild new file mode 100644 index 000000000000..333489c99fa5 --- /dev/null +++ b/dev-libs/tree-sitter-json/tree-sitter-json-0.21.0.ebuild @@ -0,0 +1,15 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +TS_BINDINGS=( python ) + +inherit tree-sitter-grammar + +DESCRIPTION="JSON grammar for Tree-sitter" +HOMEPAGE="https://github.com/tree-sitter/tree-sitter-json" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~riscv ~s390 ~x86" diff --git a/dev-libs/tree-sitter-julia/Manifest b/dev-libs/tree-sitter-julia/Manifest index 9919ac5ca25d..8f235382ff54 100644 --- a/dev-libs/tree-sitter-julia/Manifest +++ b/dev-libs/tree-sitter-julia/Manifest @@ -1,2 +1,3 @@ DIST tree-sitter-julia-0.19.0.tar.gz 591870 BLAKE2B 0a15485ce7eb87f080add5b2dae19004349f3c79a048b77552915ae776860d722d6d6e07422ab82fb932f795285b545fe1b6579824a8f4905fbbdd4b96f16ea4 SHA512 ee3943683413e3d16d60ec1bf1f3cc816011c4d458b5c44d7ce42e5f14c8aa22e35ce07747f0737c9b514fa7ea8b866d4fa6af5c53069b755e0d6d3f7bcc8e2a DIST tree-sitter-julia-0.20.0.tar.gz 4032821 BLAKE2B eac1ec80509c8dfb75a68f507a615eaf69366e42fdf2ff9a74fb7acc8281f55fa5ba45cd4a1b050e5277614a14b5bd39145115c74de83ffb7669701ed709c04d SHA512 173e990ba6353e8b3f124fb3b1e1e5c281882d7fd6f7d53b3f40304db0f5361c0220017af51dbc569ddc2debf494ae8325877fc3c5de60239da942299a054b3d +DIST tree-sitter-julia-0.22.0.tar.gz 2792109 BLAKE2B d661b9d84b9d1903d7fae9e4073fcc1fd52030e7a264929cf6eb3aa33745cc51c094beb6e4ddcfd11725989fc82a5e21b20a66b01bc60c8f06c522f732bcff6a SHA512 9687875f641eb0f599a15a5c9ced0a873c81a2d6ad36528f2c29120126a92ca5d6a51c97f736c1c1e46cd8af32e7c5739c694b0372fa62ca840f39f0fbd6a387 diff --git a/dev-libs/tree-sitter-julia/tree-sitter-julia-0.22.0.ebuild b/dev-libs/tree-sitter-julia/tree-sitter-julia-0.22.0.ebuild new file mode 100644 index 000000000000..c0b00dfcb6a3 --- /dev/null +++ b/dev-libs/tree-sitter-julia/tree-sitter-julia-0.22.0.ebuild @@ -0,0 +1,13 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit tree-sitter-grammar + +DESCRIPTION="Julia grammar for Tree-sitter" +HOMEPAGE="https://github.com/tree-sitter/tree-sitter-julia" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" diff --git a/dev-libs/tree-sitter-php/Manifest b/dev-libs/tree-sitter-php/Manifest index 02d9e0cff7d8..d133ea96db85 100644 --- a/dev-libs/tree-sitter-php/Manifest +++ b/dev-libs/tree-sitter-php/Manifest @@ -1,2 +1,3 @@ DIST tree-sitter-php-0.20.0.tar.gz 290518 BLAKE2B 5ba7dabf79665ceb2be737906493bf774e51a0233a62bdb89d84a6a9204745a99679322e047a9115d95e92c3dbb34c5da591497223bb580522b587bedc933d10 SHA512 0ce3e8b2a7cb26b8fa2210e2ac8b133c0ea8450b7504f93422a7baa0ee6f5217c72b9ce0cbdc5ac1e85deb2ab08fc6b968e74f124dce13ebfb8ad9b0af2afb8f DIST tree-sitter-php-0.22.2.tar.gz 541599 BLAKE2B 5e98d7d9226900c16b8681ec408bafb6a4c4c281fa0d97b3b9c06b58657f69166df6700ecd127406efff430c0f79a56ff08cc45ca48b483ecd6579cfe7263a05 SHA512 0592d145f92f9f93524b5d6b341b8141234784c03d9e0384311cd735f4b8216e0dd3d5ff27daef6127d3a079b16043b3957e7fd0f8759e90924539bb42f4f306 +DIST tree-sitter-php-0.22.4.tar.gz 555466 BLAKE2B c95870d3079053cf8ff0ce07ce3019a4c33712f1be21734ddf52b9c47f2721387c4c024c4e53855c7449cff386fd46924a5fccf149437a06263e732378e8b0d7 SHA512 5baf5f454769407789ad2e84065088da2aa4a404ac518ba77078d421c38a08a622884c6c6a8e2e77d38c441de36d6e778a5073cb575fe649ab92e9f7420a32b3 diff --git a/dev-libs/tree-sitter-php/tree-sitter-php-0.22.2.ebuild b/dev-libs/tree-sitter-php/tree-sitter-php-0.22.2.ebuild index 13dc08afbb50..75450e8ef333 100644 --- a/dev-libs/tree-sitter-php/tree-sitter-php-0.22.2.ebuild +++ b/dev-libs/tree-sitter-php/tree-sitter-php-0.22.2.ebuild @@ -11,4 +11,4 @@ S="${WORKDIR}"/${P}/php LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64" diff --git a/dev-libs/tree-sitter-php/tree-sitter-php-0.22.4.ebuild b/dev-libs/tree-sitter-php/tree-sitter-php-0.22.4.ebuild new file mode 100644 index 000000000000..13dc08afbb50 --- /dev/null +++ b/dev-libs/tree-sitter-php/tree-sitter-php-0.22.4.ebuild @@ -0,0 +1,14 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit tree-sitter-grammar + +DESCRIPTION="PHP grammar for Tree-sitter" +HOMEPAGE="https://github.com/tree-sitter/tree-sitter-php" +S="${WORKDIR}"/${P}/php + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" diff --git a/dev-libs/tree-sitter-python/tree-sitter-python-0.21.0-r1.ebuild b/dev-libs/tree-sitter-python/tree-sitter-python-0.21.0-r1.ebuild index e7ea609d79c0..10f934140555 100644 --- a/dev-libs/tree-sitter-python/tree-sitter-python-0.21.0-r1.ebuild +++ b/dev-libs/tree-sitter-python/tree-sitter-python-0.21.0-r1.ebuild @@ -12,4 +12,4 @@ HOMEPAGE="https://github.com/tree-sitter/tree-sitter-python" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~x86" diff --git a/dev-libs/tree-sitter-ruby/Manifest b/dev-libs/tree-sitter-ruby/Manifest index 621521608fb9..20c1e7a8b49f 100644 --- a/dev-libs/tree-sitter-ruby/Manifest +++ b/dev-libs/tree-sitter-ruby/Manifest @@ -1,2 +1,3 @@ -DIST tree-sitter-ruby-0.19.0.tar.gz 325077 BLAKE2B eb39ba999ccf582b698138ebb7a7f9cbd949510046460d84e37471634700b0751219a7a266652256225bc6fbdd80340cca38662b180c2314f82c5ed7de3324cf SHA512 dc092b55a73a7ffaf698c784e0a6e8fd115478ce8eb2de00301bb8c2455044a4b7f4cd04ab36eb19401386b55088ad3fba6cb9cce9856b6f607bd76caaf0900b DIST tree-sitter-ruby-0.20.0_pre20221101.tar.gz 575761 BLAKE2B 17daf39dfd812ab0993cd2a3ad728603d629c2e177261fa60d237a1dfd504b2a087611824cdffb03e95c0b304d9f6991ccf36aad1f18db4aa3177c082c6e275e SHA512 ff6eb4a28e5313cbdebca0f939d209d7c15016fef4ed864e64ce2e6f30023e15a88483c5bc90673fcee42df75c6e003b69fc2e5f81b72ecf1a506c836eebeba4 +DIST tree-sitter-ruby-0.20.1.tar.gz 601038 BLAKE2B 29174a74a96f0b93d803eb9455ae1ceb7e4ca78be215c062ca341485c19f595a29cafe7c9ee75b95239045497e8d4695648c3ab1503d96039ec7c5a3c64c9883 SHA512 96d68cb7c557d341def9cbb9a51ecf12b7572bb46b9588bd3dab6f2598b6ce73df2fbbae8f0aa08737b34bda55e98eff8499921ea68f7389a7237fa32f62793b +DIST tree-sitter-ruby-0.21.0.tar.gz 618006 BLAKE2B d296dd901e426642383594f9bd45cabb8cff3193b5e83ab17f5c199e954b912da4b398ff57337b9439780bff7565bd4b396cf5bba69587e4714d5563fbcebb02 SHA512 d8f2059f60dde221466b1428bca11aa815129c9247789ba7de79f837050225687699cd9a3316e3bd8b1f28da339b68a4f73c5765710c238d88a213521297e604 diff --git a/dev-libs/tree-sitter-ruby/tree-sitter-ruby-0.20.1.ebuild b/dev-libs/tree-sitter-ruby/tree-sitter-ruby-0.20.1.ebuild new file mode 100644 index 000000000000..ef5a0db4369b --- /dev/null +++ b/dev-libs/tree-sitter-ruby/tree-sitter-ruby-0.20.1.ebuild @@ -0,0 +1,20 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit tree-sitter-grammar + +DESCRIPTION="Ruby grammar for Tree-sitter" +HOMEPAGE="https://github.com/tree-sitter/tree-sitter-ruby" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64" + +# Highlight tests failing in upstream ci too. The parser works, and +# we do not currently install the highlight queries. +# +# https://bugs.gentoo.org/923987 +# https://github.com/tree-sitter/tree-sitter-ruby/issues/253 +RESTRICT="test" diff --git a/dev-libs/tree-sitter-ruby/tree-sitter-ruby-0.19.0.ebuild b/dev-libs/tree-sitter-ruby/tree-sitter-ruby-0.21.0.ebuild index 116225a7b7ce..ee3d1223746f 100644 --- a/dev-libs/tree-sitter-ruby/tree-sitter-ruby-0.19.0.ebuild +++ b/dev-libs/tree-sitter-ruby/tree-sitter-ruby-0.21.0.ebuild @@ -1,8 +1,10 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 +TS_BINDINGS=( python ) + inherit tree-sitter-grammar DESCRIPTION="Ruby grammar for Tree-sitter" @@ -10,4 +12,4 @@ HOMEPAGE="https://github.com/tree-sitter/tree-sitter-ruby" LICENSE="MIT" SLOT="0" -KEYWORDS="amd64" +KEYWORDS="~amd64" diff --git a/dev-libs/tree-sitter-rust/Manifest b/dev-libs/tree-sitter-rust/Manifest index 7e7b8de3678d..db118c56a1cf 100644 --- a/dev-libs/tree-sitter-rust/Manifest +++ b/dev-libs/tree-sitter-rust/Manifest @@ -1,3 +1,5 @@ DIST tree-sitter-rust-0.20.1.tar.gz 308918 BLAKE2B b226bf6eb2c282f62d3eef0598db38dc54d03ed2ea07313fffbb6c9d955cccc71bef5513b8b2c56460989789e9f4293fb27a2db152b5afa56085348427fe9ad5 SHA512 de799d76dbcbc7f68ab8560f747c3df3950dd3e640ac60cd44d65a60b23e118e271370e2b1b84d2d830c2d70341b5714f5f52592709ba15f6b164c05f3798f07 DIST tree-sitter-rust-0.20.3.tar.gz 325621 BLAKE2B b5d2f15df3550e22e380c26a3fa6270a897f4555efb2778e54ef9262145ca919bf933ee739674e02a2086f58d707174c3a2cfb545d879a2c67decf508793af47 SHA512 9732a6e9782538c1a7f7a265e185aece659e164284eac61f65f3d174845aafc697ec2758d6dddb52c8a6ee3856be67493339d680f963ee383894f1d3789d96d5 DIST tree-sitter-rust-0.20.4.tar.gz 358924 BLAKE2B 16c7918d352163ebb866f34865c68f5d9e19bbc3ffcec0f0c61ba38a8c828cee3eb50c97ddaea01d7575e23496bca18dc5161daee8bbdaa075ba75de608be999 SHA512 f1b2e9537286921056eda4e96faa9f61131b9ca5684e7ab8aa7bd07e46d91e5eab18e6e292cfad7cdcb7ba195e80f7f1e35f04992cb8011bbd29dd2d95116f9d +DIST tree-sitter-rust-0.21.0.tar.gz 448170 BLAKE2B ecf13ff1358a64383feaa973332be7ff7d7551c414fef9bb3773f1ca975db97f6e0e6076ea572094771c25c59641a58aeec70c41fea65533b59fc436fd143938 SHA512 f9cd32e43b544a18eddfc0b6f8210f1fbc3e7a5d6e9b72c482a536df1e215ceadb41545a65f0c6fc791f6063adbe51957d4e20f7c8fa07a5079a4338a0351bf3 +DIST tree-sitter-rust-0.21.2.tar.gz 433742 BLAKE2B d929baa23ef85bdf0b22ea1878699ef8b788ce43ebba93552f473fb695502d6e8bde5f378ef053702ecfaba2e859143d093f3f7b46e302160212eee89f6cbac6 SHA512 304b232683ded9973a94ec872401151a5900e3423c7bff966b3f5ec4a71122405fb3790f71f5fb445b8af72a31176349cb3ea8bc7d1b1a042ee574420472e19e diff --git a/dev-libs/tree-sitter-rust/tree-sitter-rust-0.21.0.ebuild b/dev-libs/tree-sitter-rust/tree-sitter-rust-0.21.0.ebuild new file mode 100644 index 000000000000..e602dda97d5d --- /dev/null +++ b/dev-libs/tree-sitter-rust/tree-sitter-rust-0.21.0.ebuild @@ -0,0 +1,15 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +TS_BINDINGS=( python ) + +inherit tree-sitter-grammar + +DESCRIPTION="Rust grammar for Tree-sitter" +HOMEPAGE="https://github.com/tree-sitter/tree-sitter-rust" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 ~arm64" diff --git a/dev-libs/tree-sitter-rust/tree-sitter-rust-0.21.2.ebuild b/dev-libs/tree-sitter-rust/tree-sitter-rust-0.21.2.ebuild new file mode 100644 index 000000000000..d054a662581b --- /dev/null +++ b/dev-libs/tree-sitter-rust/tree-sitter-rust-0.21.2.ebuild @@ -0,0 +1,15 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +TS_BINDINGS=( python ) + +inherit tree-sitter-grammar + +DESCRIPTION="Rust grammar for Tree-sitter" +HOMEPAGE="https://github.com/tree-sitter/tree-sitter-rust" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~riscv ~s390 ~x86" diff --git a/dev-libs/tree-sitter-scala/tree-sitter-scala-0.21.0.ebuild b/dev-libs/tree-sitter-scala/tree-sitter-scala-0.21.0.ebuild index f994c3b92365..d19d0d446e2d 100644 --- a/dev-libs/tree-sitter-scala/tree-sitter-scala-0.21.0.ebuild +++ b/dev-libs/tree-sitter-scala/tree-sitter-scala-0.21.0.ebuild @@ -10,4 +10,4 @@ HOMEPAGE="https://github.com/tree-sitter/tree-sitter-scala" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64" diff --git a/dev-libs/tree-sitter-typescript/Manifest b/dev-libs/tree-sitter-typescript/Manifest index 5f69a46f87f9..c077958053be 100644 --- a/dev-libs/tree-sitter-typescript/Manifest +++ b/dev-libs/tree-sitter-typescript/Manifest @@ -1,4 +1,3 @@ -DIST tree-sitter-typescript-0.20.1.tar.gz 767713 BLAKE2B 25921ef20ec82bacf9858fd2bdca5d79f19ee132a48ad523ce4ea9d5141c2d314ec76d81a7d1751a6fab3651c3b3a2e0e2a469fc5168a5961310ee412e22ad4f SHA512 4d57308e84964bbf136868285141c4cd28ae0bbddef7973849679f8b8b85f00cd1bb5a4db7fd7b5cbd6a090b56193c8120bfd134358d33597a60a9145c694de0 -DIST tree-sitter-typescript-0.20.2.tar.gz 826705 BLAKE2B f51e56932676bb16d6439a0513f38cd5970afff47045d3e43ad804c1557c6f93c267934d1cd7804caded6d14b85fb88e6f7c21ea99bc23e99912e6f434d96510 SHA512 0ed78e515ffa3756800e1c3864540b761d734c34efeab4c5ab46ea96ae026bc09f7c6ef51eaa7275cc06ebdccc870961580da1930717d038265c0293fcf1784e DIST tree-sitter-typescript-0.20.3.tar.gz 843881 BLAKE2B a8b01a6fef435ac089ff716be400e6f55b89256a0b170cef3d6103eeca301f076d909180db61534dcf58bcf703d607871193f0a517d34398d81131c6dcb0e977 SHA512 6dacfe3d329acfbc80dd798bc900798cf3bad06441ece0964adb51117876b8c54be7d88303deb3abf139d7241b60d45c458a66f6079a149c010a3cd55581065b DIST tree-sitter-typescript-0.20.5.tar.gz 1556573 BLAKE2B ae4d71cc8e4745a3b6899f3f28fb31f0d31b0b1f749a73485b5f0b9e81257bde1b3338650e72e7c0082386cabb3b04bfc6bf8a603305aa8fa44c1e08e3843aab SHA512 5b0f9b5725766069d1535e39f3a4658b5200a2a33c3b4881f4876b741a6c13f9140429b73621949e2bd1e06ab0ee147893fffcd3c5349df337eb923a649b8867 +DIST tree-sitter-typescript-0.20.6.tar.gz 1564217 BLAKE2B bc4d26bd8e4e9ca14ddf4b175cc2a2e7a81dac67e114a6e01f59ff55c5ecd63a0a359e03d78928aa965363e9c4db154a9b1917cf3aafce9fdaca3a58d60bfcc1 SHA512 f30f38aa269302eee5f738422626187111c14c7ba07982d619b200a58a20a08849f8a0e79358cad331d689afd5ab389a88b246bda30031ae354f93433e85b763 diff --git a/dev-libs/tree-sitter-typescript/tree-sitter-typescript-0.20.2.ebuild b/dev-libs/tree-sitter-typescript/tree-sitter-typescript-0.20.6.ebuild index 3826613aff5d..de54a9cddb67 100644 --- a/dev-libs/tree-sitter-typescript/tree-sitter-typescript-0.20.2.ebuild +++ b/dev-libs/tree-sitter-typescript/tree-sitter-typescript-0.20.6.ebuild @@ -12,3 +12,10 @@ S="${WORKDIR}"/${P}/typescript LICENSE="MIT" SLOT="0" KEYWORDS="amd64" + +src_prepare() { + # fix test corpus path + ln -s ../common test || die + + tree-sitter-grammar_src_prepare +} diff --git a/dev-libs/tree-sitter/Manifest b/dev-libs/tree-sitter/Manifest index ca1e2342ab2e..0f5e9cfb1dc8 100644 --- a/dev-libs/tree-sitter/Manifest +++ b/dev-libs/tree-sitter/Manifest @@ -1,3 +1,4 @@ -DIST tree-sitter-0.20.8.tar.gz 2941223 BLAKE2B 158820a88b20cc96252f8bfdd257e910ca4dc79174bb45ee52623c923b8a634714c65be8f9534411865fb03aaf84bf16bf659567a74cd58141ea687fa89601e5 SHA512 30fa3f97e1a24d469a7565dc91db629accdfbe081b43d951e9751059a0c7f763d727e95efce5806cd9b1689650773bee1106f4f91ba001da57df3b0d83dda967 -DIST tree-sitter-0.20.9.tar.gz 3041304 BLAKE2B a6cf6606f75918eeab7dab0d2758cdba0922b5677cd4c8755982c077ee0a734090c8a87f7dd1fd56525b5864f94f5f19c3fd04e43773877e13968855f976d0c0 SHA512 6882c0edf87232d42aa40936c6a2da46e6dbb89d28b3def67e9c5231af19a517fbe22cf0ce9aa25a8ad4252cef6cf4aa94a00f8d0503a8bdd99ce0edd99a392a -DIST tree-sitter-0.22.1.tar.gz 3038644 BLAKE2B f4a2cae41e6ec327c8a77380fcf531b00a4fcd75997872c73371886379f35e31431da1e175e41b3c6bee9fdad46015d29bec93a103ea1ff36a1d365dc9a04d40 SHA512 fa2656ad3a6d52301b497512aecc87b8c50ab6646aaac4730a26249ed0878e4542e2d256e42e0179ebc06147f772a2cf38f9362bb94ea1a8f0ec8c21e06e75e7 +DIST tree-sitter-0.22.2.tar.gz 3040339 BLAKE2B c18a79b4fdf553c50b4dd4c67c92d02fd341c5266c4658eb226d9ea455f23d2d22fe4ed4ca48811da2c8a59c403d8eff53dd9257468df7a9cfa640652c485c95 SHA512 a42d744f6e1db7c7c842804f3435b87ccb5d0df2363a18eee38353f12f18c8cf0c6211bf0225fd5f2c0431ca8531aa4ddd73d87d42b80fa35c3c701cae2d7856 +DIST tree-sitter-0.22.4.tar.gz 3034955 BLAKE2B 797feb6e2171b0e00b10c67c8b6dcda6cc2ec420ef797991a642524982629496e4b7bcae92a2658ba3adffea75332bcda09ecbced01e73e13ba6f4c39d15e9ea SHA512 7f160e88cdffb47f4ee3f884385ec759fcf88883307221ddadd8bf561d1dfb3659b0c7f4b216286066cf912183cc8234788492d62d1f1ad14fcb39bd3287cf36 +DIST tree-sitter-0.22.5.tar.gz 3035094 BLAKE2B f54b16e2421ad68fd34b5bada767010be4224652f5a138f7afcdbc15ebaae98dfe3cc8ac77e5e8e5ab12cef516464d29e38a23fc895fa966d5a03a9569fa5ffc SHA512 cff3902e8f6e0211b6d4fafecf9f0d73a2bf73efed68df0d6e8798aac3e685cbcc882fb698ebc10115e72bcf46b59aabd0b14dd402a08d3b42cfceffea5aab2c +DIST tree-sitter-0.22.6.tar.gz 3036954 BLAKE2B f109a738214882e63a721e8db384fa42a624af78d42ceb9ab7a45135b36cf3bbbd2554f470ca5038404365f5b9dbf9979c4d26309e123a9d9533feb1f0a3f724 SHA512 bf0b87bb9ce16b049824e53933986ac451a7b7f432df39ee9d4546627d740ae689af9e838a53cc50e29d66d6d85d51dab7490d66a429a14bcc9d0b8e2935a63a diff --git a/dev-libs/tree-sitter/files/tree-sitter-0.20.8-no-parser-header.patch b/dev-libs/tree-sitter/files/tree-sitter-0.20.8-no-parser-header.patch deleted file mode 100644 index 1e055a69e00d..000000000000 --- a/dev-libs/tree-sitter/files/tree-sitter-0.20.8-no-parser-header.patch +++ /dev/null @@ -1,23 +0,0 @@ -https://github.com/tree-sitter/tree-sitter-bash/issues/199 -https://github.com/tree-sitter/tree-sitter/pull/2573 -https://github.com/tree-sitter/tree-sitter/pull/2574 - -From 05b18c2cda9b391efffb4986bf46fa56333d801b Mon Sep 17 00:00:00 2001 -From: Andrew Hlynskyi <ahlincq@gmail.com> -Date: Sat, 26 Aug 2023 20:50:23 +0300 -Subject: [PATCH] fix: makefile should install only header - ---- a/Makefile -+++ b/Makefile -@@ -57,7 +57,7 @@ install: all - ln -sf libtree-sitter.$(SOEXTVER) '$(DESTDIR)$(LIBDIR)'/libtree-sitter.$(SOEXTVER_MAJOR) - ln -sf libtree-sitter.$(SOEXTVER) '$(DESTDIR)$(LIBDIR)'/libtree-sitter.$(SOEXT) - install -d '$(DESTDIR)$(INCLUDEDIR)'/tree_sitter -- install -m644 lib/include/tree_sitter/*.h '$(DESTDIR)$(INCLUDEDIR)'/tree_sitter/ -+ install -m644 lib/include/tree_sitter/api.h '$(DESTDIR)$(INCLUDEDIR)'/tree_sitter/ - install -d '$(DESTDIR)$(PCLIBDIR)' - sed -e 's|@LIBDIR@|$(LIBDIR)|;s|@INCLUDEDIR@|$(INCLUDEDIR)|;s|@VERSION@|$(VERSION)|' \ - -e 's|=$(PREFIX)|=$${prefix}|' \ --- -2.42.0 - diff --git a/dev-libs/tree-sitter/files/tree-sitter-0.20.9-no-static.patch b/dev-libs/tree-sitter/files/tree-sitter-0.20.9-no-static.patch deleted file mode 100644 index ab0b7ef76fb6..000000000000 --- a/dev-libs/tree-sitter/files/tree-sitter-0.20.9-no-static.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/Makefile b/Makefile -index 6030852e..ea1c4617 100644 ---- a/Makefile -+++ b/Makefile -@@ -41,7 +41,7 @@ ifneq (,$(filter $(shell uname),FreeBSD NetBSD DragonFly)) - PCLIBDIR := $(PREFIX)/libdata/pkgconfig - endif - --all: libtree-sitter.a libtree-sitter.$(SOEXTVER) -+all: libtree-sitter.$(SOEXTVER) - - libtree-sitter.a: $(OBJ) - $(AR) rcs $@ $^ -@@ -61,7 +61,6 @@ install: all - tree-sitter.pc.in > tree-sitter.pc - - install -d '$(DESTDIR)$(LIBDIR)' -- install -m644 libtree-sitter.a '$(DESTDIR)$(LIBDIR)'/ - install -m755 libtree-sitter.$(SOEXTVER) '$(DESTDIR)$(LIBDIR)'/ - ln -sf libtree-sitter.$(SOEXTVER) '$(DESTDIR)$(LIBDIR)'/libtree-sitter.$(SOEXTVER_MAJOR) - ln -sf libtree-sitter.$(SOEXTVER) '$(DESTDIR)$(LIBDIR)'/libtree-sitter.$(SOEXT) diff --git a/dev-libs/tree-sitter/files/tree-sitter-0.22.1-no-static.patch b/dev-libs/tree-sitter/files/tree-sitter-0.22.2-no-static.patch index c2bcb3cd6fd1..47934bbcd359 100644 --- a/dev-libs/tree-sitter/files/tree-sitter-0.22.1-no-static.patch +++ b/dev-libs/tree-sitter/files/tree-sitter-0.22.2-no-static.patch @@ -11,9 +11,10 @@ $(AR) $(ARFLAGS) $@ $^ @@ -69,7 +69,6 @@ clean: install: all - install -Dm644 lib/include/tree_sitter/api.h '$(DESTDIR)$(INCLUDEDIR)'/tree_sitter/api.h - install -Dm644 tree-sitter.pc '$(DESTDIR)$(PCLIBDIR)'/tree-sitter.pc -- install -Dm644 libtree-sitter.a '$(DESTDIR)$(LIBDIR)'/libtree-sitter.a + install -d '$(DESTDIR)$(INCLUDEDIR)'/tree_sitter '$(DESTDIR)$(PCLIBDIR)' '$(DESTDIR)$(LIBDIR)' + install -m644 lib/include/tree_sitter/api.h '$(DESTDIR)$(INCLUDEDIR)'/tree_sitter/api.h + install -m644 tree-sitter.pc '$(DESTDIR)$(PCLIBDIR)'/tree-sitter.pc +- install -m644 libtree-sitter.a '$(DESTDIR)$(LIBDIR)'/libtree-sitter.a install -m755 libtree-sitter.$(SOEXT) '$(DESTDIR)$(LIBDIR)'/libtree-sitter.$(SOEXTVER) ln -sf libtree-sitter.$(SOEXTVER) '$(DESTDIR)$(LIBDIR)'/libtree-sitter.$(SOEXTVER_MAJOR) ln -sf libtree-sitter.$(SOEXTVER_MAJOR) '$(DESTDIR)$(LIBDIR)'/libtree-sitter.$(SOEXT) diff --git a/dev-libs/tree-sitter/files/tree-sitter-No-static-libs-gentoo.patch b/dev-libs/tree-sitter/files/tree-sitter-No-static-libs-gentoo.patch deleted file mode 100644 index dd898b059612..000000000000 --- a/dev-libs/tree-sitter/files/tree-sitter-No-static-libs-gentoo.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/Makefile b/Makefile -index 764f411a..86aaefd8 100644 ---- a/Makefile -+++ b/Makefile -@@ -41,7 +41,7 @@ ifneq (,$(filter $(shell uname),FreeBSD NetBSD DragonFly)) - PCLIBDIR := $(PREFIX)/libdata/pkgconfig - endif - --all: libtree-sitter.a libtree-sitter.$(SOEXTVER) -+all: libtree-sitter.$(SOEXTVER) - - libtree-sitter.a: $(OBJ) - $(AR) rcs $@ $^ -@@ -53,7 +53,6 @@ libtree-sitter.$(SOEXTVER): $(OBJ) - - install: all - install -d '$(DESTDIR)$(LIBDIR)' -- install -m755 libtree-sitter.a '$(DESTDIR)$(LIBDIR)'/libtree-sitter.a - install -m755 libtree-sitter.$(SOEXTVER) '$(DESTDIR)$(LIBDIR)'/libtree-sitter.$(SOEXTVER) - ln -sf libtree-sitter.$(SOEXTVER) '$(DESTDIR)$(LIBDIR)'/libtree-sitter.$(SOEXTVER_MAJOR) - ln -sf libtree-sitter.$(SOEXTVER) '$(DESTDIR)$(LIBDIR)'/libtree-sitter.$(SOEXT) diff --git a/dev-libs/tree-sitter/metadata.xml b/dev-libs/tree-sitter/metadata.xml index 3ea27f3896b1..00a04e33ca4a 100644 --- a/dev-libs/tree-sitter/metadata.xml +++ b/dev-libs/tree-sitter/metadata.xml @@ -17,6 +17,10 @@ <email>matthew@gentoo.org</email> <name>Matthew Smith</name> </maintainer> + <maintainer type="project"> + <email>pkgcore@gentoo.org</email> + <name>Pkgcore</name> + </maintainer> <upstream> <remote-id type="github">tree-sitter/tree-sitter</remote-id> </upstream> diff --git a/dev-libs/tree-sitter/tree-sitter-0.22.1.ebuild b/dev-libs/tree-sitter/tree-sitter-0.22.2.ebuild index 05b74b9f9391..66553bca39a7 100644 --- a/dev-libs/tree-sitter/tree-sitter-0.22.1.ebuild +++ b/dev-libs/tree-sitter/tree-sitter-0.22.2.ebuild @@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then EGIT_REPO_URI="https://github.com/${PN}/${PN}" else SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos" fi LICENSE="MIT" @@ -23,7 +23,7 @@ SLOT="0" RESTRICT="test" # tests are for CLI and not the lib PATCHES=( - "${FILESDIR}/${PN}-0.22.1-no-static.patch" + "${FILESDIR}/${PN}-0.22.2-no-static.patch" ) src_prepare() { diff --git a/dev-libs/tree-sitter/tree-sitter-0.20.8-r1.ebuild b/dev-libs/tree-sitter/tree-sitter-0.22.4-r1.ebuild index d521078d2bfc..d9718e3f31d5 100644 --- a/dev-libs/tree-sitter/tree-sitter-0.20.8-r1.ebuild +++ b/dev-libs/tree-sitter/tree-sitter-0.22.4-r1.ebuild @@ -12,24 +12,19 @@ if [[ ${PV} == *9999* ]]; then EGIT_REPO_URI="https://github.com/${PN}/${PN}" else SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos" fi LICENSE="MIT" -SLOT="0" +# soname is .0, but abi was broken unexpectedly +# Bug #930039 +SLOT="0/1" +RESTRICT="test" # tests are for CLI and not the lib PATCHES=( - "${FILESDIR}/${PN}-No-static-libs-gentoo.patch" - "${FILESDIR}/${PN}-0.20.8-no-parser-header.patch" + "${FILESDIR}/${PN}-0.22.2-no-static.patch" ) -# XXX: Please, don't forget to check this on next version bump. -# And, maybe remove as non-needed, if version in Makefile will -# match the release. -# ref: https://github.com/tree-sitter/tree-sitter/issues/2210 -# see Makefile:1 -QA_PKGCONFIG_VERSION="0.20.9" - src_prepare() { default tc-export CC @@ -38,14 +33,15 @@ src_prepare() { src_compile() { emake \ PREFIX="${EPREFIX}/usr" \ - LIBDIR="${EPREFIX}/usr/$(get_libdir)" + LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ + STRIP="" # bug 930020 } src_install() { emake DESTDIR="${D}" \ - PREFIX="${EPREFIX}/usr" \ - LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ - install + PREFIX="${EPREFIX}/usr" \ + LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ + install } pkg_postinst() { diff --git a/dev-libs/tree-sitter/tree-sitter-0.20.9-r1.ebuild b/dev-libs/tree-sitter/tree-sitter-0.22.5.ebuild index 8d5a0cb48ed3..18a010bd57ca 100644 --- a/dev-libs/tree-sitter/tree-sitter-0.20.9-r1.ebuild +++ b/dev-libs/tree-sitter/tree-sitter-0.22.5.ebuild @@ -1,8 +1,6 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# Bump tree-sitter-cli at the same time. - EAPI=8 inherit optfeature toolchain-funcs @@ -14,23 +12,20 @@ if [[ ${PV} == *9999* ]]; then EGIT_REPO_URI="https://github.com/${PN}/${PN}" else SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos" + KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-macos" fi LICENSE="MIT" -SLOT="0" +# ABI is not stable. Revisit after tree-sitter-1.0. +# https://bugs.gentoo.org/930039 +# https://github.com/tree-sitter/tree-sitter/pull/3302 +SLOT="0/${PV}" +RESTRICT="test" # tests are for CLI and not the lib PATCHES=( - "${FILESDIR}/${PN}-0.20.9-no-static.patch" + "${FILESDIR}/${PN}-0.22.2-no-static.patch" ) -# XXX: Please, don't forget to check this on next version bump. -# And, maybe remove as non-needed, if version in Makefile will -# match the release. -# ref: https://github.com/tree-sitter/tree-sitter/issues/2210 -# see Makefile:1 -QA_PKGCONFIG_VERSION="0.20.10" - src_prepare() { default tc-export CC @@ -40,14 +35,14 @@ src_compile() { emake \ PREFIX="${EPREFIX}/usr" \ LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ - STRIP="" + STRIP="" # bug 930020 } src_install() { emake DESTDIR="${D}" \ - PREFIX="${EPREFIX}/usr" \ - LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ - install + PREFIX="${EPREFIX}/usr" \ + LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ + install } pkg_postinst() { diff --git a/dev-libs/tree-sitter/tree-sitter-0.20.8.ebuild b/dev-libs/tree-sitter/tree-sitter-0.22.6.ebuild index f44668ee69e9..178a494dffc9 100644 --- a/dev-libs/tree-sitter/tree-sitter-0.20.8.ebuild +++ b/dev-libs/tree-sitter/tree-sitter-0.22.6.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 @@ -12,21 +12,19 @@ if [[ ${PV} == *9999* ]]; then EGIT_REPO_URI="https://github.com/${PN}/${PN}" else SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos" fi LICENSE="MIT" -SLOT="0" +# ABI is not stable. Revisit after tree-sitter-1.0. +# https://bugs.gentoo.org/930039 +# https://github.com/tree-sitter/tree-sitter/pull/3302 +SLOT="0/${PV}" +RESTRICT="test" # tests are for CLI and not the lib -PATCHES=( "${FILESDIR}/${PN}-No-static-libs-gentoo.patch" ) - -# see Makefile:1 -QA_PKGCONFIG_VERSION="0.20.9" - -# XXX: Please, don't forget to check this on next version bump. -# And, maybe remove as non-needed, if version in Makefile will -# match the release. -# ref: https://github.com/tree-sitter/tree-sitter/issues/2210 +PATCHES=( + "${FILESDIR}/${PN}-0.22.2-no-static.patch" +) src_prepare() { default @@ -36,14 +34,15 @@ src_prepare() { src_compile() { emake \ PREFIX="${EPREFIX}/usr" \ - LIBDIR="${EPREFIX}/usr/$(get_libdir)" + LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ + STRIP="" # bug 930020 } src_install() { emake DESTDIR="${D}" \ - PREFIX="${EPREFIX}/usr" \ - LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ - install + PREFIX="${EPREFIX}/usr" \ + LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ + install } pkg_postinst() { diff --git a/dev-libs/tree-sitter/tree-sitter-9999.ebuild b/dev-libs/tree-sitter/tree-sitter-9999.ebuild index 1725e8da5f49..178a494dffc9 100644 --- a/dev-libs/tree-sitter/tree-sitter-9999.ebuild +++ b/dev-libs/tree-sitter/tree-sitter-9999.ebuild @@ -16,10 +16,14 @@ else fi LICENSE="MIT" -SLOT="0" +# ABI is not stable. Revisit after tree-sitter-1.0. +# https://bugs.gentoo.org/930039 +# https://github.com/tree-sitter/tree-sitter/pull/3302 +SLOT="0/${PV}" +RESTRICT="test" # tests are for CLI and not the lib PATCHES=( - "${FILESDIR}/${PN}-0.20.9-no-static.patch" + "${FILESDIR}/${PN}-0.22.2-no-static.patch" ) src_prepare() { @@ -30,7 +34,8 @@ src_prepare() { src_compile() { emake \ PREFIX="${EPREFIX}/usr" \ - LIBDIR="${EPREFIX}/usr/$(get_libdir)" + LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ + STRIP="" # bug 930020 } src_install() { diff --git a/dev-libs/tvmet/tvmet-1.7.2-r2.ebuild b/dev-libs/tvmet/tvmet-1.7.2-r2.ebuild index 4f79060709e0..f31dbeb77343 100644 --- a/dev-libs/tvmet/tvmet-1.7.2-r2.ebuild +++ b/dev-libs/tvmet/tvmet-1.7.2-r2.ebuild @@ -5,7 +5,7 @@ EAPI=7 DESCRIPTION="Tiny Vector Matrix library using Expression Templates" HOMEPAGE="http://tvmet.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.bz2" SLOT="0" LICENSE="LGPL-2.1" diff --git a/dev-libs/udis86/udis86-1.7.2-r1.ebuild b/dev-libs/udis86/udis86-1.7.2-r1.ebuild index 5ef49a73955d..eae6f0cee99d 100644 --- a/dev-libs/udis86/udis86-1.7.2-r1.ebuild +++ b/dev-libs/udis86/udis86-1.7.2-r1.ebuild @@ -1,16 +1,16 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) PYTHON_REQ_USE="xml(+)" inherit autotools multilib-minimal python-any-r1 DESCRIPTION="Disassembler library for the x86/-64 architecture sets" HOMEPAGE="http://udis86.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" LICENSE="BSD" SLOT="0" diff --git a/dev-libs/uriparser/Manifest b/dev-libs/uriparser/Manifest index 0597d1cbaa0a..61a9f5cc90a2 100644 --- a/dev-libs/uriparser/Manifest +++ b/dev-libs/uriparser/Manifest @@ -1 +1,2 @@ DIST uriparser-0.9.7.tar.bz2 179989 BLAKE2B 50d04df0024f2ad926072a06d92066025c12528853e784f28bf311a64eb37b619634fa14265cadf55e514810804adeefb7dea841178f916ccdbd086a897d375b SHA512 7f69c9806665745c1bafe11f818434e27c2da03af387f009ef46c1427af8c008faa45e6f49bece66e0b96fd17b3924ba0af25476e796972c5e4b651f35f74c13 +DIST uriparser-0.9.8.tar.bz2 180690 BLAKE2B 75c115fc6d89ffb44a7ff4899b9a89394fdc6e49e9d374836e548cf75d7aed314406ec9abcc29410a66038aa670636e44cf97305c1ca8b6f472af444ffed9167 SHA512 41377e27f92345442cafa4e443485808c286430fcb5ce2354a683344e744786a170f443425f304bdb5a152edf96a3412f203eabe4fb3345a369e6d69f3d97e40 diff --git a/dev-libs/uriparser/files/uriparser-0.9.8-docs-compilation.patch b/dev-libs/uriparser/files/uriparser-0.9.8-docs-compilation.patch new file mode 100644 index 000000000000..fbf298e6a7cd --- /dev/null +++ b/dev-libs/uriparser/files/uriparser-0.9.8-docs-compilation.patch @@ -0,0 +1,13 @@ +diff --git a/doc/preprocess.sh b/doc/preprocess.sh +index c77bb6a..6ee75f2 100755 +--- a/doc/preprocess.sh ++++ b/doc/preprocess.sh +@@ -1,4 +1,6 @@ + #! /usr/bin/env bash + # Run GCC preprocessor and delete empty lines +-: ${CPP:=cpp} +-"${CPP}" -DURI_DOXYGEN -DURI_NO_UNICODE -C -I ../include "$1" | sed -e '/^$/d' -e 's/COMMENT_HACK//g' ++: ${CC:=cc} ++PS4='doc/preprocess.sh|# ' ++set -x ++"${CC}" -E -DURI_DOXYGEN -DURI_NO_UNICODE -C -I ../include "$1" | sed -e '/^$/d' -e 's/COMMENT_HACK//g' diff --git a/dev-libs/uriparser/uriparser-0.9.8-r1.ebuild b/dev-libs/uriparser/uriparser-0.9.8-r1.ebuild new file mode 100644 index 000000000000..984256a19ba3 --- /dev/null +++ b/dev-libs/uriparser/uriparser-0.9.8-r1.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Strictly RFC 3986 compliant URI parsing library in C" +HOMEPAGE="https://uriparser.github.io/" +SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="+doc qt5 test unicode" # +doc to address warning RequiredUseDefaults + +REQUIRED_USE="qt5? ( doc ) test? ( unicode )" +RESTRICT="!test? ( test )" + +DEPEND=" + test? ( >=dev-cpp/gtest-1.8.1 ) +" +BDEPEND=" + virtual/pkgconfig + doc? ( + >=app-text/doxygen-1.5.8 + media-gfx/graphviz + qt5? ( dev-qt/qthelp:5 ) + ) +" + +PATCHES=( + "${FILESDIR}"/${P}-docs-compilation.patch +) + +DOCS=( AUTHORS ChangeLog THANKS ) + +src_configure() { + local mycmakeargs=( + -DURIPARSER_BUILD_CHAR=ON + -DURIPARSER_BUILD_DOCS=$(usex doc ON OFF) + -DURIPARSER_BUILD_TESTS=$(usex test ON OFF) + -DURIPARSER_BUILD_TOOLS=ON + -DURIPARSER_BUILD_WCHAR_T=$(usex unicode ON OFF) + + # The usex wrapper is here to address this warning: + # One or more CMake variables were not used by the project: + # CMAKE_DISABLE_FIND_PACKAGE_Qt5Help + $(usex doc "$(cmake_use_find_package qt5 Qt5Help)") + ) + cmake_src_configure +} + +src_install() { + cmake_src_install + + if use doc && use qt5; then + dodoc "${BUILD_DIR}"/doc/*.qch + docompress -x /usr/share/doc/${PF}/${P}.qch + fi +} diff --git a/dev-libs/uriparser/uriparser-0.9.8.ebuild b/dev-libs/uriparser/uriparser-0.9.8.ebuild new file mode 100644 index 000000000000..70cd7772c491 --- /dev/null +++ b/dev-libs/uriparser/uriparser-0.9.8.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Strictly RFC 3986 compliant URI parsing library in C" +HOMEPAGE="https://uriparser.github.io/" +SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm arm64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="+doc qt5 test unicode" # +doc to address warning RequiredUseDefaults + +REQUIRED_USE="qt5? ( doc ) test? ( unicode )" +RESTRICT="!test? ( test )" + +DEPEND=" + test? ( >=dev-cpp/gtest-1.8.1 ) +" +BDEPEND=" + virtual/pkgconfig + doc? ( + >=app-text/doxygen-1.5.8 + media-gfx/graphviz + qt5? ( dev-qt/qthelp:5 ) + ) +" + +DOCS=( AUTHORS ChangeLog THANKS ) + +src_configure() { + local mycmakeargs=( + -DURIPARSER_BUILD_CHAR=ON + -DURIPARSER_BUILD_DOCS=$(usex doc ON OFF) + -DURIPARSER_BUILD_TESTS=$(usex test ON OFF) + -DURIPARSER_BUILD_TOOLS=ON + -DURIPARSER_BUILD_WCHAR_T=$(usex unicode ON OFF) + + # The usex wrapper is here to address this warning: + # One or more CMake variables were not used by the project: + # CMAKE_DISABLE_FIND_PACKAGE_Qt5Help + $(usex doc "$(cmake_use_find_package qt5 Qt5Help)") + ) + cmake_src_configure +} + +src_install() { + cmake_src_install + + if use doc && use qt5; then + dodoc "${BUILD_DIR}"/doc/*.qch + docompress -x /usr/share/doc/${PF}/${P}.qch + fi +} diff --git a/dev-libs/vala-common/Manifest b/dev-libs/vala-common/Manifest index 12eeb8f823de..647b70e51a11 100644 --- a/dev-libs/vala-common/Manifest +++ b/dev-libs/vala-common/Manifest @@ -1,3 +1,2 @@ -DIST vala-0.56.14.tar.xz 4003276 BLAKE2B db6ccca635122ff2089cd61fd8335376eed435f15d9bd7c20837829fe5acc8df49a51194e3bc17d0c24567240cf2519348cc2b0a7b177b971dc037ed39e893de SHA512 f13e7916acaba220bf8a0fb8825bf9a125fadcc13011c4e4f426e5d3a5af650543457294bede66dc5e1c742dd9b55f722a65b880e4737a6b480365c9df4c8c8b -DIST vala-0.56.15.tar.xz 4014128 BLAKE2B bbed2bc84d08c4eab63c628b21b975c5661590b1fe96921fa43760b5bd0ad21aaa55d460997ae0bc9e1fd7268029a1f0f26f6291f0b346b46dea796973aeb49c SHA512 667a84020ce9739e57f4cab1f2e9350ce5266d85dc4943cfa45b3ce44235f275bc709d40d8ebffd89ca8b5f92844c2a9134bd3ca1276fc2c173ec84f842563f1 DIST vala-0.56.16.tar.xz 4013716 BLAKE2B 509809a93c70fd6a153fc188aaa3d85cbcc8d37649711ea32521505eb0bdc3fe824d90c538aaa7a7caa1c4faaea9053693b28ae54bdd6c212539a70300f2c33e SHA512 99f69c3c7a5ed89923b55cf035c6d9a5867577b2ecff92dddf5f21aaad1281786e5fcd775833b0f251417caf857f5fe7efbf134fbded427a7b29fa3acb00203a +DIST vala-0.56.17.tar.xz 4016576 BLAKE2B c4b8d5b7c810893728f82d2cbbf2f0dd70ad17bd4eeb323ab5d31d99f37b5a5508b7d2447f0249f3a925013d7110bb6f145b32c833b990b15f18d9949035293f SHA512 61df98ba6b15d589a1864598a6f69cc3bee9154ba65270fc3a2fb1d0c3a68c32c29b572bcc26d6616d3fa23d53fb41710af3636125507864dd17f47cf27d4723 diff --git a/dev-libs/vala-common/vala-common-0.56.14.ebuild b/dev-libs/vala-common/vala-common-0.56.14.ebuild deleted file mode 100644 index 39e3c39dc4dc..000000000000 --- a/dev-libs/vala-common/vala-common-0.56.14.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -GNOME_ORG_MODULE="vala" - -inherit gnome.org - -DESCRIPTION="Build infrastructure for packages that use Vala" -HOMEPAGE="https://wiki.gnome.org/Projects/Vala https://gitlab.gnome.org/GNOME/vala" - -LICENSE="LGPL-2.1+" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" - -RDEPEND="" -DEPEND="" -BDEPEND="" - -src_configure() { :; } - -src_compile() { :; } - -src_install() { - insinto /usr/share/aclocal - doins vala.m4 vapigen/vapigen.m4 - insinto /usr/share/vala - doins vapigen/Makefile.vapigen -} diff --git a/dev-libs/vala-common/vala-common-0.56.16.ebuild b/dev-libs/vala-common/vala-common-0.56.16.ebuild index e12b06c906ca..39e3c39dc4dc 100644 --- a/dev-libs/vala-common/vala-common-0.56.16.ebuild +++ b/dev-libs/vala-common/vala-common-0.56.16.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala https://gitlab.gnome.org/GNOME/va LICENSE="LGPL-2.1+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" RDEPEND="" DEPEND="" diff --git a/dev-libs/vala-common/vala-common-0.56.15.ebuild b/dev-libs/vala-common/vala-common-0.56.17.ebuild index e12b06c906ca..e12b06c906ca 100644 --- a/dev-libs/vala-common/vala-common-0.56.15.ebuild +++ b/dev-libs/vala-common/vala-common-0.56.17.ebuild diff --git a/dev-libs/wayland-protocols/Manifest b/dev-libs/wayland-protocols/Manifest index cb66a4589b5c..4a0c3b16963c 100644 --- a/dev-libs/wayland-protocols/Manifest +++ b/dev-libs/wayland-protocols/Manifest @@ -1,3 +1,2 @@ -DIST wayland-protocols-1.32.tar.xz 90452 BLAKE2B 80e38270526c9da13c39263a60e7d2c330a1a4b1dfecec03fadda747f1a2e3dff95b30373aa19e133ae999fa15bdcdd64aa9ebbb54acf571f980a3f6088ea9be SHA512 90bbd52daf342b98823ddeed04e349ae242d2eaf925ab8d603cceb36c980c83b5681bb890961e0d49584cb5c2e60a33abf8821770c6ab87956383630bd5b7966 DIST wayland-protocols-1.33.tar.xz 91504 BLAKE2B aee870dd5877b0fce05eac396bd1a8cd0bc5ef1ac014c54f3eb0096ac1ea3425d1e66891db29ba2f020586418500163bfe451c4078a86d1d19d0b1548318cc85 SHA512 4584f6ac86367655f9db5d0c0ed0681efa31e73f984e4b620fbe5317df21790927f4f5317ecbbc194ac31eaf88caebc431bcc52c23d9dc0098c71de3cb4a9fef -DIST wayland-protocols-1.34.tar.xz 94800 BLAKE2B fa1edd872e0dc9f762db33541d6e0f1f4bd98dcdd072b73acbfb14e0f05199399dc46beb1a91676b72d43397cfddce2d89d989273b23ba0d38fb19a76e16a399 SHA512 d180eaaf87281dc7adade19070ee8308a5cb3dc2f60cff077960436ad647d3d207eb63fa0b079b7b315109654ad6e6b5e2588bfe859900e67edf8c67b1c3ad20 +DIST wayland-protocols-1.36.tar.xz 95512 BLAKE2B 6c460106a2069ff9ce0b6c8221f85462e74d726ead69f6918417aac0cd24567251873ea05ec111a90f3385f4128e7e8d76aca42c7b1f89a070943c604b87573c SHA512 5448b9aedc953ce6be0f378da900c195c8743cb6001f615823b5fc9cab3e3ee54271132055743278e10decef7f8e9dcdeef31593a2a12062575fb90eb0084be0 diff --git a/dev-libs/wayland-protocols/wayland-protocols-1.32.ebuild b/dev-libs/wayland-protocols/wayland-protocols-1.32.ebuild deleted file mode 100644 index 04d709642ab9..000000000000 --- a/dev-libs/wayland-protocols/wayland-protocols-1.32.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit meson - -DESCRIPTION="Wayland protocol files" -HOMEPAGE="https://wayland.freedesktop.org/" - -if [[ ${PV} = 9999* ]]; then - EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/${PN}.git/" - inherit git-r3 -else - SRC_URI="https://gitlab.freedesktop.org/wayland/${PN}/-/releases/${PV}/downloads/${P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" -fi - -LICENSE="MIT" -SLOT="0" -IUSE="test" -RESTRICT="!test? ( test )" - -DEPEND=" - test? ( dev-libs/wayland ) -" -RDEPEND="" -BDEPEND=" - dev-util/wayland-scanner - virtual/pkgconfig -" - -src_configure() { - local emesonargs=( - $(meson_use test tests) - ) - meson_src_configure -} diff --git a/dev-libs/wayland-protocols/wayland-protocols-1.33.ebuild b/dev-libs/wayland-protocols/wayland-protocols-1.33.ebuild index 7820286edec2..e0d8761901b5 100644 --- a/dev-libs/wayland-protocols/wayland-protocols-1.33.ebuild +++ b/dev-libs/wayland-protocols/wayland-protocols-1.33.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then inherit git-r3 else SRC_URI="https://gitlab.freedesktop.org/wayland/${PN}/-/releases/${PV}/downloads/${P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" fi LICENSE="MIT" diff --git a/dev-libs/wayland-protocols/wayland-protocols-1.34.ebuild b/dev-libs/wayland-protocols/wayland-protocols-1.36.ebuild index 7310be696158..7310be696158 100644 --- a/dev-libs/wayland-protocols/wayland-protocols-1.34.ebuild +++ b/dev-libs/wayland-protocols/wayland-protocols-1.36.ebuild diff --git a/dev-libs/wayland/Manifest b/dev-libs/wayland/Manifest index e2de0f2c2836..95b73bb0bdfe 100644 --- a/dev-libs/wayland/Manifest +++ b/dev-libs/wayland/Manifest @@ -1 +1,2 @@ DIST wayland-1.22.0.tar.xz 229544 BLAKE2B b0bb366e7f3494813d1574228ae5dd48eccde035120d6dd8709e3a24738681ab9dd9ba6a13924b6a35982d331fa8911fa7346911da9f618be9c9109da0288629 SHA512 fb1974efc8433e97254eb83fe28974198f2b4d8246418eb3d34ce657055461e0c97bc06dd52e5066ae91bbe05bac611dc49a0937ba226ac6388d5a47241efb12 +DIST wayland-1.23.0.tar.xz 237900 BLAKE2B efb80e3c67db7a707a6d2ea66e7a5132173550bc13fdff447925ec3d33bfba8131532f819d5ab0dd80924cb4339b58b7ca83d9e70a436cea8268167476355bd8 SHA512 9c525231a7ea3e68d3178230d476285a960d23e38571ac96d885f86c0588c52ef01460bff6833db5adb9456ce8db7b996613611187aac972736748ba91b8fd81 diff --git a/dev-libs/wayland/wayland-1.23.0.ebuild b/dev-libs/wayland/wayland-1.23.0.ebuild new file mode 100644 index 000000000000..7361890a730d --- /dev/null +++ b/dev-libs/wayland/wayland-1.23.0.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} = *9999* ]]; then + EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/wayland.git" + inherit git-r3 +else + SRC_URI="https://gitlab.freedesktop.org/wayland/${PN}/-/releases/${PV}/downloads/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +fi +inherit meson-multilib + +DESCRIPTION="Wayland protocol libraries" +HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/wayland" + +LICENSE="MIT" +SLOT="0" +IUSE="doc test" +RESTRICT="!test? ( test )" + +BDEPEND=" + ~dev-util/wayland-scanner-${PV} + virtual/pkgconfig + doc? ( + >=app-text/doxygen-1.6[dot] + app-text/xmlto + >=media-gfx/graphviz-2.26.0 + ) +" +DEPEND=" + >=dev-libs/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}] +" +RDEPEND="${DEPEND}" + +multilib_src_configure() { + local emesonargs=( + $(meson_native_use_bool doc documentation) + $(meson_native_true dtd_validation) + -Dlibraries=true + -Dscanner=false + $(meson_use test tests) + ) + meson_src_configure +} + +src_test() { + # We set it on purpose to only a short subdir name, as socket paths are + # created in there, which are 108 byte limited. With this it hopefully + # barely fits to the limit with /var/tmp/portage/${CATEGORY}/${PF}/temp/x + export XDG_RUNTIME_DIR="${T}"/x + mkdir "${XDG_RUNTIME_DIR}" || die + chmod 0700 "${XDG_RUNTIME_DIR}" || die + + multilib-minimal_src_test +} + +src_install() { + meson-multilib_src_install + + if use doc; then + mv "${ED}"/usr/share/doc/"${PN}"/* "${ED}"/usr/share/doc/"${PF}"/ || die + rmdir "${ED}"/usr/share/doc/"${PN}" || die + fi +} diff --git a/dev-libs/weston/Manifest b/dev-libs/weston/Manifest index 9f5974dba152..9507ecc296b7 100644 --- a/dev-libs/weston/Manifest +++ b/dev-libs/weston/Manifest @@ -1,3 +1,2 @@ -DIST weston-11.0.1.tar.xz 1900796 BLAKE2B 33d7d5b3340e7074265885bd54ee039e8b5d448fa9f58f4bf9f823efd2557da9b916d903119565a806ab698382fe185165c8ede8614e983c872dfe15b474b616 SHA512 d451230fc260b45aaaadb5cf0aa360629e45e72e3b3676c6ec040d6c6549dbb57d05683effd962c3b2d61482b47a6c990d12cc736c896b501d982c8c4d34834c -DIST weston-12.0.91.tar.xz 1986200 BLAKE2B 368fe795bd6121390f14995d8c5ddfcd585e620bcb54f0818b9e9131bb442e79048f82bcd90cfff563c7ad9968cdc9e4f1d859fdd318f4e9b08fec371c4a62e4 SHA512 8e1ceae599344c305e1b65294403d434c4a6ca740f76bdcc67a9f83afe9d352d75ab9cf8bb5091b889ddece43941adf9c4666767098c4c27cb732f8c7f8f738a DIST weston-13.0.0.tar.xz 1986520 BLAKE2B df0e73e451e39b329ed327c370f42bcae01eb5b8fad67711f069fa8f24900ac0c9a9e69b9a6445b67c76ab0ce441dcd2a5a1a8aa3ac0d89a647b9661d575a917 SHA512 8c656cdf24ec9429c76c64ebd2d58351991f5990a6d4b5900ac913243ad8e2c9c0fb1a748f018d177fbfd7e0a8836d0434d97acec287a8f977d47335ae30eacc +DIST weston-13.0.1.tar.xz 1986684 BLAKE2B 7910f9b62c2fe92a6915037521024d3682f391727d615b044517e1cc2e157dc78b7571a923b9c6d62c55bf2a532101220d4ffd2ecbb81f984e9676919420576b SHA512 4a0fd0b1aec823219421d701030bc534576be64b71ede70c7d33f131e9e64c0e0dc209e62f75cecb9368df7604c1d5b2321932eccc818b529d246ec2e3114122 diff --git a/dev-libs/weston/files/weston-musl-basename.patch b/dev-libs/weston/files/weston-musl-basename.patch new file mode 100644 index 000000000000..57b91331055f --- /dev/null +++ b/dev-libs/weston/files/weston-musl-basename.patch @@ -0,0 +1,73 @@ +From dbd134ca5a3c639819c6fd503de7e2c72762ada0 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 14 Dec 2023 09:13:54 -0800 +Subject: [PATCH] libweston,tools: Include libgen.h for basename signature +Upstream: https://gitlab.freedesktop.org/wayland/weston/-/commit/dbd134ca5a3c639819c6fd503de7e2c72762ada0 +Upstream-Status: Merged in main branch + +Latest musl has removed the declaration from string.h [1] as it only +implements POSIX version alone and string.h in glibc implements GNU +version of basename. This now results in compile errors on musl. + +This might be a warning with older compilers but it is error with +Clang-17+ as it treats -Wimplicit-function-declaration as error + +Switch the use in backlight_init function to use POSIX version + +[1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7 + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + libweston/backend-drm/libbacklight.c | 8 +++++--- + tools/zunitc/src/zunitc_impl.c | 1 + + 2 files changed, 6 insertions(+), 3 deletions(-) + +diff --git a/libweston/backend-drm/libbacklight.c b/libweston/backend-drm/libbacklight.c +index ca7f2d6806..973d15ff8c 100644 +--- a/libweston/backend-drm/libbacklight.c ++++ b/libweston/backend-drm/libbacklight.c +@@ -41,6 +41,7 @@ + #include <drm.h> + #include <fcntl.h> + #include <malloc.h> ++#include <libgen.h> + #include <string.h> + #include <errno.h> + +@@ -167,7 +168,7 @@ struct backlight *backlight_init(struct udev_device *drm_device, + DIR *backlights = NULL; + struct dirent *entry; + enum backlight_type type = 0; +- char buffer[100]; ++ char buffer[100], basename_buffer[100]; + struct backlight *backlight = NULL; + int ret; + +@@ -186,9 +187,10 @@ struct backlight *backlight_init(struct udev_device *drm_device, + free(path); + if (ret < 0) + return NULL; +- ++ strncpy(basename_buffer, buffer, ret); + buffer[ret] = '\0'; +- pci_name = basename(buffer); ++ basename_buffer[ret] = '\0'; ++ pci_name = basename(basename_buffer); + + if (connector_type <= 0) + return NULL; +diff --git a/tools/zunitc/src/zunitc_impl.c b/tools/zunitc/src/zunitc_impl.c +index 18f030158e..9b460fa03b 100644 +--- a/tools/zunitc/src/zunitc_impl.c ++++ b/tools/zunitc/src/zunitc_impl.c +@@ -27,6 +27,7 @@ + + #include <errno.h> + #include <fcntl.h> ++#include <libgen.h> + #include <stdarg.h> + #include <stdbool.h> + #include <stdio.h> +-- +GitLab + diff --git a/dev-libs/weston/files/weston-neatvnc-0.8.patch b/dev-libs/weston/files/weston-neatvnc-0.8.patch new file mode 100644 index 000000000000..03ffab596c3a --- /dev/null +++ b/dev-libs/weston/files/weston-neatvnc-0.8.patch @@ -0,0 +1,15 @@ +https://bugs.gentoo.org/930424 +https://gitlab.freedesktop.org/wayland/weston/-/issues/890 + +diff -Naur a/libweston/backend-vnc/meson.build b/libweston/backend-vnc/meson.build +--- a/libweston/backend-vnc/meson.build 2023-11-27 18:01:53.000000000 +0000 ++++ b/libweston/backend-vnc/meson.build 2024-04-24 23:55:22.262121014 +0100 +@@ -3,7 +3,7 @@ + endif + + config_h.set('BUILD_VNC_COMPOSITOR', '1') +-dep_neatvnc = dependency('neatvnc', version: ['>= 0.7.0', '< 0.8.0'], required: false, fallback: ['neatvnc', 'neatvnc_dep']) ++dep_neatvnc = dependency('neatvnc', version: ['>= 0.7.0', '< 0.9.0'], required: false, fallback: ['neatvnc', 'neatvnc_dep']) + if not dep_neatvnc.found() + error('VNC backend requires neatvnc which was not found. Or, you can use \'-Dbackend-vnc=false\'.') + endif diff --git a/dev-libs/weston/metadata.xml b/dev-libs/weston/metadata.xml index 2e4783560fc4..a92c370bfe99 100644 --- a/dev-libs/weston/metadata.xml +++ b/dev-libs/weston/metadata.xml @@ -22,7 +22,6 @@ <flag name="remoting">Enable plugin to stream output to remote hosts using <pkg>media-libs/gstreamer</pkg></flag> <flag name="resize-optimization">Increase performance, allocate more RAM. Recommended to disable on Raspberry Pi</flag> <flag name="screen-sharing">Enable screen-sharing through RDP</flag> - <flag name="seatd">Enable support for rootless session via <pkg>sys-auth/seatd</pkg></flag> <flag name="wayland-compositor">Enable Wayland compositor support</flag> <flag name="xwayland">Enable ability support native X11 applications</flag> </use> diff --git a/dev-libs/weston/weston-11.0.1-r1.ebuild b/dev-libs/weston/weston-11.0.1-r1.ebuild deleted file mode 100644 index d0775521a739..000000000000 --- a/dev-libs/weston/weston-11.0.1-r1.ebuild +++ /dev/null @@ -1,141 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -if [[ ${PV} = 9999* ]]; then - EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/weston.git" - GIT_ECLASS="git-r3" - EXPERIMENTAL="true" -fi - -PYTHON_COMPAT=( python3_{9..11} ) -inherit meson python-any-r1 readme.gentoo-r1 xdg-utils ${GIT_ECLASS} - -DESCRIPTION="Wayland reference compositor" -HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/weston" - -if [[ ${PV} = *9999* ]]; then - SRC_URI="${SRC_PATCHES}" -else - SRC_URI="https://gitlab.freedesktop.org/wayland/${PN}/uploads/f5648c818fba5432edc3ea63c4db4813/${P}.tar.xz" - KEYWORDS="amd64 arm arm64 ~ia64 ~loong ppc64 ~riscv x86" -fi - -LICENSE="MIT CC-BY-SA-3.0" -SLOT="0" - -IUSE="+desktop +drm editor examples fullscreen +gles2 headless ivi jpeg kiosk lcms pipewire rdp remoting +resize-optimization screen-sharing +seatd +suid systemd test wayland-compositor webp +X xwayland" -RESTRICT="!test? ( test )" - -REQUIRED_USE=" - drm? ( gles2 ) - pipewire? ( drm ) - remoting? ( drm gles2 ) - screen-sharing? ( rdp ) - test? ( desktop headless lcms xwayland ) - wayland-compositor? ( gles2 ) - || ( drm headless rdp wayland-compositor X ) - || ( seatd systemd ) -" - -RDEPEND=" - >=dev-libs/libinput-0.8.0 - >=dev-libs/wayland-1.20.0 - lcms? ( >=media-libs/lcms-2.9:2 ) - media-libs/libpng:0= - webp? ( media-libs/libwebp:0= ) - jpeg? ( media-libs/libjpeg-turbo:0= ) - >=x11-libs/cairo-1.11.3 - >=x11-libs/libdrm-2.4.108 - >=x11-libs/libxkbcommon-0.5.0 - >=x11-libs/pixman-0.25.2 - x11-misc/xkeyboard-config - drm? ( - >=media-libs/mesa-17.1[gbm(+)] - >=sys-libs/mtdev-1.1.0 - >=virtual/udev-136 - ) - editor? ( x11-libs/pango ) - examples? ( x11-libs/pango ) - gles2? ( - media-libs/mesa[gles2,wayland] - ) - pipewire? ( >=media-video/pipewire-0.3:= ) - rdp? ( >=net-misc/freerdp-2.3.0:0=[server] <net-misc/freerdp-3:0 ) - remoting? ( - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - ) - seatd? ( sys-auth/seatd:= ) - systemd? ( - sys-auth/pambase[systemd] - >=sys-apps/dbus-1.6 - >=sys-apps/systemd-209[pam] - ) - X? ( - >=x11-libs/libxcb-1.9 - x11-libs/libX11 - ) - xwayland? ( - x11-base/xwayland - x11-libs/cairo[X,xcb(+)] - >=x11-libs/libxcb-1.9 - x11-libs/libXcursor - ) -" -DEPEND="${RDEPEND} - >=dev-libs/wayland-protocols-1.24 -" -BDEPEND=" - ${PYTHON_DEPS} - virtual/pkgconfig -" - -src_configure() { - local emesonargs=( - $(meson_use drm backend-drm) - -Dbackend-drm-screencast-vaapi=false - $(meson_use headless backend-headless) - $(meson_use rdp backend-rdp) - $(meson_use screen-sharing screenshare) - $(meson_use wayland-compositor backend-wayland) - $(meson_use X backend-x11) - -Dbackend-default=auto - $(meson_use gles2 renderer-gl) - $(meson_use xwayland) - $(meson_use seatd launcher-libseat) - $(meson_use systemd) - $(meson_use remoting) - $(meson_use pipewire) - $(meson_use desktop shell-desktop) - $(meson_use fullscreen shell-fullscreen) - $(meson_use ivi shell-ivi) - $(meson_use kiosk shell-kiosk) - $(meson_use lcms color-management-lcms) - $(meson_use systemd launcher-logind) - $(meson_use jpeg image-jpeg) - $(meson_use webp image-webp) - -Dtools=debug,info,terminal - $(meson_use examples demo-clients) - -Dsimple-clients=$(usex examples damage,dmabuf-v4l,im,shm,touch$(usex gles2 ,dmabuf-egl,egl "") "") - $(meson_use resize-optimization resize-pool) - -Dtest-junit-xml=false - "${myconf[@]}" - ) - meson_src_configure -} - -src_test() { - xdg_environment_reset - addwrite /dev/dri/ - - # xwayland test can fail if X11 socket already exists. - cd "${BUILD_DIR}" || die - meson test $(meson test --list | grep -Exv "xwayland") || die -} - -src_install() { - meson_src_install - readme.gentoo_create_doc -} diff --git a/dev-libs/weston/weston-11.0.1-r10.ebuild b/dev-libs/weston/weston-11.0.1-r10.ebuild deleted file mode 100644 index 3795b5b5127f..000000000000 --- a/dev-libs/weston/weston-11.0.1-r10.ebuild +++ /dev/null @@ -1,141 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -if [[ ${PV} = 9999* ]]; then - EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/weston.git" - GIT_ECLASS="git-r3" - EXPERIMENTAL="true" -fi - -PYTHON_COMPAT=( python3_{9..11} ) -inherit meson python-any-r1 readme.gentoo-r1 xdg-utils ${GIT_ECLASS} - -DESCRIPTION="Wayland reference compositor" -HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/weston" - -if [[ ${PV} = *9999* ]]; then - SRC_URI="${SRC_PATCHES}" -else - SRC_URI="https://gitlab.freedesktop.org/wayland/${PN}/uploads/f5648c818fba5432edc3ea63c4db4813/${P}.tar.xz" - KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc64 ~riscv ~x86" -fi - -LICENSE="MIT CC-BY-SA-3.0" -SLOT="0" - -IUSE="+desktop +drm editor examples fullscreen +gles2 headless ivi jpeg kiosk lcms pipewire rdp remoting +resize-optimization screen-sharing +seatd +suid systemd test wayland-compositor webp +X xwayland" -RESTRICT="!test? ( test )" - -REQUIRED_USE=" - drm? ( gles2 ) - pipewire? ( drm ) - remoting? ( drm gles2 ) - screen-sharing? ( rdp ) - test? ( desktop headless lcms xwayland ) - wayland-compositor? ( gles2 ) - || ( drm headless rdp wayland-compositor X ) - || ( seatd systemd ) -" - -RDEPEND=" - >=dev-libs/libinput-0.8.0 - >=dev-libs/wayland-1.20.0 - lcms? ( >=media-libs/lcms-2.9:2 ) - media-libs/libpng:0= - webp? ( media-libs/libwebp:0= ) - jpeg? ( media-libs/libjpeg-turbo:0= ) - >=x11-libs/cairo-1.11.3 - >=x11-libs/libdrm-2.4.108 - >=x11-libs/libxkbcommon-0.5.0 - >=x11-libs/pixman-0.25.2 - x11-misc/xkeyboard-config - drm? ( - >=media-libs/mesa-17.1[gbm(+)] - >=sys-libs/mtdev-1.1.0 - >=virtual/udev-136 - ) - editor? ( x11-libs/pango ) - examples? ( x11-libs/pango ) - gles2? ( - media-libs/mesa[gles2,wayland] - ) - pipewire? ( >=media-video/pipewire-0.3:= ) - rdp? ( >=net-misc/freerdp-2.3.0:2=[server] ) - remoting? ( - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - ) - seatd? ( sys-auth/seatd:= ) - systemd? ( - sys-auth/pambase[systemd] - >=sys-apps/dbus-1.6 - >=sys-apps/systemd-209[pam] - ) - X? ( - >=x11-libs/libxcb-1.9 - x11-libs/libX11 - ) - xwayland? ( - x11-base/xwayland - x11-libs/cairo[X,xcb(+)] - >=x11-libs/libxcb-1.9 - x11-libs/libXcursor - ) -" -DEPEND="${RDEPEND} - >=dev-libs/wayland-protocols-1.24 -" -BDEPEND=" - ${PYTHON_DEPS} - virtual/pkgconfig -" - -src_configure() { - local emesonargs=( - $(meson_use drm backend-drm) - -Dbackend-drm-screencast-vaapi=false - $(meson_use headless backend-headless) - $(meson_use rdp backend-rdp) - $(meson_use screen-sharing screenshare) - $(meson_use wayland-compositor backend-wayland) - $(meson_use X backend-x11) - -Dbackend-default=auto - $(meson_use gles2 renderer-gl) - $(meson_use xwayland) - $(meson_use seatd launcher-libseat) - $(meson_use systemd) - $(meson_use remoting) - $(meson_use pipewire) - $(meson_use desktop shell-desktop) - $(meson_use fullscreen shell-fullscreen) - $(meson_use ivi shell-ivi) - $(meson_use kiosk shell-kiosk) - $(meson_use lcms color-management-lcms) - $(meson_use systemd launcher-logind) - $(meson_use jpeg image-jpeg) - $(meson_use webp image-webp) - -Dtools=debug,info,terminal - $(meson_use examples demo-clients) - -Dsimple-clients=$(usex examples damage,dmabuf-v4l,im,shm,touch$(usex gles2 ,dmabuf-egl,egl "") "") - $(meson_use resize-optimization resize-pool) - -Dtest-junit-xml=false - "${myconf[@]}" - ) - meson_src_configure -} - -src_test() { - xdg_environment_reset - addwrite /dev/dri/ - - # xwayland test can fail if X11 socket already exists. - cd "${BUILD_DIR}" || die - meson test $(meson test --list | grep -Exv "xwayland") || die -} - -src_install() { - meson_src_install - readme.gentoo_create_doc -} diff --git a/dev-libs/weston/weston-12.0.91-r1.ebuild b/dev-libs/weston/weston-13.0.0-r2.ebuild index 9b26690ae48b..1094abbbb6f3 100644 --- a/dev-libs/weston/weston-12.0.91-r1.ebuild +++ b/dev-libs/weston/weston-13.0.0-r2.ebuild @@ -9,7 +9,7 @@ if [[ ${PV} = 9999* ]]; then EXPERIMENTAL="true" fi -PYTHON_COMPAT=( python3_{9..12} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit meson python-any-r1 readme.gentoo-r1 xdg-utils ${GIT_ECLASS} DESCRIPTION="Wayland reference compositor" @@ -19,7 +19,7 @@ if [[ ${PV} = *9999* ]]; then SRC_URI="${SRC_PATCHES}" else SRC_URI="https://gitlab.freedesktop.org/wayland/${PN}/-/releases/${PV}/downloads/${P}.tar.xz" - KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~riscv ~x86" + KEYWORDS="amd64 arm arm64 ~ia64 ~loong ppc64 ~riscv x86" fi LICENSE="MIT CC-BY-SA-3.0" @@ -55,7 +55,7 @@ RDEPEND=" ) editor? ( x11-libs/pango ) examples? ( x11-libs/pango ) - gles2? ( media-libs/mesa[gles2,wayland] ) + gles2? ( media-libs/mesa[gles2(+),wayland] ) jpeg? ( media-libs/libjpeg-turbo:0= ) lcms? ( >=media-libs/lcms-2.9:2 ) pipewire? ( >=media-video/pipewire-0.3:= ) @@ -67,7 +67,7 @@ RDEPEND=" systemd? ( sys-apps/systemd ) vnc? ( =dev-libs/aml-0.3* - =gui-libs/neatvnc-0.7* + =gui-libs/neatvnc-0.8* sys-libs/pam ) webp? ( media-libs/libwebp:0= ) @@ -93,6 +93,10 @@ BDEPEND=" $(python_gen_any_dep 'dev-python/setuptools[${PYTHON_USEDEP}]') " +PATCHES=( + "${FILESDIR}"/${PN}-neatvnc-0.8.patch +) + python_check_deps() { python_has_version "dev-python/setuptools[${PYTHON_USEDEP}]" } diff --git a/dev-libs/weston/weston-13.0.0-r1.ebuild b/dev-libs/weston/weston-13.0.1.ebuild index 9b26690ae48b..801ef005cb3b 100644 --- a/dev-libs/weston/weston-13.0.0-r1.ebuild +++ b/dev-libs/weston/weston-13.0.1.ebuild @@ -9,7 +9,7 @@ if [[ ${PV} = 9999* ]]; then EXPERIMENTAL="true" fi -PYTHON_COMPAT=( python3_{9..12} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit meson python-any-r1 readme.gentoo-r1 xdg-utils ${GIT_ECLASS} DESCRIPTION="Wayland reference compositor" @@ -55,7 +55,7 @@ RDEPEND=" ) editor? ( x11-libs/pango ) examples? ( x11-libs/pango ) - gles2? ( media-libs/mesa[gles2,wayland] ) + gles2? ( media-libs/mesa[gles2(+),wayland] ) jpeg? ( media-libs/libjpeg-turbo:0= ) lcms? ( >=media-libs/lcms-2.9:2 ) pipewire? ( >=media-video/pipewire-0.3:= ) @@ -67,7 +67,7 @@ RDEPEND=" systemd? ( sys-apps/systemd ) vnc? ( =dev-libs/aml-0.3* - =gui-libs/neatvnc-0.7* + =gui-libs/neatvnc-0.8* sys-libs/pam ) webp? ( media-libs/libwebp:0= ) @@ -93,6 +93,11 @@ BDEPEND=" $(python_gen_any_dep 'dev-python/setuptools[${PYTHON_USEDEP}]') " +PATCHES=( + "${FILESDIR}"/${PN}-neatvnc-0.8.patch + "${FILESDIR}"/${PN}-musl-basename.patch +) + python_check_deps() { python_has_version "dev-python/setuptools[${PYTHON_USEDEP}]" } diff --git a/dev-libs/weston/weston-9999.ebuild b/dev-libs/weston/weston-9999.ebuild index 9b26690ae48b..40b3bd77eef2 100644 --- a/dev-libs/weston/weston-9999.ebuild +++ b/dev-libs/weston/weston-9999.ebuild @@ -9,7 +9,7 @@ if [[ ${PV} = 9999* ]]; then EXPERIMENTAL="true" fi -PYTHON_COMPAT=( python3_{9..12} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit meson python-any-r1 readme.gentoo-r1 xdg-utils ${GIT_ECLASS} DESCRIPTION="Wayland reference compositor" @@ -55,7 +55,7 @@ RDEPEND=" ) editor? ( x11-libs/pango ) examples? ( x11-libs/pango ) - gles2? ( media-libs/mesa[gles2,wayland] ) + gles2? ( media-libs/mesa[gles2(+),wayland] ) jpeg? ( media-libs/libjpeg-turbo:0= ) lcms? ( >=media-libs/lcms-2.9:2 ) pipewire? ( >=media-video/pipewire-0.3:= ) @@ -67,7 +67,7 @@ RDEPEND=" systemd? ( sys-apps/systemd ) vnc? ( =dev-libs/aml-0.3* - =gui-libs/neatvnc-0.7* + =gui-libs/neatvnc-0.8* sys-libs/pam ) webp? ( media-libs/libwebp:0= ) @@ -93,6 +93,10 @@ BDEPEND=" $(python_gen_any_dep 'dev-python/setuptools[${PYTHON_USEDEP}]') " +PATCHES=( + "${FILESDIR}"/${PN}-neatvnc-0.8.patch +) + python_check_deps() { python_has_version "dev-python/setuptools[${PYTHON_USEDEP}]" } diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.25.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.25.ebuild index a929cc8d30bd..8198da77f4c5 100644 --- a/dev-libs/xapian-bindings/xapian-bindings-1.4.25.ebuild +++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.25.ebuild @@ -27,7 +27,7 @@ S="${WORKDIR}/${P}" # need this here, some inherited eclasses change it LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" IUSE="java lua mono perl php python ruby tcl" REQUIRED_USE=" || ( java lua mono perl php python ruby tcl ) diff --git a/dev-libs/xapian/xapian-1.4.25.ebuild b/dev-libs/xapian/xapian-1.4.25.ebuild index 25f4dd84a037..d991a51da8e2 100644 --- a/dev-libs/xapian/xapian-1.4.25.ebuild +++ b/dev-libs/xapian/xapian-1.4.25.ebuild @@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="GPL-2" SLOT="0/30" # ABI version of libxapian.so -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris" +KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris" IUSE="cpu_flags_x86_sse cpu_flags_x86_sse2 debug static-libs" DEPEND=" diff --git a/dev-libs/xerces-c/Manifest b/dev-libs/xerces-c/Manifest index 7825dbd820ee..44078a794034 100644 --- a/dev-libs/xerces-c/Manifest +++ b/dev-libs/xerces-c/Manifest @@ -1 +1,2 @@ DIST xerces-c-3.2.4.tar.xz 4260560 BLAKE2B 5d9fed1e9a461f8b348f3259216c5181bd03d2b5d8790cad88621d601065d0d79f8766ae70ed0aa7afe05005e2bcaf37a88da25b17f0e028bf074a31cea5fe71 SHA512 4d58d25b59b4528ad1f2d60681ddd6d2a4dba945613cee9ce978605f006da03703ea85a1bd89f781eeb3ad4dbdadf485a310f29d4c07036b0322f0755f87fddf +DIST xerces-c-3.2.5.tar.xz 4274820 BLAKE2B e0926660bf29e35c05843aae683a7a4f2fe5a6f5f68c76ce16fde975a24277c0e50465a02bfa785f96f4ebec3c7d411785793914491f112ce19477b5dd59e351 SHA512 77b80148b0a3dbb61af648e2571855d59040512dd0c739a892e8ac6a6d7ddbb43b49850c87c39fcf374f2c7658a9c795b3e3fcd4785efbc6226f831b938d5300 diff --git a/dev-libs/xerces-c/files/xerces-c-3.2.5-cxx17.patch b/dev-libs/xerces-c/files/xerces-c-3.2.5-cxx17.patch new file mode 100644 index 000000000000..ed47510e08ad --- /dev/null +++ b/dev-libs/xerces-c/files/xerces-c-3.2.5-cxx17.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -23,7 +23,7 @@ + + # Try C++14, then fall back to C++11 and C++98. Used for feature tests + # for optional features. +-set(CMAKE_CXX_STANDARD 14) ++set(CMAKE_CXX_STANDARD 17) + + # Use folders (for IDE project grouping) + set_property(GLOBAL PROPERTY USE_FOLDERS ON) diff --git a/dev-libs/xerces-c/xerces-c-3.2.5.ebuild b/dev-libs/xerces-c/xerces-c-3.2.5.ebuild new file mode 100644 index 000000000000..e134d155af4b --- /dev/null +++ b/dev-libs/xerces-c/xerces-c-3.2.5.ebuild @@ -0,0 +1,123 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake flag-o-matic prefix + +DESCRIPTION="Validating XML parser written in a portable subset of C++" +HOMEPAGE="https://xerces.apache.org/xerces-c/" + +if [[ ${PV} == *9999 ]] ; then + ESVN_REPO_URI="https://svn.apache.org/repos/asf/xerces/c/trunk" + inherit subversion +else + SRC_URI="mirror://apache/xerces/c/3/sources/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" +fi + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="cpu_flags_x86_sse2 curl doc examples iconv icu static-libs test threads" + +RESTRICT="!test? ( test )" + +RDEPEND=" + curl? ( net-misc/curl ) + icu? ( dev-libs/icu:0= ) + virtual/libiconv" +DEPEND="${RDEPEND}" +BDEPEND=" + doc? ( app-text/doxygen ) + test? ( dev-lang/perl )" + +DOCS=( CREDITS KEYS NOTICE README ) + +PATCHES=( + "${FILESDIR}"/${PN}-3.2.4-strict-aliasing.patch + "${FILESDIR}"/${P}-cxx17.patch # bug 931105 +) + +pkg_setup() { + export ICUROOT="${EPREFIX}/usr" + + if use iconv && use icu; then + ewarn "This package can use iconv or icu for loading messages" + ewarn "and transcoding, but not both. ICU takes precedence." + fi +} + +src_configure() { + # bug #856100 + filter-lto + append-flags -fno-strict-aliasing + + # 'cfurl' is only available on OSX and 'socket' isn't supposed to work. + # But the docs aren't clear about it, so we would need some testing... + local netaccessor + if use curl; then + netaccessor="curl" + elif use elibc_Darwin; then + netaccessor="cfurl" + else + netaccessor="socket" + fi + + local msgloader + if use icu; then + msgloader="icu" + elif use iconv; then + msgloader="iconv" + else + msgloader="inmemory" + fi + + local transcoder + if use icu; then + transcoder="icu" + elif use elibc_Darwin; then + transcoder="macosunicodeconverter" + else + transcoder="gnuiconv" + fi + + local mycmakeargs=( + -DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}" + -Dnetwork-accessor="${netaccessor}" + -Dmessage-loader="${msgloader}" + -Dtranscoder="${transcoder}" + -Dthreads:BOOL="$(usex threads)" + -Dsse2:BOOL="$(usex cpu_flags_x86_sse2)" + ) + + cmake_src_configure +} + +src_compile() { + cmake_src_compile + + use doc && cmake_build doc-style createapidocs doc-xml +} + +src_install() { + cmake_src_install + + # package provides .pc files + find "${D}" -name '*.la' -delete || die + + if use examples; then + # clean out object files, executables, Makefiles + # and the like before installing examples + find samples/ \( -type f -executable -o -iname 'runConfigure' -o -iname '*.o' \ + -o -iname '.libs' -o -iname 'Makefile*' \) -exec rm -rf '{}' + || die + docinto examples + dodoc -r samples/. + docompress -x /usr/share/doc/${PF}/examples + fi + + # To make sure an appropriate NLS msg file is around when using + # the iconv msgloader ICU has the messages compiled in. + if use iconv && ! use icu; then + doenvd "$(prefixify_ro "${FILESDIR}/50xerces-c")" + fi +} diff --git a/dev-libs/xerces-c/xerces-c-9999.ebuild b/dev-libs/xerces-c/xerces-c-9999.ebuild index 4e7bce5e9e18..2ff3cf44a5bc 100644 --- a/dev-libs/xerces-c/xerces-c-9999.ebuild +++ b/dev-libs/xerces-c/xerces-c-9999.ebuild @@ -34,7 +34,6 @@ BDEPEND=" DOCS=( CREDITS KEYS NOTICE README ) PATCHES=( - "${FILESDIR}"/${PN}-3.2.2-fix-XERCESC-2163.patch "${FILESDIR}"/${PN}-3.2.4-strict-aliasing.patch ) diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.54.05-r2.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.54.05-r2.ebuild index 140979cfaa37..2fc77c21f14f 100644 --- a/dev-libs/xmlrpc-c/xmlrpc-c-1.54.05-r2.ebuild +++ b/dev-libs/xmlrpc-c/xmlrpc-c-1.54.05-r2.ebuild @@ -12,7 +12,7 @@ inherit toolchain-funcs DESCRIPTION="A lightweight RPC library based on XML and HTTP" HOMEPAGE="http://xmlrpc-c.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tgz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tgz" LICENSE="BSD" SLOT="0/4.54" diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.54.06.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.54.06.ebuild index bdc54dc3b1e1..8969179a335b 100644 --- a/dev-libs/xmlrpc-c/xmlrpc-c-1.54.06.ebuild +++ b/dev-libs/xmlrpc-c/xmlrpc-c-1.54.06.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 @@ -12,7 +12,7 @@ inherit toolchain-funcs DESCRIPTION="A lightweight RPC library based on XML and HTTP" HOMEPAGE="http://xmlrpc-c.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tgz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tgz" LICENSE="BSD" SLOT="0/4.54" diff --git a/dev-libs/xmlsec/Manifest b/dev-libs/xmlsec/Manifest index a6d977704744..1a4adea18094 100644 --- a/dev-libs/xmlsec/Manifest +++ b/dev-libs/xmlsec/Manifest @@ -1,5 +1,6 @@ DIST xmlsec1-1.2.37.tar.gz 2009175 BLAKE2B 19f43ba6bf6eb49428b9c5563baecbab21476f326cceee13785ae16769afa258f100732831c0f3f7d160543bd075cdcfdc5cbf11b7406637ee6c2f0e27c07f30 SHA512 99220cb28a346ffac0023f9f177d6a7be3ddcea04bea434b7dc926c1f0aaa5564d75f74f92896ac100179c04d77e001f688ddf46fed4e0a0b4f20b7b87c24900 DIST xmlsec1-1.2.38.tar.gz 2036578 BLAKE2B 03f7e1b5e659793bf1984c5a59582d9459089ce913620d5cc1e5a5d0eb65557580cd23fa190db277298fd7cc55bd41563b93cf61a37c8b7521a4690cd2ca3489 SHA512 724089777caae95db27e67f24381c066eaae23a9d64819a18bb04837c1ab1b380d19be2c7ee25659ca481d9eab96fcbe8027a430a0ac1630ad3b073cddd20fac +DIST xmlsec1-1.2.39.tar.gz 2036905 BLAKE2B c1844f2068f6afe8dff3bf3fcf45a7180f09cae3418812b49b5c86b5387c795900a9ebd2077691d51d778c081f4282a54fdc11e7a54e6b8d969ef2871c2f5bb8 SHA512 bc8457bca8ada87c12d3be685bf8ad805f102b4ac1265e257ba12137e0430783973f27d22bfcb7559be5e89cb4c01b3556488fa641fc7c9d8f403972fdc8f2f7 DIST xmlsec1-1.3.1.tar.gz 2432943 BLAKE2B 1dafdffd959579add5c579e3fa9c9f9ddc73ce4aadc6fc2139506e6e64ffcd1bbe7298786e414900eb9f33f93b0a47da64e686c499e48d4c80d81b256db6692e SHA512 7f30c15c3edcafe70fa5febaa0ba39f73f8d30525ee102b5961a658dd2842fbc58e63f7595f15b150d71bf735bfa7688c3694a191b0d475776ca26902d90d25f -DIST xmlsec1-1.3.2.tar.gz 2437263 BLAKE2B d11953c6e2a263a6742ef62309c2f29e2ba5761d58bee5f8cc761965d0e16fea148811ac3d8036d271400840a62ff2a7fff947bb5331170d3bcc598c558b2a95 SHA512 328f3d27cc1dadee27e5ee4649f6c5a094203cc27f42f1fe98fd429f7dd5630eaadff0e8bf14616016fc3530482ed8bcee4870289a41a083f6dd9bd603782a92 DIST xmlsec1-1.3.3.tar.gz 2435741 BLAKE2B 1b0e44a8a5185d67b8f97ec72cd8e215fe79a988eb7ade0d2890be662b693d511857b24670ec692f9452bf95ad8c53ff80c250ecbcd167742477a83e0b72fda0 SHA512 1535b6f878259914ab9574892d05c927fbcd548986cf7bcf91e435acb2cb74eb11e58163f797038ee13a11444882814b2b4318cd677053fbe52557a2e4acf68a +DIST xmlsec1-1.3.4.tar.gz 2435656 BLAKE2B b398f970e5b201971419b537125e9a7430c8d7c1c57e193b2592ee3f01ce797993607a210e87ad44e99bc0ef49ac4c350492268a3ac3bedbb81d937d99837468 SHA512 959a97ed7d7cbdc3e5ef037b2cb4f05bda299274c09ed3dfe24f7203d97e3dfc13bf480e15a2d15bcc7893569d341204884de58cc9b462b6c29306b67672e9c7 diff --git a/dev-libs/xmlsec/files/xmlsec-1.3.2-libxml2-2.12.0-includes.patch b/dev-libs/xmlsec/files/xmlsec-1.3.2-libxml2-2.12.0-includes.patch deleted file mode 100644 index e4b7ec4d7f68..000000000000 --- a/dev-libs/xmlsec/files/xmlsec-1.3.2-libxml2-2.12.0-includes.patch +++ /dev/null @@ -1,114 +0,0 @@ -https://github.com/lsh123/xmlsec/commit/ffb327376f5bb69e8dfe7f805529e45a40118c2b - -From ffb327376f5bb69e8dfe7f805529e45a40118c2b Mon Sep 17 00:00:00 2001 -From: lsh123 <aleksey@aleksey.com> -Date: Mon, 20 Nov 2023 11:50:43 -0500 -Subject: [PATCH] Fix libxml2 v2.12.0 includes (#729) - ---- a/apps/crypto.c -+++ b/apps/crypto.c -@@ -12,6 +12,7 @@ - #endif - - #include <string.h> -+#include <stdlib.h> - - #include <xmlsec/xmlsec.h> - #include <xmlsec/keys.h> ---- a/apps/xmlsec.c -+++ b/apps/xmlsec.c -@@ -22,6 +22,7 @@ - #include <libxml/xmlmemory.h> - #include <libxml/parser.h> - #include <libxml/xpath.h> -+#include <libxml/xmlsave.h> - #include <libxml/xpathInternals.h> - - #ifndef XMLSEC_NO_XSLT -@@ -3030,7 +3031,7 @@ xmlSecAppInit(void) { - /* Init libxml */ - xmlInitParser(); - LIBXML_TEST_VERSION -- xmlTreeIndentString = "\t"; -+ xmlThrDefTreeIndentString("\t"); - #ifndef XMLSEC_NO_XSLT - xmlIndentTreeOutput = 1; - #endif /* XMLSEC_NO_XSLT */ ---- a/include/xmlsec/xmlsec.h -+++ b/include/xmlsec/xmlsec.h -@@ -12,6 +12,7 @@ - #define __XMLSEC_H__ - - #include <libxml/tree.h> -+#include <libxml/parser.h> - - #include <xmlsec/version.h> - #include <xmlsec/exports.h> ---- a/src/errors_helpers.h -+++ b/src/errors_helpers.h -@@ -136,7 +136,7 @@ extern "C" { - */ - #define xmlSecXmlError(errorFunction, errorObject) \ - { \ -- xmlErrorPtr error = xmlGetLastError(); \ -+ const xmlError * error = xmlGetLastError(); \ - int code = (error != NULL) ? error->code : 0; \ - const char* message = (error != NULL) ? error->message : NULL; \ - xmlSecError(XMLSEC_ERRORS_HERE, \ -@@ -159,7 +159,7 @@ extern "C" { - */ - #define xmlSecXmlError2(errorFunction, errorObject, msg, param) \ - { \ -- xmlErrorPtr error = xmlGetLastError(); \ -+ const xmlError * error = xmlGetLastError(); \ - int code = (error != NULL) ? error->code : 0; \ - const char* message = (error != NULL) ? error->message : NULL; \ - xmlSecError(XMLSEC_ERRORS_HERE, \ -@@ -181,7 +181,7 @@ extern "C" { - */ - #define xmlSecXmlParserError(errorFunction, ctxt, errorObject) \ - { \ -- xmlErrorPtr error = xmlCtxtGetLastError(ctxt);\ -+ const xmlError * error = xmlCtxtGetLastError(ctxt);\ - int code = (error != NULL) ? error->code : 0; \ - const char* message = (error != NULL) ? error->message : NULL; \ - xmlSecError(XMLSEC_ERRORS_HERE, \ -@@ -205,7 +205,7 @@ extern "C" { - */ - #define xmlSecXmlParserError2(errorFunction, ctxt, errorObject, msg, param) \ - { \ -- xmlErrorPtr error = xmlCtxtGetLastError(ctxt);\ -+ const xmlError * error = xmlCtxtGetLastError(ctxt);\ - int code = (error != NULL) ? error->code : 0; \ - const char* message = (error != NULL) ? error->message : NULL; \ - xmlSecError(XMLSEC_ERRORS_HERE, \ -@@ -227,7 +227,7 @@ extern "C" { - */ - #define xmlSecXsltError(errorFunction, ctxt, errorObject) \ - { \ -- xmlErrorPtr error = xmlGetLastError(); \ -+ const xmlError * error = xmlGetLastError(); \ - int code = (error != NULL) ? error->code : 0; \ - const char* message = (error != NULL) ? error->message : NULL; \ - xmlSecError(XMLSEC_ERRORS_HERE, \ ---- a/src/mscrypto/certkeys.c -+++ b/src/mscrypto/certkeys.c -@@ -18,6 +18,7 @@ - #include "globals.h" - - #include <string.h> -+#include <stdlib.h> - - #ifndef XMLSEC_NO_GOST - #include "csp_oid.h" ---- a/src/mscrypto/signatures.c -+++ b/src/mscrypto/signatures.c -@@ -17,6 +17,7 @@ - #include "globals.h" - - #include <string.h> -+#include <stdlib.h> - - #ifndef XMLSEC_NO_GOST - #include "csp_calg.h" - diff --git a/dev-libs/xmlsec/xmlsec-1.3.2.ebuild b/dev-libs/xmlsec/xmlsec-1.2.39.ebuild index a64cafb9198d..5fcdd6b380de 100644 --- a/dev-libs/xmlsec/xmlsec-1.3.2.ebuild +++ b/dev-libs/xmlsec/xmlsec-1.2.39.ebuild @@ -3,34 +3,34 @@ EAPI=8 -inherit autotools - DESCRIPTION="Command line tool for signing, verifying, encrypting and decrypting XML" HOMEPAGE="https://www.aleksey.com/xmlsec" SRC_URI="https://www.aleksey.com/xmlsec/download/${PN}1-${PV}.tar.gz" S="${WORKDIR}/${PN}1-${PV}" LICENSE="MIT" -# Upstream consider major version bumps to be changes in either X or Y in X.Y.Z -SLOT="0/$(ver_cut 1-2)" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86" -IUSE="doc gcrypt gnutls http nss +openssl static-libs test" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="doc gcrypt gnutls nss +openssl static-libs test" RESTRICT="!test? ( test )" REQUIRED_USE=" - || ( gnutls nss openssl ) + || ( gcrypt gnutls nss openssl ) + gnutls? ( gcrypt ) " RDEPEND=" - >=dev-libs/libxml2-2.7.4 + >=dev-libs/libxml2-2.7.4[ftp(+)] >=dev-libs/libxslt-1.0.20 dev-libs/libltdl gcrypt? ( >=dev-libs/libgcrypt-1.4.0:= ) - gnutls? ( >=net-libs/gnutls-3.6.13:= ) + gnutls? ( >=net-libs/gnutls-2.8.0:= ) nss? ( >=dev-libs/nspr-4.4.1 >=dev-libs/nss-3.9 ) - openssl? ( dev-libs/openssl:= ) + openssl? ( + dev-libs/openssl:= + ) " DEPEND="${RDEPEND}" BDEPEND=" @@ -43,43 +43,21 @@ BDEPEND=" " PATCHES=( - "${FILESDIR}"/${PN}-1.3.0-optimisation.patch - "${FILESDIR}"/${P}-libxml2-2.12.0-includes.patch + "${FILESDIR}"/${PN}-1.2.37-libressl.patch # bug #903001 ) -src_prepare() { - default - - eautoreconf -} - src_configure() { - local myeconfargs=( - $(use_enable doc docs) - $(use_enable static-libs static) - $(use_with gcrypt) - $(use_with gnutls) - $(use_with nss nspr) - $(use_with nss) - $(use_with openssl) - - --disable-werror - --enable-mans - --enable-pkgconfig - - --enable-concatkdf - --enable-pbkdf2 - --enable-ec - --enable-dh - --enable-sha3 - - --enable-files - $(use_enable http) - --disable-ftp - ) - # Bash because of bug #721128 - CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}" + CONFIG_SHELL="${BROOT}"/bin/bash econf \ + $(use_enable doc docs) \ + $(use_enable static-libs static) \ + $(use_with gcrypt) \ + $(use_with gnutls) \ + $(use_with nss nspr) \ + $(use_with nss) \ + $(use_with openssl) \ + --enable-mans \ + --enable-pkgconfig } src_test() { diff --git a/dev-libs/xmlsec/xmlsec-1.3.3.ebuild b/dev-libs/xmlsec/xmlsec-1.3.4.ebuild index f0324bc08612..f0324bc08612 100644 --- a/dev-libs/xmlsec/xmlsec-1.3.3.ebuild +++ b/dev-libs/xmlsec/xmlsec-1.3.4.ebuild diff --git a/dev-libs/yascreen/Manifest b/dev-libs/yascreen/Manifest deleted file mode 100644 index 1c4276397e24..000000000000 --- a/dev-libs/yascreen/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST yascreen-1.86.tar.xz 26104 BLAKE2B 4716c1eb2a41468fbb0ecbcda7c34a031d97f5292632501ce4c9740de071f8c39e1c7d9f0f8f6c5fbdccaef5908e3751b25ebc7e0c6dab3dff63b2a99f12eefa SHA512 dce785c477395b0c78c5054682dd8ccfbe3243ede966300c3e95e25fac6320f820aa1f0a3b2ce37544b3b45adb94eccccaf32187b145cd2bba43367e166b9e7c -DIST yascreen-1.92.tar.xz 27624 BLAKE2B 8450d2f3d7f35b0bfa994869d71343f7c4e7c78ad5e73bbfb5c2a9a7ef1ba67deed469720b3aed8af5f841b65ea8c17456866bb9c98d6750957a74800e245e34 SHA512 f884e6ad9a0cd3410323bd0bf544f006e719a021a6a04063d6f0712d73893579098f7d00c91b8d85dadff8f9136389e0f7b5831a2b52595ef6a7f1dbb30d5244 diff --git a/dev-libs/yascreen/files/yascreen-1.86-fix-install.patch b/dev-libs/yascreen/files/yascreen-1.86-fix-install.patch deleted file mode 100644 index 0e584bb0ece9..000000000000 --- a/dev-libs/yascreen/files/yascreen-1.86-fix-install.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: Boian Bonev <bbonev@ipacct.com> -Date: Tue, 21 Sep 2021 03:36:23 +0300 -Subject: [PATCH] fix problems with install - ---- a/Makefile.main -+++ b/Makefile.main -@@ -108,12 +108,12 @@ yascreen.pc: yascreen.pc.in - - install: libyascreen.a libyascreen.so yascreen.pc yascreen.3 - $(INSTALL) -Ds -m 644 -t $(DESTDIR)$(PREFIX)$(LIBDIR) libyascreen.a -- $(INSTALL) -Ds -m 644 -t $(DESTDIR)$(PREFIX)$(LIBDIR)/pkgconfig/ yascreen.pc -+ $(INSTALL) -D -m 644 -t $(DESTDIR)$(PREFIX)$(LIBDIR)/pkgconfig/ yascreen.pc - ln -fs libyascreen.so.$(SOVERF) $(DESTDIR)$(PREFIX)$(LIBDIR)libyascreen.so.$(SOVERM) - ln -fs libyascreen.so.$(SOVERM) $(DESTDIR)$(PREFIX)$(LIBDIR)libyascreen.so - $(INSTALL) -Ds -m 644 -s -t $(DESTDIR)$(PREFIX)$(LIBDIR) libyascreen.so.$(SOVERF) -- $(INSTALL) -Ds -m 644 -t $(DESTDIR)$(PREFIX)$(INCDIR) yascreen.h -- $(INSTALL) -TDs -m 0644 yascreen.3 $(DESTDIR)$(PREFIX)/share/man/man3/yascreen.3 -+ $(INSTALL) -D -m 644 -t $(DESTDIR)$(PREFIX)$(INCDIR) yascreen.h -+ $(INSTALL) -TD -m 0644 yascreen.3 $(DESTDIR)$(PREFIX)/share/man/man3/yascreen.3 - - clean: - rm -f yastest yastest.shared yastest.o yascreen.o libyascreen.a libyascreen.so libyascreen.so.$(SOVERM) libyascreen.so.$(SOVERF) yascreen.pc diff --git a/dev-libs/yascreen/yascreen-1.86-r1.ebuild b/dev-libs/yascreen/yascreen-1.86-r1.ebuild deleted file mode 100644 index 6ce556efe3ab..000000000000 --- a/dev-libs/yascreen/yascreen-1.86-r1.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit toolchain-funcs - -DESCRIPTION="Yet Another Screen Library - curses replacement" -HOMEPAGE="https://github.com/bbonev/yascreen" -SRC_URI="https://github.com/bbonev/yascreen/releases/download/v${PV}/${P}.tar.xz" - -LICENSE="LGPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -PATCHES=( - "${FILESDIR}/${P}-fix-install.patch" -) - -src_prepare() { - default - sed -e '/INSTALL/s/-Ds/-D/' \ - -e '/INSTALL/s/-s//' \ - -e "s:/usr/local:${EPREFIX}/usr:" \ - -e "s:/lib/:/$(get_libdir)/:" \ - -i Makefile.main || die -} - -src_compile() { - emake CC="$(tc-getCC)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" NO_FLTO=1 -} - -src_install() { - default - find "${D}" -name '*.a' -delete || die -} diff --git a/dev-libs/yascreen/yascreen-1.92.ebuild b/dev-libs/yascreen/yascreen-1.92.ebuild deleted file mode 100644 index 8435b7154827..000000000000 --- a/dev-libs/yascreen/yascreen-1.92.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 2021-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit toolchain-funcs - -DESCRIPTION="Yet Another Screen Library - curses replacement" -HOMEPAGE="https://github.com/bbonev/yascreen" -SRC_URI="https://github.com/bbonev/yascreen/releases/download/v${PV}/${P}.tar.xz" - -LICENSE="LGPL-3+" -SLOT="0/1" -KEYWORDS="~amd64 ~x86" - -src_prepare() { - default - sed -e '/INSTALL/s/-Ds/-D/' \ - -e '/INSTALL.*libyascreen.a/d' -e 's/libyascreen.a//' -i Makefile.main || die - grep -q -F "SOVERM:=1" Makefile.main || die "subslot changed" -} - -src_compile() { - emake CC="$(tc-getCC)" PREFIX="${EPREFIX}/usr" LIBDIR="/$(get_libdir)/" NO_FLTO=1 -} - -src_install() { - emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" LIBDIR="/$(get_libdir)/" install - einstalldocs -} diff --git a/dev-libs/yyjson/Manifest b/dev-libs/yyjson/Manifest index 52ddb0b3a064..66f2cfb50cf3 100644 --- a/dev-libs/yyjson/Manifest +++ b/dev-libs/yyjson/Manifest @@ -1 +1 @@ -DIST yyjson-0.8.0.tar.gz 1529369 BLAKE2B b76acfbc48a3520129c5ecffd61b5eb06a1a0103b09e31cf45ead6ddb9876c30c0d096e104bb73a57c128b42fa9b5dd7af700144d61dd51e2ac14f188e5e5195 SHA512 3872b46930fd0f4d659004a4d08cdb1c506ccc2bf2888f5ee50523929a2b72f9d8e72ee71dc958ebca630f1886858d4350521bffc18c300a27d25436833384a9 +DIST yyjson-0.9.0.tar.gz 1531794 BLAKE2B 070b9921dbe897d345bae4fa653b48ec38a0d7a0b27a7dba476b7c62d18f0d0b79484d7a66e1fb80b0885a6ebf78a9e3a21240407736ae5106cbbc5a9bc5a677 SHA512 4b9ca85096ccfe2f513a5869eb63b175f44c67785940e02414f6a586d7dd7b772fed77a1775d9416a5f1bf17f20e18a31f0dc4e65be263019d9b95bf95366219 diff --git a/dev-libs/yyjson/yyjson-0.8.0.ebuild b/dev-libs/yyjson/yyjson-0.9.0.ebuild index d59a980f33bf..8cf40aaa1dd9 100644 --- a/dev-libs/yyjson/yyjson-0.8.0.ebuild +++ b/dev-libs/yyjson/yyjson-0.9.0.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/ibireme/yyjson https://ibireme.github.io/yyjson/doc SRC_URI="https://github.com/ibireme/yyjson/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT test? ( BSD )" -SLOT="0/${PV}" +SLOT="0/0" KEYWORDS="amd64 ~arm arm64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86" IUSE="doc test" diff --git a/dev-libs/zlog/Manifest b/dev-libs/zlog/Manifest deleted file mode 100644 index b0e5119e6d23..000000000000 --- a/dev-libs/zlog/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST zlog-v1.2.15.tar.gz 124794 BLAKE2B a60ef362269d48672c7f0f4321b6c4f50241c7c1abcc2c3a3a888d7838018edaba103cbb985fda02db719dcb8553bad3f84bfd715f3fdb34ad64557107d24e44 SHA512 88c741b58e7857c573e4da0b3999a23c00d339e45eb4f7d3e07c03dbe8ebf4cae62720208c9759871969bb4959d2f081b6a8955e229d3872f99cde3e650702e4 diff --git a/dev-libs/zlog/files/zlog_no_static_lib.patch b/dev-libs/zlog/files/zlog_no_static_lib.patch deleted file mode 100644 index f2ad8c65a126..000000000000 --- a/dev-libs/zlog/files/zlog_no_static_lib.patch +++ /dev/null @@ -1,59 +0,0 @@ ---- a/src/makefile 2020-06-05 15:29:43.926423440 +0200 -+++ b/src/makefile 2020-06-05 15:30:26.266501492 +0200 -@@ -43,8 +43,6 @@ - DYLIB_MAJOR_NAME=$(LIBNAME).$(DYLIBSUFFIX).$(ZLOG_MAJOR) - DYLIBNAME=$(LIBNAME).$(DYLIBSUFFIX) - DYLIB_MAKE_CMD=$(CC) -shared -Wl,-soname,$(DYLIB_MINOR_NAME) -o $(DYLIBNAME) $(LDFLAGS) --STLIBNAME=$(LIBNAME).$(STLIBSUFFIX) --STLIB_MAKE_CMD=ar rcs $(STLIBNAME) - - # Installation related variables - PREFIX?=/usr/local -@@ -78,7 +76,6 @@ - # not to mention dynamic linker .a preference... - DYLIB_MAKE_CMD=$(CC) -shared -Wl,-G,-b64 -maix64 -pthread -o $(DYLIBNAME) $(LDFLAGS) - REAL_CFLAGS+= -maix64 -- STLIB_MAKE_CMD=OBJECT_MODE=64 ar rcs $(STLIBNAME) $(DYLIB_MAJOR_NAME) - endif - - all: $(DYLIBNAME) $(BINS) -@@ -139,21 +136,17 @@ - cp -f $(DYLIBNAME) $(DYLIB_MAJOR_NAME) - cp -f $(DYLIBNAME) $(DYLIB_MINOR_NAME) - --$(STLIBNAME): $(OBJ) -- $(STLIB_MAKE_CMD) $(OBJ) -- - dynamic: $(DYLIBNAME) --static: $(STLIBNAME) - - # Binaries: --zlog-chk-conf: zlog-chk-conf.o $(STLIBNAME) $(DYLIBNAME) -+zlog-chk-conf: zlog-chk-conf.o $(DYLIBNAME) - $(CC) -o $@ zlog-chk-conf.o -L. -lzlog $(REAL_LDFLAGS) - - .c.o: - $(CC) -std=c99 -pedantic -c $(REAL_CFLAGS) $< - - clean: -- rm -rf $(DYLIBNAME) $(STLIBNAME) $(BINS) *.o *.gcda *.gcno *.gcov $(DYLIB_MINOR_NAME) $(DYLIB_MAJOR_NAME) -+ rm -rf $(DYLIBNAME) $(BINS) *.o *.gcda *.gcno *.gcov $(DYLIB_MINOR_NAME) $(DYLIB_MAJOR_NAME) - - dep: - $(CC) -MM *.c -@@ -171,14 +164,13 @@ - - INSTALL?= cp -a - --install: $(DYLIBNAME) $(STLIBNAME) -+install: $(DYLIBNAME) - mkdir -p $(INSTALL_INCLUDE_PATH) $(INSTALL_LIBRARY_PATH) $(INSTALL_BINARY_PATH) - $(INSTALL) zlog.h $(INSTALL_INCLUDE_PATH) - $(INSTALL) zlog-chk-conf $(INSTALL_BINARY_PATH) - $(INSTALL) $(DYLIBNAME) $(INSTALL_LIBRARY_PATH)/$(DYLIB_MINOR_NAME) - cd $(INSTALL_LIBRARY_PATH) && ln -sf $(DYLIB_MINOR_NAME) $(DYLIB_MAJOR_NAME) - cd $(INSTALL_LIBRARY_PATH) && ln -sf $(DYLIB_MAJOR_NAME) $(DYLIBNAME) -- $(INSTALL) $(STLIBNAME) $(INSTALL_LIBRARY_PATH) - - 32bit: - @echo "" diff --git a/dev-libs/zlog/metadata.xml b/dev-libs/zlog/metadata.xml deleted file mode 100644 index 986cdb9c5854..000000000000 --- a/dev-libs/zlog/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <remote-id type="github">HardySimpson/zlog</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-libs/zlog/zlog-1.2.15.ebuild b/dev-libs/zlog/zlog-1.2.15.ebuild deleted file mode 100644 index 221a11e0e522..000000000000 --- a/dev-libs/zlog/zlog-1.2.15.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -DESCRIPTION="A reliable, thread safe, clear-model, pure C logging library" -HOMEPAGE="http://hardysimpson.github.io/zlog/" -SRC_URI="https://github.com/HardySimpson/${PN}/archive/${PV}.tar.gz -> ${PN}-v${PV}.tar.gz" - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="test" -RESTRICT="!test? ( test )" -PATCHES="${FILESDIR}/zlog_no_static_lib.patch" - -src_compile() { - emake CC="$(tc-getCC)" -} - -src_test() { - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" test -} - -src_install() { - emake LIBRARY_PATH="$(get_libdir)" PREFIX="${D}/usr" install -} diff --git a/dev-libs/zthread/Manifest b/dev-libs/zthread/Manifest deleted file mode 100644 index af07a5000190..000000000000 --- a/dev-libs/zthread/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST ZThread-2.3.2.tar.gz 412527 BLAKE2B f8b176a35ca2df21460825f4cf9406a0e0fdd0a320eca2ffa323c47f025fa76e087bc30e3f6f2dc061cd79b0346c023f736f5fa2d1b0829eef718197c4e50e67 SHA512 e17e12746d16f32f6f1dc8ec041795f3c05a541c015b9579252599b51de9f97dc780946e6e83b41ca78d1af892455e6f00169a089f6e1a7c3196d6a4f49a7f7b diff --git a/dev-libs/zthread/files/zthread-2.3.2-automake-r2.patch b/dev-libs/zthread/files/zthread-2.3.2-automake-r2.patch deleted file mode 100644 index bcd9e0675979..000000000000 --- a/dev-libs/zthread/files/zthread-2.3.2-automake-r2.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 577b34b74b7a73650d906f371044bfaed6e8b74c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tiziano=20M=C3=BCller?= <tm@dev-zero.ch> -Date: Tue, 19 Feb 2013 10:13:12 +0100 -Subject: [PATCH] Use standard automake rules rather than hand coding the - install rules and append linker flags to LDFLAGS and not LDADD, otherwise - --as-needed gets ignored (and possibly others). - ---- - Makefile.am | 21 +++++---------------- - configure.ac | 1 - - src/Makefile.am | 2 -- - 3 files changed, 5 insertions(+), 19 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 6c092cf..2d7bddf 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -24,24 +24,13 @@ LICENSE \ - MIT.TXT \ - depcomp - -+bin_SCRIPTS = share/zthread-config - --## install the config script --install-exec-hook: -- $(mkinstalldirs) $(bindir) -- $(INSTALL_PROGRAM) $(top_srcdir)/share/zthread-config $(bindir) -+aclocaldir = $(datadir)/aclocal -+aclocal_DATA = share/zthread.m4 share/pthread.m4 - --## install the config script & m4 macros --install-data-hook: -- $(mkinstalldirs) $(datadir)/aclocal -- $(INSTALL_DATA) $(top_srcdir)/share/zthread.m4 $(datadir)/aclocal -- $(INSTALL_DATA) $(top_srcdir)/share/pthread.m4 $(datadir)/aclocal -- mkdir -p $(DESTDIR)$(includedir)/zthread -- cp -pR $(top_srcdir)/include/zthread $(DESTDIR)$(includedir)/ -- --## uninstall the config script & m4 macros --uninstall-local: -- -rm -rf $(datadir)/aclocal/pthread.m4 -- -rm -rf $(datadir)/aclocal/zthread.m4 -+zincludedir = $(includedir)/zthread -+zinclude_HEADERS = include/zthread/*.h - - distclean-local: - -rm -rf $(top_srcdir)/$(PACKAGE)-$(VERSION).tar.gz -diff --git a/configure.ac b/configure.ac -index 866041b..5d32a58 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -226,7 +226,6 @@ AC_TRY_LINK( [#include <windows.h>], [_beginthreadex((void*)0, 0, 0, (void*)0, 0 - - dnl Configure the final compiler & linker options - COMPILER_OPTIONS="$COMPILER_OPTIONS $CXXFLAGS" --LINKER_OPTIONS="$LINKER_OPTIONS $LDFLAGS" - - dnl Configured flags for compiling ZThreads - AC_SUBST(LINKER_OPTIONS) -diff --git a/src/Makefile.am b/src/Makefile.am -index 04404d6..35dc764 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -21,8 +21,6 @@ AM_CXXFLAGS = @COMPILER_OPTIONS@ @EXTRA_COMPILER_OPTIONS@ - INCLUDES = -I$(top_srcdir)/include - SUBDIRS=. - --libdir=$(prefix)/lib -- - lib_LTLIBRARIES = libZThread.la - - libZThread_la_LIBADD=@LINKER_OPTIONS@ @EXTRA_LINKER_OPTIONS@ --- -1.8.1.1 - diff --git a/dev-libs/zthread/files/zthread-2.3.2-clang.patch b/dev-libs/zthread/files/zthread-2.3.2-clang.patch deleted file mode 100644 index 3c0e07b9dc4a..000000000000 --- a/dev-libs/zthread/files/zthread-2.3.2-clang.patch +++ /dev/null @@ -1,15 +0,0 @@ -fix compile when using clang as $CC: - -Based on patch from https://bugs.launchpad.net/hugin/+bug/1213585 (rebased) - ---- a/include/zthread/Guard.h -+++ b/include/zthread/Guard.h -@@ -108,7 +108,7 @@ - } - - template <class LockType> -- static void createScope(LockHolder<LockType>& l, unsigned long ms) { -+ static bool createScope(LockHolder<LockType>& l, unsigned long ms) { - - if(Scope1::createScope(l, ms)) - if(!Scope2::createScope(l, ms)) { diff --git a/dev-libs/zthread/files/zthread-2.3.2-configure-clang16.patch b/dev-libs/zthread/files/zthread-2.3.2-configure-clang16.patch deleted file mode 100644 index 998dc36c2976..000000000000 --- a/dev-libs/zthread/files/zthread-2.3.2-configure-clang16.patch +++ /dev/null @@ -1,22 +0,0 @@ -pthread_yield needs GNU_SOURCE (missing in the test here), but pthread_yield -is both deprecated and also not actually used (even conditionally!) in zthread, -so let's just drop the test. - -(zthread uses sched_yield conditionally, however.) ---- a/share/pthread.m4 -+++ b/share/pthread.m4 -@@ -128,14 +128,6 @@ pthread_explicit="no" - AC_DEFINE(HAVE_SCHED_YIELD,,[Defined if sched_yield() is available]) ], - [ AC_MSG_RESULT(no) ]) - -- dnl Check for pthread_yield -- AC_MSG_CHECKING(for pthread_yield); -- AC_TRY_LINK([#include <pthread.h>], -- [ pthread_yield(); ], -- [ AC_MSG_RESULT(yes) -- AC_DEFINE(HAVE_PTHREAD_YIELD,,[Defined if pthread_yield() is available]) ], -- [ AC_MSG_RESULT(no) ]) -- - dnl Check for pthread_key_create - AC_MSG_CHECKING(for pthread_key_create) - AC_TRY_LINK([#include <pthread.h>], diff --git a/dev-libs/zthread/files/zthread-2.3.2-gcc47.patch b/dev-libs/zthread/files/zthread-2.3.2-gcc47.patch deleted file mode 100644 index 57b122d22c5f..000000000000 --- a/dev-libs/zthread/files/zthread-2.3.2-gcc47.patch +++ /dev/null @@ -1,25 +0,0 @@ -Description: Make sure to use qualified lookups. -http://bugs.debian.org/667430 -https://bugs.gentoo.org/show_bug.cgi?id=414133 - -Author: Cyril Brulebois <kibi@debian.org> ---- a/include/zthread/Guard.h -+++ b/include/zthread/Guard.h -@@ -428,7 +428,7 @@ - template <class U, class V> - Guard(Guard<U, V>& g) : LockHolder<LockType>(g) { - -- LockingPolicy::shareScope(*this, extract(g)); -+ LockingPolicy::shareScope(*this, this->extract(g)); - - } - -@@ -458,7 +458,7 @@ - template <class U, class V> - Guard(Guard<U, V>& g, LockType& lock) : LockHolder<LockType>(lock) { - -- LockingPolicy::transferScope(*this, extract(g)); -+ LockingPolicy::transferScope(*this, this->extract(g)); - - } - diff --git a/dev-libs/zthread/files/zthread-2.3.2-m4-quote.patch b/dev-libs/zthread/files/zthread-2.3.2-m4-quote.patch deleted file mode 100644 index 72163a3b12a3..000000000000 --- a/dev-libs/zthread/files/zthread-2.3.2-m4-quote.patch +++ /dev/null @@ -1,26 +0,0 @@ -fix m4 warnings: -zthread.m4:34: warning: underquoted definition of AM_PATH_ZTHREAD -pthread.m4:39: warning: underquoted definition of AM_DETECT_PTHREAD - ---- a/share/zthread.m4 -+++ b/share/zthread.m4 -@@ -31,7 +31,7 @@ - dnl ZTHREAD_CXXFLAGS - dnl ZTHREAD_LIBS - dnl --AC_DEFUN(AM_PATH_ZTHREAD, -+AC_DEFUN([AM_PATH_ZTHREAD], - [ - - ---- a/share/pthread.m4 -+++ b/share/pthread.m4 -@@ -36,7 +36,7 @@ - GNU Pth can also be used if it was configured with --enable-pthread. - EOF - --AC_DEFUN(AM_DETECT_PTHREAD, -+AC_DEFUN([AM_DETECT_PTHREAD], - [ - - pthread_explicit="no" diff --git a/dev-libs/zthread/files/zthread-2.3.2-no-fpermissive-r1.diff b/dev-libs/zthread/files/zthread-2.3.2-no-fpermissive-r1.diff deleted file mode 100644 index b8f68f59dd2a..000000000000 --- a/dev-libs/zthread/files/zthread-2.3.2-no-fpermissive-r1.diff +++ /dev/null @@ -1,94 +0,0 @@ ---- a/include/zthread/Guard.h -+++ b/include/zthread/Guard.h -@@ -491,7 +491,7 @@ - - try { - -- if(!isDisabled()) -+ if(!LockHolder<LockType>::isDisabled()) - LockingPolicy::destroyScope(*this); - - } catch (...) { /* ignore */ } ---- a/src/MutexImpl.h -+++ b/src/MutexImpl.h -@@ -153,7 +153,7 @@ - - _owner = self; - -- ownerAcquired(self); -+ MutexImpl<List,Behavior>::ownerAcquired(self); - - } - -@@ -164,7 +164,7 @@ - _waiters.insert(self); - m.acquire(); - -- waiterArrived(self); -+ MutexImpl<List, Behavior>::waiterArrived(self); - - { - -@@ -173,7 +173,7 @@ - - } - -- waiterDeparted(self); -+ MutexImpl<List, Behavior>::waiterDeparted(self); - - m.release(); - -@@ -192,7 +192,7 @@ - assert(_owner == 0); - _owner = self; - -- ownerAcquired(self); -+ MutexImpl<List, Behavior>::ownerAcquired(self); - - break; - -@@ -236,7 +236,7 @@ - - _owner = self; - -- ownerAcquired(self); -+ MutexImpl<List, Behavior>::ownerAcquired(self); - - } - -@@ -253,7 +253,7 @@ - - m.acquire(); - -- waiterArrived(self); -+ MutexImpl<List, Behavior>:: waiterArrived(self); - - { - -@@ -262,7 +262,7 @@ - - } - -- waiterDeparted(self); -+ MutexImpl<List, Behavior>::waiterDeparted(self); - - m.release(); - -@@ -284,7 +284,7 @@ - assert(0 == _owner); - _owner = self; - -- ownerAcquired(self); -+ MutexImpl<List, Behavior>::ownerAcquired(self); - - break; - -@@ -326,7 +326,7 @@ - - _owner = 0; - -- ownerReleased(impl); -+ MutexImpl<List, Behavior>::ownerReleased(impl); - - // Try to find a waiter with a backoff & retry scheme - for(;;) { diff --git a/dev-libs/zthread/zthread-2.3.2-r5.ebuild b/dev-libs/zthread/zthread-2.3.2-r5.ebuild deleted file mode 100644 index 08b64a050964..000000000000 --- a/dev-libs/zthread/zthread-2.3.2-r5.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools - -MY_P="ZThread-${PV}" - -DESCRIPTION="platform-independent multi-threading and synchronization library for C++" -HOMEPAGE="http://zthread.sourceforge.net/" -SRC_URI="mirror://sourceforge/zthread/${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm64 ~hppa ~mips ppc ~sparc x86" -IUSE="debug doc" - -BDEPEND="doc? ( app-text/doxygen )" - -PATCHES=( - "${FILESDIR}"/${P}-no-fpermissive-r1.diff - "${FILESDIR}"/${P}-m4-quote.patch - "${FILESDIR}"/${P}-automake-r2.patch - "${FILESDIR}"/${P}-gcc47.patch - "${FILESDIR}"/${P}-clang.patch - "${FILESDIR}"/${P}-configure-clang16.patch -) - -src_prepare() { - default - - rm -f include/zthread/{.Barrier.h.swp,Barrier.h.orig} || die - - # bug #467778 - sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die - - AT_M4DIR="share" eautoreconf -} - -src_configure() { - econf \ - $(use_enable debug) \ - $(use_enable kernel_linux atomic-linux) -} - -src_compile() { - default - - if use doc; then - doxygen doc/zthread.doxygen || die - sed -i -e 's|href="html/|href="|' doc/documentation.html || die - cp doc/documentation.html doc/html/index.html || die - cp doc/{zthread.css,bugs.js} doc/html/ || die - fi -} - -src_install() { - default - - use doc && dodoc -r doc/html - - find "${ED}" -name '*.la' -delete || die -} diff --git a/dev-libs/zziplib/Manifest b/dev-libs/zziplib/Manifest index 818ead106f53..0e48fca0f0ca 100644 --- a/dev-libs/zziplib/Manifest +++ b/dev-libs/zziplib/Manifest @@ -1,3 +1,4 @@ DIST zziplib-0.13.72.tar.gz 1162175 BLAKE2B ff5617645e25040e4666e5440651fbb2b04c0505c7bda08b158f44c63c5dd53ec97a9942908314c3b103a4685be49368e964d249fcf9b9d685e328f0ebabdedd SHA512 4bb089e74813c6fac9657cd96e44e4a6469bf86aba3980d885c4573e8db45e74fd07bbdfcec9f36297c72227c8c0b2c37dab1bc4326cef8529960e482fe501c8 DIST zziplib-0.13.74-testdata.tar.xz 166188 BLAKE2B f3cc98495542fb95e8bd9cfb98ecd22c9e6206fd13c1d0607ee8b7640ddb3d3c4b9cb7bc7ca7a95a787ffef4e5a8c2b4ab1bc0c5890811ab21c681239840dcdb SHA512 d4545f770c4f00658ec69a7f393f38d0c649704adb30b6a25f2c0b48711829416985258d34911d48b9bd394d9334ab89c8deda719f2aae509a75441f8a8d8902 DIST zziplib-0.13.74.tar.gz 1177162 BLAKE2B fc093b731406101086e59ff54b4378190c88821c4349d75e35c9595b45695b5f91a20e99a9689f7ebbc8d8951f2c4e1132d670e3827f5329977de1f85c9ce5d2 SHA512 7dd27247cbc475e2c6beb3a96c620f9938ade0dff6f4e088f9c28432fc4cc01df9d6771ec3d5e07baabe27033f4764d60e31c4c54588559de64e894d0557c94f +DIST zziplib-0.13.76.tar.gz 1185716 BLAKE2B c04743fc47e6a0e102a01d0473d88b9f9cb044a3a021119d16533949d0a1f132fb73f957714a840b0474590bc98f62132e89ce890c5c9097a77d8f007c3f1e5a SHA512 d4b327530fc2681df1705b24d5de697d3c3829e299c28e047849444c7aeaf87e188d96782a2009dc7ae216f82f744a32a94fc7962fb12b3a62b28d7ecf12a7d6 diff --git a/dev-libs/zziplib/zziplib-0.13.76.ebuild b/dev-libs/zziplib/zziplib-0.13.76.ebuild new file mode 100644 index 000000000000..cef1f31dd237 --- /dev/null +++ b/dev-libs/zziplib/zziplib-0.13.76.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +# Needed for docs, bug #835755 +PYTHON_REQ_USE="xml(+)" +inherit cmake flag-o-matic python-any-r1 + +TEST_PV="0.13.74" +DESCRIPTION="Lightweight library for extracting data from files archived in a single zip file" +HOMEPAGE="https://github.com/gdraheim/zziplib https://zziplib.sourceforge.net" +# Test data tarball generated with python ./zziptests.py -D -d /tmp/zziplib -v +SRC_URI=" + https://github.com/gdraheim/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz + test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_PV}-testdata.tar.xz ) +" + +LICENSE="|| ( LGPL-2.1 MPL-1.1 )" +SLOT="0/13" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="sdl test" +RESTRICT="!test? ( test )" + +BDEPEND=" + ${PYTHON_DEPS} + test? ( + app-arch/unzip + app-arch/zip + ) +" +DEPEND=" + sys-libs/zlib + sdl? ( >=media-libs/libsdl-1.2.6 ) +" +RDEPEND="${DEPEND}" + +src_prepare() { + # This test assumes being built with automake (checks for .libs/x). + sed -i -e 's/test_91000_zzshowme_check_sfx/skip_&/' test/zziptests.py || die + cmake_src_prepare +} + +src_configure() { + # https://github.com/gdraheim/zziplib/commit/f3bfc0dd6663b7df272cc0cf17f48838ad724a2f#diff-b7b1e314614cf326c6e2b6eba1540682R100 + append-flags -fno-strict-aliasing + + local mycmakeargs=( + -DZZIPSDL=$(usex sdl) + -DBUILD_TESTS=$(usex test) + -DZZIPTEST=$(usex test) + -DZZIPDOCS=ON + -DZZIPWRAP=OFF + ) + + cmake_src_configure +} + +src_test() { + cd "${S}" || die + "${EPYTHON}" "${S}"/test/zziptests.py \ + --downloads=no \ + --verbose \ + --topsrcdir "${S}" \ + --bindir "$(realpath --relative-to="${S}" "${BUILD_DIR}"/bins)" \ + --downloaddir "${WORKDIR}"/${PN}-${TEST_PV}-testdata \ + --testdatadir "${T}"/testdata.d \ + || die "Tests failed with ${EPYTHON}" +} |