gentoo resync : 02.02.2022

3 files changed, 6 insertions, 157 deletions

diff --git a/x11-wm/muffin/Manifest b/x11-wm/muffin/Manifest
index 416b2c03e040..98e21effd7e8 100644
--- a/x11-wm/muffin/Manifest
+++ b/x11-wm/muffin/Manifest
@@ -1,6 +1,5 @@
-AUX muffin-4.8.1-slibtool.patch 6242 BLAKE2B 487b87b47378cb827eaa85b0dbaa533bf6e79eaf712939aa694a8d42b54bb100b9e99b5b4d5fdce828a6e735af0a79fd99946a5c7a29ac5ab4ef1cea685efdee SHA512 8734ffc295042fc988a6668f12bc7f13a3de6783eff23418dd6dfd07f5f8a38697fa82e23b7e0703cbb4e20c78fa3e5b63e2943b272f5b50a487d6aba7252cdb
-DIST muffin-4.8.1.tar.gz 5195618 BLAKE2B 33dbbf7231b8f8d5c7df23d6cf8ddb29a86caca7b8c3b4af1231c98e114ee797d1c6bc866574348fcabaa65a93ff95c80366329bd5a41a46a74ba53ba81ce545 SHA512 61b621c7a4e25fc8ac69f2f5182e2caf52dfcfd456154f3b91ebb8b126319e704acd927ab5abe9e19ff057f38002a3b7e322e8d411db21e0fee7ec19d7928d31
 DIST muffin-5.0.2.tar.gz 5197188 BLAKE2B 88a7530359386ceb14b0b509e1769d8cc4d552d9afa45faf6dbd62a457c7ca19d59e553176cf3689c3d22962c761a8633f6880802ea3c5453ff07901e3ca5374 SHA512 4f31b5a4b81db5967a3bc21b7f2bdbb30f47f5dcde12be467cd27f340164483ab43b423cd043dce50201c9b900ccab4a0fc84f4f6e22c66e901cd0c6d986761d
-EBUILD muffin-4.8.1.ebuild 2391 BLAKE2B c7bba34a7a838e54661e93df09dd5939632d911d3e95a11f8cee8b432e1d0dce7f370986cac7c89f0cf8e52005f1c839e556cb684ec848160382267bbec5811f SHA512 f6a8d5f7d4d1bed6d019f2f50ef026b989ecf9cc37feab790f7de04c8c173390df70f82c4f1202e6edf98fb20e161c4df40a753caae6faaa9d2629207c124f7a
+DIST muffin-5.2.0.tar.gz 5197334 BLAKE2B e1c3ffc6f88ef4a6c5b2f3e03838448540baeeacce3029a039b2fae1804c79193f9ee0bb64d9187f4b2f7f902f47211dc5c5fb185e4f2fcf94513bfe2f0913bf SHA512 16d83d10e8ca4f0cc1cb679e8bf8bc0fd0788d656fa39470a921d848bcb0b158ef56bdd681a842e2ca41b40cb0121007d5e7f5f7f1570459b31fd21a78f96932
 EBUILD muffin-5.0.2.ebuild 2346 BLAKE2B c2b8ee69a05dbf4d8f3c9e9e20a5f1a5fc718d831f486cc3abe5396e2acfd5bb530224ee3b4faa36a07dca52323376c36564cb5c35284f478673fb0c106bf139 SHA512 933886bf4590cd3c5909fce63b5f5e7da939ec59e0bede656bbf13626b2650c701c3ffd7f422d74eec6ec7ee255baa53f1d205c5e2aa63b85da1592a7b7f58a8
+EBUILD muffin-5.2.0.ebuild 2353 BLAKE2B 4efc9d7f6ead92f50a03a21503c4b3a58d0b5c223d052a124dc4228b168f90b6682df533d267175774a9bb3e99df1c528f52dbff9b0a19ef97efbace7fb24820 SHA512 43c850437a78e6368c058a5d543e87e5c910e323caf18c1b875bd992600b781178f2e555622cc91ff632fd337e503668e7ae6f5afde6b132c1cdd3b85f006541
 MISC metadata.xml 486 BLAKE2B 26fc8398897e069e47a85126a78fe71fe0f6b0fad0a32078f2799fd4d15db18ebe4ff010f2a2b4889e2c27fe1bdc6244abb2c11ac02f1f1c050a5f2ba37c810d SHA512 ffb4b8c46f6fe2324d68c3041308342e550b3424c1909455cfad12d1a268eda4279ea28bd1836893f453fe9a45df568e81a6fb15d72b68fefdaad27fb8106315
diff --git a/x11-wm/muffin/files/muffin-4.8.1-slibtool.patch b/x11-wm/muffin/files/muffin-4.8.1-slibtool.patch
deleted file mode 100644
index 4d0d5827a62a..000000000000
--- a/x11-wm/muffin/files/muffin-4.8.1-slibtool.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-https://github.com/linuxmint/muffin/pull/577
-https://bugs.gentoo.org/767139
-
-From c10ab2d741cf4bbeff8f40f6859c9381606dbf26 Mon Sep 17 00:00:00 2001
-From: orbea <orbea@riseup.net>
-Date: Mon, 25 Jan 2021 22:30:35 -0800
-Subject: [PATCH 1/2] build: Add missing libtool dependencies.
-
-This fixes the build with slibtool.
----
- clutter/clutter/Makefile.am | 18 +++++++++++++++---
- src/Makefile.am             |  9 +++++++--
- 2 files changed, 22 insertions(+), 5 deletions(-)
-
-diff --git a/clutter/clutter/Makefile.am b/clutter/clutter/Makefile.am
-index a6366f4f2..ecfa568b7 100644
---- a/clutter/clutter/Makefile.am
-+++ b/clutter/clutter/Makefile.am
-@@ -666,7 +666,11 @@ Clutter-@MUFFIN_PLUGIN_API_VERSION@.gir: libmuffin-clutter-@MUFFIN_PLUGIN_API_VE
- 
- Clutter_@MUFFIN_PLUGIN_API_VERSION@_gir_NAMESPACE = Clutter
- Clutter_@MUFFIN_PLUGIN_API_VERSION@_gir_VERSION = @MUFFIN_PLUGIN_API_VERSION@
--Clutter_@MUFFIN_PLUGIN_API_VERSION@_gir_LIBS = libmuffin-clutter-@MUFFIN_PLUGIN_API_VERSION@.la
-+Clutter_@MUFFIN_PLUGIN_API_VERSION@_gir_LIBS = \
-+	libmuffin-clutter-@MUFFIN_PLUGIN_API_VERSION@.la \
-+	$(top_builddir)/../cogl/cogl/libmuffin-cogl-@MUFFIN_PLUGIN_API_VERSION@.la \
-+	$(top_builddir)/../cogl/cogl-pango/libmuffin-cogl-pango-@MUFFIN_PLUGIN_API_VERSION@.la \
-+	$(top_builddir)/../cogl/cogl-path/libmuffin-cogl-path-@MUFFIN_PLUGIN_API_VERSION@.la
- Clutter_@MUFFIN_PLUGIN_API_VERSION@_gir_FILES = \
- 	$(clutter_include_HEADERS) \
- 	$(clutter_deprecated_HEADERS) \
-@@ -687,7 +691,11 @@ Cally-@MUFFIN_PLUGIN_API_VERSION@.gir: Makefile Clutter-@MUFFIN_PLUGIN_API_VERSI
- 
- Cally_@MUFFIN_PLUGIN_API_VERSION@_gir_NAMESPACE = Cally
- Cally_@MUFFIN_PLUGIN_API_VERSION@_gir_VERSION = @MUFFIN_PLUGIN_API_VERSION@
--Cally_@MUFFIN_PLUGIN_API_VERSION@_gir_LIBS = libmuffin-clutter-@MUFFIN_PLUGIN_API_VERSION@.la
-+Cally_@MUFFIN_PLUGIN_API_VERSION@_gir_LIBS = \
-+	libmuffin-clutter-@MUFFIN_PLUGIN_API_VERSION@.la \
-+	$(top_builddir)/../cogl/cogl/libmuffin-cogl-@MUFFIN_PLUGIN_API_VERSION@.la \
-+	$(top_builddir)/../cogl/cogl-pango/libmuffin-cogl-pango-@MUFFIN_PLUGIN_API_VERSION@.la \
-+	$(top_builddir)/../cogl/cogl-path/libmuffin-cogl-path-@MUFFIN_PLUGIN_API_VERSION@.la
- Cally_@MUFFIN_PLUGIN_API_VERSION@_gir_FILES = $(cally_sources_h) $(cally_sources_c)
- Cally_@MUFFIN_PLUGIN_API_VERSION@_gir_CFLAGS = $(AM_CPPFLAGS) $(CLUTTER_CFLAGS)
- Cally_@MUFFIN_PLUGIN_API_VERSION@_gir_SCANNERFLAGS = \
-@@ -702,7 +710,11 @@ ClutterX11-@MUFFIN_PLUGIN_API_VERSION@.gir: Makefile Clutter-@MUFFIN_PLUGIN_API_
- 
- ClutterX11_@MUFFIN_PLUGIN_API_VERSION@_gir_NAMESPACE = ClutterX11
- ClutterX11_@MUFFIN_PLUGIN_API_VERSION@_gir_INCLUDES = xlib-2.0
--ClutterX11_@MUFFIN_PLUGIN_API_VERSION@_gir_LIBS = libmuffin-clutter-@MUFFIN_PLUGIN_API_VERSION@.la
-+ClutterX11_@MUFFIN_PLUGIN_API_VERSION@_gir_LIBS = \
-+	libmuffin-clutter-@MUFFIN_PLUGIN_API_VERSION@.la \
-+	$(top_builddir)/../cogl/cogl/libmuffin-cogl-@MUFFIN_PLUGIN_API_VERSION@.la \
-+	$(top_builddir)/../cogl/cogl-pango/libmuffin-cogl-pango-@MUFFIN_PLUGIN_API_VERSION@.la \
-+	$(top_builddir)/../cogl/cogl-path/libmuffin-cogl-path-@MUFFIN_PLUGIN_API_VERSION@.la
- ClutterX11_@MUFFIN_PLUGIN_API_VERSION@_gir_FILES = $(x11_introspection)
- ClutterX11_@MUFFIN_PLUGIN_API_VERSION@_gir_CFLAGS = $(AM_CPPFLAGS) $(CLUTTER_CFLAGS)
- ClutterX11_@MUFFIN_PLUGIN_API_VERSION@_gir_SCANNERFLAGS = \
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 9cb3af14e..37274a4bd 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -277,7 +277,12 @@ Meta-$(api_version).gir: libmuffin.la
- @META_GIR@_INCLUDES = GObject-2.0 CDesktopEnums-3.0 Gdk-3.0 Gtk-3.0 Cogl-$(MUFFIN_PLUGIN_API_VERSION) Clutter-$(MUFFIN_PLUGIN_API_VERSION) xlib-2.0 xfixes-4.0
- @META_GIR@_PACKAGES = gtk+-3.0
- @META_GIR@_CFLAGS = $(AM_CPPFLAGS)
--@META_GIR@_LIBS = libmuffin.la
-+@META_GIR@_LIBS = \
-+	libmuffin.la \
-+	$(top_builddir)/clutter/clutter/libmuffin-clutter-@MUFFIN_PLUGIN_API_VERSION@.la \
-+	$(top_builddir)/cogl/cogl/libmuffin-cogl-@MUFFIN_PLUGIN_API_VERSION@.la \
-+	$(top_builddir)/cogl/cogl-pango/libmuffin-cogl-pango-@MUFFIN_PLUGIN_API_VERSION@.la \
-+	$(top_builddir)/cogl/cogl-path/libmuffin-cogl-path-@MUFFIN_PLUGIN_API_VERSION@.la
- @META_GIR@_FILES =				\
- 	muffin-enum-types.h			\
- 	$(libmuffininclude_base_headers)	\
-@@ -383,4 +388,4 @@ install-exec-local:
- 	      { rm -f libmuffin-$$lib-0.so && ln -s muffin/libmuffin-$$lib-0.so libmuffin-$$lib-0.so; }; \
- 	    } \
- 	  ) ; \
--	done
-\ No newline at end of file
-+	done
-
-From 0762515b658b6331c076603340ce572c002f9458 Mon Sep 17 00:00:00 2001
-From: orbea <orbea@riseup.net>
-Date: Mon, 25 Jan 2021 22:30:44 -0800
-Subject: [PATCH 2/2] build: Fix undefined references with slibtool.
-
----
- Makefile.am                        | 2 +-
- src/Makefile.am                    | 2 +-
- src/compositor/plugins/Makefile.am | 9 ++++++---
- 3 files changed, 8 insertions(+), 5 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index cf8382b67..c5d589ff7 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,5 +1,5 @@
- 
--SUBDIRS=cogl clutter src po doc data
-+SUBDIRS=cogl clutter src src/compositor/plugins po doc data
- 
- EXTRA_DIST = HACKING MAINTAINERS rationales.txt
- 
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 37274a4bd..b75b1879f 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -3,7 +3,7 @@
- 
- lib_LTLIBRARIES = libmuffin.la
- 
--SUBDIRS=wm-tester tools compositor/plugins
-+SUBDIRS=wm-tester tools
- 
- NULL =
- 
-diff --git a/src/compositor/plugins/Makefile.am b/src/compositor/plugins/Makefile.am
-index 09ab325a5..241b514c3 100644
---- a/src/compositor/plugins/Makefile.am
-+++ b/src/compositor/plugins/Makefile.am
-@@ -2,9 +2,9 @@
- pkglibdir=@MUFFIN_PLUGIN_DIR@
- 
- AM_CPPFLAGS= \
--  $(WARN_CFLAGS) \
-+	$(WARN_CFLAGS) \
- 	$(MUFFIN_CFLAGS) \
--  -I$(top_builddir)/src						\
-+	-I$(top_builddir)/src						\
- 	-I$(top_srcdir)/src						\
- 	-I$(top_srcdir)/cogl						\
- 	-I$(top_builddir)/cogl						\
-@@ -27,7 +27,10 @@ AM_CPPFLAGS= \
- default_la_CFLAGS   = $(WARN_CFLAGS) -fPIC
- default_la_SOURCES  = default.c
- default_la_LDFLAGS  = $(WARN_LDFLAGS) -module -avoid-version -no-undefined
--default_la_LIBADD   = $(CLUTTER_LIBS)
-+default_la_LIBADD   = \
-+	$(CLUTTER_LIBS) \
-+	$(top_builddir)/src/libmuffin.la \
-+	$(top_builddir)/clutter/clutter/libmuffin-clutter-@MUFFIN_PLUGIN_API_VERSION@.la
- 
- pkglib_LTLIBRARIES = default.la
- 
diff --git a/x11-wm/muffin/muffin-4.8.1.ebuild b/x11-wm/muffin/muffin-5.2.0.ebuild
index 3b692972bcb0..e68e869ca9bc 100644
--- a/x11-wm/muffin/muffin-4.8.1.ebuild
+++ b/x11-wm/muffin/muffin-5.2.0.ebuild
@@ -12,15 +12,15 @@ SRC_URI="https://github.com/linuxmint/muffin/archive/${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="+introspection test xinerama"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.37.3:2[dbus]
 	>=dev-libs/json-glib-1.0
-	>=gnome-extra/cinnamon-desktop-4.8:0=
+	>=gnome-extra/cinnamon-desktop-5.2:0=
 	gnome-extra/zenity
 	>=media-libs/libcanberra-0.26[gtk3]
-	virtual/opengl
+	media-libs/libglvnd
 	>=x11-libs/cairo-1.14:=[X]
 	x11-libs/gdk-pixbuf:2[introspection?]
 	>=x11-libs/gtk+-3.9.12:3[X,introspection?]
@@ -34,7 +34,7 @@ RDEPEND="
 	x11-libs/libXext
 	x11-libs/libXfixes
 	>=x11-libs/libXi-1.6.0
-	>=x11-libs/libxkbcommon-0.4.3
+	>=x11-libs/libxkbcommon-0.4.3[X]
 	x11-libs/libxkbfile
 	x11-libs/libXrandr
 	x11-libs/libXrender
@@ -61,10 +61,6 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.8.1-slibtool.patch
-)
-
 src_prepare() {
 	default
 	eautoreconf