From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1361195-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 8B796158087
for <garchives@archives.gentoo.org>; Mon, 24 Jan 2022 22:43:44 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 9AD062BC040;
Mon, 24 Jan 2022 22:43:39 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 4998C2BC041
for <gentoo-commits@lists.gentoo.org>; Mon, 24 Jan 2022 22:43:39 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 22914342FAF
for <gentoo-commits@lists.gentoo.org>; Mon, 24 Jan 2022 22:43:38 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id E9F4F275
for <gentoo-commits@lists.gentoo.org>; Mon, 24 Jan 2022 22:43:34 +0000 (UTC)
From: "Matt Turner" <mattst88@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" <mattst88@gentoo.org>
Message-ID: <1643064178.1e84d5efce0fe34e7e40fbbb45b84f1ecaf94156.mattst88@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-wm/mutter/
X-VCS-Repository: repo/gentoo
X-VCS-Files: x11-wm/mutter/Manifest x11-wm/mutter/mutter-40.4-r3.ebuild x11-wm/mutter/mutter-41.2-r1.ebuild
X-VCS-Directories: x11-wm/mutter/
X-VCS-Committer: mattst88
X-VCS-Committer-Name: Matt Turner
X-VCS-Revision: 1e84d5efce0fe34e7e40fbbb45b84f1ecaf94156
X-VCS-Branch: master
Date: Mon, 24 Jan 2022 22:43:34 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 547eb873-2280-42fe-881b-7d2e4fff82a7
X-Archives-Hash: 693eb5ae4db0cc4e5dd40ff60ac19f84
commit: 1e84d5efce0fe34e7e40fbbb45b84f1ecaf94156
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 24 21:19:51 2022 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Jan 24 22:42:58 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e84d5ef
x11-wm/mutter: Drop old versions
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
x11-wm/mutter/Manifest | 2 -
x11-wm/mutter/mutter-40.4-r3.ebuild | 164 -----------------------------------
x11-wm/mutter/mutter-41.2-r1.ebuild | 168 ------------------------------------
3 files changed, 334 deletions(-)
diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index 49f91db59632..4688034a0c2a 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -1,5 +1,3 @@
-DIST mutter-40.4.tar.xz 2682648 BLAKE2B fe3ed2edc20b4502db17bf3e6413159047eaa9812baa01b49f64ca2e3f05fe6f2e922a8e84ffd01636e8b6e5e31381653311153db5910f2dd1c84431d1892f6b SHA512 a38fe7c1ba2c65cb4510ee3ecd9b3e726cf3cb35922977e55f8b49f5ab847601277e1efaec63e7068ce0f924b38085adfe6d26b6d0af148a8f87400b31aba805
DIST mutter-40.5-r1-patchset.tar.xz 5568 BLAKE2B 3e1cc6a8cb0a792a4abedaaa1f856eae679acf17be8fa5be6c4bf764924d89950c8fcd264859049fcf326ed94e2b4d74433bbee16acf06bb0e180674a9d3a2c2 SHA512 8da4f92b2268a6966d468cd15063fb361a71299aff671203141225e74d5655ee1cb4f4e2f1922e06355c3f3b756638f3a2243ecafeb30273e3ff04897b6a23d8
DIST mutter-40.5.tar.xz 2682916 BLAKE2B 9ba2eeb5962a5473804fab02b1209c6044b151a1bc64b533762a27e91f6701a0ad655f582c8831cf92defc7be82e9eaa2c72b772fe7ea5e032dab5ecc96fb1b1 SHA512 ebd4f2bc4e8eef99d66305347673cbd2e38c5a058eb91eab6b932671ea7cb4a2f893dd65c4c5028ece454f8dd293898821bd125b68e304cf905ad237abff8837
-DIST mutter-41.2.tar.xz 2713924 BLAKE2B 271b5cd3eebf3b3c040876dc634d5316788ee566fece2ded6987e048d03ea8b4b4c76b482ca91e1eaf5cdcdf36294948b2ab902013874f100247dfb5b04a4cbb SHA512 9fd030e2c3e5956e4e7412ac36069ab0e81798688b0a4f2372d935f81190ae8fb383919b2c29b8af37e5eeea47d250647ce8466d7f2e9047edf60e1ca93a9e3c
DIST mutter-41.3.tar.xz 2717692 BLAKE2B c31fa8c5e110b243dc9ce0a96d4ea28670adec27d519788de6d826bcb858eda9df209eb02c08a07e2fa3a16fb8a2a2e8bce1025721c43a1f96b062980b924dbe SHA512 daa0cc8d91f8f3a35d2e2218c1e8d1f9e7f57df95a209f4b87ba8f3f81284ad45aa5000d08a148ae6d408f60d7ff120565e9132e1a84c3b6f55f9e59d6585338
diff --git a/x11-wm/mutter/mutter-40.4-r3.ebuild b/x11-wm/mutter/mutter-40.4-r3.ebuild
deleted file mode 100644
index 94dd02db647d..000000000000
--- a/x11-wm/mutter/mutter-40.4-r3.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=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/"
-
-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
-
-IUSE="elogind 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="
- wayland? ( ^^ ( elogind systemd ) udev )
- test? ( wayland )"
-RESTRICT="!test? ( test )"
-
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-
-# 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="
- >=x11-libs/libX11-1.7.0
- >=media-libs/graphene-1.10.2[introspection?]
- >=x11-libs/gtk+-3.19.8:3[X,introspection?]
- x11-libs/gdk-pixbuf:2
- >=x11-libs/pango-1.46[introspection?]
- >=dev-libs/fribidi-1.0.0
- >=x11-libs/cairo-1.14[X]
- >=gnome-base/gsettings-desktop-schemas-40.0[introspection?]
- >=dev-libs/glib-2.67.3:2
- gnome-base/gnome-settings-daemon
- >=dev-libs/json-glib-0.12.0[introspection?]
- gnome-base/gnome-desktop:3=
- >=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
- x11-libs/libICE
- >=dev-libs/atk-2.5.3[introspection?]
- >=media-libs/libcanberra-0.26
- sys-apps/dbus
- media-libs/mesa[X(+),egl(+)]
- sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
- wayland? (
- >=dev-libs/wayland-protocols-1.19
- >=dev-libs/wayland-1.18.0
- x11-libs/libdrm:=
- >=media-libs/mesa-17.3[egl(+),gbm(+),wayland,gles2]
- >=dev-libs/libinput-1.15.0
- systemd? ( sys-apps/systemd )
- elogind? ( sys-auth/elogind )
- x11-base/xwayland
- video_cards_nvidia? ( gui-libs/egl-wayland )
- )
- udev? ( >=dev-libs/libgudev-232:=
- >=virtual/libudev-232-r1:= )
- 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:= )
-"
-RDEPEND="${DEPEND}
- gnome-extra/zenity
-"
-DEPEND="${DEPEND}
- x11-base/xorg-proto
- sysprof? ( >=dev-util/sysprof-common-3.38.0 )
-"
-# wayland bdepend for wayland-scanner, and either libxcvt or xorg-server[xorg,-minimal] for the cvt binary
-BDEPEND="
- dev-libs/wayland
- dev-util/gdbus-codegen
- dev-util/glib-utils
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
- test? ( app-text/docbook-xml-dtd:4.5 )
- wayland? (
- >=sys-kernel/linux-headers-4.4
- x11-libs/libxcvt
- )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-40.0-Disable-anonymous-file-test.patch
-)
-
-src_configure() {
- # TODO: Replicate debug vs release meson build type behaviour under our buildtype=plain
- local emesonargs=(
- -Dopengl=true
- #opengl_libname
- #gles2_libname
- $(meson_use wayland gles2)
- -Degl=true
- -Dglx=true
- $(meson_use wayland)
- $(meson_use wayland native_backend)
- $(meson_use screencast remote_desktop)
- $(meson_use udev)
- -Dudev_dir=$(get_udevdir)
- $(meson_use input_devices_wacom libwacom)
- -Dpango_ft2=true
- -Dstartup_notification=true
- -Dsm=true
- $(meson_use introspection)
- $(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)
- $(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
- emsonargs+=(
- -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 virtx meson_src_test
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_schemas_update
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_schemas_update
-}
diff --git a/x11-wm/mutter/mutter-41.2-r1.ebuild b/x11-wm/mutter/mutter-41.2-r1.ebuild
deleted file mode 100644
index b05673366a97..000000000000
--- a/x11-wm/mutter/mutter-41.2-r1.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson udev xdg
-
-DESCRIPTION="GNOME compositing window manager based on Clutter"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/"
-
-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="elogind 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="
- wayland? ( ^^ ( elogind systemd ) udev )
- test? ( wayland )"
-RESTRICT="!test? ( test )"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-# 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="
- >=x11-libs/libX11-1.7.0
- >=media-libs/graphene-1.10.2[introspection?]
- >=x11-libs/gtk+-3.19.8:3[X,introspection?]
- x11-libs/gdk-pixbuf:2
- >=x11-libs/pango-1.46[introspection?]
- >=dev-libs/fribidi-1.0.0
- >=x11-libs/cairo-1.14[X]
- >=gnome-base/gsettings-desktop-schemas-40.0[introspection?]
- >=dev-libs/glib-2.69.0:2
- gnome-base/gnome-settings-daemon
- >=dev-libs/json-glib-0.12.0[introspection?]
- gnome-base/gnome-desktop:3=
- >=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
- x11-libs/libICE
- >=dev-libs/atk-2.5.3[introspection?]
- >=media-libs/libcanberra-0.26
- sys-apps/dbus
- media-libs/mesa[X(+),egl(+)]
- sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
- systemd? ( sys-apps/systemd )
- wayland? (
- >=dev-libs/wayland-protocols-1.21
- >=dev-libs/wayland-1.18.0
- x11-libs/libdrm:=
- >=media-libs/mesa-17.3[egl(+),gbm(+),wayland,gles2]
- >=dev-libs/libinput-1.18.0
- elogind? ( sys-auth/elogind )
- x11-base/xwayland
- video_cards_nvidia? ( gui-libs/egl-wayland )
- )
- udev? ( >=dev-libs/libgudev-232:=
- >=virtual/libudev-232-r1:= )
- 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:= )
-"
-RDEPEND="${DEPEND}
- gnome-extra/zenity
-"
-DEPEND="${DEPEND}
- x11-base/xorg-proto
- sysprof? ( >=dev-util/sysprof-common-3.38.0 )
-"
-# wayland bdepend for wayland-scanner, and either libxcvt or xorg-server[xorg,-minimal] for the cvt binary
-BDEPEND="
- dev-libs/wayland
- dev-util/gdbus-codegen
- dev-util/glib-utils
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
- test? (
- app-text/docbook-xml-dtd:4.5
- x11-misc/xvfb-run
- )
- wayland? (
- >=sys-kernel/linux-headers-4.4
- x11-libs/libxcvt
- )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-40.0-Disable-anonymous-file-test.patch
-)
-
-src_configure() {
- # TODO: Replicate debug vs release meson build type behaviour under our buildtype=plain
- local emesonargs=(
- -Dopengl=true
- #opengl_libname
- #gles2_libname
- $(meson_use wayland gles2)
- -Degl=true
- -Dglx=true
- $(meson_use wayland)
- $(meson_use systemd)
- $(meson_use wayland native_backend)
- $(meson_use screencast remote_desktop)
- $(meson_use udev)
- -Dudev_dir=$(get_udevdir)
- $(meson_use input_devices_wacom libwacom)
- -Dpango_ft2=true
- -Dstartup_notification=true
- -Dsm=true
- $(meson_use introspection)
- $(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)
- $(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
- emsonargs+=(
- -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() {
- xdg_pkg_postinst
- gnome2_schemas_update
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_schemas_update
-}