All consumers are now on EAPI 8. Signed-off-by: James Le Cuirot <[email protected]> ---
On Thu, 2026-01-08 at 21:18 +0200, Mart Raudsepp wrote: > We have a bunch of other eclass changes going in as part of bump work > this weekend or next weekend, so if that's OK, I'd like to push this > together with that work for less metadata churn with it being good > matching timing. > > That said, you seem to have missed the part about conditional exporting > of the gstreamer-meson_pkg_setup phase in EAPI-8 and the comment on > that phase definition. This is very likely to be kept for EAPI-9 too. I needed the meson.eclass change in ASAP, so I've merged that now, but this one wasn't essential. It was really just in case. I've fixed up the patch as you suggested, but I saw you're also handling this in https://github.com/gentoo/gentoo/pull/42781, so please do whatever works for you. eclass/gstreamer-meson.eclass | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/eclass/gstreamer-meson.eclass b/eclass/gstreamer-meson.eclass index 22626f1b82b81..e2bb4c9de5acd 100644 --- a/eclass/gstreamer-meson.eclass +++ b/eclass/gstreamer-meson.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2025 Gentoo Authors +# Copyright 1999-2026 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: gstreamer-meson.eclass @@ -13,7 +13,7 @@ # foser <[email protected]> # zaheerm <[email protected]> # Steven Newbury -# @SUPPORTED_EAPIS: 7 8 +# @SUPPORTED_EAPIS: 8 # @PROVIDES: meson multilib-minimal # @BLURB: Helps building core & split gstreamer plugins # @DESCRIPTION: @@ -28,18 +28,16 @@ # also list any packages that provide explicitly requested plugins. case "${EAPI:-0}" in - 7|8) + 8) ;; *) die "EAPI=\"${EAPI}\" is not supported" ;; esac -PYTHON_COMPAT=( python3_{10..13} ) -[[ ${EAPI} == 8 ]] && inherit python-any-r1 - # multilib-minimal goes last -inherit meson multilib toolchain-funcs xdg-utils multilib-minimal +PYTHON_COMPAT=( python3_{10..13} ) +inherit python-any-r1 meson multilib toolchain-funcs xdg-utils multilib-minimal # @ECLASS_VARIABLE: GST_PLUGINS_ENABLED # @DESCRIPTION: @@ -209,9 +207,9 @@ RDEPEND=" >=dev-libs/glib-${GLIB_VERSION}:2[${MULTILIB_USEDEP}] " BDEPEND=" + ${PYTHON_DEPS} virtual/pkgconfig " -[[ ${EAPI} == 8 ]] && BDEPEND="${BDEPEND} ${PYTHON_DEPS}" # gst-plugins-{base,good} splits all require glib-utils due to gnome.mkenums_simple meson calls in gst-libs # The alternative would be to patch out the subdir calls, but some packages need it themselves too anyways, thus # something in a full upgrade path will require it anyways at build time, so not worth the risk. @@ -457,7 +455,6 @@ gstreamer_multilib_src_compile() { # @FUNCTION: gstreamer-meson_pkg_setup # @DESCRIPTION: # Proxies python-any-r1_pkg_setup for forward-proofing any future pkg_setup needs. -# Only exported for EAPI-8. gstreamer-meson_pkg_setup() { python-any-r1_pkg_setup } @@ -498,16 +495,12 @@ gstreamer_multilib_src_install_all() { for plugin_dir in ${GST_PLUGINS_BUILD_DIR} ; do local dir=$(gstreamer_get_plugin_dir ${plugin_dir}) [[ -e ${dir}/README ]] && dodoc "${dir}"/README - if [[ ${EAPI} == 8 ]]; then - local presets=( "${dir}"/*.prs ) - if [[ -e ${presets[0]} ]]; then - insinto /usr/share/gstreamer-${SLOT}/presets - doins "${presets[@]}" - fi + local presets=( "${dir}"/*.prs ) + if [[ -e ${presets[0]} ]]; then + insinto /usr/share/gstreamer-${SLOT}/presets + doins "${presets[@]}" fi done } -if [[ ${EAPI} == 8 ]]; then - EXPORT_FUNCTIONS pkg_setup -fi +EXPORT_FUNCTIONS pkg_setup -- 2.52.0
