commit: 6efc7e6f90e3cf32e7d4186b0c69a160b6f60bdd
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 5 19:10:42 2023 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Sep 5 20:28:35 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6efc7e6f
x11-wm/mutter: Drop old versions
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
x11-wm/mutter/Manifest | 2 -
x11-wm/mutter/mutter-44.2.ebuild | 235 -----------------------------------
x11-wm/mutter/mutter-45_alpha.ebuild | 234 ----------------------------------
3 files changed, 471 deletions(-)
diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index 3b7d0845d63e..6fbb48ec0c83 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -1,5 +1,3 @@
-DIST mutter-44.2.tar.xz 2848696 BLAKE2B
2adbda457c215dfb1889c9b42eb1c58b0d012f79287414da6f4a18ff92b082d872df344abdb72b5f193f1830c6f1002495ff9152c51ad3824c779ccd81e11310
SHA512
5c58cac46a571bd9fabca8326cf973c79d9d47bd223b39476e143f30e435900859e5cef1858bc343261ad9c026166647b940c5becc6d788d99d947bd003e12da
DIST mutter-44.3.tar.xz 2848256 BLAKE2B
42c00d4673cab5d119361c6eb2b78c33894c637b36a34f9b74eb5a19ca621d3458208be020216f9a8949e8b0a9c9de697662c5aebb11f70bc83173ce33c7a1eb
SHA512
d29bc6c7407ba81be0b5bfa2333bc77c09f7a084e09d6902cad8ca8e64ba75a22652b68a4e84b79b80481d9a7b6cb490128113dcd125ed5bcd5423d4ec88fb35
DIST mutter-44.4.tar.xz 2847392 BLAKE2B
2ecdb0d447c0426a7e02f4d3b3cdf8936a6c7a5fecad163bdba9428f018e0ceb2047b241422bc9de5e9d0fb08e88a04d572d1b404b48d6df214a7263292309ba
SHA512
3f7b37be5531e270c071fc9784a6a284a3d715dfd1dfc854779126197d6e53c660836412ba08e6233747c7b016926114a57be5adb36a11c8ec9c81e333ce668c
-DIST mutter-45.alpha.tar.xz 2850600 BLAKE2B
92e03c1ba440eae9369cb344e003d3bbc619de6ee45debf51145a6729220879855faa75f2c4c7b21cf79f691981aaed39daf771c959f44d9c63572ff2aa43195
SHA512
c819fa6d1ee1e41f4dee702c6b8ee7b5ede3f689a6a55e245f40d3bc8013c8414eb7077224bd8e33c9536fdf089fbc4cd7fe7a7d071cafe392c6281169c28c4b
DIST mutter-45.beta.1.tar.xz 2876540 BLAKE2B
f7aa51c1bad49b58ddc6aca9abcf91c69c20b8dfa33331da5c2c7e47e259720e326bbbc71138b3b5e3d09f2dd8e77c3826bf8b936eb819fff391ea9b56957360
SHA512
4083952406dc4c6f84da6641ab84072b889fc775cd7ff3146297f3d22ae298b2283ebb683a94b49259c748220f1a00292b460f20f64c2de36896659591c49039
diff --git a/x11-wm/mutter/mutter-44.2.ebuild b/x11-wm/mutter/mutter-44.2.ebuild
deleted file mode 100644
index 3fa7e76ec965..000000000000
--- a/x11-wm/mutter/mutter-44.2.ebuild
+++ /dev/null
@@ -1,235 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
-inherit gnome.org gnome2-utils meson python-any-r1 udev xdg
-
-DESCRIPTION="GNOME compositing window manager based on Clutter"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/";
-
-if [[ ${PV} == 9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/mutter.git";
- SRC_URI=""
-else
- KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0/$(($(ver_cut 1) - 32))" # 0/libmutter_api_version - ONLY gnome-shell
(or anything using mutter-clutter-<api_version>.pc) should use the subslot
-
-IUSE="debug elogind gnome gtk-doc input_devices_wacom +introspection
screencast sysprof systemd test udev wayland video_cards_nvidia"
-# native backend requires gles3 for hybrid graphics blitting support, udev and
a logind provider
-REQUIRED_USE="
- gtk-doc? ( introspection )
- wayland? ( ^^ ( elogind systemd ) udev )
- test? ( wayland )"
-RESTRICT="!test? ( test )"
-
-# gnome-settings-daemon is build checked, but used at runtime only for
org.gnome.settings-daemon.peripherals.keyboard gschema
-# xorg-server is needed at build and runtime with USE=wayland for Xwayland
-# v3.32.2 has many excessive or unused *_req variables declared, thus
currently the dep order ignores those and goes via dependency() call order
-DEPEND="
- >=media-libs/graphene-1.10.2[introspection?]
- x11-libs/gdk-pixbuf:2
- >=x11-libs/pango-1.46[introspection?]
- >=x11-libs/cairo-1.14[X]
- >=dev-libs/fribidi-1.0.0
- >=gnome-base/gsettings-desktop-schemas-42.0[introspection?]
- >=dev-libs/glib-2.75.1:2
- gnome-base/gnome-settings-daemon
- >=dev-libs/json-glib-0.12.0[introspection?]
- >=x11-libs/libxkbcommon-0.4.3
- x11-libs/libICE
- >=app-accessibility/at-spi2-core-2.46:2[introspection?]
- sys-apps/dbus
- >=x11-misc/colord-1.4.5:=
- >=media-libs/lcms-2.6:2
- >=media-libs/harfbuzz-2.6.0:=
-
- gnome? ( gnome-base/gnome-desktop:4= )
-
- >=media-libs/libcanberra-0.26
-
- media-libs/libglvnd[X]
-
- wayland? (
- >=dev-libs/wayland-protocols-1.31
- >=dev-libs/wayland-1.21.0
-
- x11-libs/libdrm
- media-libs/mesa[gbm(+)]
- >=dev-libs/libinput-1.18.0:=
-
- elogind? ( sys-auth/elogind )
- x11-base/xwayland
- video_cards_nvidia? ( gui-libs/egl-wayland )
- )
- udev? (
- >=virtual/libudev-232-r1:=
- >=dev-libs/libgudev-232
- )
- systemd? ( sys-apps/systemd )
- x11-libs/libSM
- input_devices_wacom? ( >=dev-libs/libwacom-0.13:= )
- >=x11-libs/startup-notification-0.7
- screencast? ( >=media-video/pipewire-0.3.21:= )
- introspection? ( >=dev-libs/gobject-introspection-1.54:= )
- test? ( >=x11-libs/gtk+-3.19.8:3[X,introspection?] )
- sysprof? ( >=dev-util/sysprof-capture-3.40.1:4
>=dev-util/sysprof-3.46.0 )
-"
-# for now upstream has "have_x11 = true" in the meson.build, but sooner or
later upstream is going to make X optional.
-# X? (
-DEPEND+="
- >=gui-libs/gtk-4.0.0:4[X,introspection?]
- >=x11-libs/libX11-1.7.0
- >=x11-libs/libXcomposite-0.4
- x11-libs/libXcursor
- x11-libs/libXdamage
- x11-libs/libXext
- >=x11-libs/libXfixes-3
- >=x11-libs/libXi-1.7.4
- x11-libs/libXtst
- x11-libs/libxkbfile
- x11-misc/xkeyboard-config
- >=x11-libs/libxkbcommon-0.4.3[X]
- x11-libs/libXrender
- >=x11-libs/libXrandr-1.5.0
- x11-libs/libxcb:=
- x11-libs/libXinerama
- x11-libs/libXau
-"
-# )"
-
-RDEPEND="${DEPEND}
- gnome-extra/zenity
-
- !<gui-libs/gtk-4.6.4:4
-"
-DEPEND="${DEPEND}
- x11-base/xorg-proto
- sysprof? ( >=dev-util/sysprof-common-3.38.0 )
-"
-BDEPEND="
- dev-util/wayland-scanner
- dev-util/gdbus-codegen
- dev-util/glib-utils
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
- gtk-doc? ( >=dev-util/gi-docgen-2021.1 )
- test? (
- ${PYTHON_DEPS}
- $(python_gen_any_dep '
- >=dev-python/python-dbusmock-0.28[${PYTHON_USEDEP}]
- ')
- app-text/docbook-xml-dtd:4.5
- x11-misc/xvfb-run
- )
- wayland? (
- >=sys-kernel/linux-headers-4.4
- x11-libs/libxcvt
- )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-43.0-Disable-anonymous-file-test.patch
-
-)
-
-python_check_deps() {
- if use test; then
- python_has_version
">=dev-python/python-dbusmock-0.28[${PYTHON_USEDEP}]"
- fi
-}
-
-src_prepare() {
- default
-
- sed -i -e "s:#!/usr/bin/bash:#!$(command -v bash):"
src/tests/x11-test.sh || die
-}
-
-src_configure() {
- local emesonargs=(
- # Mutter X11 renderer only supports gles2 and GLX, thus do NOT
pass
- #
- # -Dopengl_libname=libOpenGL.so.0
- #
- # while we build the x11 renderer, as we currently enable gles2
only
- # with USE=wayland and x11 renderer wouldn't find the needed
GLX symbols
- # in a configuration where wayland is disabled, as libOpenGL
doesn't
- # include them.
- #
- # See
- # - https://bugs.gentoo.org/835786
- # - https://forums.gentoo.org/viewtopic-p-8695669.html
-
- --buildtype $(usex debug debug plain)
- -Dopengl=true
- $(meson_use wayland gles2)
- #gles2_libname
- -Degl=true
- -Dglx=true
- $(meson_use wayland)
- $(meson_use wayland xwayland)
- $(meson_use systemd)
- $(meson_use wayland native_backend)
- $(meson_use screencast remote_desktop)
- $(meson_use gnome libgnome_desktop)
- $(meson_use udev)
- -Dudev_dir=$(get_udevdir)
- $(meson_use input_devices_wacom libwacom)
- -Dsound_player=true
- -Dpango_ft2=true
- -Dstartup_notification=true
- -Dsm=true
- $(meson_use introspection)
- $(meson_use gtk-doc docs)
- $(meson_use test cogl_tests)
- $(meson_use wayland core_tests) # core tests require wayland;
overall -Dtests option is honored on top, so no extra conditional needed
- -Dnative_tests=false
- $(meson_use test clutter_tests)
- $(meson_use test tests)
- -Dkvm_tests=false
- -Dtty_tests=false
- $(meson_use sysprof profiler)
- -Dinstalled_tests=false
-
- #verbose # Let upstream choose default for verbose mode
- #xwayland_path
- # TODO: relies on default settings, but in Gentoo we might have
some more packages we want to give Xgrab access (mostly virtual managers and
remote desktops)
- #xwayland_grab_default_access_rules
- )
-
- if use wayland && use video_cards_nvidia; then
- emesonargs+=(
- -Degl_device=true
- -Dwayland_eglstream=true
- )
- else
- emesonargs+=(
- -Degl_device=false
- -Dwayland_eglstream=false
- )
- fi
-
- meson_src_configure
-}
-
-src_test() {
- gnome2_environment_reset # Avoid dconf that looks at XDG_DATA_DIRS,
which can sandbox fail if flatpak is installed
- glib-compile-schemas "${BUILD_DIR}"/data
- GSETTINGS_SCHEMA_DIR="${BUILD_DIR}"/data meson_src_test --setup=CI
-}
-
-pkg_postinst() {
- use udev && udev_reload
- xdg_pkg_postinst
- gnome2_schemas_update
-}
-
-pkg_postrm() {
- use udev && udev_reload
- xdg_pkg_postrm
- gnome2_schemas_update
-}
diff --git a/x11-wm/mutter/mutter-45_alpha.ebuild
b/x11-wm/mutter/mutter-45_alpha.ebuild
deleted file mode 100644
index 09a495a3b9e1..000000000000
--- a/x11-wm/mutter/mutter-45_alpha.ebuild
+++ /dev/null
@@ -1,234 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
-inherit gnome.org gnome2-utils meson python-any-r1 udev xdg
-
-DESCRIPTION="GNOME compositing window manager based on Clutter"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/";
-
-if [[ ${PV} == 9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/mutter.git";
- SRC_URI=""
-else
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0/$(($(ver_cut 1) - 32))" # 0/libmutter_api_version - ONLY gnome-shell
(or anything using mutter-clutter-<api_version>.pc) should use the subslot
-
-IUSE="debug elogind gnome gtk-doc input_devices_wacom +introspection
screencast sysprof systemd test udev wayland video_cards_nvidia"
-# native backend requires gles3 for hybrid graphics blitting support, udev and
a logind provider
-REQUIRED_USE="
- gtk-doc? ( introspection )
- wayland? ( ^^ ( elogind systemd ) udev )
- test? ( wayland )"
-RESTRICT="!test? ( test )"
-
-# gnome-settings-daemon is build checked, but used at runtime only for
org.gnome.settings-daemon.peripherals.keyboard gschema
-# xorg-server is needed at build and runtime with USE=wayland for Xwayland
-# v3.32.2 has many excessive or unused *_req variables declared, thus
currently the dep order ignores those and goes via dependency() call order
-DEPEND="
- >=media-libs/graphene-1.10.2[introspection?]
- x11-libs/gdk-pixbuf:2
- >=x11-libs/pango-1.46[introspection?]
- >=x11-libs/cairo-1.14[X]
- >=dev-libs/fribidi-1.0.0
- >=gnome-base/gsettings-desktop-schemas-42.0[introspection?]
- >=dev-libs/glib-2.75.1:2
- gnome-base/gnome-settings-daemon
- >=dev-libs/json-glib-0.12.0[introspection?]
- >=x11-libs/libxkbcommon-0.4.3
- x11-libs/libICE
- >=app-accessibility/at-spi2-core-2.46:2[introspection?]
- sys-apps/dbus
- >=x11-misc/colord-1.4.5:=
- >=media-libs/lcms-2.6:2
- >=media-libs/harfbuzz-2.6.0:=
-
- gnome? ( gnome-base/gnome-desktop:4= )
-
- >=media-libs/libcanberra-0.26
-
- media-libs/libglvnd[X]
-
- wayland? (
- >=dev-libs/wayland-protocols-1.31
- >=dev-libs/wayland-1.21.0
-
- x11-libs/libdrm
- media-libs/mesa[gbm(+)]
- >=dev-libs/libinput-1.18.0:=
-
- elogind? ( sys-auth/elogind )
- x11-base/xwayland
- video_cards_nvidia? ( gui-libs/egl-wayland )
- )
- udev? (
- >=virtual/libudev-232-r1:=
- >=dev-libs/libgudev-232
- )
- systemd? ( sys-apps/systemd )
- x11-libs/libSM
- input_devices_wacom? ( >=dev-libs/libwacom-0.13:= )
- >=x11-libs/startup-notification-0.7
- screencast? ( >=media-video/pipewire-0.3.21:= )
- introspection? ( >=dev-libs/gobject-introspection-1.54:= )
- test? ( >=x11-libs/gtk+-3.19.8:3[X,introspection?] )
- sysprof? ( >=dev-util/sysprof-capture-3.40.1:4
>=dev-util/sysprof-3.46.0 )
-"
-# for now upstream has "have_x11 = true" in the meson.build, but sooner or
later upstream is going to make X optional.
-# X? (
-DEPEND+="
- >=gui-libs/gtk-4.0.0:4[X,introspection?]
- >=x11-libs/libX11-1.7.0
- >=x11-libs/libXcomposite-0.4
- x11-libs/libXcursor
- x11-libs/libXdamage
- x11-libs/libXext
- >=x11-libs/libXfixes-3
- >=x11-libs/libXi-1.7.4
- x11-libs/libXtst
- x11-libs/libxkbfile
- x11-misc/xkeyboard-config
- >=x11-libs/libxkbcommon-0.4.3[X]
- x11-libs/libXrender
- >=x11-libs/libXrandr-1.5.0
- x11-libs/libxcb:=
- x11-libs/libXinerama
- x11-libs/libXau
-"
-# )"
-
-RDEPEND="${DEPEND}
- gnome-extra/zenity
-
- !<gui-libs/gtk-4.6.4:4
-"
-DEPEND="${DEPEND}
- x11-base/xorg-proto
- sysprof? ( >=dev-util/sysprof-common-3.38.0 )
-"
-BDEPEND="
- dev-util/wayland-scanner
- dev-util/gdbus-codegen
- dev-util/glib-utils
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
- gtk-doc? ( >=dev-util/gi-docgen-2021.1 )
- test? (
- ${PYTHON_DEPS}
- $(python_gen_any_dep '
- >=dev-python/python-dbusmock-0.28[${PYTHON_USEDEP}]
- ')
- app-text/docbook-xml-dtd:4.5
- x11-misc/xvfb-run
- )
- wayland? (
- >=sys-kernel/linux-headers-4.4
- x11-libs/libxcvt
- )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-43.0-Disable-anonymous-file-test.patch
-)
-
-python_check_deps() {
- if use test; then
- python_has_version
">=dev-python/python-dbusmock-0.28[${PYTHON_USEDEP}]"
- fi
-}
-
-src_prepare() {
- default
-
- sed -i -e "s:#!/usr/bin/bash:#!$(command -v bash):"
src/tests/x11-test.sh || die
-}
-
-src_configure() {
- local emesonargs=(
- # Mutter X11 renderer only supports gles2 and GLX, thus do NOT
pass
- #
- # -Dopengl_libname=libOpenGL.so.0
- #
- # while we build the x11 renderer, as we currently enable gles2
only
- # with USE=wayland and x11 renderer wouldn't find the needed
GLX symbols
- # in a configuration where wayland is disabled, as libOpenGL
doesn't
- # include them.
- #
- # See
- # - https://bugs.gentoo.org/835786
- # - https://forums.gentoo.org/viewtopic-p-8695669.html
-
- --buildtype $(usex debug debug plain)
- -Dopengl=true
- $(meson_use wayland gles2)
- #gles2_libname
- -Degl=true
- -Dglx=true
- $(meson_use wayland)
- $(meson_use wayland xwayland)
- $(meson_use systemd)
- $(meson_use wayland native_backend)
- $(meson_use screencast remote_desktop)
- $(meson_use gnome libgnome_desktop)
- $(meson_use udev)
- -Dudev_dir=$(get_udevdir)
- $(meson_use input_devices_wacom libwacom)
- -Dsound_player=true
- -Dpango_ft2=true
- -Dstartup_notification=true
- -Dsm=true
- $(meson_use introspection)
- $(meson_use gtk-doc docs)
- $(meson_use test cogl_tests)
- $(meson_use wayland core_tests) # core tests require wayland;
overall -Dtests option is honored on top, so no extra conditional needed
- -Dnative_tests=false
- $(meson_use test clutter_tests)
- $(meson_use test tests)
- -Dkvm_tests=false
- -Dtty_tests=false
- $(meson_use sysprof profiler)
- -Dinstalled_tests=false
-
- #verbose # Let upstream choose default for verbose mode
- #xwayland_path
- # TODO: relies on default settings, but in Gentoo we might have
some more packages we want to give Xgrab access (mostly virtual managers and
remote desktops)
- #xwayland_grab_default_access_rules
- )
-
- if use wayland && use video_cards_nvidia; then
- emesonargs+=(
- -Degl_device=true
- -Dwayland_eglstream=true
- )
- else
- emesonargs+=(
- -Degl_device=false
- -Dwayland_eglstream=false
- )
- fi
-
- meson_src_configure
-}
-
-src_test() {
- gnome2_environment_reset # Avoid dconf that looks at XDG_DATA_DIRS,
which can sandbox fail if flatpak is installed
- glib-compile-schemas "${BUILD_DIR}"/data
- GSETTINGS_SCHEMA_DIR="${BUILD_DIR}"/data meson_src_test --setup=CI
-}
-
-pkg_postinst() {
- use udev && udev_reload
- xdg_pkg_postinst
- gnome2_schemas_update
-}
-
-pkg_postrm() {
- use udev && udev_reload
- xdg_pkg_postrm
- gnome2_schemas_update
-}
