[gentoo-commits] repo/gentoo:master commit in: x11-wm/metacity/

[Andreas Sturmlechner]

commit:     2769d79cbf808c5b249bff8e961fdfcfb184f2a4
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 17 19:53:00 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Nov  4 18:38:35 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2769d79c

x11-wm/metacity: Depend on libcanberra-gtk3

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../metacity/{metacity-3.52.0.ebuild => metacity-3.52.0-r1.ebuild} | 7 +++++--
 .../metacity/{metacity-3.54.0.ebuild => metacity-3.54.0-r1.ebuild} | 6 ++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/x11-wm/metacity/metacity-3.52.0.ebuild 
b/x11-wm/metacity/metacity-3.52.0-r1.ebuild
similarity index 93%
rename from x11-wm/metacity/metacity-3.52.0.ebuild
rename to x11-wm/metacity/metacity-3.52.0-r1.ebuild
index 60f7ad76a4f2..583b92f2fc9c 100644
--- a/x11-wm/metacity/metacity-3.52.0.ebuild
+++ b/x11-wm/metacity/metacity-3.52.0-r1.ebuild
@@ -9,8 +9,8 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/metacity/";
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE="+libcanberra vulkan xinerama"
 KEYWORDS="amd64 ~riscv"
+IUSE="+libcanberra vulkan xinerama"
 
 # TODO: libgtop could be optional, but no knob
 RDEPEND="
@@ -24,7 +24,10 @@ RDEPEND="
        x11-libs/libXrender
        x11-libs/libXdamage
        x11-libs/libXpresent
-       libcanberra? ( media-libs/libcanberra[gtk3] )
+       libcanberra? ( || (
+               media-libs/libcanberra-gtk3
+               media-libs/libcanberra[gtk3(-)]
+       ) )
        >=x11-libs/startup-notification-0.7
        x11-libs/libXcursor
        gnome-base/libgtop:2=

diff --git a/x11-wm/metacity/metacity-3.54.0.ebuild 
b/x11-wm/metacity/metacity-3.54.0-r1.ebuild
similarity index 93%
rename from x11-wm/metacity/metacity-3.54.0.ebuild
rename to x11-wm/metacity/metacity-3.54.0-r1.ebuild
index e28a9046063d..c4fe2a31b2f5 100644
--- a/x11-wm/metacity/metacity-3.54.0.ebuild
+++ b/x11-wm/metacity/metacity-3.54.0-r1.ebuild
@@ -10,7 +10,6 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/metacity/";
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~riscv"
-
 IUSE="+libcanberra vulkan xinerama"
 
 # TODO: libgtop could be optional, but no knob
@@ -25,7 +24,10 @@ RDEPEND="
        x11-libs/libXrender
        x11-libs/libXdamage
        x11-libs/libXpresent
-       libcanberra? ( media-libs/libcanberra[gtk3] )
+       libcanberra? ( || (
+               media-libs/libcanberra-gtk3
+               media-libs/libcanberra[gtk3(-)]
+       ) )
        >=x11-libs/startup-notification-0.7
        x11-libs/libXcursor
        gnome-base/libgtop:2=