From 3ade8645340cc2b313640bb4180c46943854c3d4 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 May 2025 07:06:40 +0000 Subject: [PATCH] dev-libs/glib: Sync with Gentoo It's from Gentoo commit e2665bfb6a923d7fb1ff17b47d6fcbfe61e00968. --- .../dev-libs/glib/glib-2.78.6.ebuild | 4 ++-- .../dev-libs/glib/glib-2.80.5-r1.ebuild | 21 +++++++++++++++++-- .../dev-libs/glib/glib-2.82.5.ebuild | 21 +++++++++++++++++-- .../dev-libs/glib/glib-2.84.0.ebuild | 21 +++++++++++++++++-- .../dev-libs/glib/glib-2.84.1.ebuild | 21 +++++++++++++++++-- 5 files changed, 78 insertions(+), 10 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.78.6.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.78.6.ebuild index e5481fe4d0..e7fad17bc4 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.78.6.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.78.6.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 PYTHON_REQ_USE="xml(+)" -PYTHON_COMPAT=( python3_{10..13} ) +PYTHON_COMPAT=( python3_{11..13} ) inherit gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.80.5-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.80.5-r1.ebuild index fb26093bb4..246b5d60c8 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.80.5-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.80.5-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 PYTHON_REQ_USE="xml(+)" -PYTHON_COMPAT=( python3_{10..13} ) +PYTHON_COMPAT=( python3_{11..13} ) inherit gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg @@ -223,8 +223,25 @@ multilib_src_configure() { #esac #fi + _need_bootstrap_gi() { + if ! multilib_native_use introspection ; then + return 1 + fi + + if ! has_version ">=dev-libs/${INTROSPECTION_P}" ; then + return 0 + fi + + # Is the installed gobject-introspection usable? + if ! g-ir-scanner --version &> /dev/null ; then + return 0 + fi + + return 1 + } + # Build internal copy of gobject-introspection to avoid circular dependency (built for native abi only) - if multilib_native_use introspection && ! has_version ">=dev-libs/${INTROSPECTION_P}" ; then + if _need_bootstrap_gi ; then einfo "Bootstrapping gobject-introspection..." INTROSPECTION_BIN_DIR="${T}/bootstrap-gi-prefix/usr/bin" INTROSPECTION_LIB_DIR="${T}/bootstrap-gi-prefix/usr/$(get_libdir)" diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.82.5.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.82.5.ebuild index b16e62189f..a134d8d356 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.82.5.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.82.5.ebuild @@ -3,7 +3,7 @@ EAPI=8 PYTHON_REQ_USE="xml(+)" -PYTHON_COMPAT=( python3_{10..13} ) +PYTHON_COMPAT=( python3_{11..13} ) inherit eapi9-ver gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg @@ -211,8 +211,25 @@ multilib_src_configure() { #esac #fi + _need_bootstrap_gi() { + if ! multilib_native_use introspection ; then + return 1 + fi + + if ! has_version ">=dev-libs/${INTROSPECTION_P}" ; then + return 0 + fi + + # Is the installed gobject-introspection usable? + if ! g-ir-scanner --version &> /dev/null ; then + return 0 + fi + + return 1 + } + # Build internal copy of gobject-introspection to avoid circular dependency (built for native abi only) - if multilib_native_use introspection && ! has_version ">=dev-libs/${INTROSPECTION_P}" ; then + if _need_bootstrap_gi ; then einfo "Bootstrapping gobject-introspection..." INTROSPECTION_BIN_DIR="${T}/bootstrap-gi-prefix/usr/bin" INTROSPECTION_LIB_DIR="${T}/bootstrap-gi-prefix/usr/$(get_libdir)" diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.84.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.84.0.ebuild index 8ec0a9d7d4..0ec8e82854 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.84.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.84.0.ebuild @@ -3,7 +3,7 @@ EAPI=8 PYTHON_REQ_USE="xml(+)" -PYTHON_COMPAT=( python3_{10..13} ) +PYTHON_COMPAT=( python3_{11..13} ) inherit eapi9-ver gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg @@ -215,8 +215,25 @@ multilib_src_configure() { #esac #fi + _need_bootstrap_gi() { + if ! multilib_native_use introspection ; then + return 1 + fi + + if ! has_version ">=dev-libs/${INTROSPECTION_P}" ; then + return 0 + fi + + # Is the installed gobject-introspection usable? + if ! g-ir-scanner --version &> /dev/null ; then + return 0 + fi + + return 1 + } + # Build internal copy of gobject-introspection to avoid circular dependency (built for native abi only) - if multilib_native_use introspection && ! has_version ">=dev-libs/${INTROSPECTION_P}" ; then + if _need_bootstrap_gi ; then einfo "Bootstrapping gobject-introspection..." INTROSPECTION_BIN_DIR="${T}/bootstrap-gi-prefix/usr/bin" INTROSPECTION_LIB_DIR="${T}/bootstrap-gi-prefix/usr/$(get_libdir)" diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.84.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.84.1.ebuild index e5e5ff280c..fb9437f28e 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.84.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.84.1.ebuild @@ -3,7 +3,7 @@ EAPI=8 PYTHON_REQ_USE="xml(+)" -PYTHON_COMPAT=( python3_{10..13} ) +PYTHON_COMPAT=( python3_{11..13} ) inherit eapi9-ver gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg @@ -216,8 +216,25 @@ multilib_src_configure() { #esac #fi + _need_bootstrap_gi() { + if ! multilib_native_use introspection ; then + return 1 + fi + + if ! has_version ">=dev-libs/${INTROSPECTION_P}" ; then + return 0 + fi + + # Is the installed gobject-introspection usable? + if ! g-ir-scanner --version &> /dev/null ; then + return 0 + fi + + return 1 + } + # Build internal copy of gobject-introspection to avoid circular dependency (built for native abi only) - if multilib_native_use introspection && ! has_version ">=dev-libs/${INTROSPECTION_P}" ; then + if _need_bootstrap_gi ; then einfo "Bootstrapping gobject-introspection..." INTROSPECTION_BIN_DIR="${T}/bootstrap-gi-prefix/usr/bin" INTROSPECTION_LIB_DIR="${T}/bootstrap-gi-prefix/usr/$(get_libdir)"