From b982051e7c8e12c3810a0d21d30d687b406b3ae5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 16 Dec 2022 09:35:57 +0000 Subject: gentoo auto-resync : 16:12:2022 - 09:35:57 --- dev-libs/Manifest.gz | Bin 96178 -> 96176 bytes dev-libs/boost/Manifest | 5 +- dev-libs/boost/boost-1.81.0.ebuild | 340 +++++++++++++++++++++ .../files/boost-1.81.0-disable_icu_rpath.patch | 19 ++ dev-libs/boost/metadata.xml | 134 ++++++++ dev-libs/elfutils/Manifest | 2 +- dev-libs/elfutils/elfutils-0.188.ebuild | 2 +- dev-libs/glib/Manifest | 4 +- dev-libs/glib/glib-2.74.3-r2.ebuild | 290 ------------------ dev-libs/glib/glib-2.74.3-r3.ebuild | 290 ++++++++++++++++++ dev-libs/gmp/Manifest | 4 +- dev-libs/gmp/gmp-6.2.1-r2.ebuild | 6 +- dev-libs/gmp/gmp-6.2.1-r5.ebuild | 6 +- dev-libs/libnl/Manifest | 2 +- dev-libs/libnl/libnl-3.7.0.ebuild | 2 +- 15 files changed, 803 insertions(+), 303 deletions(-) create mode 100644 dev-libs/boost/boost-1.81.0.ebuild create mode 100644 dev-libs/boost/files/boost-1.81.0-disable_icu_rpath.patch delete mode 100644 dev-libs/glib/glib-2.74.3-r2.ebuild create mode 100644 dev-libs/glib/glib-2.74.3-r3.ebuild (limited to 'dev-libs') diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz index 66ddea8e7b40..ec5089f1d821 100644 Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest index 638661cc6468..b0cca53433e8 100644 --- a/dev-libs/boost/Manifest +++ b/dev-libs/boost/Manifest @@ -7,6 +7,9 @@ AUX boost-1.80.0-python3.11.patch 1285 BLAKE2B 070def79a53193d7e181060da15d072fb AUX boost-1.80.0-unary-function.patch 757 BLAKE2B 25fbc3532add9a0fc9c90e6690fc13ac13ac8e14fb7c6b62e52c26c8e46127c75ad20742ae90d72dc073945df6c1d392d48f65de4e8454b26cda25b19637ebfd SHA512 a07a5bf9587789216395ef246d1411fff31f4488b033ebfe2b1ffd9f88fab3f73b14b9027e2717fed7237fa9b49b8b80779c3901ea1ff67d699f4309a93e8fa4 AUX boost-1.80.0-unordered-fix.patch 7067 BLAKE2B 1a465a764dd510ec7bbbee4a2d5ca12982ee4a7dca9a605195492810c952918185c79d7d326d9eda063c0ede7a3a2c86b48ab2dc2a92b8debe4e0ee00d3e7a29 SHA512 bccdb2b136c5d99a4bfc60445ff0aa07ecffccc522215820336d55a6c4cb1a0b5636a98180e3f1af543722d4977bc2c6ce1e2b9d6156b4ecbeb398fab7a3fcb7 AUX boost-1.80.0-unordered-ftm-malloc.patch 897 BLAKE2B 5119fddcf5d84e907a3366e38b0f30be0c4547cf65e57c781515e8770e6980746572c3f3c94a461416bb1ee6821f2a204e77b09ae4791f0889fe8b35bcc90842 SHA512 994c7fa578240c9d5c85dde57de5011c9ef1c8c3f540c6ccf3f89dafd43b377d6f09d61ad1f0071cf589a46a2f4374738f119f16a067290014b88cf0d6f1a480 +AUX boost-1.81.0-disable_icu_rpath.patch 577 BLAKE2B 0e8634a6a4594232238d03ed329c0ca56c005ec0f3f259afd431c4b461b6c8d9a0b636b916859b5baa1152395995e5fa5b150ef0ab39480fcebaa9c6c5943b7e SHA512 7383423dd4611482bf3ff3820152152e9fc9643ca408b260e3715baba52b48b444626b14e955950b025e57f72c50158c83ffa6b55b995c2c427da90d0a0a50df DIST boost_1_80_0.tar.bz2 115869904 BLAKE2B 507e811be7659442c41bc2d99811bd02a236dc94932e1a7a8cf256243b479f2d2707819cd99e016a51c9dadc215713e803afdd9ea4c105af8d5d2d28d3d06a1f SHA512 829a95b463473d69ff79ea41799c68429bb79d3b2321fbdb71df079af237ab01de9ad7e9612d8783d925730acada010068d2d1aa856c34244ee5c0ece16f208f +DIST boost_1_81_0.tar.bz2 118797750 BLAKE2B ae57247fb80ee5a952881a99bdbe9a1d5622690879ef59053716647dc1121e70fdd322251837387b43357f1cd63c6d1ba285cf35c0c40e4f5ee28a929d7eacf7 SHA512 a04201e73da59f68fa02761b333c864a96ebaf268247b6b10cb19ed3d70ee9ad3da4c53123f2a7a4a9b9e1408793b51e1adbcc6fd09f60fecef3ca9522bb6b36 EBUILD boost-1.80.0-r1.ebuild 10947 BLAKE2B c732831b3038c878e5abc369548c412872795d7ba0ed8dbc2845ec84819e14d3842935dccfda8544f4322dcdb07df4f47bbf8cec46301c30fac6013adc849283 SHA512 0e9aa0bf2c3aa9038cd25a874841fba61d49887ad88c7010835279e09b9f501b83f6225700bf115fd5725d59e00959fca115ef468a131ba1dd03d83f6dbfe058 -MISC metadata.xml 1350 BLAKE2B 5fd10a89cb215629c0a7a0dfd134b3d187312e49c2f77a77666f9c30128f0feec1a82dac64bec80b0f3e20f0f9648924290323e818738da07e1ce8a3112398fa SHA512 3a3584abd5be99dc70daa63bf86ff716ba310dcc7f3aa8bbae5be3e20762ed856eaf372ee9dbdab4c00bc3622288d96816eaef9f639f07cf245de501da917f65 +EBUILD boost-1.81.0.ebuild 10760 BLAKE2B f040d8b601c917496a8598a97a15add17789d6d3530c66be0472a70db540be43a7335bd81f8597bb5cfd49d6105c56fe6d39f7e0014af85a3fe7e5dd1f2424ba SHA512 86fd50f4d9c202d98449db629b2ce61a56346f78536e0d7f38f4d468aecbe0cf30a211bc28af31d33e238e5c18debefa2668f001578c0a6dab774a60c92c3602 +MISC metadata.xml 9028 BLAKE2B 066cbb57ea9116c9aa13d5bd8e092eb1724e3501b29812fbe0ba46565de94404e96585068af9266fe3a66c556b960e3095b318b376e3689bdb8f11dadaa99d26 SHA512 b489dbb41686b252ad3632d276f9a469405126a81bc16ae5d62f5b6a90851f0438dd7cbf4bad5963a52e9b5037368ef674b0bd4cd8eaac24b22f796d80be56a9 diff --git a/dev-libs/boost/boost-1.81.0.ebuild b/dev-libs/boost/boost-1.81.0.ebuild new file mode 100644 index 000000000000..6d6f80dba7ae --- /dev/null +++ b/dev-libs/boost/boost-1.81.0.ebuild @@ -0,0 +1,340 @@ +# 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- _)" + +DESCRIPTION="Boost Libraries for C++" +HOMEPAGE="https://www.boost.org/" +SRC_URI="https://boostorg.jfrog.io/artifactory/main/release/${PV}/source/boost_${MY_PV}.tar.bz2" +S="${WORKDIR}/${PN}_${MY_PV}" + +LICENSE="Boost-1.0" +SLOT="0/${PV}" # ${PV} instead of the major version due to bug 486122 +#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~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/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/b2-4.9.2" + +PATCHES=( + "${FILESDIR}"/${PN}-1.81.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) +) + +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}" "${CXXFLAGS}" "${LDFLAGS}" "$(tc-getAR)" "$(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 \] : no \]/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 " ::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.81.0-disable_icu_rpath.patch b/dev-libs/boost/files/boost-1.81.0-disable_icu_rpath.patch new file mode 100644 index 000000000000..a64d2d8675ee --- /dev/null +++ b/dev-libs/boost/files/boost-1.81.0-disable_icu_rpath.patch @@ -0,0 +1,19 @@ +--- a/libs/locale/build/Jamfile.v2 ++++ b/libs/locale/build/Jamfile.v2 +@@ -99,16 +99,6 @@ if $(.icu-path) + rule path_options ( properties * ) + { + local result ; +- if 64 in $(properties) && msvc in $(properties) +- { +- debug-message Search 64 bit ICU in "$(.icu-path)/lib64" ; +- result = $(.icu-path)/bin64 $(.icu-path)/lib64 ; +- } +- else +- { +- debug-message Search ICU in "$(.icu-path)/lib" ; +- result = $(.icu-path)/bin $(.icu-path)/lib ; +- } + return $(result) ; + } + diff --git a/dev-libs/boost/metadata.xml b/dev-libs/boost/metadata.xml index 5ceb55d4b897..98eea6f8a059 100644 --- a/dev-libs/boost/metadata.xml +++ b/dev-libs/boost/metadata.xml @@ -19,7 +19,141 @@ cpe:/a:boost:boost + boostorg/boost + boostorg/accumulators + boostorg/algorithm + boostorg/align + boostorg/any + boostorg/archive + boostorg/asio + boostorg/assert + boostorg/assign + boostorg/atomic + boostorg/beast + boostorg/bimap + boostorg/bind + boostorg/callable_traits + boostorg/chrono + boostorg/circular_buffer + boostorg/compatibility + boostorg/compute + boostorg/concept + boostorg/concept_check + boostorg/config + boostorg/container + boostorg/container_hash + boostorg/context + boostorg/contract + boostorg/convert + boostorg/core + boostorg/coroutine + boostorg/coroutine2 + boostorg/date_time + boostorg/describe + boostorg/detail + boostorg/dll + boostorg/dynamic_bitset + boostorg/endian + boostorg/exception + boostorg/fiber + boostorg/filesystem + boostorg/flyweight + boostorg/format + boostorg/function + boostorg/functional + boostorg/function_types + boostorg/fusion + boostorg/geometry + boostorg/gil + boostorg/graph + boostorg/hana + boostorg/heap + boostorg/histogram + boostorg/hof + boostorg/icl + boostorg/integer + boostorg/interprocess + boostorg/intrusive + boostorg/io + boostorg/iostreams + boostorg/iterator + boostorg/json + boostorg/lambda + boostorg/lambda2 + boostorg/leaf + boostorg/lexical_cast + boostorg/locale + boostorg/local_function + boostorg/lockfree + boostorg/log + boostorg/logic + boostorg/math + boostorg/metaparse + boostorg/move + boostorg/mp11 + boostorg/mpi + boostorg/mpl + boostorg/msm + boostorg/multi_array + boostorg/multi_index + boostorg/multiprecision + boostorg/nowide + boostorg/numeric + boostorg/optional + boostorg/outcome + boostorg/parameter + boostorg/pending + boostorg/pfr + boostorg/phoenix + boostorg/poly_collection + boostorg/polygon + boostorg/pool + boostorg/predef + boostorg/preprocessor + boostorg/process + boostorg/program_options + boostorg/property_map + boostorg/property_tree + boostorg/proto + boostorg/ptr_container + boostorg/python + boostorg/qvm + boostorg/random + boostorg/range + boostorg/ratio + boostorg/regex + boostorg/safe_numerics + boostorg/serialization + boostorg/signals2 + boostorg/smart_ptr + boostorg/sort + boostorg/spirit + boostorg/stacktrace + boostorg/statechart + boostorg/static_string + boostorg/stl_interfaces + boostorg/system + boostorg/test + boostorg/thread + boostorg/timer + boostorg/tti + boostorg/tuple + boostorg/type_erasure + boostorg/type_index + boostorg/typeof + boostorg/type_traits + boostorg/units + boostorg/unordered + boostorg/utility + boostorg/uuid + boostorg/variant + boostorg/variant2 + boostorg/vmd + boostorg/wave + boostorg/winapi + boostorg/xpressive + boostorg/yap boost diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest index 39f14a08225b..f1d307c28a23 100644 --- a/dev-libs/elfutils/Manifest +++ b/dev-libs/elfutils/Manifest @@ -5,5 +5,5 @@ DIST elfutils-0.188.tar.bz2 9112977 BLAKE2B 6b0474f1436eaf6af73b735b9b2ddd5448ab DIST elfutils-0.188.tar.bz2.sig 310 BLAKE2B c8d9135cffde3b1dd337b692d5351855cf799915d3ebd553327febaac192bd2f108b3f45a6376d458e179390a1ceaf4809762cdc40ea1e05fed0214ac33ed56e SHA512 4cc8a7417d244e319a1650d71b1831660cfe41afc7c73e9c83d1f076f4013fe15247e8b4f5e12a5396d83c4f1c7663ca4be5ea42bff3dc23263f85331fd9d566 EBUILD elfutils-0.187-r2.ebuild 3210 BLAKE2B b11ebaf01e5c1c0b4fe61b39e0e2c25ff20ed0574d202bd0bb93cfcb58f0c62549962ab7a7a8f7f856b1784e53ede960dec76fced1dea384658f73cf186748f3 SHA512 12c875059b00a58c232c83923bd3eebabfed45e120cd1572a4c9b1f6d28320a4fa95188a066e517751d4c05907303321144fe52416d31968c1a8252fb82c9ca1 EBUILD elfutils-0.187.ebuild 3097 BLAKE2B e3373bbc80a9cf19ab318fa73ed1adba039ab235bc56b0cd22eddca98a486c8f4daa6768ae9fe5e13766c694534197dad6f41ef3701b8b158b90853913fe266e SHA512 b33cd29502adce7fab08ad3fe426d7232535d3a2a537cba558369869ba7cefe062e7005e9558160f8990373f568603f296b0b4f2f9754345f696e0e863dac323 -EBUILD elfutils-0.188.ebuild 3229 BLAKE2B df39fb6e8aec92bd70dbe6c3b67165a10cfb1296a6992408dea45fee7f573f17c603af6ef92f39594573f79fca5971129abf44a625c888044e45dfe5920fb1f4 SHA512 0c066ef498acd2281b0ddc8fa3d9726c9fc39d4924def3c2ea495494e5582d0af1e895e81f11893e5105307575dbc0060cefd2652a306554b203d1eb5403fa52 +EBUILD elfutils-0.188.ebuild 3227 BLAKE2B d1e40f51acc9852315d3c20c9832f268f09afb798cfd6321e6823960186c53e56f7278febb7fe3a034dca5eeae822c4e3544dfa994e102c14c2a0a07d6b039b2 SHA512 3abc4627abc31829bda909d579076138dd343fe6a0e36b5f2b9dc9359095865d3687082331c2f6f62aa3222844152d74688398b858e97c9670c213bfdbab7628 MISC metadata.xml 730 BLAKE2B 94e9585a2d765ee2a7c85a823c389453bcdbc29b90a5542333eef1253d4ebafb7c26e383dfe5c5e0fcccf61f60321e7a46b0ae8c5edf467937485d6c9867712a SHA512 663cb6d587113d21fc0d3c703731f4dcaed55fc1bc7e75e1ac465e21b161ba5c4b4cefe0fd838d28b1f890cc33008878996e1d117fcab6435f8ed49f7eb0bc73 diff --git a/dev-libs/elfutils/elfutils-0.188.ebuild b/dev-libs/elfutils/elfutils-0.188.ebuild index 13a2eb582fa0..4e30d9bd7080 100644 --- a/dev-libs/elfutils/elfutils-0.188.ebuild +++ b/dev-libs/elfutils/elfutils-0.188.ebuild @@ -14,7 +14,7 @@ SRC_URI+=" verify-sig? ( https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2. 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" +KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="bzip2 lzma nls static-libs test +utils valgrind zstd" RESTRICT="!test? ( test )" diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest index 5c6132eb951d..7d12c8d5d1b6 100644 --- a/dev-libs/glib/Manifest +++ b/dev-libs/glib/Manifest @@ -1,9 +1,9 @@ AUX glib-2.64.1-mark-gdbus-server-auth-test-flaky.patch 842 BLAKE2B 6b2eb57b8923c8bb54ead80d829aeb7a5c8a42c62e960e7305bc3fad69c67fd21e1c9f20b5c9002c0319cf3d77992b9cb71912c9b813b723e0a56aaea38330ad SHA512 ccd92d2f1fd495618ac788ffe6b69acec05a521a0ee8ff2bacb1dce6e283a04bbc2a10e61b37fc29f3893003fa154fa0d30bc37ed266b3f813200cd8ed17c116 AUX glib-2.74.1-gnome-keyring-cpu.patch 3930 BLAKE2B 3da62efaa538e4685475b730626b9d76777874908340a55244e83cd70eaf6b731b5c363155b12db20c6fcf3a7692db047ca6cba65ac03f6c7f2b894af7da2ee8 SHA512 662d12afab80fb3d4af854d0ad1b477cfd27194ea86cbf5ad254a2997381d4eb327554a25d8a397b948c38011aa85d026d8ee477ce959553d292330fa01dd318 DIST glib-2.74.1.tar.xz 5189452 BLAKE2B 58d977a5d2a100aa9125f2009ae66c6f27232dff70159433076552bdb64f9a6a93d7cb705feba890ee43d6f16d4766f6f1d5502c2e01eeb7e88d5ed0dd205d5c SHA512 21176cb95fcab49a781d02789bf21191a96a34a6391f066699b3c20b414b3169c958bd86623deb34ca55912083862885f7a7d12b67cc041467da2ba94d9e83c3 -DIST glib-2.74.3-patches.tar.xz 20644 BLAKE2B 1ffc465c4a3efd0ddd413bf40677bab903dad44580e66527c4ca115563228caf4450a94925522f12be69be88353e89b21d303d757903515fb1898a88768de18c SHA512 3eba57a4d0136bfbb7b6d7fb25957b63cc11d1e52bdcf8f5c6c346bca6db64f21237defaa320e528d00b979f73dc935ba882aa3629d14717fd109b7404766b36 +DIST glib-2.74.3-patches-2.tar.xz 23576 BLAKE2B f3746bdf961890d9f4e7ad20b107b83b7ceb8dcc36e288c1d526bac31a0e1dd9d1f13323f512355085c77d186ad66c3f52c1154f34c1d6fd6a5e64a074b2920c SHA512 945c131c27f02044db6154f0a63f458d6317c8a4e841fb392947b16756e25d92adeb2b34d793c9e19441b825d1aee71ae9b08fdcbefa1bc9de1d5af9e903e82c DIST glib-2.74.3.tar.xz 5181732 BLAKE2B 46c37be9519866af040b2aaf35129a9cfae6e2c74636c01755b901002fa77f4e2305025691d7a8279acfbae1298a4b5b1e095b333bed3b067e9820547b6eca97 SHA512 a9aa7e84187abb57aeeff9c7f4c4125be742a510ae5d39b6b62696ad1a715c36b353c6c14222caeb1e87bed930fb54184dba77118b991c42f1857a292c6aa77b EBUILD glib-2.74.1-r1.ebuild 10172 BLAKE2B 0920ab3c5ac1187ac6c31c6b9531fe7f5f0b4027a9f084f8620d4a0579b07baa10cf9f93fcc16bea2362bd7b43a25e67e77225702d1e2a35dc47b63e2bbe5b17 SHA512 1644fdff2f7031251b0f5b9e9d71f4ef522660fefcf9c963be73f911b9a283c7448657fc68f5dc679658861cb33c63ba5c0bd4785ecedee1429220e415e5fdb6 EBUILD glib-2.74.3-r1.ebuild 10215 BLAKE2B b1ec264b5e77c633dc44348a27df0e5fcb6dc7d2fd01f2f37245f3033de46b176d7a1cc8992c17d39e91a497d7e3126d9e2231cfae1424544b64a2b26adde9fa SHA512 49b67bd553b6aecc82545a191add65276dff5aebf06915b5ad43baccd287d97ab3aa68f2cb280a0fc5f3079d70e9c2181d38ac725e4f1114c75f79048e07d637 -EBUILD glib-2.74.3-r2.ebuild 10425 BLAKE2B 153723dd40ec1c075a56e1b5441279038477809a22f3668881631af441fb7610539dd211da9aadc22f89d5a853b9bb20a25bc06a117d4f8ad119009fbb39da0c SHA512 b297c6579480340a4b86c290f95fb6309b50e9fe53d42d6840edc74fa083a84ec489d9926a13644d0777ec14e66904078b3d1c3379bd497d62b2fb80caa5aaf9 +EBUILD glib-2.74.3-r3.ebuild 10429 BLAKE2B f06a4447c7259818e516579a6a789d2ecfff51fd1162af424d6b905a76afce03c7f936cad29644488c575c0937dd8a85662337e5352df7219ff1878edec4c247 SHA512 bb650792ae7256c61ea3b5d6f368faf0a78d20ba19afa333c446d6d7012f0468b1e233e6ae8e920fb9ed5570b324be3ebce9c5229633fb04ab72a7fb0584f7fe MISC metadata.xml 1357 BLAKE2B c9236f5cdb72931175f757cd7b713d924655cbbdbba9a45479564a2fb8f73b490923d62b69e84568dcd8cd47df32f9fa1dd51481c332a85713c17ce6f6af5109 SHA512 6fc9c503e81c78e21904f74cedb9dbce10194b7acaecf3f17098749e33ca2513a96a53142bc8c1d9d196e48d62b8752956c30d4813ac34d0616cdf13de37b33b diff --git a/dev-libs/glib/glib-2.74.3-r2.ebuild b/dev-libs/glib/glib-2.74.3-r2.ebuild deleted file mode 100644 index 5efc4fa82716..000000000000 --- a/dev-libs/glib/glib-2.74.3-r2.ebuild +++ /dev/null @@ -1,290 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_REQ_USE="xml(+)" -PYTHON_COMPAT=( python3_{8..11} ) - -inherit flag-o-matic gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg - -DESCRIPTION="The GLib library of C routines" -HOMEPAGE="https://www.gtk.org/" -# https://discourse.gnome.org/t/multiple-fixes-for-gvariant-normalisation-issues-in-glib/12835 -SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-patches.tar.xz" - -LICENSE="LGPL-2.1+" -SLOT="2" -IUSE="dbus debug +elf gtk-doc +mime selinux static-libs sysprof systemtap test utils xattr" -RESTRICT="!test? ( test )" -#REQUIRED_USE="gtk-doc? ( test )" # Bug #777636 - -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" - -# * elfutils (via libelf) does not build on Windows. gresources are not embedded -# within ELF binaries on that platform anyway and inspecting ELF binaries from -# other platforms is not that useful so exclude the dependency in this case. -# * Technically static-libs is needed on zlib, util-linux and perhaps more, but -# these are used by GIO, which glib[static-libs] consumers don't really seem -# to need at all, thus not imposing the deps for now and once some consumers -# are actually found to static link libgio-2.0.a, we can revisit and either add -# them or just put the (build) deps in that rare consumer instead of recursive -# RDEPEND here (due to lack of recursive DEPEND). -RDEPEND=" - !=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] - >=dev-libs/libpcre2-10.32:0=[${MULTILIB_USEDEP},unicode(+),static-libs?] - >=dev-libs/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}] - >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] - >=virtual/libintl-0-r2[${MULTILIB_USEDEP}] - kernel_linux? ( >=sys-apps/util-linux-2.23[${MULTILIB_USEDEP}] ) - selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] ) - xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) ) - elf? ( virtual/libelf:0= ) - sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] ) -" -DEPEND="${RDEPEND}" -# libxml2 used for optional tests that get automatically skipped -BDEPEND=" - app-text/docbook-xsl-stylesheets - dev-libs/libxslt - >=sys-devel/gettext-0.19.8 - gtk-doc? ( >=dev-util/gtk-doc-1.33 - app-text/docbook-xml-dtd:4.2 - app-text/docbook-xml-dtd:4.5 ) - systemtap? ( >=dev-util/systemtap-1.3 ) - ${PYTHON_DEPS} - test? ( >=sys-apps/dbus-1.2.14 ) - virtual/pkgconfig -" -# TODO: >=dev-util/gdbus-codegen-${PV} test dep once we modify gio/tests/meson.build to use external gdbus-codegen - -PDEPEND=" - dbus? ( gnome-base/dconf ) - mime? ( x11-misc/shared-mime-info ) -" -# shared-mime-info needed for gio/xdgmime, bug #409481 -# dconf is needed to be able to save settings, bug #498436 - -MULTILIB_CHOST_TOOLS=( - /usr/bin/gio-querymodules$(get_exeext) -) - -PATCHES=( - "${FILESDIR}"/${PN}-2.64.1-mark-gdbus-server-auth-test-flaky.patch - "${WORKDIR}"/${P}-patches -) - -pkg_setup() { - if use kernel_linux ; then - CONFIG_CHECK="~INOTIFY_USER" - if use test ; then - CONFIG_CHECK="~IPV6" - WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them." - fi - linux-info_pkg_setup - fi - python-any-r1_pkg_setup -} - -src_prepare() { - if use test; then - # TODO: Review the test exclusions, especially now with meson - # Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163 - if ! has_version dev-util/desktop-file-utils ; then - ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system," - ewarn "think on installing it to get these tests run." - sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die - sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die - fi - - # gdesktopappinfo requires existing terminal (gnome-terminal or any - # other), falling back to xterm if one doesn't exist - #if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then - # ewarn "Some tests will be skipped due to missing terminal program" - # These tests seem to sometimes fail even with a terminal; skip for now and reevulate with meson - # Also try https://gitlab.gnome.org/GNOME/glib/issues/1601 once ready for backport (or in a bump) and file new issue if still fails - sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die - # desktop-app-info/launch* might fail similarly - sed -i -e "/desktop-app-info\/launch-as-manager/d" gio/tests/desktop-app-info.c || die - #fi - - # https://bugzilla.gnome.org/show_bug.cgi?id=722604 - sed -i -e "/timer\/stop/d" glib/tests/timer.c || die - sed -i -e "/timer\/basic/d" glib/tests/timer.c || die - - ewarn "Tests for search-utils have been skipped" - sed -i -e "/search-utils/d" glib/tests/meson.build || die - - # Play nice with network-sandbox, but this approach would defeat the purpose of the test - #sed -i -e "s/localhost/127.0.0.1/g" gio/tests/gsocketclient-slow.c || die - else - # Don't build tests, also prevents extra deps, bug #512022 - sed -i -e '/subdir.*tests/d' {.,gio,glib}/meson.build || die - fi - - # Don't build fuzzing binaries - not used - sed -i -e '/subdir.*fuzzing/d' meson.build || die - - # gdbus-codegen is a separate package - sed -i -e '/install_dir/d' gio/gdbus-2.0/codegen/meson.build || die - - # Same kind of meson-0.50 issue with some installed-tests files; will likely be fixed upstream soon - sed -i -e '/install_dir/d' gio/tests/meson.build || die - - cat > "${T}/glib-test-ld-wrapper" <<-EOF - #!/usr/bin/env sh - exec \${LD:-ld} "\$@" - EOF - chmod a+x "${T}/glib-test-ld-wrapper" || die - sed -i -e "s|'ld'|'${T}/glib-test-ld-wrapper'|g" gio/tests/meson.build || die - - default - gnome2_environment_reset - # TODO: python_name sedding for correct python shebang? Might be relevant mainly for glib-utils only -} - -multilib_src_configure() { - if use debug; then - append-cflags -DG_ENABLE_DEBUG - else - append-cflags -DG_DISABLE_CAST_CHECKS # https://gitlab.gnome.org/GNOME/glib/issues/1833 - fi - - # TODO: figure a way to pass appropriate values for all cross properties that glib uses (search for get_cross_property) - #if tc-is-cross-compiler ; then - # https://bugzilla.gnome.org/show_bug.cgi?id=756473 - # TODO-meson: This should be in meson cross file as 'growing_stack' property; and more, look at get_cross_property - #case ${CHOST} in - #hppa*|metag*) export glib_cv_stack_grows=yes ;; - #*) export glib_cv_stack_grows=no ;; - #esac - #fi - - local emesonargs=( - -Ddefault_library=$(usex static-libs both shared) - $(meson_feature selinux) - $(meson_use xattr) - -Dlibmount=enabled # only used if host_system == 'linux' - -Dman=true - $(meson_use systemtap dtrace) - $(meson_use systemtap) - $(meson_feature sysprof) - $(meson_native_use_bool gtk-doc gtk_doc) - $(meson_use test tests) - -Dinstalled_tests=false - -Dnls=enabled - -Doss_fuzz=disabled - $(meson_native_use_feature elf libelf) - -Dmultiarch=false - ) - meson_src_configure -} - -multilib_src_test() { - export XDG_CONFIG_DIRS=/etc/xdg - export XDG_DATA_DIRS=/usr/local/share:/usr/share - export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp" - export LC_TIME=C # bug #411967 - export TZ=UTC - unset GSETTINGS_BACKEND # bug #596380 - python_setup - - # https://bugs.gentoo.org/839807 - local -x SANDBOX_PREDICT=${SANDBOX_PREDICT} - addpredict /usr/b - - # Related test is a bit nitpicking - mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" - chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" - - meson_src_test --timeout-multiplier 2 --no-suite flaky -} - -multilib_src_install() { - meson_src_install - keepdir /usr/$(get_libdir)/gio/modules -} - -multilib_src_install_all() { - # These are installed by dev-util/glib-utils - # TODO: With patching we might be able to get rid of the python-any deps and removals, and test depend on glib-utils instead; revisit now with meson - rm "${ED}/usr/bin/glib-genmarshal" || die - rm "${ED}/usr/share/man/man1/glib-genmarshal.1" || die - rm "${ED}/usr/bin/glib-mkenums" || die - rm "${ED}/usr/share/man/man1/glib-mkenums.1" || die - rm "${ED}/usr/bin/gtester-report" || die - rm "${ED}/usr/share/man/man1/gtester-report.1" || die - # gdbus-codegen manpage installed by dev-util/gdbus-codegen - rm "${ED}/usr/share/man/man1/gdbus-codegen.1" || die -} - -pkg_preinst() { - xdg_pkg_preinst - - # Make gschemas.compiled belong to glib alone - local cache="/usr/share/glib-2.0/schemas/gschemas.compiled" - - if [[ -e ${EROOT}${cache} ]]; then - cp "${EROOT}"${cache} "${ED}"/${cache} || die - else - touch "${ED}"${cache} || die - fi - - multilib_pkg_preinst() { - # Make giomodule.cache belong to glib alone - local cache="/usr/$(get_libdir)/gio/modules/giomodule.cache" - - if [[ -e ${EROOT}${cache} ]]; then - cp "${EROOT}"${cache} "${ED}"${cache} || die - else - touch "${ED}"${cache} || die - fi - } - - # Don't run the cache ownership when cross-compiling, as it would end up with an empty cache - # file due to inability to create it and GIO might not look at any of the modules there - if ! tc-is-cross-compiler ; then - multilib_foreach_abi multilib_pkg_preinst - fi -} - -pkg_postinst() { - xdg_pkg_postinst - # glib installs no schemas itself, but we force update for fresh install in case - # something has dropped in a schemas file without direct glib dep; and for upgrades - # in case the compiled schema format could have changed - gnome2_schemas_update - - multilib_pkg_postinst() { - gnome2_giomodule_cache_update \ - || die "Update GIO modules cache failed (for ${ABI})" - } - if ! tc-is-cross-compiler ; then - multilib_foreach_abi multilib_pkg_postinst - else - ewarn "Updating of GIO modules cache skipped due to cross-compilation." - ewarn "You might want to run gio-querymodules manually on the target for" - ewarn "your final image for performance reasons and re-run it when packages" - ewarn "installing GIO modules get upgraded or added to the image." - fi - - for v in ${REPLACING_VERSIONS}; do - if ver_test "$v" "-lt" "2.63.6"; then - ewarn "glib no longer installs the gio-launch-desktop binary. You may need" - ewarn "to restart your session for \"Open With\" dialogs to work." - fi - done -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update - - if [[ -z ${REPLACED_BY_VERSION} ]]; then - multilib_pkg_postrm() { - rm -f "${EROOT}"/usr/$(get_libdir)/gio/modules/giomodule.cache - } - multilib_foreach_abi multilib_pkg_postrm - rm -f "${EROOT}"/usr/share/glib-2.0/schemas/gschemas.compiled - fi -} diff --git a/dev-libs/glib/glib-2.74.3-r3.ebuild b/dev-libs/glib/glib-2.74.3-r3.ebuild new file mode 100644 index 000000000000..fec548071712 --- /dev/null +++ b/dev-libs/glib/glib-2.74.3-r3.ebuild @@ -0,0 +1,290 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_REQ_USE="xml(+)" +PYTHON_COMPAT=( python3_{8..11} ) + +inherit flag-o-matic gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg + +DESCRIPTION="The GLib library of C routines" +HOMEPAGE="https://www.gtk.org/" +# https://discourse.gnome.org/t/multiple-fixes-for-gvariant-normalisation-issues-in-glib/12835 +SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-patches-2.tar.xz" + +LICENSE="LGPL-2.1+" +SLOT="2" +IUSE="dbus debug +elf gtk-doc +mime selinux static-libs sysprof systemtap test utils xattr" +RESTRICT="!test? ( test )" +#REQUIRED_USE="gtk-doc? ( test )" # Bug #777636 + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" + +# * elfutils (via libelf) does not build on Windows. gresources are not embedded +# within ELF binaries on that platform anyway and inspecting ELF binaries from +# other platforms is not that useful so exclude the dependency in this case. +# * Technically static-libs is needed on zlib, util-linux and perhaps more, but +# these are used by GIO, which glib[static-libs] consumers don't really seem +# to need at all, thus not imposing the deps for now and once some consumers +# are actually found to static link libgio-2.0.a, we can revisit and either add +# them or just put the (build) deps in that rare consumer instead of recursive +# RDEPEND here (due to lack of recursive DEPEND). +RDEPEND=" + !=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] + >=dev-libs/libpcre2-10.32:0=[${MULTILIB_USEDEP},unicode(+),static-libs?] + >=dev-libs/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}] + >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] + >=virtual/libintl-0-r2[${MULTILIB_USEDEP}] + kernel_linux? ( >=sys-apps/util-linux-2.23[${MULTILIB_USEDEP}] ) + selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] ) + xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) ) + elf? ( virtual/libelf:0= ) + sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] ) +" +DEPEND="${RDEPEND}" +# libxml2 used for optional tests that get automatically skipped +BDEPEND=" + app-text/docbook-xsl-stylesheets + dev-libs/libxslt + >=sys-devel/gettext-0.19.8 + gtk-doc? ( >=dev-util/gtk-doc-1.33 + app-text/docbook-xml-dtd:4.2 + app-text/docbook-xml-dtd:4.5 ) + systemtap? ( >=dev-util/systemtap-1.3 ) + ${PYTHON_DEPS} + test? ( >=sys-apps/dbus-1.2.14 ) + virtual/pkgconfig +" +# TODO: >=dev-util/gdbus-codegen-${PV} test dep once we modify gio/tests/meson.build to use external gdbus-codegen + +PDEPEND=" + dbus? ( gnome-base/dconf ) + mime? ( x11-misc/shared-mime-info ) +" +# shared-mime-info needed for gio/xdgmime, bug #409481 +# dconf is needed to be able to save settings, bug #498436 + +MULTILIB_CHOST_TOOLS=( + /usr/bin/gio-querymodules$(get_exeext) +) + +PATCHES=( + "${FILESDIR}"/${PN}-2.64.1-mark-gdbus-server-auth-test-flaky.patch + "${WORKDIR}"/${P}-patches-2 +) + +pkg_setup() { + if use kernel_linux ; then + CONFIG_CHECK="~INOTIFY_USER" + if use test ; then + CONFIG_CHECK="~IPV6" + WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them." + fi + linux-info_pkg_setup + fi + python-any-r1_pkg_setup +} + +src_prepare() { + if use test; then + # TODO: Review the test exclusions, especially now with meson + # Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163 + if ! has_version dev-util/desktop-file-utils ; then + ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system," + ewarn "think on installing it to get these tests run." + sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die + sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die + fi + + # gdesktopappinfo requires existing terminal (gnome-terminal or any + # other), falling back to xterm if one doesn't exist + #if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then + # ewarn "Some tests will be skipped due to missing terminal program" + # These tests seem to sometimes fail even with a terminal; skip for now and reevulate with meson + # Also try https://gitlab.gnome.org/GNOME/glib/issues/1601 once ready for backport (or in a bump) and file new issue if still fails + sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die + # desktop-app-info/launch* might fail similarly + sed -i -e "/desktop-app-info\/launch-as-manager/d" gio/tests/desktop-app-info.c || die + #fi + + # https://bugzilla.gnome.org/show_bug.cgi?id=722604 + sed -i -e "/timer\/stop/d" glib/tests/timer.c || die + sed -i -e "/timer\/basic/d" glib/tests/timer.c || die + + ewarn "Tests for search-utils have been skipped" + sed -i -e "/search-utils/d" glib/tests/meson.build || die + + # Play nice with network-sandbox, but this approach would defeat the purpose of the test + #sed -i -e "s/localhost/127.0.0.1/g" gio/tests/gsocketclient-slow.c || die + else + # Don't build tests, also prevents extra deps, bug #512022 + sed -i -e '/subdir.*tests/d' {.,gio,glib}/meson.build || die + fi + + # Don't build fuzzing binaries - not used + sed -i -e '/subdir.*fuzzing/d' meson.build || die + + # gdbus-codegen is a separate package + sed -i -e '/install_dir/d' gio/gdbus-2.0/codegen/meson.build || die + + # Same kind of meson-0.50 issue with some installed-tests files; will likely be fixed upstream soon + sed -i -e '/install_dir/d' gio/tests/meson.build || die + + cat > "${T}/glib-test-ld-wrapper" <<-EOF + #!/usr/bin/env sh + exec \${LD:-ld} "\$@" + EOF + chmod a+x "${T}/glib-test-ld-wrapper" || die + sed -i -e "s|'ld'|'${T}/glib-test-ld-wrapper'|g" gio/tests/meson.build || die + + default + gnome2_environment_reset + # TODO: python_name sedding for correct python shebang? Might be relevant mainly for glib-utils only +} + +multilib_src_configure() { + if use debug; then + append-cflags -DG_ENABLE_DEBUG + else + append-cflags -DG_DISABLE_CAST_CHECKS # https://gitlab.gnome.org/GNOME/glib/issues/1833 + fi + + # TODO: figure a way to pass appropriate values for all cross properties that glib uses (search for get_cross_property) + #if tc-is-cross-compiler ; then + # https://bugzilla.gnome.org/show_bug.cgi?id=756473 + # TODO-meson: This should be in meson cross file as 'growing_stack' property; and more, look at get_cross_property + #case ${CHOST} in + #hppa*|metag*) export glib_cv_stack_grows=yes ;; + #*) export glib_cv_stack_grows=no ;; + #esac + #fi + + local emesonargs=( + -Ddefault_library=$(usex static-libs both shared) + $(meson_feature selinux) + $(meson_use xattr) + -Dlibmount=enabled # only used if host_system == 'linux' + -Dman=true + $(meson_use systemtap dtrace) + $(meson_use systemtap) + $(meson_feature sysprof) + $(meson_native_use_bool gtk-doc gtk_doc) + $(meson_use test tests) + -Dinstalled_tests=false + -Dnls=enabled + -Doss_fuzz=disabled + $(meson_native_use_feature elf libelf) + -Dmultiarch=false + ) + meson_src_configure +} + +multilib_src_test() { + export XDG_CONFIG_DIRS=/etc/xdg + export XDG_DATA_DIRS=/usr/local/share:/usr/share + export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp" + export LC_TIME=C # bug #411967 + export TZ=UTC + unset GSETTINGS_BACKEND # bug #596380 + python_setup + + # https://bugs.gentoo.org/839807 + local -x SANDBOX_PREDICT=${SANDBOX_PREDICT} + addpredict /usr/b + + # Related test is a bit nitpicking + mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" + chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" + + meson_src_test --timeout-multiplier 2 --no-suite flaky +} + +multilib_src_install() { + meson_src_install + keepdir /usr/$(get_libdir)/gio/modules +} + +multilib_src_install_all() { + # These are installed by dev-util/glib-utils + # TODO: With patching we might be able to get rid of the python-any deps and removals, and test depend on glib-utils instead; revisit now with meson + rm "${ED}/usr/bin/glib-genmarshal" || die + rm "${ED}/usr/share/man/man1/glib-genmarshal.1" || die + rm "${ED}/usr/bin/glib-mkenums" || die + rm "${ED}/usr/share/man/man1/glib-mkenums.1" || die + rm "${ED}/usr/bin/gtester-report" || die + rm "${ED}/usr/share/man/man1/gtester-report.1" || die + # gdbus-codegen manpage installed by dev-util/gdbus-codegen + rm "${ED}/usr/share/man/man1/gdbus-codegen.1" || die +} + +pkg_preinst() { + xdg_pkg_preinst + + # Make gschemas.compiled belong to glib alone + local cache="/usr/share/glib-2.0/schemas/gschemas.compiled" + + if [[ -e ${EROOT}${cache} ]]; then + cp "${EROOT}"${cache} "${ED}"/${cache} || die + else + touch "${ED}"${cache} || die + fi + + multilib_pkg_preinst() { + # Make giomodule.cache belong to glib alone + local cache="/usr/$(get_libdir)/gio/modules/giomodule.cache" + + if [[ -e ${EROOT}${cache} ]]; then + cp "${EROOT}"${cache} "${ED}"${cache} || die + else + touch "${ED}"${cache} || die + fi + } + + # Don't run the cache ownership when cross-compiling, as it would end up with an empty cache + # file due to inability to create it and GIO might not look at any of the modules there + if ! tc-is-cross-compiler ; then + multilib_foreach_abi multilib_pkg_preinst + fi +} + +pkg_postinst() { + xdg_pkg_postinst + # glib installs no schemas itself, but we force update for fresh install in case + # something has dropped in a schemas file without direct glib dep; and for upgrades + # in case the compiled schema format could have changed + gnome2_schemas_update + + multilib_pkg_postinst() { + gnome2_giomodule_cache_update \ + || die "Update GIO modules cache failed (for ${ABI})" + } + if ! tc-is-cross-compiler ; then + multilib_foreach_abi multilib_pkg_postinst + else + ewarn "Updating of GIO modules cache skipped due to cross-compilation." + ewarn "You might want to run gio-querymodules manually on the target for" + ewarn "your final image for performance reasons and re-run it when packages" + ewarn "installing GIO modules get upgraded or added to the image." + fi + + for v in ${REPLACING_VERSIONS}; do + if ver_test "$v" "-lt" "2.63.6"; then + ewarn "glib no longer installs the gio-launch-desktop binary. You may need" + ewarn "to restart your session for \"Open With\" dialogs to work." + fi + done +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update + + if [[ -z ${REPLACED_BY_VERSION} ]]; then + multilib_pkg_postrm() { + rm -f "${EROOT}"/usr/$(get_libdir)/gio/modules/giomodule.cache + } + multilib_foreach_abi multilib_pkg_postrm + rm -f "${EROOT}"/usr/share/glib-2.0/schemas/gschemas.compiled + fi +} diff --git a/dev-libs/gmp/Manifest b/dev-libs/gmp/Manifest index 14b7f9628e23..e01e6dc5e4e6 100644 --- a/dev-libs/gmp/Manifest +++ b/dev-libs/gmp/Manifest @@ -5,6 +5,6 @@ AUX gmp-6.2.1-no-zarch.patch 623 BLAKE2B 4cdf9b780ca92f56eb3dd030a3614169b8cf4df DIST gmp-6.2.1-arm64-darwin.patch.bz2 2520 BLAKE2B 3d4e9dbd29dc9aa81f0c9e0de4a5904c989d54148c9e3dcc5097a43b3fb1ecd17802dacfc71ee131c0805a345f5dce9009e88439758d3a0ed8b3a88526353b4a SHA512 72d49f09c3facd75036c945e076207e72e5673ba9605999c32a122e43e8b970ed646c8ca8f07acbb62bff5e7c387d4c8e1f73ca73e50ac3f574b5f6471d66d56 DIST gmp-6.2.1.tar.xz 2027316 BLAKE2B c0d85f175392a50cfa01bc6b0a312b235946ad8b4f6f84f6dabd33d7a6f2cc75c9b0e1e33057be07750bfa0145b7c4cf3b6188a5be6ca9d7271ec2276c84ebcb SHA512 c99be0950a1d05a0297d65641dd35b75b74466f7bf03c9e8a99895a3b2f9a0856cd17887738fa51cf7499781b65c049769271cbcb77d057d2e9f1ec52e07dd84 DIST gmp-man-6.2.1.pdf 827583 BLAKE2B 9aa25457a3c488e37cc7d54d825253ab749a3780919570579b319cf607001de50b212ca387b70213abcc5ab428b4525bdb9cd8ae932798a2d7928da98ce3f353 SHA512 f2d9d02e97975355ef490e921fedc94fb7687c3661eec8fa2e94a1622b6e59b17b3879eb3ec1f2df8edac100f727175144d107f4c49c602b773c43bc9e91dbcb -EBUILD gmp-6.2.1-r2.ebuild 3149 BLAKE2B 934cd313c6cd94b3e4347f1a2b1b6e3c871a274617be729ff496e33be72095a8eb61690238285d4d597994ff3e7d88312130e32afa92a5b0e3d7eb34b02fc51d SHA512 213753bd26129c343f32306262d81fade3b9d67e53014c96656979a480e2a81c4d14776081b1aebf3617804a38be45cf49b1ec13aa1f49fa703819be232512a8 -EBUILD gmp-6.2.1-r5.ebuild 5462 BLAKE2B 5a18f8decd27eea8ce546840aedfeadcaaa7fc9c96c2277d3a0cb8a8dd08dd2726b6db2a0b91889f767cf468bf142d957ef5fa4f12e69549931e8abccdac35a6 SHA512 1bcfd15b5e91bc52a4c024c904daddddfd9a47f75a35bda46a6c444d65361326478c1f9a69bb241d643ab9f5fc8fc28b2ce04235877600e821cefbd855ef9aa3 +EBUILD gmp-6.2.1-r2.ebuild 3151 BLAKE2B 9271870022046d8f5b9eef93d432a72125fec063bf6b953ef120dd9d1070c30ba54cc68bd2b4377fb004a41b88bc36054e92dbd8f04ef43e164c1542422edb4e SHA512 98e20537ac7584f7d21bced0067fccdec0f2ca15d6878354530051e214c097bc85a45b3f5587f9c83458209d12112dd338ba9725ccc91ea2c4caaf01ea2cf57b +EBUILD gmp-6.2.1-r5.ebuild 5464 BLAKE2B 9efd99066619370b137f2ca6cfee2b875a94356524b54a1195202d0ca6ab468c39836cf95ea2dbecbc0618d31c68d47304facbe367384134b97610f1e9458e8d SHA512 a05b91a9e3a2748b3791c19a0cc87617a3ec6523ed4cc6aa0f664de16e2481cd8c34f69ecc9b9a4dd42ff4a3d73049b48cb6ba6a1cbffc2db4fd2bc70af48631 MISC metadata.xml 1044 BLAKE2B b6c7a609f9b8756693ae49f80508e73483145a9f4a8e3e63f25bdeb53dec0bca9851415f097722b1d646d57ae444fe4fdb98aef83d8a7cb15068672322dd5279 SHA512 4e47e1b850637db4b9d62d3a355587679cda1f245fcd264c6399fd4c463b0efbb2ec29cb4845efdb0795ba1dfa0dbc4c2186e983c6648352c9b41d871f388580 diff --git a/dev-libs/gmp/gmp-6.2.1-r2.ebuild b/dev-libs/gmp/gmp-6.2.1-r2.ebuild index 85974f6f50d9..ae2140240b2a 100644 --- a/dev-libs/gmp/gmp-6.2.1-r2.ebuild +++ b/dev-libs/gmp/gmp-6.2.1-r2.ebuild @@ -13,9 +13,11 @@ MY_P=${PN}-${MY_PV} PLEVEL=${PV/*p} DESCRIPTION="Library for arbitrary-precision arithmetic on different type of numbers" HOMEPAGE="https://gmplib.org/" -SRC_URI="ftp://ftp.gmplib.org/pub/${MY_P}/${MY_P}.tar.xz +SRC_URI=" + https://gmplib.org/download/gmp/${MY_P}.tar.xz mirror://gnu/${PN}/${MY_P}.tar.xz - doc? ( https://gmplib.org/${PN}-man-${MANUAL_PV}.pdf )" + doc? ( https://gmplib.org/${PN}-man-${MANUAL_PV}.pdf ) +" SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-arm64-darwin.patch.bz2" LICENSE="|| ( LGPL-3+ GPL-2+ )" diff --git a/dev-libs/gmp/gmp-6.2.1-r5.ebuild b/dev-libs/gmp/gmp-6.2.1-r5.ebuild index 2e867d0047e9..566858f65c45 100644 --- a/dev-libs/gmp/gmp-6.2.1-r5.ebuild +++ b/dev-libs/gmp/gmp-6.2.1-r5.ebuild @@ -16,9 +16,11 @@ PLEVEL=${PV/*p} DESCRIPTION="Library for arbitrary-precision arithmetic on different type of numbers" HOMEPAGE="https://gmplib.org/" -SRC_URI="ftp://ftp.gmplib.org/pub/${MY_P}/${MY_P}.tar.xz +SRC_URI=" + https://gmplib.org/download/gmp/${MY_P}.tar.xz mirror://gnu/${PN}/${MY_P}.tar.xz - doc? ( https://gmplib.org/${PN}-man-${MANUAL_PV}.pdf )" + doc? ( https://gmplib.org/${PN}-man-${MANUAL_PV}.pdf ) +" SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-arm64-darwin.patch.bz2" S="${WORKDIR}"/${MY_P%a} diff --git a/dev-libs/libnl/Manifest b/dev-libs/libnl/Manifest index 8620714e4d73..8feb198dab19 100644 --- a/dev-libs/libnl/Manifest +++ b/dev-libs/libnl/Manifest @@ -5,6 +5,6 @@ DIST libnl-3.6.0.tar.gz 981921 BLAKE2B 4fbc1f6284dfbf0aaa855dfc3bb97743272547182 DIST libnl-3.7.0.tar.gz 1000913 BLAKE2B 22c418ea520416d79ee4552ab6bc5ba99239b29e074c840d31b0ec4171a0403ea9d2c1afcbf1b3428564dd371cadd99bc062ae7540e7496f970c4fb98f967e84 SHA512 80fbbc079299c90afd2a5eda62e4d4f98bf4ef23958c3ce5101f4ed4d81d783af733213bb3bab15f218555d8460bc2394898f909f4ac024fc27281faec86a041 EBUILD libnl-3.5.0.ebuild 2381 BLAKE2B e054756ad522c3cfe593baf45854e6e4a8e669d26ec2027adf30cb537442f14d77b06493fdab911503d4e08045b1c2c9c4302ce9f892e17e221e77d82eabf2b5 SHA512 c99854fbf768e9e5f140fa8f4c88a1549272ba3c9a8200318016b1dbcaa03502527caeb1d26ed917c38958216eb0f3141a722bfc543c9a969e477fc7febd68a1 EBUILD libnl-3.6.0-r1.ebuild 2637 BLAKE2B 147ee4f4e9e1aa98757c25118761bb2ca9910ee0b07c3452c026d177c0e4a71ac70a55fca49fe77b6d3ff6d1c9074277e1116593ce4a9bc9d349ab58da0111c5 SHA512 e926f00e85bdfa2f115a55ec22f8de09f842dad726c8b0298c445258fb173f2e66c3d54bd7ede5266f248b33037c9b19c0a08ad01fb2a0d61ba3947d78bd1d7c -EBUILD libnl-3.7.0.ebuild 2607 BLAKE2B f4d5f69c8af1a98fea70bb64e5e425471beef0c656bf24d81610c85273884eeb7eabed8b4c223947d3c7fb7576085003d7585e208dc9b61af5653ffc454f29ba SHA512 dd742d30232c0c2937d971ad6bbcb02ae2a27c93bc48067dfa9b2aa2ad6ff13ec48d0a26c36c31f946615d1d1b0eebccf9130d25603b92947944d5b3a0354569 +EBUILD libnl-3.7.0.ebuild 2602 BLAKE2B edb9a0a4e856fadc3615545a39269539c35ed7a579f20fb480019e098831d14af85c51c547c91fed1c35928fff90d693a92b22c05a013bc695c0c558df7b7586 SHA512 83d9c7e62173e437ea5b33e00b48f724cb6869199d63660bf4a59772bded736465bd10ee94d41369413c9aad124d10f9ff9e552b70b357ea9c8ee5a523afe244 EBUILD libnl-9999.ebuild 2607 BLAKE2B f4d5f69c8af1a98fea70bb64e5e425471beef0c656bf24d81610c85273884eeb7eabed8b4c223947d3c7fb7576085003d7585e208dc9b61af5653ffc454f29ba SHA512 dd742d30232c0c2937d971ad6bbcb02ae2a27c93bc48067dfa9b2aa2ad6ff13ec48d0a26c36c31f946615d1d1b0eebccf9130d25603b92947944d5b3a0354569 MISC metadata.xml 525 BLAKE2B 62918f4b184a0636f9dbe24a31978ceccf354610b2b8d6db040440f5b519f5a7d710861b94671fd1c684da40e2a9df8563093509e7de9318c891e7c93567b7bf SHA512 076a06cff6803de3775cb295688cbe61831e79e3fa2d7a7e53b376a2c0a5137b349db153692b4cfa22ce6121d9e0579253dee06056076e9aec6f09aaf7a41387 diff --git a/dev-libs/libnl/libnl-3.7.0.ebuild b/dev-libs/libnl/libnl-3.7.0.ebuild index 9d6312ae6dd0..5ffdbbc1144d 100644 --- a/dev-libs/libnl/libnl-3.7.0.ebuild +++ b/dev-libs/libnl/libnl-3.7.0.ebuild @@ -19,7 +19,7 @@ if [[ ${PV} == 9999 ]] ; then inherit git-r3 else SRC_URI="https://github.com/thom311/${PN}/releases/download/${PN}${LIBNL_DIR}/${P/_rc/-rc}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" S="${WORKDIR}/${LIBNL_P}" fi -- cgit v1.2.3