commit:     952274ef20feb9aadafcce492c9fb06b04a35678
Author:     Cristian Othón Martínez Vera <cfuga <AT> cfuga <DOT> mx>
AuthorDate: Wed Oct  8 19:31:48 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct 19 13:17:50 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=952274ef

app-emulation/open-vm-tools: apply fixes from version 12.5.0 to 12.4.5

Fixes applied in commit 2d8dcc9f00707a1d895afb6225e9917d6940e4f3
are also valid for version 12.4.5

Signed-off-by: Cristian Othón Martínez Vera <cfuga <AT> cfuga.mx>
Part-of: https://github.com/gentoo/gentoo/pull/43132
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../open-vm-tools/open-vm-tools-12.4.5-r2.ebuild       | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/app-emulation/open-vm-tools/open-vm-tools-12.4.5-r2.ebuild 
b/app-emulation/open-vm-tools/open-vm-tools-12.4.5-r2.ebuild
index 0dfba5ee9793..06f67d5e5170 100644
--- a/app-emulation/open-vm-tools/open-vm-tools-12.4.5-r2.ebuild
+++ b/app-emulation/open-vm-tools/open-vm-tools-12.4.5-r2.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
        dev-libs/glib
        net-libs/libtirpc
        deploypkg? ( dev-libs/libmspack )
-       fuse? ( sys-fs/fuse:0 )
+       fuse? ( sys-fs/fuse:3= )
        pam? ( sys-libs/pam )
        !pam? ( virtual/libcrypt:= )
        ssl? ( dev-libs/openssl:= )
@@ -95,6 +95,15 @@ src_configure() {
                $(use_with dnet)
                $(use_with icu)
                --with-udev-rules-dir="$(get_udevdir)"/rules.d
+               $(use_with fuse fuse 3)
+               # Disable it explicitly, we do not yet list the
+               # containerinfo dependencies in the ebuild
+               --disable-containerinfo
+               # Disable it explicitly, gtk2 is obsolete
+               --without-gtk2
+               # Possibly add a separate USE flag for the utility, or
+               # merge it into resolutionkms
+               --disable-vmwgfxctrl
        )
        # Avoid a bug in configure.ac
        use ssl || myeconfargs+=( --without-ssl )
@@ -125,8 +134,11 @@ src_install() {
                systemd_dounit "${FILESDIR}"/vmtoolsd.service
        fi
 
-       # Make fstype = vmhgfs-fuse work in fstab
-       dosym vmhgfs-fuse /usr/bin/mount.vmhgfs-fuse
+       # vmhgfs-fuse is built only when fuse is enabled
+       if use fuse; then
+               # Make fstype = vmhgfs-fuse work in fstab
+               dosym vmhgfs-fuse /usr/bin/mount.vmhgfs-fuse
+       fi
 
        if use X; then
                fperms 4711 /usr/bin/vmware-user-suid-wrapper

Reply via email to