gentoo resync : 20.03.2022

3 files changed, 5 insertions, 58 deletions

diff --git a/x11-libs/libwnck/Manifest b/x11-libs/libwnck/Manifest
index 50d684fab9af..f0498fef846c 100644
--- a/x11-libs/libwnck/Manifest
+++ b/x11-libs/libwnck/Manifest
@@ -1,7 +1,5 @@
 DIST libwnck-2.31.0.tar.xz 630792 BLAKE2B 8201537d3c9a8a0a8668fc16d33a8eaa05c14312401f1c763c922402df04ef03260dd259f5c46508f85390f7aefd551e83143e654b24b412272dddb7c7c4bd62 SHA512 54262a08882021f08f3ba7f2ddfa33fc1f02e391a0f61cf999a50a089e0d277dfe13ab133c1a46e9abf0599bd24c21dacff80b51013cbb1375d2cd71ac9abbe9
-DIST libwnck-3.36.0.tar.xz 447760 BLAKE2B c61098362c57c3de879170d3104472b0a7f3c16da163c5d740d7a42bd545cfdaecd96804108834d5b7de5028e847f9b0557f015d08f50f9459a896f1d5f84431 SHA512 b7bf5d935327f61634a898594cf20a270e1b403c8df6c74e6ac20e22eea2845ac8c3007b31994728b74953e40c1015373efe10ed64243cf5e85fd210654aecb3
-DIST libwnck-40.0.tar.xz 455216 BLAKE2B 7ebadb2a57cd0ce6bccac265427cc31e9a84460219c2f19f9dd14c5e6175da19a2e8ab2309902e098686fb40bf277ae8b815d60b29b541de9992e0b1538f6777 SHA512 059f2a2add3f95feb7759e827072905652a4dc9c6756d526743319b5016ee36191b5c9a4fb5204f85a13049c2bd1bb3d01b2456ddb3ddc8f76148a0ee1651696
+DIST libwnck-40.1.tar.xz 455624 BLAKE2B dd069cba299b9006a10de3311da87958f14a9defcc02a936cb0be38431eda9210aa8cff36ae63858235380a75c1d5266ce0612b5f93f47de21d48a5324af8a6d SHA512 50ba20547e95280d10f1f66f36eea6c649b59d385da7a9217c295150520099585a5ff43c08a552afb8b0db3ee7305bbb2c38d0baed84cc6dc0942f3ca1e43e29
 EBUILD libwnck-2.31.0-r1.ebuild 1209 BLAKE2B 5bf316bc3ab03afbc54fbcf4095804721f86b24c81be44e416d5e1107d65954b9142a739e8d46ff07a27657b174b078a364e52640cec50a8676cdb7916f34888 SHA512 adcd8a2024f44730082de7a27bea6fdea598f3ba5495fe18f86df09e23d21218cf9fa4403a4ad665d0ca218e2aa5d1187643bb68cc57187e9825a9f558cd4eba
-EBUILD libwnck-3.36.0.ebuild 1423 BLAKE2B deb4f4d8a43f40a7e4aea5c12550492a2a4fd6d5d485ef60070a95117d3eb47b9593a95632e787cb9cedec9ca15549acf36036a94c0ee703bfb818dd66fd03fa SHA512 50560b1e74b937803c44cae0f21d3f513d3e27e0ac4905242b4e7308da2916274659655d4e7eeadef182e2ad5da93a0b7a92e50ac97157f41edf6ecc7e3bb6f3
-EBUILD libwnck-40.0.ebuild 1417 BLAKE2B 229d54ed01832f6469bebbad49822f59df6a5c5c80b4e032ef2194fdc17bd813a54773edbf98762153c252aa684aa52c23469c8fffcc3bb218a62210fec6f21a SHA512 42fec50639ef9df96602eba6a3ff9d329a0c0a2de5536f0b7c5a2fc9627278c6db518acf39522fcac39809a3184c8516cd6ef4d156d8f3bfe1ac722333fff549
+EBUILD libwnck-40.1.ebuild 1410 BLAKE2B 41de94e5d9c92e57414d6af7496862b6db655d175778c599ed29e456077713ba0c51000b15b75f8d28a0641d10e0091279df653affdcd8b569ef9bdf19ca109c SHA512 153b9a15843562614b0b1732a94696eb917c71f20504e16b215ff37113de04a4e8879f95d9f631406d6c522379ad7cb1eda6a09d00f1b4b7db3e57b13a34d0d2
 MISC metadata.xml 365 BLAKE2B a7be92726d84fa9db42339b18e8ce7cafcf36a19c7573295c5b833c6ab1fcde222bcb43a645ae5c581d8fbe71e52073381f73203c89009dc9088aa4d11c9a1dd SHA512 d7fccc45d93efd6f83a0af12a1b8816a4a9d45c379f247f0728e7bcc7c4b6d8e193649ac83df6070fac2841b42708181829393cc424075067ef49496eb1f9f54
diff --git a/x11-libs/libwnck/libwnck-40.0.ebuild b/x11-libs/libwnck/libwnck-40.0.ebuild
deleted file mode 100644
index b8eedfea78f3..000000000000
--- a/x11-libs/libwnck/libwnck-40.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org meson xdg
-
-DESCRIPTION="A window navigation construction kit"
-HOMEPAGE="https://developer.gnome.org/libwnck/stable/"
-
-LICENSE="LGPL-2+"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
-
-IUSE="gtk-doc +introspection startup-notification tools"
-
-RDEPEND="
-	x11-libs/cairo[X]
-	>=dev-libs/glib-2.44:2
-	>=x11-libs/gtk+-3.22:3[X,introspection?]
-	startup-notification? ( >=x11-libs/startup-notification-0.4 )
-	x11-libs/libX11
-	x11-libs/libXres
-	introspection? ( >=dev-libs/gobject-introspection-1.56:= )
-"
-# libXi header used by wnckprop.c, which is compiled even with USE=-tools (just not installed then)
-DEPEND="${RDEPEND}
-	x11-libs/libXi"
-BDEPEND="
-	gtk-doc? ( >=dev-util/gtk-doc-1.9
-		app-text/docbook-xml-dtd:4.1.2 )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# Don't collide with SLOT=1 with USE=tools
-	sed -e "s|executable(prog|executable(prog + '-3'|" -i libwnck/meson.build || die
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		-Ddeprecation_flags=false
-		$(meson_use tools install_tools)
-		$(meson_feature startup-notification startup_notification)
-		$(meson_feature introspection)
-		$(meson_use gtk-doc gtk_doc)
-	)
-	meson_src_configure
-}
diff --git a/x11-libs/libwnck/libwnck-3.36.0.ebuild b/x11-libs/libwnck/libwnck-40.1.ebuild
index 2600377be1ee..fc95a99f6e79 100644
--- a/x11-libs/libwnck/libwnck-3.36.0.ebuild
+++ b/x11-libs/libwnck/libwnck-40.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit gnome.org flag-o-matic meson xdg
+inherit gnome.org meson xdg
 
 DESCRIPTION="A window navigation construction kit"
 HOMEPAGE="https://developer.gnome.org/libwnck/stable/"
@@ -16,7 +16,7 @@ IUSE="gtk-doc +introspection startup-notification tools"
 
 RDEPEND="
 	x11-libs/cairo[X]
-	>=dev-libs/glib-2.34:2
+	>=dev-libs/glib-2.44:2
 	>=x11-libs/gtk+-3.22:3[X,introspection?]
 	startup-notification? ( >=x11-libs/startup-notification-0.4 )
 	x11-libs/libX11