gentoo resync : 12.05.2022

3 files changed, 3 insertions, 111 deletions

diff --git a/x11-wm/muffin/Manifest b/x11-wm/muffin/Manifest
index 98e21effd7e8..36c345322c44 100644
--- a/x11-wm/muffin/Manifest
+++ b/x11-wm/muffin/Manifest
@@ -1,5 +1,3 @@
-DIST muffin-5.0.2.tar.gz 5197188 BLAKE2B 88a7530359386ceb14b0b509e1769d8cc4d552d9afa45faf6dbd62a457c7ca19d59e553176cf3689c3d22962c761a8633f6880802ea3c5453ff07901e3ca5374 SHA512 4f31b5a4b81db5967a3bc21b7f2bdbb30f47f5dcde12be467cd27f340164483ab43b423cd043dce50201c9b900ccab4a0fc84f4f6e22c66e901cd0c6d986761d
 DIST muffin-5.2.0.tar.gz 5197334 BLAKE2B e1c3ffc6f88ef4a6c5b2f3e03838448540baeeacce3029a039b2fae1804c79193f9ee0bb64d9187f4b2f7f902f47211dc5c5fb185e4f2fcf94513bfe2f0913bf SHA512 16d83d10e8ca4f0cc1cb679e8bf8bc0fd0788d656fa39470a921d848bcb0b158ef56bdd681a842e2ca41b40cb0121007d5e7f5f7f1570459b31fd21a78f96932
-EBUILD muffin-5.0.2.ebuild 2346 BLAKE2B c2b8ee69a05dbf4d8f3c9e9e20a5f1a5fc718d831f486cc3abe5396e2acfd5bb530224ee3b4faa36a07dca52323376c36564cb5c35284f478673fb0c106bf139 SHA512 933886bf4590cd3c5909fce63b5f5e7da939ec59e0bede656bbf13626b2650c701c3ffd7f422d74eec6ec7ee255baa53f1d205c5e2aa63b85da1592a7b7f58a8
-EBUILD muffin-5.2.0.ebuild 2353 BLAKE2B 4efc9d7f6ead92f50a03a21503c4b3a58d0b5c223d052a124dc4228b168f90b6682df533d267175774a9bb3e99df1c528f52dbff9b0a19ef97efbace7fb24820 SHA512 43c850437a78e6368c058a5d543e87e5c910e323caf18c1b875bd992600b781178f2e555622cc91ff632fd337e503668e7ae6f5afde6b132c1cdd3b85f006541
+EBUILD muffin-5.2.0.ebuild 2351 BLAKE2B 8018602b5f1dfab90f2ca00914521e69fc663cbdea767e2f28a2582020b010de17b40ee8503ea9664e6b4153adc370920e9555a22a11ed2dbaa798ff13c48ef0 SHA512 2fdce7f45641e1d6e6bc7dd4251e164bd9d7b0c1b38408bb2d1401447a2a9cbe30e19e53acb3b0a43e1c79bbe358a2fa0fd002e023abf9dc52461f6dd0e79511
 MISC metadata.xml 486 BLAKE2B 26fc8398897e069e47a85126a78fe71fe0f6b0fad0a32078f2799fd4d15db18ebe4ff010f2a2b4889e2c27fe1bdc6244abb2c11ac02f1f1c050a5f2ba37c810d SHA512 ffb4b8c46f6fe2324d68c3041308342e550b3424c1909455cfad12d1a268eda4279ea28bd1836893f453fe9a45df568e81a6fb15d72b68fefdaad27fb8106315
diff --git a/x11-wm/muffin/muffin-5.0.2.ebuild b/x11-wm/muffin/muffin-5.0.2.ebuild
deleted file mode 100644
index 0d24a28f38de..000000000000
--- a/x11-wm/muffin/muffin-5.0.2.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2021 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-2+"
-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.0:0=
-	gnome-extra/zenity
-	>=media-libs/libcanberra-0.26[gtk3]
-	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/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.2.0.ebuild b/x11-wm/muffin/muffin-5.2.0.ebuild
index e68e869ca9bc..694c008dc14d 100644
--- a/x11-wm/muffin/muffin-5.2.0.ebuild
+++ b/x11-wm/muffin/muffin-5.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.37.3:2[dbus]