From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1335008-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 2B5DD158086
for <garchives@archives.gentoo.org>; Sun, 31 Oct 2021 00:24:39 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 8118DE08F6;
Sun, 31 Oct 2021 00:24:38 +0000 (UTC)
Received: from smtp.gentoo.org (mail.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 5A191E08F6
for <gentoo-commits@lists.gentoo.org>; Sun, 31 Oct 2021 00:24:38 +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 929EF34343E
for <gentoo-commits@lists.gentoo.org>; Sun, 31 Oct 2021 00:24:37 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 1D4D3D0
for <gentoo-commits@lists.gentoo.org>; Sun, 31 Oct 2021 00:24:36 +0000 (UTC)
From: "Sam James" <sam@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, "Sam James" <sam@gentoo.org>
Message-ID: <1635639867.6e1ee1fe7b66f5d88509ad7332dc0e1e21a7f101.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-wm/mutter/
X-VCS-Repository: repo/gentoo
X-VCS-Files: x11-wm/mutter/mutter-40.3-r2.ebuild x11-wm/mutter/mutter-40.3-r3.ebuild x11-wm/mutter/mutter-40.4-r1.ebuild x11-wm/mutter/mutter-40.4-r2.ebuild x11-wm/mutter/mutter-40.5-r2.ebuild x11-wm/mutter/mutter-40.5-r3.ebuild x11-wm/mutter/mutter-40.5-r4.ebuild x11-wm/mutter/mutter-40.5-r5.ebuild x11-wm/mutter/mutter-41.0-r2.ebuild x11-wm/mutter/mutter-41.0-r3.ebuild
X-VCS-Directories: x11-wm/mutter/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 6e1ee1fe7b66f5d88509ad7332dc0e1e21a7f101
X-VCS-Branch: master
Date: Sun, 31 Oct 2021 00:24:36 +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: 4148af91-ce5c-4b5a-9a61-a35f89cb6175
X-Archives-Hash: 78fcf3e67f104a1b6be19ec39983cfed
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
)
"