gentoo resync : 15.06.2021

3 files changed, 30 insertions, 24 deletions

diff --git a/x11-wm/muffin/Manifest b/x11-wm/muffin/Manifest
index 61da8190558a..2826d0860dd0 100644
--- a/x11-wm/muffin/Manifest
+++ b/x11-wm/muffin/Manifest
@@ -1,6 +1,6 @@
 AUX muffin-4.8.1-slibtool.patch 6242 BLAKE2B 487b87b47378cb827eaa85b0dbaa533bf6e79eaf712939aa694a8d42b54bb100b9e99b5b4d5fdce828a6e735af0a79fd99946a5c7a29ac5ab4ef1cea685efdee SHA512 8734ffc295042fc988a6668f12bc7f13a3de6783eff23418dd6dfd07f5f8a38697fa82e23b7e0703cbb4e20c78fa3e5b63e2943b272f5b50a487d6aba7252cdb
-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 2198 BLAKE2B c49204763bc3fa56f272b40a249f314107f45dd225835499d5109fd00e6c424b78648205cc647eafe8d36e882b871540af40fd49fc5083d94358bb1302bcbe18 SHA512 45e4ced1cc68aca4d183cf7374bef34bcf2c009fd4907f3015f20cfbc22c322299ad3e215ecd8b35ed6371e7e16a5a3d4e09b9c1f390a712c840c86174aeba5f
-EBUILD muffin-4.8.1.ebuild 2393 BLAKE2B a133ddfaf9af27c6c5dac92cc6b5664214cbe75c2299f724a6eeccc178391d0469664f5c2d54d955003f01e2f8139d6e56d256786bfd1ebcf794e3e4be2968e8 SHA512 c810f6f0aeacccb32f2b5d4e1dc512a455191832e2b4a19a4b693c71c7144f8608f71a088ce7a22ae5143c026ccbb8ad6c798697fe51563457b787f884e8611f
+DIST muffin-5.0.0.tar.gz 5196913 BLAKE2B 50499ad7a8b4a3ea56bf0d06b4f25b4f78d00721d58991fc1c4c174370862560e63ebf0eba32118e8c3a3537c3a98de65f4ee0ea8230130c3e36ad8fa814f2ee SHA512 297a8eaca89085ddf4d89242ce41c594f8221113acd5eb986c3b07f45de2e4e5cc25ec7e183eee6c49062a45d01e8517f0774a02c252b5cb6bac6920d0a04ff6
+EBUILD muffin-4.8.1.ebuild 2391 BLAKE2B c7bba34a7a838e54661e93df09dd5939632d911d3e95a11f8cee8b432e1d0dce7f370986cac7c89f0cf8e52005f1c839e556cb684ec848160382267bbec5811f SHA512 f6a8d5f7d4d1bed6d019f2f50ef026b989ecf9cc37feab790f7de04c8c173390df70f82c4f1202e6edf98fb20e161c4df40a753caae6faaa9d2629207c124f7a
+EBUILD muffin-5.0.0.ebuild 2338 BLAKE2B 0c58d9dfe83369e4d9e1759cd180da381935240605f2de243cbaa15f262cc8dc0acdaaefe0f10a38087f2f917ca5f09e56fc19145fbe54f7e96ffe1a848df73b SHA512 99a49dbb02dd0d003fb661e9200def28bb8f9ef77b71463d45bd8b8d62ba941d83b53079a7ebf3ebe96f2c932371fc454f5bee02426eb3081ace6627085d7eea
 MISC metadata.xml 485 BLAKE2B 9c98a549cc02d9f3406afb6677215d183d8b8a78bfaaf322d1094d976352bc7f7bc361d3dbdb2ec935cecf991bec6b43cc869e4a6f61b88913c7643aa2d3d6fd SHA512 901c002088995674a0b3ef67d2558ea63bc1989c6ee459bb0bc074edd7a3e20d09284f8e76d87a4609bda6342586a1022e16caa61fbe5d4db8ba0024922c8998
diff --git a/x11-wm/muffin/muffin-4.8.1.ebuild b/x11-wm/muffin/muffin-4.8.1.ebuild
index 2e14e5cfece0..3b692972bcb0 100644
--- a/x11-wm/muffin/muffin-4.8.1.ebuild
+++ b/x11-wm/muffin/muffin-4.8.1.ebuild
@@ -12,7 +12,7 @@ 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 x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.37.3:2[dbus]
diff --git a/x11-wm/muffin/muffin-4.6.3.ebuild b/x11-wm/muffin/muffin-5.0.0.ebuild
index 33f724dea90a..88d5bcdbe869 100644
--- a/x11-wm/muffin/muffin-4.6.3.ebuild
+++ b/x11-wm/muffin/muffin-5.0.0.ebuild
@@ -3,59 +3,61 @@
 
 EAPI=7
 
-inherit autotools gnome2-utils xdg-utils
+inherit autotools gnome2-utils xdg-utils virtualx
 
 DESCRIPTION="Compositing window manager forked from Mutter for use with Cinnamon"
-HOMEPAGE="https://projects.linuxmint.com/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+"
 SLOT="0"
 IUSE="+introspection test xinerama"
-KEYWORDS="amd64 ~arm64 x86"
-RESTRICT="test"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 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=
+	>=gnome-extra/cinnamon-desktop-5.0:0=
+	gnome-extra/zenity
 	>=media-libs/libcanberra-0.26[gtk3]
-	>=x11-libs/libXcomposite-0.3
-	>=x11-libs/startup-notification-0.7:=
-
+	virtual/opengl
+	>=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/libXcomposite
+	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
+	x11-libs/libxkbfile
 	x11-libs/libXrandr
 	x11-libs/libXrender
-	x11-libs/libxkbcommon
-	virtual/opengl
-
-	gnome-extra/zenity
+	>=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.5:= )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
 	xinerama? ( x11-libs/libXinerama )
 "
-DEPEND="${RDEPEND}
+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
+	sys-devel/gettext
 	virtual/pkgconfig
 "
 
@@ -89,6 +91,10 @@ src_install() {
 	dodoc HACKING MAINTAINERS *.txt doc/*.txt
 }
 
+src_test() {
+	virtx default
+}
+
 pkg_postinst() {
 	xdg_desktop_database_update
 	gnome2_schemas_update