gentoo resync : 29.12.2022

5 files changed, 27 insertions, 197 deletions

diff --git a/app-emulation/open-vm-tools/Manifest b/app-emulation/open-vm-tools/Manifest
index a952dae0aa15..cef75e6ec071 100644
--- a/app-emulation/open-vm-tools/Manifest
+++ b/app-emulation/open-vm-tools/Manifest
@@ -1,6 +1,4 @@
 AUX 10.1.0-Werror.patch 660 BLAKE2B a2877e473e2206259cf260b22d638643ae0e1a595f79bc69c401b9e5107445764868782e3cd4d8626f9a9d62fd748b7242530d89881678c12ac49230804cab41 SHA512 3bfbc1e5c064318b36b01e656ce6296726b31632222f8cebe96cac6acf011e1237380cdad71d01a0493c1382d0e3fc471e2a4e0ed0b902e70cf29e1d8a88633f
-AUX 10.1.0-mount.vmhgfs.patch 1305 BLAKE2B 5482c6ab87c5e14e229088eb71c3e6833674eae09af4f4171ff16ee752fd354828c7eab1f7c85eb5f23f14d9412c15e4566f872d709aaead4ff7d7cf8dbd06b4 SHA512 3cf1cf89f8e39d676075a56643e9d0aef22609234166195cb31cea2cb3daf6d90cb5aab0aa84f446c34dabc9ad67ccc5532276fe1c20d5cc5a723240b1313694
-AUX 11.2.5-glib-2.68.patch 6419 BLAKE2B ca772719d7328deeb784a4bb6e7e1bbee56704bab2d5faf81e1df719877960333df7004aff9775e2903b4ac996495e5cc150bace69c84d10568b75956ca6fc36 SHA512 1e99c9b61406aeb0b071b1d3706074f900c8b8afa57881c9e13e712b6ae1cd61702795e7f01580b748c52fd58be47fa1c23bfafbf497da74dfd1924d8e4fdab2
 AUX 11.3.5-icu.patch 840 BLAKE2B 7f49ef8e2f93bf813cd88504d708b66132678e6686f862e0c6b3fe4626386d8e6de0fc4fe1b5d860652873903cc3faabfe75c6d04becab2f0cd318cc4624206d SHA512 29f80dc1d918a8462484a405f827f02a6367270d5143c22c2a01e905350649fb1054bce696835cc98300ab3a4e53436665d47d74a12a69178c230fb22dd81d41
 AUX mount.vmhgfs 63 BLAKE2B 8214f6eaae9e1c2b6af7cb364572323f91e544d17d816ce93ca1a58e4f6c0ac8692000c95ef982ad6a2721bb070a5d0c4a65275a63e8cea91e14888713b560d4 SHA512 dbad70fbb96e37ffca4664abe7766c26ce3303e52ccfc80b5c83d1e21066d2a23d548910f8e15055be36e1ca162cdbbf6e19fcb672314888c63cd802a499acb9
 AUX open-vm-tools.confd 88 BLAKE2B d82267674328d1e38cc850df238b8cc6c566588883d81e59f308ddd070fde6e4f9ae4950c9d68ac6daf2ed33e1a45f323d8f954430559b03697f1a25f1e7ef6a SHA512 fca30a3be4dd3247e16115fe32b4d27ede8751f96b5a33b9f489b0ce57823c605b6249ff722d6f4ed82a98979f36d28821603b4a5a1d967d3048d23d983a19be
@@ -8,8 +6,8 @@ AUX open-vm-tools.initd 1225 BLAKE2B 279f572bfb07c40f0612c39989ba0048c640b5bdfdb
 AUX vgauthd.service 339 BLAKE2B 8f80d6d2f017623a8594c060e38e319c9406f5cf0008002ed64b3205f0b4ad05d4d92ae059a1b451cfa043488d15dd31dd8c152342895cd296052757c854124b SHA512 de3265980076f87ab8e0b459b2b6d60dbcf6e8453bd26200d9e05938246add8d320681c7faa3c290c8851c9a3949c62ddfe524b7e1581daf508115f340111881
 AUX vmtoolsd.service 244 BLAKE2B 65bf0e80b580c2c29a06a2cbf37f8428dbfe03404cea92d0d62c2d0f4d1ccefea8f1b553ca9cdaf5693f5f1546db5733061218e4c95b953e5f140e602fe68ba2 SHA512 0e29b56eb1495a6a9d3c84862e62aac78f29d9940aa19717d2a15ea88fe9484bf84ac858bbbcf22ed9194ecd141758a4398d5a193dd0d74172fd8fe53df53505
 AUX vmtoolsd.vgauth.service 312 BLAKE2B dba8ddb1b701cea490b117d08c93738a38bd668cf5444501bad8aabc503da4b87e53103a26ca4664247f14582c5546a28f093768833182581a850f0c50bc61e3 SHA512 fce9af2a3b98bf1fd5063af6c0d00bac7eba4ca02456d9266be5b74f2dea168521ffd44c38df1e28b0684f7ce21e4cb44ec2570fcbe01ff2ef432b55ede585f3
-DIST open-vm-tools-11.2.5-17337674.tar.gz 4057528 BLAKE2B 2adc5179e09a4bb501fe12c9e6dea7fee106516fd250899170a8fb3bcefb9b576136a82e4c3d3a73217b44aba8880728bb3588cedd715529f9b2991f0156ac84 SHA512 b6d4bc6522418ec7a881752181ad9240e535854df492e758abf3996c6afe245466ffbff60cc1b6cdff5cf731b5769c9f9cb96aed29f0b788d0eef05f91fcf8ab
 DIST open-vm-tools-11.3.5-18557794.tar.gz 4218935 BLAKE2B 41e3f5877a5074bfb206870d7bdba613a468aa104d6d497dcf16e80b24fcbdd2195fcce370b150ced4665dd19296ff27dc06922d2742a43f5bf70b1b5eea9d48 SHA512 fa31f5615c9c90865ba9122f7fcd0831068d48defee30a5f5c620e744b76ccd5b7cc2de20cea4e37b596f99619ffb7bb47774de04e7c4bea666c7c0b6fa1560e
-EBUILD open-vm-tools-11.2.5_p17337674-r3.ebuild 3191 BLAKE2B 52fcff90ec9562cf743a91e0c1d86ab6d32a8766265a7e7082fbfd18f6f462b3de4d8ef1855845feb0414e07b73177f9163ea00211d59b893acf6cbdbb348d40 SHA512 6a046d3413a3cec3d9bf4763103038f0e95a3a55bf3a97a4dae3978d491951b17a481ecd753f8c5dfc15c0b268200a4b3e15cc3d9fd5411c58b2d8b64fbfd9bc
-EBUILD open-vm-tools-11.3.5_p18557794.ebuild 3016 BLAKE2B 3c8b5223ee4c85f6d504ce1e1015542938b6adbc2a3d333090fef2a1ee6b526153e1ffe9556c6098696c17750c3dfe1239ee094f6688a71102208a4a7a611925 SHA512 24c1ec71e728d4bab6823a48fbe846576bd7a1b2995d2c287111341030769633ba52da84ed72d2833ded2a9ea74cb0c1ea633d647d59fdf3fe74a37444fcf9dd
+DIST open-vm-tools-12.0.5-19716617.tar.gz 4348389 BLAKE2B 9b5160ce6c7025c948a5ee9e3906e2bbe2cdfddbd27a6e6ca142624bbb11bf08651ad3d38685e84a8d65898eacb9b9e4e9c584c8f1e0c80987996b8624608338 SHA512 d0e842a33e423cb07f86c2c7c9b3d2e7bca85c49c922d14529a72db322931b3baedad386bffc1bb500bb4fe8b572529f3c63fc823732405849edb6344b405714
+EBUILD open-vm-tools-11.3.5_p18557794.ebuild 3132 BLAKE2B 4ade4af47a72a76aaa5ded087f53844c249f91147ecb2882a0f20a6d4f6aace275c11a233d8cea765fae9b36bd452320002ff306135195fa9cbb6152d40d55e2 SHA512 a3b753da45594009ee710a176cc627f60177cf60378acb01f2585c36307f35ca2a134af90be73bf2e6b03f1369955aee8286f4c2ad3cddd86eef46c703cd8035
+EBUILD open-vm-tools-12.0.5_p19716617.ebuild 3134 BLAKE2B b1ac835cd92d4f3d890aab6869552f576930651597e0af8286c3c23ff80fe1417bfe808b07199337460dd394c795adad686d8c141a3b7e7cfe01e41db5888d06 SHA512 4cfa491191c70e93e9aec7d0d9832621ef502243ba62af75d6e8cecca7982d87a0355514abd81b6bc064e98838a47cd06cc06bae8e87d67437471ac8e91872a7
 MISC metadata.xml 1155 BLAKE2B be59d8dad6f92410c7244a90ccd9db69ca50bed5eac69728b5920b57d2dfa30f37740077f1a6c367094da0ad757da9cfec8ae958a56e76107e132cfd4cbce0d5 SHA512 6fba5194196c4abcbd954fe69b8f97205a0f1d7da3bb4a2220a625cdf918cc48c92a10c61f0cad6736bd153a3e9b7c95672279b5eec05745299fded939f542cc
diff --git a/app-emulation/open-vm-tools/files/10.1.0-mount.vmhgfs.patch b/app-emulation/open-vm-tools/files/10.1.0-mount.vmhgfs.patch
deleted file mode 100644
index bff97811771b..000000000000
--- a/app-emulation/open-vm-tools/files/10.1.0-mount.vmhgfs.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 1805ab024b10e8185175de7ce9c9b9db87fd0897 Mon Sep 17 00:00:00 2001
-From: Bernd Zeimetz <bernd@bzed.de>
-Date: Sun, 10 Jan 2016 22:18:04 +0100
-Subject: [PATCH] Fix mount.vmhgfs symlinks if DESTDIR is used
-
-Without this change symlinks in the form of
-sbin/mount.vmhgfs -> /build/open-vm-tools-10.0.5-3227872/debian/open-vm-tools/usr/sbin/mount.vmhgfs
-are being produced, if DESTDIR was uset while running make install.
----
- open-vm-tools/hgfsmounter/Makefile.am | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/open-vm-tools/hgfsmounter/Makefile.am b/open-vm-tools/hgfsmounter/Makefile.am
-index e48417e..fe70892 100644
---- a/open-vm-tools/hgfsmounter/Makefile.am
-+++ b/open-vm-tools/hgfsmounter/Makefile.am
-@@ -33,14 +33,14 @@ install-exec-hook:
- 	mv $(DESTDIR)$(sbindir)/mount.vmhgfs \
- 		$(DESTDIR)$(sbindir)/mount_vmhgfs
- 	-$(MKDIR_P) $(DESTDIR)/sbin
--	-$(LN_S) $(DESTDIR)$(sbindir)/mount_vmhgfs \
-+	-$(LN_S) $(sbindir)/mount_vmhgfs \
- 		$(DESTDIR)/sbin/mount_vmhgfs &> /dev/null
- uninstall-hook:
- 	rm -f $(DESTDIR)$(sbindir)/mount_vmhgfs
- else
- install-exec-hook:
- 	-$(MKDIR_P) $(DESTDIR)/sbin
--	-$(LN_S) $(DESTDIR)$(sbindir)/mount.vmhgfs \
-+	-$(LN_S) $(sbindir)/mount.vmhgfs \
- 		$(DESTDIR)/sbin/mount.vmhgfs &> /dev/null
- uninstall-hook:
- 	rm -f $(DESTDIR)/sbin/mount.vmhgfs
diff --git a/app-emulation/open-vm-tools/files/11.2.5-glib-2.68.patch b/app-emulation/open-vm-tools/files/11.2.5-glib-2.68.patch
deleted file mode 100644
index b04342c3f68e..000000000000
--- a/app-emulation/open-vm-tools/files/11.2.5-glib-2.68.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-From 82931a1bcb39d5132910c7fb2ddc086c51d06662 Mon Sep 17 00:00:00 2001
-From: John Wolfe <jwolfe@vmware.com>
-Date: Mon, 19 Apr 2021 11:08:10 -0700
-Subject: [PATCH] Fix issues using GCC 11 with gtk >= 3.20 and glib >=2.66.3
-
-With glib2.0 releases >= 2.66.3, glib header files inside an
-extern "C" block will encounter compilation errors.  This has
-impacted several OSS packages.  Consumers of newer versions of glib2.0
-must not include glib headers in an extern "C" block.
-
-GTK 3.20 has deprecated gdk_display_get_device_manager(); using the
-newer gdk_display_get_default_seat() when the GTK version is >= 3.20.
-
-The return value from read() must be used to avoid an unused result
-warning from the compiler.  This can be avoided by using dummy retyping
-in the case where the return value is not used or in this case, using
-the returned value in a debug log message.
-
-Pull Request: https://github.com/vmware/open-vm-tools/pull/505
-Addresses:    https://github.com/vmware/open-vm-tools/issues/500
-Addresses:    https://github.com/vmware/open-vm-tools/issues/509
----
- open-vm-tools/AUTHORS                                 |  3 +++
- open-vm-tools/lib/include/tracer.hh                   |  4 +---
- .../services/plugins/dndcp/copyPasteUIX11.cpp         |  3 ++-
- .../plugins/dndcp/dndGuest/dndCPTransportGuestRpc.hpp |  6 +++---
- open-vm-tools/services/plugins/dndcp/dndUIX11.cpp     | 11 +++++++++--
- open-vm-tools/services/plugins/dndcp/dndcp.cpp        |  7 ++++++-
- 6 files changed, 24 insertions(+), 10 deletions(-)
-
-diff --git a/open-vm-tools/lib/include/tracer.hh b/open-vm-tools/lib/include/tracer.hh
-index 697caedbc..e9ae892cb 100644
---- a/open-vm-tools/lib/include/tracer.hh
-+++ b/open-vm-tools/lib/include/tracer.hh
-@@ -1,5 +1,5 @@
- /*********************************************************
-- * Copyright (C) 2013-2017 VMware, Inc. All rights reserved.
-+ * Copyright (C) 2013-2017,2021 VMware, Inc. All rights reserved.
-  *
-  * This program is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as published
-@@ -28,9 +28,7 @@
- 
- #include "vm_basic_defs.h"
- 
--extern "C" {
- #include "glib.h"
--}
- 
- 
- #ifdef VMX86_DEVEL
-diff --git a/open-vm-tools/services/plugins/dndcp/copyPasteUIX11.cpp b/open-vm-tools/services/plugins/dndcp/copyPasteUIX11.cpp
-index 68212ab8b..080dc3d76 100644
---- a/open-vm-tools/services/plugins/dndcp/copyPasteUIX11.cpp
-+++ b/open-vm-tools/services/plugins/dndcp/copyPasteUIX11.cpp
-@@ -1,5 +1,5 @@
- /*********************************************************
-- * Copyright (C) 2009-2020 VMware, Inc. All rights reserved.
-+ * Copyright (C) 2009-2021 VMware, Inc. All rights reserved.
-  *
-  * This program is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as published
-@@ -1666,6 +1666,7 @@ CopyPasteUIX11::FileBlockMonitorThread(void *arg)   // IN
-       char buf[sizeof(VMBLOCK_FUSE_READ_RESPONSE)];
-       ssize_t size;
-       size = read(fd, buf, sizeof(VMBLOCK_FUSE_READ_RESPONSE));
-+      g_debug("%s: Number of bytes read : %" FMTSZ "u\n", __FUNCTION__, size);
-       /*
-        * The current thread will block in read function until
-        * any other application accesses the file params->fileBlockName
-diff --git a/open-vm-tools/services/plugins/dndcp/dndGuest/dndCPTransportGuestRpc.hpp b/open-vm-tools/services/plugins/dndcp/dndGuest/dndCPTransportGuestRpc.hpp
-index 9b70984fc..424481baa 100644
---- a/open-vm-tools/services/plugins/dndcp/dndGuest/dndCPTransportGuestRpc.hpp
-+++ b/open-vm-tools/services/plugins/dndcp/dndGuest/dndCPTransportGuestRpc.hpp
-@@ -1,5 +1,5 @@
- /*********************************************************
-- * Copyright (C) 2010-2017 VMware, Inc. All rights reserved.
-+ * Copyright (C) 2010-2017,2021 VMware, Inc. All rights reserved.
-  *
-  * This program is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as published
-@@ -31,13 +31,13 @@
- 
- #include "dnd.h"
- 
--extern "C" {
- #ifdef VMX86_TOOLS
-    #include "vmware/tools/guestrpc.h"
- #else
-+extern "C" {
-    #include "guest_rpc.h"
--#endif
- }
-+#endif
- 
- #define GUEST_RPC_CMD_STR_DND "dnd.transport"
- #define GUEST_RPC_CMD_STR_CP  "copypaste.transport"
-diff --git a/open-vm-tools/services/plugins/dndcp/dndUIX11.cpp b/open-vm-tools/services/plugins/dndcp/dndUIX11.cpp
-index 50c2bf5e1..03cf3e0d7 100644
---- a/open-vm-tools/services/plugins/dndcp/dndUIX11.cpp
-+++ b/open-vm-tools/services/plugins/dndcp/dndUIX11.cpp
-@@ -1,5 +1,5 @@
- /*********************************************************
-- * Copyright (C) 2009-2019 VMware, Inc. All rights reserved.
-+ * Copyright (C) 2009-2021 VMware, Inc. All rights reserved.
-  *
-  * This program is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as published
-@@ -467,8 +467,15 @@ DnDUIX11::OnSrcDragBegin(const CPClipboard *clip,       // IN
- #ifndef GTK3
-    event.device = gdk_device_get_core_pointer();
- #else
--   GdkDeviceManager* manager = gdk_display_get_device_manager(gdk_window_get_display(event.window));
-+#   if GTK_MINOR_VERSION >= 20
-+   GdkSeat *seat =
-+      gdk_display_get_default_seat(gdk_window_get_display(event.window));
-+   event.device = gdk_seat_get_pointer(seat);
-+#   else
-+   GdkDeviceManager *manager =
-+      gdk_display_get_device_manager(gdk_window_get_display(event.window));
-    event.device = gdk_device_manager_get_client_pointer(manager);
-+#   endif
- #endif
-    event.x_root = mOrigin.get_x();
-    event.y_root = mOrigin.get_y();
-diff --git a/open-vm-tools/services/plugins/dndcp/dndcp.cpp b/open-vm-tools/services/plugins/dndcp/dndcp.cpp
-index d1013f4a7..bae4c94c7 100644
---- a/open-vm-tools/services/plugins/dndcp/dndcp.cpp
-+++ b/open-vm-tools/services/plugins/dndcp/dndcp.cpp
-@@ -1,5 +1,5 @@
- /*********************************************************
-- * Copyright (C) 2010-2019 VMware, Inc. All rights reserved.
-+ * Copyright (C) 2010-2021 VMware, Inc. All rights reserved.
-  *
-  * This program is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as published
-@@ -31,6 +31,11 @@
- 
- #define G_LOG_DOMAIN "dndcp"
- 
-+/**
-+ * Include glib.h before encountering any extern "C".
-+ */
-+#include <glib.h>
-+
- extern "C" {
- #include "vmware/guestrpc/tclodefs.h"
- #include "vmware/tools/plugin.h"
diff --git a/app-emulation/open-vm-tools/open-vm-tools-11.3.5_p18557794.ebuild b/app-emulation/open-vm-tools/open-vm-tools-11.3.5_p18557794.ebuild
index 8d894cdb54a8..02e927c472da 100644
--- a/app-emulation/open-vm-tools/open-vm-tools-11.3.5_p18557794.ebuild
+++ b/app-emulation/open-vm-tools/open-vm-tools-11.3.5_p18557794.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools linux-info pam systemd
+inherit autotools linux-info pam systemd udev
 
 DESCRIPTION="Tools for VMware guests"
 HOMEPAGE="https://github.com/vmware/open-vm-tools"
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/vmware/open-vm-tools/releases/download/stable-${PV%_
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="X +deploypkg +dnet doc +fuse gtkmm +icu multimon pam +resolutionkms +ssl +vgauth"
 REQUIRED_USE="
 	multimon? ( X )
@@ -104,6 +104,7 @@ src_configure() {
 		$(use_enable vgauth)
 		$(use_with dnet)
 		$(use_with icu)
+		--with-udev-rules-dir="$(get_udevdir)/rules.d"
 	)
 	# Avoid a bug in configure.ac
 	use ssl || myeconfargs+=( --without-ssl )
@@ -138,3 +139,11 @@ src_install() {
 		dobin scripts/common/vmware-xdg-detect-de
 	fi
 }
+
+pkg_postinst() {
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/app-emulation/open-vm-tools/open-vm-tools-11.2.5_p17337674-r3.ebuild b/app-emulation/open-vm-tools/open-vm-tools-12.0.5_p19716617.ebuild
index afcbe6f2c508..29730afa69b4 100644
--- a/app-emulation/open-vm-tools/open-vm-tools-11.2.5_p17337674-r3.ebuild
+++ b/app-emulation/open-vm-tools/open-vm-tools-12.0.5_p19716617.ebuild
@@ -1,9 +1,9 @@
 # Copyright 2007-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit autotools linux-info pam systemd
+inherit autotools linux-info pam systemd udev
 
 DESCRIPTION="Tools for VMware guests"
 HOMEPAGE="https://github.com/vmware/open-vm-tools"
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/vmware/open-vm-tools/releases/download/stable-${PV%_
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="X +deploypkg +dnet doc +fuse gtkmm +icu multimon pam +resolutionkms +ssl +vgauth"
 REQUIRED_USE="
 	multimon? ( X )
@@ -68,9 +68,8 @@ BDEPEND="
 S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
-	"${FILESDIR}/10.1.0-mount.vmhgfs.patch"
 	"${FILESDIR}/10.1.0-Werror.patch"
-	"${FILESDIR}/11.2.5-glib-2.68.patch"
+	"${FILESDIR}/11.3.5-icu.patch"
 )
 
 pkg_setup() {
@@ -105,6 +104,7 @@ src_configure() {
 		$(use_enable vgauth)
 		$(use_with dnet)
 		$(use_with icu)
+		--with-udev-rules-dir="$(get_udevdir)/rules.d"
 	)
 	# Avoid a bug in configure.ac
 	use ssl || myeconfargs+=( --without-ssl )
@@ -131,10 +131,6 @@ src_install() {
 		systemd_dounit "${FILESDIR}"/vmtoolsd.service
 	fi
 
-	# Replace mount.vmhgfs with a wrapper
-	mv "${ED}"/usr/sbin/{mount.vmhgfs,hgfsmounter} || die
-	dosbin "${FILESDIR}/mount.vmhgfs"
-
 	# Make fstype = vmhgfs-fuse work in fstab
 	dosym vmhgfs-fuse /usr/bin/mount.vmhgfs-fuse
 
@@ -143,3 +139,11 @@ src_install() {
 		dobin scripts/common/vmware-xdg-detect-de
 	fi
 }
+
+pkg_postinst() {
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}