diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-09-03 22:19:54 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-09-03 22:19:54 +0100 |
commit | 71f9cc21aab4168093940b3d2e267444d712bff5 (patch) | |
tree | 15406e14be0cd3cfbafe191468b8825b3ccc1855 /dev-libs | |
parent | 312456186919deebd1ea3b34b9e26b1e15ebd5b6 (diff) |
gentoo auto-resync : 03:09:2022 - 22:19:54
Diffstat (limited to 'dev-libs')
-rw-r--r-- | dev-libs/Manifest.gz | bin | 95604 -> 95611 bytes | |||
-rw-r--r-- | dev-libs/boost/Manifest | 5 | ||||
-rw-r--r-- | dev-libs/boost/boost-1.80.0.ebuild | 341 | ||||
-rw-r--r-- | dev-libs/boost/files/boost-1.80.0-disable_icu_rpath.patch | 13 | ||||
-rw-r--r-- | dev-libs/boost/files/boost-1.80.0-fix-mips1-transition.patch | 24 | ||||
-rw-r--r-- | dev-libs/boost/files/boost-1.80.0-unordered-fix.patch | 192 | ||||
-rw-r--r-- | dev-libs/vala-common/Manifest | 2 | ||||
-rw-r--r-- | dev-libs/vala-common/vala-common-0.56.3.ebuild | 29 |
8 files changed, 606 insertions, 0 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz Binary files differindex 015f24e83c07..f9db4cb457dd 100644 --- a/dev-libs/Manifest.gz +++ b/dev-libs/Manifest.gz diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest index 1d236a62560a..cbded1830750 100644 --- a/dev-libs/boost/Manifest +++ b/dev-libs/boost/Manifest @@ -4,6 +4,11 @@ AUX boost-1.79.0-build-auto_index-tool.patch 265 BLAKE2B 05e52ca716522db7bb11b48 AUX boost-1.79.0-context-x32.patch 1116 BLAKE2B 16b6ddbdc47d72d5afd39e61441f9f094dff8db46bd7fa4e04e5a8b132c8894c51db506d20356c352022f42d5b9a9923f23c5db2b0f9fa1c64ceeb4e50e16be1 SHA512 cf76691d4adbc4b43f468c587fea23c43e1b337ba7eebff2c856b0403bf32b78826f483faca25a4459c1d47eabbd5b67c65863a4d44407990178022433f718bf AUX boost-1.79.0-disable_icu_rpath.patch 1077 BLAKE2B c4549b7a706cd934392bdafb44ee89987534d5cca48060b955a4b998f0ac6c8a96b5c0d6f5d46476a0225ba6e66fabc095ec12c0f0c43a60c7147ef922e8a2ae SHA512 7095d94def1ee04f009f0c2e84d0450705211793f6d18ac4a3e0fb673a36127282f31172a7f571ed89f4128b6ffbc38d850e6105a5ad5224d42749557db41ee0 AUX boost-1.79.0-fix-mips1-transition.patch 1623 BLAKE2B c44ed1a6eaf89e30c4150b42e5b26cebc8742b2446939cd3310c45a5f4c6c6d6bd84ef72f2a47991cea8a664296854651d857609a8f5500e283176de99d68dfd SHA512 aec8ddd77e25e5549c12099e57c66354baa9da79188ee7a054e98b5ad9d7f8510e7f00ccd8fd3e50d004f184ea6e3ef62f815e05db16740d286171dce2d83929 +AUX boost-1.80.0-disable_icu_rpath.patch 632 BLAKE2B f7bccbc7cf00a6c3a6eb63bddb049647c958592c4768d0a8868b7b03f02e37de54722da930340fa91c5b3b3ba1f44b1c4e0b28525c8ccf19f643dbe4b3d0561b SHA512 21c9afc7f8c6095476b075f78f3af7e8afaf50f33ec8166b5a11ed7d778c80e3a81c8ef04a20d8878a7bb47ba9cb947f7688de52fa7598497866d76fcb678f05 +AUX boost-1.80.0-fix-mips1-transition.patch 1041 BLAKE2B 03ac38ed4d403f1d75a3ade98076593e93336c77e807ab2ce0f5b9393bb2f7dd59c56a9e0fba647825eca0310e2e3f9eacd52eff17f8363cb76c9559413612c5 SHA512 a61e75322486e1e09efcf2e8f3d341c600c6b871d15ac3478573758b33cf7e9752a8576d4e02c4331dc38d568fb3386e733826502c6183aea2e1e90d9283c1a2 +AUX boost-1.80.0-unordered-fix.patch 7067 BLAKE2B 1a465a764dd510ec7bbbee4a2d5ca12982ee4a7dca9a605195492810c952918185c79d7d326d9eda063c0ede7a3a2c86b48ab2dc2a92b8debe4e0ee00d3e7a29 SHA512 bccdb2b136c5d99a4bfc60445ff0aa07ecffccc522215820336d55a6c4cb1a0b5636a98180e3f1af543722d4977bc2c6ce1e2b9d6156b4ecbeb398fab7a3fcb7 DIST boost_1_79_0.tar.bz2 113456811 BLAKE2B 61f47ca022e60745868e6bdd3b5c75603dd68d878e126dcbb73de5b40fc03c0eec8eede3ec304ece58050435ef2fc1ed7eb763773c20673f85e32bbf4d5f978a SHA512 70909e0561c213d10a1fdd692f9ae7b293d3cdc63e925bdc207da9e9bba6e86474341100e7ee5de6d94f9561196b1a3a1597055a7b7382babf8931131170a312 +DIST boost_1_80_0.tar.bz2 115869904 BLAKE2B 507e811be7659442c41bc2d99811bd02a236dc94932e1a7a8cf256243b479f2d2707819cd99e016a51c9dadc215713e803afdd9ea4c105af8d5d2d28d3d06a1f SHA512 829a95b463473d69ff79ea41799c68429bb79d3b2321fbdb71df079af237ab01de9ad7e9612d8783d925730acada010068d2d1aa856c34244ee5c0ece16f208f EBUILD boost-1.79.0.ebuild 10641 BLAKE2B 44e43c096af4e3e30d96cffbd21df7111f76453f53b5cc604171addeda32b9cd05560b0c375f8cede3223c95ff07afc9efcfdd8faada0524dd45b4330ea6f591 SHA512 b81c002b0493a966ff11bad777cf73d5a4bef08f6ae4f3a68aa9de82d2c86cf33af89dbfd62a9a502b123c9c63f3f497fa5b6959e9fa1172f114bc5d800ac05f +EBUILD boost-1.80.0.ebuild 10836 BLAKE2B b312b1f2f16265d17329618294e53add848c7978abf0a802c0b1f960dbe7ab7bec493771148c4fcb9328dbf9e93277450f28b36d38d135de3b30886ab1f10f7e SHA512 a52c75c8c5819c58bc879b1e5e7ff8cc06346c2c431be651411d80398ae8c840eea4d543cb7c725ec62b27712b3bf4003f475f0b945c8d542d0fd062921732f9 MISC metadata.xml 1350 BLAKE2B 5fd10a89cb215629c0a7a0dfd134b3d187312e49c2f77a77666f9c30128f0feec1a82dac64bec80b0f3e20f0f9648924290323e818738da07e1ce8a3112398fa SHA512 3a3584abd5be99dc70daa63bf86ff716ba310dcc7f3aa8bbae5be3e20762ed856eaf372ee9dbdab4c00bc3622288d96816eaef9f639f07cf245de501da917f65 diff --git a/dev-libs/boost/boost-1.80.0.ebuild b/dev-libs/boost/boost-1.80.0.ebuild new file mode 100644 index 000000000000..712ad83f404a --- /dev/null +++ b/dev-libs/boost/boost-1.80.0.ebuild @@ -0,0 +1,341 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..11} ) + +inherit flag-o-matic multiprocessing python-r1 toolchain-funcs multilib-minimal + +MY_PV="$(ver_rs 1- _)" +MAJOR_V="$(ver_cut 1-2)" + +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 ${MAJOR_V} due to bug 486122 +#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +IUSE="bzip2 context debug doc icu lzma +nls mpi numpy python 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=" + !<dev-libs/leatherman-1.12.0-r1 + bzip2? ( app-arch/bzip2:=[${MULTILIB_USEDEP}] ) + icu? ( >=dev-libs/icu-3.6:=[${MULTILIB_USEDEP}] ) + !icu? ( virtual/libiconv[${MULTILIB_USEDEP}] ) + lzma? ( app-arch/xz-utils:=[${MULTILIB_USEDEP}] ) + mpi? ( >=virtual/mpi-2.0-r4[${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-util/boost-build-${MAJOR_V}" + +PATCHES=( + "${FILESDIR}"/${PN}-1.80.0-disable_icu_rpath.patch + "${FILESDIR}"/${PN}-1.79.0-context-x32.patch + "${FILESDIR}"/${PN}-1.79.0-build-auto_index-tool.patch + # Boost.MPI's __init__.py doesn't work on Py3 + "${FILESDIR}"/${PN}-1.79.0-boost-mpi-python-PEP-328.patch + "${FILESDIR}"/${PN}-1.80.0-fix-mips1-transition.patch + # (upstreamed) + "${FILESDIR}"/${PN}-1.80.0-unordered-fix.patch +) + +python_bindings_needed() { + multilib_is_native_abi && use python +} + +tools_needed() { + multilib_is_native_abi && use tools +} + +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)" + if [[ ${CHOST} == *-darwin* ]]; then + compiler="darwin" + compiler_version="$(gcc-fullversion)" + else + compiler="gcc" + compiler_version="$(gcc-version)" + fi + + if use mpi; then + local mpi_configuration="using mpi ;" + fi + + cat > "${user_config_jam}" <<- __EOF__ || die + using ${compiler} : ${compiler_version} : ${compiler_executable} : <cflags>"${CFLAGS}" <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" <archiver>"$(tc-getAR)" <ranlib>"$(tc-getRANLIB)" ; + ${mpi_configuration} + __EOF__ + + if python_bindings_needed; 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 python_bindings_needed && 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 python_bindings_needed; 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') + --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 +} + +multilib_src_compile() { + ejam \ + --prefix="${EPREFIX}"/usr \ + "${OPTIONS[@]}" || die + + if tools_needed; 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 tools_needed; 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 + refs=$(otool -XL "${d}" | \ + sed -e '1d' -e 's/^\t//' | \ + grep "^libboost_" | \ + cut -f1 -d' ') + local r + for r in ${refs}; do + ebegin " correcting reference to ${r}" + install_name_tool -change \ + "${r}" \ + "${EPREFIX}/usr/lib/${r}" \ + "${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 "${S}"/libs/mpi/build/__init__.py + + 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.80.0-disable_icu_rpath.patch b/dev-libs/boost/files/boost-1.80.0-disable_icu_rpath.patch new file mode 100644 index 000000000000..1f4ec29fcf00 --- /dev/null +++ b/dev-libs/boost/files/boost-1.80.0-disable_icu_rpath.patch @@ -0,0 +1,13 @@ +--- a/libs/locale/build/Jamfile.v2 ++++ b/libs/locale/build/Jamfile.v2 +@@ -82,8 +82,8 @@ ICU_LINK ?= [ modules.peek : ICU_LINK_LOCALE ] ; + + if $(ICU_LINK) + { +- ICU_OPTS = <include>$(icu-path)/include <linkflags>$(ICU_LINK) <dll-path>$(icu-path)/bin <runtime-link>shared ; +- ICU64_OPTS = <include>$(icu-path)/include <linkflags>$(ICU_LINK) <dll-path>$(icu-path)/bin64 <runtime-link>shared ; ++ ICU_OPTS = <include>$(icu_path)/include <linkflags>$(ICU_LINK) <runtime-link>shared ; ++ ICU64_OPTS = <include>$(icu_path)/include <linkflags>$(ICU_LINK) <runtime-link>shared ; + } else + { + searched-lib icuuc : : <name>icuuc diff --git a/dev-libs/boost/files/boost-1.80.0-fix-mips1-transition.patch b/dev-libs/boost/files/boost-1.80.0-fix-mips1-transition.patch new file mode 100644 index 000000000000..4f5e81c925b3 --- /dev/null +++ b/dev-libs/boost/files/boost-1.80.0-fix-mips1-transition.patch @@ -0,0 +1,24 @@ +--- a/boostcpp.jam ++++ b/boostcpp.jam +@@ -634,7 +634,7 @@ rule address-model ( ) + return <conditional>@boostcpp.deduce-address-model ; + } + +-local deducable-architectures = arm mips1 power riscv s390x sparc x86 combined ; ++local deducable-architectures = arm mips power riscv s390x sparc x86 combined ; + feature.feature deduced-architecture : $(deducable-architectures) : propagated optional composite hidden ; + for a in $(deducable-architectures) + { +@@ -645,10 +645,10 @@ rule deduce-architecture ( properties * ) + { + local result ; + local filtered = [ toolset-properties $(properties) ] ; +- local names = arm mips1 power riscv s390x sparc x86 combined ; ++ local names = arm mips power riscv s390x sparc x86 combined ; + local idx = [ configure.find-builds "default architecture" : $(filtered) + : /boost/architecture//arm +- : /boost/architecture//mips1 ++ : /boost/architecture//mips + : /boost/architecture//power + : /boost/architecture//riscv + : /boost/architecture//s390x diff --git a/dev-libs/boost/files/boost-1.80.0-unordered-fix.patch b/dev-libs/boost/files/boost-1.80.0-unordered-fix.patch new file mode 100644 index 000000000000..51776094386e --- /dev/null +++ b/dev-libs/boost/files/boost-1.80.0-unordered-fix.patch @@ -0,0 +1,192 @@ +From f9eae4153f4ea9aac4b6c46e660ec92824d5827f Mon Sep 17 00:00:00 2001 +From: Christian Mazakas <christian.mazakas@gmail.com> +Date: Tue, 16 Aug 2022 14:34:58 -0700 +Subject: [PATCH] Update code to be valid when the internal `buckets_` data + member is moved-from + +--- + boost/unordered/detail/fca.hpp | 18 +++++-- + .../boost/unordered/detail/implementation.hpp | 49 +++++++++++-------- + boost/unordered/unordered_map.hpp | 8 +++ + boost/unordered/unordered_set.hpp | 8 +++ + 4 files changed, 58 insertions(+), 25 deletions(-) + +diff --git a/boost/unordered/detail/fca.hpp b/boost/unordered/detail/fca.hpp +index 19fafe739..a1d14d957 100644 +--- a/boost/unordered/detail/fca.hpp ++++ b/boost/unordered/detail/fca.hpp +@@ -646,7 +646,7 @@ namespace boost { + + size_type bucket_count() const { return size_; } + +- iterator begin() const { return ++at(size_); } ++ iterator begin() const { return size_ == 0 ? end() : ++at(size_); } + + iterator end() const + { +@@ -660,6 +660,10 @@ namespace boost { + + local_iterator begin(size_type n) const + { ++ if (size_ == 0) { ++ return this->end(n); ++ } ++ + return local_iterator( + (buckets + static_cast<difference_type>(n))->next); + } +@@ -670,12 +674,16 @@ namespace boost { + + iterator at(size_type n) const + { +- std::size_t const N = group::N; ++ if (size_ > 0) { ++ std::size_t const N = group::N; + +- iterator pbg(buckets + static_cast<difference_type>(n), +- groups + static_cast<difference_type>(n / N)); ++ iterator pbg(buckets + static_cast<difference_type>(n), ++ groups + static_cast<difference_type>(n / N)); + +- return pbg; ++ return pbg; ++ } else { ++ return this->end(); ++ } + } + + span<Bucket> raw() +diff --git a/boost/unordered/detail/implementation.hpp b/boost/unordered/detail/implementation.hpp +index 2cc27c5d4..373236754 100644 +--- a/boost/unordered/detail/implementation.hpp ++++ b/boost/unordered/detail/implementation.hpp +@@ -2054,12 +2054,14 @@ namespace boost { + + std::size_t bucket_size(std::size_t index) const + { +- bucket_iterator itb = buckets_.at(index); +- node_pointer n = itb->next; + std::size_t count = 0; +- while (n) { +- ++count; +- n = n->next; ++ if (size_ > 0) { ++ bucket_iterator itb = buckets_.at(index); ++ node_pointer n = itb->next; ++ while (n) { ++ ++count; ++ n = n->next; ++ } + } + return count; + } +@@ -2420,11 +2422,14 @@ namespace boost { + node_pointer find_node_impl( + Key const& x, bucket_iterator itb) const + { +- key_equal const& pred = this->key_eq(); +- node_pointer p = itb->next; +- for (; p; p = p->next) { +- if (pred(x, extractor::extract(p->value()))) { +- break; ++ node_pointer p = node_pointer(); ++ if (itb != buckets_.end()) { ++ key_equal const& pred = this->key_eq(); ++ p = itb->next; ++ for (; p; p = p->next) { ++ if (pred(x, extractor::extract(p->value()))) { ++ break; ++ } + } + } + return p; +@@ -2453,11 +2458,13 @@ namespace boost { + inline iterator transparent_find( + Key const& k, Hash const& h, Pred const& pred) const + { +- std::size_t const key_hash = h(k); +- bucket_iterator itb = buckets_.at(buckets_.position(key_hash)); +- for (node_pointer p = itb->next; p; p = p->next) { +- if (BOOST_LIKELY(pred(k, extractor::extract(p->value())))) { +- return iterator(p, itb); ++ if (size_ > 0) { ++ std::size_t const key_hash = h(k); ++ bucket_iterator itb = buckets_.at(buckets_.position(key_hash)); ++ for (node_pointer p = itb->next; p; p = p->next) { ++ if (BOOST_LIKELY(pred(k, extractor::extract(p->value())))) { ++ return iterator(p, itb); ++ } + } + } + +@@ -2467,11 +2474,13 @@ namespace boost { + template <class Key> + node_pointer* find_prev(Key const& key, bucket_iterator itb) + { +- key_equal pred = this->key_eq(); +- for (node_pointer* pp = boost::addressof(itb->next); *pp; +- pp = boost::addressof((*pp)->next)) { +- if (pred(key, extractor::extract((*pp)->value()))) { +- return pp; ++ if (size_ > 0) { ++ key_equal pred = this->key_eq(); ++ for (node_pointer* pp = boost::addressof(itb->next); *pp; ++ pp = boost::addressof((*pp)->next)) { ++ if (pred(key, extractor::extract((*pp)->value()))) { ++ return pp; ++ } + } + } + typedef node_pointer* node_pointer_pointer; +diff --git a/boost/unordered/unordered_map.hpp b/boost/unordered/unordered_map.hpp +index 97908fb65..3e25a28a2 100644 +--- a/boost/unordered/unordered_map.hpp ++++ b/boost/unordered/unordered_map.hpp +@@ -2069,6 +2069,10 @@ namespace boost { + template <class K, class T, class H, class P, class A> + float unordered_map<K, T, H, P, A>::load_factor() const BOOST_NOEXCEPT + { ++ if (table_.size_ == 0) { ++ return 0.0f; ++ } ++ + BOOST_ASSERT(table_.bucket_count() != 0); + return static_cast<float>(table_.size_) / + static_cast<float>(table_.bucket_count()); +@@ -2506,6 +2510,10 @@ namespace boost { + template <class K, class T, class H, class P, class A> + float unordered_multimap<K, T, H, P, A>::load_factor() const BOOST_NOEXCEPT + { ++ if (table_.size_ == 0) { ++ return 0.0f; ++ } ++ + BOOST_ASSERT(table_.bucket_count() != 0); + return static_cast<float>(table_.size_) / + static_cast<float>(table_.bucket_count()); +diff --git a/boost/unordered/unordered_set.hpp b/boost/unordered/unordered_set.hpp +index 8721a68a0..82d323c6e 100644 +--- a/boost/unordered/unordered_set.hpp ++++ b/boost/unordered/unordered_set.hpp +@@ -1586,6 +1586,10 @@ namespace boost { + template <class T, class H, class P, class A> + float unordered_set<T, H, P, A>::load_factor() const BOOST_NOEXCEPT + { ++ if (table_.size_ == 0) { ++ return 0.0f; ++ } ++ + BOOST_ASSERT(table_.bucket_count() != 0); + return static_cast<float>(table_.size_) / + static_cast<float>(table_.bucket_count()); +@@ -1986,6 +1990,10 @@ namespace boost { + template <class T, class H, class P, class A> + float unordered_multiset<T, H, P, A>::load_factor() const BOOST_NOEXCEPT + { ++ if (table_.size_ == 0) { ++ return 0.0f; ++ } ++ + BOOST_ASSERT(table_.bucket_count() != 0); + return static_cast<float>(table_.size_) / + static_cast<float>(table_.bucket_count()); diff --git a/dev-libs/vala-common/Manifest b/dev-libs/vala-common/Manifest index cb8d52264aa1..f3fb283d55f2 100644 --- a/dev-libs/vala-common/Manifest +++ b/dev-libs/vala-common/Manifest @@ -1,5 +1,7 @@ DIST vala-0.56.1.tar.xz 3960476 BLAKE2B a78786c51ce35735aa42e5e22a09bd29f98b19608651843c32c84ca6901a22971a2128a85a1e1e110d0b7d14cb89d4164688c289090a4299bb11540180548cf7 SHA512 83c34ab0497a9b7a627db8c1dbfea9e76c94b902e298afb2c30ba9824717f2fe3b0e26b987feb93cd4ff0ce211d0ecd9a746cc18c00e41c4c6fd01d05947902f DIST vala-0.56.2.tar.xz 3967960 BLAKE2B 60b48ee3ddd1cee087819cded91ccbbe378a6945ddcb2583a94ab41b66599bc4897bec346b65525e67f6fba9cf94ab3923120e8eb2828afbcb6b674f0512009c SHA512 8a33a1f1d573dd6aa1de6c001bce6e77da39d804cd526433c3e01454e597a7afb6d1b1bce554babf52a7baca5e88e205d28132c73b9a63e9d7b9f7314b3d4496 +DIST vala-0.56.3.tar.xz 3969676 BLAKE2B 66fba756d89b7fbc9689a9ff7ef8d4689b53b9ee570225fb268bb433e9c14a876eac1565999944ad72864d9a3c62f777d534579ee7ca091d90e405ef2b271314 SHA512 3222edab995a1d405bc891b37ffb4915677b7bb56ce3be7d1ece1dfb77f2d054bf7499dad9e6eb593c42678ae2c2c7cd779a595b702a3e2e38e9e0e0d69ba99e EBUILD vala-common-0.56.1.ebuild 652 BLAKE2B a6f3cd9df801208cec45606af33db763d5abdee123bbbbb89399f510b2bcfbeaf9cb345530787d997eacc1367f97ccb93471e6a8aa154b4911768b180a45a0c4 SHA512 3c92712b742cc3f84cbf16f5851260287a42a9fb7eab5110223e30fe30be2a43a8f76f7d452ebe70e9c8adb0f8b29fc17c18d8fe0f08d7dbedf100f660166dcf EBUILD vala-common-0.56.2.ebuild 660 BLAKE2B 3578c6d15454f83e69064a44c1d80bb1725cc4e4c27cfe81f6339c1f4695a0d34c722fa66954a5c0dd0ae925ee2eb731d482e341b6aafb1d771c34d931a1eee9 SHA512 5806a45e7a02b88f15a51fc2e7d0a3e2e04fae5a8985277de79d35365512af466855f127fa70329c52cd8768baafe8ba17004879bd352ee98fd18d38bae851b8 +EBUILD vala-common-0.56.3.ebuild 696 BLAKE2B cda13fb791cbae85a7aee8bb47c6d547cac279397b4aac202e85d9da34cf9317b36b6a6f1e49f6e9c46062f61756c321a41c75e22866c07f39e8c2ec60a2d007 SHA512 44bbf5b6643fcf57e3ef4782c60d2a2f0e0cb63fc43b9ae087a5567c13f5f74315a9321902e8ca0b5ceae411a34f32b237b51d2742bc49282b64211fc410a65a MISC metadata.xml 326 BLAKE2B cd8c49993b750ebef93c620f819f42b858431d1aab4d2066a124a5118d5d18f4970b9d1eccb77121089264db7cfbe69ca06fb2fc2d2c4db98047629af9878db5 SHA512 52854d43fb74af5402cb1855409ab25d6741ea6fe48ae50416044d7b518745b02752e69cb9680e9c132e3a2f65ae29d92e9e771ac883e2ef01ae91effdf1097f diff --git a/dev-libs/vala-common/vala-common-0.56.3.ebuild b/dev-libs/vala-common/vala-common-0.56.3.ebuild new file mode 100644 index 000000000000..af2f4977c2a7 --- /dev/null +++ b/dev-libs/vala-common/vala-common-0.56.3.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2022 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 +} |