gentoo auto-resync : 05:11:2024 - 03:03:37

6 files changed, 16 insertions, 8 deletions

diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 930b74c032e2..625935e3e2de 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/marco/Manifest b/x11-wm/marco/Manifest
index 538ed3f3252b..8992f0b2e19a 100644
--- a/x11-wm/marco/Manifest
+++ b/x11-wm/marco/Manifest
@@ -1,3 +1,3 @@
 DIST marco-1.28.1.tar.xz 1800320 BLAKE2B 6594095cb7b038c3107513229f81cfb8e71f437b1f716a108169ddb8c792c4ab06979f57cd2c3a11c3de65e07550f8fcd246911a7ccff2f1e89fe20de3836b59 SHA512 3642e3fab967baef35b0e02d3e4b63e3ef97e5e44d01dbde2a7557a5ced41e73f7f8a1e63860aa9bcebe1ea1c8e1f6fd8740d853bf3996c32977b65091364ac3
-EBUILD marco-1.28.1-r1.ebuild 1686 BLAKE2B d5b2ad39d60d8dacad2ee89c0159c7750cfbd65df2b50a42d4422f504181343009dfa94b1fea87d0e8e1c216b97b3bed79db001d498c9fc409701e3dc9919da5 SHA512 36edaf92d5da76e2946aee79fdb91fe88866adf11d5fdf73e5b0714720df28975f8a0a6c9bad4a687411332508053c753d6a786f7a969b4d6133b23370be4550
+EBUILD marco-1.28.1-r2.ebuild 1729 BLAKE2B c5f3715d0179d3f4c3fa3cc1a766f66623376b6a3eca6b3c1b648594ac8acf5c946252717b29e6a3dcf035cccd446498d0d70e19e31b4694dabcf500e9df69b2 SHA512 669147ab564cb15dd6f5132ae325dc90c5ffac9e2a87733fd837186b47da3f974a8ef5dee38c2de27482bc1b90f5c95eddeb10715a3b612f789d921f51c16524
 MISC metadata.xml 484 BLAKE2B 9ba0475c983500a353feb2ed117c564c267d45451068f56cfb50bfa5656f9e8eef53213c588550d6ec9f3eb6ed92ac011a764473e63b716999413aaa1fe4be85 SHA512 c9c1ed68be07a06b27dd5bd5d404d1d7c7086a5f16b1a30a58eae457f9c9df2d13a8d3bfe384fbebc5f553a2fcc9cd289d02fa60f02695279465c1917c76c6ea
diff --git a/x11-wm/marco/marco-1.28.1-r1.ebuild b/x11-wm/marco/marco-1.28.1-r2.ebuild
index 71e4d7061996..b4b18d3de582 100644
--- a/x11-wm/marco/marco-1.28.1-r1.ebuild
+++ b/x11-wm/marco/marco-1.28.1-r2.ebuild
@@ -27,7 +27,10 @@ COMMON_DEPEND="
 	>=dev-libs/glib-2.58:2
 	>=gnome-base/libgtop-2:2=
 	>=mate-base/mate-desktop-$(ver_cut 1-2)
-	media-libs/libcanberra[gtk3]
+	|| (
+		media-libs/libcanberra-gtk3
+		media-libs/libcanberra[gtk3(-)]
+	)
 	x11-libs/cairo
 	>=x11-libs/pango-1.2[X]
 	x11-libs/gdk-pixbuf:2
diff --git a/x11-wm/metacity/Manifest b/x11-wm/metacity/Manifest
index 8bd1440f250f..5871a8f6b5d9 100644
--- a/x11-wm/metacity/Manifest
+++ b/x11-wm/metacity/Manifest
@@ -1,5 +1,5 @@
 DIST metacity-3.52.0.tar.xz 1960156 BLAKE2B e8d078f08c4d3a40a98b5d95aa0286adc4da518ca6a495768d9e31626862b03a3ad5da26928ccc3f337b9811fd5ffa927a37e5f9ab6a7b7c256052842207b5cf SHA512 e49c8a45a26b9b43700e50787fef9e02a6c5abc5d8a809542acaf32f6e15ea756bf8398883e3c69707908e8556ae726d9764fc09f07b0beaa40f79a1490c361e
 DIST metacity-3.54.0.tar.xz 1796756 BLAKE2B d1bb961feaa76486ae866e8e719e3c4443cb7f76f4fbe407ba0821b8db309a7890c6d88a2853a850de2a5df605b6d2a433bad1470677e953afdc9a9e3e62efee SHA512 81029997b9024bb8075dec0e4184a33697ce3c597c3eb686d30536fbe09db619667f3379f995553ff201850910ab7533739c97126e4cbc4f5066a8bb1e2b143f
-EBUILD metacity-3.52.0.ebuild 1294 BLAKE2B b54f901a1fa0a3eb6d4b536764039e966b8f1225f335a8c21141ca3147d4aa27fd14d27e17be12771ebcad61fa778f616f5b808904081d56f3666e21b30b4aad SHA512 c9f68f9b0edccde5c84db81615f067f572fdfa1e50a8484a78f18463981c94140811ba7fc41df902c3d3341466f0d21a438fb7352a2c3490306b39135446cad3
-EBUILD metacity-3.54.0.ebuild 1296 BLAKE2B 74bc377c2f9f22d3940316a27178afe035977c314d40d409ccf7938bbd5bb9f349d3f8c0152fe1802c931618609742941be34b9ca6af2f125dc3c6b59edb0b2c SHA512 0365f1642352a83ebf09a14ceb78e4c0c633454665fb1efed60c6f5e5714cabfb7f467ab4fa129b5fed645ea884825753ab9241f8df6a9dc8cc7f78549147ab8
+EBUILD metacity-3.52.0-r1.ebuild 1337 BLAKE2B eba15b863a3b052a383fd4eb4fedacdf1cffb7a378971cd2b85356185b68c05b7a30b3e2dfae048a65c7d50b023f5b723791e37b5540a33391cf997cc4269a4a SHA512 76c3c69eb531acd2258f7ef48686b15a2f003295650c23d4a0a702d30fa8d3e2df9d6655b6cbc65f04d930a8501cfab99cda6ae2072015c8df59b914a4e176c4
+EBUILD metacity-3.54.0-r1.ebuild 1338 BLAKE2B 9f8d6f3b27cc3526c3b7f18e458e5fa2aeef44f481ee3600da3ac4663ab603a9b0095aa818580df18a978d0a5d4e1dd737c1ab99b29cce024a35c6f0c6ac203c SHA512 e9d22b15c20aad9d61eb567629203d292fbd34e6861042088d8ef1f8ab77fbe981e05c84c4d47774ee3d5524097f4175a999b9614462bc7804fc377117c449ce
 MISC metadata.xml 700 BLAKE2B b921242ee748e52852815f6e3dae860cce3f8342af61c48de070b4228ee08967838c083f9bc6a21c88d16179ebdeddf46b97f4dc5af5ad923d15df87d742f895 SHA512 62541ce5a5b768fc4eed973ee46002865005efb23a51f6b725c7d7f6bfe952d2e86b42e8f6dd27a42f23c106cdc35ebfd14507737bc8a2c8c2b39f12953f7f49
diff --git a/x11-wm/metacity/metacity-3.52.0.ebuild b/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
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=