gentoo resync : 20.03.2021

4 files changed, 155 insertions, 4 deletions

diff --git a/x11-wm/muffin/Manifest b/x11-wm/muffin/Manifest
index 649ac0bad038..67df17a99496 100644
--- a/x11-wm/muffin/Manifest
+++ b/x11-wm/muffin/Manifest
@@ -1,5 +1,6 @@
+AUX muffin-4.8.1-slibtool.patch 6241 BLAKE2B be4f0ed369f5f500201d4ae22238f67deff1e1e14cc4725c408253c3ce120dfe02b5f9c30ca6505cc3c6611af88daa3a74f6606f74923cb3c00c92ffd89d700e SHA512 85b986cfcdd0daa06cc5ee95cf23c6f0b2957080dc726fec840581227d154583f5a928157554830dad3c80cd87a82d1312d72c650c7764a1fe3e93fd5d37c9a4
 DIST muffin-4.6.3.tar.gz 5196072 BLAKE2B 1b8c0eeab13c35fc0b66898328f378331cb2bfc78b27a48a8f9e22c842df1a223613f27f5b29fe28c1edaaeb59972262024ed656dfabafa6c9454c4c4c0a74b9 SHA512 c07d83656d3a9164ad488b500f98acb88e0c8e2374af858776ff27dbe90880db4310405505d79539222ba3b4ddedb22934ef3e0f1f6198dc7b36986b784b48f5
 DIST muffin-4.8.1.tar.gz 5195618 BLAKE2B 33dbbf7231b8f8d5c7df23d6cf8ddb29a86caca7b8c3b4af1231c98e114ee797d1c6bc866574348fcabaa65a93ff95c80366329bd5a41a46a74ba53ba81ce545 SHA512 61b621c7a4e25fc8ac69f2f5182e2caf52dfcfd456154f3b91ebb8b126319e704acd927ab5abe9e19ff057f38002a3b7e322e8d411db21e0fee7ec19d7928d31
 EBUILD muffin-4.6.3.ebuild 2204 BLAKE2B a5c62fdb96cce1b9b3ba424c801caab4cec0fbc70abf42c8f425e56a6afc5fd27ddf9834a74b75d9ccfc908728b202da318afe6434f62ff2fbc873972bd3028d SHA512 1a3af4ecd5b38aba64ab9f7d802e615d8c8080b59577e51b9c1197d4863f257133a90af97f7bc1308d1d7958fa3ca365366201dd8e9c2036c676d6d8e32aee36
-EBUILD muffin-4.8.1.ebuild 2338 BLAKE2B 9f88d9f356e4cc3033836d2c659575b82f477fa178fb1dc473d445d1e6b7407441aa268e4a76a590f0a0709d4dad14668eeecc52a71cf199b3a32c3fb25b5682 SHA512 27d26ae3fea92ef20a89e7d9503d31a0c3128776292b31d5b80b3f510e566fc023565806d3753587594581de2f7aaa95ef6784a172a10d442c56a14ec01cfb8d
-MISC metadata.xml 455 BLAKE2B d4584f37c17ed7f43e3200c5b4cf5db9d73634ec2634575d0667a2b6de278f746839cb52b037f9239aa1a570a056fa6ff3990bd26a1cde3975a391ef44360660 SHA512 e21ad4e3cab168c13fd6b34335e1d615a548160f78c558655def493f1632ac6cac170892b781a020f8e6a877526d320051154aa0cfcf986d3e76dcc89e61bf21
+EBUILD muffin-4.8.1.ebuild 2393 BLAKE2B a133ddfaf9af27c6c5dac92cc6b5664214cbe75c2299f724a6eeccc178391d0469664f5c2d54d955003f01e2f8139d6e56d256786bfd1ebcf794e3e4be2968e8 SHA512 c810f6f0aeacccb32f2b5d4e1dc512a455191832e2b4a19a4b693c71c7144f8608f71a088ce7a22ae5143c026ccbb8ad6c798697fe51563457b787f884e8611f
+MISC metadata.xml 485 BLAKE2B 9c98a549cc02d9f3406afb6677215d183d8b8a78bfaaf322d1094d976352bc7f7bc361d3dbdb2ec935cecf991bec6b43cc869e4a6f61b88913c7643aa2d3d6fd SHA512 901c002088995674a0b3ef67d2558ea63bc1989c6ee459bb0bc074edd7a3e20d09284f8e76d87a4609bda6342586a1022e16caa61fbe5d4db8ba0024922c8998
diff --git a/x11-wm/muffin/files/muffin-4.8.1-slibtool.patch b/x11-wm/muffin/files/muffin-4.8.1-slibtool.patch
new file mode 100644
index 000000000000..65f70b22023d
--- /dev/null
+++ b/x11-wm/muffin/files/muffin-4.8.1-slibtool.patch
@@ -0,0 +1,146 @@
+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 depedencies.
+
+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/metadata.xml b/x11-wm/muffin/metadata.xml
index 4339a3ad386e..8c9ad1344809 100644
--- a/x11-wm/muffin/metadata.xml
+++ b/x11-wm/muffin/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>sparky@bluefang-logic.com</email>
 		<name>Matthew Turnbull</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/x11-wm/muffin/muffin-4.8.1.ebuild b/x11-wm/muffin/muffin-4.8.1.ebuild
index 28b45d8ec772..2e14e5cfece0 100644
--- a/x11-wm/muffin/muffin-4.8.1.ebuild
+++ b/x11-wm/muffin/muffin-4.8.1.ebuild
@@ -61,6 +61,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.8.1-slibtool.patch
+)
+
 src_prepare() {
 	default
 	eautoreconf