gentoo resync : 16.09.2020

4 files changed, 110 insertions, 9 deletions

diff --git a/x11-wm/muffin/Manifest b/x11-wm/muffin/Manifest
index dbc0e7e3d2d9..0eb07f0065c7 100644
--- a/x11-wm/muffin/Manifest
+++ b/x11-wm/muffin/Manifest
@@ -1,5 +1,7 @@
 AUX muffin-4.4-gir-fixes.patch 2133 BLAKE2B 07635927daaa45e5f83c419e27efc9863b43b23591b908fbaa94c7b951c9bd6626ea8df6682f8a16cd4e18192486d84ec6d3d431e91cc20488546077c2450683 SHA512 01fe330ba2dc2bb965b5870ba22bb11c1d31d8d318457bc5a1035d49386a117e605aa0edbabd1ad2d34b6c4ab3cf347936b13d6a2f6f4dea94db8d0aac82f7fd
 AUX muffin-4.4-gobject-introspection-fixes.patch 16907 BLAKE2B 02cc9f22053580f046eb9f5ea2d9ca55364330e729f7f2e765c7c7f100077e81d33f47e4097e24ac95ab901447a1c4eccf0dd09d85b5af93f91daccbfba3eb5a SHA512 181007af23aa61c0d9422a6c7fe1cdc7cc4ee5e506d789ffc12b5a799171a34aa4eaba995c00cf04512d81549d6e675ec8259fc7440a21d97c19a2148a9e7a46
 DIST muffin-4.4.3.tar.gz 5194631 BLAKE2B 10221560daed72f776f6543b8d044442fe8f501ec42cc2f6ce15f0d00f26fe74d3dbe763145c48ecf18d0f821277753a71a607e8c705e6dc624c16d7f17b9785 SHA512 a11418f9ab6f6dee0f4df45f06ec6df5666490effec7468fd4c1e9cb6b537448f1aaf0fe743b208194488b86de0b269ffdc442ee677b45940761bbdfa4fafed3
-EBUILD muffin-4.4.3.ebuild 2059 BLAKE2B 95ad8ac24d78556542cbdc537e7826184fcc169238b95d6fd78e7de280d984d13fe98c13f4bc889abf937945be6f1626e521109d54bd19d702d8ef2c3b972a01 SHA512 aec02f556eca9b4325c4177eb4ad12baca81c2b88c6ae8c1d80dd2c3f8e8e885c997f61e4e82d7c3bb2309f3df314c01afc972049a7d3c1ce0db81175a8ab5c0
-MISC metadata.xml 568 BLAKE2B 508383c07145ee7f1d2e24749a32499ac1786a26af8034eb87f0fd1ddcd0c4a27572fbeb8e4a288ad1122348162dbaa34063ec268e0b90aa56e1f2f9ee097067 SHA512 ae69e0756469ba11a738248b601489de534b54d5e7f5f6765f77be3fb4437ec7c42f85c5b8ae19d52cdc9a2cf664bffbe0d65ba7b90a49be48448e97606629db
+DIST muffin-4.6.3.tar.gz 5196072 BLAKE2B 1b8c0eeab13c35fc0b66898328f378331cb2bfc78b27a48a8f9e22c842df1a223613f27f5b29fe28c1edaaeb59972262024ed656dfabafa6c9454c4c4c0a74b9 SHA512 c07d83656d3a9164ad488b500f98acb88e0c8e2374af858776ff27dbe90880db4310405505d79539222ba3b4ddedb22934ef3e0f1f6198dc7b36986b784b48f5
+EBUILD muffin-4.4.3.ebuild 2129 BLAKE2B 2666ee555fdd226e7ca873369b8d698241ff9660734575a49a6f04fe6222f97af97b11adb3ab20893da2d0979ebb08d3cd407d2dc89f0e8a8b224e29ff8097e3 SHA512 d3f3c37d8788824f1a2ad7e88d636b8067340ccf254a46216981b62752740c5ed6fdf9dd3042ed4db30ce27a71ee5caada99ec5ae2fbbb65105c047bcc19f810
+EBUILD muffin-4.6.3.ebuild 2222 BLAKE2B 3c6b46af4077b9ef28189861a610caa378111514d27a99c65fc469b35f5488cb2803f52d2def6d1e12a36a4261280dba013c3661a708825ac09617e0b24bb95c SHA512 d3d6e5074fd5b5dc69d9ffe7eecf7b3455fe4e55ed3920d2e824ad0f0c4078f461cd8a0a93bea13aaf3c73c6be395ebb7e66c43767d6cd3c4ddfb9d60a5527c9
+MISC metadata.xml 455 BLAKE2B d4584f37c17ed7f43e3200c5b4cf5db9d73634ec2634575d0667a2b6de278f746839cb52b037f9239aa1a570a056fa6ff3990bd26a1cde3975a391ef44360660 SHA512 e21ad4e3cab168c13fd6b34335e1d615a548160f78c558655def493f1632ac6cac170892b781a020f8e6a877526d320051154aa0cfcf986d3e76dcc89e61bf21
diff --git a/x11-wm/muffin/metadata.xml b/x11-wm/muffin/metadata.xml
index 34a28b9277af..4339a3ad386e 100644
--- a/x11-wm/muffin/metadata.xml
+++ b/x11-wm/muffin/metadata.xml
@@ -1,18 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>cinnamon@gentoo.org</email>
-		<name>Cinnamon Project</name>
+	<maintainer type="person">
+		<email>sparky@bluefang-logic.com</email>
+		<name>Matthew Turnbull</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>sparky@bluefang-logic.com</email>
-		<name>Matthew Turnbull</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="github">linuxmint/muffin</remote-id>
 	</upstream>
diff --git a/x11-wm/muffin/muffin-4.4.3.ebuild b/x11-wm/muffin/muffin-4.4.3.ebuild
index f8d8c2d3a9c7..b77326d58632 100644
--- a/x11-wm/muffin/muffin-4.4.3.ebuild
+++ b/x11-wm/muffin/muffin-4.4.3.ebuild
@@ -21,6 +21,7 @@ COMMON_DEPEND="
 	x11-libs/gdk-pixbuf:2[introspection?]
 	>=x11-libs/gtk+-3.9.12:3[X,introspection?]
 	>=dev-libs/glib-2.37.3:2[dbus]
+	>=dev-libs/json-glib-1.0
 	>=gnome-extra/cinnamon-desktop-4.4:0=
 	>=media-libs/libcanberra-0.26[gtk3]
 	>=x11-libs/libXcomposite-0.3
@@ -36,6 +37,7 @@ COMMON_DEPEND="
 	x11-libs/libXfixes
 	x11-libs/libXrandr
 	x11-libs/libXrender
+	x11-libs/libxkbcommon
 	virtual/opengl
 
 	gnome-extra/zenity
@@ -46,6 +48,7 @@ COMMON_DEPEND="
 # needs gtk-doc, not just -am, for gtk-doc.make
 DEPEND="${COMMON_DEPEND}
 	${PYTHON_DEPS}
+	dev-util/glib-utils
 	>=app-text/gnome-doc-utils-0.8
 	sys-devel/gettext
 	dev-util/gtk-doc
diff --git a/x11-wm/muffin/muffin-4.6.3.ebuild b/x11-wm/muffin/muffin-4.6.3.ebuild
new file mode 100644
index 000000000000..3cbf7b38cc64
--- /dev/null
+++ b/x11-wm/muffin/muffin-4.6.3.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools eutils gnome2-utils xdg-utils
+
+DESCRIPTION="Compositing window manager forked from Mutter for use with Cinnamon"
+HOMEPAGE="https://projects.linuxmint.com/cinnamon/"
+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 ~x86"
+RESTRICT="test"
+
+RDEPEND="
+	>=x11-libs/pango-1.2[X,introspection?]
+	>=x11-libs/cairo-1.14:=[X]
+	x11-libs/gdk-pixbuf:2[introspection?]
+	>=x11-libs/gtk+-3.9.12:3[X,introspection?]
+	>=dev-libs/glib-2.37.3:2[dbus]
+	>=dev-libs/json-glib-1.0
+	>=gnome-extra/cinnamon-desktop-4.4:0=
+	>=media-libs/libcanberra-0.26[gtk3]
+	>=x11-libs/libXcomposite-0.3
+	>=x11-libs/startup-notification-0.7:=
+
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libxkbcommon
+	virtual/opengl
+
+	gnome-extra/zenity
+
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
+	xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+	test? ( app-text/docbook-xml-dtd:4.5 )
+"
+# needs gtk-doc, not just -am, for gtk-doc.make
+BDEPEND="
+	dev-util/glib-utils
+	sys-devel/gettext
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.35
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	xdg_environment_reset
+	default
+	eautoreconf
+	gnome2_disable_deprecation_warning
+}
+
+# Wayland is not supported upstream.
+src_configure() {
+	econf \
+		--disable-gtk-doc \
+		--disable-maintainer-mode \
+		--disable-schemas-compile \
+		--enable-compile-warnings=minimum \
+		--disable-static \
+		--enable-shape \
+		--enable-sm \
+		--enable-startup-notification \
+		--enable-xsync \
+		--enable-verbose-mode \
+		--with-libcanberra \
+		$(use_enable introspection) \
+		$(use_enable xinerama)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+	dodoc HACKING MAINTAINERS *.txt doc/*.txt
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	gnome2_schemas_update
+}