commit: 6e016066fc23f8d38b8d47501033bab21c483480 Author: Lukas Schmelting <lschmelting <AT> posteo <DOT> com> AuthorDate: Sun Aug 10 09:25:42 2025 +0000 Commit: Eli Schwartz <eschwartz <AT> gentoo <DOT> org> CommitDate: Sun Sep 7 20:25:13 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e016066
gnome-base/gnome-shell: enforce binary dependency on gtk x11 and wayland backends Signed-off-by: Lukas Schmelting <lschmelting <AT> posteo.com> Part-of: https://github.com/gentoo/gentoo/pull/43235 Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org> .../{gnome-shell-47.7.ebuild => gnome-shell-47.7-r1.ebuild} | 9 ++++++--- .../{gnome-shell-47.8.ebuild => gnome-shell-47.8-r1.ebuild} | 9 ++++++--- gnome-base/gnome-shell/gnome-shell-48.3.ebuild | 9 ++++++--- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/gnome-base/gnome-shell/gnome-shell-47.7.ebuild b/gnome-base/gnome-shell/gnome-shell-47.7-r1.ebuild similarity index 95% rename from gnome-base/gnome-shell/gnome-shell-47.7.ebuild rename to gnome-base/gnome-shell/gnome-shell-47.7-r1.ebuild index d35d3510d9be..40605506441e 100644 --- a/gnome-base/gnome-shell/gnome-shell-47.7.ebuild +++ b/gnome-base/gnome-shell/gnome-shell-47.7-r1.ebuild @@ -4,7 +4,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{11..13} ) -inherit gnome.org gnome2-utils meson optfeature python-single-r1 virtualx xdg +inherit flag-o-matic gnome.org gnome2-utils meson optfeature python-single-r1 virtualx xdg DESCRIPTION="Provides core UI functions for the GNOME desktop" HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-shell"; @@ -13,7 +13,7 @@ LICENSE="GPL-2+ LGPL-2+" SLOT="0" KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" -IUSE="elogind gtk-doc +ibus +networkmanager pipewire systemd test" +IUSE="X elogind gtk-doc +ibus +networkmanager pipewire systemd test wayland" REQUIRED_USE="${PYTHON_REQUIRED_USE} ?? ( elogind systemd )" RESTRICT="!test? ( test )" @@ -25,7 +25,7 @@ DEPEND=" >=dev-libs/glib-2.68:2 >=dev-libs/gobject-introspection-1.49.1:= >=dev-libs/gjs-1.73.1[cairo(+)] - >=gui-libs/gtk-4:4[introspection] + >=gui-libs/gtk-4:4[X?,introspection,wayland?] >=x11-wm/mutter-47.0:0/15[introspection,test?] >=sys-auth/polkit-0.120_p20220509[introspection] >=gnome-base/gsettings-desktop-schemas-47_alpha[introspection] @@ -145,6 +145,9 @@ src_prepare() { } src_configure() { + use X || append-cppflags -DGENTOO_GTK_HIDE_X11 + use wayland || append-cppflags -DGENTOO_GTK_HIDE_WAYLAND + local emesonargs=( $(meson_use pipewire camera_monitor) -Dextensions_tool=true diff --git a/gnome-base/gnome-shell/gnome-shell-47.8.ebuild b/gnome-base/gnome-shell/gnome-shell-47.8-r1.ebuild similarity index 95% rename from gnome-base/gnome-shell/gnome-shell-47.8.ebuild rename to gnome-base/gnome-shell/gnome-shell-47.8-r1.ebuild index 5f52e3bfb1ed..2e6d6bb00288 100644 --- a/gnome-base/gnome-shell/gnome-shell-47.8.ebuild +++ b/gnome-base/gnome-shell/gnome-shell-47.8-r1.ebuild @@ -4,7 +4,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{11..13} ) -inherit gnome.org gnome2-utils meson optfeature python-single-r1 virtualx xdg +inherit flag-o-matic gnome.org gnome2-utils meson optfeature python-single-r1 virtualx xdg DESCRIPTION="Provides core UI functions for the GNOME desktop" HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-shell"; @@ -13,7 +13,7 @@ LICENSE="GPL-2+ LGPL-2+" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="elogind gtk-doc +ibus +networkmanager pipewire systemd test" +IUSE="X elogind gtk-doc +ibus +networkmanager pipewire systemd test wayland" REQUIRED_USE="${PYTHON_REQUIRED_USE} ?? ( elogind systemd )" RESTRICT="!test? ( test )" @@ -25,7 +25,7 @@ DEPEND=" >=dev-libs/glib-2.68:2 >=dev-libs/gobject-introspection-1.49.1:= >=dev-libs/gjs-1.73.1[cairo(+)] - >=gui-libs/gtk-4:4[introspection] + >=gui-libs/gtk-4:4[X?,introspection,wayland?] >=x11-wm/mutter-47.0:0/15[introspection,test?] >=sys-auth/polkit-0.120_p20220509[introspection] >=gnome-base/gsettings-desktop-schemas-47_alpha[introspection] @@ -146,6 +146,9 @@ src_prepare() { } src_configure() { + use X || append-cppflags -DGENTOO_GTK_HIDE_X11 + use wayland || append-cppflags -DGENTOO_GTK_HIDE_WAYLAND + local emesonargs=( $(meson_use pipewire camera_monitor) -Dextensions_tool=true diff --git a/gnome-base/gnome-shell/gnome-shell-48.3.ebuild b/gnome-base/gnome-shell/gnome-shell-48.3.ebuild index a0622ea62bb3..e33339078539 100644 --- a/gnome-base/gnome-shell/gnome-shell-48.3.ebuild +++ b/gnome-base/gnome-shell/gnome-shell-48.3.ebuild @@ -4,7 +4,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{11..13} ) -inherit gnome.org gnome2-utils meson optfeature python-single-r1 virtualx xdg +inherit flag-o-matic gnome.org gnome2-utils meson optfeature python-single-r1 virtualx xdg DESCRIPTION="Provides core UI functions for the GNOME desktop" HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-shell"; @@ -13,7 +13,7 @@ LICENSE="GPL-2+ LGPL-2+" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="elogind gtk-doc +ibus +networkmanager pipewire systemd test" +IUSE="X elogind gtk-doc +ibus +networkmanager pipewire systemd test wayland" REQUIRED_USE="${PYTHON_REQUIRED_USE} ?? ( elogind systemd )" RESTRICT="!test? ( test )" @@ -25,7 +25,7 @@ DEPEND=" >=dev-libs/glib-2.68:2 >=dev-libs/gobject-introspection-1.49.1:= >=dev-libs/gjs-1.73.1[cairo(+)] - >=gui-libs/gtk-4:4[introspection] + >=gui-libs/gtk-4:4[X?,introspection,wayland?] >=x11-wm/mutter-48.0:0/16[introspection,test?] >=sys-auth/polkit-0.120_p20220509[introspection] >=gnome-base/gsettings-desktop-schemas-48_beta[introspection] @@ -141,6 +141,9 @@ src_prepare() { } src_configure() { + use X || append-cppflags -DGENTOO_GTK_HIDE_X11 + use wayland || append-cppflags -DGENTOO_GTK_HIDE_WAYLAND + local emesonargs=( $(meson_use pipewire camera_monitor) -Dextensions_tool=true
