commit: 6e1ee1fe7b66f5d88509ad7332dc0e1e21a7f101 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Oct 31 00:23:59 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Oct 31 00:24:27 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e1ee1fe
x11-wm/mutter: drop obsolete xorg-server[wayland] dependency libxcvt has been stable for a while and this ends up leading to confusing blockers anyway. Bug: https://bugs.gentoo.org/814335 Signed-off-by: Sam James <sam <AT> gentoo.org> x11-wm/mutter/{mutter-40.3-r2.ebuild => mutter-40.3-r3.ebuild} | 5 +---- x11-wm/mutter/{mutter-40.4-r1.ebuild => mutter-40.4-r2.ebuild} | 5 +---- x11-wm/mutter/{mutter-40.5-r2.ebuild => mutter-40.5-r4.ebuild} | 5 +---- x11-wm/mutter/{mutter-40.5-r3.ebuild => mutter-40.5-r5.ebuild} | 7 ++----- x11-wm/mutter/{mutter-41.0-r2.ebuild => mutter-41.0-r3.ebuild} | 7 ++----- 5 files changed, 7 insertions(+), 22 deletions(-) diff --git a/x11-wm/mutter/mutter-40.3-r2.ebuild b/x11-wm/mutter/mutter-40.3-r3.ebuild similarity index 98% rename from x11-wm/mutter/mutter-40.3-r2.ebuild rename to x11-wm/mutter/mutter-40.3-r3.ebuild index 958a2dbcd10..aa5fa3a39ec 100644 --- a/x11-wm/mutter/mutter-40.3-r2.ebuild +++ b/x11-wm/mutter/mutter-40.3-r3.ebuild @@ -92,10 +92,7 @@ BDEPEND=" test? ( app-text/docbook-xml-dtd:4.5 ) wayland? ( >=sys-kernel/linux-headers-4.4 - || ( - x11-libs/libxcvt - <x11-base/xorg-server-1.20.11-r3[xorg,-minimal] - ) + x11-libs/libxcvt ) " diff --git a/x11-wm/mutter/mutter-40.4-r1.ebuild b/x11-wm/mutter/mutter-40.4-r2.ebuild similarity index 98% rename from x11-wm/mutter/mutter-40.4-r1.ebuild rename to x11-wm/mutter/mutter-40.4-r2.ebuild index f5f38992218..1d2f1214d2f 100644 --- a/x11-wm/mutter/mutter-40.4-r1.ebuild +++ b/x11-wm/mutter/mutter-40.4-r2.ebuild @@ -92,10 +92,7 @@ BDEPEND=" test? ( app-text/docbook-xml-dtd:4.5 ) wayland? ( >=sys-kernel/linux-headers-4.4 - || ( - x11-libs/libxcvt - <x11-base/xorg-server-1.20.11-r3[xorg,-minimal] - ) + x11-libs/libxcvt ) " diff --git a/x11-wm/mutter/mutter-40.5-r2.ebuild b/x11-wm/mutter/mutter-40.5-r4.ebuild similarity index 98% rename from x11-wm/mutter/mutter-40.5-r2.ebuild rename to x11-wm/mutter/mutter-40.5-r4.ebuild index f127e4c4b82..4d648da9d7b 100644 --- a/x11-wm/mutter/mutter-40.5-r2.ebuild +++ b/x11-wm/mutter/mutter-40.5-r4.ebuild @@ -92,10 +92,7 @@ BDEPEND=" test? ( app-text/docbook-xml-dtd:4.5 ) wayland? ( >=sys-kernel/linux-headers-4.4 - || ( - x11-libs/libxcvt - <x11-base/xorg-server-1.20.11-r3[xorg,-minimal] - ) + x11-libs/libxcvt ) " diff --git a/x11-wm/mutter/mutter-40.5-r3.ebuild b/x11-wm/mutter/mutter-40.5-r5.ebuild similarity index 96% rename from x11-wm/mutter/mutter-40.5-r3.ebuild rename to x11-wm/mutter/mutter-40.5-r5.ebuild index d32054f34f8..ff038d79078 100644 --- a/x11-wm/mutter/mutter-40.5-r3.ebuild +++ b/x11-wm/mutter/mutter-40.5-r5.ebuild @@ -6,7 +6,7 @@ inherit gnome.org gnome2-utils meson udev virtualx xdg DESCRIPTION="GNOME compositing window manager based on Clutter" HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/"; -SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${PF}-patchset.tar.xz"; +SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-r1-patchset.tar.xz"; LICENSE="GPL-2+" SLOT="0/8" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-<api_version>.pc) should use the subslot @@ -93,10 +93,7 @@ BDEPEND=" test? ( app-text/docbook-xml-dtd:4.5 ) wayland? ( >=sys-kernel/linux-headers-4.4 - || ( - x11-libs/libxcvt - <x11-base/xorg-server-1.20.11-r3[xorg,-minimal] - ) + x11-libs/libxcvt ) " diff --git a/x11-wm/mutter/mutter-41.0-r2.ebuild b/x11-wm/mutter/mutter-41.0-r3.ebuild similarity index 96% rename from x11-wm/mutter/mutter-41.0-r2.ebuild rename to x11-wm/mutter/mutter-41.0-r3.ebuild index bdc55adffa3..7eff393ac61 100644 --- a/x11-wm/mutter/mutter-41.0-r2.ebuild +++ b/x11-wm/mutter/mutter-41.0-r3.ebuild @@ -6,7 +6,7 @@ inherit gnome.org gnome2-utils meson udev xdg DESCRIPTION="GNOME compositing window manager based on Clutter" HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/"; -SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${PF}-patchset.tar.xz"; +SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-r1-patchset.tar.xz"; 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 @@ -96,10 +96,7 @@ BDEPEND=" ) wayland? ( >=sys-kernel/linux-headers-4.4 - || ( - x11-libs/libxcvt - <x11-base/xorg-server-1.20.11-r3[xorg,-minimal] - ) + x11-libs/libxcvt ) "
