gentoo auto-resync : 13:10:2022 - 01:41:21

6 files changed, 128 insertions, 5 deletions

diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 83e842ba9637..4ba0f01592b4 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/muffin/Manifest b/x11-wm/muffin/Manifest
index 5729c9d4c008..426abded4204 100644
--- a/x11-wm/muffin/Manifest
+++ b/x11-wm/muffin/Manifest
@@ -1,5 +1,7 @@
 DIST muffin-5.2.0.tar.gz 5197334 BLAKE2B e1c3ffc6f88ef4a6c5b2f3e03838448540baeeacce3029a039b2fae1804c79193f9ee0bb64d9187f4b2f7f902f47211dc5c5fb185e4f2fcf94513bfe2f0913bf SHA512 16d83d10e8ca4f0cc1cb679e8bf8bc0fd0788d656fa39470a921d848bcb0b158ef56bdd681a842e2ca41b40cb0121007d5e7f5f7f1570459b31fd21a78f96932
 DIST muffin-5.2.1.tar.gz 5197177 BLAKE2B 9703a2e2c5ef75c7d4da3e201b60033a7ba549d94106df33aa9b89d0029f52c06fb4be00dd4c4d996bb083a790635a8227c8ff729dc43940f70b679e1b46924d SHA512 fa88a88f77a1cb84c2159fac8ab3ed38ae1054d3a01bb100aa264e8b91493a744da6e83ffad9190f0f7a07bd26022fea12d13a60e213d57f289685fba1810eb6
-EBUILD muffin-5.2.0.ebuild 2351 BLAKE2B 8018602b5f1dfab90f2ca00914521e69fc663cbdea767e2f28a2582020b010de17b40ee8503ea9664e6b4153adc370920e9555a22a11ed2dbaa798ff13c48ef0 SHA512 2fdce7f45641e1d6e6bc7dd4251e164bd9d7b0c1b38408bb2d1401447a2a9cbe30e19e53acb3b0a43e1c79bbe358a2fa0fd002e023abf9dc52461f6dd0e79511
-EBUILD muffin-5.2.1.ebuild 2471 BLAKE2B 79aafcf0a1739ca7a1ae353d0da0a770d540d865203da7a8cf652096e53f49cbadfb68012a6347cf5e01bd740b4f7545da6554ac685d4e8c9f0f815af7c2b6df SHA512 196cb45c2cc76cdba6633bdfb9cd8c36e9aba1d64d933777190c2600cb8ddc3f314e92c7c289020e618b6bbba2b8fb3fabee7d2e32dfc249b2e2785b9365dbb8
-MISC metadata.xml 486 BLAKE2B 26fc8398897e069e47a85126a78fe71fe0f6b0fad0a32078f2799fd4d15db18ebe4ff010f2a2b4889e2c27fe1bdc6244abb2c11ac02f1f1c050a5f2ba37c810d SHA512 ffb4b8c46f6fe2324d68c3041308342e550b3424c1909455cfad12d1a268eda4279ea28bd1836893f453fe9a45df568e81a6fb15d72b68fefdaad27fb8106315
+DIST muffin-5.4.7.tar.gz 4515845 BLAKE2B 53e2debb404f1712b2c23b7d46cf020389acff50067f39ed8a99272688b0ec95fe8e1e14a1c032a36ae4e80a55099390cebaec156bd6da81d3a89629e627e8b3 SHA512 12789c9ad1c69b59b0dbff6a3853eca42851a48d949b913dc851e676dc92b95c9b1b73d5bc8550dc5cf555546fc9b659a6a4c04431ec16c9aeeddab408d2066e
+EBUILD muffin-5.2.0.ebuild 2401 BLAKE2B edc9d34606c39eba1e24e47decbc7173f5ca4778dfa545d81d0202d8dc56c813407aa9bb03b915604668d3bdcce39ec5180600ffd5f3d2e4a411351ee46fd2d7 SHA512 76ef9b883a10406bbbed77ead3965390e4a997d49b63195a35c601c7f8e341c5ace9e539b2921a0b395ec35caf6cb873f300207f7a67a756a6097620d425efd7
+EBUILD muffin-5.2.1.ebuild 2521 BLAKE2B 399953c9acb458b3bb1a65fa9a4bda2a665b051891e456574fa46c3b6efa2532990aac46347d1c02f07b19e3b2a238abcd6720e45fa4ab8524abef15eb50a212 SHA512 63a58b4fa590f940e0783432813fa970172160ad18b49aa0cc083a04f8da67280f10afe55b95e6befbba3f30ac867978598a7b0a512ca47e1e7fdb2d75b46730
+EBUILD muffin-5.4.7.ebuild 3065 BLAKE2B d82c3f19cc684a5408e2fc9720380920a807df67750fcbf73de669d52b976f4f5a63e7e54c15ab47d5d2db6a9fb7621925f7eb11a1e9d0a010dd7fa0d9b82b6b SHA512 6585254d820b1d3f53bad5cf0072e27f0b38e0d3d76e7eb0b2c0656230730e649cb3fe8c0115b2361f37bc1d52d14004cfb411fd2219bb7236eeb6d88a92fac1
+MISC metadata.xml 611 BLAKE2B 550f115a51852c3e1dfcb9f84bd84c6c24fcfa7b90ca3772ed1e7e315a7b112c035e17a34e029e794922012eee3163759fc6105af29e0dfd1767183c4779005c SHA512 3211657912916ca3a207f46159d436839e9a82594cdad574dc02c64b19654f801e082284d56c4dceddd8cdbb8be424f0b4be37b010f3130551dfe12df2928ecf
diff --git a/x11-wm/muffin/metadata.xml b/x11-wm/muffin/metadata.xml
index aad0d6642dd8..1d464bc6bfa2 100644
--- a/x11-wm/muffin/metadata.xml
+++ b/x11-wm/muffin/metadata.xml
@@ -12,4 +12,7 @@
 	<upstream>
 		<remote-id type="github">linuxmint/muffin</remote-id>
 	</upstream>
+	<use>
+		<flag name="sysprof">Enable profiling data capture support using <pkg>dev-util/sysprof-capture</pkg></flag>
+	</use>
 </pkgmetadata>
diff --git a/x11-wm/muffin/muffin-5.2.0.ebuild b/x11-wm/muffin/muffin-5.2.0.ebuild
index 694c008dc14d..e40b71916685 100644
--- a/x11-wm/muffin/muffin-5.2.0.ebuild
+++ b/x11-wm/muffin/muffin-5.2.0.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Compositing window manager forked from Mutter for use with Cinnamon
 HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/muffin"
 SRC_URI="https://github.com/linuxmint/muffin/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="GPL-2+"
+LICENSE="GPL-1 GPL-2+ LGPL-2+ MIT || ( MPL-1.1 GPL-2+ LGPL-2.1+ )"
 SLOT="0"
 IUSE="+introspection test xinerama"
 KEYWORDS="amd64 ~arm64 ~riscv x86"
diff --git a/x11-wm/muffin/muffin-5.2.1.ebuild b/x11-wm/muffin/muffin-5.2.1.ebuild
index de4b9641514b..78403819aa26 100644
--- a/x11-wm/muffin/muffin-5.2.1.ebuild
+++ b/x11-wm/muffin/muffin-5.2.1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Compositing window manager forked from Mutter for use with Cinnamon
 HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/muffin"
 SRC_URI="https://github.com/linuxmint/muffin/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="GPL-2+"
+LICENSE="GPL-1 GPL-2+ LGPL-2+ MIT || ( MPL-1.1 GPL-2+ LGPL-2.1+ )"
 SLOT="0"
 IUSE="input_devices_wacom +introspection test xinerama"
 KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
diff --git a/x11-wm/muffin/muffin-5.4.7.ebuild b/x11-wm/muffin/muffin-5.4.7.ebuild
new file mode 100644
index 000000000000..34e81f424c7f
--- /dev/null
+++ b/x11-wm/muffin/muffin-5.4.7.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome2-utils meson xdg-utils virtualx
+
+DESCRIPTION="Compositing window manager forked from Mutter for use with Cinnamon"
+HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/muffin"
+SRC_URI="https://github.com/linuxmint/muffin/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD GPL-2+ LGPL-2+ LGPL-2.1+ MIT SGI-B-2.0"
+SLOT="0"
+IUSE="input_devices_wacom +introspection screencast sysprof test udev"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+
+# Dependencies listed in meson order
+COMDEPEND="
+	x11-libs/libX11
+	>=media-libs/graphene-1.9.3[introspection?]
+	>=x11-libs/gtk+-3.19.8:3[X,introspection?]
+	x11-libs/gdk-pixbuf:2[introspection?]
+	>=x11-libs/pango-1.20.0[introspection?]
+	>=x11-libs/cairo-1.10.0:=[X]
+	>=dev-libs/fribidi-1.0.0
+	>=dev-libs/glib-2.61.1:2
+	>=dev-libs/json-glib-0.12.0[introspection?]
+	>=gnome-extra/cinnamon-desktop-5.4:0=
+	>=x11-libs/libXcomposite-0.4
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	>=x11-libs/libXfixes-3
+	>=x11-libs/libXi-1.7.4
+	x11-libs/libXtst
+	x11-libs/libxkbfile
+	x11-misc/xkeyboard-config
+	>=x11-libs/libxkbcommon-0.4.3[X]
+	x11-libs/libXrender
+	>=x11-libs/libXrandr-1.5.0
+	x11-libs/libxcb:=
+	x11-libs/libXinerama
+	x11-libs/libXau
+	x11-libs/libICE
+	|| (
+		>=app-accessibility/at-spi2-core-2.46.0:2[introspection?]
+		>=dev-libs/atk-2.5.3[introspection?]
+	)
+	>=media-libs/libcanberra-0.26
+	sys-apps/dbus
+	media-libs/libglvnd[X]
+	media-libs/mesa[X(+),egl(+)]
+	x11-libs/libSM
+	>=x11-libs/startup-notification-0.7:=
+
+	input_devices_wacom? ( >=dev-libs/libwacom-0.13:= )
+	introspection? ( >=dev-libs/gobject-introspection-1.41.3:= )
+	screencast? ( >=media-video/pipewire-0.3.0:= )
+	sysprof? ( >=dev-util/sysprof-capture-3.35.2:4 )
+	udev? ( >=virtual/libudev-228:=
+	        >=dev-libs/libgudev-232 )
+"
+RDEPEND="${COMDEPEND}
+	gnome-extra/zenity
+"
+DEPEND="${COMDEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+# Wayland is not supported upstream.
+src_configure() {
+	local emesonargs=(
+		-Dopengl=true
+		#opengl_libname
+		#gles2_libname
+		-Dgles2=false # wayland
+		-Degl=true
+		-Dglx=true
+		$(meson_use screencast remote_desktop)
+		$(meson_use udev)
+		$(meson_use input_devices_wacom libwacom)
+		-Dpango_ft2=true
+		-Dstartup_notification=true
+		-Dsm=true
+		$(meson_use introspection)
+		$(meson_use test cogl_tests)
+		$(meson_use test clutter_tests)
+		-Dcore_tests=false # wayland
+		$(meson_use test tests)
+		$(meson_use sysprof profiler)
+		-Dinstalled_tests=false
+		#verbose
+	)
+
+	meson_src_configure
+}
+
+src_test() {
+	gnome2_environment_reset # Avoid dconf that looks at XDG_DATA_DIRS, which can sandbox fail if flatpak is installed
+	glib-compile-schemas "${BUILD_DIR}"/data
+	GSETTINGS_SCHEMA_DIR="${BUILD_DIR}"/data virtx meson_src_test --no-suite flaky
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	gnome2_schemas_update
+}