diff options
Diffstat (limited to 'dev-libs')
42 files changed, 1053 insertions, 255 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz Binary files differindex 89ad52738e07..28dfc8d77579 100644 --- a/dev-libs/Manifest.gz +++ b/dev-libs/Manifest.gz diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest index 67a6fd6cacfe..fc0eff557c3c 100644 --- a/dev-libs/boost/Manifest +++ b/dev-libs/boost/Manifest @@ -14,6 +14,8 @@ AUX boost-1.85.0-container-aliasing.patch 15219 BLAKE2B 438e5cbeed4626b22172722a AUX boost-1.85.0-python-numpy-2.patch 986 BLAKE2B 5f4cd317c75f8eb3183f720ac76afeffeb4f1e2617f32a795a94d9db56c7c27cba7a1b2591f2f851223b85ce962293bf54733e0d3f830340d2ef174a869284ed SHA512 46b3831acbd89980abc8312d8ba0a991d9c8531f0f8b63f5218ef8920fcf18b1ff207748abef2f3753baf6ea0932dc0c4ef524daec7fb265f64e35c5335f7a96 DIST boost_1_84_0.tar.bz2 123110547 BLAKE2B a872ee00402be0383726020f4d13a7df6c2765c52eac2e09aab1604432931d26dd597503f5dcbbf788d7e7528d13c6d1dbfff1e85d22bf92c7828ef74cf2405d SHA512 5dfeb35198bb096e46cf9e131ef0334cb95bc0bf09f343f291b860b112598b3c36111bd8c232439c401a2b2fb832fa0c399a8d5b96afc60bd359dff070154497 DIST boost_1_85_0.tar.bz2 124015250 BLAKE2B dd72a9299cd78d2c260e1c94e28ba04daaa352f5bd023d99e43caa3540b1e0f8c09fc04b91f68db0ef8532e4a91fdef0b66a80bf0f9f838303bccaf0729bf581 SHA512 b4489813a4192b57626589457932338cfc47c4ec05c19b3a58b2d8df9e95f022ff2f5f452811ff82d1cec4fb0a490e991c8825bad0fb5a81318d07a8788d8ca0 +DIST boost_1_86_0.tar.bz2 126220652 BLAKE2B de3d262e3dc174813e8e9abc8fb083ae101949dbd3b818b1114457497607085dc998f6f0fdd095a87c38c90700761c825ce239b082144389507c0fec77d527dd SHA512 9f8144e07a44cc5b5be6c6da17b2e6f29f0637dda345764c89eac0bcb9ce2878469a7e6fcd2c96d25034937025768450b33fc14fb40470fa4806bfcf03330e75 EBUILD boost-1.84.0-r3.ebuild 11406 BLAKE2B d0534d67b863800cf37d7e848c69e8b360554dffa8b009959b5b91c85ff69c73e671ac94c07f1e03ae2d52b4ccf6d577526e7402d4f0c95ea93e9e2578444382 SHA512 415ad4e0844fa377fbdfaff5100c44889f30080507a4aa747c866d79bf7aed8b96224c1608cc896c24fe89b6d8c6ba3003adf7789dfb06567465a03254e46ca9 EBUILD boost-1.85.0-r1.ebuild 11740 BLAKE2B 7283b803f29a1507346b644d886bcc429f25185fecb153217bc98b81ccd0ab40a618c34dbc5f34d7baf1c4ffdbecc7101504608390e8ed60e4cd1fb1bc3e4eb9 SHA512 d211f9fce7b2a1634a4bc336d2f5aa0c109083233a728c32950c400b83aa959f4f902b7392e9d69d69a303fc036a2874e5b60f68ab8199e3d96603e1159fcea3 +EBUILD boost-1.86.0.ebuild 11292 BLAKE2B 29a6b0b34aa814e264652c7c5a8a77e4934a75c1b7f58424cd9034ecc34ed37b894ef2ef4c2d8b288f417b73b46764dbfb038f6d1d686869524360b50ba261c7 SHA512 5a78f7c10a4689434f04fa85ee438997ad8a40fe69e37d677be092f8870b098eb57df01e29834b788e3a36dcab1971fcdf8a7d8a98f9df1ebccbf1db95612eb6 MISC metadata.xml 9162 BLAKE2B c8df087c7fe1e4af3a59f21763777d3f1318aebcd524e077b6a93c374e0910ff31b1e73b8b4908130d63c2bb7d060348602cffd215648f09afd8015c782e2340 SHA512 3c45d74e046e0fd09f152fcfa7af942c9097e3ed91a0915a2541caad14a8b94b9faceccdbc74bf8aa7c8f7b383db7e91e09babba9c2c28fd7855a7b809616839 diff --git a/dev-libs/boost/boost-1.86.0.ebuild b/dev-libs/boost/boost-1.86.0.ebuild new file mode 100644 index 000000000000..b07536311205 --- /dev/null +++ b/dev-libs/boost/boost-1.86.0.ebuild @@ -0,0 +1,346 @@ +# 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}" +#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) + boost.stacktrace.from_exception=off + ) + + 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/c-blosc2/Manifest b/dev-libs/c-blosc2/Manifest index 05731cbd9afd..3988c3858aa1 100644 --- a/dev-libs/c-blosc2/Manifest +++ b/dev-libs/c-blosc2/Manifest @@ -1,5 +1,5 @@ DIST c-blosc2-2.14.4.gh.tar.gz 3155712 BLAKE2B 1af67562150b7b0b87fa076114bab0cccfbd12417c13dfae4fbd40e15531ed54f3a315588ac81b15e137f0272ac6c610c48205608be0b9e98ce44218dd200a27 SHA512 4173c7b0cf4f0399a3d36c987d265aacf766f54dc871ca87ebd98d4ecd4fbd24d4b923ffb2d0b59bda359e1fbba29f088d78816d375904b1945e8c40c29dccce DIST c-blosc2-2.15.1.gh.tar.gz 3203267 BLAKE2B 0009afc8e9357a9d9787a60ee549bb21d68e952ca076f529add0f67500f2055a43463b3d612b600197579fd640b937024070508cb92b911d77e8ff4d8c7f16e5 SHA512 56e7395297ce8e336b2e881bf4dae169268ef19328bae8c037aa297696f723196f65eb3f66c03728d1c6492b768e17ad586f8aae29c9033b571f736d391e9ab9 EBUILD c-blosc2-2.14.4.ebuild 1494 BLAKE2B 89662d85966e7b009317421e30a3cb6a62ee18b480ab37df6544b2c215f67e80b30bd0bcd45a8b48b9d0beeb62781ec08751fe85e3f787b18a3b60ee0ceb15a5 SHA512 1aa7edc8a34b13c63c3affe3c0e27bc11a43d00da6138deaee69c71a1db8569a9e33bd98e38a3028e0b7651aa8fc8f0089c9bcc1e009cc10c7f2cb723612fc3c -EBUILD c-blosc2-2.15.1.ebuild 1499 BLAKE2B 269f3db909e10994d0c3a3998f01d4fe4f90f378f74af74bb89bd2c62aaf11886814ecbc40bb9d64eace379c661145e0abcb60c820bccd88d3a5526c186b3160 SHA512 dcb9fbe17d772221fa3382b703301cdaf89d6b5357e88dc240fa16987aea5dae8addc81a93a692979e69b6dc6f280b505fdbca7b1ecb2f46512c38a991e208d5 +EBUILD c-blosc2-2.15.1.ebuild 1496 BLAKE2B 15d789135a69969e357448c39cf3040fc3b50afc4b2b2fc857f44ee327b35935f211c5b42607c1fde45e38604d212a7a17139dd251bb79a00b959572153af037 SHA512 c7ccc6dc3c3f6b38cd306c6092b668b2b7fd9a6f48182912202a56b546b59a9788c9b4762d8bd4e6744da54b0bfe2f34dd664ed5b78faa70c078bd339611ba8b MISC metadata.xml 327 BLAKE2B 5fafd7f688780e7c5479d492da4943b9a95122d5c64e36e4415fe69a708f983f9463824981d771424c1c75f7236a159ef843738a0b31430ccd572770fbc5a74e SHA512 9d2aa06eb8e144bafe1c65b9c7704993633f9e1db629d77209e8c832e09de34c641d9f588cf208d8f5f65ff489c56f1e01ef573213439ba99678601d6a790ee0 diff --git a/dev-libs/c-blosc2/c-blosc2-2.15.1.ebuild b/dev-libs/c-blosc2/c-blosc2-2.15.1.ebuild index c438862e8a0c..d6c89088cb4f 100644 --- a/dev-libs/c-blosc2/c-blosc2-2.15.1.ebuild +++ b/dev-libs/c-blosc2/c-blosc2-2.15.1.ebuild @@ -17,7 +17,7 @@ SRC_URI=" LICENSE="BSD" SLOT="0/4" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +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/cyrus-sasl/Manifest b/dev-libs/cyrus-sasl/Manifest index 39f55edc5d26..cbee87f32e1a 100644 --- a/dev-libs/cyrus-sasl/Manifest +++ b/dev-libs/cyrus-sasl/Manifest @@ -7,6 +7,6 @@ AUX saslauthd.service 277 BLAKE2B cf80eaa1e3f7ef854978a458e4b026f3f47891620ac63e AUX saslauthd2.rc7 411 BLAKE2B 7cda36ea03aeea5f8e32c2fd0319a483dae78080fa213fb423bd1545e9d29193ebe077ebe5d15ab5940b2d805cb46a25ad2629757f55d2c40c4acc3f0adfa355 SHA512 1d5942a94ffbc15774443d60a88d4c89c7c3c6ea68b041d304f0110f6ec3aa2a812f59021cddc78de6f51a25bb00955e4e56d769e766a9d856f13774dd37ce83 DIST cyrus-sasl-2.1.28-r4-patches.tar.xz 4452 BLAKE2B e75f89f0e4ce829b9b27ce0cf86d04e18e30cd851335a9be22235063b19731e312ab390be7b57f024b40074dc4d9373b520e4e9a22121dab9a5c4297378d8486 SHA512 33850bd3ac80721f2765414b19d1a3adaf92e973293910c0b19ef6fcdc3981a8abb3f4d6f487da71d1a7454375e77e3fafb892eace5aa37335841718fcc4c541 DIST cyrus-sasl-2.1.28.tar.gz 4034803 BLAKE2B 6cca8c26cebb9c2ee5d539c43797d30b6309a476ec4233225789978e1d7315c4ea5d2abbc7f5464be0f3c0de5fd9212706b43fbc92f40b76cd0b1013cc00f823 SHA512 db15af9079758a9f385457a79390c8a7cd7ea666573dace8bf4fb01bb4b49037538d67285727d6a70ad799d2e2318f265c9372e2427de9371d626a1959dd6f78 -EBUILD cyrus-sasl-2.1.28-r4.ebuild 7061 BLAKE2B 2902d241cf2e83e9af8ba9cd2df8d67d765fa30ad5d125967d279d990e03c73cbecbce37e471486e68c12b76e1bf8c785f3b89e72499a9815b33f4ea81177412 SHA512 7b73764da8bdb25a3b859d19e50e24ab50523b116669adc11291d846d3153ffbfc3a3a74cd5bb1621969e0e43be1a68dcd3b9ef54e3098b0d06da6361ad584a2 -EBUILD cyrus-sasl-2.1.28-r5.ebuild 7650 BLAKE2B de3b4b63e14e5ce2dfc795e29cad00c262ce3f1c946ee08e26c4c03e8c1ea6bf789760a3087b828c362a690a9c339ad90d0a92693545d4912c835535093a58b7 SHA512 50e197080768def8bb0041833fa2794d22668d261c01f69dd0a0e0076048ebe4598328f7553dee69d5ffc1682fc0c83aaac0804f78e0f6dd1b4ff1022187bad5 +EBUILD cyrus-sasl-2.1.28-r4.ebuild 7122 BLAKE2B 92a7da755e80ccae3c19bbe962fe5f29fbe8a0cdf2f724ff30946edb180f7fb3021310004b9bc9fcbe69b111c847d5460881b34d8e897b421a3b2e0a044950ef SHA512 c21e2d3fdbc4d124ba9760103a011c2b612bd4c3c49d80d04c02988dd982007405e72882421e6245cdefd2966061aec3ba95c71da1dd6785b1486db98660ce99 +EBUILD cyrus-sasl-2.1.28-r5.ebuild 7711 BLAKE2B 0db3480580d085e5471cd015c0b15083c7b83c53dd5d03c38d51068b77f439740cbd4d27b6f916362fa0d04463a5c8d94a62da840d89fca654abc9e8cb3f35d7 SHA512 2f6eef762bbd8cf488679a03ffac1197a3bb8d3e78bd14597eecc108d1b0f20b956ac4bf7e5b57b7a6ddfcf2fad147f90bc2c35efe3faee66bea2013cf112cc6 MISC metadata.xml 720 BLAKE2B 2c8e6b0ca364214c9d09a26c561b2452f49fb7e2f348e299fbd08c698a814b9f5e75715ef58f600f3032044d298639bf8daf40fe4a1b5397e21fdf91b0811767 SHA512 4b9db09c9f9de1c0be4649ce421194dec5d805e858ec5c7a674351e17fff94074797288783be2813b8328868d641d475f5bc6cb63159e3ad1875af0e37196dc7 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 395775bc63fb..974da3e78d17 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 @@ -60,6 +60,9 @@ src_prepare() { src_configure() { export CC_FOR_BUILD="$(tc-getBUILD_CC)" + # Fails with C23 because of decls + append-flags -std=gnu17 + # -Werror=lto-type-mismatch # https://bugs.gentoo.org/894684 # https://github.com/cyrusimap/cyrus-sasl/pull/771 diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r5.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r5.ebuild index 358927ac57c3..865f1a93f44c 100644 --- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r5.ebuild +++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r5.ebuild @@ -63,6 +63,9 @@ src_prepare() { src_configure() { export CC_FOR_BUILD="$(tc-getBUILD_CC)" + # Fails with C23 because of decls + append-flags -std=gnu17 + # -Werror=lto-type-mismatch # https://bugs.gentoo.org/894684 # https://github.com/cyrusimap/cyrus-sasl/pull/771 diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest index c797e355ffb1..0244622a4653 100644 --- a/dev-libs/elfutils/Manifest +++ b/dev-libs/elfutils/Manifest @@ -7,6 +7,8 @@ DIST elfutils-0.190.tar.bz2.sig 310 BLAKE2B d6a2d490aa6815ed9a7c3624050716ebf7c5 DIST elfutils-0.191.tar.bz2 9310088 BLAKE2B 2a7ad251369eca7ba609ab8644181fd479ad8596ee58dc068398ca22be25a978e96b81a10a92a5555d7574fd1b9227c8d54fb41dceb4025aedfc6ae32870bbca SHA512 e22d85f25317a79b36d370347e50284c9120c86f9830f08791b7b6a7b4ad89b9bf4c7c71129133b8d193a0edffb2a2c17987b7e48428b9670aff5ce918777e04 DIST elfutils-0.191.tar.bz2.sig 310 BLAKE2B 5afee19515a115d4ca6d1e0c4a49eca84bb4b911687492934e939a80ac75b7fcea9b6bf5fc0f2248a4c64ef09bd5af9dfc60c72410cba33b78444c38443ad279 SHA512 ab030739d95d13abb84cf4dc6c5407e51d0bd0bca108e27654a1830371694181a1b6f115fdbb4ae0772390f54f1c4811e5ae26b38fdcfd3275177a3716adfd22 EBUILD elfutils-0.190.ebuild 3195 BLAKE2B 27cfc8ca8387db49e04998c2365c72d3f686fcb9c103975d67642b2ca09a40e274613ba3458274586fc01e5cd09b6c529f897a7c0aec13ff603b666f6d6ef18a SHA512 fb7d4bd5a0ed21fbbc7f9c97b9b7bc2372584b84246ffe8ee7ce8ffff3e59b90dc8e3be3c8d770a197c5bc3e31a5b64872e36260e2eab604f1023d6bb31010c2 -EBUILD elfutils-0.191-r1.ebuild 3303 BLAKE2B 520bdb2c9e2b4157e5b524aa8674c7ff246131e923c50c8522932c2f05b8ee97bbb37ffd00e9ce88c27aff94221308d8455517fcc7f01086872b4cfb35739c3b SHA512 9abf83903778c42832aaf50ba2b2725f3d51ba6fe32842d6a49fb3c3f09240f6b45b26b70b8fa01656de73861bca99f026d0c9a5c0e6d38a99daae7f138f17f2 +EBUILD elfutils-0.191-r1.ebuild 3437 BLAKE2B 9c3a9b5c3799a1040e93a7d477f78864132e15991eef2dce4f6236e22cd60a314afc251f117bce82bde99ec3a1dea6cfd8f0579f746198dd9c61f1408c95d983 SHA512 cf8419f8f564a5e8e5d7d203bb8ccb57620f8d0c7149a2da818f8a965003217295ecaa093d90dae9df2cdb6fb27f66c237957931d719962e208a953fd790a706 +EBUILD elfutils-0.191-r2.ebuild 3648 BLAKE2B 7171fd8e28affac5fc5f3008e3695b38f4af2bc680845f76e7a746bd98978262d9667f58501711f2c8c57f1ffcf882dbd9cc927b55b350002646dffdb3e1f4f1 SHA512 17957e10ec24d70d93ec73dfe8a746d218e762f0fc33c042634db5cfbdd3ec3006e3252431a81b639baba67608e677b33ae11cd7922f815885fb1aa6ad6da10a EBUILD elfutils-0.191.ebuild 3214 BLAKE2B d22fe81fdf08fef3c379ecb053b22f31921d5c01054a2be58c61a34c00226cee4c7a5ed5571c902a4134d39f5e1c52bcc9c9f3283c86879f66e3df74b35255a5 SHA512 c6df139b1895e6ca869f4c4b191230e5dddab724d3c7ea5f26a7a81bc7a757baa0e9787828be2899264f9f01da79e87425cad7b6ab7657a6c78479c6921b70f2 +EBUILD elfutils-9999.ebuild 3577 BLAKE2B 838ccf2aa507737bbda99b56d27e22f112abd53299ab1a328103b8b50984d5b3c3fff75914af96f404f3eb4b701f4a0aade76098ba93f2fbbd38d48383b180e7 SHA512 deadeb04fe9fc2c2455e19443d8465eab0fc48de36f74a05067006e9af7ae5fddea6b2b6af45938af761172bb8821cab9b99a19b1cb185f691f025d41ceeb12f MISC metadata.xml 680 BLAKE2B f5f2ad88e2f5f7823ea466403cb44888cea12ded4c1364e4c941be9f0e620ff9214973459bd4f70c43540e8f2a5d915c7d6e65ff3b2758c6660af928deb648b3 SHA512 403b91d41f6ff564c66445492c45d41ed4513709e557ac68d447e583b6bc4e22ccafe67f8e998660dfe47e75120c902107fccba90db06d99bd4c72f024bd881c diff --git a/dev-libs/elfutils/elfutils-0.191-r1.ebuild b/dev-libs/elfutils/elfutils-0.191-r1.ebuild index e33417f6c8bc..eeac99a7062e 100644 --- a/dev-libs/elfutils/elfutils-0.191-r1.ebuild +++ b/dev-libs/elfutils/elfutils-0.191-r1.ebuild @@ -4,32 +4,46 @@ EAPI=8 VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/elfutils.gpg -inherit autotools flag-o-matic multilib-minimal verify-sig +inherit autotools flag-o-matic multilib-minimal DESCRIPTION="Libraries/utilities to handle ELF objects (drop in replacement for libelf)" HOMEPAGE="https://sourceware.org/elfutils/" -SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2" -SRC_URI+=" verify-sig? ( https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2.sig )" +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://sourceware.org/git/elfutils.git" + inherit git-r3 + + BDEPEND=" + sys-devel/bison + sys-devel/flex + " +else + inherit verify-sig + SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2" + SRC_URI+=" verify-sig? ( https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2.sig )" + + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" + + BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-elfutils-20240301 )" +fi LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" -IUSE="bzip2 debuginfod lzma nls static-libs test +utils zstd" +IUSE="bzip2 debuginfod lzma nls test +utils valgrind zstd" RESTRICT="!test? ( test )" RDEPEND=" !dev-libs/libelf - >=sys-libs/zlib-1.2.8-r1[static-libs?,${MULTILIB_USEDEP}] - bzip2? ( >=app-arch/bzip2-1.0.6-r4[static-libs?,${MULTILIB_USEDEP}] ) + >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] + bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] ) debuginfod? ( app-arch/libarchive:= dev-db/sqlite:3= net-libs/libmicrohttpd:= - net-misc/curl[static-libs?,${MULTILIB_USEDEP}] + net-misc/curl[${MULTILIB_USEDEP}] ) - lzma? ( >=app-arch/xz-utils-5.0.5-r1[static-libs?,${MULTILIB_USEDEP}] ) - zstd? ( app-arch/zstd:=[static-libs?,${MULTILIB_USEDEP}] ) + lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] ) + zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] ) elibc_musl? ( dev-libs/libbsd sys-libs/argp-standalone @@ -39,13 +53,12 @@ RDEPEND=" " DEPEND=" ${RDEPEND} + valgrind? ( dev-debug/valgrind ) " -BDEPEND=" - app-alternatives/lex +BDEPEND+=" sys-devel/m4 virtual/pkgconfig nls? ( sys-devel/gettext ) - verify-sig? ( >=sec-keys/openpgp-keys-elfutils-20240301 ) " PATCHES=( @@ -57,10 +70,6 @@ PATCHES=( src_prepare() { default - if ! use static-libs; then - sed -i -e '/^lib_LIBRARIES/s:=.*:=:' -e '/^%.os/s:%.o$::' lib{asm,dw,elf}/Makefile.in || die - fi - eautoreconf # https://sourceware.org/PR23914 @@ -78,10 +87,13 @@ src_configure() { } multilib_src_configure() { + unset LEX YACC + local myeconfargs=( $(use_enable nls) $(multilib_native_use_enable debuginfod) $(use_enable debuginfod libdebuginfod) + $(use_enable valgrind valgrind-annotations) # explicitly disable thread safety, it's not recommended by upstream # doesn't build either on musl. @@ -97,6 +109,8 @@ multilib_src_configure() { $(use_with zstd) ) + [[ ${PV} == 9999 ]] && myeconfargs+=( --enable-maintainer-mode ) + # Needed because sets alignment macro is-flagq -fsanitize=address && myeconfargs+=( --enable-sanitize-address ) is-flagq -fsanitize=undefined && myeconfargs+=( --enable-sanitize-undefined ) @@ -115,8 +129,8 @@ multilib_src_install_all() { dodoc NOTES - # These build quick, and are needed for most tests, so don't - # disable their building when the USE flag is disabled. + # These build quick, and are needed for most tests, so we don't + # disable building them when the USE flag is disabled. if ! use utils; then rm -rf "${ED}"/usr/bin || die fi diff --git a/dev-libs/elfutils/elfutils-0.191-r2.ebuild b/dev-libs/elfutils/elfutils-0.191-r2.ebuild new file mode 100644 index 000000000000..917e0ffdca15 --- /dev/null +++ b/dev-libs/elfutils/elfutils-0.191-r2.ebuild @@ -0,0 +1,141 @@ +# Copyright 2003-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/elfutils.gpg +inherit autotools flag-o-matic multilib-minimal + +DESCRIPTION="Libraries/utilities to handle ELF objects (drop in replacement for libelf)" +HOMEPAGE="https://sourceware.org/elfutils/" +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://sourceware.org/git/elfutils.git" + inherit git-r3 + + BDEPEND=" + sys-devel/bison + sys-devel/flex + " +else + inherit verify-sig + SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2" + SRC_URI+=" verify-sig? ( https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2.sig )" + + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" + + BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-elfutils-20240301 )" +fi + +LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )" +SLOT="0" +IUSE="bzip2 debuginfod lzma nls static-libs test +utils valgrind zstd" +RESTRICT="!test? ( test )" + +RDEPEND=" + !dev-libs/libelf + >=sys-libs/zlib-1.2.8-r1[static-libs?,${MULTILIB_USEDEP}] + bzip2? ( >=app-arch/bzip2-1.0.6-r4[static-libs?,${MULTILIB_USEDEP}] ) + debuginfod? ( + app-arch/libarchive:= + dev-db/sqlite:3= + net-libs/libmicrohttpd:= + + net-misc/curl[static-libs?,${MULTILIB_USEDEP}] + ) + lzma? ( >=app-arch/xz-utils-5.0.5-r1[static-libs?,${MULTILIB_USEDEP}] ) + zstd? ( app-arch/zstd:=[static-libs?,${MULTILIB_USEDEP}] ) + elibc_musl? ( + dev-libs/libbsd + sys-libs/argp-standalone + sys-libs/fts-standalone + sys-libs/obstack-standalone + ) +" +DEPEND=" + ${RDEPEND} + valgrind? ( dev-debug/valgrind ) +" +BDEPEND+=" + sys-devel/m4 + virtual/pkgconfig + nls? ( sys-devel/gettext ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-0.189-musl-aarch64-regs.patch + "${FILESDIR}"/${PN}-0.191-musl-macros.patch + "${FILESDIR}"/${PN}-0.191-avoid-overriding-libcxx-system-header.patch +) + +src_prepare() { + default + + eautoreconf + + if ! use static-libs; then + sed -i -e '/^lib_LIBRARIES/s:=.*:=:' -e '/^%.os/s:%.o$::' lib{asm,dw,elf}/Makefile.in || die + fi + + # https://sourceware.org/PR23914 + sed -i 's:-Werror::' */Makefile.in || die +} + +src_configure() { + # bug #407135 + use test && append-flags -g + + # bug 660738 + filter-flags -fno-asynchronous-unwind-tables + + multilib-minimal_src_configure +} + +multilib_src_configure() { + unset LEX YACC + + local myeconfargs=( + $(use_enable nls) + $(multilib_native_use_enable debuginfod) + $(use_enable debuginfod libdebuginfod) + $(use_enable valgrind valgrind-annotations) + + # explicitly disable thread safety, it's not recommended by upstream + # doesn't build either on musl. + --disable-thread-safety + + # Valgrind option is just for running tests under it; dodgy under sandbox + # and indeed even w/ glibc with newer instructions. + --disable-valgrind + --program-prefix="eu-" + --with-zlib + $(use_with bzip2 bzlib) + $(use_with lzma) + $(use_with zstd) + ) + + [[ ${PV} == 9999 ]] && myeconfargs+=( --enable-maintainer-mode ) + + # Needed because sets alignment macro + is-flagq -fsanitize=address && myeconfargs+=( --enable-sanitize-address ) + is-flagq -fsanitize=undefined && myeconfargs+=( --enable-sanitize-undefined ) + + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_test() { + env LD_LIBRARY_PATH="${BUILD_DIR}/libelf:${BUILD_DIR}/libebl:${BUILD_DIR}/libdw:${BUILD_DIR}/libasm" \ + LC_ALL="C" \ + emake check VERBOSE=1 +} + +multilib_src_install_all() { + einstalldocs + + dodoc NOTES + + # These build quick, and are needed for most tests, so we don't + # disable building them when the USE flag is disabled. + if ! use utils; then + rm -rf "${ED}"/usr/bin || die + fi +} diff --git a/dev-libs/elfutils/elfutils-9999.ebuild b/dev-libs/elfutils/elfutils-9999.ebuild new file mode 100644 index 000000000000..250038f6f588 --- /dev/null +++ b/dev-libs/elfutils/elfutils-9999.ebuild @@ -0,0 +1,140 @@ +# Copyright 2003-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/elfutils.gpg +inherit autotools flag-o-matic multilib-minimal + +DESCRIPTION="Libraries/utilities to handle ELF objects (drop in replacement for libelf)" +HOMEPAGE="https://sourceware.org/elfutils/" +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://sourceware.org/git/elfutils.git" + inherit git-r3 + + BDEPEND=" + sys-devel/bison + sys-devel/flex + " +else + inherit verify-sig + SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2" + SRC_URI+=" verify-sig? ( https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2.sig )" + + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" + + BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-elfutils-20240301 )" +fi + +LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )" +SLOT="0" +IUSE="bzip2 debuginfod lzma nls static-libs test +utils valgrind zstd" +RESTRICT="!test? ( test )" + +RDEPEND=" + !dev-libs/libelf + >=sys-libs/zlib-1.2.8-r1[static-libs?,${MULTILIB_USEDEP}] + bzip2? ( >=app-arch/bzip2-1.0.6-r4[static-libs?,${MULTILIB_USEDEP}] ) + debuginfod? ( + app-arch/libarchive:= + dev-db/sqlite:3= + net-libs/libmicrohttpd:= + + net-misc/curl[static-libs?,${MULTILIB_USEDEP}] + ) + lzma? ( >=app-arch/xz-utils-5.0.5-r1[static-libs?,${MULTILIB_USEDEP}] ) + zstd? ( app-arch/zstd:=[static-libs?,${MULTILIB_USEDEP}] ) + elibc_musl? ( + dev-libs/libbsd + sys-libs/argp-standalone + sys-libs/fts-standalone + sys-libs/obstack-standalone + ) +" +DEPEND=" + ${RDEPEND} + valgrind? ( dev-debug/valgrind ) +" +BDEPEND+=" + sys-devel/m4 + virtual/pkgconfig + nls? ( sys-devel/gettext ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-0.189-musl-aarch64-regs.patch + "${FILESDIR}"/${PN}-0.191-musl-macros.patch +) + +src_prepare() { + default + + eautoreconf + + if ! use static-libs; then + sed -i -e '/^lib_LIBRARIES/s:=.*:=:' -e '/^%.os/s:%.o$::' lib{asm,dw,elf}/Makefile.in || die + fi + + # https://sourceware.org/PR23914 + sed -i 's:-Werror::' */Makefile.in || die +} + +src_configure() { + # bug #407135 + use test && append-flags -g + + # bug 660738 + filter-flags -fno-asynchronous-unwind-tables + + multilib-minimal_src_configure +} + +multilib_src_configure() { + unset LEX YACC + + local myeconfargs=( + $(use_enable nls) + $(multilib_native_use_enable debuginfod) + $(use_enable debuginfod libdebuginfod) + $(use_enable valgrind valgrind-annotations) + + # explicitly disable thread safety, it's not recommended by upstream + # doesn't build either on musl. + --disable-thread-safety + + # Valgrind option is just for running tests under it; dodgy under sandbox + # and indeed even w/ glibc with newer instructions. + --disable-valgrind + --program-prefix="eu-" + --with-zlib + $(use_with bzip2 bzlib) + $(use_with lzma) + $(use_with zstd) + ) + + [[ ${PV} == 9999 ]] && myeconfargs+=( --enable-maintainer-mode ) + + # Needed because sets alignment macro + is-flagq -fsanitize=address && myeconfargs+=( --enable-sanitize-address ) + is-flagq -fsanitize=undefined && myeconfargs+=( --enable-sanitize-undefined ) + + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_test() { + env LD_LIBRARY_PATH="${BUILD_DIR}/libelf:${BUILD_DIR}/libebl:${BUILD_DIR}/libdw:${BUILD_DIR}/libasm" \ + LC_ALL="C" \ + emake check VERBOSE=1 +} + +multilib_src_install_all() { + einstalldocs + + dodoc NOTES + + # These build quick, and are needed for most tests, so we don't + # disable building them when the USE flag is disabled. + if ! use utils; then + rm -rf "${ED}"/usr/bin || die + fi +} diff --git a/dev-libs/fddl/Manifest b/dev-libs/fddl/Manifest index a8b8021009e4..aedce7cd7ae9 100644 --- a/dev-libs/fddl/Manifest +++ b/dev-libs/fddl/Manifest @@ -1,5 +1,4 @@ AUX fddl-20111124-disambiguate-variable-name.patch 2912 BLAKE2B e705af11ff36f771fb0520b61d57974cc0c50a4746810ae32e2294b85803ac8d8e183cada2d45701e3e963925d7d233c04d47c078e1903a748d20c6b554846be SHA512 50f24f08dbcc1067a968004494f9391f45895f85ee660491d4cd2aaa806e41fe66c40a73e7683ce1208d3af9bbc7d9a17c9eefe73f2fdab19f7e6de75acd315d DIST fddl-20111124.tar.gz 29608 BLAKE2B 5769edc935c4606cbc9662712ea05ff2cdd44646e36ef71a2b185a9efdd8655fd8ff0c7a0f0ed105cfee44f18c43815984771e7a74a2329adc29f6ff544fe64d SHA512 d9c4f3f4e10b92ffc158a8cd24726ac6f95050256178a17b6d11aefd4b5786452b17ee96e4d4f4762d07c372c248aba1f22cbe2c03cd6b0f709aeeb4d15a0266 -EBUILD fddl-20111124-r1.ebuild 1014 BLAKE2B c1cdfa6e85871b3f8efe4e298d744076a77551d53f88833c0b8015c2ac7588f97991afd9d14358aedb013b97faa0b70de2eb8442626ae53c7f2e29afbc8ef6f1 SHA512 c9c384a697d83a7723f1b69a92271a101ef12e66e930f93ae948f24f600eff300f462a35b566e45bae9d63e4632673afae99d94fb28f207cdb456ac271ac2563 -EBUILD fddl-20111124-r2.ebuild 1096 BLAKE2B a3292fdfce073656651f7c8c61da4bf7a6454849093b66881e13ee34fe7b7086a1a1b86337af4a9cbffc675f05e9e2bcd7210e9241894d9acd2dac60db581019 SHA512 718cd80d381029159a69b21fff78fc1ac987ce4116e2085174b24f4b48a4c34f5bf9a072171dc83b2eea9d19cf66242aef9bfdeff7857074c401b721f7f2e5bb +EBUILD fddl-20111124-r2.ebuild 1094 BLAKE2B 672375e780690c7d33cbfd49723ea1e4a00539dcbfbdd6de996687f922c5913cf54fb470e6848975baa370bdb8af5de4094b1ade000f0d1c8677d8ff8e9fc7ab SHA512 9ddb32ad7087019ef0abfbac2a3caab653d8932818a4f200a942a9f790d101bfd02a37775b9516a56de5e584ff6106b1c9177e8680c9078d7227b3e6b5e73656 MISC metadata.xml 304 BLAKE2B 54999e09ff8bdc75a3f6e5765f4f68ff80f9c4f211ec4f284c7d2a98999e67b287765f3a4849230456b8928a539c1d48c4c23748608479013f4a5cbf5e05f91f SHA512 8aadb3cedf647b45308e8d817105ddd7157354b1e57f9599e32509ce344b1111152616370671396d6c7467f186875317c005cc9d44fcf827a9e6ee5081405696 diff --git a/dev-libs/fddl/fddl-20111124-r1.ebuild b/dev-libs/fddl/fddl-20111124-r1.ebuild deleted file mode 100644 index adf229a08483..000000000000 --- a/dev-libs/fddl/fddl-20111124-r1.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake vcs-snapshot - -DESCRIPTION="Free Decision Diagram Library" -HOMEPAGE="https://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 ) - -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/fddl-20111124-r2.ebuild b/dev-libs/fddl/fddl-20111124-r2.ebuild index 97af9c72f804..041845ae39b0 100644 --- a/dev-libs/fddl/fddl-20111124-r2.ebuild +++ b/dev-libs/fddl/fddl-20111124-r2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" DOCS=( AUTHORS ChangeLog INSTALL RELEASE ) diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest index cae2b82e4423..e0b718c2c182 100644 --- a/dev-libs/glib/Manifest +++ b/dev-libs/glib/Manifest @@ -6,9 +6,9 @@ DIST glib-2.78.3.tar.xz 5321388 BLAKE2B 6ef754b15e1ce4377eafdfc317025ac65c3d8010 DIST glib-2.78.4.tar.xz 5331892 BLAKE2B ada7134597d7d863e581a2bb1097ac07a63b27b53309aadab5b1d3686327ee718ad8c5c07af3fce5cc12328e728fc2c4df5fd9e69f431fa00dc634062ef7f926 SHA512 6f3a06e10e7373a2dbf0688512de4126472fb73cbec488b7983b5ffecff09c64d7e1ca462f892e8f215d3d277d103ca802bad7ef0bd0f91edf26fc6ce67187b6 DIST glib-2.78.6.tar.xz 5344808 BLAKE2B d16173794c4aa019459cf8c8c84d4107fb8393828f41ec6c631b9452890f34f9022ed848a543ed134fdb8a575faef6b941cea3e05de512eb1b7a99f7601a2485 SHA512 8d75f8fd77b6309215ca86a0c7648878efe11051f18b279840c137669017ea4066388f8682367e4ea3f154333d833c9dc28ccd4a66a91f0c3854a40a2838f8da DIST glib-2.80.4.tar.xz 5535760 BLAKE2B 1d2b301703b27a5c2def370e1d44b4f7b08a940969563ce9d8d7c38e5f0a32163b95523e09cedc4a57b2af84a57d63dc545abcb31b61a8066ef62ba396fb4f3c SHA512 efdc7dd1e0609b0f2d988a8cc8fd4a3fda96e8450832f905f7686f9063b727cb996e0e4e638aca62f60b76f9f04be62e089a615413e64cf298c7eef26e074570 -EBUILD glib-2.76.4.ebuild 10852 BLAKE2B fd5ef68de939553ae5523bc11fef106c720853175147746845b9c7171e01b2c8a56626c657ea1a1f98154f89d11a1f75c483123a958265251fee431b60ad736f SHA512 7fe4fe4f7742a1a2d12ba4ff030cc9a409ab8de45b8361e49b780f0a8865ccea2cdc9395f81ad67b07bc552a4b4bd04009c51b832d69197d8305991461806d56 -EBUILD glib-2.78.3.ebuild 10852 BLAKE2B fd5ef68de939553ae5523bc11fef106c720853175147746845b9c7171e01b2c8a56626c657ea1a1f98154f89d11a1f75c483123a958265251fee431b60ad736f SHA512 7fe4fe4f7742a1a2d12ba4ff030cc9a409ab8de45b8361e49b780f0a8865ccea2cdc9395f81ad67b07bc552a4b4bd04009c51b832d69197d8305991461806d56 -EBUILD glib-2.78.4-r1.ebuild 11097 BLAKE2B 36e0cfd571bf729138f97b4f59385942b41cc35383a52be2c2e6fbc72734edd1e48e7b74b153b0f828186f6b603e2d07e4f8e7a57429dbe5743eed6bed046db3 SHA512 19c6665c651ab8f6d264574b37b3e10f159c41484d967193a5914a3ec98af909595941c151f11466bbf425bd2931803552a75abe2711b74c7811b2eb3d30700e -EBUILD glib-2.78.6.ebuild 11047 BLAKE2B d3e840ea6dc22e98a0f822376204e104947590be784662020d3555a70bd38b57863935a52d896d50915cc914305a112c36a1fb45f72a5cd33ba9343049d3aa95 SHA512 98ab1e9071ff41193143abee19903da0f811441a77ba1a74ab0c2b1cbb936211eb019e7bf3ebb087ad0e14db54606beb3e254cba410f124d9a14097d1117c5df -EBUILD glib-2.80.4.ebuild 11173 BLAKE2B 32c46e7ee2a9654a23dc7336c299dd12f34ab48281234cbf0b571ceca3d0e5d06505ccabcdda6b6865e5833f07c8e194c9488440fcd7a5318fe85fc8cb538e99 SHA512 a19ddc9e9a79ceda5871f93fa7c2d5e442fe3aaed3417dae435cafd8973de96cd18612249aea4369665aa105a6937cd52dff2d6400b1330a6962f9bf358ba7c3 +EBUILD glib-2.76.4.ebuild 11134 BLAKE2B e9bb6e07284892dc0297d3e0f5476802320ce7fe7b4b8206297ea6020b36865ac6f6ab5d85fbc50e6112f575188d8b203b3841367b3d995efa527b57d9fe059d SHA512 5cc15f6043708b6f8710f95e2d01201daf037565e15b97af381e34cfb9eebfa19c1f343dadb977310d3d393fe69ceed2b338f301f308447300be357a7ae27952 +EBUILD glib-2.78.3.ebuild 11134 BLAKE2B e9bb6e07284892dc0297d3e0f5476802320ce7fe7b4b8206297ea6020b36865ac6f6ab5d85fbc50e6112f575188d8b203b3841367b3d995efa527b57d9fe059d SHA512 5cc15f6043708b6f8710f95e2d01201daf037565e15b97af381e34cfb9eebfa19c1f343dadb977310d3d393fe69ceed2b338f301f308447300be357a7ae27952 +EBUILD glib-2.78.4-r1.ebuild 11379 BLAKE2B 985c405d528ddf65bed984c4df0c50dca24953e5ab61e1f4b7c64dd1a3cc77e132d7aaae0ae76ebc58c6df88151c464d941ee7bc8d6b12cf15ba3a4a76631df8 SHA512 a04e6db79b31064afd7fb016a1f5fa0226df76494d88ba78143232baf3756ec6c9102d02f6cc554bf1b2163eb0f22a164a8c2ca9f6013007b11638a6512671d0 +EBUILD glib-2.78.6.ebuild 11329 BLAKE2B ad844337f6316791db3b0736d8da475d9388cce4878ede90416c272334d774ab90f4ec2b1772ea015de9ff0d94d2c7c10d23266280516e8c26b47ef72ca6e24d SHA512 668e528c96a7b6529981a090388f6731840f555af13fdc402d3ff678e6d3f6d84733c19c84caed20a239a3ae1ec08acffc786bc56ffe7a5e623f5f13308e9a57 +EBUILD glib-2.80.4.ebuild 11456 BLAKE2B 4688873ac6e784e1ce43cdccdfee6b8708451b99078adf920d203afcae2e330866b889c5c3e75285c8f1a12cc9f1430466723b31061d6c42bfd8261cf769430d SHA512 4927c7c97724cf42ed8d8065bb2175f3d3f68e697d0710981ecb686b8e0bb967b351b4b9560f0850de92b1f1febd51d3f63f49909cd435f387267889be7e0fac MISC metadata.xml 1499 BLAKE2B 5a75e3b360e4656fe9127f2dc3ba7e90df3eae0586a025b4eefc2317398e53815c98a8014ea6f0dd69ae8afdafa066eec61c18e9fa86d24c78a3f11404c2a7a8 SHA512 2b12c409bf16cf9e01e80c30a6707aac5b48ca4cdeac3852028c003c6cb2d50b5e82be73adeefb8341fd4f157e0f7d22505cebfc2ee0f6d64ca77a7d3cfa8271 diff --git a/dev-libs/glib/glib-2.76.4.ebuild b/dev-libs/glib/glib-2.76.4.ebuild index 356bd10b8796..f296a348fdf3 100644 --- a/dev-libs/glib/glib-2.76.4.ebuild +++ b/dev-libs/glib/glib-2.76.4.ebuild @@ -178,7 +178,17 @@ multilib_src_configure() { #esac #fi + local native_file="${T}"/meson.${CHOST}.ini.local + # Workaround for bug #938302 + if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then + cat >> ${native_file} <<-EOF || die + [binaries] + dtrace='stap-dtrace' + EOF + fi + local emesonargs=( + --native-file "${native_file}" -Dbuildtype=$(usex debug debug plain) -Ddefault_library=$(usex static-libs both shared) -Druntime_dir="${EPREFIX}"/run diff --git a/dev-libs/glib/glib-2.78.3.ebuild b/dev-libs/glib/glib-2.78.3.ebuild index 356bd10b8796..f296a348fdf3 100644 --- a/dev-libs/glib/glib-2.78.3.ebuild +++ b/dev-libs/glib/glib-2.78.3.ebuild @@ -178,7 +178,17 @@ multilib_src_configure() { #esac #fi + local native_file="${T}"/meson.${CHOST}.ini.local + # Workaround for bug #938302 + if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then + cat >> ${native_file} <<-EOF || die + [binaries] + dtrace='stap-dtrace' + EOF + fi + local emesonargs=( + --native-file "${native_file}" -Dbuildtype=$(usex debug debug plain) -Ddefault_library=$(usex static-libs both shared) -Druntime_dir="${EPREFIX}"/run diff --git a/dev-libs/glib/glib-2.78.4-r1.ebuild b/dev-libs/glib/glib-2.78.4-r1.ebuild index f3dbbeb1f18b..07caf94eb0dc 100644 --- a/dev-libs/glib/glib-2.78.4-r1.ebuild +++ b/dev-libs/glib/glib-2.78.4-r1.ebuild @@ -187,7 +187,17 @@ multilib_src_configure() { #esac #fi + local native_file="${T}"/meson.${CHOST}.ini.local + # Workaround for bug #938302 + if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then + cat >> ${native_file} <<-EOF || die + [binaries] + dtrace='stap-dtrace' + EOF + fi + local emesonargs=( + --native-file "${native_file}" $(meson_feature debug glib_debug) -Ddefault_library=$(usex static-libs both shared) -Druntime_dir="${EPREFIX}"/run diff --git a/dev-libs/glib/glib-2.78.6.ebuild b/dev-libs/glib/glib-2.78.6.ebuild index 4cb3fb6b75e4..19ae0fc69d73 100644 --- a/dev-libs/glib/glib-2.78.6.ebuild +++ b/dev-libs/glib/glib-2.78.6.ebuild @@ -186,7 +186,17 @@ multilib_src_configure() { #esac #fi + local native_file="${T}"/meson.${CHOST}.ini.local + # Workaround for bug #938302 + if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then + cat >> ${native_file} <<-EOF || die + [binaries] + dtrace='stap-dtrace' + EOF + fi + local emesonargs=( + --native-file "${native_file}" $(meson_feature debug glib_debug) -Ddefault_library=$(usex static-libs both shared) -Druntime_dir="${EPREFIX}"/run diff --git a/dev-libs/glib/glib-2.80.4.ebuild b/dev-libs/glib/glib-2.80.4.ebuild index 1a20959666c2..2d87ba9d7a69 100644 --- a/dev-libs/glib/glib-2.80.4.ebuild +++ b/dev-libs/glib/glib-2.80.4.ebuild @@ -186,7 +186,18 @@ multilib_src_configure() { #fi use debug && EMESON_BUILD_TYPE=debug + + local native_file="${T}"/meson.${CHOST}.ini.local + # Workaround for bug #938302 + if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then + cat >> ${native_file} <<-EOF || die + [binaries] + dtrace='stap-dtrace' + EOF + fi + local emesonargs=( + --native-file "${native_file}" -Ddefault_library=$(usex static-libs both shared) -Druntime_dir="${EPREFIX}"/run $(meson_feature selinux) diff --git a/dev-libs/jsoncpp/Manifest b/dev-libs/jsoncpp/Manifest index 171579c1c7df..266d7a79873a 100644 --- a/dev-libs/jsoncpp/Manifest +++ b/dev-libs/jsoncpp/Manifest @@ -1,3 +1,4 @@ DIST jsoncpp-1.9.5.tar.gz 216055 BLAKE2B 744275297647be8f1ac7bbf6c818e5106fc122591b3fb68c37cf33f5b3b7d6666e8429bb7ca2ae693202a5a83c274303804e21ebb27f05ba235568bf75a9b375 SHA512 1d06e044759b1e1a4cc4960189dd7e001a0a4389d7239a6d59295af995a553518e4e0337b4b4b817e70da5d9731a4c98655af90791b6287870b5ff8d73ad8873 +EBUILD jsoncpp-1.9.5-r1.ebuild 1237 BLAKE2B 81846f3c8a67cd89e031c3f23ab6e8a2b6eb7b05c145e4f8c28c783b58d46ab7a275ae3129e29aa2ccb87eaa156e061669a132859e47646147b7531df80c0cba SHA512 d93c9e9e1713a55d758fa73d3c71732939c752daca237865a4afd4974f949eb1a8ffbeafa6603c233d03c6f575a97bd2acf7e55df2a795070d8b7b84e2eb0035 EBUILD jsoncpp-1.9.5.ebuild 1193 BLAKE2B 15911fb84995505c9925546e61b9077f941270debbb54355d5a22429ce94b51910b7ff1f22fc2d8b4e66aa99b6e031bd99dc218dd2e08f95ffd9c873f4538732 SHA512 1ae4ea3827abc5682db457d8c554580ed05bb80218b6eb73aa0cd845f8c07121b65336fce903b6e50ccdc6ea28f9489502e8404a0d1dfcc364470827344764f4 MISC metadata.xml 473 BLAKE2B cee9ea6f824489bf51f6c293faff24e62bb8c3457d49638b9547d104bfbed8b5c566e429b4d597dfa9b556955450c758261231ce83ea28216c1386a2d645176b SHA512 f7e2f0a82c5370802072e94a727bcb19d138979ab46670f01bdb17ed19b59f8e79bd28d37a8d939917f108fd4a64f53f67153ceaa9dad393840e9eb0247538e1 diff --git a/dev-libs/jsoncpp/jsoncpp-1.9.5-r1.ebuild b/dev-libs/jsoncpp/jsoncpp-1.9.5-r1.ebuild new file mode 100644 index 000000000000..9bcbf81653d3 --- /dev/null +++ b/dev-libs/jsoncpp/jsoncpp-1.9.5-r1.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..13} ) + +inherit meson-multilib python-any-r1 + +DESCRIPTION="C++ JSON reader and writer" +HOMEPAGE="https://github.com/open-source-parsers/jsoncpp/" +SRC_URI=" + https://github.com/open-source-parsers/${PN}/archive/${PV}.tar.gz + -> ${P}.tar.gz +" + +LICENSE="|| ( public-domain MIT )" +SLOT="0/25" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="doc test" +RESTRICT="!test? ( test )" + +BDEPEND=" + ${PYTHON_DEPS} + doc? ( app-text/doxygen ) +" + +multilib_src_configure() { + local emesonargs=( + # Follow Debian, Ubuntu, Arch convention for headers location + # bug #452234 + --includedir include/jsoncpp + -Dtests=$(usex test true false) + ) + meson_src_configure +} + +src_compile() { + meson-multilib_src_compile + + if use doc; then + echo "${PV}" > version || die + "${EPYTHON}" doxybuild.py --doxygen="${EPREFIX}"/usr/bin/doxygen || die + HTML_DOCS=( dist/doxygen/jsoncpp*/. ) + fi +} + +multilib_src_test() { + # increase test timeout due to failures on slower hardware + meson_src_test -t 2 +} diff --git a/dev-libs/libcdada/Manifest b/dev-libs/libcdada/Manifest index fc5b202cc407..8ad987e2e792 100644 --- a/dev-libs/libcdada/Manifest +++ b/dev-libs/libcdada/Manifest @@ -1,7 +1,5 @@ AUX libcdada-0.3.4-Werror.patch 688 BLAKE2B e4c6bf7c8df550a2dbafaab78b9933e39c7c7b8875a6c87c125b25b5396092b17b5e718fbeaf8ac6a79fb759d9378702ca98852e69ef1c782fc069cf85318e9b SHA512 3fb6fcc7ae855c9049256f74d69011a5599307eda280c5d5b546e7a1a8ff08e64eb3a842835753120c498e7f787a86193ef21624a0fd04ef67f8408752fdfe3c AUX libcdada-0.3.5-respect-CFLAGS.patch 850 BLAKE2B 84a52e62571a2f4fb9090d07de5abf3cd6865b698d8c30a6d78d80dc01ee76806a931e999c409d24ac4ccbfd884b5dcd933820801b5aedc1987c3be1e387f377 SHA512 d966ffc87dea5d5cba4a82fea2da401baf5e4cefb17337c955dd86347a240b637f22c2965d58562c81b6b6b65c5b04e606bba887d03e2f855b1ed8267d82c248 -DIST libcdada-0.4.0.tar.gz 1777257 BLAKE2B 26e24fa513ab4a290a7632b4f56c102dc45cd9d34d4a7b7464f58aaee596b5ac3c8172080144d3f3c5cbcf5790f29e74b020f11cea943223e5933c2a7db66f8b SHA512 370a40a070df6783b5f44373bd09751660d51698095fa0ace38943a0331f90a55d131de50180b9ca9597361b7712dbcb350fde77a0e0489c47e4358fec61458b DIST libcdada-0.6.1.tar.gz 1780134 BLAKE2B 8b9d4ab481db4460f5b5426f9f46120649ce5d71fdc322cc32ed17df97add0ce54896c8d304d7c735a79abce02e62b499fff85473e940451a145e8aaf5277234 SHA512 d2ce7f2f98520d49f75bd97624f6f765e47edeccaf6f6a7e61cbea6ef2516b8ee8110e0f1d83d6220d050ac746f2d43cf443f1f70b7c20e03a25f6e98d3f5d51 -EBUILD libcdada-0.4.0.ebuild 990 BLAKE2B 41b35f667cb3bd8a1fde3628d7093706bb8d0634628cfc840a675971a88c16eee18e6de579297ac784bc81c6209dd5907173d7bbb37eaf8ae3f74eed404edd63 SHA512 4c5b28ee2149737b7b2aadfaeda8ba3a899f9fe0a5c75c1016ffda3000e2a352cfeb67084fffacda7a9c41f0c8a3ae0de79eea597076086a35cc634a6b8e91bf EBUILD libcdada-0.6.1.ebuild 991 BLAKE2B a4dcbb47c18fe6078d452b654e3c83b48add2c1346f192c783fe113fec3afc7551bbf47269a7569e8a97cafb204d3b2352e698ed54692431f4058567309dafb5 SHA512 b87c4da1a6787f0a4aa50e5ff45d2aa96c369b44fc8bfeed0e272a71d8f0c29f12f40abcfde87c2abc8f79e5b5bb7a1373413f91e994f797913bacefeb2899f1 MISC metadata.xml 298 BLAKE2B dc523eb0719867c25f38bd413a4229c4b81b1d347184ce3574d32f96691fa907d14ee54e2f0fae3e94006b3465f0c8fb81c33818ec627d2028571b4d14500292 SHA512 5d9f732d34ef76b98a7366339bcfdbe1a3ef40fb49ff6c804d82f0b089fe2559f6cd26406b2028b49caafdbf0b57ffe27750f34143865fe3cb9b56041898a143 diff --git a/dev-libs/libcdada/libcdada-0.4.0.ebuild b/dev-libs/libcdada/libcdada-0.4.0.ebuild deleted file mode 100644 index 754eed86424d..000000000000 --- a/dev-libs/libcdada/libcdada-0.4.0.ebuild +++ /dev/null @@ -1,53 +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-any-r1 - -DESCRIPTION="Basic data structures in C" -HOMEPAGE="https://github.com/msune/libcdada" -SRC_URI="https://github.com/msune/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="test" -RESTRICT="!test? ( test )" -BDEPEND="test? ( ${PYTHON_DEPS} )" - -PATCHES=( - "${FILESDIR}"/${PN}-0.3.4-Werror.patch - "${FILESDIR}"/${PN}-0.3.5-respect-CFLAGS.patch -) - -pkg_setup() { - use test && python-any-r1_pkg_setup -} - -src_prepare() { - default - - eautoreconf -} - -src_configure() { - local myeconfargs=( - $(use_with test tests) - - # Needed for tests. We throw them away in src_install anyway. - --enable-static - - --disable-valgrind - --without-examples - ) - - econf "${myeconfargs[@]}" -} - -src_install() { - default - - find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die -} diff --git a/dev-libs/libclc/Manifest b/dev-libs/libclc/Manifest index c73d07b467fa..ab7999f8779c 100644 --- a/dev-libs/libclc/Manifest +++ b/dev-libs/libclc/Manifest @@ -9,6 +9,7 @@ DIST llvm-project-18.1.8.src.tar.xz.sig 566 BLAKE2B 6ab0efc5b38d4483f4e32e8b8577 DIST llvm-project-19.1.0-rc3.src.tar.xz 141250388 BLAKE2B 6530bede000d2e4b8ce10b445bfc1f81dc25c2d7121fc953581cd9b6989b3ba197707cd79d3c7b94c055bf2e21b0d07ab3cb401d3f73d22eefba6da4b71dca7b SHA512 3ee4eab848e5e38c396e6f5addf5eb42570d451fc8e7cd77150dc5542f8f710f4a9db51836f7a799996dd1b8194defe4d58efe7c19e5d5e1c5f3dbdda94c0cf3 DIST llvm-project-19.1.0-rc3.src.tar.xz.sig 438 BLAKE2B 86bad4d4fb805340096473bc603d7a3483f030f62b6f52b64d12c33561fbbb999c2ab69cc94857a32747492c846a5ab631a84da200b03475fd401335373bbccf SHA512 ef0fd2e3e7069fbfd410cbcf71294d1b7182456330ff151348058b5cb0f292edaecb9dcbf613ee4fc979214a23bd3bb8077d71e674635359da36b938dc143266 DIST llvm-project-503907dc505db1e439e7061113bf84dd105f2e35.tar.gz 218750576 BLAKE2B 40904dbf62cffe9cb757cc1382a765d5c89791948e86bfa4fbdc5a78ebc11cc82588bc730e6c5c84b6d84922cd32290df0146733a013ffa4e408b8a7c2313a1f SHA512 a121cca2ef49c6b25f137e66d23d332d2f9e3bd0d349b1202b6869f7c85a141aecfe20a6c4d4eff84e32a243216740f20114968589207d39df229daf6443ba0d +DIST llvm-project-5500e21942f7047344b6fee62d3e08c0ba2f9182.tar.gz 219148250 BLAKE2B 61880a13086c46ac9a9f8326b1e007146afb1662a0a223703fe36a91da230d5708b368f1177e76ac13c1e5a30f620c4ce6346484a0a67a0f011a816bba4d13f9 SHA512 a6d4fcae960b450be2abd2da485cea638b73290b17ceeabf560651d614f55925f86ee6f76a116262d8a1ff70ba699468cb4cf4c32015e26540ba6e47c58db1b7 EBUILD libclc-15.0.7.ebuild 1668 BLAKE2B ac2bd589fb3c29662799f97b1f649fd22b1b7ce5701879815bc01a05ae88421a830a6a3507b4dead181f24eb4e45c451e8ea1ebbdac2a2de51ddbc3cd9f53c66 SHA512 a3e39fbaddb322360f6362ef21713f375d04e02b2b9a3d43a3d47b26d5d43643a8c654181aef9518aee5f9805d09c446bbbf13342b74f09622e5e1b0c59470b1 EBUILD libclc-16.0.6.ebuild 1665 BLAKE2B 27ffe7083936c466a749550797d109c7a48fc6aaf110977c53ae2d4c5edd558c958a4981020b2c74c6b0c47aeee184edc6e1f192da93f57972fe9cc9abfaa762 SHA512 5007264c688588ec9fd7e74e88a1c1810be2602b744a64d8927275bc8ceaf278d9598222c5d2e3d3fa64504364625b03951752ef7221fd1bf16cc26fbd54ad80 EBUILD libclc-17.0.6.ebuild 1749 BLAKE2B 0b083103fc48654357f621bd3c40002fe9030598a4873519b186b601cd75cc1555a3930f26fe884c1970ddf5728c9a7dffc08e97ebdb151e55b80b204d327a4e SHA512 2509e6ff63a86ba1ceef095fab34b49642b7e6866111c289c124bb7ef9d4bad8f07c4927b45994555386536975c8a4c56401860dca25f2ef2014d9153abb4c8f @@ -16,4 +17,5 @@ EBUILD libclc-18.1.8.ebuild 1302 BLAKE2B f5c4d9d86b2150a602626d7785bae098edf6ff7 EBUILD libclc-19.1.0_rc3.ebuild 1268 BLAKE2B bcf40564f542b2f2c4eaf493e74226472d1a3d151293a1c09ab4940aa7296018eb237e6254d545a850b2e3ad2f1b0a838dc3f04114c13bb947a8d33cdcba8ee3 SHA512 5bcb5ca819b48dc4b24d5ff0689a19c1d897a560fa89fd761d19cca65e46d185d51ec2745f5091fa9383974e0506fe303d6bdc95327a3be154192d580f92c431 EBUILD libclc-20.0.0.9999.ebuild 1268 BLAKE2B bcf40564f542b2f2c4eaf493e74226472d1a3d151293a1c09ab4940aa7296018eb237e6254d545a850b2e3ad2f1b0a838dc3f04114c13bb947a8d33cdcba8ee3 SHA512 5bcb5ca819b48dc4b24d5ff0689a19c1d897a560fa89fd761d19cca65e46d185d51ec2745f5091fa9383974e0506fe303d6bdc95327a3be154192d580f92c431 EBUILD libclc-20.0.0_pre20240822.ebuild 1268 BLAKE2B bcf40564f542b2f2c4eaf493e74226472d1a3d151293a1c09ab4940aa7296018eb237e6254d545a850b2e3ad2f1b0a838dc3f04114c13bb947a8d33cdcba8ee3 SHA512 5bcb5ca819b48dc4b24d5ff0689a19c1d897a560fa89fd761d19cca65e46d185d51ec2745f5091fa9383974e0506fe303d6bdc95327a3be154192d580f92c431 +EBUILD libclc-20.0.0_pre20240830.ebuild 1268 BLAKE2B bcf40564f542b2f2c4eaf493e74226472d1a3d151293a1c09ab4940aa7296018eb237e6254d545a850b2e3ad2f1b0a838dc3f04114c13bb947a8d33cdcba8ee3 SHA512 5bcb5ca819b48dc4b24d5ff0689a19c1d897a560fa89fd761d19cca65e46d185d51ec2745f5091fa9383974e0506fe303d6bdc95327a3be154192d580f92c431 MISC metadata.xml 362 BLAKE2B 768f93d0058e4da4b420569f3f1771dfa7385ad89540bbc18cf53b5a71e3f060a8afa1112ff37570d7fc9dc3e71619fa3fd8d0cf7b5d3954f5110b19e146df30 SHA512 e6335424da09f668953acd39dcd9b03a30e3b509b34b1de5c72644a3740a5b6b287f10e08405b79bafc8104cc4dc1324b7b9d7990c3b560b0235ae82da8c68a5 diff --git a/dev-libs/libclc/libclc-20.0.0_pre20240830.ebuild b/dev-libs/libclc/libclc-20.0.0_pre20240830.ebuild new file mode 100644 index 000000000000..2b8c5e63c257 --- /dev/null +++ b/dev-libs/libclc/libclc-20.0.0_pre20240830.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LLVM_COMPAT=( {17..18} ) +PYTHON_COMPAT=( python3_{10..13} ) +inherit cmake llvm.org llvm-r1 python-any-r1 + +DESCRIPTION="OpenCL C library" +HOMEPAGE="https://libclc.llvm.org/" + +LICENSE="Apache-2.0-with-LLVM-exceptions || ( MIT BSD )" +SLOT="0" +IUSE="+spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi" + +BDEPEND=" + ${PYTHON_DEPS} + $(llvm_gen_dep ' + sys-devel/clang:${LLVM_SLOT} + spirv? ( dev-util/spirv-llvm-translator:${LLVM_SLOT} ) + ') +" + +LLVM_COMPONENTS=( libclc ) +llvm.org_set_globals + +pkg_setup() { + llvm-r1_pkg_setup + python-any-r1_pkg_setup +} + +src_configure() { + local libclc_targets=() + + use spirv && libclc_targets+=( + "spirv-mesa3d-" + "spirv64-mesa3d-" + ) + use video_cards_nvidia && libclc_targets+=( + "nvptx--" + "nvptx64--" + "nvptx--nvidiacl" + "nvptx64--nvidiacl" + ) + use video_cards_r600 && libclc_targets+=( + "r600--" + ) + use video_cards_radeonsi && libclc_targets+=( + "amdgcn--" + "amdgcn-mesa-mesa3d" + "amdgcn--amdhsa" + ) + [[ ${#libclc_targets[@]} ]] || die "libclc target missing!" + + libclc_targets=${libclc_targets[*]} + local mycmakeargs=( + -DLIBCLC_TARGETS_TO_BUILD="${libclc_targets// /;}" + ) + cmake_src_configure +} diff --git a/dev-libs/libconfig/Manifest b/dev-libs/libconfig/Manifest index 8b4626107984..766144df089f 100644 --- a/dev-libs/libconfig/Manifest +++ b/dev-libs/libconfig/Manifest @@ -1,3 +1,3 @@ DIST libconfig-1.7.3.tar.gz 3026416 BLAKE2B 94301be4d6e472fc9daeac7a04074855737ddda94bb5748cd0087fafe192cf674ea1c020808ebf855372188b6b27a57ed185323fa26988bb1fccde0566617cba SHA512 3749bf9eb29bab0f6b14f4fc759f0c419ed27a843842aaabed1ec1fbe0faa8c93322ff875ca1291d69cb28a39ece86d512aec42c2140d566c38c56dc616734f4 -EBUILD libconfig-1.7.3.ebuild 1174 BLAKE2B c392ae7de6900f179b5bbede1fac72ae439c8c0803ca0a95b189873e0418497d6b61f0bb5f9cbf479f1a6d82a48518ffb75b474d24faf05cce9bb0d9e722a7e0 SHA512 e170899e81e30dee561e3ff5dfc1c1f84824ed4b09c15e51446c37ea9363bc85333bdf1334d257eeffa99f8e0a7055ec8648a536a58176d998b4a2938049878a +EBUILD libconfig-1.7.3.ebuild 1248 BLAKE2B 0b6f327c365c64fc3ba3bb1d3bac544e92ab174e6cfeb2ded8850ebfd405d4ffe83b34e8344046df3eb8d65182a1c82ded85b1f6b21f24f7f603bb4fa46a80d2 SHA512 5752e5ca3f525a14298534ab1bafae30464d5af1f9e7bb3e75e6435289123ccdd3eb1bb63229ceee8ed491e3ea359e75a23c0f1760bb825ef0d4ab45f382d99e MISC metadata.xml 253 BLAKE2B e595c2f117852882dd0c6e5e28f2c4f845f0178a5e91d6f4cbb453bd5954b858c3171796a167c71e9cf193060eb3d60a1d1a8a436b868f95a96f800dfeab3372 SHA512 8ee2c2029d048041d487b0448066aa0616d04c6dceb639b0c82e4f0af283fe436de8dd80c1d3a3fcd591c108eb11c17f20b7bc21b88324dd1fa84edc6cf58d80 diff --git a/dev-libs/libconfig/libconfig-1.7.3.ebuild b/dev-libs/libconfig/libconfig-1.7.3.ebuild index 449f75c98860..36cad66a2189 100644 --- a/dev-libs/libconfig/libconfig-1.7.3.ebuild +++ b/dev-libs/libconfig/libconfig-1.7.3.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit autotools multilib-minimal +inherit autotools flag-o-matic multilib-minimal DESCRIPTION="Libconfig is a simple library for manipulating structured configuration files" HOMEPAGE=" @@ -26,9 +26,14 @@ DEPEND=" src_prepare() { default + + # Fails with c23 b/c old decls + append-cflags -std=gnu17 + sed -i \ -e '/sleep 3/d' \ configure.ac || die + eautoreconf multilib_copy_sources } diff --git a/dev-libs/libfstrcmp/Manifest b/dev-libs/libfstrcmp/Manifest index aee0e54dac1f..9d2d17db9b76 100644 --- a/dev-libs/libfstrcmp/Manifest +++ b/dev-libs/libfstrcmp/Manifest @@ -1,6 +1,5 @@ AUX libfstrcmp-0.7-docdir.patch 4491 BLAKE2B 31bfda4805b99de8e590861ff5445bbc88424e1e19b3f70bfac8c86474383ee8cb90bc42daa8a5da05868880336b197f130a4925c7f524224da3ffdf0fe6b680 SHA512 b45621d8cafe0f5f0f70f12e2b2e35399d5e471c724cc4957ee019da40fd6e01bc4b9b2367349fbfb61deec7f1b128c5fd8fce2a2288271295813ad6d0a6641f AUX libfstrcmp-0.7-libtool.patch 1905 BLAKE2B d74c235e4bbfc7a5e3e055beecdda3cd0b215adb537fead2b76bd0ed070cc4f24d4d2d27839ba7cb13dd79004d1ecfd61db5d4202b6ef2d81102c1f970dd356b SHA512 36f3a43dca917fbca4b43236b02033c627c1e36221ab98f0bfc7f85cf926c5634fe05410d87649cf30541bcb014b8c40f18c6f040a74a6e1bb8af21ecde49860 DIST libfstrcmp-0.7.tar.gz 394845 BLAKE2B a8b68fcb8613f0d30e5ff7b862b37408472162585ca71cdff328e3299ff50476fd265467bbd77b352b22bb88c590969044f74d91c5468475504568fd269fa69e SHA512 aaeb0227afd5ada5955cbe6a565254ff88d2028d677d199c00e03b7cb5de1f2c69b18e6e8b032e452350a8eda7081807b01765adbeb8476eaf803d9de6e5509c -EBUILD libfstrcmp-0.7-r1.ebuild 936 BLAKE2B aec038edb10757e1e674b8bf6cce2cc455651d6d4c44fcb9144b766f3e515ff7a8be4e00f2fad33db2b5832b2ad36d924d25c70f51766a4dfe10d3acdd325242 SHA512 93a6953dfd66031ff561a0693aece3c1a2a518e9f2d9f4f4d4e77fcf4e922eb87708a31a9dcbb9f625c138d3247aa1ef80d9ad2d38eb71e68fadb49af592657b EBUILD libfstrcmp-0.7-r3.ebuild 1046 BLAKE2B 453496f0c85098804a067e821bdf003b0f099c6bc06a0223c595f3fdc385c7d9886f5ed8c9041816a3817afa6e142463bb1c25e09add1d2d19206cff0d3d8e9a SHA512 ca8f4857f504554c6cc55cd1a7ada59d26f053a697bfa2df8242ebcac130e2963b6cece2a9e688127e2855e56bad8f80e2b1f7ed054972929a57497624d99e1b MISC metadata.xml 326 BLAKE2B 926108a5954c15305765e37bb63c177e30757266bdc7267d0693f8d9412cca3bc0f1eab55463fe5198980e5adafe191e36fec7bf0dbde4fc72d203d0666b3608 SHA512 abd7abb1a7b5d420e540dae2eea944bad4b16334c40e677277b9a610cf342781e9a38613218ec215a5c3c3abe14c1f83b24185c6061f70d20a28b1c3af6dd395 diff --git a/dev-libs/libfstrcmp/libfstrcmp-0.7-r1.ebuild b/dev-libs/libfstrcmp/libfstrcmp-0.7-r1.ebuild deleted file mode 100644 index 01f2a6f1a330..000000000000 --- a/dev-libs/libfstrcmp/libfstrcmp-0.7-r1.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -DESCRIPTION="Make fuzzy comparisons of strings and byte arrays" -HOMEPAGE="http://fstrcmp.sourceforge.net/" - -LICENSE="GPL-3+" -IUSE="doc static-libs test" -SLOT="0" - -SRC_URI="http://fstrcmp.sourceforge.net/fstrcmp-0.7.D001.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/fstrcmp-0.7.D001" -KEYWORDS="amd64 ~arm arm64 x86" - -DEPEND=" - sys-apps/groff - doc? ( app-text/ghostscript-gpl ) - test? ( app-text/ghostscript-gpl ) -" -RESTRICT="!test? ( test )" - -src_prepare() { - default - eautoreconf -} - -src_compile() { - emake all-bin - use doc && emake all-doc -} - -src_install() { - emake DESTDIR="${D}" install-bin install-include install-libdir install-man - find "${D}" -name '*.la' -delete || die - if ! use static-libs ; then - find "${D}" -name '*.a' -delete || die - fi - use doc && emake DESTDIR="${D}" install-doc - einstalldocs -} diff --git a/dev-libs/npth/Manifest b/dev-libs/npth/Manifest index 7d764f791773..65d1ba140810 100644 --- a/dev-libs/npth/Manifest +++ b/dev-libs/npth/Manifest @@ -1,7 +1,6 @@ AUX npth-1.7-musl.patch 402 BLAKE2B cccb3266238fb4879eb0a80a1d336e58b3647021c3b71e22c0e980050c3790cba3bca21e90b1632ea21e621ebac052df086d33c7a4074739820fbb9a5c03c695 SHA512 b94be7c35f453c579f59b1b49aa2f599bd21b6aa9c85745cdb4893cae5bd737148f9cf6e2afeb8e50d6659e38800048ca8adec687e9c2ac9f461b5fc0c556be4 DIST npth-1.6.tar.bz2 300486 BLAKE2B 665fdb2f4cbe59750b6b4b7c2701ee80a23a122df10c9f8be47c4af5f3bf5968f709637ab3f4878bb68609752fbb6ce1364e109fdfeba64e4db258733a33f3fc SHA512 2ed1012e14a9d10665420b9a23628be7e206fd9348111ec751349b93557ee69f1176bcf7e6b195b35b1c44a5e0e81ee33b713f03d79a33d1ecd9037035afeda2 DIST npth-1.7.tar.bz2 313213 BLAKE2B 39bc5857fb61a4264bef6ff23c28755d2a3b3ceef93034aefd5cf1c2ad905adf696c6753ebd5cea5e0a875df4ecb97db03e023a50a27f51ec0641bbc36b54089 SHA512 8893023bcf953a3f7c490cf8116bed323a9d4af2bea35277e919f437916fda8b8e68ded28ec1777717cf9187c504892556159cbdb8bc02ed4a8b30b3d897d244 -EBUILD npth-1.6-r1.ebuild 1026 BLAKE2B e547f6fd629ea0aa193776e73327eff3cdcd0cdbcc3b693985f814477e34cc3db67786dad076380bb8b753a342eaad4d1cfe7548613c279b57425cc984643042 SHA512 c5568a25e529ca1af2a1a0d99f4b4c37d45bc3bc073617ba5ec712063176dcdea61b6be280783d8a00d830244f4acc26e6bbc9eaf6f105fe308ca80e575090c7 -EBUILD npth-1.6-r2.ebuild 792 BLAKE2B 7942cb2e49768d80be40fcb76e2c8ca3ac9f0325de06541e3b22d1521e4f181e3b2f76fa784e0ffbaac329eb3e3a86974fbe83367dc8a2f807de27565a2b487d SHA512 df08937672e778acb4838b8fe323b42807fbc9b92aeb3f828547538fc6ebb1dafa7fa72daa6abe73bcaa28c83f8f02c78c9d4f44281f7bd978238fb495f70eb6 +EBUILD npth-1.6-r1.ebuild 873 BLAKE2B 03663ce220dde0907c502a1683eae01b73aa4f31a2a285d8ccaaf08c3fba528aa13e8d0cc38522b7db5be20c9634e44a0e22d10e2a19d6db4acd60a07741b33a SHA512 369b0a42b5bcb3d09b64ee3adb1a60fa2674516e4e0c27ea5a9d0ec3aed63d4d85ab764322e40371c151bcb928c16bb63988283d3f30b4d225601b9b39c42908 EBUILD npth-1.7-r1.ebuild 862 BLAKE2B aadede06664ae438b435ebd80f0f478b9fe68b6dea969e92053419fec152d6979e2ad438636abaf47823b9eb90ce429eaeffee784c9d5f5672abe946c530809c SHA512 b3d42567ab37423715c74ad7c7efa668e07718df35065508d05d8354574cba21f4525c3dafad8fe1be741ad6c938df4815a19cd066da9a4404ef8c52f47c6d0e MISC metadata.xml 248 BLAKE2B 8635d7e87f0f2de85f967cadf3324aecfe013decb6f6dbc4338f2bdbb3fad5b61b5a58780f4c6d4759ec51a1b89af067b689b716ad34c71b6f09887536da1493 SHA512 fb771f3d411fc1ab3e5600af41fc51d254b7c2c4d057e80e582fcf2f355f35204e7f61dba852bed35f21c87f2063d7ee0d3a5628395e4ed945955a818deeb37c diff --git a/dev-libs/npth/npth-1.6-r1.ebuild b/dev-libs/npth/npth-1.6-r1.ebuild index 6e83a9465555..0da1d8cb733c 100644 --- a/dev-libs/npth/npth-1.6-r1.ebuild +++ b/dev-libs/npth/npth-1.6-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=7 @@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" LICENSE="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="hppa" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-libs/npth/npth-1.6-r2.ebuild b/dev-libs/npth/npth-1.6-r2.ebuild deleted file mode 100644 index 71d952cdae8c..000000000000 --- a/dev-libs/npth/npth-1.6-r2.ebuild +++ /dev/null @@ -1,34 +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="New GNU Portable Threads Library" -HOMEPAGE="https://git.gnupg.org/cgi-bin/gitweb.cgi?p=npth.git" -SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" - -LICENSE="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="test" -RESTRICT="!test? ( test )" - -src_prepare() { - default - eautoreconf -} - -src_configure() { - append-ldflags $(test-flags-CCLD -Wl,--undefined-version) - - econf $(use_enable test tests) -} - -src_install() { - default - - # no static archives - find "${ED}" -name '*.la' -delete || die -} diff --git a/dev-libs/simdjson/Manifest b/dev-libs/simdjson/Manifest index fd54861c0b68..6eb34bb9dcc0 100644 --- a/dev-libs/simdjson/Manifest +++ b/dev-libs/simdjson/Manifest @@ -3,12 +3,16 @@ AUX simdjson-1.0.0-dont-bundle-cxxopts.patch 611 BLAKE2B 65671f33b25e9569de8a938 AUX simdjson-1.0.0-dont-fetch-data-tarball.patch 658 BLAKE2B e15a9d8186f422f14e66bd42f07b72441f69b6d6c1caf2536f08f56445f3b869f3a97d49e96e12536e5e86fb1f886233724abcad723ccd19e7563c9d5450fe79 SHA512 5e6aabff62a58274ae058ff8f0057569048578207914c9a983ce0c51bd23eb77e272d0c2f92ff7b164a592569fbd677327f83955700967b71e8ada7f1d103646 AUX simdjson-1.0.0-install-tools.patch 933 BLAKE2B 1464f6eba0bc747dc24fc94ceebefdf52fbdd147293fce80a2d3612c0130a4c0a68bbc7dcad5ac1dbe2f1bbd4b6030ade7dd78717c80be74e497872fd66f0037 SHA512 ba399139793ac9b8be76eba69844d74c931c9edaa20adf42f21353bb242ec9d5e093c9cb26e36542b7b8cb12f75a5a8906992b6569c990af77af189318c67ba7 AUX simdjson-3.1.7-tests.patch 562 BLAKE2B f246a10e4c8af534b41314a7dd8a213f598bcdd313a15b1b6697fd4ba9700696d4b581122306c55195e84eeb2dbfb7b577eea4d81093282783db5264b9a27af4 SHA512 4f95c52bf56d170edc08050f17d9eca85c10d25637e385f096caa2ee7d5c7c32cceba9688f98a1c83360880945955c4a7a5c38e3fb72e3a79e477951f341a2ad +AUX simdjson-3.10.0-dont-bundle-cxxopts.patch 611 BLAKE2B ada786ac90539efe8eec01b41478081bff8275ac59524ed3576bbaa43870a7a91e450ac5e1b0de1e715c8572484651217109a97f34f030f19137548bf1c2d6fb SHA512 94f18e42fe0b4b457081da6cb25ff3662de6bef5314be7361a602630430567788b8d5c1695004814d6f33eae54b0bc0ca7e37daadc2c83472b09eedcac596196 +AUX simdjson-3.10.1-tests.patch 1227 BLAKE2B 9fd805f3b2eaee72b319684be528702ce00709469684a4fd6fc7194e0a65ecdb5c425175c594e4ae2d7edacbcde93ad4a6173d1f4d7e7127a33a3f382b36fd92 SHA512 b12cfbcc2b163cf216862b341a16c940cac3f977bb37b23e65761f241d8266e6cf22695e9ec9fd1d2f5a3b936d17913262b2ed0d54f4b263b716464c8353d998 AUX simdjson-3.7.1-data-optional.patch 841 BLAKE2B f207b75c0c9d81f5d35ef9da4eeb39ca00e83a0e8bfcaab717f2c67be36f185fdb6655e1f09adbb5ad543d44776ccd019792800534559fc0c24a03f6d1b4643b SHA512 a6e8aab64822e92944f3710f10f36986ffc01008528f8058902ad6e77b841c3f37ddcf48f09cd164237494185ab122e20225be97a279448eb51f44c08f8b0933 +DIST simdjson-3.10.1.gh.tar.gz 2652674 BLAKE2B 3ccfc55d5bf8ce6a7e8be1b6cb28ed7b6289e23b1d4fe8505e35a42f4ff32a0ee7f500402828164bdeacae1b72e238413575288082151723d6d0c87dcefd1fa0 SHA512 b19fde8d81eaff34b83bb41028d7ee3a408ae5bc896277148e96879b1cba1a7cfc4af0064973bcb07e2b56e0955c3a3a581910d7af23d68510374e7f297c3b7c DIST simdjson-3.6.3.gh.tar.gz 2302220 BLAKE2B c46eeb8a07460cc5427fc35714fd262069cd3d913732e6037d808281d0fed0e82e0423dfd16abaeb515264559fe4454c42f81211354723eb21b212decfe7834b SHA512 b9fa7e554ded4e6cbe9d70ee29aa5b582e58b8b2ada1a781e58746082bb7d31791a4e2ea8b43d9391d783e61e489554f260448029c0b7e730cc69dc44f4aa86a 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-3.9.4.gh.tar.gz 2646588 BLAKE2B c0f0e5d6af2342d338ea7fbe033af2715e4317cd81818fca9dfcc04cb25ffe1eb08683f04d43162305d317178b14ed5f78e8ffa115ed02c7af41b8646c4eae76 SHA512 6fa940ad60b7560d1865806195428ae17f0daf19de803bdb7bd93b0704490994ec3cddc09c9d91f2e70036c6cb34153cdc5c998e7ebee2e4504f6a23944e25c1 DIST simdjson-data-a5b13babe65c1bba7186b41b43d4cbdc20a5c470.tar.gz 6635706 BLAKE2B 563376147f18d590a176a5a0398365db1a3e677b773c018f335efa7fff05ac22ac5dc37613792082a32e6c9b91a773a590f7dfd15efa5ba660f9142b128b28a7 SHA512 168198404b11b8c76ff4f53645d7b5a88a5c72b4a5b6646b4410859ec3416ae9b37fc59f7d2f014ccc785615ea5c31dc00b145dbb1a7acb701b94029dd4ea1e1 +EBUILD simdjson-3.10.1.ebuild 2329 BLAKE2B fd0851ee28f932e8dee350fe89e4101f4e8e8a1002bbc3b05502e73a1c9829987a6b89253a062b9e2bb4eaa138bb755e5148d3deb6ce2cb1caf4951ea2114f83 SHA512 08a6fb367bc8d69f67157f0e2d9e71681cbd844c7355712b764c12a1f47c3c5387a2bcab63e0d29d6772a48e9856c46d5e14f3e94ece80e1f604fe3c4c5c9ea1 EBUILD simdjson-3.6.3.ebuild 2321 BLAKE2B 4eac6784711aff726a783e914fa8924c1b1a7f96d66959bbb929bec3c3613b17a37a381d03b4b495251f7d20c0f369ab4a72fb5b38bd9ee2ea8aaec6d879e991 SHA512 af15e0a19cace3c3c588760ff11398935e8207089cadd13679babd7a2d90a1c2b80f28b980b2aeda296a441f2959d43ab0dc3fea54a2d64f76a11165c2ad2940 EBUILD simdjson-3.9.1.ebuild 2370 BLAKE2B 6ad4c0a75ab0c4b8e8951551a5f74bfc0f8939bd9e1eca475a2244a7c1cf144b3c867c83ebb1f4eea90c8043cfac621d51889f9c8363e631c7d1c5d1283db387 SHA512 9e4a02079594ba7abf9e084e19c19c6ba86c473daf8c2c3d8908cf8f9cd3f0da47541cd441a4408572157106d3ad30dbd25bb82399510ffd12e896523d80c742 EBUILD simdjson-3.9.3.ebuild 2375 BLAKE2B 2654cfa619c94e80cab4f90ac71bbf5544817933d5d9f428d3fffebf2cd06e9c64bd438c96641c44e235167c55011c2f647f4d9a9c1a536dd5a2964cc43bd98c SHA512 cea5b77ab55d00737f47e1640dd9a255df4d8163eeafb6f7baf8d41d8549cfde02e21c83acfd4bb2dbd4065129686406231f72b3653406b3353c86dc1fcfad7e diff --git a/dev-libs/simdjson/files/simdjson-3.10.0-dont-bundle-cxxopts.patch b/dev-libs/simdjson/files/simdjson-3.10.0-dont-bundle-cxxopts.patch new file mode 100644 index 000000000000..cd735888b232 --- /dev/null +++ b/dev-libs/simdjson/files/simdjson-3.10.0-dont-bundle-cxxopts.patch @@ -0,0 +1,20 @@ +diff --git a/dependencies/CMakeLists.txt b/dependencies/CMakeLists.txt +index b9802392..056a0635 100644 +--- a/dependencies/CMakeLists.txt ++++ b/dependencies/CMakeLists.txt +@@ -146,15 +146,3 @@ endfunction() + if(SIMDJSON_COMPETITION) + competition_scope_() + endif() +- +-cmake_dependent_option(SIMDJSON_CXXOPTS "Download cxxopts (necessary for tools)" ON +- SIMDJSON_ALLOW_DOWNLOADS OFF) +- +-if(SIMDJSON_CXXOPTS) +- set_off(CXXOPTS_BUILD_EXAMPLES) +- set_off(CXXOPTS_BUILD_TESTS) +- set_off(CXXOPTS_ENABLE_INSTALL) +- +- import_dependency(cxxopts jarro2783/cxxopts 5965670) +- add_dependency(cxxopts) +-endif() diff --git a/dev-libs/simdjson/files/simdjson-3.10.1-tests.patch b/dev-libs/simdjson/files/simdjson-3.10.1-tests.patch new file mode 100644 index 000000000000..a5eade492ec6 --- /dev/null +++ b/dev-libs/simdjson/files/simdjson-3.10.1-tests.patch @@ -0,0 +1,33 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ca23a8a0..0bf54dd6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -303,12 +303,11 @@ endif() + # + # Compile tools / tests / benchmarks + # +-add_subdirectory(tests) +-add_subdirectory(examples) +-if(CMAKE_SIZEOF_VOID_P EQUAL 8) # we only include the benchmarks on 64-bit systems. +- add_subdirectory(benchmark) ++if (SIMDJSON_TESTS) ++ add_subdirectory(tests) ++ add_subdirectory(fuzz) + endif() +-add_subdirectory(fuzz) ++add_subdirectory(examples) + + # + # Source files should be just ASCII +diff --git a/tests/ondemand/compilation_failure_tests/CMakeLists.txt b/tests/ondemand/compilation_failure_tests/CMakeLists.txt +index 54b74afb..b14567d3 100644 +--- a/tests/ondemand/compilation_failure_tests/CMakeLists.txt ++++ b/tests/ondemand/compilation_failure_tests/CMakeLists.txt +@@ -13,6 +13,7 @@ function(add_dual_compile_test TEST_NAME) + target_compile_definitions(${TEST_NAME}_should_not_compile PRIVATE COMPILATION_TEST_USE_FAILING_CODE=1) + endfunction(add_dual_compile_test) + ++target_compile_options(simdjson-internal-flags INTERFACE -Werror=uninitialized) + add_dual_compile_test(iterate_object) + add_dual_compile_test(iterate_array) + add_dual_compile_test(iterate_char_star) diff --git a/dev-libs/simdjson/simdjson-3.10.1.ebuild b/dev-libs/simdjson/simdjson-3.10.1.ebuild new file mode 100644 index 000000000000..26ee1b77d4e9 --- /dev/null +++ b/dev-libs/simdjson/simdjson-3.10.1.ebuild @@ -0,0 +1,102 @@ +# Copyright 2020-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs cmake + +DATA_HASH="a5b13babe65c1bba7186b41b43d4cbdc20a5c470" +DESCRIPTION="SIMD accelerated C++ JSON library" +HOMEPAGE=" + https://simdjson.org/ + https://github.com/simdjson/simdjson +" +SRC_URI=" + https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz + test? ( https://github.com/${PN}/${PN}-data/archive/${DATA_HASH}.tar.gz -> ${PN}-data-${DATA_HASH}.tar.gz ) +" + +LICENSE="Apache-2.0 Boost-1.0 BSD MIT" +SLOT="0/23" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~x86" +IUSE="+all-impls test tools" + +BDEPEND=" + sys-apps/file + sys-apps/grep + virtual/pkgconfig +" +DEPEND=" + tools? ( >=dev-libs/cxxopts-3.2:= ) +" + +REQUIRED_USE="test? ( tools )" +RESTRICT="!test? ( test )" + +PATCHES=( + "${FILESDIR}/simdjson-3.10.0-dont-bundle-cxxopts.patch" + "${FILESDIR}/simdjson-1.0.0-install-tools.patch" + "${FILESDIR}/simdjson-3.7.1-data-optional.patch" + "${FILESDIR}/simdjson-3.10.1-tests.patch" +) + +DOCS=( + AUTHORS + CONTRIBUTING.md + CONTRIBUTORS + HACKING.md + README.md +) + +src_prepare() { + if use test; then + 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 + sed -e '/Werror/ d ; /Werror/ d ' -i tests/ondemand/compilation_failure_tests/CMakeLists.txt || die + sed -e "s:^c++ :$(tc-getCXX) :" -i singleheader/README.md || die + mv tools/{,simd}jsonpointer.cpp || die + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DSIMDJSON_ENABLE_THREADS:BOOL=ON + ) + use test && mycmakeargs+=( + -DSIMDJSON_TESTS:BOOL=ON + ) + + if use tools; then + mycmakeargs+=( + -DSIMDJSON_DEVELOPER_MODE:BOOL=ON + -DSIMDJSON_ALLOW_DOWNLOADS:BOOL=OFF + -DSIMDJSON_GOOGLE_BENCHMARKS:BOOL=OFF + -DSIMDJSON_COMPETITION:BOOL=OFF + -DSIMDJSON_TOOLS:BOOL=ON + ) + elif ! use test; then + mycmakeargs+=( + -DSIMDJSON_DEVELOPER_MODELBOOL=OFF + ) + fi + + if use all-impls; then + local -a impls=("fallback") + if use amd64; then + impls+=("westmere" "haswell" "icelake") + elif use arm64; then + impls+=("arm64") + elif use ppc64; then + impls+=("ppc64") + fi + + mycmakeargs+=( + -DSIMDJSON_IMPLEMENTATION:STRING=$(printf '%s;' "${impls[@]}") + ) + fi + + cmake_src_configure +} diff --git a/dev-libs/skalibs/Manifest b/dev-libs/skalibs/Manifest index b627f6c75206..b7719f74749f 100644 --- a/dev-libs/skalibs/Manifest +++ b/dev-libs/skalibs/Manifest @@ -1,5 +1,3 @@ -DIST skalibs-2.14.1.1.tar.gz 237220 BLAKE2B 880f40a640e7680f847f8d9eb5e90ca472583d0badfbf233707be9bf64e2eb172543fdc9b663c99c3a5839ed58dbf7befebf9aa75820c9be9d70cd0c37959665 SHA512 01b3da7614ee626f838b62aff6fa2d4677ab5c5dfffcb3145232db9ac0b5bf70c063f4d83abdee809139fee721c75550eb997e2c3e265417b9493c98886236f9 DIST skalibs-2.14.2.0.tar.gz 242763 BLAKE2B 5a172245ae27eeb6a41f943e285f3e40d66324a60a1190afbbb4cdbc3fbbd0cace0feac9666c02c2adddbbac477741e578d2a3d4af707799704ed8050245783b SHA512 b96491e6429cc69bc75f50be99b7b18769cb756c1a82f698994c23aefb16bc68ee5558076993b948a6674203ecd82a454a978c89f450c219cc2728d52b7f5656 -EBUILD skalibs-2.14.1.1.ebuild 911 BLAKE2B 18789dbc3969551197f38ec4721b024f386421e4924d358393b07e66272c4cc668c076147f51e95387fb6e3f44f4c3b183158df00965a033fe669ae44c91156d SHA512 3801feda4d890e081f3600be2bb1bc6da078ababf6dcf1e2ceb4b770f2990885cfc6ae651f3df4e82689e99e5f5f787a7956cb554c6dc56b495f7703f6fb1dae EBUILD skalibs-2.14.2.0.ebuild 911 BLAKE2B 18789dbc3969551197f38ec4721b024f386421e4924d358393b07e66272c4cc668c076147f51e95387fb6e3f44f4c3b183158df00965a033fe669ae44c91156d SHA512 3801feda4d890e081f3600be2bb1bc6da078ababf6dcf1e2ceb4b770f2990885cfc6ae651f3df4e82689e99e5f5f787a7956cb554c6dc56b495f7703f6fb1dae MISC metadata.xml 355 BLAKE2B 66e0a671da1ad125bd77d9d05bf03ea2e4bb9f8ec0c91bfe2f5b87192ce2de48a5137105af6e34260fb53c0a858577bc63681a53436d40ae635d87b2a346da25 SHA512 c6240c87d05a08450803a5887077715842112da1fa49264a8594735909d07e76a25a10bff4b09e7cf6049081153f520ac12019d93384357b692734ce82b07089 diff --git a/dev-libs/skalibs/skalibs-2.14.1.1.ebuild b/dev-libs/skalibs/skalibs-2.14.1.1.ebuild deleted file mode 100644 index 1740c9906c0f..000000000000 --- a/dev-libs/skalibs/skalibs-2.14.1.1.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit toolchain-funcs - -DESCRIPTION="General-purpose libraries from skarnet.org" -HOMEPAGE="https://www.skarnet.org/software/skalibs/" -SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz" - -LICENSE="ISC" -SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~alpha amd64 arm ~arm64 ~mips ~ppc ~ppc64 ~riscv x86" - -HTML_DOCS=( doc/. ) - -src_prepare() { - default - - # Avoid QA warning for LDFLAGS addition - sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die - - sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die -} - -src_configure() { - tc-export AR CC RANLIB - - local myconf=( - --dynlibdir="/$(get_libdir)" - --libdir="/usr/$(get_libdir)/${PN}" - --sysdepdir="/usr/$(get_libdir)/${PN}" - --sysconfdir=/etc - - --disable-static - --enable-clock - --enable-ipv6 - --enable-shared - ) - - econf "${myconf[@]}" -} diff --git a/dev-libs/uthash/Manifest b/dev-libs/uthash/Manifest index 1a52704bf885..3bda78a202ae 100644 --- a/dev-libs/uthash/Manifest +++ b/dev-libs/uthash/Manifest @@ -1,4 +1,5 @@ AUX uthash-2.1.0-cflags.patch 228 BLAKE2B 2f6e1ee3b9bcac275c40470567ff1c044f727546d7c1c62f72c6d85a38c477c7a439d1924188f046ac263f21153f5499a1aa29aa0b9061b0e683f101951f1b53 SHA512 046e619a75a8ef28c7c18d078ffba1653971536a287ded36b22c6700358351fd95b2709318ed05d68e81edc13a8f7abdb03d0c5616a01817752fec45605215c1 DIST uthash-2.3.0.tar.gz 191291 BLAKE2B 473e263df9f3555c9ef41c2b39cf2ed33a4624ce7325bbe52db805ac741b8383e64f84a9e249f96faf40e0b94fa4a7fc6c0e83bebe8b3677a90cdca82a4e3f51 SHA512 3b01f1074790fb242900411cb16eb82c1a9afcf58e3196a0f4611d9d7ef94690ad38c0a500e7783d3efa20328aa8d6ab14f246be63b3b3d385502ba2b6b2a294 +EBUILD uthash-2.3.0-r1.ebuild 691 BLAKE2B d73cfbc340371e7cd5ed5b4719142e23406d54acc3701518a1cb0abba0fbd4c6806b9df01226a490c47a12582bcd84f9be26503a515daedf1ff2f6b11f78f669 SHA512 2f5a6c5f39004fed021ab377847b6df43fceb4a09defc8acc3c4bf833e3e50b0188a35ef69137c67fe0058d21e447ba7f543fef800b7d2b2526fd73c6451cf0b EBUILD uthash-2.3.0.ebuild 686 BLAKE2B 55b47ad29705ae59690ee7913e5ed1d10934601f93835e76cf454e7e722573ed7b0213543104097864eeef59e5736adc6b811f37f8e2d7cb232383877f52e114 SHA512 8acbddec748bfd69e252cbe9c15a2f035fc29ebd1a533c284ada967d95dee1da9cc040c9d48fad5ad759f4b3bba98ebb75a0b3e74476eece93f65235a00679a0 MISC metadata.xml 331 BLAKE2B 76ba42705c20d4af2dc65c5fcde3b4afdb1a9cc04c4e21dae8fba586e5d88f4d57a451aa7a45a48decab322db2e4f908d98b3fe7a49d7feb61b498e32684767e SHA512 22870b5b51a37438c16c3bd5335eab20cbc6e737a3cd98525aa3811494427513b5a9ee3bcbcf2f2dec69273edadc524bea06043173437e9c930955fd9d678611 diff --git a/dev-libs/uthash/uthash-2.3.0-r1.ebuild b/dev-libs/uthash/uthash-2.3.0-r1.ebuild new file mode 100644 index 000000000000..05c456d3d563 --- /dev/null +++ b/dev-libs/uthash/uthash-2.3.0-r1.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="An easy-to-use hash implementation for C programmers" +HOMEPAGE="https://troydhanson.github.io/uthash/index.html" +SRC_URI="https://github.com/troydhanson/uthash/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD-1" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + +BDEPEND="test? ( dev-lang/perl )" + +PATCHES=( + "${FILESDIR}"/${PN}-2.1.0-cflags.patch +) + +src_configure() { + tc-export CC +} + +src_test() { + emake -C tests +} + +src_install() { + doheader src/*.h + dodoc doc/*.txt +} |