gentoo auto-resync : 30:10:2022 - 15:03:33

3 files changed, 4 insertions, 110 deletions

diff --git a/x11-wm/muffin/Manifest b/x11-wm/muffin/Manifest
index 9c731f3036b7..3cf29117b263 100644
--- a/x11-wm/muffin/Manifest
+++ b/x11-wm/muffin/Manifest
@@ -1,7 +1,5 @@
-DIST muffin-5.2.0.tar.gz 5197334 BLAKE2B e1c3ffc6f88ef4a6c5b2f3e03838448540baeeacce3029a039b2fae1804c79193f9ee0bb64d9187f4b2f7f902f47211dc5c5fb185e4f2fcf94513bfe2f0913bf SHA512 16d83d10e8ca4f0cc1cb679e8bf8bc0fd0788d656fa39470a921d848bcb0b158ef56bdd681a842e2ca41b40cb0121007d5e7f5f7f1570459b31fd21a78f96932
 DIST muffin-5.2.1.tar.gz 5197177 BLAKE2B 9703a2e2c5ef75c7d4da3e201b60033a7ba549d94106df33aa9b89d0029f52c06fb4be00dd4c4d996bb083a790635a8227c8ff729dc43940f70b679e1b46924d SHA512 fa88a88f77a1cb84c2159fac8ab3ed38ae1054d3a01bb100aa264e8b91493a744da6e83ffad9190f0f7a07bd26022fea12d13a60e213d57f289685fba1810eb6
 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 2519 BLAKE2B 04d0035a5f5988c5367e3c423b8332524913b72b2c794deefc2de617756c4c45a3401948336e851bb46c2a2756afc0faf2f3104d961fd44870c608147b964532 SHA512 af5a8cba8a4f780a5081346e8d521f735ad461c1a473f5e0b384ed1fcf3dcf98942ae787e74292b9ca558485c2ea6b25255e8715aa9c0686accfe6d6c8b05847
-EBUILD muffin-5.4.7.ebuild 3065 BLAKE2B d82c3f19cc684a5408e2fc9720380920a807df67750fcbf73de669d52b976f4f5a63e7e54c15ab47d5d2db6a9fb7621925f7eb11a1e9d0a010dd7fa0d9b82b6b SHA512 6585254d820b1d3f53bad5cf0072e27f0b38e0d3d76e7eb0b2c0656230730e649cb3fe8c0115b2361f37bc1d52d14004cfb411fd2219bb7236eeb6d88a92fac1
+EBUILD muffin-5.4.7-r1.ebuild 3104 BLAKE2B 818c89f219c86be884a67bb4fdb3d653c5a8b9b4b75a29722786ba997f353bed96b521ba19d3b871b762340258ca45901a77c6e03567b5ad7c7c029901acdfcf SHA512 86f37b7bb545acbd362c6f206b9079f4994f2b1e54d67e08cb5334db2b1d021d388f351f74584df94dce111770ae5f5721922b8cea99d9aec4b30116ea6fd928
 MISC metadata.xml 611 BLAKE2B 550f115a51852c3e1dfcb9f84bd84c6c24fcfa7b90ca3772ed1e7e315a7b112c035e17a34e029e794922012eee3163759fc6105af29e0dfd1767183c4779005c SHA512 3211657912916ca3a207f46159d436839e9a82594cdad574dc02c64b19654f801e082284d56c4dceddd8cdbb8be424f0b4be37b010f3130551dfe12df2928ecf
diff --git a/x11-wm/muffin/muffin-5.2.0.ebuild b/x11-wm/muffin/muffin-5.2.0.ebuild
deleted file mode 100644
index e40b71916685..000000000000
--- a/x11-wm/muffin/muffin-5.2.0.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools gnome2-utils 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="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"
-
-RDEPEND="
-	>=dev-libs/glib-2.37.3:2[dbus]
-	>=dev-libs/json-glib-1.0
-	>=gnome-extra/cinnamon-desktop-5.2:0=
-	gnome-extra/zenity
-	>=media-libs/libcanberra-0.26[gtk3]
-	media-libs/libglvnd
-	>=x11-libs/cairo-1.14:=[X]
-	x11-libs/gdk-pixbuf:2[introspection?]
-	>=x11-libs/gtk+-3.9.12:3[X,introspection?]
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libxcb
-	>=x11-libs/libXcomposite-0.3
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	>=x11-libs/libXi-1.6.0
-	>=x11-libs/libxkbcommon-0.4.3[X]
-	x11-libs/libxkbfile
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	>=x11-libs/pango-1.14.0[X,introspection?]
-	>=x11-libs/startup-notification-0.7:=
-	x11-misc/xkeyboard-config
-
-	introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
-	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
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	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
-}
-
-src_test() {
-	virtx default
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_schemas_update
-}
diff --git a/x11-wm/muffin/muffin-5.4.7.ebuild b/x11-wm/muffin/muffin-5.4.7-r1.ebuild
index 34e81f424c7f..bb59f627180d 100644
--- a/x11-wm/muffin/muffin-5.4.7.ebuild
+++ b/x11-wm/muffin/muffin-5.4.7-r1.ebuild
@@ -56,7 +56,7 @@ COMDEPEND="
 	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 )
+	sysprof? ( >=dev-util/sysprof-capture-3.35.2:3 )
 	udev? ( >=virtual/libudev-228:=
 	        >=dev-libs/libgudev-232 )
 "
@@ -65,6 +65,8 @@ RDEPEND="${COMDEPEND}
 "
 DEPEND="${COMDEPEND}
 	x11-base/xorg-proto
+
+	sysprof? ( dev-util/sysprof-common )
 "
 BDEPEND="
 	dev-util/gdbus-codegen